diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab index 4262c4595d..9b929e1e76 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonAllSkillInfoPopup.prefab @@ -76,8 +76,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: -1543, y: 419} - m_SizeDelta: {x: 650, y: 0} + m_AnchoredPosition: {x: -1562, y: 390} + m_SizeDelta: {x: 620, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1860555992772850798 CanvasRenderer: @@ -114,8 +114,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 + m_Left: 10 + m_Right: 10 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 @@ -182,7 +182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.7735849, g: 0.65583616, b: 0.3466536, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -270,10 +270,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 20 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -390,7 +390,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: -13, y: -21} + m_AnchoredPosition: {x: -59, y: -21} m_SizeDelta: {x: 662.55, y: 39} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3398852186055745455 @@ -414,7 +414,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2784314, g: 0.5411765, b: 0.37254903, a: 1} + m_Color: {r: 0.3539516, g: 0.7735849, b: 0.5020575, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -434,7 +434,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.1 - m_Text: + m_Text: "1\u661F\u6FC0\u6D3B" LanguageIndex: 0 --- !u!1 &4323202771301113729 GameObject: @@ -471,7 +471,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 640.8, y: 0} + m_SizeDelta: {x: 605.33, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &226332539532498445 CanvasRenderer: @@ -494,7 +494,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.8113208, g: 0.66430855, b: 0.57022077, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -575,7 +575,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.48235294, g: 0.28235295, b: 0.13333334, a: 1} + m_Color: {r: 0.990566, g: 0.639815, b: 0.378471, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -607,6 +607,7 @@ GameObject: m_Component: - component: {fileID: 8318244381695467668} - component: {fileID: 8862598739554882174} + - component: {fileID: 107198081104272580} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -623,7 +624,7 @@ RectTransform: m_GameObject: {fileID: 4684142525127782624} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: - {fileID: 6691482258876763617} m_Father: {fileID: 9132023566809640833} @@ -631,8 +632,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: 9.5, y: -4.4} - m_SizeDelta: {x: 280.5, y: 64.08} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 858, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8862598739554882174 CanvasRenderer: @@ -642,6 +643,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4684142525127782624} m_CullTransparentMesh: 0 +--- !u!114 &107198081104272580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684142525127782624} + 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: 917b0fb15ffb18243bdfd178d8f1b152, 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 &4774394755809750407 GameObject: m_ObjectHideFlags: 0 @@ -700,14 +730,14 @@ 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.9411765} 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: 58c503111f310224a9a04ab39a004308, type: 3} + m_Sprite: {fileID: 21300000, guid: ede034f0264b2c747928c78d64b97564, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -795,7 +825,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: 0} + m_AnchoredPosition: {x: 0, y: 55.1} m_SizeDelta: {x: 197.07, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6513456190567692597 @@ -829,7 +859,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 48 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 70 @@ -899,7 +929,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.8207547, g: 0.6625904, b: 0.56136525, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab index befad8961d..97f09be149 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab @@ -31,12 +31,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2681911924583289171} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 394, y: -248} - m_SizeDelta: {x: 769, y: 268} + m_AnchoredPosition: {x: 394, y: -255.4} + m_SizeDelta: {x: 769, y: 260.6} m_Pivot: {x: 1, y: 1} --- !u!222 &1639807305043071355 CanvasRenderer: @@ -101,7 +101,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.9245283, g: 0.8941824, b: 0.7980598, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -157,8 +157,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 605.4, y: -87} - m_SizeDelta: {x: 605.4, y: 130} + m_AnchoredPosition: {x: 716.4, y: -90} + m_SizeDelta: {x: 605.4, y: 115.1} m_Pivot: {x: 1, y: 1} --- !u!222 &6516281780208366694 CanvasRenderer: @@ -181,7 +181,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.9245283, g: 0.8941824, b: 0.7980598, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -195,12 +195,12 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 28 m_MaxSize: 32 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.2 + m_LineSpacing: 1 m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\n\u5BF9\u751F\u547D\u503C\u6700\u4F4E\n" LanguageIndex: 0 --- !u!1 &540098779584679991 @@ -230,15 +230,15 @@ RectTransform: m_GameObject: {fileID: 540098779584679991} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85066724, y: 0.85066724, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2681911924583289171} 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: 1.58, y: -154} - m_SizeDelta: {x: 980.22, y: 59.42} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -126.5} + m_SizeDelta: {x: 950, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3512439638950480629 CanvasRenderer: @@ -268,7 +268,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: bd6e456bd61c3d045bc5fe944c025e90, type: 3} + m_Sprite: {fileID: 21300000, guid: 00e3708dd9f4ce545a3d07f9083654b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,11 +307,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2681911924583289171} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 179.4, y: -190.9} + m_AnchoredPosition: {x: 179.4, y: -197.6} m_SizeDelta: {x: 555, y: 42} m_Pivot: {x: 1, y: 1} --- !u!222 &3448469357569243240 @@ -335,7 +335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} + m_Color: {r: 0.9716981, g: 0.68902504, b: 0.18792273, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -344,7 +344,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -387,11 +387,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4992170729401993570} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 179, y: 139} + m_AnchoredPosition: {x: 179, y: 152} m_SizeDelta: {x: 555.1, y: 42} m_Pivot: {x: 1, y: 1} --- !u!222 &591622831560282562 @@ -415,7 +415,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} + m_Color: {r: 0.9716981, g: 0.68902504, b: 0.18792273, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -424,7 +424,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -533,7 +533,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5298704627110431964 RectTransform: m_ObjectHideFlags: 0 @@ -550,7 +550,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.7000123, y: -52.700016} + m_AnchoredPosition: {x: 1.7000122, y: -52.700012} m_SizeDelta: {x: -55.299988, y: -158.09998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &984270244410182131 @@ -625,7 +625,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: 132, y: 424} + m_AnchoredPosition: {x: 0, y: 449} m_SizeDelta: {x: 704.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4223889078831659468 @@ -670,8 +670,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 420, y: -39} - m_SizeDelta: {x: 420, y: 38} + m_AnchoredPosition: {x: 531, y: -29} + m_SizeDelta: {x: 420, y: 50} m_Pivot: {x: 1, y: 1} --- !u!222 &1496520769140915758 CanvasRenderer: @@ -694,7 +694,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5254902, g: 0.33333334, b: 0.11764707, a: 1} + m_Color: {r: 0.9716981, g: 0.68902504, b: 0.18792273, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -703,7 +703,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -747,12 +747,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4992170729401993570} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 393.2, y: 87.00001} - m_SizeDelta: {x: 769.2, y: 183.8} + m_AnchoredPosition: {x: 393.2, y: 95.6} + m_SizeDelta: {x: 769.2, y: 203} m_Pivot: {x: 1, y: 1} --- !u!222 &5088807683379780490 CanvasRenderer: @@ -817,7 +817,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.34901962, b: 0.28627452, a: 1} + m_Color: {r: 0.9245283, g: 0.8941824, b: 0.7980598, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -869,6 +869,7 @@ RectTransform: m_Children: - {fileID: 4684488753878028513} - {fileID: 466885976322591967} + - {fileID: 692344562024805381} - {fileID: 6937486829890818633} - {fileID: 6770360468690446731} m_Father: {fileID: 4199312890852100441} @@ -951,14 +952,14 @@ 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.9019608} 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: 58c503111f310224a9a04ab39a004308, type: 3} + m_Sprite: {fileID: 21300000, guid: ede034f0264b2c747928c78d64b97564, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1063,6 +1064,7 @@ GameObject: m_Component: - component: {fileID: 4991140602952300458} - component: {fileID: 4993513678868442376} + - component: {fileID: 5520748024294418378} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -1087,8 +1089,8 @@ RectTransform: 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: -42} - m_SizeDelta: {x: 265.95996, y: 54.44} + m_AnchoredPosition: {x: 0, y: -88} + m_SizeDelta: {x: 858, y: 35} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4993513678868442376 CanvasRenderer: @@ -1098,6 +1100,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5070093429220254418} m_CullTransparentMesh: 0 +--- !u!114 &5520748024294418378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5070093429220254418} + 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: 917b0fb15ffb18243bdfd178d8f1b152, 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 &5070213742167352308 GameObject: m_ObjectHideFlags: 0 @@ -1132,8 +1163,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000015259, y: 0.0000019073486} - m_SizeDelta: {x: 197.07, y: 47.75} + m_AnchoredPosition: {x: 0, y: 55} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4993851722751980146 CanvasRenderer: @@ -1156,7 +1187,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.94117653, g: 0.87843144, b: 0.7686275, a: 1} + m_Color: {r: 0.9716981, g: 0.79669243, b: 0.49043253, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1165,8 +1196,8 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 - m_FontStyle: 0 + m_FontSize: 45 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 70 @@ -1282,6 +1313,7 @@ RectTransform: m_Children: - {fileID: 3933820329740296671} - {fileID: 1912866778025550643} + - {fileID: 5960580817094176070} - {fileID: 593746869620370062} - {fileID: 921979974891696337} m_Father: {fileID: 4199312890852100441} @@ -1327,7 +1359,7 @@ RectTransform: m_GameObject: {fileID: 5070824192050067808} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_Children: - {fileID: 4991881148015395816} - {fileID: 4991500326418806048} @@ -1336,7 +1368,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: -310, y: 319} + m_AnchoredPosition: {x: -314.2, y: 347.1} m_SizeDelta: {x: 90.28003, y: 90.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4993373206789795048 @@ -1478,15 +1510,15 @@ RectTransform: m_GameObject: {fileID: 5465576253348542693} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8506672, y: 0.8506672, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4992170729401993570} 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: 1.58, y: 178.03} - m_SizeDelta: {x: 980.22, y: 59.42} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 231.42} + m_SizeDelta: {x: 950, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7114343251047875740 CanvasRenderer: @@ -1516,7 +1548,81 @@ 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: bd6e456bd61c3d045bc5fe944c025e90, type: 3} + m_Sprite: {fileID: 21300000, guid: 00e3708dd9f4ce545a3d07f9083654b8, 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 &6192966459746720999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5960580817094176070} + - component: {fileID: 7709051997282918382} + - component: {fileID: 7952883861503675628} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5960580817094176070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6192966459746720999} + 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: 4992170729401993570} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 175.2} + m_SizeDelta: {x: 950, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7709051997282918382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6192966459746720999} + m_CullTransparentMesh: 0 +--- !u!114 &7952883861503675628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6192966459746720999} + 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: 00e3708dd9f4ce545a3d07f9083654b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1674,11 +1780,11 @@ RectTransform: m_Father: {fileID: 4992170729401993570} 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: 91, y: 203.06} - m_SizeDelta: {x: 466.6, y: 50.11} - m_Pivot: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 203.7} + m_SizeDelta: {x: 466.6, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8922295556461203564 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1700,7 +1806,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} + m_Color: {r: 0.7843138, g: 0.7254902, b: 0.64705884, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1709,12 +1815,12 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 - m_FontStyle: 0 + m_FontSize: 35 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1722,6 +1828,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5F53\u524D\u7B49\u7EA7" LanguageIndex: 0 +--- !u!1 &7693290109819736833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692344562024805381} + - component: {fileID: 5463722208149669062} + - component: {fileID: 3206156623906987680} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &692344562024805381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693290109819736833} + 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: 2681911924583289171} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -182.5} + m_SizeDelta: {x: 950, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5463722208149669062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693290109819736833} + m_CullTransparentMesh: 0 +--- !u!114 &3206156623906987680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693290109819736833} + 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: 00e3708dd9f4ce545a3d07f9083654b8, 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 &8461878044636810698 GameObject: m_ObjectHideFlags: 0 @@ -1754,11 +1934,11 @@ RectTransform: m_Father: {fileID: 2681911924583289171} 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: 91, y: -128.81998} - m_SizeDelta: {x: 466.6, y: 51.18} - m_Pivot: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -154.41} + m_SizeDelta: {x: 466.6, y: 50} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7431841981134847872 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1780,7 +1960,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} + m_Color: {r: 0.78431374, g: 0.7254902, b: 0.64705884, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1790,11 +1970,11 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 32 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1