Commit 3c98bc0f authored by 16이진형's avatar 16이진형

clock 끼리 충돌하지 않게 변경

parent e262495f
...@@ -1113,8 +1113,8 @@ MonoBehaviour: ...@@ -1113,8 +1113,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3} m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
objectType: 2 objectType: 3
collisionPreset: 2 collisionPreset: 4
beta: 0 beta: 0
alpha: {x: 0, y: 0, z: 0} alpha: {x: 0, y: 0, z: 0}
v: {x: 0, y: 0, z: 0} v: {x: 0, y: 0, z: 0}
...@@ -2669,8 +2669,8 @@ MonoBehaviour: ...@@ -2669,8 +2669,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3} m_Script: {fileID: 11500000, guid: 11c0c0a758005e0408c9a767ec478e97, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
objectType: 2 objectType: 3
collisionPreset: 2 collisionPreset: 4
beta: 0 beta: 0
alpha: {x: 0, y: 0, z: 0} alpha: {x: 0, y: 0, z: 0}
v: {x: 0, y: 0, z: 0} v: {x: 0, y: 0, z: 0}
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
new CollisionType(ObjectType.player,true), new CollisionType(ObjectType.player,true),
new CollisionType(ObjectType.normalobject,true), new CollisionType(ObjectType.normalobject,true),
new CollisionType(ObjectType.interactive,false), new CollisionType(ObjectType.interactive,false),
new CollisionType(ObjectType.clock,false),
new CollisionType(ObjectType.wall,true) new CollisionType(ObjectType.wall,true)
}; };
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
new CollisionType(ObjectType.player,true), new CollisionType(ObjectType.player,true),
new CollisionType(ObjectType.normalobject,true), new CollisionType(ObjectType.normalobject,true),
new CollisionType(ObjectType.interactive,true), new CollisionType(ObjectType.interactive,true),
new CollisionType(ObjectType.clock,true),
new CollisionType(ObjectType.wall,true) new CollisionType(ObjectType.wall,true)
}; };
...@@ -23,6 +25,15 @@ ...@@ -23,6 +25,15 @@
new CollisionType(ObjectType.player,false), new CollisionType(ObjectType.player,false),
new CollisionType(ObjectType.normalobject,true), new CollisionType(ObjectType.normalobject,true),
new CollisionType(ObjectType.interactive,true), new CollisionType(ObjectType.interactive,true),
new CollisionType(ObjectType.clock,true),
new CollisionType(ObjectType.wall,true)
};
public static CollisionType[] Clock { get; private set; } = {
new CollisionType(ObjectType.player,false),
new CollisionType(ObjectType.normalobject,true),
new CollisionType(ObjectType.interactive,true),
new CollisionType(ObjectType.clock,false),
new CollisionType(ObjectType.wall,true) new CollisionType(ObjectType.wall,true)
}; };
...@@ -30,6 +41,7 @@ ...@@ -30,6 +41,7 @@
new CollisionType(ObjectType.player,false), new CollisionType(ObjectType.player,false),
new CollisionType(ObjectType.normalobject,false), new CollisionType(ObjectType.normalobject,false),
new CollisionType(ObjectType.interactive,false), new CollisionType(ObjectType.interactive,false),
new CollisionType(ObjectType.clock,false),
new CollisionType(ObjectType.wall,false) new CollisionType(ObjectType.wall,false)
}; };
...@@ -43,6 +55,7 @@ ...@@ -43,6 +55,7 @@
normalobject, normalobject,
interactive, interactive,
wall, wall,
clock,
etc etc
} }
} }
...@@ -11,6 +11,7 @@ namespace Assets.Scripts.Collision ...@@ -11,6 +11,7 @@ namespace Assets.Scripts.Collision
player, player,
normalobject, normalobject,
interactive, interactive,
clock,
wall wall
} }
} }
...@@ -78,6 +78,9 @@ public class FlatlandMovement : MonoBehaviour ...@@ -78,6 +78,9 @@ public class FlatlandMovement : MonoBehaviour
case PresetType.wall: case PresetType.wall:
howToCollison = CollisionPreset.Wall; howToCollison = CollisionPreset.Wall;
break; break;
case PresetType.clock:
howToCollison = CollisionPreset.Clock;
break;
case PresetType.etc: case PresetType.etc:
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment