diff --git a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab index 7465da5292..10b830204b 100644 --- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab +++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab @@ -301,6 +301,23 @@ MonoBehaviour: - {fileID: 928224351994020785} - {fileID: 9049048348530379419} - {fileID: 6905220490405268265} +--- !u!114 &4089327054249829692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309633228405838073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d35e0e262b096054493589c4dbf0fc6a, type: 3} + m_Name: + m_EditorClassIdentifier: + _sfxEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2} + _audioConfig: {fileID: 11400000, guid: 6b42c99763682d64ba019b447d78be04, type: 2} + caneSwing: {fileID: 11400000, guid: ab9635318edf5da409588eec7deb39f2, type: 2} + objectPickup: {fileID: 11400000, guid: 802be3a8bc6d3064e84c781cad59cb68, type: 2} + footstep: {fileID: 11400000, guid: ddb0fd735bd6f904eaae159c865eb35f, type: 2} --- !u!114 &5557640735889932260 MonoBehaviour: m_ObjectHideFlags: 0 @@ -318,12 +335,6 @@ MonoBehaviour: type: 2} _openInventoryChannel: {fileID: 11400000, guid: 30f6db2122a30480b996908173e1c7d7, type: 2} - jumpInput: 0 - extraActionInput: 0 - attackInput: 0 - movementInput: {x: 0, y: 0, z: 0} - movementVector: {x: 0, y: 0, z: 0} - isRunning: 0 --- !u!114 &6243045328629046901 MonoBehaviour: m_ObjectHideFlags: 0 @@ -373,23 +384,6 @@ MonoBehaviour: _walkingParticles: {fileID: 4559447277278735044} _landParticles: {fileID: 334012115255375375} _jumpParticles: {fileID: 4839788363397376542} ---- !u!114 &4089327054249829692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 309633228405838073} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d35e0e262b096054493589c4dbf0fc6a, type: 3} - m_Name: - m_EditorClassIdentifier: - _sfxEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2} - _audioConfig: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a, type: 2} - caneSwing: {fileID: 11400000, guid: ab9635318edf5da409588eec7deb39f2, type: 2} - objectPickup: {fileID: 11400000, guid: 802be3a8bc6d3064e84c781cad59cb68, type: 2} - footstep: {fileID: 11400000, guid: ddb0fd735bd6f904eaae159c865eb35f, type: 2} --- !u!1 &648091144661104905 GameObject: m_ObjectHideFlags: 0 @@ -1032,6 +1026,11 @@ PrefabInstance: propertyPath: m_Layer value: 9 objectReference: {fileID: 0} + - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, type: 3} propertyPath: m_LocalPosition.x @@ -1047,6 +1046,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, type: 3} propertyPath: m_LocalRotation.x @@ -1062,16 +1066,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1752,6 +1746,11 @@ PrefabInstance: propertyPath: m_Layer value: 9 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -1767,6 +1766,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.3597734 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.x @@ -1782,16 +1786,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.3597734 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1812,16 +1806,16 @@ PrefabInstance: propertyPath: m_Layer value: 9 objectReference: {fileID: 0} - - target: {fileID: -8595871017191866967, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: -8595871017191866967, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: -8595871017191866967, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: -8392203552951964329, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1849,18 +1843,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 6.1578 - objectReference: {fileID: 0} - - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -1.9204994 - objectReference: {fileID: 0} - - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 17.502598 + propertyPath: m_LocalRotation.w + value: 0.98665583 objectReference: {fileID: 0} - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -1879,8 +1863,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.98665583 + propertyPath: m_LocalEulerAnglesHint.x + value: 6.1578 + objectReference: {fileID: 0} + - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.9204994 + objectReference: {fileID: 0} + - target: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 17.502598 objectReference: {fileID: 0} - target: {fileID: -8242689729492277750, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -1899,18 +1893,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 60.512127 - objectReference: {fileID: 0} - - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -128.00568 - objectReference: {fileID: 0} - - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 135.99109 + propertyPath: m_LocalRotation.w + value: 0.27803147 objectReference: {fileID: 0} - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -1929,23 +1913,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.27803147 - objectReference: {fileID: 0} - - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.000001432246 + value: 60.512127 objectReference: {fileID: 0} - - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -25.560047 + value: -128.00568 objectReference: {fileID: 0} - - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0.00000036803524 + value: 135.99109 + objectReference: {fileID: 0} + - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9052609 objectReference: {fileID: 0} - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -1964,8 +1948,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9052609 + propertyPath: m_LocalEulerAnglesHint.x + value: 0.000001432246 + objectReference: {fileID: 0} + - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25.560047 + objectReference: {fileID: 0} + - target: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.00000036803524 objectReference: {fileID: 0} - target: {fileID: -7877829953566039679, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2132,16 +2126,16 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: cddd3350453cf434a8947870acec244b, type: 2} - - target: {fileID: -6025708899128263457, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -6025708899128263457, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: -6025708899128263457, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -5948828724568103663, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -2279,18 +2273,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -10.990369 - objectReference: {fileID: 0} - - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -5.022179 - objectReference: {fileID: 0} - - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -15.53911 + propertyPath: m_LocalRotation.w + value: 0.984752 objectReference: {fileID: 0} - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2309,33 +2293,33 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.984752 + propertyPath: m_LocalEulerAnglesHint.x + value: -10.990369 objectReference: {fileID: 0} - - target: {fileID: -4200461926575173289, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} + propertyPath: m_LocalEulerAnglesHint.y + value: -5.022179 + objectReference: {fileID: 0} + - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -15.53911 + objectReference: {fileID: 0} - target: {fileID: -4200461926575173289, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -0.14569294 - objectReference: {fileID: 0} - - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: -4200461926575173289, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.34006113 - objectReference: {fileID: 0} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -35.274616 + propertyPath: m_LocalRotation.w + value: 0.95298743 objectReference: {fileID: 0} - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2354,8 +2338,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.95298743 + propertyPath: m_LocalEulerAnglesHint.x + value: -0.14569294 + objectReference: {fileID: 0} + - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.34006113 + objectReference: {fileID: 0} + - target: {fileID: -4181227459435074103, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -35.274616 objectReference: {fileID: 0} - target: {fileID: -4163726706130929188, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2457,16 +2451,16 @@ PrefabInstance: propertyPath: m_Layer value: 9 objectReference: {fileID: 0} - - target: {fileID: -2481878564107924521, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -2481878564107924521, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: -2481878564107924521, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -2466431279027601768, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -2779,18 +2773,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -67.74214 - objectReference: {fileID: 0} - - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 78.07544 - objectReference: {fileID: 0} - - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -7.6536946 + propertyPath: m_LocalRotation.w + value: 0.66690505 objectReference: {fileID: 0} - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2809,23 +2793,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.66690505 - objectReference: {fileID: 0} - - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 1.3982846e-12 + value: -67.74214 objectReference: {fileID: 0} - - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -25.130772 + value: 78.07544 objectReference: {fileID: 0} - - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -1.1670075e-12 + value: -7.6536946 + objectReference: {fileID: 0} + - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8623936 objectReference: {fileID: 0} - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2844,8 +2828,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.8623936 + propertyPath: m_LocalEulerAnglesHint.x + value: 1.3982846e-12 + objectReference: {fileID: 0} + - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25.130772 + objectReference: {fileID: 0} + - target: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -1.1670075e-12 objectReference: {fileID: 0} - target: {fileID: 520727278711501504, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -2914,13 +2908,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_TagString - value: Player + propertyPath: m_Layer + value: 9 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_Layer - value: 9 + propertyPath: m_TagString + value: Player objectReference: {fileID: 0} - target: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3047,16 +3041,16 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - - target: {fileID: 2649400151080213580, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 2649400151080213580, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2649400151080213580, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 2742891811965840690, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -3119,18 +3113,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 18.31801 - objectReference: {fileID: 0} - - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -4.0313716 - objectReference: {fileID: 0} - - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -50.017452 + propertyPath: m_LocalRotation.w + value: 0.9200152 objectReference: {fileID: 0} - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3149,8 +3133,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9200152 + propertyPath: m_LocalEulerAnglesHint.x + value: 18.31801 + objectReference: {fileID: 0} + - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -4.0313716 + objectReference: {fileID: 0} + - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -50.017452 objectReference: {fileID: 0} - target: {fileID: 4232177642318348382, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3177,16 +3171,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4619836570106922205, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 4619836570106922205, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4619836570106922205, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3234,18 +3228,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -21.06071 - objectReference: {fileID: 0} - - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.6839509 - objectReference: {fileID: 0} - - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 6.9925656 + propertyPath: m_LocalRotation.w + value: 0.9819513 objectReference: {fileID: 0} - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3264,19 +3248,29 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9819513 + propertyPath: m_LocalEulerAnglesHint.x + value: -21.06071 objectReference: {fileID: 0} - - target: {fileID: 5309171990651476030, guid: c478a391cfbc4b74ebda3f9a57283705, + - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.6839509 + objectReference: {fileID: 0} + - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 6.9925656 + objectReference: {fileID: 0} - target: {fileID: 5309171990651476030, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5309171990651476030, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 5324172423425752238, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -3359,18 +3353,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 3.712395 - objectReference: {fileID: 0} - - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -11.361799 - objectReference: {fileID: 0} - - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -44.15957 + propertyPath: m_LocalRotation.w + value: 0.82881594 objectReference: {fileID: 0} - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3389,8 +3373,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.82881594 + propertyPath: m_LocalEulerAnglesHint.x + value: 3.712395 + objectReference: {fileID: 0} + - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -11.361799 + objectReference: {fileID: 0} + - target: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -44.15957 objectReference: {fileID: 0} - target: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3454,18 +3448,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -19.356195 - objectReference: {fileID: 0} - - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -8.593798 - objectReference: {fileID: 0} - - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 5.412012 + propertyPath: m_LocalRotation.w + value: 0.97718567 objectReference: {fileID: 0} - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3484,8 +3468,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.97718567 + propertyPath: m_LocalEulerAnglesHint.x + value: -19.356195 + objectReference: {fileID: 0} + - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8.593798 + objectReference: {fileID: 0} + - target: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 5.412012 objectReference: {fileID: 0} - target: {fileID: 7459679077848680949, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3594,18 +3588,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -6.7844157 - objectReference: {fileID: 0} - - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 4.353069 - objectReference: {fileID: 0} - - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 25.273106 + propertyPath: m_LocalRotation.w + value: 0.9728734 objectReference: {fileID: 0} - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3624,8 +3608,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9728734 + propertyPath: m_LocalEulerAnglesHint.x + value: -6.7844157 + objectReference: {fileID: 0} + - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 4.353069 + objectReference: {fileID: 0} + - target: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 25.273106 objectReference: {fileID: 0} - target: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} @@ -3717,16 +3711,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -14.5298 objectReference: {fileID: 0} - - target: {fileID: 8959478772981209604, guid: c478a391cfbc4b74ebda3f9a57283705, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: 8959478772981209604, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8959478772981209604, guid: c478a391cfbc4b74ebda3f9a57283705, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: 9060900421649665895, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -4223,13 +4217,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 969440480837226763, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} - propertyPath: m_Radius - value: 0.12 + propertyPath: m_Height + value: 1.2306131 objectReference: {fileID: 0} - target: {fileID: 969440480837226763, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} - propertyPath: m_Height - value: 1.2306131 + propertyPath: m_Radius + value: 0.12 objectReference: {fileID: 0} - target: {fileID: 969440480837226763, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} @@ -4246,6 +4240,11 @@ PrefabInstance: propertyPath: m_Center.z value: -0.020000005 objectReference: {fileID: 0} + - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} propertyPath: m_LocalPosition.x @@ -4261,6 +4260,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071062 + objectReference: {fileID: 0} - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} propertyPath: m_LocalRotation.x @@ -4276,16 +4280,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.000000010360963 objectReference: {fileID: 0} - - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071062 - objectReference: {fileID: 0} - - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4326,6 +4320,11 @@ PrefabInstance: propertyPath: m_Name value: JumpParticle objectReference: {fileID: 0} + - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3} propertyPath: m_LocalPosition.x @@ -4341,6 +4340,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3} propertyPath: m_LocalRotation.x @@ -4356,16 +4360,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.000000007450579 objectReference: {fileID: 0} - - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3346050453518178618, guid: 5bf7aeff6af6cad4ba9c19219c9841db, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4402,6 +4396,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 342023486377954667} m_Modifications: + - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, type: 3} propertyPath: m_LocalPosition.x @@ -4417,6 +4416,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.603553 + objectReference: {fileID: 0} - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, type: 3} propertyPath: m_LocalRotation.x @@ -4432,16 +4436,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.303603 objectReference: {fileID: 0} - - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.603553 - objectReference: {fileID: 0} - - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5864779421758016536, guid: 6de7b76f7d729b44a9ad9ae2159b5bd5, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4481,6 +4475,11 @@ PrefabInstance: propertyPath: m_Layer value: 9 objectReference: {fileID: 0} + - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, type: 3} propertyPath: m_LocalPosition.x @@ -4496,6 +4495,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.13360044 objectReference: {fileID: 0} + - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, type: 3} propertyPath: m_LocalRotation.x @@ -4511,16 +4515,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.00000010430813 objectReference: {fileID: 0} - - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3084967427938355885, guid: eb908f2ce4939c74a859b357ce6558d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4556,6 +4550,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2229996005663935112} m_Modifications: + - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3} propertyPath: m_LocalPosition.x @@ -4571,6 +4570,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.188 objectReference: {fileID: 0} + - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3} propertyPath: m_LocalRotation.x @@ -4586,16 +4590,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.000000007450579 objectReference: {fileID: 0} - - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 482719544232312599, guid: f8a6e96eef53e5a4686f9a85a72fe73b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4637,6 +4631,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5337852870612368657} m_Modifications: + - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, type: 3} propertyPath: m_LocalPosition.x @@ -4652,6 +4651,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.135 objectReference: {fileID: 0} + - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9934976 + objectReference: {fileID: 0} - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, type: 3} propertyPath: m_LocalRotation.x @@ -4667,16 +4671,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.0000001490116 objectReference: {fileID: 0} - - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9934976 - objectReference: {fileID: 0} - - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1641733921936875253, guid: 6be2ee433475f3a4096eaf60a7f40137, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4711,6 +4705,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1083073290189785667} m_Modifications: + - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, type: 3} propertyPath: m_LocalPosition.x @@ -4726,6 +4725,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, type: 3} propertyPath: m_LocalRotation.x @@ -4741,16 +4745,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 3257505381734315597, guid: f8b7770f18df7614e90765b366548764, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4791,6 +4785,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2229996005663935112} m_Modifications: + - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3} propertyPath: m_LocalPosition.x @@ -4806,6 +4805,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3} propertyPath: m_LocalRotation.x @@ -4821,16 +4825,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.000000007450579 objectReference: {fileID: 0} - - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 558165235346798506, guid: 2a17d00f8cddbf44ea0f55e00cbc97e9, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity index bd10deb2d1..e1fe207819 100644 --- a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity +++ b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity @@ -245,12 +245,12 @@ RectTransform: m_Children: - {fileID: 1806157293} m_Father: {fileID: 2140469183} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -323.2} - m_SizeDelta: {x: 337.9086, y: 144.69672} + m_AnchoredPosition: {x: 0, y: -255.3} + m_SizeDelta: {x: 240.65524, y: 116.64508} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &403475998 MonoBehaviour: @@ -357,42 +357,42 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalPosition.x + propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalPosition.z + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalRotation.x + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_LocalRotation.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3} - propertyPath: m_RootOrder + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e, @@ -470,7 +470,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -490,6 +490,163 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 622178817} m_CullTransparentMesh: 0 +--- !u!1 &684748716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684748717} + - component: {fileID: 684748719} + - component: {fileID: 684748718} + m_Layer: 5 + m_Name: Disclaimer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &684748717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684748716} + 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: [] + m_Father: {fileID: 2140469183} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -965.44} + m_SizeDelta: {x: -112.24219, y: 114.56348} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &684748718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684748716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 120 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Work in progress. This game is being made as a collaborative effort by + Unity and the community. +--- !u!222 &684748719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684748716} + m_CullTransparentMesh: 0 +--- !u!1 &821853654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 821853655} + - component: {fileID: 821853657} + - component: {fileID: 821853656} + m_Layer: 5 + m_Name: VersionNo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &821853655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 821853654} + 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: [] + m_Father: {fileID: 2140469183} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -76.27, y: 114.56348} + m_SizeDelta: {x: 152.53586, y: 114.56348} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &821853656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 821853654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 120 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: v 0.6 +--- !u!222 &821853657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 821853654} + m_CullTransparentMesh: 0 --- !u!1 &1228641979 GameObject: m_ObjectHideFlags: 0 @@ -520,12 +677,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2140469183} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.30005} - m_SizeDelta: {x: 0, y: 441.28995} + m_AnchoredPosition: {x: 0, y: -123.1} + m_SizeDelta: {x: 0, y: 280.2737} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1228641981 MonoBehaviour: @@ -547,21 +704,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 120 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_FontSize: 150 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 120 + m_MaxSize: 150 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'Open Project #1: - - Chop Chop' + m_Text: CHOP CHOP --- !u!222 &1228641982 CanvasRenderer: m_ObjectHideFlags: 0 @@ -570,6 +725,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228641979} m_CullTransparentMesh: 0 +--- !u!1 &1312122615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1312122616} + - component: {fileID: 1312122618} + - component: {fileID: 1312122617} + m_Layer: 5 + m_Name: UOP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1312122616 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312122615} + 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: [] + m_Father: {fileID: 2140469183} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -49.1} + m_SizeDelta: {x: 0, y: 157.00864} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1312122617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312122615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} + m_FontSize: 50 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 120 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Open Project #1 +--- !u!222 &1312122618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312122615} + m_CullTransparentMesh: 0 --- !u!1 &1367871825 GameObject: m_ObjectHideFlags: 0 @@ -862,7 +1095,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -915,12 +1148,12 @@ RectTransform: m_Children: - {fileID: 622178818} m_Father: {fileID: 2140469183} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -107} - m_SizeDelta: {x: 337.9086, y: 144.69672} + m_AnchoredPosition: {x: 0, y: -81} + m_SizeDelta: {x: 240.65524, y: 116.64508} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1967191112 MonoBehaviour: @@ -1130,9 +1363,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1312122616} - {fileID: 1228641980} - {fileID: 1967191111} - {fileID: 403475997} + - {fileID: 684748717} + - {fileID: 821853655} m_Father: {fileID: 1367871826} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset b/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset index c8801121e6..b56bb935b0 100644 --- a/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset +++ b/UOP1_Project/Assets/Settings/Graphics/PostProcessing.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fb60a22f311433c4c962b888d1393f88, type: 3} m_Name: PaniniProjection m_EditorClassIdentifier: - active: 1 + active: 0 m_AdvancedMode: 0 distance: m_OverrideState: 0 diff --git a/UOP1_Project/ProjectSettings/ProjectSettings.asset b/UOP1_Project/ProjectSettings/ProjectSettings.asset index a101c7822f..8118b222b3 100644 --- a/UOP1_Project/ProjectSettings/ProjectSettings.asset +++ b/UOP1_Project/ProjectSettings/ProjectSettings.asset @@ -124,7 +124,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.6.5 + bundleVersion: 0.6 preloadedAssets: - {fileID: 11400000, guid: 56b1c58ec65bd4151b3054a32d1f7b69, type: 2} - {fileID: 11400000, guid: bf2387135d5fdc745b74293cd27573be, type: 2} @@ -169,7 +169,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.openprojects.chopchop buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19