diff --git a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/x_xb_quan_01_zh.png b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/x_xb_quan_01_zh.png index 568f653bd5..3f50dd1adb 100644 Binary files a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/x_xb_quan_01_zh.png and b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/x_xb_quan_01_zh.png differ diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png index 5933f78787..6e8ee933ba 100644 Binary files a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index b591654325..5c9e7decc3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -15993,7 +15993,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -41610,7 +41610,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -41913,7 +41913,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1742237803807469844 RectTransform: m_ObjectHideFlags: 0 @@ -41931,9 +41931,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} 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: 50, y: -108.75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -42451,7 +42451,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5.1898785, y: 10.200058} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 144, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8989046716319955887 @@ -54121,7 +54121,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -54507,7 +54507,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: 64.3, y: 81.59998} + m_AnchoredPosition: {x: 60.3, y: 64.2} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6919773709148311990 @@ -64782,7 +64782,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -76682,7 +76682,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -102690,7 +102690,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -103075,8 +103075,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: 8.199951, y: 15.249964} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 4.2, y: 15.249964} + m_SizeDelta: {x: 141, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6243456963164346374 CanvasRenderer: @@ -140252,13 +140252,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7304681999346056449} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.04494468, y: -0.3208119, z: 0.053682063, w: 0.94455177} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6976277603980592380} m_RootOrder: 18 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -2.8920002, y: -37.709003, z: 7.4940004} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 49, y: -278} @@ -147330,7 +147330,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: 1.5, y: -66} + m_AnchoredPosition: {x: 0, y: -66} m_SizeDelta: {x: 113.84, y: 34.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7248558690288872478