diff --git a/Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture b/Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture index 8cad233..1f7d121 100644 --- a/Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture +++ b/Assets/ArtRes/RenderTexture/PlayerRenderTexture.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 256 - m_Height: 256 + m_Width: 255 + m_Height: 489 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab b/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab similarity index 96% rename from Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab rename to Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab index 62fe22b..93d71f8 100644 --- a/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab +++ b/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 diff --git a/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab.meta b/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab.meta similarity index 100% rename from Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/CheckMyselfItem.prefab.meta rename to Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab.meta diff --git a/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab index 354778c..11d3d74 100644 --- a/Assets/Resources/UI/UI_Panel/UI_ToolAndMaterialPanel.prefab +++ b/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 diff --git a/Assets/SandBox/TestUIPanelScenes/UI_LowTensionWorkTicketPanel.unity b/Assets/SandBox/TestUIPanelScenes/UI_LowTensionWorkTicketPanel.unity index 42489b5..8f517f2 100644 --- a/Assets/SandBox/TestUIPanelScenes/UI_LowTensionWorkTicketPanel.unity +++ b/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: - - {fileID: 793798410} + m_Children: [] 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} diff --git a/Assets/Scenes/01_InitScene.unity b/Assets/Scenes/01_InitScene.unity index 1ca565d..76b891c 100644 --- a/Assets/Scenes/01_InitScene.unity +++ b/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 diff --git a/Assets/Scripts/Project/CXX.meta b/Assets/Scripts/CXX.meta similarity index 100% rename from Assets/Scripts/Project/CXX.meta rename to Assets/Scripts/CXX.meta diff --git a/Assets/Scripts/Project/CXX/StepState.cs b/Assets/Scripts/CXX/StepState.cs similarity index 100% rename from Assets/Scripts/Project/CXX/StepState.cs rename to Assets/Scripts/CXX/StepState.cs diff --git a/Assets/Scripts/Project/CXX/StepState.cs.meta b/Assets/Scripts/CXX/StepState.cs.meta similarity index 100% rename from Assets/Scripts/Project/CXX/StepState.cs.meta rename to Assets/Scripts/CXX/StepState.cs.meta diff --git a/Assets/Scripts/Project/CXX/StepStateBase.cs b/Assets/Scripts/CXX/StepStateBase.cs similarity index 100% rename from Assets/Scripts/Project/CXX/StepStateBase.cs rename to Assets/Scripts/CXX/StepStateBase.cs diff --git a/Assets/Scripts/Project/CXX/StepStateBase.cs.meta b/Assets/Scripts/CXX/StepStateBase.cs.meta similarity index 100% rename from Assets/Scripts/Project/CXX/StepStateBase.cs.meta rename to Assets/Scripts/CXX/StepStateBase.cs.meta diff --git a/Assets/Scripts/Project/CXX/StepStateControl.cs b/Assets/Scripts/CXX/StepStateControl.cs similarity index 100% rename from Assets/Scripts/Project/CXX/StepStateControl.cs rename to Assets/Scripts/CXX/StepStateControl.cs diff --git a/Assets/Scripts/Project/CXX/StepStateControl.cs.meta b/Assets/Scripts/CXX/StepStateControl.cs.meta similarity index 100% rename from Assets/Scripts/Project/CXX/StepStateControl.cs.meta rename to Assets/Scripts/CXX/StepStateControl.cs.meta diff --git a/Assets/Scripts/CXX/Tools.meta b/Assets/Scripts/CXX/Tools.meta new file mode 100644 index 0000000..be91bfd --- /dev/null +++ b/Assets/Scripts/CXX/Tools.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1df0e3d6d1e61349adf0cb3bb714ac5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs new file mode 100644 index 0000000..be7af9a --- /dev/null +++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 工具材料基类 +/// +public class Tool_Base : MonoBehaviour +{ + // +} diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs.meta b/Assets/Scripts/CXX/Tools/Tool_Base.cs.meta new file mode 100644 index 0000000..533ad6c --- /dev/null +++ b/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: diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs new file mode 100644 index 0000000..227fd1c --- /dev/null +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 验电笔 +/// +public class Tool_TestPen : Tool_Base +{ + public void MoveTo() + { + + } +} diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs.meta b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs.meta new file mode 100644 index 0000000..656c270 --- /dev/null +++ b/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: diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs index befb962..04b6e9a 100644 --- a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs +++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs @@ -38,25 +38,25 @@ public class PacksackBagMgr : BaseManager public Dictionary> GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials tmdTpye) { - Dictionary> temp = new Dictionary>(); + Dictionary> tempNew = new Dictionary>(); 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() { item }); + tempNew.Add(item, new List() { item }); } } } - return temp; + return tempNew; } /// diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs index 131ae3b..b91f934 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs +++ b/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();//提示面板 } + + [Button] + public void TestAddOne() + { + GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo); + _highlight.highlighted = false; + gameObject.SetActive(false); + GameManager.UIMgr.HidePanel();//提示面板 + } } diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs new file mode 100644 index 0000000..330e9c0 --- /dev/null +++ b/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("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("CountText").text = count.ToString(); + } + } + break; + case "UI_CheckMyselfItem": + //TODO something + break; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs.meta b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs.meta new file mode 100644 index 0000000..c14b271 --- /dev/null +++ b/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: diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 77adb47..e134102 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/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("CountText").text = count.ToString(); + } + } + } } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs index bd0d34a..cc153eb 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs +++ b/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("itemScrollView").content; + + foreach (var item in currentBagDataForTool.Keys) + { + if (validToolNames.Contains(item.toolName)) + { + var uiItem = + GameManager.ResourcesMgr.Load(Const.UI_Item + "UI_CheckMyselfPanel/UI_CheckMyselfItem"); + uiItem.transform.parent = _content; + uiItem.GetComponent().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(); + UIManager.Instance.HidePanel(); //GameManager.UIMgr.HidePanel(); break; default: diff --git a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs index 0129059..d02f703 100644 --- a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs +++ b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs @@ -10,7 +10,7 @@ using UnityEngine.UI; public class BasePanel : MonoBehaviour { /// - /// ??????????п?? + /// ?????????????? /// private readonly Dictionary> controlDic = new Dictionary>(); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 42cae11..49a6904 100644 --- a/Packages/packages-lock.json +++ b/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,