From fc8b9d2630f948ee700edd65e77e9278afbad145 Mon Sep 17 00:00:00 2001
From: bag <bagasaryo03@gmail.com>
Date: Sat, 11 May 2024 17:40:38 +0700
Subject: [PATCH] fix: shop
---
Assets/SFX/skeleton.wav.meta | 9 +--
Assets/Scenes/Level04.unity | 76 ++++++++++++++++++++++-
Assets/Scenes/ShopCutscene.unity | 1 +
Assets/Scripts/Global/GameStateManager.cs | 6 +-
ProjectSettings/EditorBuildSettings.asset | 3 +
5 files changed, 87 insertions(+), 8 deletions(-)
diff --git a/Assets/SFX/skeleton.wav.meta b/Assets/SFX/skeleton.wav.meta
index 6f297f3..3f4591b 100644
--- a/Assets/SFX/skeleton.wav.meta
+++ b/Assets/SFX/skeleton.wav.meta
@@ -1,21 +1,22 @@
fileFormatVersion: 2
guid: cb387d58af1a39047815ce1bd8a6cf0c
-timeCreated: 1541766395
-licenseType: Store
AudioImporter:
- serializedVersion: 6
+ externalObjects: {}
+ serializedVersion: 7
defaultSettings:
+ serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
+ preloadAudioData: 1
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
- preloadAudioData: 1
loadInBackground: 0
+ ambisonic: 0
3D: 1
userData:
assetBundleName:
diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity
index 219070f..3140d27 100644
--- a/Assets/Scenes/Level04.unity
+++ b/Assets/Scenes/Level04.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3477,6 +3477,63 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e7f6a43b7f28b6c42890ce7153345c07, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &880025823
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7838514508986632005, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_Name
+ value: PetManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8715510611577004420, guid: c3262de077febf24a84367fec8297e36, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: c3262de077febf24a84367fec8297e36, type: 3}
--- !u!1 &916377278 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1401507406560278165, guid: 5dcff9e2eb341014c8098f8c95d71fdd, type: 3}
@@ -5146,6 +5203,22 @@ PrefabInstance:
propertyPath: m_Name
value: GameStateManager
objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsBought.Array.data[0]
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsBought.Array.data[1]
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsHealth.Array.data[0]
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 6989656073050333270, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: petsHealth.Array.data[1]
+ value: 100
+ objectReference: {fileID: 0}
- target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
propertyPath: m_LocalPosition.x
value: 75.24971
@@ -7321,3 +7394,4 @@ SceneRoots:
- {fileID: 859731727}
- {fileID: 379622453}
- {fileID: 633448953}
+ - {fileID: 880025823}
diff --git a/Assets/Scenes/ShopCutscene.unity b/Assets/Scenes/ShopCutscene.unity
index 02df50e..6da5749 100644
--- a/Assets/Scenes/ShopCutscene.unity
+++ b/Assets/Scenes/ShopCutscene.unity
@@ -1623,6 +1623,7 @@ MonoBehaviour:
image2: {fileID: 155814871}
button1: {fileID: 2013581162}
button2: {fileID: 1029841698}
+ button3: {fileID: 2055053773}
newImage1: {fileID: 21300000, guid: 8306a111b47cdba4f8a61af3f4c03a5f, type: 3}
newImage2: {fileID: 21300000, guid: 44b2436fa1fb59c4fae7c65f32b9e435, type: 3}
transactionSound: {fileID: 8300000, guid: 086f56e0aeb2c994ebc81ad124580341, type: 3}
diff --git a/Assets/Scripts/Global/GameStateManager.cs b/Assets/Scripts/Global/GameStateManager.cs
index 8cabd1c..d68c561 100644
--- a/Assets/Scripts/Global/GameStateManager.cs
+++ b/Assets/Scripts/Global/GameStateManager.cs
@@ -3,7 +3,7 @@ using UnityEngine;
public class GameStateManager : MonoBehaviour
{
public static GameStateManager Instance;
- [HideInInspector]
+ // [HideInInspector]
public int coin;
[HideInInspector]
public float playerHealth;
@@ -39,7 +39,7 @@ public class GameStateManager : MonoBehaviour
// karena player bisa punya 2 pet saja
public bool[] petsBought = new []{false, false};
// -1 artinya blm kebeli, 0 artinya udah mati
- public float[] petsHealth = new[] { -1f, -1f };
+ public float[] petsHealth = new[] { 100f, 100f };
// BUAT STATISTIK
public int bulletShot;
@@ -203,6 +203,6 @@ public class GameStateManager : MonoBehaviour
public void BuyPet(int i)
{
petsBought[i] = true;
- petsHealth[i] = 100f;
+ petsHealth[i] = 100;
}
}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index d77f8db..334d78c 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -35,6 +35,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Cutscene03.unity
guid: 71be6a4c4094d7744ba664e4b6b21732
+ - enabled: 1
+ path: Assets/Scenes/Cutscene04.unity
+ guid: 54080e437185c0d47ab5f0303f1b7081
- enabled: 1
path: Assets/Scenes/GameMenuScene.unity
guid: 0c8d1fba0d65f3a499ab95304569d82c
--
GitLab