Commit 09ca015c authored by 18손재민's avatar 18손재민

Jackson 애니메이션 넣기 Wip. 거울 wip

parent 7bf9ab38
...@@ -90,8 +90,8 @@ BoxCollider: ...@@ -90,8 +90,8 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1.0000005, y: 0.20000361, z: 1.0000007} m_Size: {x: 1.0000005, y: 0.2, z: 1}
m_Center: {x: -0.000000029802322, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &19711883686801522 --- !u!114 &19711883686801522
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -104,3 +104,4 @@ MonoBehaviour: ...@@ -104,3 +104,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b47a59601255854ea2822508c284e85, type: 3} m_Script: {fileID: 11500000, guid: 5b47a59601255854ea2822508c284e85, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mapPos: {x: 0, y: 0}
fileFormatVersion: 2
guid: 1c24887609748c44290aecf8a05574d6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 449b2ca4d925da541bb45c84b63aab98
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -1568,10 +1568,10 @@ NavMeshAgent: ...@@ -1568,10 +1568,10 @@ NavMeshAgent:
m_Enabled: 0 m_Enabled: 0
m_AgentTypeID: 0 m_AgentTypeID: 0
m_Radius: 0.5 m_Radius: 0.5
m_Speed: 5 m_Speed: 0.25
m_Acceleration: 1000 m_Acceleration: 6000
avoidancePriority: 50 avoidancePriority: 50
m_AngularSpeed: 300 m_AngularSpeed: 3000
m_StoppingDistance: 0 m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1 m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1 m_AutoBraking: 1
......
...@@ -100,7 +100,7 @@ NavMeshSettings: ...@@ -100,7 +100,7 @@ NavMeshSettings:
agentRadius: 0.03 agentRadius: 0.03
agentHeight: 2 agentHeight: 2
agentSlope: 45 agentSlope: 45
agentClimb: 0.4 agentClimb: 0
ledgeDropHeight: 0 ledgeDropHeight: 0
maxJumpAcrossDistance: 0 maxJumpAcrossDistance: 0
minRegionArea: 2 minRegionArea: 2
...@@ -574,6 +574,11 @@ PrefabInstance: ...@@ -574,6 +574,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: MapManager value: MapManager
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6014610519130626400, guid: 11285456de5f1854d947bea83275646f,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f, - target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -634,6 +639,18 @@ PrefabInstance: ...@@ -634,6 +639,18 @@ PrefabInstance:
propertyPath: surface propertyPath: surface
value: value:
objectReference: {fileID: 2102809461} objectReference: {fileID: 2102809461}
- target: {fileID: 3268100033343711389, guid: 11285456de5f1854d947bea83275646f,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 494213313239918027, guid: 449b2ca4d925da541bb45c84b63aab98,
type: 3}
- target: {fileID: 3268100033343711389, guid: 11285456de5f1854d947bea83275646f,
type: 3}
propertyPath: stage.Array.data[0]
value:
objectReference: {fileID: 2496973653136699540, guid: dbb2e09c19fe5ad49b11a6b95e5ac9e8,
type: 3}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 11285456de5f1854d947bea83275646f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 11285456de5f1854d947bea83275646f, type: 3}
--- !u!1001 &7277015660625800392 --- !u!1001 &7277015660625800392
...@@ -648,6 +665,17 @@ PrefabInstance: ...@@ -648,6 +665,17 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: NavMesh value: NavMesh
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7277015661519863740, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7277015661519863741, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_NavMeshData
value:
objectReference: {fileID: 23800000, guid: e7eb2fe133fb4eb45bffdded306b23f4,
type: 2}
- target: {fileID: 7277015661519863742, guid: 20dee07e28273f049a9093ae4453912f, - target: {fileID: 7277015661519863742, guid: 20dee07e28273f049a9093ae4453912f,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
......
fileFormatVersion: 2
guid: e7eb2fe133fb4eb45bffdded306b23f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000
userData:
assetBundleName:
assetBundleVariant:
...@@ -101,7 +101,7 @@ public class CameraController : MonoBehaviour ...@@ -101,7 +101,7 @@ public class CameraController : MonoBehaviour
{ {
if (!PlayerController.inst.isPlayerShooting) if (!PlayerController.inst.isPlayerShooting)
{ {
CameraMove(); //CameraMove();
CameraDrag(); CameraDrag();
} }
} }
......
...@@ -24,7 +24,7 @@ public class MapManager : SingletonBehaviour<MapManager> ...@@ -24,7 +24,7 @@ public class MapManager : SingletonBehaviour<MapManager>
currentMap.transform.position = new Vector3(0, 0, 0); currentMap.transform.position = new Vector3(0, 0, 0);
surface.BuildNavMesh(); surface.BuildNavMesh();
for (int i = 0; i < currentMap.startFloors.Count; i++) for (int i = 0; i < currentMap.startFloors.Count; i++)
players.Add(Instantiate(player, currentMap.startFloors[i].transform.position + new Vector3(0, 1.15f, 0), Quaternion.identity)); players.Add(Instantiate(player, currentMap.startFloors[i].transform.position + new Vector3(0, 0.1f, 0), Quaternion.identity));
} }
public IEnumerator Rebaker() public IEnumerator Rebaker()
{ {
......
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