diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index dac44f6799..faa74a127c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -64859,7 +64859,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: 62.660496, y: -6.7535} + m_AnchoredPosition: {x: 77.110504, y: -28.9535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &4267877275148723013 @@ -98597,8 +98597,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: -13.6, y: -102} - m_SizeDelta: {x: 170.79999, y: 30} + m_AnchoredPosition: {x: -13.44, y: -102} + m_SizeDelta: {x: 199.7, y: 74.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &634518588873211544 CanvasRenderer: @@ -179834,7 +179834,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: 124.139496, y: -6.7535} + m_AnchoredPosition: {x: 138.5895, y: -28.9535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &6263878411758922803 @@ -200979,7 +200979,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: 42.167496, y: -6.7535} + m_AnchoredPosition: {x: 56.6175, y: -28.9535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &2119603865895816861 @@ -225635,7 +225635,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: 103.6465, y: -6.7535} + m_AnchoredPosition: {x: 118.0965, y: -28.9535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &944337245014338764 @@ -236286,7 +236286,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: 83.153496, y: -6.7535} + m_AnchoredPosition: {x: 97.6035, y: -28.9535} m_SizeDelta: {x: 32.493, y: 32.493} m_Pivot: {x: 0, y: 1} --- !u!222 &3377134514865943644 diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab index 6a77f173f7..0fc1aa0749 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab @@ -1260,6 +1260,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1207466032} + - component: {fileID: 920567891043258623} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -1286,6 +1287,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &920567891043258623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207466031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1299374983 GameObject: m_ObjectHideFlags: 0 @@ -2562,6 +2586,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1686743504476821615} + - component: {fileID: 7056748716131386201} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -2588,6 +2613,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &7056748716131386201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309732667879195979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &322339096638839563 GameObject: m_ObjectHideFlags: 0 @@ -3422,6 +3470,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 262617907175397813} + - component: {fileID: 7952532440293150761} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -3448,6 +3497,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &7952532440293150761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689395085363349193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &711579534274837820 GameObject: m_ObjectHideFlags: 0 @@ -4948,6 +5020,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8090360538184304510} + - component: {fileID: 9078995636765457710} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -4974,6 +5047,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &9078995636765457710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033751437226277020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1041987742574663967 GameObject: m_ObjectHideFlags: 0 @@ -10023,7 +10119,7 @@ ParticleSystem: --- !u!199 &183811353441062434 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11077,6 +11173,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3234838221363769531} + - component: {fileID: 744983640586969601} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -11103,6 +11200,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &744983640586969601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1430972911484920918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1444539460297596819 GameObject: m_ObjectHideFlags: 0 @@ -15863,7 +15983,7 @@ ParticleSystem: --- !u!199 &3726496062862187039 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15931,6 +16051,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8742225217215501589} + - component: {fileID: 8719752230065439935} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -15957,6 +16078,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8719752230065439935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447559302574042072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1507494832182733973 GameObject: m_ObjectHideFlags: 0 @@ -16772,6 +16916,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5103637068576441152} + - component: {fileID: 1510087026637641057} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -16798,6 +16943,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &1510087026637641057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872877905901921782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1901734558359496818 GameObject: m_ObjectHideFlags: 0 @@ -22154,7 +22322,7 @@ ParticleSystem: --- !u!199 &1828999986466696245 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27445,7 +27613,7 @@ ParticleSystem: --- !u!199 &7169494131298017607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28265,6 +28433,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 183495778633635634} + - component: {fileID: 8951866751701490478} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -28291,6 +28460,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8951866751701490478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2482857299644183590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &2508568365211051542 GameObject: m_ObjectHideFlags: 0 @@ -28300,6 +28492,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8017049124636713678} + - component: {fileID: 748402830668129749} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -28326,6 +28519,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &748402830668129749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2508568365211051542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &2562475833595681297 GameObject: m_ObjectHideFlags: 0 @@ -33028,7 +33244,7 @@ ParticleSystem: --- !u!199 &4730220943101630174 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33096,6 +33312,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4980340271684471745} + - component: {fileID: 772735462374546798} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -33122,6 +33339,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &772735462374546798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2620943572599098933} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &2623755508154218845 GameObject: m_ObjectHideFlags: 0 @@ -34082,6 +34322,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6202997973243386878} + - component: {fileID: 1549795981698861279} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -34108,6 +34349,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &1549795981698861279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2970575711880269637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3006655462135868492 GameObject: m_ObjectHideFlags: 0 @@ -35037,6 +35301,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5365978843761595421} + - component: {fileID: 1331532419674675987} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -35063,6 +35328,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &1331532419674675987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3290942904455695717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3291741053704979662 GameObject: m_ObjectHideFlags: 0 @@ -39991,7 +40279,7 @@ ParticleSystem: --- !u!199 &8377234745172345827 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44752,7 +45040,7 @@ ParticleSystem: --- !u!199 &2112434876054886735 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45480,6 +45768,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6766480401711569047} + - component: {fileID: 3457296584971254562} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -45506,6 +45795,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &3457296584971254562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435860351247931373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3459359782604638789 GameObject: m_ObjectHideFlags: 0 @@ -46283,6 +46595,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4449491527087194539} + - component: {fileID: 261220822502422079} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -46309,6 +46622,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &261220822502422079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3654582902163206058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3665890039712406907 GameObject: m_ObjectHideFlags: 0 @@ -46806,6 +47142,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8783105792436154692} + - component: {fileID: 4600498295032439740} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -46832,6 +47169,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &4600498295032439740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3825725757992395538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3869698158530342542 GameObject: m_ObjectHideFlags: 0 @@ -51682,7 +52042,7 @@ ParticleSystem: --- !u!199 &7853062081848821078 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52324,6 +52684,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 508009223436340169} + - component: {fileID: 2766791288650217296} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -52350,6 +52711,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &2766791288650217296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4107652901311476410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4131524445910963799 GameObject: m_ObjectHideFlags: 0 @@ -52433,6 +52817,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3834195086781618410} + - component: {fileID: 6845304863058798705} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -52459,6 +52844,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &6845304863058798705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4165209069337843897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4175265255250745658 GameObject: m_ObjectHideFlags: 0 @@ -53468,6 +53876,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7294826893954336752} + - component: {fileID: 4216264488829224433} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -53494,6 +53903,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &4216264488829224433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508434426363264472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4509515127972829331 GameObject: m_ObjectHideFlags: 0 @@ -54494,6 +54926,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3653938596888377453} + - component: {fileID: 5835993553270895872} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -54520,6 +54953,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &5835993553270895872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4688340591011752352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4745777510839452517 GameObject: m_ObjectHideFlags: 0 @@ -54759,6 +55215,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7715482511550897472} + - component: {fileID: 8073067295904959262} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -54785,6 +55242,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8073067295904959262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4816802163776244837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4873840392183860370 GameObject: m_ObjectHideFlags: 0 @@ -55305,6 +55785,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2556952563562128554} + - component: {fileID: 5334531466427718290} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -55331,6 +55812,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &5334531466427718290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5052967039424373326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5080642077589471892 GameObject: m_ObjectHideFlags: 0 @@ -60063,7 +60567,7 @@ ParticleSystem: --- !u!199 &7967927306451800798 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60655,6 +61159,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8778456344219408860} + - component: {fileID: 8649740020991206010} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -60681,6 +61186,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8649740020991206010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5456910625088950564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5479302682362179327 GameObject: m_ObjectHideFlags: 0 @@ -62101,6 +62629,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6724617316262137215} + - component: {fileID: 915947155324055908} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62127,6 +62656,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &915947155324055908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5948031439105881893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5982575147209675444 GameObject: m_ObjectHideFlags: 0 @@ -62465,6 +63017,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1597570796455138250} + - component: {fileID: 4815252059452007365} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62491,6 +63044,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &4815252059452007365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6057332651121165736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6064449256958640464 GameObject: m_ObjectHideFlags: 0 @@ -63154,6 +63730,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 663378637218711927} + - component: {fileID: 6265514066246853723} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -63180,6 +63757,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &6265514066246853723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6335270839048348384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6351663304555202014 GameObject: m_ObjectHideFlags: 0 @@ -63190,6 +63790,8 @@ GameObject: m_Component: - component: {fileID: 4703390379678214157} - component: {fileID: 91760674196836699} + - component: {fileID: 5536688529873052477} + - component: {fileID: 1518390399158646271} m_Layer: 5 m_Name: enInfo m_TagString: Untagged @@ -63244,6 +63846,43 @@ MonoBehaviour: m_Spacing: {x: 0, y: -56} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!222 &5536688529873052477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6351663304555202014} + m_CullTransparentMesh: 0 +--- !u!114 &1518390399158646271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6351663304555202014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6353018047668852550 GameObject: m_ObjectHideFlags: 0 @@ -64789,6 +65428,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5834595128899102240} + - component: {fileID: 3885295179856451463} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -64815,6 +65455,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &3885295179856451463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6781316386673238288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6791919522298219114 GameObject: m_ObjectHideFlags: 0 @@ -70092,7 +70755,7 @@ ParticleSystem: --- !u!199 &821857876895440949 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70428,6 +71091,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2345777113731288056} + - component: {fileID: 1322093821213564816} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -70454,6 +71118,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &1322093821213564816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7217276149369479424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7220273007699884491 GameObject: m_ObjectHideFlags: 0 @@ -70735,6 +71422,8 @@ GameObject: m_Component: - component: {fileID: 5186622360375891445} - component: {fileID: 3571753460428766923} + - component: {fileID: 5960866371649915499} + - component: {fileID: 1371311342738504480} m_Layer: 5 m_Name: myInfo m_TagString: Untagged @@ -70789,6 +71478,43 @@ MonoBehaviour: m_Spacing: {x: 0, y: -56} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!222 &5960866371649915499 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7244766192120675948} + m_CullTransparentMesh: 0 +--- !u!114 &1371311342738504480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7244766192120675948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7264334862378395321 GameObject: m_ObjectHideFlags: 0 @@ -71299,6 +72025,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6189090823157574250} + - component: {fileID: 8253781385198895919} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -71325,6 +72052,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8253781385198895919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7455907617130165321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7499177339046463325 GameObject: m_ObjectHideFlags: 0 @@ -71409,6 +72159,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2916334162665942404} + - component: {fileID: 4741907814913889939} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -71435,6 +72186,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &4741907814913889939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7502391052055539666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7511851484491751892 GameObject: m_ObjectHideFlags: 0 @@ -71724,6 +72498,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5833628865617709080} + - component: {fileID: 1238464464635478648} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -71750,6 +72525,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &1238464464635478648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7627345687345070026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7627794586136492074 GameObject: m_ObjectHideFlags: 0 @@ -72216,6 +73014,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7643982507990869267} + - component: {fileID: 7679155147791546572} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -72242,6 +73041,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &7679155147791546572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7877142124633376869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7882877828450493653 GameObject: m_ObjectHideFlags: 0 @@ -72860,6 +73682,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2755297123705081425} + - component: {fileID: 9201923998084652044} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -72886,6 +73709,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &9201923998084652044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8117335528944671449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8127387571569552145 GameObject: m_ObjectHideFlags: 0 @@ -73114,6 +73960,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3571043599205168444} + - component: {fileID: 8366975975433595293} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -73140,6 +73987,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8366975975433595293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8208685646917774057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8231632977524784792 GameObject: m_ObjectHideFlags: 0 @@ -73660,6 +74530,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4709244497327572231} + - component: {fileID: 8567128050691485471} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -73686,6 +74557,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8567128050691485471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8528400725134295970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8591684252669624665 GameObject: m_ObjectHideFlags: 0 @@ -74317,6 +75211,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 867641749479274875} + - component: {fileID: 609576297429675037} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -74343,6 +75238,29 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &609576297429675037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8767687300671404569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8775592178109617333 GameObject: m_ObjectHideFlags: 0 @@ -75599,6 +76517,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 152455212652304840} + - component: {fileID: 3988823791943994209} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -75625,3 +76544,26 @@ RectTransform: m_AnchoredPosition: {x: 0.0000076293945, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &3988823791943994209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9211722141175025771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab index c3c5d01e41..21836be5bb 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMyTeamPanel.prefab @@ -104,17 +104,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 17042300448505051} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 1017358979627446166} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &63383707124702790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +132,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -841,17 +841,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 523701827631263495} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 5100264395710831998} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &2524803299303732040 MonoBehaviour: m_ObjectHideFlags: 0 @@ -869,7 +869,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -2377,17 +2377,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1517841806425702604} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 5280202603848018280} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &8820431913966435382 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2405,7 +2405,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -2707,17 +2707,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625024068647083060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2672825553160855000} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &4229697187962541744 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2735,7 +2735,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -2845,17 +2845,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1740644130297690779} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 3314798782322799596} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &8457717995939770982 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2873,7 +2873,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -3940,17 +3940,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2196875575428836659} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7843031699568438226} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &5325810030476012410 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3968,7 +3968,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -4195,17 +4195,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2235665920516352613} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 8812475581350961424} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &7212348344113641406 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4223,7 +4223,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -4449,17 +4449,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2399917332144713992} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 481843529520286891} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &2259271512613484586 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4477,7 +4477,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -5560,17 +5560,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3420966563374833675} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7547651305670048894} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &7117709867019286850 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5588,7 +5588,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -6189,17 +6189,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3907816446317604790} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 5321430132381157627} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &8000085269421513827 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6217,7 +6217,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -6403,17 +6403,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3978707153168165525} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 296992790894248411} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &4669454277850939683 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6431,7 +6431,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -7477,17 +7477,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4570490086724750136} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 335569756564401536} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &9101020221840175318 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7505,7 +7505,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -7674,17 +7674,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4624762187000814991} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 4301107328974358706} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &4898783093399371601 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7702,7 +7702,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -9417,17 +9417,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5446205792932042842} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7728833800328626157} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &5686705309304478870 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9445,7 +9445,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -10408,17 +10408,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6144402248890007634} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2665346024722757877} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &2087087396912312561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10436,7 +10436,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -10808,17 +10808,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6354425982585631910} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7987280708182378126} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &3951520505120227022 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10836,7 +10836,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -11102,17 +11102,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6571597668048297643} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 9219570268207579259} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &794084353024035022 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11130,7 +11130,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -13831,17 +13831,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7990389984259882356} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 8378346776003122014} 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: -25.200016, y: -52.700005} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -15.3, y: -14.545} m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0} --- !u!114 &1214189858230204876 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13859,7 +13859,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -14365,6 +14365,7 @@ GameObject: - component: {fileID: 5942838873893575530} - component: {fileID: 6726098567555601817} - component: {fileID: 6031802477581496423} + - component: {fileID: 8298780463367480578} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -14439,6 +14440,35 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8298780463367480578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8305936643606583999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8437090461121925986 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab index 2a5a200a6d..7bc6f4308d 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab @@ -1875,6 +1875,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5445946172337447949} + - component: {fileID: 6062933930403840284} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -1890,7 +1891,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 870609343027832585} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2032676261992695775} @@ -1898,9 +1899,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &6062933930403840284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870609343027832585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &910743068519370085 GameObject: m_ObjectHideFlags: 0 @@ -2065,6 +2089,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8681539371721877026} + - component: {fileID: 8601996249877899811} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -2080,7 +2105,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 967083670780517997} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 1018849769007428254} @@ -2088,9 +2113,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &8601996249877899811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967083670780517997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &986886272692340427 GameObject: m_ObjectHideFlags: 0 @@ -2789,6 +2837,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8963368813005005017} + - component: {fileID: 5061790434284811771} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -2804,7 +2853,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269950536507051159} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 5900006110890393960} @@ -2812,9 +2861,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &5061790434284811771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269950536507051159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1273542421551672060 GameObject: m_ObjectHideFlags: 0 @@ -3702,17 +3774,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1650657314554358416} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 6144657895698593671} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &1910154912080965423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3730,7 +3802,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -5468,17 +5540,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2535796078356349068} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7390682612622195852} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &1747731963836126546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5496,7 +5568,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -5527,17 +5599,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2568878666519412173} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 8964142084477960798} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &692656030112174998 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5555,7 +5627,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -5763,6 +5835,8 @@ GameObject: m_Component: - component: {fileID: 6155825235263467664} - component: {fileID: 6466083547730226912} + - component: {fileID: 2304906550961292227} + - component: {fileID: 4287339018125291368} m_Layer: 5 m_Name: teamInfo m_TagString: Untagged @@ -5817,6 +5891,43 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 +--- !u!222 &2304906550961292227 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2654342161237008934} + m_CullTransparentMesh: 0 +--- !u!114 &4287339018125291368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2654342161237008934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2670737335032021535 GameObject: m_ObjectHideFlags: 0 @@ -5916,17 +6027,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2718782831181372733} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 6740571657068055733} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &7482585203340252331 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5944,7 +6055,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -6393,17 +6504,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3040347633326388767} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 4440674969946681066} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &3510344505432480061 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6421,7 +6532,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -7181,17 +7292,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3424023975337472332} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 14276405967008956} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &8410733196215468493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7209,7 +7320,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -7471,17 +7582,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3548089262881995499} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 66846550698776408} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &279054717425280635 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7499,7 +7610,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -10373,17 +10484,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5220907703795458502} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2130667252276937614} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &7717543752918691731 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10401,7 +10512,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -12911,17 +13022,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6671106574605601228} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 8513820856532731249} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &1215311883847365062 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12939,7 +13050,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -13224,6 +13335,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6819999251619609382} + - component: {fileID: 7315589914410850918} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -13239,7 +13351,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6877033406811971331} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2008216668056444978} @@ -13247,9 +13359,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &7315589914410850918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877033406811971331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6951432841418311214 GameObject: m_ObjectHideFlags: 0 @@ -13275,17 +13410,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6951432841418311214} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 2558776068756047600} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &5933368766000753510 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13303,7 +13438,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -13373,17 +13508,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7005685512857127352} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 4691459203234909933} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &8864077859050024904 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13401,7 +13536,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -13661,17 +13796,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7165992357652541740} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 4869048655912426673} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &2275709361013793044 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13689,7 +13824,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -14912,17 +15047,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7643679696779375294} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 8642821307768013888} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &1929670289422606979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14940,7 +15075,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -15028,6 +15163,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1925499201552562739} + - component: {fileID: 46894126377446436} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -15043,7 +15179,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7734566843728218528} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 6380616956685712324} @@ -15051,9 +15187,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &46894126377446436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7734566843728218528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7807883159257520759 GameObject: m_ObjectHideFlags: 0 @@ -15737,17 +15896,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8070789914475639493} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 3689765780270010696} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &5077746813169394627 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15765,7 +15924,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -15859,6 +16018,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4712735135519358481} + - component: {fileID: 4469225117051812913} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -15874,7 +16034,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8148653847709504663} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000015258789} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 5728821056973648674} @@ -15882,9 +16042,32 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &4469225117051812913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8148653847709504663} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8180379755395318264 GameObject: m_ObjectHideFlags: 0 @@ -15910,17 +16093,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8180379755395318264} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 6916151757336867948} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &7284118725142713208 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15938,7 +16121,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -16235,17 +16418,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8338912109916344637} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 576612991155093204} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &8527807807265384011 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16263,7 +16446,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -16453,17 +16636,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8446806817839802764} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 1387092635796435943} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &3689138775075227592 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16481,7 +16664,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -16901,17 +17084,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8674199856426531033} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 0.90090084, y: 0.90090084, z: 1} m_Children: [] m_Father: {fileID: 7512070353588353581} 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: -25.200016, y: -52.700005} - m_SizeDelta: {x: 99.7, y: 29.09} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -16.908997, y: -13.503601} + m_SizeDelta: {x: 138.87, y: 29.09} + m_Pivot: {x: 0, y: 0} --- !u!114 &5686197863198182688 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16929,7 +17112,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index ad1d596b4b..4fb01b51df 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2008,7 +2008,7 @@ function LanguageFontSizeFilter(text, size) end function SetHeroIcon(spLoader, heroData,icon,heroConfig) - -- LogGreen("heroData.skinId:"..tostring(heroData.skinId)) + LogGreen("heroData.skinId:"..tostring(heroData.skinId)) if not heroData.skinId or heroData.skinId == 0 then icon.sprite = spLoader:LoadSprite(GetResourcePath(heroConfig.Icon)) else diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index d735f77d3c..d6173e8296 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -556,10 +556,14 @@ function this.SetTeamInfo(_go,teamData,type) teamList[hero.position].starGrid.transform.localScale=Vector3.one*0.7 local star,starType = GetStarOrGodSoulLv(1,hero) local starScale = -15 + local starSize = Vector2.New(32,32) if starType == 3 then starScale = -16 + starSize = Vector2.New(0.8,-15) + elseif starType == 2 then + starSize = Vector2.New(48,48) end - SetHeroStars(this.spLoader, teamList[hero.position].starGrid, star,starType,nil,starScale) + SetHeroStars(this.spLoader, teamList[hero.position].starGrid, star,starType,starSize,starScale) Util.SetParticleSortLayer(teamList[hero.position].starGrid,this.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid) teamList[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua index b3af2e890d..35e85a0895 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua @@ -166,7 +166,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index) if heroTid then local heroData=HeroManager.GetSingleHeroData(heroTid) self.Heros[index][hero.position].hero:SetActive(true) - local star,starType = GetStarOrGodSoulLv(1,heroData) + local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType) Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua index 738bf0a78a..9df26d74b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua @@ -221,13 +221,21 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData) if heroTid then self.teamList[index].heroList[hero.position].hero:SetActive(true) local star,starType = GetStarOrGodSoulLv(1,hero) - SetHeroStars(self.spLoader, self.teamList[index].heroList[hero.position].starGrid, star,starType) + local starScale = -15 + local starSize = Vector2.New(32,32) + if starType == 3 then + starScale = -16 + starSize = Vector2.New(0.8,-15) + elseif starType == 2 then + starSize = Vector2.New(48,48) + end + SetHeroStars(self.spLoader, self.teamList[index].heroList[hero.position].starGrid, star,starType,starSize,starScale) Util.SetParticleSortLayer(self.teamList[index].heroList[hero.position].starGrid,self.sortingOrder + 1) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid) self.teamList[index].heroList[hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) self.teamList[index].heroList[hero.position].levelText.text = hero.level self.teamList[index].heroList[hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star)) - SetHeroIcon(self.spLoader, self.teamList[index].heroList[hero.position].icon,heroConfig) + SetHeroIcon(self.spLoader,hero, self.teamList[index].heroList[hero.position].icon,heroConfig) local heroData = {} Util.AddOnceClick(self.teamList[index].heroList[hero.position].frame.gameObject, function() LogError("playerid=="..self.playerId.." heroid=="..hero.heroid.." servername=="..serverName.." arrayid=="..2000+index) diff --git a/Assets/ManagedResources/~Lua/View/RoleItemView.lua b/Assets/ManagedResources/~Lua/View/RoleItemView.lua index 3f7697bb9a..487a6d37da 100644 --- a/Assets/ManagedResources/~Lua/View/RoleItemView.lua +++ b/Assets/ManagedResources/~Lua/View/RoleItemView.lua @@ -80,7 +80,7 @@ function RoleItemView:OnShowHeroData(effectLayer) Util.AddParticleSortLayer(self.roleEffect, effectLayer - self.EffectOrginLayer) self.EffectOrginLayer = effectLayer SetHeroStars(this.spLoader, self.starGrid,star,starType,starSize,starScale) - Util.SetParticleSortLayer(self.starGrid,self.EffectOrginLayer + 1) + Util.SetParticleSortLayer(self.starGrid,effectLayer + 1) self.heroNameText.text=GetLanguageStrById(self.heroData.heroConfig.ReadingName) if self.hpVal and self.isShowHeroHp then