修改人物检视面板

Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture

@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 256
+  m_Width: 255
-  m_Height: 256
+  m_Height: 489
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab

@@ -147,8 +147,9 @@ GameObject:
   - component: {fileID: 8078226639558209602}
   - component: {fileID: 3944633717089808067}
   - component: {fileID: 8050215455937781931}
+  - component: {fileID: 7488210369510801467}
   m_Layer: 5
-  m_Name: CheckMyselfItem
+  m_Name: UI_CheckMyselfItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -258,6 +259,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7488210369510801467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7984153428917771150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9db7b09607301694982a934007b3516b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8746938320234467046
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab

@@ -1437,7 +1437,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1727,7 +1727,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1263243931714669586
 RectTransform:
   m_ObjectHideFlags: 0

Assets/SandBox/TestUIPanelScenes/UI_LowTensionWorkTicketPanel.unity

@@ -123,108 +123,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &278349793
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8048042365218946059}
-    m_Modifications:
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-      propertyPath: m_Name
-      value: UI_LowTensionWorkTicketPanel
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
---- !u!224 &793798410 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
-  m_PrefabInstance: {fileID: 278349793}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &845611926
 GameObject:
   m_ObjectHideFlags: 0
@@ -343,6 +241,152 @@ MonoBehaviour:
   m_RequiresDepthTexture: 0
   m_RequiresColorTexture: 0
   m_Version: 2
+--- !u!1001 &1204582736
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8048042367136801948}
+    m_Modifications:
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+      propertyPath: m_Name
+      value: UI_LowTensionWorkTicketPanel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+--- !u!224 &1204582737 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
+  m_PrefabInstance: {fileID: 1204582736}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1361204692
 GameObject:
   m_ObjectHideFlags: 0
@@ -485,8 +529,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 793798410}
   m_Father: {fileID: 8048042365605609282}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -752,7 +795,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1204582737}
   m_Father: {fileID: 8048042365605609282}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scenes/01_InitScene.unity

@@ -365,7 +365,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 987826881}
-  - {fileID: 1536160730}
   m_Father: {fileID: 552229449}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1563,51 +1562,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   initStatePara: "\u9690\u85CF"
---- !u!1 &1536160729
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1536160730}
-  - component: {fileID: 1536160731}
-  m_Layer: 0
-  m_Name: aaaa
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1536160730
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1536160729}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 254869080}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1536160731
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1536160729}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 40734e2dbb26ba24eaced19c3fbc57ae, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  initStatePara: 0
 --- !u!1 &1606844579
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/CXX/Tools.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a1df0e3d6d1e61349adf0cb3bb714ac5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CXX/Tools/Tool_Base.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 묏야꼼죕샘잚
+/// </summary>
+public class Tool_Base : MonoBehaviour
+{
+    //
+}

Assets/Scripts/CXX/Tools/Tool_Base.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b987cc5e6a3075c4a92dbb2dc7ab4489
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CXX/Tools/Tool_TestPen.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// Ñéµç±Ê
+/// </summary>
+public class Tool_TestPen : Tool_Base
+{
+    public void MoveTo()
+    {
+
+    }
+}

Assets/Scripts/CXX/Tools/Tool_TestPen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 384c2a2ee9bfbb34291e9e46171e43c4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Project/Manager/PacksackBagMgr.cs

@@ -38,25 +38,25 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
 
     public Dictionary<ItemInfo, List<ItemInfo>> GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials tmdTpye)
     {
-        Dictionary<ItemInfo, List<ItemInfo>> temp = new Dictionary<ItemInfo, List<ItemInfo>>();
+        Dictionary<ItemInfo, List<ItemInfo>> tempNew = new Dictionary<ItemInfo, List<ItemInfo>>();
 
         var dicTemp = GetCurrentBagData();
         foreach (var item in dicTemp.Keys)
         {
             if (item.toolOrDeviceOrMaterial == tmdTpye)
             {
-                if (temp.ContainsKey(item))
+                if (tempNew.ContainsKey(item))
                 {
-                    temp[item].Add(item);
+                    tempNew[item].Add(item);
                 }
                 else
                 {
-                    temp.Add(item, new List<ItemInfo>() { item });
+                    tempNew.Add(item, new List<ItemInfo>() { item });
                 }
             }
 
         }
-        return temp;
+        return tempNew;
     }
 
     /// <summary>

Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
 using UnityEngine;
 
 public class Tool_SelectComponent : BaseToolOrDevice
@@ -36,4 +37,13 @@ public class Tool_SelectComponent : BaseToolOrDevice
         _highlight.highlighted = false;
         GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
     }
+
+    [Button]
+    public void TestAddOne()
+    {
+        GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo);
+        _highlight.highlighted = false;
+        gameObject.SetActive(false);
+        GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
+    }
 }

Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs

@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+
+public class UI_CheckMyselfItem : BaseItem
+{
+    private string[] validToolNames = { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" };
+    private ItemInfo itemInfo;
+    public void Init(ItemInfo _itemInfo, int count)
+    {
+        itemInfo = _itemInfo;
+        GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
+    }
+
+    protected override void OnClick(string btnName)
+    {
+        base.OnClick(btnName);
+        switch (btnName)
+        {
+            case "ItemCloseBtn":
+                if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
+                {
+                    int count = 0;
+                    if (!GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfo, ref count))
+                    {
+                        itemInfo.selfObj.SetActive(true);
+                        Destroy(gameObject);
+                    }
+                    else
+                    {
+
+                        GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
+                    }
+                }
+                break;
+            case "UI_CheckMyselfItem":
+                //TODO something
+                break;
+        }
+    }
+}

Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9db7b09607301694982a934007b3516b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
 using TMPro;
 using UnityEngine;
 
@@ -39,4 +40,23 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
                 break;
         }
     }
+
+    [Button]
+    public void TestRemoveOne()
+    {
+        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
+        {
+            int count = 0;
+            if (!GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfo, ref count))
+            {
+                itemInfo.selfObj.SetActive(true);
+                Destroy(gameObject);
+            }
+            else
+            {
+
+                GetControl<TextMeshProUGUI>("CountText").text = count.ToString();
+            }
+        }
+    }
 }

Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs

@@ -1,20 +1,34 @@
+using System.Linq;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class UI_CheckMyselfPanel : BasePanel
 {
+    private string[] validToolNames = { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" };
+
     public void Init()
     {
-
     }
 
     public override void ShowMe()
     {
-        Debug.Log("ShowMe");
+        var currentBagDataForTool = GameManager.PacksackBagMgr.GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials.Tool);
+        var _content = GetControl<ScrollRect>("itemScrollView").content;
+
+        foreach (var item in currentBagDataForTool.Keys)
+        {
+            if (validToolNames.Contains(item.toolName))
+            {
+                var uiItem =
+                    GameManager.ResourcesMgr.Load<GameObject>(Const.UI_Item + "UI_CheckMyselfPanel/UI_CheckMyselfItem");
+                uiItem.transform.parent = _content;
+                uiItem.GetComponent<UI_CheckMyselfItem>().Init(item,currentBagDataForTool[item].Count);
+            }
+        }
     }
 
     public override void HideMe()
     {
-        Debug.Log("HideMe");
     }
 
     protected override void OnClick(string btnName)
@@ -22,7 +36,7 @@ public class UI_CheckMyselfPanel : BasePanel
         switch (btnName)
         {
             case "closeBtn":
-                 UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
+                UIManager.Instance.HidePanel<UI_CheckMyselfPanel>();
                 //GameManager.UIMgr.HidePanel<UI_CheckMyselfPanel>();
                 break;
             default:

Assets/Scripts/ProjectBase/UIManager/BasePanel.cs

@@ -10,7 +10,7 @@ using UnityEngine.UI;
 public class BasePanel : MonoBehaviour
 {
     /// <summary>
-    /// ??????????§α??
+    /// ??????????????
     /// </summary>
     private readonly Dictionary<string,List<UIBehaviour>> controlDic = new Dictionary<string, List<UIBehaviour>>();
 

Packages/packages-lock.json

@@ -1,5 +1,14 @@
 {
   "dependencies": {
+    "com.singularitygroup.hotreload": {
+      "version": "file:com.singularitygroup.hotreload",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,