diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index b8b627c9a3..d190fc5756 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -2067,7 +2067,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 @@ -4299,10 +4299,10 @@ RectTransform: m_Father: {fileID: 1002555691} 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: 210, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &6441804786815422722 CanvasRenderer: @@ -5628,6 +5628,7 @@ GameObject: - component: {fileID: 1740931807} - component: {fileID: 1740931806} - component: {fileID: 1740931805} + - component: {fileID: 784437563245950726} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -5717,6 +5718,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &784437563245950726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740931803} + 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 &1797568285 GameObject: m_ObjectHideFlags: 0 @@ -6386,6 +6402,7 @@ GameObject: - component: {fileID: 2003013918} - component: {fileID: 2003013917} - component: {fileID: 2003013916} + - component: {fileID: 3815856271075947687} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -6475,6 +6492,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &3815856271075947687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003013914} + 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 &2014766672 GameObject: m_ObjectHideFlags: 0 @@ -7094,7 +7126,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2140040536 RectTransform: m_ObjectHideFlags: 0 @@ -7622,10 +7654,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} m_RootOrder: 4 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: 0, y: 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2980853436230393831 CanvasRenderer: @@ -11926,10 +11958,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4329534855784721111 CanvasRenderer: @@ -12732,7 +12764,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7653855264894605139 RectTransform: m_ObjectHideFlags: 0 @@ -35587,10 +35619,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} m_RootOrder: 3 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: 0, y: 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5416947283401139823 CanvasRenderer: @@ -36976,10 +37008,10 @@ RectTransform: m_Father: {fileID: 5596053903948610984} 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: 0, y: 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1075456802991939877 CanvasRenderer: @@ -49002,10 +49034,10 @@ RectTransform: m_Father: {fileID: 1002555691} 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: 590, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &2280464345083763535 CanvasRenderer: @@ -55525,10 +55557,10 @@ RectTransform: m_Father: {fileID: 1002555691} 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: 400, y: -127.925} - m_SizeDelta: {x: 150, y: 150} + 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 &6714569458965818143 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab index aefd11e6d1..68f3525119 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab @@ -10590,7 +10590,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: 533.30005, y: 338.10895} + m_AnchoredPosition: {x: 533.30005, y: 358} m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8454816023798566641 @@ -21129,7 +21129,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &649844801553347507 RectTransform: m_ObjectHideFlags: 0 @@ -21178,7 +21178,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: 36 m_FontStyle: 0 m_BestFit: 0 @@ -31621,7 +31621,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: 453.4, y: 288.9} + m_AnchoredPosition: {x: 453.4, y: 258} m_SizeDelta: {x: 492.4, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5570695162331111546 @@ -47497,7 +47497,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: 505.67, y: 286.03} + m_AnchoredPosition: {x: 505.67, y: 255.12997} m_SizeDelta: {x: 373.11, y: 63.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4942687059910894160 @@ -78972,7 +78972,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u98DE \u5347" + m_Text: "\u6781 \u706B" LanguageIndex: 11561 --- !u!1 &5013195387048489343 GameObject: @@ -107837,7 +107837,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u98DE\u5347\u9884\u89C8" + m_Text: "\u6781\u706B\u9884\u89C8" LanguageIndex: 11558 --- !u!1 &7892693954949450801 GameObject: @@ -119399,7 +119399,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: -195, y: 406.6203} + m_AnchoredPosition: {x: -121, y: 406.6203} m_SizeDelta: {x: 197.07, y: 55.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &690586987623888620 @@ -119443,7 +119443,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u98DE\u5347\u63D0\u5347" + m_Text: "\u6781\u706B\u63D0\u5347" LanguageIndex: 11558 --- !u!1 &8938390969820188448 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab index 7823e667da..a25b928408 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 127.5} + m_AnchoredPosition: {x: 0, y: 117} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8895917 @@ -102,14 +102,15 @@ 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: 2671716222460302939} m_Father: {fileID: 636995024} 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: 210.30002, y: -16.575016} - m_SizeDelta: {x: 1020, y: 412.85} + 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 &26978009 CanvasRenderer: @@ -139,7 +140,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: 207e7d65b8657064bb3269c1e0b32943, type: 3} + m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -182,7 +183,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.5, y: 2.1} + m_AnchoredPosition: {x: 49.4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &41092790 @@ -206,7 +207,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -214,13 +215,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -261,7 +262,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: 1.7025337, y: -1.2669044} + m_AnchoredPosition: {x: 52.399998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &75444870 @@ -285,7 +286,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -293,13 +294,13 @@ 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: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -340,7 +341,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: -32.4, y: -2.9} + m_AnchoredPosition: {x: -32.4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &97573733 @@ -364,7 +365,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -372,7 +373,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -384,7 +385,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u653B\u51FB\u529B" + m_Text: "\u653B\u51FB" LanguageIndex: 0 --- !u!1 &115684401 GameObject: @@ -14816,14 +14817,14 @@ 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: 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: 46ecaf1e47becac44bb7a85f1c2f0c72, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14888,7 +14889,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: 11, y: 499} + m_AnchoredPosition: {x: 0, y: 725} m_SizeDelta: {x: 595.5, y: 130.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &277781946 @@ -14981,7 +14982,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &286725736 RectTransform: m_ObjectHideFlags: 0 @@ -15000,10 +15001,10 @@ RectTransform: m_Father: {fileID: 877557727} 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: 265.735, y: -149} - m_SizeDelta: {x: 100, y: 100} + 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 &286725737 CanvasRenderer: @@ -19932,7 +19933,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &405080529 @@ -19956,7 +19957,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -19964,7 +19965,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -20012,7 +20013,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: 14, y: 93.04999} + m_AnchoredPosition: {x: 90, y: 130} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &424374235 @@ -20036,7 +20037,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1} + m_Color: {r: 0.98039216, g: 0.8039216, b: 0.42745098, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -20044,7 +20045,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -20087,15 +20088,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 520182773} - {fileID: 1621283025} + - {fileID: 520182773} - {fileID: 1293216359} m_Father: {fileID: 273844538} 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: -31} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &424536945 @@ -20116,10 +20117,10 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 35.3 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!114 &424536944 MonoBehaviour: @@ -25214,10 +25215,10 @@ MonoBehaviour: loop: 0 loopType: 0 targetObj: {fileID: 273844538} - - initV3: {x: -207.5, y: -380, z: 0} + - initV3: {x: 1000, y: -380, z: 0} initFloat: 0 isInit: 1 - changeV3: {x: -207.5, y: 235.6001, z: 0} + changeV3: {x: 0, y: 235.6001, z: 0} changeFloat: 0 duration: 0.3 delay: 0 @@ -25261,7 +25262,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &484697864 RectTransform: m_ObjectHideFlags: 0 @@ -25352,6 +25353,7 @@ GameObject: - component: {fileID: 520182776} - component: {fileID: 520182775} - component: {fileID: 520182774} + - component: {fileID: 2152892746336014822} m_Layer: 5 m_Name: heroName m_TagString: Untagged @@ -25371,11 +25373,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 424536943} - m_RootOrder: 0 + 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: 120, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &520182776 @@ -25413,7 +25415,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.78431374, g: 0.6784314, b: 0.5137255, a: 1} + m_Color: {r: 0.9294118, g: 0.8196079, b: 0.5568628, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25421,8 +25423,8 @@ 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_FontSize: 60 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -25435,6 +25437,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7389\u7687\u5927\u5E1D" LanguageIndex: 0 +--- !u!114 &2152892746336014822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520182772} + 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 &541878351 GameObject: m_ObjectHideFlags: 0 @@ -25469,7 +25486,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &541878354 @@ -25493,7 +25510,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25501,7 +25518,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -25587,7 +25604,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.5, y: 2.1} + m_AnchoredPosition: {x: 52.399998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &578939154 @@ -25611,7 +25628,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25619,13 +25636,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -25705,8 +25722,8 @@ 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: -207.5, y: 266} - m_SizeDelta: {x: 594.6, y: 379.7} + m_AnchoredPosition: {x: 0, y: 236} + m_SizeDelta: {x: 1080, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &661073718 GameObject: @@ -25786,7 +25803,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &682146913 @@ -25810,7 +25827,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25818,7 +25835,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -30657,7 +30674,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.5, y: 2.1} + m_AnchoredPosition: {x: 49.399982, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &717118981 @@ -30681,7 +30698,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -30689,13 +30706,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -30736,7 +30753,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.5, y: 2.1} + m_AnchoredPosition: {x: 49.399982, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &751165301 @@ -30760,7 +30777,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -30768,13 +30785,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -40592,10 +40609,10 @@ RectTransform: m_Father: {fileID: 636995024} 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: 209.2, y: -7.25} - m_SizeDelta: {x: 1076.5, y: 438} + 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!114 &877557728 MonoBehaviour: @@ -55344,7 +55361,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.5, y: 2.1} + m_AnchoredPosition: {x: 49.399982, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1110125310 @@ -55368,7 +55385,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -55376,13 +55393,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -55423,7 +55440,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1127944028 @@ -55447,7 +55464,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -55455,7 +55472,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -69630,7 +69647,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: 1.55, y: -2.922585} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 74, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1165688057 @@ -79199,7 +79216,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1183113229 RectTransform: m_ObjectHideFlags: 0 @@ -79216,7 +79233,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: 207, y: -12} + m_AnchoredPosition: {x: 0, y: 94} m_SizeDelta: {x: 375.5, y: 48.799988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1183113231 @@ -79240,7 +79257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3019608, g: 0.54509807, b: 0.41176474, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79248,7 +79265,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -79333,8 +79350,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: 14, y: -48.975037} - m_SizeDelta: {x: 714.9, y: 197.9} + m_AnchoredPosition: {x: 85.1, y: -69.6} + m_SizeDelta: {x: 391.8, y: 315.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1206327824 CanvasRenderer: @@ -79357,7 +79374,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79365,7 +79382,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: 40 m_FontStyle: 0 m_BestFit: 0 @@ -79413,7 +79430,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1230081069 @@ -79437,7 +79454,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79445,7 +79462,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -79566,7 +79583,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1256043535 @@ -79590,7 +79607,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79598,7 +79615,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -89241,7 +89258,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: -32.4, y: -2.9} + m_AnchoredPosition: {x: -32.4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1267110169 @@ -89265,7 +89282,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -89273,7 +89290,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -89285,7 +89302,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u653B\u51FB\u529B" + m_Text: "\u653B\u51FB" LanguageIndex: 0 --- !u!1 &1275738267 GameObject: @@ -94006,7 +94023,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: -60, y: -70} + m_AnchoredPosition: {x: -105, y: -70} m_SizeDelta: {x: 211.1, y: 256.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1383547166 @@ -103443,7 +103460,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.5, y: 2.1} + m_AnchoredPosition: {x: 52.399998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1389408249 @@ -103467,7 +103484,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -103475,13 +103492,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -103522,7 +103539,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: 47.699932, y: 93.04999} + m_AnchoredPosition: {x: 47.699932, y: 130} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1410072902 @@ -103546,7 +103563,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1} + m_Color: {r: 0.98039216, g: 0.8039216, b: 0.42745098, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -103554,7 +103571,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -122842,7 +122859,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1570656611 @@ -122866,7 +122883,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -122874,7 +122891,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -127640,6 +127657,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1621283025} + - component: {fileID: 3264420713417742318} + - component: {fileID: 5126881315572496627} m_Layer: 5 m_Name: proImage m_TagString: Untagged @@ -127660,13 +127679,50 @@ RectTransform: m_Children: - {fileID: 1165688055} m_Father: {fileID: 424536943} - m_RootOrder: 1 + m_RootOrder: 0 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: 0, y: 100} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3264420713417742318 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621283024} + m_CullTransparentMesh: 0 +--- !u!114 &5126881315572496627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621283024} + 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: 7047902cea7e0a644bec2bf166d4f6c1, 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 &1623553659 GameObject: m_ObjectHideFlags: 0 @@ -127906,7 +127962,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1660623464 RectTransform: m_ObjectHideFlags: 0 @@ -127997,7 +128053,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.5, y: 2.1} + m_AnchoredPosition: {x: 52.399998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1726395477 @@ -128021,7 +128077,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -128029,13 +128085,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -128076,7 +128132,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.5, y: 2.1} + m_AnchoredPosition: {x: 52.4, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1746300884 @@ -128100,7 +128156,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0.43529412, g: 0.94509804, b: 0.47058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -128108,13 +128164,13 @@ 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: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -128158,7 +128214,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: 200, y: -70} + m_AnchoredPosition: {x: 185, y: -70} m_SizeDelta: {x: 211.1, y: 256.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1956145367 @@ -137485,7 +137541,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: 1.7025337, y: -1.2669044} + m_AnchoredPosition: {x: 49.399982, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2013894504 @@ -137509,7 +137565,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -137517,13 +137573,13 @@ 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: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -137564,7 +137620,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: -27.599998, y: -1.2669806} + m_AnchoredPosition: {x: -27.599998, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2036455634 @@ -137588,7 +137644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -137596,7 +137652,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -137756,9 +137812,9 @@ RectTransform: m_Father: {fileID: 481878634} m_RootOrder: 10 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: -419, y: 717} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121, y: -243} m_SizeDelta: {x: 76, y: 317} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2074330663 @@ -137789,8 +137845,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: 160f9d20d35bf3c47937e17cd7060d09, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 02d017b768196614cba74209330fa078, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -142623,6 +142679,7 @@ GameObject: - component: {fileID: 2124029416} - component: {fileID: 2124029418} - component: {fileID: 2124029417} + - component: {fileID: 23126915749943232} m_Layer: 5 m_Name: PosText m_TagString: Untagged @@ -142646,7 +142703,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -12.275} + m_AnchoredPosition: {x: 0, y: -30.7} m_SizeDelta: {x: 46.01, y: 217.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2124029418 @@ -142670,7 +142727,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.90196085, g: 0.7803922, b: 0.49803925, a: 1} + m_Color: {r: 0.9254902, g: 0.9254902, b: 0.9254902, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -142678,7 +142735,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: 38 m_FontStyle: 0 m_BestFit: 0 @@ -142692,6 +142749,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" LanguageIndex: 0 +--- !u!114 &23126915749943232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124029415} + 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 &2126759848 GameObject: m_ObjectHideFlags: 0 @@ -147452,7 +147524,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6169882424432321945 RectTransform: m_ObjectHideFlags: 0 @@ -147509,3 +147581,77 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5442525899213969236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2671716222460302939} + - component: {fileID: 5365785878912405118} + - component: {fileID: 6842114909324906761} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2671716222460302939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442525899213969236} + 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: 26978007} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -34.01} + m_SizeDelta: {x: 0, y: 68.01} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5365785878912405118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442525899213969236} + m_CullTransparentMesh: 0 +--- !u!114 &6842114909324906761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442525899213969236} + 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: 7047902cea7e0a644bec2bf166d4f6c1, 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 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index d7f2402024..6d09ad515a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -223,7 +223,7 @@ function TimeLimitUpHero:RefreshHeroData() curConfig = bool and heroConfig[id] or itemConfig[id] self.mask1:SetActive(bool) self.mask2:SetActive(not bool) - LogError("id================================"..id) + --LogError("id================================"..id) if bool then--是神将 self.heroIcon.sprite=self.spLoader:LoadSprite(artResourcesConfig[curConfig.Icon].Name) self.heroNameTxt.text=curConfig.ReadingName @@ -283,10 +283,10 @@ function TimeLimitUpHero:RefreshGetHeroTimes() local type = 0 if n == 1 then type = Setting.CostItemSingle - m.info.text = "1次" + m.info.text = "单次召唤" else type = Setting.CostItemMul - m.info.text = "10次" + m.info.text = "十连召唤" end local d = {} if isFree then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua index af4d7eb85e..b8fe821197 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan.lua @@ -34,7 +34,7 @@ function this:OnShow(_parent,_Data) local curHeroData = args[1] if args[2] then type=args[2] - self.title.text="飞升预览" + self.title.text="极火预览" else type=0 self.title.text="进阶预览" diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index da2dfabe33..0c1f098117 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -396,7 +396,7 @@ function HandBookRoleInfoLayout:SkillInfo() if skillList[i].isOpen then LogError("skillList[i].needStar=="..skillList[i].needStar) if skillList[i].needStar==13 then - sText.text="飞升2解锁" + sText.text="极火2解锁" else sText.text=NumToSimplenessFont[skillList[i].needStar].."星解锁" end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 73e26f2e02..9a272845ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -639,6 +639,7 @@ function RewardItemPopup:OnClose() end compShowType = 0 + --[[ if func and not isPopGetSSR then if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then func(isBackBattle) @@ -646,6 +647,7 @@ function RewardItemPopup:OnClose() func(isBackBattle) end end + ]] -- 展示完以后结束章节解锁状态 FightPointPassManager.isOpenNewChapter = false diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index dbfa720a70..373b1f2fc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -108,9 +108,9 @@ function this:OnOpen(...) LogError("urSkillData.needStar=="..curSkillData.needStar) if curSkillData.needStar==15 then --this.hintTxt.text=" ".."飞升3解锁" - des1="".."飞升5解锁".."".."\n"..des1 + des1="".."极火5解锁".."".."\n"..des1 elseif curSkillData.needStar==13 then - des1="".."飞升3解锁".."".."\n"..des1 + des1="".."极火3解锁".."".."\n"..des1 else --this.hintTxt.text=" ".. des1=""..NumToSimplenessFont[curSkillData.needStar].."星解锁\n"..""..des1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua index 7777b92b92..5e80dfbe58 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpLayout.lua @@ -125,7 +125,7 @@ function RoleFlyUpLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h else this.upStarBtn.gameObject:SetActive(false) this.tip.gameObject:SetActive(true) - this.tip.text = "飞升需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel + this.tip.text = "极火需求伙伴共鸣等级:"..upStarRankUpConfig.LimitHongmengLevel end end end @@ -170,7 +170,7 @@ function RoleFlyUpLayout:UpdateHeroUpStarData() --this.flyImage.sprite=this.spLoader:LoadSprite(str) this.flyTxt.text=flyStr local awaken=curHeroData.heroConfig.Awaken - local str="激活飞升天赋: " + local str="激活极火天赋: " if awaken then for key, value in pairs(awaken) do if value[2]==curHeroData.star+15 then @@ -525,7 +525,7 @@ function RoleFlyUpLayout:StarUpClick() -- 进阶音效 PlaySoundWithoutClick(SoundConfig.Sound_Recruit3) else - PopupTipPanel.ShowTip("材料不足无法飞升") + PopupTipPanel.ShowTip("材料不足无法极火") end end --扣除升星 消耗的材料 更新英雄数据 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua index 7993905faa..cc9bfe5c8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleFlyUpSuccessPanel.lua @@ -105,7 +105,7 @@ function RoleFlyUpSuccessPanel:OnOpen(...) this.UI_Effect_choukaSSR:SetActive(curHeroData.heroConfig.Quality == 5) this.UI_Effect_choukaSR:SetActive(curHeroData.heroConfig.Quality == 4) this.UI_Effect_choukaR:SetActive(curHeroData.heroConfig.Quality == 3) - this.LiveName = curHeroData.live + this.LiveName = curHeroData.painting this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform, Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0)) @@ -128,7 +128,7 @@ function RoleFlyUpSuccessPanel:OnOpen(...) this.flyImage.sprite=this.spLoader:LoadSprite(flyImg) this.heroName.text=GetLanguageStrById(curHeroData.heroConfig.ReadingName) --定位描述相关 - this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession)) + --this.posBgImage.sprite=this.spLoader:LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession)) -- this.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation) SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 837761ee37..005435af65 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -672,7 +672,7 @@ function this.UpdateHeroUpStarProUpSkillShowOld(skillGridGO,skillTabs,passiveSki if this.skillData[i].state == 0 then local str = NumToChinese[this.skillData[i].star].."星" if this.skillData[i].star > 10 then - str = "飞升"..NumToChinese[this.skillData[i].star - 10] + str = "极火"..NumToChinese[this.skillData[i].star - 10] end this.skillList[i].skillName.text = str.."解锁" Util.SetGray(this.skillList[i].go,true) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 6a06293e09..52960de67f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -18,7 +18,7 @@ local tabs = { }, [RoleInfoPanelIndex.pifu] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = Language[11816],rpType = -1, }, - [RoleInfoPanelIndex.feiSheng] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = "飞升",rpType = -1, + [RoleInfoPanelIndex.feiSheng] = {default = "task_bigbtn02", lock = "UI_hz_gonghui_Lock", select = "task_bigbtn01",title = "极火",rpType = -1, }, } diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index fc8be243be..e60c1321e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -301,9 +301,9 @@ function this.GetSoulLockTip() if curHeroData.star < v.OpenRules[2] then local str="" if v.OpenRules[2]==14 then - str="飞升四阶" + str="极火四阶" elseif v.OpenRules[2]==15 then - str="飞升五阶" + str="极火五阶" end return string.format("%s解锁",str) end