diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab index c69d9ffcdc..2de15f0ed1 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2116659517} - component: {fileID: 2116659516} m_Layer: 5 - m_Name: Image (1) + m_Name: DownBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -31,7 +31,7 @@ RectTransform: m_Children: - {fileID: 21414102437267752} m_Father: {fileID: 2155765969751685322} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -476,7 +476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -183, y: 62} + m_AnchoredPosition: {x: -183, y: 35} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8863082876799844785 @@ -534,7 +534,7 @@ GameObject: - component: {fileID: 6569879826823042364} - component: {fileID: 7493883999557490954} m_Layer: 5 - m_Name: Image (2) + m_Name: UPBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -553,12 +553,12 @@ RectTransform: m_Children: - {fileID: 5854163897430184175} m_Father: {fileID: 2155765969751685322} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.025146484, y: -50} - m_SizeDelta: {x: -0.099975586, y: 100} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6569879826823042364 CanvasRenderer: @@ -933,7 +933,7 @@ GameObject: - component: {fileID: 3060067227909623060} - component: {fileID: 1385509141848692797} m_Layer: 5 - m_Name: Image + m_Name: BGxia m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -946,17 +946,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 872910754831930857} - 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: 1.5, y: 1.5, z: 1} m_Children: [] - m_Father: {fileID: 9040369084567382052} - m_RootOrder: 0 + m_Father: {fileID: 2155765969751685322} + 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: 524.74, y: -467.1} - m_SizeDelta: {x: -1273.38, y: -1063.4} + m_AnchoredPosition: {x: -4.9000244, y: -573.6001} + m_SizeDelta: {x: -288.4, y: -1477.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3060067227909623060 CanvasRenderer: @@ -979,15 +979,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4433962, g: 0.4245728, b: 0.4245728, a: 0.94509804} 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: ff9e101cc1eb87445a4e1e256d964d7a, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 38bd1a991d78cf64687634a598f7bf62, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6128,7 +6128,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2155765969751685322} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -6223,14 +6223,14 @@ RectTransform: m_GameObject: {fileID: 1336104246635325114} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4072935318317542415} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -346, y: -91} + m_AnchoredPosition: {x: -175, y: -106} m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4705537261379448976 @@ -6423,17 +6423,15 @@ RectTransform: m_GameObject: {fileID: 1558974222827538013} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} - m_Children: - - {fileID: 3912835091265650747} - - {fileID: 6001477027529160757} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] m_Father: {fileID: 2155765969751685322} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -792, y: 133} - m_SizeDelta: {x: 920, y: -430} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -315, y: -463} + m_SizeDelta: {x: 2000, y: 1490} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6168287311235063520 CanvasRenderer: @@ -6502,7 +6500,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2155765969751685322} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -22589,7 +22587,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 111, y: 31} - m_SizeDelta: {x: 26, y: 26} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5669379983633071369 CanvasRenderer: @@ -32953,6 +32951,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9040369084567382052} + - {fileID: 3912835091265650747} + - {fileID: 6001477027529160757} - {fileID: 508951510436007231} - {fileID: 577102399245695346} - {fileID: 2032698284345472482} @@ -38378,12 +38378,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2155765969751685322} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -279.3, y: -1147} - m_SizeDelta: {x: -521.4, y: 128.19995} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 277, y: -1147} + m_SizeDelta: {x: 558.6, y: 128.19995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5101248089985389127 CanvasRenderer: @@ -44045,16 +44045,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7970458928979676634} - 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: 1.5, y: 1.5, z: 1} m_Children: [] - m_Father: {fileID: 9040369084567382052} - m_RootOrder: 1 + m_Father: {fileID: 2155765969751685322} + m_RootOrder: 2 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: -1, y: -73.79999} + m_AnchoredPosition: {x: -793.5, y: 1139.8} m_SizeDelta: {x: 1078.7, y: 123.599976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111753186594748698 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 692f977079..f40dd9ff07 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -31,7 +31,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -219,7 +219,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -325,7 +325,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - 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} @@ -371,7 +371,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - 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} @@ -5185,12 +5185,12 @@ RectTransform: m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - 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: 2, y: 0} - m_SizeDelta: {x: 73, y: 36} + m_AnchoredPosition: {x: 2, y: -38.299988} + m_SizeDelta: {x: 34, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &376801912 CanvasRenderer: @@ -5333,7 +5333,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5469,7 +5469,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &833350864 RectTransform: m_ObjectHideFlags: 0 @@ -5486,8 +5486,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &833350866 CanvasRenderer: @@ -5631,7 +5631,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - 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} @@ -10485,7 +10485,7 @@ RectTransform: - {fileID: 252862588} - {fileID: 1506957856} m_Father: {fileID: 1956484872} - 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} @@ -10540,7 +10540,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - 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} @@ -10704,12 +10704,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: 9, y: 17.999985} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 1, y: 1} --- !u!222 &1148108882 CanvasRenderer: @@ -25121,6 +25121,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1071262802687969794} - {fileID: 954743263} - {fileID: 376801910} - {fileID: 1110767356} @@ -30001,12 +30002,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: 9, y: 17.999985} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 1, y: 1} --- !u!222 &1594856836 CanvasRenderer: @@ -30075,12 +30076,12 @@ RectTransform: m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 1956484872} - 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: 2, y: 0} - m_SizeDelta: {x: 73, y: 36} + m_AnchoredPosition: {x: 2, y: -38.3} + m_SizeDelta: {x: 34, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1695855553 CanvasRenderer: @@ -39581,7 +39582,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1434561301} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -39659,7 +39660,7 @@ RectTransform: - {fileID: 1792618418} - {fileID: 1248963056} m_Father: {fileID: 1434561301} - 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} @@ -39715,6 +39716,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5843496785684830561} - {fileID: 181421154} - {fileID: 1695855551} - {fileID: 147058932} @@ -54613,7 +54615,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -32.999756, y: 26} + m_AnchoredPosition: {x: -33, y: 26} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1244502510961074 @@ -56517,7 +56519,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -54, y: 254.2} + m_AnchoredPosition: {x: -54, y: 254.2002} m_SizeDelta: {x: 67.03998, y: 67.03998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222113928326134552 @@ -67505,8 +67507,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4018991985173698719 CanvasRenderer: @@ -108814,8 +108816,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: 9, y: 17.999985} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 1, y: 1} --- !u!222 &9134705159748373973 CanvasRenderer: @@ -118955,8 +118957,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21, y: -10} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &494634162801450256 CanvasRenderer: @@ -135291,7 +135293,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: -800.46, y: 82} + m_AnchoredPosition: {x: -857.5447, y: 82} m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1757188509791595279 @@ -135522,8 +135524,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: 115.1, y: 30.5} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 133, y: 46} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &32025381920975939 CanvasRenderer: @@ -140922,8 +140924,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7863274112953960933 CanvasRenderer: @@ -170035,8 +170037,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6097905394426095939 CanvasRenderer: @@ -261994,8 +261996,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: 9, y: 18} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 1, y: 1} --- !u!222 &8609224252466894303 CanvasRenderer: @@ -281763,6 +281765,96 @@ MonoBehaviour: m_LineSpacing: 0.7 m_Text: "\u6218\u9774" LanguageIndex: 11545 +--- !u!1 &7277734157433127258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5843496785684830561} + - component: {fileID: 6170545712101730526} + - component: {fileID: 5405353274363154106} + - component: {fileID: 7138028374794469176} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5843496785684830561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7277734157433127258} + 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: 1956484872} + 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: 0} + m_SizeDelta: {x: 104, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6170545712101730526 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7277734157433127258} + m_CullTransparentMesh: 0 +--- !u!114 &5405353274363154106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7277734157433127258} + 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: 44d53c286c497894192d63b7e9ab8973, 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!114 &7138028374794469176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7277734157433127258} + 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 &7343670388826790658 GameObject: m_ObjectHideFlags: 0 @@ -305967,6 +306059,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7895024001939190063} m_CullTransparentMesh: 0 +--- !u!1 &7936862400299351301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1071262802687969794} + - component: {fileID: 1917487430482676203} + - component: {fileID: 4796550213099821323} + - component: {fileID: 8338055488061714358} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1071262802687969794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936862400299351301} + 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: 1434561301} + 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: 0} + m_SizeDelta: {x: 104, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1917487430482676203 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936862400299351301} + m_CullTransparentMesh: 0 +--- !u!114 &4796550213099821323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936862400299351301} + 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: 44d53c286c497894192d63b7e9ab8973, 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!114 &8338055488061714358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936862400299351301} + 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 &7980197209951540660 GameObject: m_ObjectHideFlags: 0 @@ -326149,8 +326331,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3845903900378161724 CanvasRenderer: @@ -326303,8 +326485,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13.800003, y: -13.799999} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: -21.000015, y: -10.000061} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3552315773368924562 CanvasRenderer: @@ -337622,7 +337804,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u795E\u77F3\u56FE\u9274" + m_Text: "\u82AF\u7247\u56FE\u9274" --- !u!114 &7980252487934516956 MonoBehaviour: m_ObjectHideFlags: 0 @@ -337907,66 +338089,6 @@ PrefabInstance: objectReference: {fileID: 8944061103535072730} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} ---- !u!4 &9048018877149632039 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632041 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072730 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632029 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632035 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377592, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632033 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632037 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632043 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072712 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907923, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072714 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &9048018877149632047 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218, @@ -337979,9 +338101,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072726 stripped +--- !u!4 &9048018877149632051 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632049 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632055 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632059 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377568, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -337991,24 +338137,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072708 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072710 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072704 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072722 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, @@ -338021,57 +338155,69 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632051 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072764 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632059 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377568, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072724 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632053 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072718 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!224 &1105523586087243496 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, +--- !u!4 &8944061103535072712 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907923, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632055 stripped +--- !u!4 &9048018877149632029 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377580, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632049 stripped +--- !u!4 &9048018877149632035 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377592, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632037 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632043 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072708 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072704 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -338081,3 +338227,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1105523586087243496 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072730 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072724 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072726 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632033 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index c7da895cbf..af6d983efc 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -661,12 +661,12 @@ RectTransform: m_Children: - {fileID: 224622296723305512} - {fileID: 7784913666953022302} - m_Father: {fileID: 224223836060665342} - m_RootOrder: 6 + m_Father: {fileID: 224333658863316554} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 268, y: 584} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 268, y: -258} m_SizeDelta: {x: 500, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222198797386434666 @@ -739,9 +739,8 @@ RectTransform: - {fileID: 224014376810088690} - {fileID: 224178501881760706} - {fileID: 813539849449416853} - - {fileID: 224589745136464296} m_Father: {fileID: 224333658863316554} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1288,9 +1287,9 @@ RectTransform: m_Father: {fileID: 224589745136464296} 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: -6, y: 340} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 244, y: -29} m_SizeDelta: {x: 307.8, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222180417632795242 @@ -2638,6 +2637,7 @@ RectTransform: - {fileID: 224952281900994262} - {fileID: 224688694138892830} - {fileID: 224254759599357364} + - {fileID: 224589745136464296} - {fileID: 224223836060665342} m_Father: {fileID: 0} m_RootOrder: 0 @@ -3853,8 +3853,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: -182.3, y: 232.8} - m_SizeDelta: {x: 40, y: 110} + m_AnchoredPosition: {x: -182.3, y: -77.199936} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260160176260886405 CanvasRenderer: @@ -7106,7 +7106,7 @@ RectTransform: m_GameObject: {fileID: 7963923808499897387} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7784913666953022302} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e40efbe892..a0995a90c6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -200,8 +200,8 @@ PoTencyTypeName = { [4] = "战靴", [5] = "手环", [6] = "挂件", - [7] = "暗石", - [8] = "光石", + [7] = "暗芯", + [8] = "光芯", } diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index f4b5b7e076..e17e9cda6a 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -52,10 +52,10 @@ function this:InitComponent() self.tip = Util.GetGameObject(self.gameObject, "scrollbg/tip") self.shopItem = Util.GetGameObject(self.gameObject, "scrollbg/scrollroot/shopItem") self.rechargeShopItem = Util.GetGameObject(self.gameObject, "scrollbg/scrollroot/item") - self.titleBg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg") - self.titleImg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title") - self.titleText = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title/titleText") - self.helpBtn = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/helpBtn") --scrollbg/titlebg/ + self.titleBg = Util.GetGameObject(self.gameObject, "titlebg") + self.titleImg = Util.GetGameObject(self.gameObject, "titlebg/title") + self.titleText = Util.GetGameObject(self.gameObject, "titlebg/title/titleText") + self.helpBtn = Util.GetGameObject(self.gameObject, "titlebg/helpBtn") --scrollbg/titlebg/ self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition -- 创建循环列表 if not self.ScrollView then diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 78cab12e73..a136fee8a1 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -50,10 +50,10 @@ function ShopViewNew:InitComponent() self.tip = Util.GetGameObject(self.gameObject, "scrollbg/tip") self.shopItem = Util.GetGameObject(self.gameObject, "scrollbg/scrollroot/shopItem") self.rechargeShopItem = Util.GetGameObject(self.gameObject, "scrollbg/scrollroot/item") - self.titleBg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg") - self.titleImg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title") - self.titleText = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title/titleText") - self.helpBtn = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/helpBtn")--scrollbg/titlebg/ + self.titleBg = Util.GetGameObject(self.gameObject, "titlebg") + self.titleImg = Util.GetGameObject(self.gameObject, "titlebg/title") + self.titleText = Util.GetGameObject(self.gameObject, "titlebg/title/titleText") + self.helpBtn = Util.GetGameObject(self.gameObject, "titlebg/helpBtn")--scrollbg/titlebg/ self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition -- 创建循环列表 if not self.ScrollView then