From 3df62f9ebfb1aab5649009eff63079fc47483772 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 9 Nov 2023 11:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=95=A3=E7=95=8C=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 79 ++++++++++++++++++- .../~Lua/Modules/Resolve/ResolvePanel.lua | 9 ++- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 23a6ec4956..66c7109494 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -15822,6 +15822,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &477585095123611065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 98874979663188697} + - component: {fileID: 2599895756132708020} + - component: {fileID: 3369791162992935278} + m_Layer: 0 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &98874979663188697 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477585095123611065} + 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: 8907807894101963682} + m_RootOrder: 5 + 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: 185, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2599895756132708020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477585095123611065} + m_CullTransparentMesh: 0 +--- !u!114 &3369791162992935278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 477585095123611065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + 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: 70880bb948d704640910d7f25d8c5294, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &574512829603387917 GameObject: m_ObjectHideFlags: 0 @@ -79681,7 +79755,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: f2393ce2d23f490409ca62cfa0b8f917, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -107516,7 +107590,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8907807894101963682 RectTransform: m_ObjectHideFlags: 0 @@ -107533,6 +107607,7 @@ RectTransform: - {fileID: 8687955517340597716} - {fileID: 670707765421156160} - {fileID: 5761677178132241610} + - {fileID: 98874979663188697} m_Father: {fileID: 6859356168919729670} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index e962a8a82b..044c8ab753 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -6,12 +6,12 @@ local isSha=false--筛选按钮状态 --Tab local TabBox = require("Modules/Common/TabBox") local _TabData={ - [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32", name = Language[11732] }, + [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31", name = Language[11732] }, -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神将归元" }, -- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "法宝归元" }, - [2] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32", name = Language[11603] }, - [3] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32", name = Language[11735] }, - [4] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32", name = "神兵分解" }, + [2] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32", name = Language[11603] }, + [3] = { default = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", name = Language[11735] }, + [4] = { default = "UI_hz_gonghui_34", select = "UI_hz_gonghui_34", name = "神兵分解" }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} @@ -233,6 +233,7 @@ function this.TabAdapter(tab, index, status) Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status]) tabLab:GetComponent("Text").text = GetCurLanguage() ~= 2 and _TabData[index].name or "".._TabData[index].name.."" tabLab:GetComponent("Text").color = _TabFontColor[status] + Util.GetGameObject(tab,"select"):SetActive(status=="select") this.SetBottomBarIsActive(tab, index) end