From c4790903269f68f47d6f0f8a35abd08ca8c80f20 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 11 Jul 2024 14:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=A3=E6=95=A3=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 78 +++++++++---------- .../~Lua/Modules/Resolve/ResolvePanel.lua | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index ed11ccd477..32aea389be 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -5920,7 +5920,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6630273786794472594 RectTransform: m_ObjectHideFlags: 0 @@ -22822,8 +22822,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3666255025854377301} - {fileID: 300383270252455509} + - {fileID: 3666255025854377301} - {fileID: 8118100312009103956} - {fileID: 600079498660936705} - {fileID: 6334397144791350490} @@ -23030,7 +23030,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4582380774234793141} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -23065,7 +23065,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54379,7 +54379,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3649966427434176771 RectTransform: m_ObjectHideFlags: 0 @@ -54394,10 +54394,10 @@ RectTransform: m_Father: {fileID: 4582380774234793141} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 410} - m_SizeDelta: {x: 0, y: 19} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 56.724854} + m_SizeDelta: {x: 1082, y: 118.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &542121234047010481 CanvasRenderer: @@ -54427,8 +54427,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a88f779e75f23d444939266ff1b08939, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -79797,7 +79797,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -79964,7 +79964,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6061645141470258472 RectTransform: m_ObjectHideFlags: 0 @@ -79972,17 +79972,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3336735637940673795} - m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + 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: 4582380774234793141} m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + 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: 400.9} - m_SizeDelta: {x: 1500, y: 35.1} + m_AnchoredPosition: {x: 0, y: -683.2} + m_SizeDelta: {x: 1080, y: 366.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4496328919072966302 CanvasRenderer: @@ -103924,7 +103924,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &818048423618081512 RectTransform: m_ObjectHideFlags: 0 @@ -103941,8 +103941,8 @@ RectTransform: 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: 468} - m_SizeDelta: {x: 1500, y: 105} + m_AnchoredPosition: {x: -0.925, y: -362.4} + m_SizeDelta: {x: 1080.1, y: 942.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5844668397619153858 CanvasRenderer: @@ -103965,14 +103965,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3207547, g: 0.31016374, b: 0.31016374, a: 0.16862746} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2535727c0a01d8443856ae394701eada, type: 3} + m_Sprite: {fileID: 21300000, guid: 6feed93c4fab3a84fba5d137c948b1bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -105114,7 +105114,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: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -105758,7 +105758,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -117641,8 +117641,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -426} - m_SizeDelta: {x: 1080, y: -850} + m_AnchoredPosition: {x: 0, y: -438.59998} + m_SizeDelta: {x: 1080, y: -824.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4148732720839314419 CanvasRenderer: @@ -183401,17 +183401,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7239661180285388931} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: [] m_Father: {fileID: 4582380774234793141} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 439} - m_SizeDelta: {x: 1080, y: -1122} + m_AnchoredPosition: {x: 63, y: -447} + m_SizeDelta: {x: 2000, y: 1125} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8580902987550828103 CanvasRenderer: @@ -183441,7 +183441,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6d7a19ca8c4f717448c4b407d1c3f2bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 68bba67eed6082149af4ecf3aa0fedc0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -185082,7 +185082,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 18.400003, y: -89} + m_AnchoredPosition: {x: 18.400003, y: -88.999756} m_SizeDelta: {x: 1000.3, y: 80.099976} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7583128554718342606 @@ -194124,9 +194124,9 @@ RectTransform: m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -251} - m_SizeDelta: {x: 0, y: 1340} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 541, y: -814} + m_SizeDelta: {x: 1082, y: 293} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4972352812197211438 CanvasRenderer: @@ -194156,7 +194156,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1b290c28f6ecd7b419ff0a2fdf22a27f, type: 3} + m_Sprite: {fileID: 21300000, guid: d0af3f2a2e71ac6438b1f993847a96c2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -195110,7 +195110,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4456537145914281463 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index fb7bc741c5..87cf93327f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -37,7 +37,7 @@ local curIndex=0 local titleImageName={"gongsong_zh","h_xianji_fenjie_zh","lingshou_lingshoufangshengzi_zh","GodWeaponAtlas_fenjie_title_zh"}--,"guiyuan_zh","h_guiyuan_zi_zh" local titleName={Language[11732],"饰品分解",Language[11735],"名刀分解"} local titleColor={Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1),Color.New(243 / 255, 235 / 255, 202 / 255, 1)} -local bgImageName={"UI_hz_ls_01","UI_hz_ls_07","UI_hz_ls_08"}--,"h_huisu_ditu","h_xianji_guiyuanditu" +local bgImageName={"LZH417","LZH417","LZH417"}--,"h_huisu_ditu","h_xianji_guiyuanditu" local heroEndBtns = {} local tabSortType