diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab index 45afc7f773..5baf292fd9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab @@ -1966,6 +1966,117 @@ MonoBehaviour: m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &4284418777292211242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7162620916745581414} + - component: {fileID: 6486017028034272289} + - component: {fileID: 3873118809133870292} + - component: {fileID: 192760128354121307} + - component: {fileID: 1914947997647204652} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7162620916745581414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4284418777292211242} + 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: 1329782309878676808} + 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: -19, y: 63} + m_SizeDelta: {x: 600, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6486017028034272289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4284418777292211242} + m_CullTransparentMesh: 0 +--- !u!114 &3873118809133870292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4284418777292211242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 100 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4F1F\u5927\u822A\u8DEF" +--- !u!114 &192760128354121307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4284418777292211242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.6392157, g: 0.79215693, b: 0.854902, a: 1} + m_EffectDistance: {x: 3, y: -3} + m_UseGraphicAlpha: 1 +--- !u!114 &1914947997647204652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4284418777292211242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -10.65} + m_UseGraphicAlpha: 1 --- !u!1 &4918942823368355812 GameObject: m_ObjectHideFlags: 0 @@ -2560,13 +2671,14 @@ 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: 7162620916745581414} m_Father: {fileID: 6039495253487302433} 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: 3, y: 808} + m_AnchoredPosition: {x: 3, y: 713} m_SizeDelta: {x: 630, y: 244} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5121610699126044405 @@ -2584,7 +2696,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6346165074287100347} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2715,7 +2827,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: -322, y: -70} + m_AnchoredPosition: {x: -222, y: -70} m_SizeDelta: {x: 503.85, y: 129.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2129073551700837811 @@ -2753,13 +2865,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 100 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u53CC\u4EBA\u8BD5\u70BC" + m_Text: "\u4F1F\u5927\u822A\u8DEF\u524D\u6BB5 " --- !u!114 &1183499131475463891 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3515,7 +3627,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: -322, y: -70} + m_AnchoredPosition: {x: -226, y: -70} m_SizeDelta: {x: 503.85, y: 129.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &451581037326680055 @@ -3553,13 +3665,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 100 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u53CC\u4EBA\u8BD5\u70BC" + m_Text: "\u4F1F\u5927\u822A\u8DEF\u540E\u6BB5" --- !u!114 &4763604762951971320 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab index 68f42ac041..13c5e25c1d 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab @@ -34,8 +34,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: 458, y: 798} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: 458, y: 869} + m_SizeDelta: {x: 144.41, y: 138.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1208510524 CanvasRenderer: @@ -300,8 +300,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -82, y: -158} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: -82.6001, y: -84.510254} + m_SizeDelta: {x: 149.23, y: 144.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5953229080547441855 CanvasRenderer: @@ -464,8 +464,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: -436, y: 789} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: 456.95, y: 709.21} + m_SizeDelta: {x: 144.41, y: 138.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7020296833619948017 CanvasRenderer: @@ -726,8 +726,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -85, y: -329} - m_SizeDelta: {x: 166, y: 182} + m_AnchoredPosition: {x: -231.41992, y: -89.799805} + m_SizeDelta: {x: 158.72, y: 143.36} m_Pivot: {x: 0.49999994, y: 0.5} --- !u!222 &5275389917384150032 CanvasRenderer: @@ -880,8 +880,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: 101.5, y: -157} - m_SizeDelta: {x: 186, y: 165} + m_AnchoredPosition: {x: 1002.7, y: -239.78998} + m_SizeDelta: {x: 149.39, y: 136.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4269923484805502012 CanvasRenderer: @@ -20420,15 +20420,16 @@ RectTransform: - {fileID: 4338331143962917799} - {fileID: 4711150923135007967} - {fileID: 7806638948486298782} + - {fileID: 8938437714928774102} - {fileID: 339340192971562833} - {fileID: 402076064177301732} m_Father: {fileID: 7806638948721940619} - 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: -7, y: 102} - m_SizeDelta: {x: 397, y: 402} + m_AnchoredPosition: {x: -23, y: 32} + m_SizeDelta: {x: 301.3, y: 298.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8248293466465543988 CanvasRenderer: @@ -20445,7 +20446,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1724013259707543523} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -20503,7 +20504,7 @@ RectTransform: 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: 42, y: -638} + m_AnchoredPosition: {x: 42, y: -807} m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2120958500500716727 @@ -30428,7 +30429,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: 6fe47bfea845d344bbab69e65f63d010, type: 3} + m_Sprite: {fileID: 21300000, guid: 66f1595ac7c6b10419d89669ba1f6242, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -35211,12 +35212,12 @@ RectTransform: - {fileID: 6141158140942588348} - {fileID: 1469755645464906340} m_Father: {fileID: 5024074326047684402} - 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} - m_AnchoredPosition: {x: 8, y: -358} - m_SizeDelta: {x: 235.5, y: 96.5} + m_AnchoredPosition: {x: 10.02, y: -191.43} + m_SizeDelta: {x: 211.86, y: 74.17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3038910061454878525 CanvasRenderer: @@ -40123,7 +40124,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7806638948721940619} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -40684,7 +40685,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &339340192971562833 RectTransform: m_ObjectHideFlags: 0 @@ -40700,11 +40701,11 @@ RectTransform: - {fileID: 3517335542461511980} - {fileID: 231630760203003901} m_Father: {fileID: 5024074326047684402} - m_RootOrder: 5 + 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: 1.4, y: 16.225} + m_AnchoredPosition: {x: 1.4, y: -3} m_SizeDelta: {x: 336.1, y: 329.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &909968877767145814 @@ -40914,7 +40915,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -82.25, y: -36.02002} + m_AnchoredPosition: {x: -708, y: -36.02002} m_SizeDelta: {x: 49.61, y: 51.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1883945852554000627 @@ -51762,7 +51763,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.7, y: -53.5} + m_AnchoredPosition: {x: -0.8, y: -49.1} m_SizeDelta: {x: 160, y: 101.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7316103713788336582 @@ -51795,7 +51796,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -51937,8 +51938,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: 3.895, y: 0.0001173} - m_SizeDelta: {x: 258, y: 85} + m_AnchoredPosition: {x: 0.7, y: -0.1} + m_SizeDelta: {x: 212.26, y: 72.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8648946191202129169 CanvasRenderer: @@ -61827,7 +61828,7 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7806638948721940619} - 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} @@ -62247,7 +62248,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: 9.9, y: -60.2} + m_AnchoredPosition: {x: 1.5, y: -37.9} m_SizeDelta: {x: 160, y: 101.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4011452964872574001 @@ -62280,7 +62281,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -62291,7 +62292,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6218\u4EE4" + m_Text: "\u52A9\u6218" --- !u!114 &164993047 MonoBehaviour: m_ObjectHideFlags: 0 @@ -62565,7 +62566,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: -51.1} + m_AnchoredPosition: {x: 0.5, y: -43.3} m_SizeDelta: {x: 160, y: 101.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3491114506344837812 @@ -62598,7 +62599,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -67915,11 +67916,11 @@ RectTransform: m_Children: - {fileID: 7806638948266605393} m_Father: {fileID: 7806638948147681323} - m_RootOrder: 2 + m_RootOrder: 4 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: 12.538, y: -119.299805} + m_AnchoredPosition: {x: -9, y: -29} m_SizeDelta: {x: 322.83, y: 41.099976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493418260395404975 @@ -67993,8 +67994,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: 456.7, y: 622.6} - m_SizeDelta: {x: 180, y: 174} + m_AnchoredPosition: {x: 306.3, y: 869.43} + m_SizeDelta: {x: 144.41, y: 138.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5732741373052145368 CanvasRenderer: @@ -68107,6 +68108,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7141313214718712957 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2561491465378247957} + - component: {fileID: 2514314767186668704} + - component: {fileID: 6131417595572880507} + 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 &2561491465378247957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141313214718712957} + 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: 7806638948721940619} + 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: 1.465, y: -0.000022888} + m_SizeDelta: {x: 1072, y: 432.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2514314767186668704 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141313214718712957} + m_CullTransparentMesh: 0 +--- !u!114 &6131417595572880507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141313214718712957} + 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: 0.32156864} + 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: 90e7fdf7150fa2542a6e0bb003822b23, 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 &7146843193386672230 GameObject: m_ObjectHideFlags: 0 @@ -68537,7 +68612,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: 129.29, y: -23.779999} + m_AnchoredPosition: {x: 122.4, y: -31.5} m_SizeDelta: {x: 118.51, y: 39.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &168394776550913998 @@ -68608,9 +68683,9 @@ RectTransform: m_Children: - {fileID: 4838256307902163560} - {fileID: 2215924426059456470} - - {fileID: 8343963279466766131} - {fileID: 7806638948721940619} - {fileID: 8932545110001937499} + - {fileID: 8343963279466766131} - {fileID: 1208510522} - {fileID: 1757751648272687148} - {fileID: 3966417162464893792} @@ -68803,7 +68878,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -185.5, y: -59.600006} + m_AnchoredPosition: {x: 259, y: -9} m_SizeDelta: {x: 282.9, y: 98.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7806638948486298780 @@ -68887,16 +68962,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2561491465378247957} - {fileID: 5024074326047684402} - {fileID: 3109173601764913313} - {fileID: 1989403210272614212} m_Father: {fileID: 7806638948147681323} - m_RootOrder: 3 + 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: 1048.7, y: -431.3} - m_SizeDelta: {x: 325.5, y: 647.5} + m_AnchoredPosition: {x: -0.054977, y: 1513} + m_SizeDelta: {x: 1074.9, y: 432.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1948123316515751128 CanvasRenderer: @@ -69146,14 +69222,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8938437714928774102} + - {fileID: 3435129912975330785} m_Father: {fileID: 5024074326047684402} 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: 282, y: -374} - m_SizeDelta: {x: 218, y: 88} + m_AnchoredPosition: {x: -228, y: -33} + m_SizeDelta: {x: 235, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1798275871522754023 CanvasRenderer: @@ -69170,7 +69246,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7831067964093048782} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -69183,7 +69259,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3} + m_Sprite: {fileID: 21300000, guid: 397f7080ce148094580d95b62878cefd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -74509,6 +74585,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8751854412522727443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3435129912975330785} + - component: {fileID: 8337377089639933087} + - component: {fileID: 7302487899815438019} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3435129912975330785 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8751854412522727443} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_Children: [] + m_Father: {fileID: 1331965263365484713} + 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: 75, y: 0} + m_SizeDelta: {x: 213.2, y: 39.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8337377089639933087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8751854412522727443} + m_CullTransparentMesh: 0 +--- !u!114 &7302487899815438019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8751854412522727443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9176471, g: 0.9176471, b: 0.9176471, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 32432432w --- !u!1 &8778266740655375593 GameObject: m_ObjectHideFlags: 0 @@ -74721,12 +74876,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7806638948147681323} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 4, y: -420} - m_SizeDelta: {x: 8, y: -661.3} + m_AnchoredPosition: {x: 4, y: -99.69971} + m_SizeDelta: {x: 8, y: -340.2} m_Pivot: {x: 0.49999997, y: 1} --- !u!1 &8938437714082590465 GameObject: @@ -74877,6 +75032,7 @@ GameObject: - component: {fileID: 8938437714928774102} - component: {fileID: 8938437714928774100} - component: {fileID: 8938437714928774103} + - component: {fileID: 3157463266139193705} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -74891,17 +75047,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8938437714928774097} - 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: 0.8, y: 0.8, z: 0.8} m_Children: [] - m_Father: {fileID: 1331965263365484713} - m_RootOrder: 0 + m_Father: {fileID: 5024074326047684402} + 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: -14.2, y: 1.22} - m_SizeDelta: {x: 187.22, y: 15.94} + m_AnchoredPosition: {x: 375, y: -92} + m_SizeDelta: {x: 213.2, y: 39.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8938437714928774100 CanvasRenderer: @@ -74933,18 +75089,33 @@ 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: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 300 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 32432432w + m_Text: "\u5956\u52B1\uFF1A" +--- !u!114 &3157463266139193705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938437714928774097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &9045082329563443880 GameObject: m_ObjectHideFlags: 0 @@ -75076,22 +75247,22 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: 287.65 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -188.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75101,7 +75272,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75111,7 +75282,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75133,6 +75304,31 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.7 objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 2.2999992 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.885 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 236 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 338.2 + objectReference: {fileID: 0} + - target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75245,9 +75441,21 @@ PrefabInstance: objectReference: {fileID: 4239138255771575618} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &3934879465561439888 stripped +--- !u!4 &3017694835917112368 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3458715491590983735 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2874966427381289844 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} @@ -75257,6 +75465,54 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} +--- !u!4 &7324771491079276774 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6789526059838717039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &39609491160141977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8215435202396873296 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1298431382559632061 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3934879465561439888 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8834863461068896970 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8145092030358069884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} --- !u!4 &8345161809758301208 stripped Transform: m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, @@ -75275,27 +75531,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &8145092030358069884 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4239138255771575618 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} --- !u!224 &3517335542461511980 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &8834863461068896970 stripped +--- !u!4 &4239138255771575618 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} @@ -75323,54 +75567,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &3458715491590983735 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2874966427381289844 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7324771491079276774 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6789526059838717039 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &39609491160141977 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3017694835917112368 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8215435202396873296 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1298431382559632061 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2312794644865576594 PrefabInstance: m_ObjectHideFlags: 0 @@ -75446,12 +75642,12 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: 742.6 + value: 55.550003 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -197.05 + value: -224.875 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75615,9 +75811,15 @@ PrefabInstance: objectReference: {fileID: 662747332772281235} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &2590766443349557498 stripped +--- !u!4 &1442016386633059749 stripped Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &469443268855522580 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} @@ -75627,9 +75829,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &662747332772281235 stripped +--- !u!4 &7917258885034123966 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2024701814541766374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4823305674520378541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} @@ -75639,6 +75853,48 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} +--- !u!4 &662747332772281235 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5428183252868327391 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3704848856444800584 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4748458885330304129 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2441523354941633644 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &395609773085990977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2590766443349557498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} --- !u!4 &3938731767263050251 stripped Transform: m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, @@ -75657,87 +75913,27 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &2024701814541766374 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1442016386633059749 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &469443268855522580 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6215016020277614135 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7917258885034123966 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3704848856444800584 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2441523354941633644 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &395609773085990977 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} --- !u!4 &5295460731459003419 stripped Transform: m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &4823305674520378541 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4748458885330304129 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2838191739614327314 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} --- !u!4 &4623231488584757961 stripped Transform: m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &5428183252868327391 stripped +--- !u!4 &2838191739614327314 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6215016020277614135 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} @@ -75811,22 +76007,22 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x - value: 62.649994 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: -188.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75836,7 +76032,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75846,7 +76042,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -75868,6 +76064,31 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.7 objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00050163 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.88 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 236 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 338.2 + objectReference: {fileID: 0} + - target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75980,21 +76201,15 @@ PrefabInstance: objectReference: {fileID: 242976170226757424} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &7324141232903758657 stripped +--- !u!4 &6642132831306302100 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &1182838340984393282 stripped +--- !u!4 &931814734807593399 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1618088765004405317 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} @@ -76004,9 +76219,99 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &6642132831306302100 stripped +--- !u!4 &1618088765004405317 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1182838340984393282 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7324141232903758657 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4378795258779545256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2997696272135148633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!224 &674236236680835934 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &242976170226757424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5642701455126167049 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3246810435530417841 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5351595982620730986 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5224851005951387662 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4832632607405404344 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3138934397645299919 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1085587704857244898 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5442704090709780514 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4109518020871527147 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} @@ -76022,87 +76327,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &4109518020871527147 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5442704090709780514 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3138934397645299919 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!224 &674236236680835934 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &931814734807593399 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1085587704857244898 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4832632607405404344 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5224851005951387662 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5351595982620730986 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3246810435530417841 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5642701455126167049 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &242976170226757424 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2997696272135148633 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4378795258779545256 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 3827f75904..14c0f622ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -538,7 +538,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) local liveName = heroData.painting local roleConfig = {} local toward=0 - local star,starType = heroData.GetStar() + local star,starType = heroData.GetStar(3) local level=heroData.lv if panelType == FORMATION_TYPE.WORLDARENA then star=endLess[heroData.heroConfig.Id].Star diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index e96b3b86e6..beeea9bb45 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -43,7 +43,7 @@ function GodsWayTowerPanel:InitComponent() local rootHight = this.grid.transform.rect.height local width = this.grid.transform.rect.width this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.grid.transform, - this.pre, nil, Vector2.New(width, rootHight), 1, 2, Vector2.New(200, -15)) + this.pre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) this.scrollView.moveTween.MomentumAmount = 1 this.scrollView.moveTween.Strength = 2 -- 挂机奖励 @@ -218,9 +218,9 @@ function GodsWayTowerPanel:OnShow() this.moppingUpBtn:SetActive(curFloor~=0) storeDataId,itemId,costNum = GodsWayTowerManager.GetCost(curType) if curType==1 then - this.titleText.text = "双队试炼" + this.titleText.text = "伟大航路前段" else - this.titleText.text = "三队试炼" + this.titleText.text = "伟大航路后段" end --this.canFightWaves.text = "可挑战层数:"..trailData.canFightTime this.canFightWaves.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index 9bcb119f4e..dd5ec70dba 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -24,7 +24,7 @@ local tabs = { -- rpType = RedPointType.Equip_Fetter,funcType = FUNCTION_OPEN_TYPE.COMPOUND,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_zhuangbeipian_zi_zh", -- }, [5] = { --神兵 - default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "神兵篇", + default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "名刀篇", rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "UI_hz_zhonghe05_71",zi = "GodWeaponAtlas_handbook_title_zh", }, } diff --git a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua index 2169d87200..86ec09718e 100644 --- a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua @@ -233,14 +233,14 @@ function GodsWaySingleSingleWave:SingleHeroDataShow(go,monConfig,heroData,index, Util.GetGameObject(go,"yuanImage"):SetActive(false) Util.GetGameObject(go,"hpProgress"):SetActive(false) Util.GetGameObject(go,"rageProgress"):SetActive(false) - frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star]) - local liveName = heroData.live + --frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star]) + local liveName = heroData.painting local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.heroConfig.Id) local scale = roleConfig.play_liveScale - local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0) local heroIndex=(self.data.wave-1)*len+index --LogError("self.data.wave=="..self.data.wave.." index=="..index.." heroindex=="..heroIndex) --icon.texture = CardRendererManager.GetSpineTexture((self.data.wave%6 == 0 and 12 or (self.data.wave%6 + 6)), liveName, Vector3.one * scale, livePos, true) + local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2]+50, 0) icon.texture = CardRendererManager.GetSpineTexture(heroIndex%12==0 and 12 or heroIndex%12, liveName, Vector3.one * scale, livePos, true) icon.transform.localScale = Vector3.one icon.transform.localPosition = Vector3.zero