summaryrefslogtreecommitdiff
path: root/SurvivalTest/Assets/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
-rw-r--r--SurvivalTest/Assets/Scripts/Items/ItemBase.cs8
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs8
-rw-r--r--SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs11
3 files changed, 21 insertions, 6 deletions
diff --git a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs
index e7cecd6..54367b2 100644
--- a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs
+++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs
@@ -12,6 +12,14 @@ public class ItemBase : MonoBehaviour
public virtual string iconPath { get; }
+ protected int m_Count = 1;
+ public int count { get { return m_Count; } }
+
+ public void SetCount(int c)
+ {
+ m_Count = c;
+ }
+
public virtual void Update()
{
}
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
index 11a18be..d2740e6 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
@@ -26,11 +26,9 @@ public class UIWeaponWidget : UIGridPropBase
Image_CD.gameObject.SetActive(weapon.autoMode == WeaponBase.AutoMode.Interval);
- //int n = Random.Range(1, 20);
- //Text_Count.gameObject.SetActive(n > 1);
- //Text_Count.text = n.ToString();
-
- Text_Count.gameObject.SetActive(false);
+ int n = weapon.count;
+ Text_Count.gameObject.SetActive(n > 1);
+ Text_Count.text = n.ToString();
}
private void Update()
diff --git a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs
index d143199..92f4ec2 100644
--- a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs
+++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs
@@ -9,6 +9,10 @@ public abstract class WeaponBase
public abstract string iconPath { get; }
+ public int count { get { return m_Count; } }
+
+ protected int m_Count = 1;
+
/// <summary>
/// Á¬·¢Ä£Ê½
/// </summary>
@@ -63,4 +67,9 @@ public abstract class WeaponBase
{
}
-}
+ public void SetCount(int c)
+ {
+ m_Count = c;
+ }
+
+} \ No newline at end of file