diff --git a/Assets/Audio/Effects/Player Shotgun.wav b/Assets/Audio/Effects/Player Shotgun.wav new file mode 100644 index 0000000000000000000000000000000000000000..c970e149b279ab382838061d51cd514f9a35319a --- /dev/null +++ b/Assets/Audio/Effects/Player Shotgun.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24cf272760716eaf15f007bd76ed6c4110ace4f8667f415c288aded55a52c7ac +size 479310 diff --git a/Assets/Audio/Effects/Player Shotgun.wav.meta b/Assets/Audio/Effects/Player Shotgun.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..631e35bbcc24563877190b204e144e51ab140b98 --- /dev/null +++ b/Assets/Audio/Effects/Player Shotgun.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ba7220d25e509f9409ceacf04b5962e2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/PlayerData.json b/Assets/Data/PlayerData.json new file mode 100644 index 0000000000000000000000000000000000000000..4eae87edf5f206b6cd16246912294b622d20d41d --- /dev/null +++ b/Assets/Data/PlayerData.json @@ -0,0 +1,5 @@ +{ + "lastScene": "", + "coins": 0, + "time": 0 +} \ No newline at end of file diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Data/PlayerData.json.meta similarity index 62% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Data/PlayerData.json.meta index 952bd1e9e110583d94b471a30ff4ddd69f4aee7d..eafb3f345bf3827c0a3bf2874874b93be89ef721 100644 --- a/Assets/Scenes/SampleScene.unity.meta +++ b/Assets/Data/PlayerData.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 9fc0d4010bbf28b4594072e72b8655ab -DefaultImporter: +guid: 46bb6ec795c53e6459a49566d21b1268 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Data/ScoreData.json b/Assets/Data/ScoreData.json index 9b06b428b43fc620748dfee8d98134aea254aaf8..8a6aa6b9ca0b259d123aa7c14590e77fd3c19822 100644 --- a/Assets/Data/ScoreData.json +++ b/Assets/Data/ScoreData.json @@ -3,38 +3,6 @@ { "name": "eran", "score": 0.0 - }, - { - "name": "eran", - "score": 1.0 - }, - { - "name": "Kaka", - "score": 7.586194038391113 - }, - { - "name": "eran", - "score": 0.0 - }, - { - "name": "eran", - "score": 1.0 - }, - { - "name": "Kaka", - "score": 6.828142166137695 - }, - { - "name": "", - "score": 11.110514640808106 - }, - { - "name": "", - "score": 14.24360466003418 - }, - { - "name": "", - "score": 20.78191375732422 } ] } \ No newline at end of file diff --git a/Assets/HUDManager.cs b/Assets/HUDManager.cs index d73f88fb22236f3c1b1ab744f9716f71e4782c7a..fdd8daf8c03215d27973fd82fdd6ab9239c4c952 100644 --- a/Assets/HUDManager.cs +++ b/Assets/HUDManager.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using TMPro; +using System.Threading.Tasks; public class HUDManager : MonoBehaviour { @@ -16,7 +17,9 @@ public class HUDManager : MonoBehaviour // Weapons [Header("Weapons")] - public GameObject weaponsUIActivate; + public GameObject weaponsUI; + public GameObject weaponsUIHighlight; + public GameObject weaponsUISlot; // Alert Banner [Header("Alert Banner")] @@ -38,7 +41,7 @@ public class HUDManager : MonoBehaviour // Opening Shop float distanceToShop = Vector3.Distance(playerLocation.position, shopLocation.position); - if (Input.GetKeyDown(KeyCode.T)) + if (Input.GetKeyDown(KeyCode.T) && !GameManager.gameManager.isShopping) { if (!GameManager.gameManager.isShopOpen) { @@ -50,12 +53,14 @@ public class HUDManager : MonoBehaviour } else { - shopUI.SetActive(true); + shopUI.SetActive(true); + GameManager.gameManager.isShopping = true; } } - else if (Input.GetKeyDown(KeyCode.Escape)) + else if (Input.GetKeyDown(KeyCode.T) && GameManager.gameManager.isShopping) { shopUI.SetActive(false); + GameManager.gameManager.isShopping = false; } } @@ -92,12 +97,10 @@ public class HUDManager : MonoBehaviour { for (int i = 0; i < 4; i++) { - weaponsUIActivate.transform.GetChild(i).gameObject.SetActive(false); + weaponsUIHighlight.transform.GetChild(i).gameObject.SetActive(false); } - GameObject slot = weaponsUIActivate.transform.GetChild(weaponSlot - 1).gameObject; + GameObject slot = weaponsUIHighlight.transform.GetChild(weaponSlot - 1).gameObject; slot.SetActive(true); - - Debug.Log(slot); } } diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity index 15a0bb7d073cbdd0e34c73239e36dd6fff129775..c380af14176e2e41e74bcf279e1f938699b234c8 100644 --- a/Assets/Scenes/GameOver.unity +++ b/Assets/Scenes/GameOver.unity @@ -1204,6 +1204,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 17a5add5b2e834a49bd2b43d9eebdbb4, type: 3} m_Name: m_EditorClassIdentifier: + sm: {fileID: 1816505441} + pdm: {fileID: 1847480616} delaySeconds: 5 --- !u!1 &1733735781 GameObject: @@ -1340,6 +1342,94 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733735781} m_CullTransparentMesh: 0 +--- !u!1 &1816505438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1816505440} + - component: {fileID: 1816505441} + m_Layer: 0 + m_Name: ScoreboardManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1816505440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816505438} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1816505441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816505438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53663303832de9b428f87768d4dff739, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1847480615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1847480617} + - component: {fileID: 1847480616} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1847480616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1847480615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1847480617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1847480615} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2071701248 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index db983ca3df2aa63cae5515f8fa9fa255f393fb05..18b914bd8c4277450ca9613c8490ab76af477a49 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -1371,6 +1371,158 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &325992047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 325992048} + - component: {fileID: 325992050} + - component: {fileID: 325992049} + m_Layer: 5 + m_Name: bow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &325992048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325992047} + 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: 788122804} + 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: 66.9, y: 0.00000023838} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &325992049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325992047} + 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.9056604, g: 0.9056604, b: 0.9056604, 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: 21300000, guid: 3a55eed04c685ec45b9e512f36558af0, type: 3} + m_Type: 0 + 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!222 &325992050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325992047} + m_CullTransparentMesh: 1 +--- !u!1 &466961565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 466961566} + - component: {fileID: 466961568} + - component: {fileID: 466961567} + m_Layer: 5 + m_Name: shotgun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &466961566 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466961565} + 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: 840802841} + m_RootOrder: 1 + 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: -22, y: -0.000017764} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &466961567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466961565} + 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.50980395, b: 1, a: 0.19607843} + 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: 0 + 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!222 &466961568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466961565} + m_CullTransparentMesh: 1 --- !u!1 &491809534 GameObject: m_ObjectHideFlags: 0 @@ -1474,6 +1626,7 @@ RectTransform: - {fileID: 1314518863} - {fileID: 1764071969} - {fileID: 1677828216} + - {fileID: 848333706} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1499,7 +1652,9 @@ MonoBehaviour: shopLocation: {fileID: 1084676478} playerLocation: {fileID: 1186615826} shopRadius: 10 - weaponsUIActivate: {fileID: 0} + weaponsUI: {fileID: 848333705} + weaponsUIHighlight: {fileID: 840802840} + weaponsUISlot: {fileID: 788122803} alertBanner: {fileID: 1314518862} alertText: {fileID: 679650416} fadeTime: 0.5 @@ -1696,6 +1851,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3} +--- !u!1 &559820991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 559820992} + - component: {fileID: 559820994} + - component: {fileID: 559820993} + m_Layer: 5 + m_Name: sword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &559820992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559820991} + 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: 840802841} + 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: 22.7, y: -2.1828e-11} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &559820993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559820991} + 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.50980395, b: 1, a: 0.19607843} + 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: 0 + 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!222 &559820994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559820991} + m_CullTransparentMesh: 1 --- !u!1 &649544087 GameObject: m_ObjectHideFlags: 0 @@ -2042,7 +2273,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 679650414} m_CullTransparentMesh: 1 ---- !u!1 &685640438 +--- !u!1 &713532686 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2050,43 +2281,182 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 685640440} - - component: {fileID: 685640439} + - component: {fileID: 713532687} m_Layer: 0 - m_Name: ScoreboardManager + m_Name: ZombearSpawnPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &685640439 +--- !u!4 &713532687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713532686} + m_LocalRotation: {x: 0, y: 0.8660254, z: -0, w: -0.5} + m_LocalPosition: {x: 22.5, y: 0, z: 15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0} +--- !u!1 &718259586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 718259587} + - component: {fileID: 718259589} + - component: {fileID: 718259588} + m_Layer: 5 + m_Name: CoinImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &718259587 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718259586} + 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: 33760921} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 42, y: 32} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &718259588 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} + m_GameObject: {fileID: 718259586} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53663303832de9b428f87768d4dff739, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &685640440 -Transform: + 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_Sprite: {fileID: 21300000, guid: 49b953915f907b84b85274cc0dc98a03, type: 3} + m_Type: 0 + 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!222 &718259589 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 435.5, y: 245, z: 0} + m_GameObject: {fileID: 718259586} + m_CullTransparentMesh: 1 +--- !u!1 &727561009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 727561010} + - component: {fileID: 727561012} + - component: {fileID: 727561011} + m_Layer: 5 + m_Name: CompleteMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &727561010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + 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: 0} - m_RootOrder: 15 + m_Father: {fileID: 1059770570} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &713532686 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -50, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &727561011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + 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} + 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!222 &727561012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + m_CullTransparentMesh: 1 +--- !u!1 &734232482 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2094,30 +2464,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 713532687} + - component: {fileID: 734232484} + - component: {fileID: 734232483} m_Layer: 0 - m_Name: ZombearSpawnPoint + m_Name: PetManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &713532687 +--- !u!114 &734232483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 734232482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7177e5ffcfe1046816ee077fa7e8c2, type: 3} + m_Name: + m_EditorClassIdentifier: + petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} + petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} + petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} + PlayerTransform: {fileID: 1186615826} +--- !u!4 &734232484 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713532686} - m_LocalRotation: {x: 0, y: 0.8660254, z: -0, w: -0.5} - m_LocalPosition: {x: 22.5, y: 0, z: 15} + m_GameObject: {fileID: 734232482} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.52918, y: 13.251007, z: -23.013973} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0} ---- !u!1 &718259586 + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &774339252 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2125,57 +2512,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 718259587} - - component: {fileID: 718259589} - - component: {fileID: 718259588} + - component: {fileID: 774339253} + - component: {fileID: 774339255} + - component: {fileID: 774339254} m_Layer: 5 - m_Name: CoinImage + m_Name: basic m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &718259587 + m_IsActive: 0 +--- !u!224 &774339253 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718259586} + m_GameObject: {fileID: 774339252} 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: 33760921} - m_RootOrder: 1 + m_Father: {fileID: 840802841} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 42, y: 32} - m_SizeDelta: {x: 32, y: 32} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -66.1, y: -0.000017764} + m_SizeDelta: {x: 40.619, y: 31.7718} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &718259588 +--- !u!114 &774339254 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718259586} + m_GameObject: {fileID: 774339252} 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: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0.50980395, b: 1, a: 0.19607843} 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: 21300000, guid: 49b953915f907b84b85274cc0dc98a03, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2185,15 +2572,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &718259589 +--- !u!222 &774339255 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718259586} + m_GameObject: {fileID: 774339252} m_CullTransparentMesh: 1 ---- !u!1 &727561009 +--- !u!1 &788122803 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2201,57 +2588,61 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 727561010} - - component: {fileID: 727561012} - - component: {fileID: 727561011} + - component: {fileID: 788122804} + - component: {fileID: 788122806} + - component: {fileID: 788122805} m_Layer: 5 - m_Name: CompleteMark + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &727561010 +--- !u!224 &788122804 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727561009} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 788122803} + 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: 1059770570} - m_RootOrder: 3 + m_Children: + - {fileID: 1275465243} + - {fileID: 1647137917} + - {fileID: 1922878700} + - {fileID: 325992048} + m_Father: {fileID: 848333706} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 50} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0000076293945, y: -237} + m_SizeDelta: {x: 181.6337, y: 34.6865} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &727561011 +--- !u!114 &788122805 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727561009} + m_GameObject: {fileID: 788122803} 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} + 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_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2261,13 +2652,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &727561012 +--- !u!222 &788122806 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727561009} + m_GameObject: {fileID: 788122803} m_CullTransparentMesh: 1 --- !u!1 &819070687 GameObject: @@ -2391,6 +2782,94 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &840802840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 840802841} + - component: {fileID: 840802842} + m_Layer: 5 + m_Name: highlight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &840802841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840802840} + 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: 774339253} + - {fileID: 466961566} + - {fileID: 559820992} + - {fileID: 1329226644} + m_Father: {fileID: 848333706} + 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: -237} + m_SizeDelta: {x: 181.6337, y: 34.6865} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &840802842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840802840} + m_CullTransparentMesh: 1 +--- !u!1 &848333705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 848333706} + m_Layer: 5 + m_Name: WeaponsUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &848333706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 848333705} + 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: 982955540} + - {fileID: 788122804} + - {fileID: 840802841} + m_Father: {fileID: 491809538} + m_RootOrder: 10 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &880479554 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} @@ -2410,6 +2889,11 @@ MonoBehaviour: m_EditorClassIdentifier: gunMode: 1 damagePerShot: 30 + gunAudioSrc: + - {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3} + - {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3} + - {fileID: 0} + - {fileID: 0} --- !u!82 &880479557 AudioSource: m_ObjectHideFlags: 0 @@ -2612,6 +3096,14 @@ LineRenderer: m_Positions: - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 1} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -7654,6 +8146,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971458635} m_CullTransparentMesh: 1 +--- !u!1 &982955539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982955540} + - component: {fileID: 982955542} + - component: {fileID: 982955541} + m_Layer: 5 + m_Name: border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &982955540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982955539} + 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: 848333706} + m_RootOrder: 0 + 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: -237} + m_SizeDelta: {x: 184.8063, y: 38.3369} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &982955541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982955539} + 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: 0} + m_Type: 0 + 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!222 &982955542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982955539} + m_CullTransparentMesh: 1 --- !u!1 &999659690 GameObject: m_ObjectHideFlags: 0 @@ -7923,6 +8491,7 @@ MonoBehaviour: zombunnyBounty: 5 zombearBounty: 10 hellephantBounty: 15 + isQuestsComplete: 0 --- !u!1 &1059770567 GameObject: m_ObjectHideFlags: 0 @@ -8367,15 +8936,91 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1244782546} - m_LocalRotation: {x: 0, y: 0.9063079, z: -0, w: -0.42261827} - m_LocalPosition: {x: 0, y: 0, z: 32} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0} + m_GameObject: {fileID: 1244782546} + m_LocalRotation: {x: 0, y: 0.9063079, z: -0, w: -0.42261827} + m_LocalPosition: {x: 0, y: 0, z: 32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0} +--- !u!1 &1275465242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275465243} + - component: {fileID: 1275465245} + - component: {fileID: 1275465244} + m_Layer: 5 + m_Name: basic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275465243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275465242} + 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: 788122804} + m_RootOrder: 0 + 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: -66.1, y: -0.000017764} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1275465244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275465242} + 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.9056604, g: 0.9056604, b: 0.9056604, 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: 21300000, guid: 3a55eed04c685ec45b9e512f36558af0, type: 3} + m_Type: 0 + 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!222 &1275465245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275465242} + m_CullTransparentMesh: 1 --- !u!1 &1289363566 GameObject: m_ObjectHideFlags: 0 @@ -8506,7 +9151,7 @@ RectTransform: 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: -239} + m_AnchoredPosition: {x: 0, y: 128} m_SizeDelta: {x: 292.7638, y: 69.6776} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &1314518864 @@ -8521,6 +9166,82 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &1329226643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1329226644} + - component: {fileID: 1329226646} + - component: {fileID: 1329226645} + m_Layer: 5 + m_Name: bow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1329226644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329226643} + 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: 840802841} + 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: 66.9, y: 0.00000023838} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1329226645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329226643} + 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.50980395, b: 1, a: 0.19607843} + 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: 0 + 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!222 &1329226646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329226643} + m_CullTransparentMesh: 1 --- !u!1 &1444128283 GameObject: m_ObjectHideFlags: 0 @@ -8604,7 +9325,7 @@ RectTransform: m_GameObject: {fileID: 1446248591} 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_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 33760921} @@ -8654,6 +9375,50 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1546708124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1546708126} + - component: {fileID: 1546708125} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1546708125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546708124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1546708126 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546708124} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1558343256 GameObject: m_ObjectHideFlags: 0 @@ -9237,7 +10002,6 @@ GameObject: - component: {fileID: 1644740157} - component: {fileID: 1644740159} - component: {fileID: 1644740160} - - component: {fileID: 1644740161} - component: {fileID: 1644740162} m_Layer: 0 m_Name: GameManager @@ -9291,11 +10055,13 @@ MonoBehaviour: buffType: buffAmount: 0 price: 0 + filename: isPetAlive: 1 isShopOpen: 0 - sm: {fileID: 0} + isShopping: 0 + petFactory: {fileID: 734232483} currentWeapon: 0 - hudManager: {fileID: 0} + hudManager: {fileID: 491809539} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9309,7 +10075,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: pauseMenu: {fileID: 1764071968} ---- !u!114 &1644740161 +--- !u!114 &1644740162 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9318,25 +10084,86 @@ MonoBehaviour: m_GameObject: {fileID: 1644740156} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c7177e5ffcfe1046816ee077fa7e8c2, type: 3} + m_Script: {fileID: 11500000, guid: 4db6dc94542ef8c4d9df445759b9df3c, type: 3} m_Name: m_EditorClassIdentifier: - petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} - petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} - petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} ---- !u!114 &1644740162 + questMenu: {fileID: 1677828215} +--- !u!1 &1647137916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1647137917} + - component: {fileID: 1647137919} + - component: {fileID: 1647137918} + m_Layer: 5 + m_Name: shotgun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1647137917 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647137916} + 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: 788122804} + m_RootOrder: 1 + 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: -22, y: -0.000017764} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1647137918 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644740156} + m_GameObject: {fileID: 1647137916} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4db6dc94542ef8c4d9df445759b9df3c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - questMenu: {fileID: 1677828215} + m_Material: {fileID: 0} + m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, 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: 21300000, guid: 3a55eed04c685ec45b9e512f36558af0, type: 3} + m_Type: 0 + 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!222 &1647137919 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1647137916} + m_CullTransparentMesh: 1 --- !u!1 &1677828215 GameObject: m_ObjectHideFlags: 0 @@ -9354,7 +10181,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1677828216 RectTransform: m_ObjectHideFlags: 0 @@ -9740,7 +10567,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1764071969 RectTransform: m_ObjectHideFlags: 0 @@ -10301,6 +11128,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871075321} m_CullTransparentMesh: 1 +--- !u!1 &1922878699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1922878700} + - component: {fileID: 1922878702} + - component: {fileID: 1922878701} + m_Layer: 5 + m_Name: sword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1922878700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922878699} + 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: 788122804} + 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: 22.7, y: -2.1828e-11} + m_SizeDelta: {x: 40.619, y: 31.7718} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1922878701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922878699} + 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.9056604, g: 0.9056604, b: 0.9056604, 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: 21300000, guid: 3a55eed04c685ec45b9e512f36558af0, type: 3} + m_Type: 0 + 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!222 &1922878702 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1922878699} + m_CullTransparentMesh: 1 --- !u!1 &2023977043 GameObject: m_ObjectHideFlags: 0 @@ -10414,7 +11317,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7.629395, y: -70.3} + m_AnchoredPosition: {x: -1, y: -70.3} m_SizeDelta: {x: 295.5, y: 73.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2030411492 diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity index 2116254f3a8625bc8b6eb1a9e6235feee94f92c7..49b45848243d9279d89390c0ddfe77b2910aece3 100644 --- a/Assets/Scenes/Level_02.unity +++ b/Assets/Scenes/Level_02.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -156,7 +156,7 @@ RectTransform: - {fileID: 678136762} - {fileID: 718259587} - {fileID: 135547607} - - {fileID: 1778112281} + - {fileID: 1105238066} m_Father: {fileID: 1446248592} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -216,7 +216,7 @@ GameObject: - component: {fileID: 36682394} - component: {fileID: 36682393} m_Layer: 5 - m_Name: AcceptButtonQ2 + m_Name: AcceptButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -235,13 +235,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 971458636} - m_Father: {fileID: 1059770570} - m_RootOrder: 3 + m_Father: {fileID: 1677828216} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 32} - m_SizeDelta: {x: 60, y: 32} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 100, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &36682393 MonoBehaviour: @@ -325,10 +325,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1036960979} - m_TargetAssemblyTypeName: QuestManager, Assembly-CSharp - m_MethodName: AcceptQuest - m_Mode: 3 + - m_Target: {fileID: 1644740162} + m_TargetAssemblyTypeName: QuestMenu, Assembly-CSharp + m_MethodName: ResumeGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -337,54 +337,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 36682393} - m_TargetAssemblyTypeName: UnityEngine.UI.Image, UnityEngine.UI - m_MethodName: set_overrideSprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1778112283} - m_TargetAssemblyTypeName: UnityEngine.UI.Image, UnityEngine.UI - m_MethodName: set_overrideSprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 971458637} - m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro - m_MethodName: set_text - m_Mode: 5 - 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 - - m_Target: {fileID: 1433674668} - m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro - m_MethodName: set_text - m_Mode: 5 - 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 &56306803 GameObject: m_ObjectHideFlags: 0 @@ -1547,7 +1499,9 @@ MonoBehaviour: shopLocation: {fileID: 1084676478} playerLocation: {fileID: 1186615826} shopRadius: 10 - weaponsUIActivate: {fileID: 0} + weaponsUI: {fileID: 0} + weaponsUIHighlight: {fileID: 0} + weaponsUISlot: {fileID: 0} alertBanner: {fileID: 1314518862} alertText: {fileID: 679650416} fadeTime: 0.5 @@ -1744,6 +1698,98 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3} +--- !u!1 &607211380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607211382} + - component: {fileID: 607211381} + m_Layer: 0 + m_Name: PetManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &607211381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607211380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7177e5ffcfe1046816ee077fa7e8c2, type: 3} + m_Name: + m_EditorClassIdentifier: + petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} + petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} + petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} + PlayerTransform: {fileID: 0} +--- !u!4 &607211382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607211380} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.52918, y: 13.251007, z: -23.013973} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &630617448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630617450} + - component: {fileID: 630617449} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &630617449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630617448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &630617450 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630617448} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &649544087 GameObject: m_ObjectHideFlags: 0 @@ -2090,50 +2136,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 679650414} m_CullTransparentMesh: 1 ---- !u!1 &685640438 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 685640440} - - component: {fileID: 685640439} - m_Layer: 0 - m_Name: ScoreboardManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &685640439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53663303832de9b428f87768d4dff739, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &685640440 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 435.5, y: 245, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &713532686 GameObject: m_ObjectHideFlags: 0 @@ -2241,6 +2243,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 718259586} m_CullTransparentMesh: 1 +--- !u!1 &727561009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 727561010} + - component: {fileID: 727561012} + - component: {fileID: 727561011} + m_Layer: 5 + m_Name: CompleteMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &727561010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + 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: 1059770570} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -50, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &727561011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + 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} + 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!222 &727561012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727561009} + m_CullTransparentMesh: 1 --- !u!1 &819070687 GameObject: m_ObjectHideFlags: 0 @@ -7503,7 +7581,7 @@ GameObject: - component: {fileID: 971458638} - component: {fileID: 971458637} m_Layer: 5 - m_Name: TextQ2 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7549,7 +7627,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Accept + m_text: OK m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 91906345d5ae42a4ca879c3f6c4b65fb, type: 2} m_sharedMaterial: {fileID: -2196506104538577691, guid: 91906345d5ae42a4ca879c3f6c4b65fb, type: 2} @@ -7576,8 +7654,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7867,7 +7945,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1036960979 MonoBehaviour: @@ -7887,15 +7965,15 @@ MonoBehaviour: quests: - title: questReward: 0 + isCompleted: 0 - title: questReward: 0 + isCompleted: 0 enemyModifier: 1 - zombunnyBounty: 5 - zombearBounty: 10 - hellephantBounty: 15 - ActiveQuest: - title: - questReward: 0 + zombunnyBounty: 10 + zombearBounty: 20 + hellephantBounty: 20 + isQuestsComplete: 0 --- !u!1 &1059770567 GameObject: m_ObjectHideFlags: 0 @@ -7967,13 +8045,13 @@ RectTransform: - {fileID: 529128669} - {fileID: 2023977044} - {fileID: 291907153} - - {fileID: 36682392} + - {fileID: 727561010} m_Father: {fileID: 1446248592} m_RootOrder: 1 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: -6, y: -100} + m_AnchoredPosition: {x: -6, y: -84} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1084676474 @@ -8074,34 +8152,110 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1186615820 stripped +--- !u!1 &1105238065 GameObject: - m_CorrespondingSourceObject: {fileID: 100078, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} - m_PrefabInstance: {fileID: 1714408640} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &1186615821 -MonoBehaviour: + serializedVersion: 6 + m_Component: + - component: {fileID: 1105238066} + - component: {fileID: 1105238068} + - component: {fileID: 1105238067} + m_Layer: 5 + m_Name: CompleteMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1105238066 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1186615820} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ec45203ae7a1a54c9d02c355f983833, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 6 ---- !u!82 &1186615822 -AudioSource: + m_GameObject: {fileID: 1105238065} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 33760921} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -50, y: 50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1105238067 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1186615820} + m_GameObject: {fileID: 1105238065} m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} + 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} + 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!222 &1105238068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105238065} + m_CullTransparentMesh: 1 +--- !u!1 &1186615820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100078, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} + m_PrefabInstance: {fileID: 1714408640} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1186615821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186615820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ec45203ae7a1a54c9d02c355f983833, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 6 +--- !u!82 &1186615822 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186615820} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 9922a12f34d0a084aab32de985459723, type: 3} m_PlayOnAwake: 0 m_Volume: 1 @@ -8418,141 +8572,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1 &1433674666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1433674667} - - component: {fileID: 1433674669} - - component: {fileID: 1433674668} - m_Layer: 5 - m_Name: TextQ1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1433674667 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433674666} - 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: 1778112281} - m_RootOrder: 0 - 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: -1.5} - m_SizeDelta: {x: 0, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1433674668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433674666} - 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: Accept - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 91906345d5ae42a4ca879c3f6c4b65fb, type: 2} - m_sharedMaterial: {fileID: -2196506104538577691, guid: 91906345d5ae42a4ca879c3f6c4b65fb, 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: 14 - m_fontSizeBase: 14 - 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!222 &1433674669 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433674666} - m_CullTransparentMesh: 1 --- !u!1 &1444128283 GameObject: m_ObjectHideFlags: 0 @@ -9270,6 +9289,7 @@ GameObject: - component: {fileID: 1644740159} - component: {fileID: 1644740160} - component: {fileID: 1644740161} + - component: {fileID: 1644740162} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -9322,11 +9342,14 @@ MonoBehaviour: buffType: buffAmount: 0 price: 0 + filename: isPetAlive: 1 isShopOpen: 0 - sm: {fileID: 0} + isShopping: 0 + petFactory: {fileID: 607211381} + pdm: {fileID: 630617449} currentWeapon: 0 - hudManager: {fileID: 0} + hudManager: {fileID: 491809539} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9355,6 +9378,20 @@ MonoBehaviour: petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} + PlayerTransform: {fileID: 0} +--- !u!114 &1644740162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644740156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4db6dc94542ef8c4d9df445759b9df3c, type: 3} + m_Name: + m_EditorClassIdentifier: + questMenu: {fileID: 1677828215} --- !u!1 &1677828215 GameObject: m_ObjectHideFlags: 0 @@ -9367,7 +9404,7 @@ GameObject: - component: {fileID: 1677828218} - component: {fileID: 1677828217} m_Layer: 5 - m_Name: QuestMenu + m_Name: QuestWindow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9387,6 +9424,7 @@ RectTransform: m_Children: - {fileID: 281270166} - {fileID: 1446248592} + - {fileID: 36682392} m_Father: {fileID: 491809538} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9818,188 +9856,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764071968} m_CullTransparentMesh: 0 ---- !u!1 &1778112280 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1778112281} - - component: {fileID: 1778112284} - - component: {fileID: 1778112283} - - component: {fileID: 1778112285} - m_Layer: 5 - m_Name: AcceptButtonQ1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1778112281 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778112280} - 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: 1433674667} - m_Father: {fileID: 33760921} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 32} - m_SizeDelta: {x: 60, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1778112283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778112280} - 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.17801704, g: 0.6886792, b: 0.19073312, 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!222 &1778112284 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778112280} - m_CullTransparentMesh: 1 ---- !u!114 &1778112285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1778112280} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: -1 - 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: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - 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: 1778112283} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1036960979} - m_TargetAssemblyTypeName: QuestManager, Assembly-CSharp - m_MethodName: AcceptQuest - m_Mode: 3 - 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 - - m_Target: {fileID: 36682393} - m_TargetAssemblyTypeName: UnityEngine.UI.Image, UnityEngine.UI - m_MethodName: set_overrideSprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1778112283} - m_TargetAssemblyTypeName: UnityEngine.UI.Image, UnityEngine.UI - m_MethodName: set_overrideSprite - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Sprite, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 971458637} - m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro - m_MethodName: set_text - m_Mode: 5 - 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 - - m_Target: {fileID: 1433674668} - m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro - m_MethodName: set_text - m_Mode: 5 - 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 &1823714612 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level_02.unity.meta b/Assets/Scenes/Level_02.unity.meta index 39ba524e624d3673e5f2ae0cabfa0b0bff5c6ec1..fa6e97788d2bf6fe17234276ac4ee7e3d942a4c9 100644 --- a/Assets/Scenes/Level_02.unity.meta +++ b/Assets/Scenes/Level_02.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 213691d5139815c409aa2d74ee04764f +guid: 5ee0acdf1af5fb54eba46fc3c51bfa98 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity index 56f1e6bdfa7f09fc884cc0f9240762f938828a94..6eedc53f569339192f16af60ee78e0f279a18e7c 100644 --- a/Assets/Scenes/Level_Final.unity +++ b/Assets/Scenes/Level_Final.unity @@ -887,6 +887,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214125933} m_CullTransparentMesh: 1 +--- !u!1 &268888276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268888278} + - component: {fileID: 268888277} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &268888277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268888276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &268888278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268888276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &491809534 GameObject: m_ObjectHideFlags: 0 @@ -1014,7 +1058,9 @@ MonoBehaviour: shopLocation: {fileID: 1084676478} playerLocation: {fileID: 1186615826} shopRadius: 10 - weaponsUIActivate: {fileID: 0} + weaponsUI: {fileID: 0} + weaponsUIHighlight: {fileID: 0} + weaponsUISlot: {fileID: 0} alertBanner: {fileID: 1314518862} alertText: {fileID: 679650416} fadeTime: 0.5 @@ -1574,50 +1620,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 679650414} m_CullTransparentMesh: 1 ---- !u!1 &685640438 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 685640440} - - component: {fileID: 685640439} - m_Layer: 0 - m_Name: ScoreboardManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &685640439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53663303832de9b428f87768d4dff739, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &685640440 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685640438} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 435.5, y: 245, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &819070687 GameObject: m_ObjectHideFlags: 0 @@ -7109,7 +7111,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1036960979 MonoBehaviour: @@ -7133,6 +7135,7 @@ MonoBehaviour: zombunnyBounty: 5 zombearBounty: 10 hellephantBounty: 15 + isQuestsComplete: 0 --- !u!1 &1084676474 GameObject: m_ObjectHideFlags: 0 @@ -8717,11 +8720,14 @@ MonoBehaviour: buffType: buffAmount: 0 price: 0 + filename: isPetAlive: 1 isShopOpen: 0 - sm: {fileID: 0} + isShopping: 0 + petFactory: {fileID: 1713238116} + pdm: {fileID: 268888277} currentWeapon: 0 - hudManager: {fileID: 0} + hudManager: {fileID: 491809539} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8750,6 +8756,7 @@ MonoBehaviour: petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} + PlayerTransform: {fileID: 0} --- !u!114 &1644740162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8937,6 +8944,54 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1713238115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1713238117} + - component: {fileID: 1713238116} + m_Layer: 0 + m_Name: PetManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1713238116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713238115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7177e5ffcfe1046816ee077fa7e8c2, type: 3} + m_Name: + m_EditorClassIdentifier: + petRabbitPrefab: {fileID: 8517487645339449119, guid: cc8c27e2635d7fd478bdafbd044d6871, type: 3} + petSparrowPrefab: {fileID: 8956976848956587104, guid: c830dfca790c01b49ab17476a096582c, type: 3} + petCultistPrefab: {fileID: 8732158265285773930, guid: c0b8db47470676444be922ddb6d2d7df, type: 3} + PlayerTransform: {fileID: 0} +--- !u!4 &1713238117 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713238115} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.52918, y: 13.251007, z: -23.013973} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1714408640 PrefabInstance: m_ObjectHideFlags: 0 @@ -10345,7 +10400,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2032439500377326597, guid: e21d8266a3f06ac4cbbfe7662feead3e, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2032439500377326597, guid: e21d8266a3f06ac4cbbfe7662feead3e, type: 3} propertyPath: m_LocalScale.x diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index add2bf4143db89e8bab96e401d98ba1a5bfd6ad7..f0ad8b7a7a71dd184ffcb68a452ecdfacde5148c 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1060,6 +1060,7 @@ MonoBehaviour: m_EditorClassIdentifier: Settings: {fileID: 853678043} BgMusic: {fileID: 1481446830} + pdm: {fileID: 1910286674} --- !u!114 &398495945 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3549,13 +3550,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 398495944} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: LoadGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -3814,6 +3815,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1736852858} m_CullTransparentMesh: 0 +--- !u!1 &1910286673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1910286675} + - component: {fileID: 1910286674} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1910286674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910286673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1910286675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910286673} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1947312526 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/QuestOver.unity b/Assets/Scenes/QuestOver.unity index 1a727a76daf838a9f09f07722abd8b526157d86a..ed838f13865f9b0ca38200e84242b5998d62480c 100644 --- a/Assets/Scenes/QuestOver.unity +++ b/Assets/Scenes/QuestOver.unity @@ -352,6 +352,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 591087993} m_CullTransparentMesh: 0 +--- !u!1 &609519384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609519385} + m_Layer: 0 + m_Name: ScoreManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &609519385 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609519384} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &828353049 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity deleted file mode 100644 index 2221b0455333e66659e36ff85fd4fe4bf1cfd760..0000000000000000000000000000000000000000 --- a/Assets/Scenes/SampleScene.unity +++ /dev/null @@ -1,267 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &705507993 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 705507995} - - component: {fileID: 705507994} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &705507994 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &705507995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &963194225 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &963194226 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 ---- !u!20 &963194227 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &963194228 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Scoreboard.unity b/Assets/Scenes/Scoreboard.unity index eb8416986d6eb8e1f54687d606cbb194ee35266a..4b1449dd87c7680ceba351cf5bb80ffe6d126628 100644 --- a/Assets/Scenes/Scoreboard.unity +++ b/Assets/Scenes/Scoreboard.unity @@ -848,7 +848,7 @@ RectTransform: 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: -353, y: 9} + m_AnchoredPosition: {x: -201, y: 9} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1367264466 @@ -1300,8 +1300,8 @@ RectTransform: 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: 198} - m_SizeDelta: {x: 300, y: 25} + m_AnchoredPosition: {x: -184, y: 198} + m_SizeDelta: {x: 0, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2141807077 MonoBehaviour: @@ -1325,7 +1325,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.5411765, g: 0.22745098, b: 0.6784314, a: 0.3529412} + m_HighlightedColor: {r: 0.5411765, g: 0.22745098, b: 0.6784314, a: 0} m_PressedColor: {r: 0.5411765, g: 0.22745098, b: 0.6784314, a: 0.7058824} m_SelectedColor: {r: 0.5411765, g: 0.22745098, b: 0.6784314, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} diff --git a/Assets/Scripts/Data/PetData.cs b/Assets/Scripts/Data/PetData.cs index 1f0990e97488883adc0cf7b2d827a44d1773b9dc..b72cf6f284e9ae87cfab43f4094d70f1150d6fa8 100644 --- a/Assets/Scripts/Data/PetData.cs +++ b/Assets/Scripts/Data/PetData.cs @@ -7,13 +7,15 @@ public class PetData public string buffType; public float buffAmount; public int price; + public string filename; - public PetData(string name, string buffType, float buffAmount, int price) + public PetData(string name, string buffType, float buffAmount, int price, string filename) { this.name = name; this.buffType = buffType; this.buffAmount = buffAmount; this.price = price; + this.filename = filename; } public override string ToString() diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 63896b6c44fb195069c66f5f214400aef180d61d..a058a4753d0aa4b46033adf2fd3bf0adfb8b1285 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -13,11 +13,10 @@ public class GameManager : MonoBehaviour // Shop Requirements [Header("Shop Requirements")] public PetData currentPet; - public bool isPetAlive = true; + public bool isPetAlive = false; public bool isShopOpen = true; // shop only open after finishing quest - - [Header("Manager")] - public ScoreboardManager sm; + public bool isShopping = false; // sedang berbelanja + public PetFactory petFactory; // Weapon [Header("Weapons")] @@ -41,13 +40,17 @@ public class GameManager : MonoBehaviour } } - public void LoadGameOver() { + public void SaveTime() { float timeElapsed = ScoreManager.time; - if (sm != null) { - sm.AddScore(new Score(PlayerPrefs.GetString("username"), timeElapsed)); - // Save the score data - sm.SaveScore(); + if (PlayerPrefs.HasKey("timeElapsed")) { + PlayerPrefs.SetFloat("timeElapsed", PlayerPrefs.GetFloat("timeElapsed") + timeElapsed); + } else { + PlayerPrefs.SetFloat("timeElapsed", timeElapsed); } + Debug.Log("Time Elapsed Quest: " + PlayerPrefs.GetFloat("timeElapsed")); + } + + public void LoadGameOver() { SceneManager.LoadScene("GameOver"); } @@ -61,6 +64,11 @@ public class GameManager : MonoBehaviour } + public void NewPet(string name) + { + petFactory.FactoryMethod(name); + } + public void SetWeapon(int i) { currentWeapon = i; diff --git a/Assets/Scripts/Managers/PlayerDataManager.cs b/Assets/Scripts/Managers/PlayerDataManager.cs index 622c83439dd5d6dba08ea0b98e8d64bfb4d44d67..de61f563ee696a9d12015173ae5d671e91397dbb 100644 --- a/Assets/Scripts/Managers/PlayerDataManager.cs +++ b/Assets/Scripts/Managers/PlayerDataManager.cs @@ -4,25 +4,62 @@ using UnityEngine; public class PlayerDataManager : MonoBehaviour { - private PlayerData data = new PlayerData(); + private PlayerData data; void Awake() { data = FileHandler.ReadFromJSONPrefs<PlayerData>("PlayerData.json"); + if (data == null) { + data = new PlayerData(); + } } public void SetCoins(int coins) { - data.coins = coins; - SavePlayerData(); + if (data != null) { + data.coins = coins; + SavePlayerData(); + } else { + Debug.LogError("PlayerDataManager: data object is null!"); + } } public void SetLastScene(string lastScene) { - data.lastScene = lastScene; - SavePlayerData(); + if (data != null) { + data.lastScene = lastScene; + SavePlayerData(); + } else { + Debug.LogError("PlayerDataManager: data object is null!"); + } + } + + public void SetTime(float time) { + if (data != null) { + data.time = time; + SavePlayerData(); + } else { + Debug.LogError("PlayerDataManager: data object is null!"); + } + } + + public int GetCoins() { + return data.coins; + } + + public string GetLastScene() { + return data.lastScene; + } + + public float GetTime() { + return data.time; } public PlayerData GetData() { return data; } + public void Clear() { + data = new PlayerData(); + SavePlayerData(); + } + // Update is called once per frame public void OnDestroy() { SavePlayerData(); diff --git a/Assets/Scripts/Managers/QuestManager.cs b/Assets/Scripts/Managers/QuestManager.cs index c3d35c20f88bd29f59cdff420c1b52fe3d06af04..0e68be329fbc06cc97d1496b05979d6596fae74a 100644 --- a/Assets/Scripts/Managers/QuestManager.cs +++ b/Assets/Scripts/Managers/QuestManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; using UnityEngine.UI; using TMPro; @@ -90,6 +91,21 @@ public class QuestManager : MonoBehaviour isQuestsComplete = isAllQuestComplete(); Debug.Log(isQuestsComplete); + if (isQuestsComplete) { + string sceneName = SceneManager.GetActiveScene().name; + PlayerPrefs.SetString("lastScene", sceneName); + PlayerPrefs.Save(); + Debug.Log("Last Scene: " + sceneName); + if (sceneName != "Level_Final") { + PlayerPrefs.SetInt("isWin", 0); + GameManager.gameManager.SaveTime(); + SceneManager.LoadScene("QuestOver"); + } else { + PlayerPrefs.SetInt("isWin", 1); + GameManager.gameManager.SaveTime(); + SceneManager.LoadScene("GameOver"); + } + } } protected bool isAllQuestComplete() { diff --git a/Assets/Scripts/Menu/GameOver.cs b/Assets/Scripts/Menu/GameOver.cs index b7ac600091e35c99eebf118e81c733a50dcb0924..57119a2e58e02c06a63d62b8795b5c05d780a7c2 100644 --- a/Assets/Scripts/Menu/GameOver.cs +++ b/Assets/Scripts/Menu/GameOver.cs @@ -5,9 +5,23 @@ using UnityEngine.SceneManagement; public class GameOver : MonoBehaviour { + public ScoreboardManager sm; + public PlayerDataManager pdm; public float delaySeconds = 5f; void Start() { Invoke("LoadMainMenuScene", delaySeconds); + int isWin = PlayerPrefs.GetInt("isWin"); + if (isWin == 1) { + // save in scoreboard + if (sm != null) { + float timeElapsed = PlayerPrefs.GetFloat("timeElapsed"); + Debug.Log("Time Elapsed: " + timeElapsed); + sm.AddScore(new Score(PlayerPrefs.GetString("username"), timeElapsed)); + // Save the score data + sm.SaveScore(); + } + SceneManager.LoadScene("Scoreboard"); + } } public void LoadMainMenuScene() @@ -17,7 +31,7 @@ public class GameOver : MonoBehaviour public void TryAgain() { - string nameScene = PlayerPrefs.GetString("loadedScene"); + string nameScene = PlayerPrefs.GetString("lastScene"); SceneManager.LoadScene(nameScene); } diff --git a/Assets/Scripts/Menu/MainMenu.cs b/Assets/Scripts/Menu/MainMenu.cs index 7d213abda535b1c25433742217c9530875937566..8679d61fbaecd3b92c7b1d6b114a0a8b5fb4b6c2 100644 --- a/Assets/Scripts/Menu/MainMenu.cs +++ b/Assets/Scripts/Menu/MainMenu.cs @@ -7,6 +7,8 @@ public class MainMenu : MonoBehaviour { public GameObject Settings; public AudioSource BgMusic; + + public PlayerDataManager pdm; void Start() { Settings.SetActive(false); @@ -14,11 +16,37 @@ public class MainMenu : MonoBehaviour BgMusic.Play(0); } + public string GetNextScene(string nameScene) { + // load scene + string sceneNext = "Level_01"; + if (nameScene != null) { + if (nameScene == "Level_01") { + sceneNext = "Level_02"; + } else if (nameScene == "Level_02") { + sceneNext = "Level_Final"; + } else if (nameScene == "Level_Final") { + sceneNext = "GameOver"; + } + } + return sceneNext; + } + public void NewGame() { + pdm.Clear(); + PlayerPrefs.DeleteKey("isWin"); + PlayerPrefs.SetString("lastScene", "Level_01"); + PlayerPrefs.DeleteKey("timeElapsed"); SceneManager.LoadScene("Level_01"); } + public void LoadGame() { + PlayerPrefs.SetFloat("timeElapsed", pdm.GetTime()); + PlayerPrefs.SetInt("isWin", 0); + PlayerPrefs.SetString("lastScene", pdm.GetLastScene()); + SceneManager.LoadScene(GetNextScene(pdm.GetLastScene())); + } + public void ScoreBoard() { SceneManager.LoadScene("Scoreboard"); diff --git a/Assets/Scripts/Menu/PauseMenu.cs b/Assets/Scripts/Menu/PauseMenu.cs index 23750a1ff4e9b2ecd6ac403b4d4aacde831e2e71..a840d2122f98eb17317bef00f1b71e34964faa1c 100644 --- a/Assets/Scripts/Menu/PauseMenu.cs +++ b/Assets/Scripts/Menu/PauseMenu.cs @@ -16,7 +16,7 @@ public class PauseMenu : MonoBehaviour // Update is called once per frame void Update() { - if (Input.GetKeyDown(KeyCode.Escape)) { + if (Input.GetKeyDown(KeyCode.Escape) && !GameManager.gameManager.isShopping) { if (isPaused) { ResumeGame(); } else { diff --git a/Assets/Scripts/Menu/QuestOver.cs b/Assets/Scripts/Menu/QuestOver.cs index a6ae7c1035a78aa3fa33f13dbb980ffa195c4726..435500b90d0c0ab6372208f14da92cbf5511235e 100644 --- a/Assets/Scripts/Menu/QuestOver.cs +++ b/Assets/Scripts/Menu/QuestOver.cs @@ -12,19 +12,40 @@ public class QuestOver : MonoBehaviour public void SaveAndNext() { - // get lastscene and set in playerdata - string nameScene = PlayerPrefs.GetString("lastScene"); + string nameScene = PlayerPrefs.GetString("lastScene"); + pdm.SetLastScene(nameScene); // save data - pdm.SavePlayerData(); + float timeElapsed = PlayerPrefs.GetFloat("timeElapsed"); + pdm.SetTime(timeElapsed); - // load scene - // SceneManager.LoadScene(pd.GetData().lastScene); + pdm.SavePlayerData(); + LoadNextScene(nameScene); } public void Next() { string nameScene = PlayerPrefs.GetString("lastScene"); - SceneManager.LoadScene(nameScene); + LoadNextScene(nameScene); + } + + public string GetNextScene(string nameScene) { + PlayerPrefs.SetInt("isWin", 0); + // load scene + string sceneNext = "Level_01"; + if (nameScene != null) { + if (nameScene == "Level_01") { + sceneNext = "Level_02"; + } else if (nameScene == "Level_02") { + sceneNext = "Level_Final"; + } + } + return sceneNext; + } + + public void LoadNextScene(string nameScene) { + // load scene + string sceneLoaded = GetNextScene(nameScene); + if (sceneLoaded != "") SceneManager.LoadScene(sceneLoaded); } } diff --git a/Assets/Scripts/Pet/PetFactory.cs b/Assets/Scripts/Pet/PetFactory.cs index 72344399f264cfe8e752d68fe159abab5fa5eab8..786bf300c71a5c2964d3e4d1639ba65ff3eaf721 100644 --- a/Assets/Scripts/Pet/PetFactory.cs +++ b/Assets/Scripts/Pet/PetFactory.cs @@ -7,23 +7,31 @@ public class PetFactory : MonoBehaviour public GameObject petRabbitPrefab; public GameObject petSparrowPrefab; public GameObject petCultistPrefab; + public Transform PlayerTransform; GameObject pet; - public GameObject FactoryMethod(string name) + public void FactoryMethod(string name) { if (name == "rabbit") { - pet = Instantiate(petRabbitPrefab); + pet = Instantiate(petRabbitPrefab, PlayerTransform); } else if (name == "sparrow") { - pet = Instantiate(petSparrowPrefab); + pet = Instantiate(petSparrowPrefab, PlayerTransform); } else if (name == "cultist") { - pet = Instantiate(petCultistPrefab); + pet = Instantiate(petCultistPrefab, PlayerTransform); + } + + PetMovement component = pet.GetComponent<PetMovement>(); // Get the component you want to modify + + if (component != null) // Check if the component exists + { + Debug.Log("adaaaa"); + component.target = PlayerTransform; // Set the speed property on the component } - return pet; } } diff --git a/Assets/Scripts/Player/PlayerData.cs b/Assets/Scripts/Player/PlayerData.cs index 3b25c2e67eebe5b5dd46e4292d15312a9c97798b..6336d76c0a1096b1563add08651e2c26387e0ab2 100644 --- a/Assets/Scripts/Player/PlayerData.cs +++ b/Assets/Scripts/Player/PlayerData.cs @@ -8,14 +8,17 @@ public class PlayerData { public string lastScene; public int coins; + public float time; // Start is called before the first frame update public PlayerData() { lastScene = "Level_01"; coins = 0; + time = 0; } - public PlayerData(string lastScene, int coins) { + public PlayerData(string lastScene, int coins, float time) { this.lastScene = lastScene; + this.time = time; this.coins = coins; } } diff --git a/Assets/Scripts/Player/PlayerGunSwitcher.cs b/Assets/Scripts/Player/PlayerGunSwitcher.cs new file mode 100644 index 0000000000000000000000000000000000000000..3ff125a5fdc7e845612e7cc678c36777dfcb989c --- /dev/null +++ b/Assets/Scripts/Player/PlayerGunSwitcher.cs @@ -0,0 +1 @@ +// TODO: Switch Gun Mesh for Player \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerGunSwitcher.cs.meta b/Assets/Scripts/Player/PlayerGunSwitcher.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..e11cb5076f0577aad4c0ae358c389d6cb9a39789 --- /dev/null +++ b/Assets/Scripts/Player/PlayerGunSwitcher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f089648e71edb4542936007945e8e427 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs index d945af63c22d2ecaac50742c88b826f710c23295..6cfd04190173e73ae105504dfde65433bba26e80 100644 --- a/Assets/Scripts/Player/PlayerHealth.cs +++ b/Assets/Scripts/Player/PlayerHealth.cs @@ -100,8 +100,6 @@ public class PlayerHealth : MonoBehaviour        playerMovement.enabled = false;         playerShooting.enabled = false; - PlayerPrefs.SetString("loadedScene", SceneManager.GetActiveScene().name); - // Add score data to the scoreboard manager GameManager.gameManager.LoadGameOver();    } } \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs index 66da2e080f1cbaa55df5edb4d43d9bddc19de042..e2a662637513251668ddff57c47a840efe94b98b 100644 --- a/Assets/Scripts/Player/PlayerShooting.cs +++ b/Assets/Scripts/Player/PlayerShooting.cs @@ -9,10 +9,10 @@ public class PlayerShooting : MonoBehaviour  */ public int gunMode = 1; public int damagePerShot = 30; + public AudioClip[] gunAudioSrc = new AudioClip[4]; private float timeBetweenBullets = 0.15f; + private float timeBulletsShot = 0.15f; private float range = 100f; - private bool multiRange = false; - float timer; Ray shootRay = new Ray(); Ray[] shootRays = new Ray[5]; @@ -23,6 +23,7 @@ public class PlayerShooting : MonoBehaviour AudioSource gunAudio; Light gunLight; float effectsDisplayTime = 0.2f; + RaycastHit[] enemiesHit; void Awake () { @@ -45,6 +46,10 @@ public class PlayerShooting : MonoBehaviour { gunMode = 2; } + else if (Input.GetKeyDown("3")) + { + gunMode = 3; + } } void UpdateGunMode(int gunMode) @@ -53,20 +58,18 @@ public class PlayerShooting : MonoBehaviour case 1: damagePerShot = 30; timeBetweenBullets = 0.15f; + range = 100f; - multiRange = false; break; case 2: - damagePerShot = 200; + damagePerShot = 50; timeBetweenBullets = 1f; range = 10f; - multiRange = true; break; default: - damagePerShot = 30; - timeBetweenBullets = 0.15f; - range = 100f; - multiRange = false; + damagePerShot = 80; + timeBetweenBullets = 0.5f; + range = 2f; break; } } @@ -77,12 +80,12 @@ public class PlayerShooting : MonoBehaviour SetGunMode(); UpdateGunMode(gunMode); - if(Input.GetButton ("Fire1") && timer >= timeBetweenBullets && Time.timeScale != 0) + if(Input.GetButton ("Fire1") && timer >= timeBetweenBullets && Time.timeScale != 0 && !GameManager.gameManager.isShopping) { Shoot (); } - if(timer >= timeBetweenBullets * effectsDisplayTime) + if(timer >= timeBulletsShot * effectsDisplayTime) { DisableEffects (); } @@ -98,57 +101,69 @@ public class PlayerShooting : MonoBehaviour gunLight.enabled = false; } - - void Shoot () - { + void GunShoot() { timer = 0f;        //Play audio + gunAudio.clip = gunAudioSrc[0]; gunAudio.Play (); -       //enable Light - gunLight.enabled = true; -        //Play gun particle gunParticles.Stop (); gunParticles.Play (); -       //enable Line renderer dan set first position +       //enable Line renderer gunLine.enabled = true; + gunLine.positionCount = 2; gunLine.SetPosition (0, transform.position); -       //Set posisi ray shoot dan direction - if (multiRange) { - for (int i = 0; i < shootRays.Length; i++) { - shootRays[i].origin = transform.position; - shootRays[i].direction = Quaternion.Euler(0, (-10 + i * 5), 0) * transform.forward; - //Lakukan raycast jika mendeteksi id nemy hit apapun - if (Physics.Raycast (shootRays[i], out shootHit, range, shootableMask)) - { -            //Lakukan raycast hit hace component Enemyhealth - EnemyHealth enemyHealth = shootHit.collider.GetComponent <EnemyHealth> (); - - if(enemyHealth != null) - { -                //Lakukan Take Damage - enemyHealth.TakeDamage (damagePerShot, shootHit.point); - } - -            //Set line end position ke hit position - gunLine.SetPosition (1, shootHit.point); - } - else - { -            //set line end position ke range freom barrel - gunLine.SetPosition (1, shootRays[i].origin + shootRays[i].direction * range); - } + // set shoot rays + shootRay.origin = transform.position; + shootRay.direction = transform.forward; + //Lakukan raycast jika mendeteksi id nemy hit apapun + if (Physics.Raycast (shootRay, out shootHit, range, shootableMask)) + { +           //Lakukan raycast hit hace component Enemyhealth + EnemyHealth enemyHealth = shootHit.collider.GetComponent <EnemyHealth> (); + + if(enemyHealth != null) + { +               //Lakukan Take Damage + enemyHealth.TakeDamage (damagePerShot, shootHit.point); } + +           //Set line end position ke hit position + gunLine.SetPosition (1, shootHit.point); } - else { - shootRays[2].origin = transform.position; - shootRays[2].direction = transform.forward; + else + { +           //set line end position ke range freom barrel + gunLine.SetPosition (1, shootRay.origin + shootRay.direction * range); + } + } + + void ShotgunShoot() { + timer = 0f; + +       //Play audio + gunAudio.clip = gunAudioSrc[1]; + gunAudio.Play (); + +       //Play gun particle + gunParticles.Stop (); + gunParticles.Play (); + +       //enable Line renderer + gunLine.enabled = true; + gunLine.positionCount = 10; + + //set shooting rays + for (int i = 0; i < shootRays.Length; i++) { + gunLine.SetPosition (2 * i, transform.position); + shootRays[i].origin = transform.position; + shootRays[i].direction = Quaternion.Euler(0, (-10 + i * 5), 0) * transform.forward; //Lakukan raycast jika mendeteksi id nemy hit apapun - if (Physics.Raycast (shootRays[2], out shootHit, range, shootableMask)) + if (Physics.Raycast (shootRays[i], out shootHit, range, shootableMask)) {            //Lakukan raycast hit hace component Enemyhealth EnemyHealth enemyHealth = shootHit.collider.GetComponent <EnemyHealth> (); @@ -160,13 +175,37 @@ public class PlayerShooting : MonoBehaviour }            //Set line end position ke hit position - gunLine.SetPosition (1, shootHit.point); + gunLine.SetPosition (2*i+1, shootHit.point); } else {            //set line end position ke range freom barrel - gunLine.SetPosition (1, shootRays[2].origin + shootRays[2].direction * range); + gunLine.SetPosition (2*i+1, shootRays[i].origin + shootRays[i].direction * range); } } } + + void SwordAttack() { + timer = 0f; + + enemiesHit = Physics.SphereCastAll(transform.position, range, transform.forward, 0, shootableMask); + for (int i = 0; i < enemiesHit.Length; i++) { + EnemyHealth enemyHealth = enemiesHit[i].collider.gameObject.GetComponent<EnemyHealth>(); + if(enemyHealth != null) + { +               //Lakukan Take Damage + enemyHealth.TakeDamage (damagePerShot, shootHit.point); + } + } + } + + void Shoot () + { + switch (gunMode) { + case 1: GunShoot(); break; + case 2: ShotgunShoot(); break; + case 3: SwordAttack(); break; + default: GunShoot(); break; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Score/ScoreboardManager.cs b/Assets/Scripts/Score/ScoreboardManager.cs index 8bbe176500d5eac21200455b6ebab22917ac5ef1..48289f781ecf0b1f3e6671d97df9b5721a9b3712 100644 --- a/Assets/Scripts/Score/ScoreboardManager.cs +++ b/Assets/Scripts/Score/ScoreboardManager.cs @@ -26,6 +26,11 @@ public class ScoreboardManager : MonoBehaviour AddScore(score); } + public void Clear() { + sd.scoreData.Clear(); + SaveScore(); + } + public void OnDestroy() { SaveScore(); diff --git a/Assets/Scripts/Shop/ShopManager.cs b/Assets/Scripts/Shop/ShopManager.cs index 1fbb2e2755a90ba293cdeab8380f2309c106e480..649e847209d714be98231d5b61d02783dd132852 100644 --- a/Assets/Scripts/Shop/ShopManager.cs +++ b/Assets/Scripts/Shop/ShopManager.cs @@ -7,7 +7,7 @@ public class ShopManager : MonoBehaviour { // Pet Panel [Header("Panel foreach Pet")] - List<PetData> petData; + List<PetData> petData = new List<PetData>(); public GameObject petPanelPrefab; public Transform parentTransfrom; public GameObject[] petPanels; @@ -16,7 +16,6 @@ public class ShopManager : MonoBehaviour // Coins public TMP_Text coins; - void Start() { coins.text = GameManager.gameManager.coins.ToString(); @@ -32,14 +31,16 @@ public class ShopManager : MonoBehaviour petPanelComponent.name.text = pet.name; petPanelComponent.buff_type.text = pet.buffType; petPanelComponent.price.text = pet.price.ToString(); - petPanelComponent.image.sprite = Resources.Load<Sprite>("UI/Shop/" + pet.name); + petPanelComponent.image.sprite = Resources.Load<Sprite>("UI/Shop/" + pet.filename); petPanelComponent.button.onClick.AddListener(() => BuyPet(pet)); } } private void Awake() { - petData = FileHandler.ReadListFromJSON<PetData>("petData.json"); + petData.Add(new PetData("rabbit", "heal", 3, 50, "birdie")); + petData.Add(new PetData("sparrow", "defense", 3, 40, "mimic")); + petData.Add(new PetData("cultist", "attack", 3, 40, "doggie")); } // Update is called once per frame @@ -63,13 +64,18 @@ public class ShopManager : MonoBehaviour hudManager.AlertMessage("You Don't have enough coins"); } - // Update coins - GameManager.gameManager.coins -= petData.price; - coins.text = GameManager.gameManager.coins.ToString(); + else + { + // Update coins + GameManager.gameManager.coins -= petData.price; + coins.text = GameManager.gameManager.coins.ToString(); - // Update pet - GameManager.gameManager.currentPet = petData; - GameManager.gameManager.isPetAlive = true; + // Update pet + GameManager.gameManager.NewPet(petData.name); + GameManager.gameManager.currentPet = petData; + GameManager.gameManager.isPetAlive = true; + } + } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5a1993b7d780ba63ee5ed1938e5f0e0c91fc2e0c..329324b3b8b07df954f10116af012a0df43ad561 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,4 +17,13 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Scoreboard.unity guid: dfcc5ef6effa3fa4bbf2b1c04793574b + - enabled: 1 + path: Assets/Scenes/Level_02.unity + guid: 5ee0acdf1af5fb54eba46fc3c51bfa98 + - enabled: 1 + path: Assets/Scenes/Level_Final.unity + guid: 726d6b2daaf917e4bb50ad5c962aadef + - enabled: 1 + path: Assets/Scenes/QuestOver.unity + guid: a9f84df88a552ad42a2d3916e4ceb3f4 m_configObjects: {}