diff --git a/Assets/Prefabs/Remade/Player.prefab b/Assets/Prefabs/Remade/Player.prefab
index b598d03e375ccadc46eb8672f8eacf6d185633b2..6d0781c71ed27de2760a371c0198a838a8850755 100644
--- a/Assets/Prefabs/Remade/Player.prefab
+++ b/Assets/Prefabs/Remade/Player.prefab
@@ -47,12 +47,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
petHolder: {fileID: 6735500062188917040}
- attackerPet: {fileID: 2066896392038628118, guid: 45288819fde2143449a96207b14db0bb,
- type: 3}
- healerPet: {fileID: 7962199819078159310, guid: f5b41ba4c79702547a89de7544b80656,
- type: 3}
+ attackerPet: {fileID: 2066896392038628118, guid: 45288819fde2143449a96207b14db0bb, type: 3}
+ healerPet: {fileID: 7962199819078159310, guid: f5b41ba4c79702547a89de7544b80656, type: 3}
playerHealthBar: {fileID: 1180116790224663537}
- PlayerDamageMultiplier: 1
moneyText: {fileID: 503189934647566338}
--- !u!1 &6735500062188917040
GameObject:
@@ -185,220 +182,285 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3528797143268262310}
m_Modifications:
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0.28490838
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.y
value: 0.26030847
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.z
value: -0.2040963
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.w
value: 0.54653007
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0.44867012
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.y
value: 0.44867012
objectReference: {fileID: 0}
- - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 36264438682269296, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.z
value: -0.54653007
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalScale.x
value: 1.0000002
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalScale.y
value: 1.0000001
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalScale.z
value: 0.99999994
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0.28490835
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.y
value: 0.29675734
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.z
value: 0.71900976
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.w
value: 0.99999976
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0.000680983
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 98786163477110611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Name
value: PlayerOnly
objectReference: {fileID: 0}
- - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- - target: {fileID: 654831133468963024, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 654831133468963024, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- - target: {fileID: 2730502394878472363, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 683366663213182591, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_text
+ value: Resume
+ objectReference: {fileID: 0}
+ - target: {fileID: 1184394878855665310, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 300
+ objectReference: {fileID: 0}
+ - target: {fileID: 1184394878855665310, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 2730502394878472363, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: pet
value:
objectReference: {fileID: 6735500062188917040}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5199068981011680826, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 4197906147239743610, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4197906147239743610, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_RaycastTarget
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4324774289170128062, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 300
+ objectReference: {fileID: 0}
+ - target: {fileID: 4324774289170128062, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 4324774289170128062, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4324774289170128062, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -104
+ objectReference: {fileID: 0}
+ - target: {fileID: 4718989372654413746, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_PixelPerfect
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5199068981011680826, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: cam
value:
objectReference: {fileID: 2655782024098641860}
- - target: {fileID: 5221818475442144211, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 5221818475442144211, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- - target: {fileID: 6777054798498412344, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 6005174201783565744, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_text
+ value: Menu
+ objectReference: {fileID: 0}
+ - target: {fileID: 6371270035543988116, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6777054798498412344, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- - target: {fileID: 6789490923025519971, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 6789490923025519971, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: pet
value:
objectReference: {fileID: 6735500062188917040}
- - target: {fileID: 8220678057462411611, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 6823473636177663423, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_AdditionalShaderChannelsFlag
+ value: 25
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: GoMainMenu
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: PauseMenu, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163897116236510543, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: Resume
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: PauseMenu, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 8031408168724732059, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 8220678057462411611, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: detectionRadius
value: 3
objectReference: {fileID: 0}
- - target: {fileID: 8562903885280076162, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 8562903885280076162, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- - target: {fileID: 9032440141398077137, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ - target: {fileID: 9032440141398077137, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: [{targetCorrespondingSourceObject: {fileID: 485291430551970356,
- guid: 6c587863919ddff47af95bf69fb745e7, type: 3}, insertIndex: -1, addedObject: {
- fileID: 1773952223658756717}}, {targetCorrespondingSourceObject: {fileID: 8108030255640556251,
- guid: 6c587863919ddff47af95bf69fb745e7, type: 3}, insertIndex: -1, addedObject: {
- fileID: 5175415042080551787}}, {targetCorrespondingSourceObject: {fileID: 8108030255640556251,
- guid: 6c587863919ddff47af95bf69fb745e7, type: 3}, insertIndex: -1, addedObject: {
- fileID: 3274102282676047340}}, {targetCorrespondingSourceObject: {fileID: 8108030255640556251,
- guid: 6c587863919ddff47af95bf69fb745e7, type: 3}, insertIndex: -1, addedObject: {
- fileID: 870563040337772923}}, {targetCorrespondingSourceObject: {fileID: 2009214424677868068,
- guid: 6c587863919ddff47af95bf69fb745e7, type: 3}, insertIndex: -1, addedObject: {
- fileID: 6287766086597155352}}]
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1773952223658756717}
+ - targetCorrespondingSourceObject: {fileID: 8108030255640556251, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 5175415042080551787}
+ - targetCorrespondingSourceObject: {fileID: 8108030255640556251, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 3274102282676047340}
+ - targetCorrespondingSourceObject: {fileID: 8108030255640556251, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 870563040337772923}
+ - targetCorrespondingSourceObject: {fileID: 2009214424677868068, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6287766086597155352}
m_SourcePrefab: {fileID: 100100000, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
--- !u!1 &164200279073756352 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: 8108030255640556251, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 8108030255640556251, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5175415042080551787
@@ -448,8 +510,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!114 &503189934647566338 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 8374840790909535769, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 8374840790909535769, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
@@ -460,8 +521,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!114 &1180116790224663537 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 7107318136494724586, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 7107318136494724586, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
@@ -472,20 +532,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!20 &2655782024098641860 stripped
Camera:
- m_CorrespondingSourceObject: {fileID: 6204238904810361311, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 6204238904810361311, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5099292473857766837 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 3748836277134840750, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7575318560065897535 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: 2009214424677868068, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 2009214424677868068, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6287766086597155352
@@ -502,8 +559,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!1 &8394358117905876015 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7,
- type: 3}
+ m_CorrespondingSourceObject: {fileID: 485291430551970356, guid: 6c587863919ddff47af95bf69fb745e7, type: 3}
m_PrefabInstance: {fileID: 8269411316769564187}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1773952223658756717
@@ -518,6 +574,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d763082dc6a367e4a9142bbf20c7ea27, type: 3}
m_Name:
m_EditorClassIdentifier:
+ currentLevel: 0
finalFloorMask:
serializedVersion: 2
m_Bits: 16384
diff --git a/Assets/Prefabs/Remade/PlayerOnly.prefab b/Assets/Prefabs/Remade/PlayerOnly.prefab
index bd846170ec2b20707ccf577ae9d39ce7d72ec8c1..fd48fdb763a06c0930217eee0392aaffbb365973 100644
--- a/Assets/Prefabs/Remade/PlayerOnly.prefab
+++ b/Assets/Prefabs/Remade/PlayerOnly.prefab
@@ -285,6 +285,7 @@ Transform:
- {fileID: 7014406395356473534}
- {fileID: 3543994217590038854}
- {fileID: 8635981581514573622}
+ - {fileID: 2983961142822076081}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4408411453207511439
@@ -6033,6 +6034,139 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &4050356864147485511
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1184394878855665310}
+ - component: {fileID: 7910844190688225621}
+ - component: {fileID: 3272112369211444424}
+ - component: {fileID: 2510480669219009616}
+ m_Layer: 5
+ m_Name: Resume
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1184394878855665310
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4050356864147485511}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 8421589660151099346}
+ m_Father: {fileID: 3124404252743134456}
+ 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: 171}
+ m_SizeDelta: {x: 250, y: 75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7910844190688225621
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4050356864147485511}
+ m_CullTransparentMesh: 1
+--- !u!114 &3272112369211444424
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4050356864147485511}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2510480669219009616
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4050356864147485511}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 0
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.49019608}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3272112369211444424}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 8455172808478617692}
+ m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp
+ m_MethodName: Resume
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &4122027998703978718
GameObject:
m_ObjectHideFlags: 0
@@ -6088,6 +6222,156 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &4305296552825878751
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7307220260447197576}
+ - component: {fileID: 5720152363104381431}
+ - component: {fileID: 6452788018242721891}
+ - component: {fileID: 8754677578459610902}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7307220260447197576
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4305296552825878751}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 852161136187793187}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5720152363104381431
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4305296552825878751}
+ m_CullTransparentMesh: 1
+--- !u!114 &6452788018242721891
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4305296552825878751}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Menu
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 65
+ m_fontSizeBase: 65
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &8754677578459610902
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4305296552825878751}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 4, y: -4}
+ m_UseGraphicAlpha: 1
--- !u!1 &4630269180991343427
GameObject:
m_ObjectHideFlags: 0
@@ -6248,6 +6532,74 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5163293357362142108
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2983961142822076081}
+ - component: {fileID: 9203244128320004374}
+ - component: {fileID: 8789176102722476897}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2983961142822076081
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5163293357362142108}
+ serializedVersion: 2
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 3748836277134840750}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9203244128320004374
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5163293357362142108}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!114 &8789176102722476897
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5163293357362142108}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_SendPointerHoverToParent: 1
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
--- !u!1 &5221818475442144211
GameObject:
m_ObjectHideFlags: 0
@@ -6260,6 +6612,7 @@ GameObject:
- component: {fileID: 4718989372654413746}
- component: {fileID: 4131136674687600961}
- component: {fileID: 6177965215442350803}
+ - component: {fileID: 8455172808478617692}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -6279,6 +6632,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 3124404252743134456}
- {fileID: 8903848162434992305}
- {fileID: 8013147257140510849}
- {fileID: 7098608066402843613}
@@ -6355,6 +6709,19 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!114 &8455172808478617692
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5221818475442144211}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cdd9ce2089c76c946bfc26a603459b31, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ pauseMenuUI: {fileID: 6371270035543988116}
--- !u!1 &5324015937506807735
GameObject:
m_ObjectHideFlags: 0
@@ -6449,6 +6816,139 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
+--- !u!1 &5526412859604619189
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 852161136187793187}
+ - component: {fileID: 1672830889459481696}
+ - component: {fileID: 2858498976627595965}
+ - component: {fileID: 3682464867270639414}
+ m_Layer: 5
+ m_Name: Menu
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &852161136187793187
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5526412859604619189}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 7307220260447197576}
+ m_Father: {fileID: 3124404252743134456}
+ 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: 69}
+ m_SizeDelta: {x: 250, y: 75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1672830889459481696
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5526412859604619189}
+ m_CullTransparentMesh: 1
+--- !u!114 &2858498976627595965
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5526412859604619189}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3682464867270639414
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5526412859604619189}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 0
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.49019608}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 2858498976627595965}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 8455172808478617692}
+ m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp
+ m_MethodName: GoMainMenu
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &6226563083460354548
GameObject:
m_ObjectHideFlags: 0
@@ -6631,6 +7131,83 @@ MonoBehaviour:
_healScaleAmount: 1.3
_adaptiveHealScaleAmount: {x: 1.2, y: 1}
_adaptiveHealScaleThreshold: 0.5
+--- !u!1 &6371270035543988116
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3124404252743134456}
+ - component: {fileID: 3563076508853381817}
+ - component: {fileID: 4197906147239743610}
+ m_Layer: 5
+ m_Name: PauseMenu
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3124404252743134456
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6371270035543988116}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1184394878855665310}
+ - {fileID: 852161136187793187}
+ m_Father: {fileID: 8635981581514573622}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.012675699}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -3}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3563076508853381817
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6371270035543988116}
+ m_CullTransparentMesh: 1
+--- !u!114 &4197906147239743610
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6371270035543988116}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 0.392}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &6440904379435734962
GameObject:
m_ObjectHideFlags: 0
@@ -12277,6 +12854,156 @@ Transform:
- {fileID: 6366016551747214711}
m_Father: {fileID: 2716465554490727732}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8236188219628353473
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8421589660151099346}
+ - component: {fileID: 4448672162248337867}
+ - component: {fileID: 9174403010500501737}
+ - component: {fileID: 6718376738227853148}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8421589660151099346
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8236188219628353473}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1184394878855665310}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4448672162248337867
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8236188219628353473}
+ m_CullTransparentMesh: 1
+--- !u!114 &9174403010500501737
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8236188219628353473}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Resume
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 65
+ m_fontSizeBase: 65
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &6718376738227853148
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8236188219628353473}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 4, y: -4}
+ m_UseGraphicAlpha: 1
--- !u!1 &8562903885280076162
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Menu/PauseMenu.cs b/Assets/Scripts/Menu/PauseMenu.cs
index 7a25838ebe6c9a090a80321cd6a2b2ca0e729bd7..7fb1c9bad8d1ac3d8cf23fe154d542328b516e23 100644
--- a/Assets/Scripts/Menu/PauseMenu.cs
+++ b/Assets/Scripts/Menu/PauseMenu.cs
@@ -1,11 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.SceneManagement;
public class PauseMenu : MonoBehaviour
{
- // Start is called before the first frame update
public static bool GameIsPaused = false;
+
public GameObject pauseMenuUI;
// Update is called once per frame
void Update()
@@ -14,6 +15,7 @@ public class PauseMenu : MonoBehaviour
{
if (GameIsPaused)
{
+
Resume();
}
else
@@ -27,6 +29,8 @@ public class PauseMenu : MonoBehaviour
pauseMenuUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
+
+
}
public void Resume()
{
@@ -34,4 +38,10 @@ public class PauseMenu : MonoBehaviour
Time.timeScale = 1f;
GameIsPaused = false;
}
+
+ public void GoMainMenu()
+ {
+ Resume();
+ SceneManager.LoadSceneAsync(0);
+ }
}
\ No newline at end of file