diff --git a/Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png b/Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png new file mode 100644 index 0000000000..68419ac7ca Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index f6b0b0bbd2..78630efce8 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -112,9 +112,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 471.4, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &95245971 @@ -150,10 +150,10 @@ RectTransform: m_Father: {fileID: 136085602} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 31, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &95245974 CanvasRenderer: @@ -5394,7 +5394,6 @@ GameObject: - component: {fileID: 351397705} - component: {fileID: 351397706} - component: {fileID: 1904013367747279327} - - component: {fileID: 4614241612954376116} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -5418,8 +5417,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} - m_SizeDelta: {x: 99.7, y: 29.09} + m_AnchoredPosition: {x: 30, y: 0.000022888184} + m_SizeDelta: {x: 99.7, y: 30.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &351397706 MonoBehaviour: @@ -5452,35 +5451,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 351397704} m_CullTransparentMesh: 0 ---- !u!114 &4614241612954376116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 351397704} - 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 &380148509 GameObject: m_ObjectHideFlags: 0 @@ -15313,10 +15283,10 @@ RectTransform: m_Father: {fileID: 136085602} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97.52, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506673911 CanvasRenderer: @@ -20565,9 +20535,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.8, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &862902003 @@ -20683,9 +20653,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 55, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &907713333 @@ -45178,9 +45148,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 749, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1719915318 @@ -45257,9 +45227,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 332.6, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1787225927 @@ -50119,9 +50089,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 610.2, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1856229260 @@ -59919,7 +59889,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3414655680617284804 RectTransform: m_ObjectHideFlags: 0 @@ -61376,6 +61346,8 @@ GameObject: m_Component: - component: {fileID: 1868826034778785617} - component: {fileID: 1868826034778785618} + - component: {fileID: 3503426392593449728} + - component: {fileID: 5125082617439025741} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -61431,6 +61403,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &3503426392593449728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868826034778785616} + m_CullTransparentMesh: 0 +--- !u!114 &5125082617439025741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868826034778785616} + 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 &1868826034830884837 GameObject: m_ObjectHideFlags: 0 @@ -61595,7 +61604,6 @@ GameObject: - component: {fileID: 1868826034946034071} - component: {fileID: 1868826034946034072} - component: {fileID: 5673796351078933169} - - component: {fileID: 7589816303261715998} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -61619,7 +61627,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826034946034072 @@ -61653,35 +61661,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826034946034070} m_CullTransparentMesh: 0 ---- !u!114 &7589816303261715998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826034946034070} - 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 &1868826034946752640 GameObject: m_ObjectHideFlags: 0 @@ -62114,7 +62093,6 @@ GameObject: - component: {fileID: 1868826035233796702} - component: {fileID: 1868826035233796703} - component: {fileID: 3075417289560795821} - - component: {fileID: 8687057859013718675} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62138,7 +62116,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035233796703 @@ -62172,35 +62150,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826035233796701} m_CullTransparentMesh: 0 ---- !u!114 &8687057859013718675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826035233796701} - 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 &1868826035237987617 GameObject: m_ObjectHideFlags: 0 @@ -62400,7 +62349,6 @@ GameObject: - component: {fileID: 1868826035594093051} - component: {fileID: 1868826035594093052} - component: {fileID: 2282993351458491329} - - component: {fileID: 8631399308126000176} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62424,7 +62372,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035594093052 @@ -62458,35 +62406,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826035594093050} m_CullTransparentMesh: 0 ---- !u!114 &8631399308126000176 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826035594093050} - 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 &1868826035683771220 GameObject: m_ObjectHideFlags: 0 @@ -63295,7 +63214,6 @@ GameObject: - component: {fileID: 1868826036035083390} - component: {fileID: 1868826036035083391} - component: {fileID: 4469491083960130862} - - component: {fileID: 2894425976571427058} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -63319,7 +63237,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036035083391 @@ -63353,35 +63271,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826036035083389} m_CullTransparentMesh: 0 ---- !u!114 &2894425976571427058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826036035083389} - 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 &1868826036070982585 GameObject: m_ObjectHideFlags: 0 @@ -63659,7 +63548,6 @@ GameObject: - component: {fileID: 1868826036237771049} - component: {fileID: 1868826036237771050} - component: {fileID: 7111802892512469401} - - component: {fileID: 3470750373883396530} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -63683,7 +63571,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036237771050 @@ -63717,35 +63605,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826036237771048} m_CullTransparentMesh: 0 ---- !u!114 &3470750373883396530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826036237771048} - 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 &1868826036264750172 GameObject: m_ObjectHideFlags: 0 @@ -67954,7 +67813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8756775217935235499 RectTransform: m_ObjectHideFlags: 0 @@ -83298,7 +83157,6 @@ GameObject: - component: {fileID: 4026116261126307272} - component: {fileID: 4026116261126307273} - component: {fileID: 8118542585179858548} - - component: {fileID: 14911276904562653} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -83322,7 +83180,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261126307273 @@ -83356,35 +83214,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261126307279} m_CullTransparentMesh: 0 ---- !u!114 &14911276904562653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261126307279} - 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 &4026116261126903700 GameObject: m_ObjectHideFlags: 0 @@ -83571,9 +83400,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261139886263 @@ -83648,9 +83477,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261196340906 @@ -83818,7 +83647,6 @@ GameObject: - component: {fileID: 4026116261212098138} - component: {fileID: 4026116261212098139} - component: {fileID: 351911577483189000} - - component: {fileID: 6898683123539119743} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -83842,7 +83670,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261212098139 @@ -83876,35 +83704,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261212098137} m_CullTransparentMesh: 0 ---- !u!114 &6898683123539119743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261212098137} - 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 &4026116261279496947 GameObject: m_ObjectHideFlags: 0 @@ -84275,9 +84074,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261390384789 @@ -84748,6 +84547,8 @@ GameObject: m_Component: - component: {fileID: 4026116261534551149} - component: {fileID: 4026116261534551150} + - component: {fileID: 6772826342536412112} + - component: {fileID: 609950460406448359} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -84803,6 +84604,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &6772826342536412112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116261534551148} + m_CullTransparentMesh: 0 +--- !u!114 &609950460406448359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116261534551148} + 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 &4026116261542644240 GameObject: m_ObjectHideFlags: 0 @@ -85497,7 +85335,6 @@ GameObject: - component: {fileID: 4026116261646268032} - component: {fileID: 4026116261646268033} - component: {fileID: 2589457525423443952} - - component: {fileID: 3690923674897914385} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -85521,7 +85358,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261646268033 @@ -85555,35 +85392,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261646268039} m_CullTransparentMesh: 0 ---- !u!114 &3690923674897914385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261646268039} - 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 &4026116261649573756 GameObject: m_ObjectHideFlags: 0 @@ -85595,7 +85403,6 @@ GameObject: - component: {fileID: 4026116261649573757} - component: {fileID: 4026116261649573758} - component: {fileID: 8397914187952360522} - - component: {fileID: 2756407637336490555} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -85619,7 +85426,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261649573758 @@ -85653,35 +85460,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261649573756} m_CullTransparentMesh: 0 ---- !u!114 &2756407637336490555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261649573756} - 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 &4026116261660019948 GameObject: m_ObjectHideFlags: 0 @@ -85790,9 +85568,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261777695568 @@ -86168,9 +85946,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261844073132 @@ -86263,7 +86041,6 @@ GameObject: - component: {fileID: 4026116261866451871} - component: {fileID: 4026116261866451864} - component: {fileID: 7682457415549150016} - - component: {fileID: 5661370104997949624} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86287,7 +86064,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261866451864 @@ -86321,35 +86098,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261866451870} m_CullTransparentMesh: 0 ---- !u!114 &5661370104997949624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261866451870} - 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 &4026116261911103185 GameObject: m_ObjectHideFlags: 0 @@ -86622,7 +86370,6 @@ GameObject: - component: {fileID: 4026116261958035107} - component: {fileID: 4026116261958035100} - component: {fileID: 4981083189726720880} - - component: {fileID: 1582876748492318018} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86646,7 +86393,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261958035100 @@ -86680,35 +86427,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261958035106} m_CullTransparentMesh: 0 ---- !u!114 &1582876748492318018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261958035106} - 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 &4026116261984099560 GameObject: m_ObjectHideFlags: 0 @@ -86720,7 +86438,6 @@ GameObject: - component: {fileID: 4026116261984099561} - component: {fileID: 4026116261984099562} - component: {fileID: 2966269858965094424} - - component: {fileID: 5784572779375931639} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86744,7 +86461,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261984099562 @@ -86778,35 +86495,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261984099560} m_CullTransparentMesh: 0 ---- !u!114 &5784572779375931639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261984099560} - 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 &4026116261984730529 GameObject: m_ObjectHideFlags: 0 @@ -86840,9 +86528,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262002252256 @@ -87197,7 +86885,6 @@ GameObject: - component: {fileID: 4026116262060962367} - component: {fileID: 4026116262060962360} - component: {fileID: 4044531212554517326} - - component: {fileID: 746238378995267218} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -87221,7 +86908,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262060962360 @@ -87255,35 +86942,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262060962366} m_CullTransparentMesh: 0 ---- !u!114 &746238378995267218 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262060962366} - 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 &4026116262072096506 GameObject: m_ObjectHideFlags: 0 @@ -87614,9 +87272,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262256548568 @@ -87747,7 +87405,6 @@ GameObject: - component: {fileID: 4026116262294965723} - component: {fileID: 4026116262294965716} - component: {fileID: 4535279799048966407} - - component: {fileID: 5029114973576945743} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -87771,7 +87428,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262294965716 @@ -87805,35 +87462,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262294965722} m_CullTransparentMesh: 0 ---- !u!114 &5029114973576945743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262294965722} - 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 &4026116262325057893 GameObject: m_ObjectHideFlags: 0 @@ -87867,9 +87495,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262325622925 @@ -89181,7 +88809,6 @@ GameObject: - component: {fileID: 4026116262616649159} - component: {fileID: 4026116262616649152} - component: {fileID: 1266220529257659965} - - component: {fileID: 7089031129019080069} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -89205,7 +88832,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262616649152 @@ -89239,35 +88866,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262616649158} m_CullTransparentMesh: 0 ---- !u!114 &7089031129019080069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262616649158} - 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 &4026116262639155791 GameObject: m_ObjectHideFlags: 0 @@ -89724,9 +89322,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262791904998 @@ -90309,7 +89907,6 @@ GameObject: - component: {fileID: 4026116262910380407} - component: {fileID: 4026116262910380400} - component: {fileID: 557441685851680365} - - component: {fileID: 7168811506763184005} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -90333,7 +89930,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262910380400 @@ -90367,35 +89964,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262910380406} m_CullTransparentMesh: 0 ---- !u!114 &7168811506763184005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262910380406} - 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 &4026116262914168895 GameObject: m_ObjectHideFlags: 0 @@ -90429,9 +89997,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262916179914 @@ -90852,9 +90420,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263129528938 @@ -90868,7 +90436,6 @@ GameObject: - component: {fileID: 4026116263129528939} - component: {fileID: 4026116263129528932} - component: {fileID: 8108344715590403823} - - component: {fileID: 9063506155747608206} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -90892,7 +90459,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116263129528932 @@ -90926,35 +90493,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116263129528938} m_CullTransparentMesh: 0 ---- !u!114 &9063506155747608206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116263129528938} - 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 &4026116263140807814 GameObject: m_ObjectHideFlags: 0 @@ -91118,6 +90656,8 @@ GameObject: m_Component: - component: {fileID: 4026116263152147740} - component: {fileID: 4026116263152147741} + - component: {fileID: 8727677702614122665} + - component: {fileID: 2699180203137277353} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -91173,6 +90713,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &8727677702614122665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116263152147747} + m_CullTransparentMesh: 0 +--- !u!114 &2699180203137277353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116263152147747} + 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 &4026116263186837814 GameObject: m_ObjectHideFlags: 0 @@ -91206,9 +90783,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263232579479 @@ -106663,10 +106240,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 221.4, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2414242672251041193 CanvasRenderer: @@ -109924,6 +109501,8 @@ GameObject: m_Component: - component: {fileID: 5920972804787731201} - component: {fileID: 5920972804787731202} + - component: {fileID: 5277159194931872215} + - component: {fileID: 294738224833165928} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -109978,6 +109557,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &5277159194931872215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920972804787731200} + m_CullTransparentMesh: 0 +--- !u!114 &294738224833165928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920972804787731200} + 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 &5942198291974117628 GameObject: m_ObjectHideFlags: 0 @@ -112623,10 +112239,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 154.87999, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &79708565718575260 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 759cc9cd2a..8a7e7054e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -780,10 +780,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5759458907260581076} - - component: {fileID: 2268112297203187335} - component: {fileID: 3141451647582073682} - component: {fileID: 5600276639709997912} - component: {fileID: 5138165610675945150} + - component: {fileID: 1473550282977014420} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -811,19 +811,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2268112297203187335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2479383142512665533} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &3141451647582073682 CanvasRenderer: m_ObjectHideFlags: 0 @@ -844,7 +831,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -893,6 +880,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &1473550282977014420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2479383142512665533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2658533052818541386 GameObject: m_ObjectHideFlags: 0 @@ -3538,10 +3537,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7679809175275777088} - - component: {fileID: 3698492846638881566} - component: {fileID: 4875746903694999264} - component: {fileID: 5725152609552433708} - component: {fileID: 860553753996015348} + - component: {fileID: 228282531681914892} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -3569,19 +3568,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3698492846638881566 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7941768748633467235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &4875746903694999264 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3602,7 +3588,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -3651,6 +3637,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &228282531681914892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941768748633467235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7947261403598486277 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab index 26e83f4d25..022d68e0f6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab @@ -2877,6 +2877,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8060973784394088321} + - component: {fileID: 8442645740951799786} + - component: {fileID: 5047410682410263552} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -2903,6 +2905,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 81.4} m_SizeDelta: {x: 927.5, y: 978.2} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8442645740951799786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7837577505631096959} + m_CullTransparentMesh: 0 +--- !u!114 &5047410682410263552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7837577505631096959} + 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 &7837584785293409971 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab index e08d54bec9..6a94ef92f5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab @@ -1200,6 +1200,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3197490103942022047} + - component: {fileID: 133388500665279468} + - component: {fileID: 5419035180060586392} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -1226,6 +1228,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 87.52498} m_SizeDelta: {x: 927.5, y: 965.95} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &133388500665279468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3406194161806404705} + m_CullTransparentMesh: 0 +--- !u!114 &5419035180060586392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3406194161806404705} + 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: 0 + 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 &3406226350511288493 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab index 908812b0b6..11de750f78 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab @@ -4258,6 +4258,7 @@ GameObject: m_Component: - component: {fileID: 1939177026611606392} - component: {fileID: 1937634087149734782} + - component: {fileID: 3138624694152778311} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -4292,6 +4293,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1869611150155371252} m_CullTransparentMesh: 0 +--- !u!114 &3138624694152778311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1869611150155371252} + 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: 0 + 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 &1869613631891814722 GameObject: m_ObjectHideFlags: 0 @@ -13724,6 +13754,8 @@ GameObject: m_Component: - component: {fileID: 8931883141293784445} - component: {fileID: 314793541967843562} + - component: {fileID: 6554334574166295044} + - component: {fileID: 5403743841401786723} m_Layer: 5 m_Name: selectHeroGrid m_TagString: Untagged @@ -13779,6 +13811,43 @@ MonoBehaviour: m_Spacing: {x: 77.48, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!222 &6554334574166295044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891037395469127299} + m_CullTransparentMesh: 0 +--- !u!114 &5403743841401786723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891037395469127299} + 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 &8915669173798880494 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab index e194a10c69..efe5dd998f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab @@ -1326,6 +1326,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224284833056434696} + - component: {fileID: 8441201234771937878} + - component: {fileID: 3837139053022586153} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -1352,6 +1354,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 107} m_SizeDelta: {x: 927.5, y: 927} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8441201234771937878 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739547300218358} + m_CullTransparentMesh: 0 +--- !u!114 &3837139053022586153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739547300218358} + 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 &1741692233933420 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index b1a4fe6c0e..e1d52ac654 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -4335,6 +4335,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7656265836104597532} + - component: {fileID: 5314499766617022713} + - component: {fileID: 6559035210426676433} m_Layer: 5 m_Name: Scroll m_TagString: Untagged @@ -4361,6 +4363,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -28.8} m_SizeDelta: {x: 900, y: 948.1} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5314499766617022713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669882069863049176} + m_CullTransparentMesh: 0 +--- !u!114 &6559035210426676433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669882069863049176} + 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 &691946464718676944 GameObject: m_ObjectHideFlags: 0 @@ -29356,6 +29395,7 @@ GameObject: m_Component: - component: {fileID: 4134529790793770453} - component: {fileID: 1090357375526350085} + - component: {fileID: 1387854069419566085} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -29390,6 +29430,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9152079933032544111} m_CullTransparentMesh: 0 +--- !u!114 &1387854069419566085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152079933032544111} + 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 &9160240826233526572 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index d4f932bf34..9b4e510a46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -3005,6 +3005,7 @@ GameObject: - component: {fileID: 2553759180244413173} - component: {fileID: 5559974153339085360} - component: {fileID: 8594897013185962644} + - component: {fileID: 4439679039454687099} m_Layer: 0 m_Name: Scroll m_TagString: Untagged @@ -3076,6 +3077,14 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!222 &4439679039454687099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_CullTransparentMesh: 0 --- !u!1 &3886299620309998347 GameObject: m_ObjectHideFlags: 0 @@ -4168,6 +4177,7 @@ GameObject: m_Component: - component: {fileID: 944098213738272631} - component: {fileID: 5438584371727106758} + - component: {fileID: 2618497146617067296} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -4202,6 +4212,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5681427206251380380} m_CullTransparentMesh: 0 +--- !u!114 &2618497146617067296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5681427206251380380} + 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 &5719908235039403081 GameObject: m_ObjectHideFlags: 0 @@ -4648,6 +4681,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4908055247632876805} + - component: {fileID: 2567286864525828672} + - component: {fileID: 7336073635758433815} m_Layer: 5 m_Name: GameObject m_TagString: Untagged @@ -4681,6 +4716,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2567286864525828672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + m_CullTransparentMesh: 0 +--- !u!114 &7336073635758433815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + 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 &6278859579252585660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 49c429db52..c4f22d5dc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -4189,6 +4189,7 @@ GameObject: m_Component: - component: {fileID: 2492555335493657461} - component: {fileID: 7264707228109259493} + - component: {fileID: 1463406129850090696} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -4223,6 +4224,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2819120374147908973} m_CullTransparentMesh: 0 +--- !u!114 &1463406129850090696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2819120374147908973} + 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 &2854028092386135442 GameObject: m_ObjectHideFlags: 0 @@ -5980,6 +6010,7 @@ GameObject: m_Component: - component: {fileID: 4910242485821419028} - component: {fileID: 3684918263632949848} + - component: {fileID: 1093422362649456572} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -6014,6 +6045,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4431145364068676807} m_CullTransparentMesh: 0 +--- !u!114 &1093422362649456572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4431145364068676807} + 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 &4480184209769585281 GameObject: m_ObjectHideFlags: 0 @@ -6642,7 +6702,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7198,10 +7258,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 184.52998, y: -63.65} - m_SizeDelta: {x: 190, y: 58} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5004630570938477890 CanvasRenderer: @@ -8218,6 +8278,7 @@ GameObject: m_Component: - component: {fileID: 5403932856111560861} - component: {fileID: 5403932856111560862} + - component: {fileID: 1662750947976081219} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -8252,6 +8313,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5403932856111560860} m_CullTransparentMesh: 0 +--- !u!114 &1662750947976081219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5403932856111560860} + 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 &5403932856370853838 GameObject: m_ObjectHideFlags: 0 @@ -9983,7 +10073,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1508773176926603313 RectTransform: m_ObjectHideFlags: 0 @@ -10033,6 +10123,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7493297396072330528} + - component: {fileID: 7161690682615853999} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -10059,6 +10150,29 @@ RectTransform: m_AnchoredPosition: {x: -27.200073, y: -2.289856} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} +--- !u!114 &7161690682615853999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774851079038251242} + 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 &5808127690274937458 GameObject: m_ObjectHideFlags: 0 @@ -15073,10 +15187,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 377.56998, y: -63.65} - m_SizeDelta: {x: 190, y: 58} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3769464419337462616 CanvasRenderer: @@ -15530,6 +15644,7 @@ GameObject: m_Component: - component: {fileID: 8120306587700567573} - component: {fileID: 1609821383811113227} + - component: {fileID: 2244901784412925840} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -15564,6 +15679,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8702982654703153435} m_CullTransparentMesh: 0 +--- !u!114 &2244901784412925840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702982654703153435} + 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 &8713559114260582039 GameObject: m_ObjectHideFlags: 0 @@ -15649,6 +15793,7 @@ GameObject: m_Component: - component: {fileID: 121018265363263051} - component: {fileID: 8550694524238033415} + - component: {fileID: 141218723707247498} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -15683,6 +15828,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716657455423796376} m_CullTransparentMesh: 0 +--- !u!114 &141218723707247498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8716657455423796376} + 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 &8722264005408772271 GameObject: m_ObjectHideFlags: 0 @@ -15766,6 +15940,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5673655264526685079} + - component: {fileID: 2267312691036561670} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -15792,6 +15967,29 @@ RectTransform: m_AnchoredPosition: {x: -23.200073, y: 1.8100815} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} +--- !u!114 &2267312691036561670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8747452094286943837} + 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 &8774376236652444173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index b6af52de53..b78f26e7ed 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -929,7 +929,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index b8f455d4b8..49931dadc3 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -409,10 +409,6 @@ function GetStarOrGodSoulLv(index,data) return data.star,index end -function SetOriScale() - -end - --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index 3db08a1c9a..e75239968a 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -16,6 +16,7 @@ TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor(); +TRIALHEROINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION = protobuf.Descriptor(); DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor(); @@ -352,11 +353,21 @@ TRIALHEROINFO_POSITION_FIELD.default_value = 0 TRIALHEROINFO_POSITION_FIELD.type = 5 TRIALHEROINFO_POSITION_FIELD.cpp_type = 1 +TRIALHEROINFO_GODSOULLV_FIELD.name = "godSoulLv" +TRIALHEROINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.godSoulLv" +TRIALHEROINFO_GODSOULLV_FIELD.number = 8 +TRIALHEROINFO_GODSOULLV_FIELD.index = 7 +TRIALHEROINFO_GODSOULLV_FIELD.label = 1 +TRIALHEROINFO_GODSOULLV_FIELD.has_default_value = false +TRIALHEROINFO_GODSOULLV_FIELD.default_value = 0 +TRIALHEROINFO_GODSOULLV_FIELD.type = 5 +TRIALHEROINFO_GODSOULLV_FIELD.cpp_type = 1 + TRIALHEROINFO.name = "TrialHeroInfo" TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo" TRIALHEROINFO.nested_types = {} TRIALHEROINFO.enum_types = {} -TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD} +TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD, TRIALHEROINFO_GODSOULLV_FIELD} TRIALHEROINFO.is_extendable = false TRIALHEROINFO.extensions = {} DIFFICULTMAPOPTION_ID_FIELD.name = "Id" diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index 5ab372297c..823930a569 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -303,14 +303,14 @@ function this.FreshTeam2(formation, isBlue) end for i, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(formation.teamHeroInfos[i].heroId) - teamRoot[heroData.position].hero:SetActive(true) - teamRoot[heroData.position].levelText.text = heroData.lv + teamRoot[hero.position].hero:SetActive(true) + teamRoot[hero.position].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, teamRoot[heroData.position].starGrid, star,starType) + SetHeroStars(this.spLoader, teamRoot[hero.position].starGrid, star,starType) local heroConfig = heroData.heroConfig - teamRoot[heroData.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - heroData,teamRoot[heroData.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + teamRoot[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + teamRoot[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end -- 控制显示编队信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index e28acddbcc..88a8efc825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -55,8 +55,6 @@ function DamageResultPanel:InitComponent() this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.OnTabChange) - this.TabCtrl:Init(this.tabbox, _TabData) - end --绑定事件(用于子类重写) @@ -77,7 +75,7 @@ end --界面打开时调用(用于子类重写) function DamageResultPanel:OnOpen(result) - + this.TabCtrl:Init(this.tabbox, _TabData) this.leftResult.sprite = this.spLoader:LoadSprite(result == 1 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") this.rightResult.sprite = this.spLoader:LoadSprite(result == 0 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") @@ -110,7 +108,9 @@ function DamageResultPanel:OnOpen(result) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function DamageResultPanel:OnShow()end +function DamageResultPanel:OnShow() + +end function this.isTabShow(index) if not this.battleRecord then @@ -402,7 +402,7 @@ function this.HeadAdapter(head, data) starType = 3 end SetHeroStars(this.spLoader, starRoot, star,starType) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 职业 prefess:SetActive(false) -- 属性 @@ -423,7 +423,7 @@ function this.HeadAdapter(head, data) lvText.text = roleLv -- 星级 SetHeroStars(this.spLoader, starRoot, star) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 头像 frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality)) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon)) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua index a237423c80..0379102f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua @@ -117,7 +117,7 @@ function this:ShowSingleData(go,heroData,index) end local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader, starGrid, star,starType) - Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) + Util.SetParticleSortLayer(starGrid,sortingOrder + 1) Util.AddOnceClick(go, function() for i = 1, #self.maskList do self.maskList[i]:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 658dca62bf..6bbfbfba98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -91,11 +91,11 @@ function ResolvePanel:BindEvent() print(Language[12153]..tabSortType) if tabSortType == i-1 then tabSortType = 0 - this.contents[curIndex].view.SortTypeClick(0)--全部 + this.contents[curIndex].view.SortTypeClick(this.sortingOrder,0)--全部 this.EndTabBtnSelect() else tabSortType = i-1 - this.contents[curIndex].view.SortTypeClick(i-1) + this.contents[curIndex].view.SortTypeClick(this.sortingOrder,i-1) this.EndTabBtnSelect(heroEndBtns[i]) end PlayerManager.now_index = tabSortType diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 7a61002089..387e9100bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -1,6 +1,7 @@ ----- 献祭 ----- local this = {} local sortingOrder=0 +local sort = 0 local tabSortType = 0 local tarHero local selectHeroData={}--选择的英雄list did = data @@ -72,14 +73,15 @@ end function this:OnShow(...) local args={...} + sort = args[1] sortingOrder = PlayerManager.now_index or 0 - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(sort,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) - LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)) +function this.SortTypeClick(sortingOrder,_sortType,isTop,isAni) + sort = sortingOrder tabSortType=_sortType selectHeroData={} tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2) @@ -119,7 +121,7 @@ function this.SingleHeroDataShow(go,_heroData) starSize = Vector2.New(60,57) end SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) - Util.SetParticleSortLayer(starGrid, sortingOrder + 1) + Util.SetParticleSortLayer(starGrid, sort + 1) local choosed =Util.GetGameObject(_go.transform, "choosed") local formationMask =Util.GetGameObject(_go.transform, "formationMask") Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index 7d72d83300..682b47f110 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -65,15 +65,14 @@ end function this:OnShow(...) local args={...} - sortingOrder =0 sortingOrder = PlayerManager.now_index or 0 --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(0,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) tabSortType=_sortType selectEquipTreasureData={} if tabSortType == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua index 517e8b7e01..75bc13f093 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua @@ -166,7 +166,7 @@ function this:BindEvent() end selectChipId = 0 oldChoosed = nil - this.SortTypeClick(sortingOrder) + this.SortTypeClick(0,sortingOrder) end) end) end) @@ -182,11 +182,11 @@ function this:OnShow(...) local args={...} sortingOrder =0 this.chooseObjList = {} - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(0,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) tabSortType=_sortType selectHeroData={} --所有灵兽数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index 2846dfe0b6..0c83a303e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -60,7 +60,7 @@ function this:OnShow(...) sortType = PlayerManager.now_index or 0 --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortType,args[3],args[4]) + this.SortTypeClick(sortingOrder,sortType,args[3],args[4]) end function this:OnClose() @@ -75,7 +75,7 @@ end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) selectHeroData={} tarHero={} diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua index fd8577f99f..f37abe6d46 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua @@ -61,7 +61,7 @@ function this:OnShow(...) --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortType,args[3],args[4]) + this.SortTypeClick(sortingOrder,sortType,args[3],args[4]) end function this:OnClose() @@ -76,7 +76,7 @@ end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) selectHeroData={} tarHero={}