diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index f7e3048e57..fc3a3a99e3 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -110,9 +110,9 @@ RectTransform: m_Father: {fileID: 3026942363793877950} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -48, y: -651} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 238, y: -529} m_SizeDelta: {x: 502, y: 54.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3353661154713415312 @@ -130,7 +130,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 120835498341656909} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -143,7 +143,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: 7f7ef0b74ef147c4e82b3f037352d751, type: 3} + m_Sprite: {fileID: 21300000, guid: 8c4dac6137d632f4a99de21a3196424b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -180,7 +180,9 @@ RectTransform: 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_Children: + - {fileID: 4877977837420902218} + - {fileID: 322874124251891113} m_Father: {fileID: 3986021082170387358} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -210,14 +212,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.08627451, g: 0.39607844, b: 0.79607844, 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: 8d17a8275d3127040bf62a9c49b35113, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -263,7 +265,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -23} - m_SizeDelta: {x: 81, y: 60} + m_SizeDelta: {x: 67, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6747955464738816831 CanvasRenderer: @@ -293,7 +295,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: e5fd40c0c9d52904682b616ef2a0e119, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e78311ebdc298c4aa94b64bbd3b0d7a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -474,10 +476,10 @@ RectTransform: m_Father: {fileID: 3547643978346228541} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -407.69} - m_SizeDelta: {x: 1080, y: 631.38} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -303} + m_SizeDelta: {x: 0, y: 607} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6629157739033899807 CanvasRenderer: @@ -507,7 +509,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: dc6348604f435c7409a6b207e9048595, type: 3} + m_Sprite: {fileID: 21300000, guid: 462da617d1ab3f540abd811c07c8cf29, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -555,7 +557,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -83.57, y: 44.74} - m_SizeDelta: {x: 154.61, y: 66.67} + m_SizeDelta: {x: 180, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6573501347890279480 CanvasRenderer: @@ -782,7 +784,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1952161082588317183 RectTransform: m_ObjectHideFlags: 0 @@ -870,12 +872,12 @@ RectTransform: m_Children: - {fileID: 2399017075097464870} m_Father: {fileID: 3547643978346228541} - m_RootOrder: 2 + 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} - m_AnchoredPosition: {x: 0, y: -788.85004} - m_SizeDelta: {x: 1080, y: 79.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -282.3} + m_SizeDelta: {x: 0, y: -564.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &390189837847334934 CanvasRenderer: @@ -898,14 +900,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.14901961, g: 0.14509805, b: 0.14509805, 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: 0} + m_Sprite: {fileID: 21300000, guid: 38bd1a991d78cf64687634a598f7bf62, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -931,7 +933,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2399017075097464870 RectTransform: m_ObjectHideFlags: 0 @@ -946,10 +948,10 @@ RectTransform: m_Father: {fileID: 7118853040504959673} 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: 131.97} - m_SizeDelta: {x: 1081, y: 182.85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 301.9} + m_SizeDelta: {x: 1, y: 86.79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &751834544735141188 CanvasRenderer: @@ -972,15 +974,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.60784316} 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: 3dfac6d5239e46944aff57441aeb6cc4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 2dde3887f1866294383f938189ff3ff1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1013,13 +1015,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796795515296883227} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.06104851, w: 0.99813485} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6713643918384602890} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 2.6, y: -0.15999985} @@ -1046,7 +1048,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: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1098,11 +1100,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1350465337999593540} - 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} - m_AnchoredPosition: {x: 381.4, y: -63.7} + m_AnchoredPosition: {x: 356.6, y: -63.7} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8799121687072226636 @@ -1126,7 +1128,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9960785, g: 0.9921569, b: 0.97647065, a: 1} + m_Color: {r: 0.066037714, g: 0.06572621, b: 0.06448022, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1178,7 +1180,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6684140351592508948} - - {fileID: 8959489130289423033} - {fileID: 7118853040504959673} m_Father: {fileID: 3026942363793877950} m_RootOrder: 0 @@ -1216,7 +1217,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: 3caf39f3691ec3e4b9293af992abdcf9, type: 3} + m_Sprite: {fileID: 21300000, guid: 8a0a4f4a64f6a8d438125a64b34f192c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1331,10 +1332,10 @@ RectTransform: m_Father: {fileID: 3986021082170387358} 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} - m_AnchoredPosition: {x: 0.24999, y: -464.3} - m_SizeDelta: {x: 1079.5, y: 793.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.25, y: -665.6} + m_SizeDelta: {x: -0.5, y: 882.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9177181720887223299 CanvasRenderer: @@ -1644,8 +1645,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: 38, y: 102.73} - m_SizeDelta: {x: 79, y: 181.62} + m_AnchoredPosition: {x: 49.399902, y: 132.2998} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3448435093060785098 CanvasRenderer: @@ -1675,7 +1676,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 @@ -1745,6 +1746,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2678455086324644734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4877977837420902218} + - component: {fileID: 7396716166192468360} + - component: {fileID: 3845157399175599758} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4877977837420902218 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2678455086324644734} + 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: 5810276389620899881} + m_RootOrder: 0 + 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: 199, y: 0} + m_SizeDelta: {x: 400, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7396716166192468360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2678455086324644734} + m_CullTransparentMesh: 0 +--- !u!114 &3845157399175599758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2678455086324644734} + 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: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2714501861805458806 GameObject: m_ObjectHideFlags: 0 @@ -1780,7 +1855,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.00051498, y: 0.000019073} - m_SizeDelta: {x: 154.61, y: 66.67} + m_SizeDelta: {x: 180, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6993632569571917862 CanvasRenderer: @@ -1810,7 +1885,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: 0dc0640ffa275b742a82550b589865b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1852,6 +1927,7 @@ RectTransform: - {fileID: 146850524550947220} - {fileID: 1350465337999593540} - {fileID: 7647412491874848298} + - {fileID: 8959489130289423033} - {fileID: 4030327733856195412} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2053,7 +2129,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -23} - m_SizeDelta: {x: 81, y: 60} + m_SizeDelta: {x: 67, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7506610351571245143 CanvasRenderer: @@ -2083,7 +2159,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: e5fd40c0c9d52904682b616ef2a0e119, type: 3} + m_Sprite: {fileID: 21300000, guid: 5fa0cea11c3606041b3ac3e4912cd398, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2261,10 +2337,10 @@ RectTransform: m_Father: {fileID: 3026942363793877950} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 297} - m_SizeDelta: {x: 0, y: 300} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -663} + m_SizeDelta: {x: 1080, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3875322589699534660 GameObject: @@ -2300,8 +2376,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: 64, y: 28} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 79.6, y: 37.6} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7912622959724688922 CanvasRenderer: @@ -2371,12 +2447,12 @@ RectTransform: m_Children: - {fileID: 1120428561395245478} m_Father: {fileID: 1350465337999593540} - 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} - m_AnchoredPosition: {x: -255.8, y: 57.1} - m_SizeDelta: {x: 558, y: 44} + m_AnchoredPosition: {x: -137.57, y: 67.2} + m_SizeDelta: {x: 688.13, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5624179217471910701 CanvasRenderer: @@ -2393,21 +2469,21 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3925812245434568345} - m_Enabled: 0 + 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_Color: {r: 0.1764706, g: 0.1764706, b: 0.1764706, a: 0.4} 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: 7491ecf89cbc4344c9165af75629b7e4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 48b69449aa377b94aa90be9331fe0162, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2449,7 +2525,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: -126, y: 0.59999466} + m_AnchoredPosition: {x: -219.9, y: 0.59999466} m_SizeDelta: {x: 242.11, y: 39.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4317519693453040355 @@ -2473,7 +2549,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9960785, g: 0.9960785, b: 0.9960785, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2482,7 +2558,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2531,7 +2607,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -449.5, y: 18} - m_SizeDelta: {x: 148.85, y: 157.5} + m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493502476584871892 CanvasRenderer: @@ -2561,9 +2637,9 @@ 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: 8855df9cfe7949a4fbdd26dda02eb098, type: 3} + m_Sprite: {fileID: 21300000, guid: e28eb3a9fbfb4044dad77be721c95109, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 0 m_FillAmount: 1 @@ -2656,6 +2732,7 @@ GameObject: - component: {fileID: 976674176078188953} - component: {fileID: 7096228294599665147} - component: {fileID: 4278810175383752963} + - component: {fileID: 7592661866314067826} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2679,7 +2756,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: 2.3, y: 3.1} + m_AnchoredPosition: {x: 2.3, y: -2.9} m_SizeDelta: {x: 160, y: 31.37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7096228294599665147 @@ -2703,7 +2780,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.909804, b: 0.8117648, a: 1} + m_Color: {r: 1, g: 0.7176471, b: 0.027450982, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2724,6 +2801,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 155 +--- !u!114 &7592661866314067826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4622268229002954602} + 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 &4626642107009112731 GameObject: m_ObjectHideFlags: 0 @@ -2736,7 +2828,7 @@ GameObject: - component: {fileID: 7678705826277589448} - component: {fileID: 4222513627706394117} m_Layer: 0 - m_Name: Image (1) + m_Name: DownBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2749,17 +2841,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4626642107009112731} - 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_Children: [] - m_Father: {fileID: 3547643978346228541} - m_RootOrder: 1 + m_Children: + - {fileID: 59913618692200383} + m_Father: {fileID: 3026942363793877950} + 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} - m_AnchoredPosition: {x: 0, y: -892.9} - m_SizeDelta: {x: 1080, y: 128.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 75} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7678705826277589448 CanvasRenderer: @@ -2782,15 +2875,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.078431375, g: 0.08627451, b: 0.09411766, 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2901,6 +2994,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 108.46771} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4609196834459449066} - {fileID: 8669047331830701111} - {fileID: 5660903253093529981} - {fileID: 6713643918384602890} @@ -2911,8 +3005,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: -1122, y: 131.86} - m_SizeDelta: {x: 1081, y: 199.18} + m_AnchoredPosition: {x: -1883, y: 131.86} + m_SizeDelta: {x: 980, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929178733539990280 CanvasRenderer: @@ -2942,8 +3036,8 @@ 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: 3dfac6d5239e46944aff57441aeb6cc4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e3084f740ccadd34b8b35953f0c48718, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3068,7 +3162,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -23} - m_SizeDelta: {x: 81, y: 60} + m_SizeDelta: {x: 67, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2257563985486614656 CanvasRenderer: @@ -3098,7 +3192,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: e5fd40c0c9d52904682b616ef2a0e119, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e78311ebdc298c4aa94b64bbd3b0d7a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3397,7 +3491,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.000012159, y: 0.61001} - m_SizeDelta: {x: 109.24, y: 55.8} + m_SizeDelta: {x: 50, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1664517498256806329 CanvasRenderer: @@ -3427,7 +3521,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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 0c5a06f37c6ccfe488ddec26ead85809, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3447,6 +3541,7 @@ GameObject: - component: {fileID: 8849108110584066241} - component: {fileID: 5035164546636351580} - component: {fileID: 4856947487757474452} + - component: {fileID: 2042853393405022336} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -3470,7 +3565,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: -149.6, y: -3} + m_AnchoredPosition: {x: -149.6, y: -0.2} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5035164546636351580 @@ -3515,6 +3610,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4" +--- !u!114 &2042853393405022336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5532096389828808701} + 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 &5624800230385220776 GameObject: m_ObjectHideFlags: 0 @@ -3595,6 +3705,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 25 LanguageIndex: 0 +--- !u!1 &5717397474139384732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4843475643972475449} + - component: {fileID: 4061349409206535321} + - component: {fileID: 8388915805874621276} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4843475643972475449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717397474139384732} + 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: 4609196834459449066} + 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: -109.55, y: 0.14149} + m_SizeDelta: {x: 519.79, y: 189.72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4061349409206535321 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717397474139384732} + m_CullTransparentMesh: 0 +--- !u!114 &8388915805874621276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5717397474139384732} + 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: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5717577223512066150 GameObject: m_ObjectHideFlags: 0 @@ -3749,7 +3933,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2400111891400085616 RectTransform: m_ObjectHideFlags: 0 @@ -3766,8 +3950,8 @@ 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: 50} - m_SizeDelta: {x: 0, y: 164} + m_AnchoredPosition: {x: 4.8, y: -5.1} + m_SizeDelta: {x: 736.3, y: 210.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &357541952192552971 CanvasRenderer: @@ -3791,13 +3975,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: 2609ccd74e672d84c8e128abd8dc9428, type: 3} + m_Sprite: {fileID: 21300000, guid: e07af00ecbd7ecd44b2ef9b8b303fa80, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4147,12 +4331,12 @@ RectTransform: - {fileID: 3954246035280230190} - {fileID: 1738333848446862752} m_Father: {fileID: 1350465337999593540} - m_RootOrder: 2 + m_RootOrder: 3 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: -158.4, y: 0.29} - m_SizeDelta: {x: 205.69, y: 84.43} + m_AnchoredPosition: {x: -137.91, y: 9.9} + m_SizeDelta: {x: 246.68, y: 84.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5728732283480163709 CanvasRenderer: @@ -4182,7 +4366,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: 60543ff590fbc834aaf7693a3a83ab9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4356,7 +4540,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3026942363793877950} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4483,7 +4667,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 30 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4526,12 +4710,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1350465337999593540} - 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: -226, y: -29} - m_SizeDelta: {x: 565.5, y: 126.5} + m_AnchoredPosition: {x: -143.5, y: -26} + m_SizeDelta: {x: 675.6, y: 126.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6625326992426038375 MonoBehaviour: @@ -4645,6 +4829,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7381758158446087800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 322874124251891113} + - component: {fileID: 5116479628831724299} + - component: {fileID: 7317268578139469397} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &322874124251891113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7381758158446087800} + 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: 5810276389620899881} + m_RootOrder: 1 + 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: -199, y: 0} + m_SizeDelta: {x: 400, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5116479628831724299 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7381758158446087800} + m_CullTransparentMesh: 0 +--- !u!114 &7317268578139469397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7381758158446087800} + 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: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7562072550311435382 GameObject: m_ObjectHideFlags: 0 @@ -4682,7 +4940,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -23} - m_SizeDelta: {x: 81, y: 60} + m_SizeDelta: {x: 67, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1354536591460631001 CanvasRenderer: @@ -4712,7 +4970,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: e5fd40c0c9d52904682b616ef2a0e119, type: 3} + m_Sprite: {fileID: 21300000, guid: d3022debf0fa42c48adbb9447933c713, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4856,6 +5114,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7866396078245509770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4609196834459449066} + - component: {fileID: 305499447198612743} + - component: {fileID: 7775666332914873572} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4609196834459449066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866396078245509770} + 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: + - {fileID: 4843475643972475449} + - {fileID: 2490861148836013537} + m_Father: {fileID: 1350465337999593540} + m_RootOrder: 0 + 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: 1.4230042, y: 3.974} + m_SizeDelta: {x: 741.81, y: 189.43} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &305499447198612743 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866396078245509770} + m_CullTransparentMesh: 0 +--- !u!114 &7775666332914873572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866396078245509770} + 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: 0.30588236, g: 0.27450982, b: 0.36862746, 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: e1ae3e051c86b38489be1306dac9bb32, 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 &8019000473530132568 GameObject: m_ObjectHideFlags: 0 @@ -4936,6 +5270,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 25 LanguageIndex: 0 +--- !u!1 &8116138945928663900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 59913618692200383} + - component: {fileID: 401333474001609014} + - component: {fileID: 3782113607197101014} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &59913618692200383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8116138945928663900} + 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: 8959489130289423033} + m_RootOrder: 0 + 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: 223.3, y: 0} + m_SizeDelta: {x: 450, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &401333474001609014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8116138945928663900} + m_CullTransparentMesh: 0 +--- !u!114 &3782113607197101014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8116138945928663900} + 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: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8402211400647155952 GameObject: m_ObjectHideFlags: 0 @@ -4973,7 +5381,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 5, y: -23} - m_SizeDelta: {x: 81, y: 60} + m_SizeDelta: {x: 67, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1493813415071284517 CanvasRenderer: @@ -5003,7 +5411,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: e5fd40c0c9d52904682b616ef2a0e119, type: 3} + m_Sprite: {fileID: 21300000, guid: 5fa0cea11c3606041b3ac3e4912cd398, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5106,10 +5514,10 @@ RectTransform: m_Father: {fileID: 3026942363793877950} 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} - m_AnchoredPosition: {x: 371.09998, y: -659} - m_SizeDelta: {x: 336.2, y: 100} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -7, y: 305} + m_SizeDelta: {x: 348.1, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8752155838393930992 GameObject: @@ -5226,8 +5634,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: -4.3, y: -79.7} - m_SizeDelta: {x: 157, y: 42} + m_AnchoredPosition: {x: -4.3, y: -69.14} + m_SizeDelta: {x: 157, y: 35.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6976397986984294231 CanvasRenderer: @@ -5257,8 +5665,8 @@ 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: 974f29e827072824092a5ffa4037adc8, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 2dde3887f1866294383f938189ff3ff1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5296,7 +5704,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1350465337999593540} - 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} @@ -5418,6 +5826,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9056134136645210724 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2490861148836013537} + - component: {fileID: 1936463422748219380} + - component: {fileID: 666739105301694795} + m_Layer: 0 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2490861148836013537 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9056134136645210724} + 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: 4609196834459449066} + 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} + m_AnchoredPosition: {x: 466.6, y: 0} + m_SizeDelta: {x: 270, y: 190} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1936463422748219380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9056134136645210724} + m_CullTransparentMesh: 0 +--- !u!114 &666739105301694795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9056134136645210724} + 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: 0.7803922, g: 0.5529412, b: 0.9450981, 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: 72677683575a3cd4a80e1f3a2509dfb0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &9146303036634683363 GameObject: m_ObjectHideFlags: 0 @@ -5452,8 +5934,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: 81.5, y: 20.7} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 99.1, y: 40.9} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6829403976832265807 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 0dd40d688b..6c8bb90782 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -11,17 +11,17 @@ function NiuQiChongTianPanel:New(gameObject) return b end local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "Btn_hz_tongyong_002", select = "Btn_hz_tongyong_001", name = Language[12251] , nameNew = "英雄招募" ,rpType = RedPointType.NiuQiChongTian_1}, - [2] = { default = "Btn_hz_tongyong_002", select = "Btn_hz_tongyong_001", name = Language[12252] , nameNew = "钻石消耗" ,rpType = RedPointType.NiuQiChongTian_2}, +local _TabData={ [1] = { default = "task_bigbtn02", select = "task_bigbtn01", name = Language[12251] , nameNew = "英雄招募" ,rpType = RedPointType.NiuQiChongTian_1}, + [2] = { default = "task_bigbtn02", select = "task_bigbtn01", name = Language[12252] , nameNew = "钻石消耗" ,rpType = RedPointType.NiuQiChongTian_2}, -- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12253] , nameNew = "极速探索" ,rpType = RedPointType.NiuQiChongTian_3}, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(255 / 255, 255 / 255, 255 / 255, 1)} local BtnState ={ - [0] = {ImgName = "Btn_hz_cheng_01",Text = Language[10556]}, - [1] = {ImgName = "Btn_hz_cheng_01",Text = Language[11948]}, - [2] = {ImgName = "Btn_hz_lan_01",Text = Language[10101]}, + [0] = {ImgName = "X1_shouzha_yeqianxuanzhong_03",Text = Language[10556]}, + [1] = {ImgName = "X1_shouzha_yeqianxuanzhong_03",Text = Language[11948]}, + [2] = {ImgName = "X1_shouzha_yeqianxuanzhong_01",Text = Language[10101]}, } --初始化组件(用于子类重写)