diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 71b6d79a5b..4ba4290279 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -7915,7 +7915,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 2.27} - m_SizeDelta: {x: 160, y: 96.25} + m_SizeDelta: {x: 150, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2654380200778611347 CanvasRenderer: @@ -7945,7 +7945,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: e1443944b35bf714c9f3a8758f1a4673, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12504,7 +12504,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7653855264894605139 RectTransform: m_ObjectHideFlags: 0 @@ -12516,6 +12516,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1128285814879830855} - {fileID: 5656602527345287586} - {fileID: 8974696871383711971} - {fileID: 1983320106550823417} @@ -13124,7 +13125,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7653855264894605139} - m_RootOrder: 4 + 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} @@ -19088,7 +19089,7 @@ RectTransform: - {fileID: 7856412810161067510} - {fileID: 6147498763642865417} m_Father: {fileID: 7653855264894605139} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19359,7 +19360,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.768265, y: -39} + m_AnchoredPosition: {x: 83.76828, y: -39} m_SizeDelta: {x: 147.53653, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8901599938845851609 @@ -26807,8 +26808,8 @@ RectTransform: 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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 1.4299927, y: 1.6100006} + m_SizeDelta: {x: -6.72, y: -3.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6938504884446585254 CanvasRenderer: @@ -26831,7 +26832,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.42352945, g: 0.42352945, b: 0.42352945, a: 1} + m_Color: {r: 0.42352945, g: 0.42352945, b: 0.42352945, a: 0.65882355} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -31759,7 +31760,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7653855264894605139} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -31860,7 +31861,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 542.75, y: 4042.0002} + m_AnchoredPosition: {x: 542.75, y: 4042} m_SizeDelta: {x: 907.9, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4213099450349952197 @@ -33856,7 +33857,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -13 + m_Spacing: 2 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -35732,7 +35733,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.1000977, y: -14.600586} + m_AnchoredPosition: {x: -3.1000977, y: -14.600342} m_SizeDelta: {x: -168.8, y: -584} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3588302341315408117 @@ -43308,11 +43309,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7653855264894605139} - m_RootOrder: 1 + 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: -379, y: 539} + m_AnchoredPosition: {x: -356.5, y: 539} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &594298357731062741 @@ -51270,7 +51271,7 @@ RectTransform: - {fileID: 3689458856999995734} - {fileID: 6010839507745286382} m_Father: {fileID: 7653855264894605139} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -52941,6 +52942,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 1 +--- !u!1 &7678859967691557142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128285814879830855} + - component: {fileID: 7902122422753439587} + - component: {fileID: 2879467404111028123} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1128285814879830855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7678859967691557142} + 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: 7653855264894605139} + m_RootOrder: 0 + 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: 475.54} + m_SizeDelta: {x: 847.832, y: 4.17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7902122422753439587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7678859967691557142} + m_CullTransparentMesh: 0 +--- !u!114 &2879467404111028123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7678859967691557142} + 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: 08e990c88f7741b48aefcb87e37822ad, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7682764619678230778 GameObject: m_ObjectHideFlags: 0 @@ -55627,7 +55702,7 @@ RectTransform: m_Children: - {fileID: 51626656778598628} m_Father: {fileID: 7653855264894605139} - 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} @@ -55662,7 +55737,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 6d6b014fb4be4e247b02f760eca14db1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59317,7 +59392,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 151.63438, y: -35} + m_AnchoredPosition: {x: 151.63437, y: -35} m_SizeDelta: {x: 263.26877, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6340918513921812379 @@ -59854,8 +59929,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.00097656, y: 0} - m_SizeDelta: {x: 120, y: 100} + m_AnchoredPosition: {x: 0, y: 4} + m_SizeDelta: {x: 150, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5917931538143603185 CanvasRenderer: @@ -59893,7 +59968,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -60563,7 +60638,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7271259109162121319 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index be0b30f96a..4b5e9c9c0f 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -4128,7 +4128,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: -270.53955, y: 543} + m_AnchoredPosition: {x: -270.53955, y: 505.99997} m_SizeDelta: {x: 603.1, y: 560.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &626943662 @@ -6900,7 +6900,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: 252, y: 540} + m_AnchoredPosition: {x: 252, y: 503} m_SizeDelta: {x: 603.1, y: 560.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1039831846 @@ -13877,7 +13877,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -76, y: -22} + m_AnchoredPosition: {x: -76, y: -2} m_SizeDelta: {x: 446, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &171603213543092075 @@ -15433,7 +15433,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 848} + m_AnchoredPosition: {x: 0, y: 811} m_SizeDelta: {x: 0, y: 960} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1742933978437012457 @@ -16626,7 +16626,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: -106, y: -14} + m_AnchoredPosition: {x: -106, y: -25.7} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6949876798601477438 @@ -17209,7 +17209,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: -0.13, y: -22.81} + m_AnchoredPosition: {x: -0.13, y: -6} m_SizeDelta: {x: 231.75, y: 75.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260218398503831726 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua index e0cdcfb02c..5316bf3a01 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua @@ -7,9 +7,9 @@ local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabImgData = {select = "r_tongyong_xiaanniu_01", default = "r_tongyong_xiaanniu_02",} -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), - select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) } +local _TabImgData = {select = "UI_hz_zhonghe01_82", default = "UI_hz_zhonghe01_83",} +local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), + select = Color.New(255 / 255, 255 / 255, 255 / 255, 1) } local _TabData = { [1]= {txt = "全部",quality = 0}, [2]= {txt = "蓝色",quality = 3},