*misc

3 files changed, 107 insertions, 3 deletions

diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
index 1e417c6..af6403f 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
@@ -1150,6 +1150,101 @@ MonoBehaviour:
   m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &695306688239082285
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6687837986288785156}
+  - component: {fileID: 4091798961729221054}
+  - component: {fileID: 6128246860759049951}
+  - component: {fileID: 8119481593074994583}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6687837986288785156
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695306688239082285}
+  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_Children: []
+  m_Father: {fileID: 2787721831540739890}
+  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: 0.000061035156, y: 0}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &4091798961729221054
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695306688239082285}
+  m_CullTransparentMesh: 1
+--- !u!114 &6128246860759049951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695306688239082285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 10
+    m_FontStyle: 2
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 12
+--- !u!114 &8119481593074994583
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 695306688239082285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0.6603774, b: 0, a: 0.5254902}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &1150918167762467697
 GameObject:
   m_ObjectHideFlags: 0
@@ -1424,6 +1519,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 928867578226861}
+  - {fileID: 6687837986288785156}
   m_Father: {fileID: 4914265009318610032}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1445,6 +1541,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Image_Icon: {fileID: 7336229837751899344}
+  Text_Count: {fileID: 6128246860759049951}
 --- !u!1 &7043254157964506460
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs
index 0f9d623..277acba 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs
@@ -12,6 +12,8 @@ public class UIItemWidget : UIGridPropBase
 {
 	public Image Image_Icon;
 
+	public Text Text_Count;
+
 	public ItemBase item { get { return m_Item; } }
 	private ItemBase m_Item;
 
@@ -21,6 +23,11 @@ public class UIItemWidget : UIGridPropBase
 		m_Item = info.item;
 
 		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.item.iconPath);
+
+		int n = Random.Range(1, 20);
+		Text_Count.gameObject.SetActive(n > 1);
+		Text_Count.text = n.ToString();
+
 	}
 
 	private void Update()
diff --git a/SurvivalTest/UserSettings/EditorUserSettings.asset b/SurvivalTest/UserSettings/EditorUserSettings.asset
index 270f3dc..6ccfa8d 100644
--- a/SurvivalTest/UserSettings/EditorUserSettings.asset
+++ b/SurvivalTest/UserSettings/EditorUserSettings.asset
@@ -27,13 +27,13 @@ EditorUserSettings:
       value: 2242470311464669081d033702205a0359041b2f222d357f7b163936efef7a2decee22f0
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c7e1e1f1a193e2527281529200900e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7e1e1f1a193e2527281529200900e1e53a3dacf238e0f323
+      value: 2242470311464669081d033702205a0359041b2f222d357f092c103cacf53a31f6fe
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 2242470311464669081d033702205a0359041b2f222d357f092c103cacf53a31f6fe
+      value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650