*misc

6 files changed, 107 insertions, 4 deletions

diff --git a/Art/源文件/分辨率.png b/Art/源文件/分辨率.png
new file mode 100644
index 0000000..9408502
--- /dev/null
+++ b/Art/源文件/分辨率.png
diff --git a/Art/源文件/分辨率HD.png b/Art/源文件/分辨率HD.png
new file mode 100644
index 0000000..c7c8707
--- /dev/null
+++ b/Art/源文件/分辨率HD.png
diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
index b2539eb..62f3be7 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
@@ -871,7 +871,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -10, y: 15.299988}
+  m_AnchoredPosition: {x: -10, y: 10}
   m_SizeDelta: {x: 344.4, y: 100}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &2021917152667161724
@@ -999,6 +999,7 @@ RectTransform:
   m_Children:
   - {fileID: 228918325}
   - {fileID: 1996007143}
+  - {fileID: 6848860798725798129}
   m_Father: {fileID: 563803806}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1021,6 +1022,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Image_Icon: {fileID: 1139449036}
   Image_CD: {fileID: 1996007144}
+  Text_Count: {fileID: 5398194312803149116}
 --- !u!1 &1986034768
 GameObject:
   m_ObjectHideFlags: 0
@@ -1438,6 +1440,101 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2029941019941594034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6848860798725798129}
+  - component: {fileID: 5920942081862111735}
+  - component: {fileID: 5398194312803149116}
+  - component: {fileID: 7080777762366578253}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6848860798725798129
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2029941019941594034}
+  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: 1891821504}
+  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: 0.00018310547, y: 0}
+  m_SizeDelta: {x: 40, y: 12.91}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &5920942081862111735
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2029941019941594034}
+  m_CullTransparentMesh: 1
+--- !u!114 &5398194312803149116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2029941019941594034}
+  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: 12800000, guid: 0ac416e59c316e241b778ef34d17cd7e, type: 3}
+    m_FontSize: 9
+    m_FontStyle: 2
+    m_BestFit: 0
+    m_MinSize: 0
+    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 &7080777762366578253
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2029941019941594034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.8773585, g: 0.14131255, b: 0.062077243, a: 0.5254902}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &4600657957224393323
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/SurvivalTest/Assets/Resources/Scenes/Demo.unity b/SurvivalTest/Assets/Resources/Scenes/Demo.unity
index d95aa8e..e512aeb 100644
--- a/SurvivalTest/Assets/Resources/Scenes/Demo.unity
+++ b/SurvivalTest/Assets/Resources/Scenes/Demo.unity
@@ -1451,7 +1451,7 @@ MonoBehaviour:
   m_AssetsPPU: 32
   m_RefResolutionX: 700
   m_RefResolutionY: 400
-  m_UpscaleRT: 1
+  m_UpscaleRT: 0
   m_PixelSnapping: 0
   m_CropFrameX: 0
   m_CropFrameY: 0
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
index baac0d2..9a79cbc 100644
--- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs
@@ -12,6 +12,7 @@ public class UIWeaponWidget : UIGridPropBase
 {
 	public Image Image_Icon;
 	public Image Image_CD;
+	public Text Text_Count;
 
 	public WeaponBase weapon { get { return m_Weapon; } }
 	private WeaponBase m_Weapon;
@@ -24,6 +25,11 @@ public class UIWeaponWidget : UIGridPropBase
 		Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.weapon.iconPath);
 
 		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();
+
 	}
 
 	private void Update()
diff --git a/SurvivalTest/UserSettings/EditorUserSettings.asset b/SurvivalTest/UserSettings/EditorUserSettings.asset
index 6ccfa8d..02181fe 100644
--- a/SurvivalTest/UserSettings/EditorUserSettings.asset
+++ b/SurvivalTest/UserSettings/EditorUserSettings.asset
@@ -30,10 +30,10 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7e1e1f1a193e2527281529200900e1e53a3dacf238e0f323
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 2242470311464669081d033702205a0359041b2f222d357f092c103cacf53a31f6fe
+      value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d
+      value: 2242470311464669081d033702205a0359041b2f222d357f092c103cacf53a31f6fe
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650