diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index ee89f12bcd..b8b627c9a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -7622,10 +7622,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 760, y: -120} - m_SizeDelta: {x: 200, y: 200} + m_AnchorMin: {x: 0, y: 0} + 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} --- !u!222 &2980853436230393831 CanvasRenderer: @@ -7960,10 +7960,10 @@ RectTransform: m_Father: {fileID: 3689458856999995734} 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: 2.27} - m_SizeDelta: {x: 160, y: 96.25} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2654380200778611347 CanvasRenderer: @@ -7993,7 +7993,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: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11926,10 +11926,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} 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: 100, y: -120} - m_SizeDelta: {x: 200, y: 200} + m_AnchorMin: {x: 0, y: 0} + 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} --- !u!222 &4329534855784721111 CanvasRenderer: @@ -12732,7 +12732,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 @@ -27079,7 +27079,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.8490566, g: 0.8490566, b: 0.8490566, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -27943,15 +27943,15 @@ RectTransform: m_GameObject: {fileID: 3400597863667632724} 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.7, y: 0.7, z: 1} m_Children: [] m_Father: {fileID: 3689458856999995734} 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: 73.9, y: 45.5} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 57.5, y: 30.1} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4995881787811515600 CanvasRenderer: @@ -34083,7 +34083,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: 0, y: -3} + m_AnchoredPosition: {x: 0, y: 8.700001} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &141235908279889864 @@ -34104,7 +34104,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -13 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -35587,10 +35587,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -120} - m_SizeDelta: {x: 200, y: 200} + m_AnchorMin: {x: 0, y: 0} + 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} --- !u!222 &5416947283401139823 CanvasRenderer: @@ -35998,7 +35998,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.600098} + 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 @@ -36976,10 +36976,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -120} - m_SizeDelta: {x: 200, y: 200} + m_AnchorMin: {x: 0, y: 0} + 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} --- !u!222 &1075456802991939877 CanvasRenderer: @@ -43668,7 +43668,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: -379, y: 539} + m_AnchoredPosition: {x: -320, y: 539} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &594298357731062741 @@ -60381,8 +60381,8 @@ GameObject: m_Component: - component: {fileID: 7974451683975434078} - component: {fileID: 5917931538143603185} - - component: {fileID: 1819114477753111420} - component: {fileID: 7778455590429733451} + - component: {fileID: 1772592204579854198} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -60406,8 +60406,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: -0.000041246} + m_SizeDelta: {x: 120, y: 88.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5917931538143603185 CanvasRenderer: @@ -60417,21 +60417,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8948225605125029747} m_CullTransparentMesh: 0 ---- !u!114 &1819114477753111420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8948225605125029747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1.5, y: -1.5} - m_UseGraphicAlpha: 1 --- !u!114 &7778455590429733451 MonoBehaviour: m_ObjectHideFlags: 0 @@ -60445,7 +60430,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: @@ -60457,8 +60442,8 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 - m_MaxSize: 42 + m_MinSize: 38 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -60467,6 +60452,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u91D1\u8272" LanguageIndex: 0 +--- !u!114 &1772592204579854198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8948225605125029747} + 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 &8950156995944815972 GameObject: m_ObjectHideFlags: 0 @@ -61322,8 +61322,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 457.5, y: -43.7} - m_SizeDelta: {x: 150, y: 100} + m_AnchoredPosition: {x: 457.5, y: -44.5} + m_SizeDelta: {x: 150, y: 88.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3102982629149876224 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 484606ff97..2aaab18d9e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -2350,7 +2350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7442141385126438634 RectTransform: m_ObjectHideFlags: 0 @@ -2367,10 +2367,10 @@ RectTransform: m_Father: {fileID: 1828482313430278523} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -322.5} - m_SizeDelta: {x: 550, y: 215} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3770493636493369945 CanvasRenderer: @@ -3636,7 +3636,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4319954644975728847 RectTransform: m_ObjectHideFlags: 0 @@ -3654,10 +3654,10 @@ RectTransform: m_Father: {fileID: 1828482313430278523} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 275, y: 0} - m_SizeDelta: {x: 550, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 275, y: -107.5} + m_SizeDelta: {x: 550, y: 215} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4780749988992621811 CanvasRenderer: @@ -4362,7 +4362,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28627452, a: 1} + m_Color: {r: 0.7169812, g: 0.4933502, b: 0.24012107, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -4866,10 +4866,10 @@ RectTransform: m_Father: {fileID: 7442141385126438634} 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: 275, y: -145} - m_SizeDelta: {x: 550, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6585703927883856743 CanvasRenderer: @@ -4915,7 +4915,7 @@ MonoBehaviour: m_Left: 15 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 10 m_ChildAlignment: 0 m_Spacing: 20 m_ChildForceExpandWidth: 0 @@ -5738,10 +5738,10 @@ RectTransform: m_Father: {fileID: 4319954644975728847} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 550, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 275, y: -145} + m_SizeDelta: {x: 550, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &902351682421173202 CanvasRenderer: @@ -7202,7 +7202,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: 300, y: -43} + m_AnchoredPosition: {x: 275, y: -43} m_SizeDelta: {x: 265.96, y: 54.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5416839627974058720 @@ -7220,7 +7220,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5102170010853879747} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab index 319cb9f3e3..37014f0130 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab @@ -674,6 +674,7 @@ GameObject: - component: {fileID: 7678107910985563933} - component: {fileID: 1529890433552485898} - component: {fileID: 4731507956104590779} + - component: {fileID: 3497004435606172587} m_Layer: 5 m_Name: getAgain m_TagString: Untagged @@ -721,7 +722,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -743,6 +744,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u518D\u6B21\u9886\u53D6" LanguageIndex: 0 +--- !u!114 &3497004435606172587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2812539162851467086} + 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 &2915068202645994490 GameObject: m_ObjectHideFlags: 0 @@ -809,7 +825,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: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1241,7 +1257,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 251.02, y: -108.73} - m_SizeDelta: {x: 230.04, y: 74.46} + m_SizeDelta: {x: 230.04, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267628388222294 CanvasRenderer: @@ -1271,7 +1287,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: 179ba29a4451da245a7d6cfcaae39cc2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1865,7 +1881,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.29803923, g: 0.2784314, b: 0.24313727, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2198,7 +2214,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: -6.54, y: 10000} + m_AnchoredPosition: {x: -264, y: 10000} m_SizeDelta: {x: 977.09, y: 140.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629551588877 @@ -2433,8 +2449,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 39.19995, y: 104.200195} - m_SizeDelta: {x: 79, y: 175} + m_AnchoredPosition: {x: 50.4, y: 104.200195} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629619513684 CanvasRenderer: @@ -2464,7 +2480,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: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2923,7 +2939,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6268446508802039740 RectTransform: m_ObjectHideFlags: 0 @@ -2940,8 +2956,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: 74, y: 17.9} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 97.2, y: 34.7} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2908274723433597685 CanvasRenderer: @@ -3146,6 +3162,7 @@ GameObject: - component: {fileID: 6116206042610156018} - component: {fileID: 9045877026921361045} - component: {fileID: 1107670703271013754} + - component: {fileID: 4213247205503086617} m_Layer: 5 m_Name: get m_TagString: Untagged @@ -3193,7 +3210,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137255, g: 0.23137255, b: 0.23137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3215,6 +3232,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9886\u53D6" LanguageIndex: 0 +--- !u!114 &4213247205503086617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4430165500360288621} + 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 &6404533595248026962 GameObject: m_ObjectHideFlags: 0 @@ -3582,7 +3614,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: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab index bc4f78f743..705eab47b2 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab @@ -62232,7 +62232,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5927\u79D8\u5B9D" + m_Text: "\u6218\u4EE4" --- !u!114 &164993047 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75265,71 +75265,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 478.1 objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 39.475 - objectReference: {fileID: 0} - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 6789526059838717039} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 3847535138429139909} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 3458715491590983735} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 3017694835917112368} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 6642769763838568755} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 382756852119676122} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1158195459222167083} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2874966427381289844} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8697078770617743630} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 7324771491079276774} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 6789526059838717039} + propertyPath: m_AnchoredPosition.x + value: 39.475 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75385,6 +75330,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 4239138255771575618} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6789526059838717039} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3847535138429139909} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 3458715491590983735} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 3017694835917112368} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6642769763838568755} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 382756852119676122} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1158195459222167083} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2874966427381289844} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8697078770617743630} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7324771491079276774} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6789526059838717039} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2874966427381289844 stripped @@ -75660,71 +75660,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 478.1 objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 39.475 - objectReference: {fileID: 0} - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 7917258885034123966} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 469443268855522580} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 2024701814541766374} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 1875746557491206881} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8055012424555673570} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3938731767263050251} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 2590766443349557498} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 1442016386633059749} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 5428183252868327391} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 6215016020277614135} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 7917258885034123966} + propertyPath: m_AnchoredPosition.x + value: 39.475 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75780,6 +75725,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 662747332772281235} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7917258885034123966} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 469443268855522580} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 2024701814541766374} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 1875746557491206881} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8055012424555673570} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3938731767263050251} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 2590766443349557498} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 1442016386633059749} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 5428183252868327391} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6215016020277614135} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7917258885034123966} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &1442016386633059749 stripped @@ -76055,71 +76055,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 478.1 objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 39.475 - objectReference: {fileID: 0} - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -50 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 7472164165561955869} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 931814734807593399} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 1618088765004405317} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 1182838340984393282} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 7324141232903758657} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 4378795258779545256} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 2997696272135148633} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2192873659091441926} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4699914484981592956} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 6642132831306302100} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 7472164165561955869} + propertyPath: m_AnchoredPosition.x + value: 39.475 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -76175,6 +76120,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 242976170226757424} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7472164165561955869} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 931814734807593399} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 1618088765004405317} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 1182838340984393282} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7324141232903758657} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 4378795258779545256} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 2997696272135148633} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2192873659091441926} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4699914484981592956} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6642132831306302100} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7472164165561955869} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4378795258779545256 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab index 8aeb250c2f..c8bcacecda 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab @@ -126,6 +126,21 @@ MonoBehaviour: m_EffectColor: {r: 0.8431373, g: 0.3254902, b: 0.37254903, a: 1} m_EffectDistance: {x: 3, y: -3} m_UseGraphicAlpha: 1 +--- !u!114 &4293221213583313130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6500457422793428576} + 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!1001 &6897800647744942611 PrefabInstance: m_ObjectHideFlags: 0 @@ -320,6 +335,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: -1079 objectReference: {fileID: 0} + - target: {fileID: 5531067337302600566, guid: 807c01db712c1334a813e0e22a3dcbc7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 164 + objectReference: {fileID: 0} - target: {fileID: 1851367787480191434, guid: 807c01db712c1334a813e0e22a3dcbc7, type: 3} propertyPath: m_LocalRotation.z @@ -364,6 +384,21 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: ba7b720192d6b794a9cd647d943a96e7, type: 3} + - target: {fileID: 5150509885150251965, guid: 807c01db712c1334a813e0e22a3dcbc7, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5150509885150251965, guid: 807c01db712c1334a813e0e22a3dcbc7, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5150509885150251965, guid: 807c01db712c1334a813e0e22a3dcbc7, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4721385739733905752, guid: 807c01db712c1334a813e0e22a3dcbc7, type: 3} propertyPath: m_TargetGraphic @@ -429,6 +464,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &6500457422793428576 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 400726570511940723, guid: 807c01db712c1334a813e0e22a3dcbc7, + type: 3} + m_PrefabInstance: {fileID: 6897800647744942611} + m_PrefabAsset: {fileID: 0} --- !u!114 &1687378032547700406 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5247586669901016229, guid: 807c01db712c1334a813e0e22a3dcbc7, diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 429d89c94d..97fbfd23b8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -883,9 +883,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -111.00625} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &900680271470056465 @@ -1120,9 +1120,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -231.86877} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1744455878834321058 @@ -1344,7 +1344,6 @@ GameObject: - component: {fileID: 2212749366653133608} - component: {fileID: 1793275980231118631} - component: {fileID: 969936460399859575} - - component: {fileID: 8016616871031637994} m_Layer: 5 m_Name: armorDesc m_TagString: Untagged @@ -1366,9 +1365,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -191.58127} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1793275980231118631 @@ -1392,7 +1391,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8000001, b: 0, a: 1} + m_Color: {r: 0.38679248, g: 0.32293525, b: 0.06750623, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1400,7 +1399,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1414,21 +1413,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 ---- !u!114 &8016616871031637994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2719816910815019633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 1, g: 0.18115139, b: 0.023584902, a: 1} - m_EffectDistance: {x: 0.4, y: -0.4} - m_UseGraphicAlpha: 1 --- !u!1 &2951906494525440713 GameObject: m_ObjectHideFlags: 0 @@ -1756,9 +1740,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4176913724073967866 @@ -2317,9 +2301,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -272.15628} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &59271303520494573 @@ -2343,7 +2327,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8000001, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2351,7 +2335,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2959,9 +2943,9 @@ RectTransform: m_Father: {fileID: 9015164529682029271} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 439.04498, y: -109.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 489.31, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5008996957804351971 @@ -3477,9 +3461,9 @@ RectTransform: m_Father: {fileID: 9015164529682029271} 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: 99, y: -109.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &862557542865219844 @@ -3501,7 +3485,6 @@ GameObject: - component: {fileID: 6708840274652747615} - component: {fileID: 4555694585401691132} - component: {fileID: 1526607283059985641} - - component: {fileID: 2138956274444812079} m_Layer: 5 m_Name: armorTitle m_TagString: Untagged @@ -3523,9 +3506,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -151.29376} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4555694585401691132 @@ -3549,7 +3532,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8000001, b: 0, a: 1} + m_Color: {r: 0.3882353, g: 0.3254902, b: 0.07058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3557,7 +3540,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -3571,21 +3554,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 ---- !u!114 &2138956274444812079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8931399907882658774} - 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: 0.4, y: -0.4} - m_UseGraphicAlpha: 1 --- !u!1 &9129434382821642174 GameObject: m_ObjectHideFlags: 0 @@ -3794,9 +3762,9 @@ RectTransform: m_Father: {fileID: 5657074182624981674} 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: 80, y: -70.71875} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6093494655719889455 diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index f3c39a2bef..9fe6e0b5cd 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -9562,7 +9562,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u63A8\u8FDB\u57CE\u79D8\u5B9D" + m_Text: "\u751F\u5B58\u79D8\u5B9D" --- !u!114 &1506259852 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13400,8 +13400,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: 40, y: 40} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 64, y: 54} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240833141015611540 CanvasRenderer: @@ -14479,14 +14479,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5754717, g: 0.5754717, b: 0.5754717, a: 1} + 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: 7047902cea7e0a644bec2bf166d4f6c1, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5ff3c7d2db3214693ff66dcf9dc8af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15966,7 +15966,7 @@ MonoBehaviour: m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 1 - m_CellSize: {x: 150, y: 180} + m_CellSize: {x: 150, y: 172} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 @@ -17425,7 +17425,7 @@ MonoBehaviour: m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 1 - m_CellSize: {x: 150, y: 180} + m_CellSize: {x: 150, y: 172} m_Spacing: {x: 0, y: 25} m_Constraint: 1 m_ConstraintCount: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua index 5316bf3a01..6522d17958 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua @@ -7,7 +7,7 @@ local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabImgData = {select = "UI_hz_zhonghe01_82", default = "UI_hz_zhonghe01_83",} +local _TabImgData = {select = "task_bigbtn02", default = "task_bigbtn01",} local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(255 / 255, 255 / 255, 255 / 255, 1) } local _TabData = { @@ -19,10 +19,10 @@ local _TabData = { } local QUALITY = { - [3] = {light="q_qjsl_yw_jhl",kuang="q_qjsl_yw_jsl"}, - [4] = {light="q_qjsl_yw_jhz",kuang="q_qjsl_yw_jsz"}, - [5] = {light="q_qjsl_yw_jhhs",kuang="q_qjsl_yw_jshs"}, - [6] = {light="q_qjsl_yw_jhh",kuang="q_qjsl_yw_jsh"}, + [3] = {light="X1_tongyong_daojukuang_03",kuang="X1_tongyong_daojukuang_03"}, + [4] = {light="X1_tongyong_daojukuang_04",kuang="X1_tongyong_daojukuang_04"}, + [5] = {light="X1_tongyong_daojukuang_05",kuang="X1_tongyong_daojukuang_05"}, + [6] = {light="X1_tongyong_daojukuang_06",kuang="X1_tongyong_daojukuang_06"}, } --初始化组件(用于子类重写)