diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/CharacterEquip/CharacterEquipBt.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/CharacterEquip/CharacterEquipBt.prefab index 47284aa9..45c24237 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/CharacterEquip/CharacterEquipBt.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/CharacterEquip/CharacterEquipBt.prefab @@ -1,5 +1,77 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &733590637826882337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 416953365192912442} + - component: {fileID: 2272547794407548622} + - component: {fileID: 8918093622557918298} + m_Layer: 5 + m_Name: Texture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &416953365192912442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 733590637826882337} + 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: 7773628375646258405} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2272547794407548622 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 733590637826882337} + m_CullTransparentMesh: 1 +--- !u!114 &8918093622557918298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 733590637826882337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &6749027252962262180 GameObject: m_ObjectHideFlags: 0 @@ -17,7 +89,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5395866562595971437 RectTransform: m_ObjectHideFlags: 0 @@ -112,6 +184,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5395866562595971437} + - {fileID: 416953365192912442} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab index 7559c88a..6e66dc78 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/Window/ToolsPack/ToolsPackWindow.prefab @@ -710,12 +710,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Content: {fileID: 6091016818118789364} m_Horizontal: 0 - m_Vertical: 0 + m_Vertical: 1 m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 10 m_Viewport: {fileID: 8322531987110649510} m_HorizontalScrollbar: {fileID: 5181046970735250682} m_VerticalScrollbar: {fileID: 3375070171143465884} @@ -1013,6 +1013,7 @@ GameObject: m_Component: - component: {fileID: 6091016818118789364} - component: {fileID: 2673424703072191146} + - component: {fileID: 233419424402274259} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -1037,7 +1038,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 300} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2673424703072191146 MonoBehaviour: @@ -1063,6 +1064,20 @@ MonoBehaviour: m_Spacing: {x: 21, y: 21} m_Constraint: 1 m_ConstraintCount: 4 +--- !u!114 &233419424402274259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6297966342962304063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &7203585046012487069 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/I型集中器.png b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/l型集中器.png similarity index 100% rename from SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/I型集中器.png rename to SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/l型集中器.png diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/I型集中器.png.meta b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/l型集中器.png.meta similarity index 82% rename from SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/I型集中器.png.meta rename to SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/l型集中器.png.meta index 3bd04221..678fee09 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/I型集中器.png.meta +++ b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/l型集中器.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -93,13 +93,26 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱手套.png b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱布手套.png similarity index 100% rename from SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱手套.png rename to SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱布手套.png diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱手套.png.meta b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱布手套.png.meta similarity index 100% rename from SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱手套.png.meta rename to SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/纱布手套.png.meta diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity index 721a35fa..d148fcba 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity @@ -2665,7 +2665,6 @@ RectTransform: m_Children: - {fileID: 435344340} - {fileID: 1494204031} - - {fileID: 777843939} - {fileID: 665983588} m_Father: {fileID: 1245220569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2712,81 +2711,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 764280860} m_CullTransparentMesh: 1 ---- !u!1 &777843938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 777843939} - - component: {fileID: 777843941} - - component: {fileID: 777843940} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &777843939 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 777843938} - 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: 764280861} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &777843940 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 777843938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &777843941 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 777843938} - m_CullTransparentMesh: 1 --- !u!1001 &822250774 PrefabInstance: m_ObjectHideFlags: 0 @@ -4223,7 +4147,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1245220569 RectTransform: m_ObjectHideFlags: 0 @@ -4301,10 +4225,10 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 18.17, y: 13.91} + m_CellSize: {x: 172, y: 136} + m_Spacing: {x: 52.73, y: 13.91} m_Constraint: 1 - m_ConstraintCount: 6 + m_ConstraintCount: 4 --- !u!114 &1331583479 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5253,7 +5177,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 771533140443e594e82e9efbfc60f320, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e216cd292e7bf746a7a8ed0125257f2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs index 15b804b1..53d632d4 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs @@ -24,6 +24,12 @@ namespace DefaultNamespace CharacterEquipInfoManager.Instance.Equipment(this.name, isChange); }); + + + + this.transform.Find("Texture").GetComponent().texture= MotionEngine.GetModule().GetToolsPackWindowBtImage(this.name); + + } } } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index 9a5a76bb..3759f354 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -25,9 +25,7 @@ namespace DefaultNamespace.ProcessMode if (!processes.ContainsKey(type)) { processes[type] = new AnimationProcess(type); - if (Enum.TryParse(type, true, out currentMode)) - { - } + Enum.TryParse(type, true, out currentMode); } } diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs index fd1f56a2..1d8eaadc 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackSceneJump.cs @@ -11,7 +11,7 @@ namespace ToolsPack { this.GetComponent