From 5fb2b0a5bc9a18701208b477eeb3549c673c15ef Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Sat, 20 Jan 2024 18:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GodWeapon/GodWeaponUpPanel.prefab | 42 ++++++++--------- .../Prefabs/UI/Setting/SettingPanel.prefab | 46 +++++++++++++------ .../Modules/GodWeapon/GodWeaponUpPanel.lua | 1 + .../~Lua/Modules/Setting/SettingPanel.lua | 4 +- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab index 5a1038562d..9da0c22c5f 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab @@ -897,7 +897,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000001391117} m_SizeDelta: {x: 921.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4363852263215371060 @@ -1053,7 +1053,7 @@ 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: 72.1, y: 73.1} + m_AnchoredPosition: {x: 84, y: 37} m_SizeDelta: {x: 21.86, y: 21.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2145840975992949321 @@ -1948,8 +1948,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: -258.3, y: 50.300003} - m_SizeDelta: {x: 186, y: 173} + m_AnchoredPosition: {x: -7, y: 50.300003} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433971505799301 CanvasRenderer: @@ -1979,7 +1979,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: a758002a909c6bf478516e8eb95c858e, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2568,10 +2568,10 @@ RectTransform: m_Father: {fileID: 2521433973095257020} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1.75, y: -105.3} - m_SizeDelta: {x: -3.5, y: -141.4} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1.75, y: 0} + m_SizeDelta: {x: 201.5, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972804930182 CanvasRenderer: @@ -3097,7 +3097,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 4.1500244, y: -6.5999756} - m_SizeDelta: {x: 185, y: 170} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433973022598370 CanvasRenderer: @@ -3127,7 +3127,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: 70880bb948d704640910d7f25d8c5294, type: 3} + m_Sprite: {fileID: 21300000, guid: e1443944b35bf714c9f3a8758f1a4673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3216,8 +3216,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: -451, y: 49} - m_SizeDelta: {x: 186, y: 173} + m_AnchoredPosition: {x: -346, y: 49} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433973095257019 CanvasRenderer: @@ -3247,7 +3247,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: a758002a909c6bf478516e8eb95c858e, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3458,10 +3458,10 @@ RectTransform: m_Father: {fileID: 2521433971505799302} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -102.399994} - m_SizeDelta: {x: 0, y: -134.3} + 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: 205, y: 69.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433973524405877 CanvasRenderer: @@ -3685,7 +3685,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5884600312981211126 RectTransform: m_ObjectHideFlags: 0 @@ -6376,7 +6376,7 @@ 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: 71.6, y: 71.07} + m_AnchoredPosition: {x: 83.50002, y: 34.97001} m_SizeDelta: {x: 21.86, y: 21.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6316209906261454580 @@ -7143,7 +7143,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &249207812581562101 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index ae736b6b6c..6902936639 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -784,7 +784,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5655121485874319116} - m_RootOrder: 3 + 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} @@ -989,12 +989,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5655121485874319116} - m_RootOrder: 5 + m_RootOrder: 2 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_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7209960396231667034 CanvasRenderer: @@ -1024,7 +1024,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: 70880bb948d704640910d7f25d8c5294, type: 3} + m_Sprite: {fileID: 21300000, guid: e1443944b35bf714c9f3a8758f1a4673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1335,6 +1335,7 @@ GameObject: - component: {fileID: 8243608562305229593} - component: {fileID: 7629167865370302842} - component: {fileID: 7522856379374678714} + - component: {fileID: 6150400365497167900} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -1358,8 +1359,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: -137.3} - m_SizeDelta: {x: 160, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7629167865370302842 CanvasRenderer: @@ -1396,13 +1397,28 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u725B\u6C14\u51B2\u5929\n" +--- !u!114 &6150400365497167900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459097135822737903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &473609383294894480 GameObject: m_ObjectHideFlags: 0 @@ -1469,17 +1485,17 @@ RectTransform: m_Children: - {fileID: 7102323360649160353} - {fileID: 5844646245707079795} - - {fileID: 7349623221013292640} - - {fileID: 6285497830612136892} - - {fileID: 8243608562305229593} - {fileID: 4414302460153612483} + - {fileID: 7349623221013292640} + - {fileID: 8243608562305229593} + - {fileID: 6285497830612136892} m_Father: {fileID: 2523992045130519754} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 112, y: 0} - m_SizeDelta: {x: 184, y: 175} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7341017649527121668 CanvasRenderer: @@ -3676,7 +3692,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5655121485874319116} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13161,7 +13177,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6564110138579792656} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -14238,7 +14254,7 @@ RectTransform: 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: 186, y: 173} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2360973790889236105 CanvasRenderer: @@ -14268,7 +14284,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: a758002a909c6bf478516e8eb95c858e, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua index dc507eb367..68f860a3be 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua @@ -184,6 +184,7 @@ function this.SetSelectBtn() this.selectText.text="升星" end this.selectBtn.transform:SetParent(_btnTab.transform) + this.selectBtn.transform:SetSiblingIndex(1) this.selectBtn.transform.localPosition = Vector3.zero this.selectBtn.transform.localScale = Vector3.one end diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index d935ed9609..6e72abef42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -10,8 +10,8 @@ local _TabData={ [2] = { default = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", name = Language[12314],rpType = RedPointType.Setting_Title }, -- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装",rpType = RedPointType.Setting_Skin }, } -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), - select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} +local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), + select = Color.New(255 / 255, 255 / 255, 255 / 255, 1)} --子模块脚本 this.contents = { --信息