diff --git a/Assets/GameObjects/Prefabs/Player.prefab b/Assets/GameObjects/Prefabs/Player.prefab index 5e22413..df05cbb 100644 --- a/Assets/GameObjects/Prefabs/Player.prefab +++ b/Assets/GameObjects/Prefabs/Player.prefab @@ -31,6 +31,37 @@ Transform: m_Father: {fileID: 1865991757674780053} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1108995136692721886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6532210512705233048} + m_Layer: 0 + m_Name: BobbingRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6532210512705233048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108995136692721886} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5736092089644017385} + m_Father: {fileID: 1865991757674780053} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1607323028047207915 GameObject: m_ObjectHideFlags: 0 @@ -121,7 +152,7 @@ Transform: m_LocalPosition: {x: 0.15, y: -0.071, z: 0.309} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5736092089644017385} + - {fileID: 6532210512705233048} - {fileID: 2637233632139837434} m_Father: {fileID: 3811958100146932696} m_RootOrder: 0 @@ -779,16 +810,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} ---- !u!4 &835288951058457063 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} - m_PrefabInstance: {fileID: 892884152691873703} - m_PrefabAsset: {fileID: 0} --- !u!198 &5204970423912589616 stripped ParticleSystem: m_CorrespondingSourceObject: {fileID: 4926916423109787287, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} m_PrefabInstance: {fileID: 892884152691873703} m_PrefabAsset: {fileID: 0} +--- !u!4 &835288951058457063 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3} + m_PrefabInstance: {fileID: 892884152691873703} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4305913406570759588 PrefabInstance: m_ObjectHideFlags: 0 @@ -852,6 +883,306 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.4 objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8670776965962096019, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.003704905 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.12723981 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.028867956 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99144495 + objectReference: {fileID: 0} + - target: {fileID: -8514005654889199914, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 7.450611e-11 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.11726038 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.78692883 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.10534324 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.59657013 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 2.9802363e-10 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.005000001 + objectReference: {fileID: 0} + - target: {fileID: -6923692964011772997, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 1.0658127e-16 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.4025505 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5795139 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.39851758 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5859185 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -4.1526386e-11 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.010049878 + objectReference: {fileID: 0} + - target: {fileID: -5811684011590700046, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 7.450577e-11 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5337629 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.46430966 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.52586335 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4722092 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0.00692738 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0015562114 + objectReference: {fileID: 0} + - target: {fileID: -4394393162741005756, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00002694261 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7331161 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.6280448 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.20716763 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.15868898 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0009899489 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0069296476 + objectReference: {fileID: 0} + - target: {fileID: -2715282777381300597, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 8.344645e-10 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.53583217 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.4953873 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.52479625 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.43825138 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.3915952e-11 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.010049876 + objectReference: {fileID: 0} + - target: {fileID: -2270507795074588759, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 5.9604643e-10 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.04723739 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00006174668 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.924667 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.37783542 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.352766e-10 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: -1950722598149266537, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000000026822078 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.9822163 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.03571471 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.035714716 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.18083201 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.6172504e-10 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0035000027 + objectReference: {fileID: 0} + - target: {fileID: -1495015646345137348, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0015000001 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.22521979 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.6452314 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.72016627 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.11963704 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 6.439291e-17 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.006929654 + objectReference: {fileID: 0} + - target: {fileID: -1419211092030752837, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0009899485 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -99557941888743577, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000013411045 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000014901161 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000014901161 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 3.552715e-17 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.009 + objectReference: {fileID: 0} + - target: {fileID: 372902504219519290, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -3.5527146e-17 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Name value: SoldierF @@ -860,6 +1191,62 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7136195 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.38093486 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.17746559 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.56048363 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: 0.004 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0049999994 + objectReference: {fileID: 0} + - target: {fileID: 2279234694574520103, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 2.2351737e-10 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8333873 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.07265535 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.53159094 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.1326572 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0039999997 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0050000004 + objectReference: {fileID: 0} + - target: {fileID: 4581825585084769525, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 5.3290694e-17 + objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_Controller value: @@ -868,6 +1255,106 @@ PrefabInstance: propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15342893 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.026746389 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0037069293 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98779076 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1920907e-10 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0069999993 + objectReference: {fileID: 0} + - target: {fileID: 6042207439844548646, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -3.516517e-10 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: -0.11964582 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.043068472 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0032882574 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9918766 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1920905e-10 + objectReference: {fileID: 0} + - target: {fileID: 7396813338001775804, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: 1.2048304e-11 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.9436777 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: 0.027592212 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0338224 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.32797417 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: -1.1920927e-10 + objectReference: {fileID: 0} + - target: {fileID: 8267027504997795347, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.z + value: -1.4901158e-10 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.x + value: 0.998392 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.y + value: -0.018809479 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.z + value: -0.013097852 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalRotation.w + value: -0.051848374 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.x + value: -0.002 + objectReference: {fileID: 0} + - target: {fileID: 8372328156874772898, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + propertyPath: m_LocalPosition.y + value: 1.192093e-10 + objectReference: {fileID: 0} - target: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} propertyPath: m_TagString value: PlayerHead @@ -898,35 +1385,35 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1865991757674780053} + m_TransformParent: {fileID: 6532210512705233048} m_Modifications: - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalPosition.x - value: 0.00000023468988 + value: -0.00030055165 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalPosition.y - value: -0.25000015 + value: -0.048959285 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalPosition.z - value: 0.00000008381906 + value: -0.00051991054 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalRotation.x - value: -0.00000014901158 + value: 0.0021719388 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalRotation.y - value: 0.70710695 + value: 0.7071036 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalRotation.z - value: 0.70710665 + value: 0.7071033 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_LocalRotation.w - value: -0.00000055879343 + value: 0.002171528 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4f2bbe1f3791622448504110deb9f847, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Graphics/Animation/Gun/GunIdle.anim b/Assets/Graphics/Animation/Gun/GunIdle.anim index c5e2905..bd74352 100644 --- a/Assets/Graphics/Animation/Gun/GunIdle.anim +++ b/Assets/Graphics/Animation/Gun/GunIdle.anim @@ -20,8 +20,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 3} - outSlope: {x: 0, y: 0, z: 3} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -38,8 +38,8 @@ AnimationClip: - serializedVersion: 3 time: 0.6666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -3} - outSlope: {x: 0, y: 0, z: -3} + inSlope: {x: 0, y: 0, z: -3.0000002} + outSlope: {x: 0, y: 0, z: -3.0000002} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -47,8 +47,8 @@ AnimationClip: - serializedVersion: 3 time: 1 value: {x: 0, y: 0, z: -1} - inSlope: {x: 0, y: 0, z: -0.00000023841858} - outSlope: {x: 0, y: 0, z: -0.00000023841858} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -56,8 +56,8 @@ AnimationClip: - serializedVersion: 3 time: 1.3333334 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 2.9999998} - outSlope: {x: 0, y: 0, z: 2.9999998} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -65,14 +65,14 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: GunModel + path: BobbingRoot m_PositionCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.19999993, z: 0} + value: {x: 0, y: -0.2, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,7 +90,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.3333334 - value: {x: 0, y: -0.19999993, z: 0} + value: {x: 0, y: -0.2, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -100,7 +100,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: GunModel + path: BobbingRoot m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -112,14 +112,14 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 446836731 + path: 3042182627 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 446836731 + path: 3042182627 attribute: 4 script: {fileID: 0} typeID: 4 @@ -181,7 +181,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -189,7 +189,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.19999993 + value: -0.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -207,7 +207,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.3333334 - value: -0.19999993 + value: -0.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -218,7 +218,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -255,7 +255,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -292,7 +292,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.x - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -329,7 +329,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.y - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -338,9 +338,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 3 - outSlope: 3 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -349,34 +349,34 @@ AnimationClip: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 34 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 - inSlope: -3 - outSlope: -3 - tangentMode: 34 + inSlope: -3.0000002 + outSlope: -3.0000002 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: -1 - inSlope: -0.00000023841858 - outSlope: -0.00000023841858 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.3333334 value: 0 - inSlope: 2.9999998 - outSlope: 2.9999998 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -384,7 +384,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: localEulerAnglesRaw.z - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -394,8 +394,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: GunModel + attribute: m_LocalEulerAngles.z + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -405,7 +405,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -414,8 +414,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: GunModel + attribute: m_LocalEulerAngles.x + path: BobbingRoot classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Graphics/Animation/Gun/GunWalk.anim b/Assets/Graphics/Animation/Gun/GunWalk.anim index 5c281b2..9110706 100644 --- a/Assets/Graphics/Animation/Gun/GunWalk.anim +++ b/Assets/Graphics/Animation/Gun/GunWalk.anim @@ -20,35 +20,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.19999993, z: 0} - inSlope: {x: 0, y: 0.045422196, z: 0} - outSlope: {x: 0, y: 0.045422196, z: 0} + value: {x: 0, y: -0.2, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.21276595, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 value: {x: 0, y: -0.19, z: 0} - inSlope: {x: 0, y: 0.0036644656, z: 0} - outSlope: {x: 0, y: 0.0036644656, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.54491717, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.45 - value: {x: 0, y: -0.19999993, z: 0} - inSlope: {x: 0, y: 0.08186936, z: 0} - outSlope: {x: 0, y: 0.08186936, z: 0} + value: {x: 0, y: -0.2, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.31914893, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: GunModel + path: BobbingRoot m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -60,7 +60,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 446836731 + path: 3042182627 attribute: 1 script: {fileID: 0} typeID: 4 @@ -100,6 +100,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.45 value: 0 @@ -113,7 +122,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -121,36 +130,36 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.19999993 - inSlope: 0.045422196 - outSlope: 0.045422196 - tangentMode: 0 + value: -0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.21276595 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 value: -0.19 - inSlope: 0.0036644656 - outSlope: 0.0036644656 - tangentMode: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.54491717 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.45 - value: -0.19999993 - inSlope: 0.08186936 - outSlope: 0.08186936 - tangentMode: 0 + value: -0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0.31914893 + inWeight: 0.33333334 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} - curve: @@ -165,6 +174,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.45 value: 0 @@ -178,7 +196,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: GunModel + path: BobbingRoot classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Graphics/Models/Guns/RifleMetal.mat b/Assets/Graphics/Models/Guns/RifleMetal.mat index 7dfd20a..a373d22 100644 --- a/Assets/Graphics/Models/Guns/RifleMetal.mat +++ b/Assets/Graphics/Models/Guns/RifleMetal.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: RifleMetal - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -59,10 +59,11 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 1 + - _Metallic: 0 - _OcclusionStrength: 1 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SampleGI: 0 - _Smoothness: 0.232 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/Assets/Graphics/Models/Soldier/SoldierMat.mat b/Assets/Graphics/Models/Soldier/SoldierMat.mat index 669871c..eb58fed 100644 --- a/Assets/Graphics/Models/Soldier/SoldierMat.mat +++ b/Assets/Graphics/Models/Soldier/SoldierMat.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SoldierMat - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -63,6 +63,7 @@ Material: - _OcclusionStrength: 1 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SampleGI: 0 - _Smoothness: 0.219 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 diff --git a/Assets/Graphics/Textures/Soldier/Gear.png.meta b/Assets/Graphics/Textures/Soldier/Gear.png.meta index 0a88b5b..f000546 100644 --- a/Assets/Graphics/Textures/Soldier/Gear.png.meta +++ b/Assets/Graphics/Textures/Soldier/Gear.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: -1 diff --git a/Assets/Graphics/Textures/Soldier/Soldier.png.meta b/Assets/Graphics/Textures/Soldier/Soldier.png.meta index fb306b4..5816bad 100644 --- a/Assets/Graphics/Textures/Soldier/Soldier.png.meta +++ b/Assets/Graphics/Textures/Soldier/Soldier.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: -1 @@ -66,7 +66,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -78,7 +78,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -90,7 +90,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0