diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index cda3a30d3f..fac02a2949 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -228,9 +228,9 @@ RectTransform: m_Father: {fileID: 1787225928} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 960, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &136085601 @@ -15424,9 +15424,9 @@ RectTransform: m_Father: {fileID: 1787225928} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -996, y: -66} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -36, y: -66} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &660142687 diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 1b0161e65e..63f3ce73f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -118,10 +118,10 @@ RectTransform: m_Father: {fileID: 8152144759320975811} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &78449124 CanvasRenderer: @@ -4936,7 +4936,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11004,7 +11004,7 @@ ParticleSystem: --- !u!199 &8269989015897928235 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11100,10 +11100,10 @@ RectTransform: m_Father: {fileID: 6774745567681306143} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &132216249107173948 CanvasRenderer: @@ -11175,10 +11175,10 @@ RectTransform: m_Father: {fileID: 792518984579861862} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 980, y: 1820} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4264240787557959322 CanvasRenderer: @@ -15856,7 +15856,7 @@ ParticleSystem: --- !u!199 &6138932627165897996 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16370,7 +16370,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.5, y: 3.7299995} + m_AnchoredPosition: {x: 63, y: 3.7299995} m_SizeDelta: {x: -24.98, y: -7.46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3102418421657793293 @@ -16408,7 +16408,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -16598,7 +16598,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &1654651795754642655 @@ -16755,10 +16755,10 @@ RectTransform: m_Father: {fileID: 5633248320576759341} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -232} - m_SizeDelta: {x: 0, y: 464} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 774} + m_SizeDelta: {x: 1080, y: 464} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &344557366744145910 CanvasRenderer: @@ -21845,7 +21845,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26543,7 +26543,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31315,7 +31315,7 @@ ParticleSystem: --- !u!199 &414691611950093415 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36013,7 +36013,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40756,7 +40756,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45454,7 +45454,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45663,10 +45663,10 @@ RectTransform: m_Father: {fileID: 5633248320576759341} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -192} - m_SizeDelta: {x: 0, y: -383.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -203.4} + m_SizeDelta: {x: 1080, y: 1678.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3800981637624364167 CanvasRenderer: @@ -45813,7 +45813,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1261357187108204877 @@ -50732,7 +50732,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55556,7 +55556,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56359,7 +56359,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2126718101130000134 @@ -56841,7 +56841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -235.4, y: -398.3} + m_AnchoredPosition: {x: -235.40002, y: -398.3} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &802014192638610350 @@ -61757,7 +61757,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63005,7 +63005,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -426.5, y: 706.9} + m_AnchoredPosition: {x: -399, y: 706.9} m_SizeDelta: {x: 83, y: 355} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1940860943235443611 @@ -63076,10 +63076,10 @@ RectTransform: m_Father: {fileID: 3801319173759387984} 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: 245.23999, y: -125.5} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1229116494260891973 GameObject: @@ -68244,7 +68244,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68494,7 +68494,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: 221, y: -444} + m_AnchoredPosition: {x: 240, y: -502} m_SizeDelta: {x: 228, y: 958} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1359388891748328003 @@ -68814,7 +68814,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &6392397540592680732 @@ -68893,7 +68893,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4554213755355661533 @@ -74390,7 +74390,7 @@ ParticleSystem: --- !u!199 &1665420556270140816 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79133,7 +79133,7 @@ ParticleSystem: --- !u!199 &1665420556318434860 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83831,7 +83831,7 @@ ParticleSystem: --- !u!199 &1665420556480315772 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88609,7 +88609,7 @@ ParticleSystem: --- !u!199 &1665420557183870184 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93307,7 +93307,7 @@ ParticleSystem: --- !u!199 &1665420557442100854 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93400,7 +93400,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &6036740569759931644 @@ -93767,10 +93767,10 @@ RectTransform: m_Father: {fileID: 3801319173759387984} 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: 540, y: -125.5} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1765346109250293498 GameObject: @@ -98370,7 +98370,7 @@ ParticleSystem: --- !u!199 &7185187909211027712 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98466,7 +98466,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -179.9, y: -21.8} + m_AnchoredPosition: {x: -190.29996, y: -21.8} m_SizeDelta: {x: 210, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4061665336423536603 @@ -103489,7 +103489,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -108444,7 +108444,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109099,7 +109099,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7032815108384212755 @@ -114899,7 +114899,7 @@ ParticleSystem: --- !u!199 &6680458719912087007 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -115993,7 +115993,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5701393779072430386 @@ -116146,7 +116146,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8634197714983867839 @@ -116505,7 +116505,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &2732029073517633306 @@ -117266,15 +117266,15 @@ RectTransform: m_GameObject: {fileID: 2786383504135219049} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 2952584943895455441} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8263091731896422555 CanvasRenderer: @@ -121952,7 +121952,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127871,7 +127871,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132646,7 +132646,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132807,15 +132807,15 @@ RectTransform: m_GameObject: {fileID: 3336213687945532185} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 8818894410860339148} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5800292445384503137 CanvasRenderer: @@ -138184,7 +138184,7 @@ ParticleSystem: --- !u!199 &5954858724788634667 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -142992,7 +142992,7 @@ ParticleSystem: --- !u!199 &9066535783336950998 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143268,14 +143268,14 @@ RectTransform: m_GameObject: {fileID: 3746858620771977685} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 5508871932649984002} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 728} + m_AnchoredPosition: {x: 0, y: 767} m_SizeDelta: {x: 0, y: -1456} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3746858620771977686 @@ -143672,7 +143672,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4411009243040615944 @@ -148754,7 +148754,7 @@ ParticleSystem: --- !u!199 &8701586039666722231 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -149292,9 +149292,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -181.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6848072587220661107 @@ -154116,7 +154116,7 @@ ParticleSystem: --- !u!199 &3978817059744655754 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -158859,7 +158859,7 @@ ParticleSystem: --- !u!199 &3978817059773644551 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -163771,7 +163771,7 @@ ParticleSystem: --- !u!199 &3978817059896238116 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168469,7 +168469,7 @@ ParticleSystem: --- !u!199 &3978817059926753440 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -173699,7 +173699,7 @@ ParticleSystem: --- !u!199 &3978817060822048515 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -173785,15 +173785,15 @@ RectTransform: m_GameObject: {fileID: 3978817060932612806} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 1059571372} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 734} - m_SizeDelta: {x: 0, y: -1456} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 768} + m_SizeDelta: {x: 1080, y: 464} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817060932612809 CanvasRenderer: @@ -178390,7 +178390,7 @@ ParticleSystem: --- !u!199 &3978817060939719994 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183088,7 +183088,7 @@ ParticleSystem: --- !u!199 &3978817060957154211 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183181,8 +183181,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -192} - m_SizeDelta: {x: 0, y: -383.5} + m_AnchoredPosition: {x: 0, y: -226.39996} + m_SizeDelta: {x: 0, y: -241.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817060981210679 CanvasRenderer: @@ -188087,7 +188087,7 @@ ParticleSystem: --- !u!199 &3978817061089637471 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188524,7 +188524,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 221, y: 649} + m_AnchoredPosition: {x: 221, y: 675} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817061654922696 @@ -193362,7 +193362,7 @@ ParticleSystem: --- !u!199 &3978817061800180927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -198406,7 +198406,7 @@ ParticleSystem: --- !u!199 &6666864934666763383 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200112,10 +200112,10 @@ RectTransform: m_Father: {fileID: 3835528897224038430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 489} - m_SizeDelta: {x: 980, y: 840} + m_SizeDelta: {x: 1080, y: 1085} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4391564163884654339 CanvasRenderer: @@ -205076,7 +205076,7 @@ ParticleSystem: --- !u!199 &3355874795211507745 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -205857,7 +205857,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 45, y: 73} + m_AnchoredPosition: {x: 133, y: 73} m_SizeDelta: {x: 774, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &490168312961073182 @@ -206443,7 +206443,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &2570830969463715595 @@ -206791,9 +206791,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -222.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5256210117087238717 @@ -207176,10 +207176,10 @@ RectTransform: m_Father: {fileID: 9200441507545600462} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -42} - m_SizeDelta: {x: 1082, y: 84} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 42} + m_SizeDelta: {x: 0, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4953878265078755380 CanvasRenderer: @@ -207352,7 +207352,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: 0, y: 0.00005340576} + m_AnchoredPosition: {x: -0.00012207031, y: 0.00005340576} m_SizeDelta: {x: 0, y: 171.29999} m_Pivot: {x: 0, y: 1} --- !u!114 &4953878265400482313 @@ -207664,10 +207664,10 @@ RectTransform: m_Father: {fileID: 9200441507545600462} 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: 82, y: 1.6575} - m_SizeDelta: {x: 918, y: 172.1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 70, y: 86.05} + m_SizeDelta: {x: -140, y: 172.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4953878266788037114 MonoBehaviour: @@ -212587,7 +212587,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -217312,7 +217312,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -217647,9 +217647,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -140.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5132717567783685399 @@ -217726,9 +217726,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -17.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5132717567845083532 @@ -217805,9 +217805,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -58.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5132717568262271588 @@ -218021,9 +218021,9 @@ RectTransform: m_Father: {fileID: 4763566659928666267} 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: 252.5, y: -99.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 503.5, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5132717569823285427 @@ -218218,7 +218218,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -20, y: -276} + m_AnchoredPosition: {x: -5, y: -343} m_SizeDelta: {x: 612, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4101531216452223400 @@ -218291,7 +218291,7 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -2.399994, y: 0.000015258789} m_SizeDelta: {x: 4.8, y: -20.94} m_Pivot: {x: 0.5, y: 0.5} @@ -218440,8 +218440,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -192} - m_SizeDelta: {x: 0, y: -383.5} + m_AnchoredPosition: {x: 0, y: -234.79999} + m_SizeDelta: {x: 0, y: -297.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8918841581968462690 CanvasRenderer: @@ -224227,7 +224227,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -224992,7 +224992,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -13.699997} - m_SizeDelta: {x: 505, y: 240} + m_SizeDelta: {x: 505, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6209869680682174717 MonoBehaviour: @@ -229631,7 +229631,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -234483,7 +234483,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -237176,7 +237176,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 153.52, y: 594} + m_AnchoredPosition: {x: 153.52, y: 639} m_SizeDelta: {x: 631.86, y: 138.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6023298945469598758 @@ -238399,7 +238399,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1179886482813418813 @@ -239030,7 +239030,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -80, y: -67.99994} + m_AnchoredPosition: {x: -80, y: -68} m_SizeDelta: {x: 121.600006, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6189801390082722064 @@ -245022,7 +245022,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -246375,7 +246375,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &6683589460505991198 @@ -246539,10 +246539,10 @@ RectTransform: m_Father: {fileID: 6023298944073718863} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6474208006402696728 CanvasRenderer: @@ -246616,7 +246616,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 356.4, y: -86.5} + m_AnchoredPosition: {x: 346, y: -86.5} m_SizeDelta: {x: 209.99, y: 49.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6500160222272882365 @@ -246972,7 +246972,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &465701343700831252 @@ -247118,7 +247118,7 @@ RectTransform: m_GameObject: {fileID: 6637212251382697483} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 5593772821237930049} m_RootOrder: 0 @@ -247570,7 +247570,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7704137850219025498 @@ -248465,7 +248465,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2868619174977431768 @@ -253357,7 +253357,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -258129,7 +258129,7 @@ ParticleSystem: --- !u!199 &3618573316915828258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -262854,7 +262854,7 @@ ParticleSystem: --- !u!199 &4631946120412805287 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -264327,7 +264327,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -218, y: -42} + m_AnchoredPosition: {x: -175, y: -42} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7221107569914704531 @@ -264439,9 +264439,9 @@ 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: -409, y: 69} - m_SizeDelta: {x: 262, y: 72} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -540, y: 69} + m_SizeDelta: {x: 356.4, y: 72} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &7214759333916350298 CanvasRenderer: m_ObjectHideFlags: 0 @@ -264912,10 +264912,10 @@ RectTransform: m_Father: {fileID: 4391564163884654337} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -1076} - m_SizeDelta: {x: 0, y: 696.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -963} + m_SizeDelta: {x: 1080, y: 1536.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7091058460960756837 CanvasRenderer: @@ -268120,7 +268120,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5953507984462482950 @@ -272876,7 +272876,7 @@ ParticleSystem: --- !u!199 &2668512127171756494 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -273959,7 +273959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -27.023, y: 4.4000244} + m_AnchoredPosition: {x: -27.02301, y: 4.4000244} m_SizeDelta: {x: 846.76, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2853910322630523865 @@ -278656,7 +278656,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -279000,7 +279000,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4244103369128744908 RectTransform: m_ObjectHideFlags: 0 @@ -279024,7 +279024,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1787, y: -11.3} + m_AnchoredPosition: {x: 0, y: -11.3} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1425501201249911072 @@ -279483,7 +279483,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 84} + m_AnchoredPosition: {x: 0, y: 84.3999} m_SizeDelta: {x: 0, y: 168.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7277551985011812382 @@ -281145,10 +281145,10 @@ RectTransform: m_Father: {fileID: 3801319173759387984} 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: 834.76, y: -125.5} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9068203629395314475 GameObject: @@ -286333,7 +286333,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -286426,7 +286426,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254.9, y: -60.100006} + m_AnchoredPosition: {x: 254.90002, y: -60.100006} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &8119575293814818871 @@ -291110,7 +291110,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index 5124d3b567..d6be9b9441 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -4902,7 +4902,6 @@ RectTransform: m_Children: - {fileID: 1481527221212258179} - {fileID: 1481527221406337024} - - {fileID: 1481527221278341942} m_Father: {fileID: 1481527222458419407} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4978,7 +4977,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1481527222458419407} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5197,7 +5196,7 @@ RectTransform: - {fileID: 5526079154911548254} - {fileID: 5526079156331108604} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5271,12 +5270,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1481527221232462852} + m_Father: {fileID: 1481527222458419407} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 426.4, y: -372} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -116, y: -408} m_SizeDelta: {x: 54, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1481527221278341939 @@ -5387,7 +5386,7 @@ RectTransform: m_Children: - {fileID: 5526079154983721372} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5667,7 +5666,7 @@ RectTransform: - {fileID: 1481527223222096653} - {fileID: 1481527221964054112} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10729,7 +10728,7 @@ RectTransform: m_Children: - {fileID: 1481527222204907387} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20737,9 +20736,9 @@ RectTransform: m_Father: {fileID: 1481527222458419407} 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: 421.9, y: 751.30005} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -118.099976, y: -208.69995} m_SizeDelta: {x: 129, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1481527222303322600 @@ -20926,6 +20925,7 @@ RectTransform: m_Children: - {fileID: 1481527221232462852} - {fileID: 1481527222303322603} + - {fileID: 1481527221278341942} - {fileID: 1481527223225029562} - {fileID: 1481527221307898958} - {fileID: 1481527221903928119} @@ -35441,7 +35441,7 @@ RectTransform: - {fileID: 1481527221721262413} - {fileID: 1481527222122278025} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -35486,7 +35486,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1481527222458419407} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -35713,7 +35713,7 @@ RectTransform: m_Children: - {fileID: 1481527222957545325} m_Father: {fileID: 1481527222458419407} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 5eb9a0f3cc..992ca60a60 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -1690,10 +1690,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} 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: 75, y: -285} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798130740508122842 CanvasRenderer: @@ -3805,10 +3805,10 @@ RectTransform: m_Father: {fileID: 1974730884724144738} 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: 75, y: -105} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976417882928787122 CanvasRenderer: @@ -4085,7 +4085,7 @@ RectTransform: m_GameObject: {fileID: 1765209222427303518} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: - {fileID: 1245474673371832576} - {fileID: 800268742546211718} @@ -4102,7 +4102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -167.59999, y: -748.66406} + m_AnchoredPosition: {x: -141, y: -748.66406} m_SizeDelta: {x: 590.9, y: 382.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976428042098195706 @@ -4148,7 +4148,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: 155.3, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976861364944621614 @@ -5038,9 +5038,9 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 12 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: 450, y: 863} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90, y: -97} m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6708122370429065882 @@ -5324,9 +5324,9 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 11 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: -449, y: 740.1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 91, y: -219.90002} m_SizeDelta: {x: 76, y: 317} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &874222423629139252 @@ -8141,7 +8141,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4F20\u8BB0" + m_Text: "\u4F20\u8BF4" LanguageIndex: 10914 --- !u!1 &7622874607638461510 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab index 253c2813ab..96f0afec4b 100644 --- a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab @@ -107,15 +107,15 @@ RectTransform: m_GameObject: {fileID: 158348723479504952} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 7035216596183516586} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2433434541164593063 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab index ab6ade2625..0a658a291b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MailMainPanel.prefab @@ -1012,7 +1012,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -51.9, y: -37.3} + m_AnchoredPosition: {x: -51.899994, y: -37.299988} m_SizeDelta: {x: 154, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222017515014200724 @@ -1204,7 +1204,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224906100166258062 RectTransform: m_ObjectHideFlags: 0 @@ -1314,7 +1314,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 54.7, y: -9.799999} + m_AnchoredPosition: {x: 54.700012, y: -9.799999} m_SizeDelta: {x: 110, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222526055477903672 @@ -1389,7 +1389,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -82.1, y: 3.9} + m_AnchoredPosition: {x: -82.100006, y: 3.9} m_SizeDelta: {x: 132.71002, y: 132.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222565429229178096 @@ -1654,7 +1654,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 56.9, y: -0.0003979206} + m_AnchoredPosition: {x: 56.899994, y: -0.0003979206} m_SizeDelta: {x: 110, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222838606412733606 @@ -1727,7 +1727,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 2a35763152..cf5cd013a7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -259,7 +259,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -200, y: 0} + m_AnchoredPosition: {x: -128, y: 0} m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &296395608 @@ -415,7 +415,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 150, y: 0} + m_AnchoredPosition: {x: 222, y: 0} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &442609890 @@ -961,7 +961,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 474.4, y: 71.9} + m_AnchoredPosition: {x: 423, y: 71.9} m_SizeDelta: {x: 231.36, y: 155.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &914848126 @@ -1720,7 +1720,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -218, y: -42} + m_AnchoredPosition: {x: -180, y: -42} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2031567987 @@ -2152,7 +2152,7 @@ RectTransform: m_GameObject: {fileID: 366335349615870606} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 3609579054658306207} m_RootOrder: 0 @@ -2580,7 +2580,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 383, y: 92} + m_AnchoredPosition: {x: 361, y: 92} m_SizeDelta: {x: 200, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &981436460608168278 @@ -3496,9 +3496,9 @@ 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: -409, y: 71.9} - m_SizeDelta: {x: 262, y: 72} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -540, y: 71.9} + m_SizeDelta: {x: 321, y: 72} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &9191736752887187248 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4122,7 +4122,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: 75} + m_AnchoredPosition: {x: 64, y: 75} m_SizeDelta: {x: 868.4, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &811048994918618223 @@ -4316,7 +4316,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 474.4, y: 71.9} + m_AnchoredPosition: {x: 421, y: 71.9} m_SizeDelta: {x: 231.36, y: 155.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2404274165340469301 @@ -4618,7 +4618,7 @@ RectTransform: m_GameObject: {fileID: 1825987516927876793} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 3609579054658306207} m_RootOrder: 1 @@ -4698,7 +4698,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -218, y: -42} + m_AnchoredPosition: {x: -177, y: -42} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1976511066394736840 @@ -4783,7 +4783,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00000023842, y: -48} + m_AnchoredPosition: {x: 0.00000023842, y: 232} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5733368107263535635 @@ -6918,7 +6918,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.0000076246456, y: 0} + m_AnchoredPosition: {x: -0.00012207031, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -7230,8 +7230,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: 42.6, y: -1.62} - m_SizeDelta: {x: 723.3, y: 60} + m_AnchoredPosition: {x: -0.9, y: -1.62} + m_SizeDelta: {x: 636.2, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2691734263488239883 CanvasRenderer: @@ -7474,7 +7474,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 439, y: 154} + m_AnchoredPosition: {x: 407, y: 154} m_SizeDelta: {x: 204, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9048149385950384945 @@ -7541,7 +7541,7 @@ RectTransform: m_GameObject: {fileID: 4055881171659202080} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 3609579054658306207} m_RootOrder: 2 @@ -8028,11 +8028,11 @@ RectTransform: - {fileID: 4459149376242441262} - {fileID: 3617748550186982137} m_Father: {fileID: 987080635761478543} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 45, y: 73} + m_AnchoredPosition: {x: 94, y: 73} m_SizeDelta: {x: 774, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &116570023032850071 @@ -8587,7 +8587,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.5, y: 3.7299995} + m_AnchoredPosition: {x: 61, y: 3.7299995} m_SizeDelta: {x: -24.98, y: -7.46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8932691367077004962 @@ -8625,7 +8625,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -9844,9 +9844,9 @@ 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: -409, y: 71.9} - m_SizeDelta: {x: 262, y: 72} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -540, y: 71.9} + m_SizeDelta: {x: 320.56, y: 72} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &3049883512612013386 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9940,7 +9940,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6572235485989589004 RectTransform: m_ObjectHideFlags: 0 @@ -9954,11 +9954,11 @@ RectTransform: m_Children: - {fileID: 2683236875456166990} m_Father: {fileID: 987080635761478543} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 474.4, y: 71.9} + m_AnchoredPosition: {x: 429.8, y: 65.4} m_SizeDelta: {x: 231.36, y: 155.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3203826895562267385 @@ -10424,7 +10424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -218, y: -42} + m_AnchoredPosition: {x: -180, y: -42} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6154542517495212383 @@ -10690,15 +10690,15 @@ RectTransform: - {fileID: 1285534463181845159} - {fileID: 2959217164713296774} - {fileID: 2444939942425561321} - - {fileID: 7246649831268688983} - {fileID: 6572235485989589004} + - {fileID: 7246649831268688983} - {fileID: 1832560383} m_Father: {fileID: 6065416689396146902} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00000023842, y: -48} + m_AnchoredPosition: {x: 0.00000023842, y: -424} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4813364863273152263 @@ -13067,7 +13067,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.5, y: 3.7299995} + m_AnchoredPosition: {x: 62, y: 3.7299995} m_SizeDelta: {x: -24.98, y: -7.46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4619395257736567026 @@ -13105,7 +13105,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -13404,7 +13404,7 @@ PrefabInstance: - target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, type: 3} propertyPath: m_AnchoredPosition.x - value: 409 + value: 392 objectReference: {fileID: 0} - target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, type: 3} @@ -13505,10 +13505,6 @@ PrefabInstance: propertyPath: m_Name value: UI_effect_TanSuo_Box objectReference: {fileID: 0} - - target: {fileID: 1094093250584210, guid: 584f6c7286705c645ab8323012566269, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114761016256353280, guid: 584f6c7286705c645ab8323012566269, type: 3} propertyPath: m_Sprite diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index da6d7394ac..5a819522b3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -162,9 +162,9 @@ RectTransform: m_Father: {fileID: 2591815285640264002} 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: 139, y: 62} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 278, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &327594048 @@ -810,7 +810,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: 221, y: -444} + m_AnchoredPosition: {x: 241, y: -470} m_SizeDelta: {x: 228, y: 958} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754761291 @@ -1241,10 +1241,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222223956725511446 CanvasRenderer: @@ -1320,7 +1320,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1082, y: 1920} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222698783592158610 CanvasRenderer: @@ -1694,7 +1694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &222100271953241440 @@ -3034,7 +3034,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -8.5} - m_SizeDelta: {x: -540.86, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2790220155273969555 MonoBehaviour: @@ -8374,7 +8374,7 @@ ParticleSystem: --- !u!199 &5769909884604089405 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -8467,10 +8467,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5285331927146186406 CanvasRenderer: @@ -13116,7 +13116,7 @@ ParticleSystem: --- !u!199 &8873181679571788139 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13431,9 +13431,9 @@ RectTransform: m_Father: {fileID: 8547655464604391253} 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: 525, y: -119.85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 944.5, y: 207.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6627258998995166970 @@ -18157,7 +18157,7 @@ ParticleSystem: --- !u!199 &4026277983322118074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23232,7 +23232,7 @@ ParticleSystem: --- !u!199 &1309976723092944450 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27942,7 +27942,7 @@ ParticleSystem: --- !u!199 &7862827307386917793 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32684,7 +32684,7 @@ ParticleSystem: --- !u!199 &1474953326918406438 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33430,9 +33430,9 @@ RectTransform: m_Father: {fileID: 2591815285640264002} 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: 641, y: 62} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 278, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6393442140888169436 @@ -39152,7 +39152,7 @@ ParticleSystem: --- !u!199 &5535976391633867577 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39985,7 +39985,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 780, y: 1} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2591815285640264015 CanvasRenderer: @@ -45088,7 +45088,7 @@ ParticleSystem: --- !u!199 &1075499567092313740 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50182,7 +50182,7 @@ ParticleSystem: --- !u!199 &1335144838161731503 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55439,7 +55439,7 @@ ParticleSystem: --- !u!199 &7674418144062191771 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56709,10 +56709,10 @@ RectTransform: m_Father: {fileID: 224859010172153270} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0.5} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3236133470011606145 CanvasRenderer: @@ -61438,7 +61438,7 @@ ParticleSystem: --- !u!199 &3478638013891207890 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61598,8 +61598,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00000023842, y: -48} - m_SizeDelta: {x: 1080, y: 222} + m_AnchoredPosition: {x: -0.49998, y: -48} + m_SizeDelta: {x: 1079, y: 222} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &754817880113616929 CanvasRenderer: @@ -61750,7 +61750,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -416, y: 7} + m_AnchoredPosition: {x: -370, y: 7} m_SizeDelta: {x: 194.8, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3670206686240294287 @@ -61787,10 +61787,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3640273960383464323 CanvasRenderer: @@ -66473,7 +66473,7 @@ ParticleSystem: --- !u!199 &1329051646654101902 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66792,10 +66792,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6005051707367858396 CanvasRenderer: @@ -71875,7 +71875,7 @@ ParticleSystem: --- !u!199 &7935500073970882351 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72044,9 +72044,9 @@ RectTransform: m_Father: {fileID: 2591815285640264002} 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: 390, y: 62} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 278, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1714597984582524258 @@ -72346,8 +72346,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000030517578} - m_SizeDelta: {x: 0, y: 223.7} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5657471360167891251 CanvasRenderer: @@ -77795,7 +77795,7 @@ ParticleSystem: --- !u!199 &5976314214847845844 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83246,7 +83246,7 @@ ParticleSystem: --- !u!199 &189997647891759117 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83535,7 +83535,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 154} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7054035270899119123 CanvasRenderer: @@ -84305,7 +84305,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -105.8, y: 7} + m_AnchoredPosition: {x: -59.800003, y: 7} m_SizeDelta: {x: 424.4, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5751583284864658793 @@ -84341,7 +84341,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -200, y: -10} + m_AnchoredPosition: {x: -129, y: -10} m_SizeDelta: {x: 700, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5909367633549227457 @@ -84361,7 +84361,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1577908840800681647 RectTransform: m_ObjectHideFlags: 0 @@ -84383,7 +84383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2558, y: -65} + m_AnchoredPosition: {x: 0, y: -65} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5172677723655779774 @@ -89316,7 +89316,7 @@ ParticleSystem: --- !u!199 &3610771200624960058 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94389,7 +94389,7 @@ ParticleSystem: --- !u!199 &3723196636064024250 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99161,7 +99161,7 @@ ParticleSystem: --- !u!199 &6752594429674840321 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99703,10 +99703,10 @@ RectTransform: m_Father: {fileID: 5044950653517220881} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 72, y: 15} - m_SizeDelta: {x: 935, y: 178} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 74.099976, y: 89} + m_SizeDelta: {x: -148.2, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5636669235917160326 CanvasRenderer: @@ -105428,7 +105428,7 @@ ParticleSystem: --- !u!199 &5282335297282974710 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110126,7 +110126,7 @@ ParticleSystem: --- !u!199 &3319074951465041593 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -115101,7 +115101,7 @@ ParticleSystem: --- !u!199 &288384786443457950 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -115890,10 +115890,10 @@ RectTransform: m_Father: {fileID: 2547574702630156647} 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: 140, y: -87} - m_SizeDelta: {x: 150, y: 134} + 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 &3176581777211206878 CanvasRenderer: @@ -120742,7 +120742,7 @@ ParticleSystem: --- !u!199 &8026587331831747561 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126481,7 +126481,7 @@ ParticleSystem: --- !u!199 &1887912736600313456 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -131632,7 +131632,7 @@ ParticleSystem: --- !u!199 &6046371778974065579 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136476,7 +136476,7 @@ ParticleSystem: --- !u!199 &8895669547597748607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -137759,10 +137759,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8814220106900169790 CanvasRenderer: @@ -139131,10 +139131,10 @@ RectTransform: m_Father: {fileID: 224326955275377428} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473465396306100237 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 7952d7dae3..e14efed48c 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1097,7 +1097,7 @@ [11096] = "搜索进度:", [11097] = "情报", [11098] = "满星", - [11099] = "传记", + [11099] = "传说", [11100] = "内容未开放", [11101] = "该神将在主线阵容中已上阵", [11102] = "该神将在竞技场防守阵容中已上阵", diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 0e1dabc41a..3d9d43e3e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -78,9 +78,20 @@ function BagPanel:BindEvent() end Util.AddClick(this.fenJieBtn, function() if sortIndex == ItemBaseType.Equip then - UIManager.OpenPanel(UIName.EquipSellSelectPopup)--宝器 + local temp = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) + if not temp or #temp < 1 then + PopupTipPanel.ShowTip("无可出售装备") + else + UIManager.OpenPanel(UIName.EquipSellSelectPopup)--宝器 + end + elseif sortIndex == ItemBaseType.SoulPrint then - UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 4)--魂印 + local temp = BagManager.GetAllSoulPrintData() + if not temp or #temp < 1 then + PopupTipPanel.ShowTip("无可分解魂印") + else + UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 4)--魂印 + end end end) @@ -135,7 +146,6 @@ function this:OnClickAllBtn() this:SetItemData(itemData) this.noneImage:SetActive(#itemData==0) - this.fenJieBtn:GetComponent("Button").enabled = not(#itemData==0) end function this.BagGoldChangeCallBackOnClickTabBtn() @@ -169,7 +179,6 @@ function this.OnClickTabBtn(_index, _clickBtn) this:SetItemData(itemData) end this.noneImage:SetActive(#itemData==0) - this.fenJieBtn:GetComponent("Button").enabled = not(#itemData==0) end --当魂印升级消耗时刷新背包数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index dbab7ecd06..bdd3709711 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -9,22 +9,22 @@ local type = { [1] = { bg = "ui_fb_btn_jy", name = Language[12299], - gameObject = "btnRoot/circle/root/renjiebaojing" , + gameObject = "renjiebaojing" , }, [2] = { bg = "ui_fb_btn_gh", name = Language[12300], - gameObject = "btnRoot/circle/root/fuochanbaojing" , + gameObject = "fuochanbaojing" , }, [3] = { bg = "ui_fb_btn_sl", name = Language[12301], - gameObject = "btnRoot/circle/root/yaolingbaojing" , + gameObject = "yaolingbaojing" , }, [4] = { bg = "ui_fb_btn_jq", name = Language[12302], - gameObject = "btnRoot/circle/root/daoxuanbaojing" , + gameObject = "daoxuanbaojing" , }, } @@ -125,10 +125,9 @@ this.UpdateCarbonContent = function(...) local temp = temp[1] if index and index >= 0 then Timer.New(function() - LogYellow("收到消息,刷新界面") local openFunctions = {} for k,v in pairs(type) do - local go = Util.GetGameObject(this.gameObject, v.gameObject) + local go = Util.GetGameObject(this.AnimRoot, v.gameObject) go:GetComponent("Image").sprite = Util.LoadSprite(v.bg) Util.GetGameObject(go, "titileBg/Text"):GetComponent("Text").text =v.name local state = XuanYuanMirrorManager.GetMirrorState(k) == 1 @@ -204,6 +203,7 @@ function this:OnDestroy() self.timer:Stop() self.timer = nil end + type = {} end --刷新时间 diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 5711962c77..84abcbc3e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -23,7 +23,7 @@ function FirstRechargePanel:InitComponent() self.frame = Util.GetGameObject(self.transform, "frame") self.closeBtn = Util.GetGameObject(self.transform, "closeBtn") self.heroPreviewBtn = Util.GetGameObject(self.transform, "frame/heroPreviewBtn") - self.tenProBtn = Util.GetGameObject(self.transform, "frame/bg_live/tenProBtn") + self.tenProBtn = Util.GetGameObject(self.transform, "frame/tenProBtn") self.stageImage6 = Util.GetGameObject(self.transform, "frame/stageImage/Image") self.stageImage100 = Util.GetGameObject(self.transform, "frame/stageImage/Image (1)") --topPart diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index bc13ef1ddc..69824b3b1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -117,9 +117,7 @@ function HandBookHeroAndEquipListPanel:BindEvent() end) for i = 1, 6 do Util.AddClick(tabs[i], function() - if i == proId then - proId=ProIdConst.All - else + if i ~= proId then proId=i end self:OnShowHeroFun() @@ -643,9 +641,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) Util.GetGameObject(_go.transform, "card/name"):GetComponent("Text").text = heroData.ReadingName Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.Painting)) - -- Util.GetGameObject(_go.transform, "card/pos/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(heroData.Profession)) Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) - --Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = Util.LoadSprite(HeroStageSprite[heroData.HeroStage]) Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false) local starGrid = Util.GetGameObject(_go.transform, "star") SetHeroStars(starGrid, star,1,nil,-15,nil,Vector3.New(0,0,-15)) diff --git a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua index efdc795280..d4cbc41df4 100644 --- a/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua +++ b/Assets/ManagedResources/~Lua/View/ElementalResonanceView.lua @@ -166,7 +166,11 @@ end function this:SetPosition(type) if (type == 1) then - self.elementalResonanceBtn.transform.localPosition = Vector3.New(455, 783, 0) + -- self.elementalResonanceBtn.transform.localPosition = Vector3.New(455, 783, 0) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(1, 1) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(1, 1) + self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) + self.elementalResonanceBtn.transform.localPosition = Vector3.New(400, 800, 0) elseif(type==2) then --self.elementalResonanceBtn.transform.localPosition = Vector3.New(-484, 876, 1) self.elementalResonanceBtn.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(58, 13)