diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index be3b808e2f..d8d8c50f0e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -1274,7 +1274,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.101960786, g: 0.101960786, b: 0.101960786, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1602,7 +1602,7 @@ 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} + m_AnchoredPosition: {x: 0, y: -0.006275666} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 @@ -1626,7 +1626,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.103773594, g: 0.103773594, b: 0.103773594, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index dd900f58f0..b003b12f55 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -67,10 +67,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 48 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1710,8 +1710,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.000012398, y: 541} - m_SizeDelta: {x: 302, y: 68} + m_AnchoredPosition: {x: 0, y: 539.3} + m_SizeDelta: {x: 362, y: 81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6506979086108423105 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab index 6658983817..ab74d78770 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab @@ -34,7 +34,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.0009994507, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &455843809901100221 @@ -322,8 +322,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, y: -57.3} - m_SizeDelta: {x: 192, y: 80.6} + m_AnchoredPosition: {x: -3.1734, y: -40.96} + m_SizeDelta: {x: 171.15, y: 113.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4095568632540916557 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 259d554e7d..d66fa95547 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3436,9 +3436,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} 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: 583.3334, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4706108599745469864 @@ -7545,10 +7545,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 188, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &7726254978842767222 CanvasRenderer: @@ -7744,9 +7744,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} 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: 116.66667, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1178887444496303329 @@ -8778,10 +8778,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 356, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &7097363111968778765 CanvasRenderer: @@ -10822,9 +10822,9 @@ RectTransform: m_Father: {fileID: 8035507657642940289} 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: 350, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5071244673715781343 @@ -10929,10 +10929,10 @@ RectTransform: m_Father: {fileID: 7329562994253383465} 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: 525, y: -39} - m_SizeDelta: {x: 646, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8436545501627112056 CanvasRenderer: @@ -10964,7 +10964,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 30 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -13928,7 +13928,7 @@ MonoBehaviour: m_Padding: m_Left: 20 m_Right: 0 - m_Top: 10 + m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -13968,9 +13968,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &5210253197636820229 @@ -16364,7 +16364,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6207233311855498205 RectTransform: m_ObjectHideFlags: 0 @@ -17336,9 +17336,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} 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: 786.59503, y: -43.08} m_SizeDelta: {x: 159.39, y: 50.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1420070111345050450 @@ -22433,9 +22433,9 @@ RectTransform: m_Father: {fileID: 7885627331012549082} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 282, y: -35} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3799765810563942401 @@ -22468,7 +22468,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 30 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -25202,10 +25202,10 @@ RectTransform: m_Father: {fileID: 215920149304938626} 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: 855.1, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 465.55, y: -28.5} + m_SizeDelta: {x: 855.1, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5392194319038496384 CanvasRenderer: @@ -25402,7 +25402,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 30 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -26473,10 +26473,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 435, y: -38.75} + m_SizeDelta: {x: 870, y: 77.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5915642200145091643 CanvasRenderer: @@ -26852,10 +26852,10 @@ RectTransform: m_Father: {fileID: 7885627331012549082} 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: 151, y: -35} - m_SizeDelta: {x: 262, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 54.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1955159793380395330 CanvasRenderer: @@ -31338,9 +31338,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: -837} m_SizeDelta: {x: 870, y: 309.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5688548084432830598 @@ -31673,10 +31673,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 435, y: -331.75} + m_SizeDelta: {x: 870, y: 72.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183859335168644090 CanvasRenderer: @@ -32060,8 +32060,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: -0.000034661924} - m_SizeDelta: {x: 917, y: 0} + m_AnchoredPosition: {x: 458.5, y: 0.003692627} + m_SizeDelta: {x: 917, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2354951152359418691 CanvasRenderer: @@ -32407,7 +32407,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.5, y: -427.2} - m_SizeDelta: {x: 870, y: 0} + m_SizeDelta: {x: 870, y: 1146.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2484587132639556036 MonoBehaviour: @@ -33882,9 +33882,9 @@ RectTransform: m_Father: {fileID: 7494134846245643573} 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: 36, y: -18} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3010712499452228185 @@ -40089,7 +40089,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8812777792825761955 RectTransform: m_ObjectHideFlags: 0 @@ -40106,8 +40106,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 111, y: -39} - m_SizeDelta: {x: 182, y: 50} + m_AnchoredPosition: {x: 108.5, y: -39} + m_SizeDelta: {x: 177, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3987301164593631488 CanvasRenderer: @@ -43555,10 +43555,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: 0} - m_SizeDelta: {x: 870, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 435, y: -796.25} + m_SizeDelta: {x: 870, y: 81.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4863705341942113372 CanvasRenderer: @@ -45749,7 +45749,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &475247785733533137 RectTransform: m_ObjectHideFlags: 0 @@ -48726,10 +48726,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 524, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &2518845947000605921 CanvasRenderer: @@ -48973,9 +48973,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: -561.75} m_SizeDelta: {x: 870, y: 387.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &530755074506280210 @@ -50019,9 +50019,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} 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: 435, y: -186.5} m_SizeDelta: {x: 870, y: 218} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5453380272156850861 @@ -50706,9 +50706,9 @@ RectTransform: m_Father: {fileID: 1724954233501732768} 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: 36, y: -14} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3903058791224746062 @@ -50869,8 +50869,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000019414838} - m_SizeDelta: {x: 916, y: 0} + m_AnchoredPosition: {x: 0, y: 0.009121489} + m_SizeDelta: {x: 916, y: 51} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2233394732319046138 MonoBehaviour: @@ -51700,10 +51700,10 @@ RectTransform: m_Father: {fileID: 8098205763713205469} 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: 692, y: -50} - m_SizeDelta: {x: 88, y: 88} + 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 &3622757647159683476 CanvasRenderer: @@ -53077,7 +53077,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: 542.75, y: 4042.0002} + m_AnchoredPosition: {x: 542.75, y: 4042} m_SizeDelta: {x: 907.9, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8550795358627820060 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab index 03ef5fc158..9fa2c9f658 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab @@ -1552,7 +1552,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: 519.2, y: -115.73001} + m_AnchoredPosition: {x: 519.2, y: -1649} m_SizeDelta: {x: 1000.7, y: 65.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2208460248097338735 @@ -3505,7 +3505,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7092402891049115531 RectTransform: m_ObjectHideFlags: 0 @@ -5284,8 +5284,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.0000076293945, y: -67.94} - m_SizeDelta: {x: 0.000015259, y: -135.88} + m_AnchoredPosition: {x: -0.0000076293945, y: -46.47} + m_SizeDelta: {x: 0, y: -92.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518034501991781036 CanvasRenderer: @@ -5325,7 +5325,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u6392\u884C" diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index 0586cd19a4..c54327e85b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -200,7 +200,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: 0, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &20288529025851301 @@ -391,7 +391,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: 36.81, y: -0.0000004992083} + m_AnchoredPosition: {x: 36.81, y: -0.0049460945} m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7871582414776459346 @@ -532,7 +532,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: 428.05, y: -245.50002} + m_AnchoredPosition: {x: 428.05, y: -245.50003} m_SizeDelta: {x: 856.1, y: 179.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &133143427933814379 @@ -2758,10 +2758,10 @@ RectTransform: m_Father: {fileID: 421409271376673275} 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: 292.97998, y: -37} + m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1915716504840710620 CanvasRenderer: @@ -3205,10 +3205,10 @@ RectTransform: m_Father: {fileID: 421409271376673275} 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: -32.98001, y: -37} + m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2459069851311799796 CanvasRenderer: @@ -3343,7 +3343,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: 0, y: 0} + m_AnchoredPosition: {x: 396.415, y: 0} m_SizeDelta: {x: 792.83, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6476048963093022719 @@ -3807,7 +3807,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: -45, y: -0} + m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!1 &2087303444814132181 @@ -4123,7 +4123,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: 146.8, y: -30.705} + m_AnchoredPosition: {x: 146.80002, y: -30.705} m_SizeDelta: {x: 293.6, y: 61.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2996187623658887069 @@ -4555,8 +4555,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: -27.1, y: -122.7} - m_SizeDelta: {x: 820.6, y: 59.3} + m_AnchoredPosition: {x: -50.2, y: -122.7} + m_SizeDelta: {x: 874.1, y: 59.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3957510038944987859 CanvasRenderer: @@ -4588,10 +4588,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 32 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 @@ -5012,7 +5012,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: 0, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &838287439496209292 @@ -5771,7 +5771,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: 0, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3022395328828038287 diff --git a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab index bafd739862..c1d172e168 100644 --- a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab @@ -467,7 +467,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: 107.7, y: -14.799999} + m_AnchoredPosition: {x: 107.70001, y: -14.799999} m_SizeDelta: {x: 215.4, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1372727728810463521 @@ -6423,7 +6423,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: -274.5, y: 1.3275146} + m_AnchoredPosition: {x: -280.8, y: 1.3275146} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3970179820322594643 @@ -6461,7 +6461,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -8262,7 +8262,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.6, y: -0} + m_AnchoredPosition: {x: -2.6, y: 0} m_SizeDelta: {x: 175.7, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8841664011052020854 @@ -9252,7 +9252,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: -391.6, y: 5} + m_AnchoredPosition: {x: -389.1, y: 5} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1155306698190916582 @@ -12044,7 +12044,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: 289.8, y: 4.4} + m_AnchoredPosition: {x: 319.1, y: 4.4} m_SizeDelta: {x: 330.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8912526172493600643 @@ -18150,7 +18150,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: -192.81, y: -0.00003624} + m_AnchoredPosition: {x: -169.9, y: 5} m_SizeDelta: {x: 211.69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5948393373316236050 @@ -21107,7 +21107,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 0 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 6b6d6240c3..f32a55d4b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -643,7 +643,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index faaafeefd7..2f87ef9297 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -1066,8 +1066,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, y: -99.69507} - m_SizeDelta: {x: 132, y: 44} + m_AnchoredPosition: {x: 0, y: -112.4} + m_SizeDelta: {x: 150, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222986977202393806 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/SmallSoldier/SmallSoldierUpFigthInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SmallSoldier/SmallSoldierUpFigthInfoPanel.prefab index 300f515dfa..47fde1f464 100644 --- a/Assets/ManagedResources/Prefabs/UI/SmallSoldier/SmallSoldierUpFigthInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SmallSoldier/SmallSoldierUpFigthInfoPanel.prefab @@ -1316,7 +1316,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: -378, y: -18} + m_AnchoredPosition: {x: -378, y: 6.3} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3950937453329624115 @@ -6267,8 +6267,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, y: -22} - m_SizeDelta: {x: 858.93, y: 90.49} + m_AnchoredPosition: {x: 0, y: -25.66} + m_SizeDelta: {x: 858.93, y: 117.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1059602558715106153 CanvasRenderer: @@ -6401,6 +6401,7 @@ GameObject: - component: {fileID: 410176051671839810} - component: {fileID: 1738910289026561944} - component: {fileID: 1915608199551401913} + - component: {fileID: 2635996012768137567} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -6424,8 +6425,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, y: 60} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 0, y: 67.5} + m_SizeDelta: {x: 160, y: 61.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1738910289026561944 CanvasRenderer: @@ -6448,7 +6449,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43137255, g: 0.23529412, b: 0.07058824, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6457,7 +6458,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -6470,6 +6471,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6280\u80FD" LanguageIndex: 0 +--- !u!114 &2635996012768137567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9083546689366865411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &9152380821916557106 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab index 93f93bf365..a7aeca41cc 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab @@ -726,7 +726,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: 178.9, y: 114.750046} + m_AnchoredPosition: {x: 178.9, y: 114.73543} m_SizeDelta: {x: 308.4, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &5086809663402702269 @@ -22150,7 +22150,7 @@ MonoBehaviour: m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u795E\u5C06\u5C5E\u6027\u52A0\u6210\uFF1A" @@ -29003,7 +29003,7 @@ 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} + m_AnchoredPosition: {x: 0, y: -0.012145996} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6617612647759148344 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index e306e8cc2b..68924de269 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -21,16 +21,17 @@ local carbonData = { -- effect2 = "Fx_DaNaoTianGong_S", --}, --[[ -[FUNCTION_OPEN_TYPE.QIJIESHILIAN] = { - id = FUNCTION_OPEN_TYPE.QIJIESHILIAN, --七界试炼 - objName = "expedition", - nameImg = "f_fuben_fubenming_10", - btnPos = Vector2(39, -67), - redPointType = RedPointType.QiJieShiLian, - effect1 = "Fx_DaNaoTianGong", - effect2 = "Fx_DaNaoTianGong_S", - }, + ]] +[FUNCTION_OPEN_TYPE.QIJIESHILIAN] = { + id = FUNCTION_OPEN_TYPE.QIJIESHILIAN, --七界试炼 + objName = "expedition", + nameImg = "f_fuben_fubenming_10", + btnPos = Vector2(39, -67), + redPointType = RedPointType.QiJieShiLian, + effect1 = "Fx_DaNaoTianGong", + effect2 = "Fx_DaNaoTianGong_S", +}, [FUNCTION_OPEN_TYPE.PEOPLE_MIRROR] = { id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕 objName = "xuanyuan",