From d85851b11b76036013398f1ff23c1f68b5955ac8 Mon Sep 17 00:00:00 2001
From: Audino723 <rioaudino723@gmail.com>
Date: Sat, 15 Apr 2023 10:28:35 +0700
Subject: [PATCH] fix: weapon slot shop
---
Assets/HUDManager.cs | 20 ++------------------
Assets/Scenes/Level_01.unity | 5 +++--
Assets/Scripts/GameManager.cs | 2 +-
ProjectSettings/TagManager.asset | 3 ++-
4 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/Assets/HUDManager.cs b/Assets/HUDManager.cs
index f45d48b7..357b0b65 100644
--- a/Assets/HUDManager.cs
+++ b/Assets/HUDManager.cs
@@ -107,25 +107,9 @@ public class HUDManager : MonoBehaviour
}
}
- public void NewWeapon(string name)
+ public void NewWeapon(int id)
{
- int weaponSlot=0;
-
- if (name == "shotgun")
- {
- weaponSlot = 1;
- }
-
- if (name == "sword")
- {
- weaponSlot = 2;
- }
- if (name == "bow")
- {
- weaponSlot = 3;
- }
-
- GameObject slot = weaponsUISlot.transform.GetChild(weaponSlot).gameObject;
+ GameObject slot = weaponsUISlot.transform.GetChild(id-1).gameObject;
slot.SetActive(true);
}
}
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 335c7789..af828365 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -11599,6 +11599,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
coins: 50
+ coinsLatest: 0
currentPet:
name:
buffType:
@@ -11609,12 +11610,12 @@ MonoBehaviour:
isPetAlive: 0
isShopOpen: 0
isShopping: 0
- isEnemySpawning: 1
+ isEnemyActive: 1
petFactory: {fileID: 734232483}
currentWeapon: 0
availableWeapon: 01000000
hudManager: {fileID: 491809539}
- enemyManager: {fileID: 164778954}
+ enemySpawner: {fileID: 0}
--- !u!114 &1644740160
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index 823f50bb..6d150d09 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -85,7 +85,7 @@ public class GameManager : MonoBehaviour
public void NewWeapon(int id)
{
- hudManager.NewWeapon(name);
+ hudManager.NewWeapon(id);
availableWeapon[id - 1] = true;
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 789ae9d5..9181309a 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -3,7 +3,8 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
- tags: []
+ tags:
+ - Pet
layers:
- Default
- TransparentFX
--
GitLab