diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab index d3d5124e72..b73149d372 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantGongmingPopup.prefab @@ -34,7 +34,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: -294.6, y: 32.6} + m_AnchoredPosition: {x: -294.59998, y: 32.6} m_SizeDelta: {x: -687.02, y: -144.54999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1820080253092200820 @@ -117,7 +117,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 316.9, y: -5.13} - m_SizeDelta: {x: 207.48, y: 59.05} + m_SizeDelta: {x: 207.48, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8888156372939186162 CanvasRenderer: @@ -147,7 +147,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -413,8 +413,8 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -666,7 +666,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: -49.7, y: -52.1} + m_AnchoredPosition: {x: -49.700012, y: -52.099976} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1664529112261126244 @@ -1085,8 +1085,8 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -1430,7 +1430,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8941177, g: 0.6784314, b: 0.227451, a: 1} + m_Color: {r: 0.3584906, g: 0.2771291, b: 0.10653258, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1439,7 +1439,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1489,7 +1489,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 316.9, y: -5.13} - m_SizeDelta: {x: 207.48, y: 59.05} + m_SizeDelta: {x: 207.48, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &216879355119662173 CanvasRenderer: @@ -1519,7 +1519,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1628,7 +1628,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8941177, g: 0.6784314, b: 0.227451, a: 1} + m_Color: {r: 0.3584906, g: 0.2771291, b: 0.10653258, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1637,7 +1637,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1930,7 +1930,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8941177, g: 0.6784314, b: 0.227451, a: 1} + m_Color: {r: 0.3584906, g: 0.2771291, b: 0.10653258, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1939,7 +1939,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -3620,7 +3620,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 316.9, y: -5.13} - m_SizeDelta: {x: 207.48, y: 59.05} + m_SizeDelta: {x: 207.48, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4869340033867325836 CanvasRenderer: @@ -3650,7 +3650,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3915,8 +3915,8 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -3987,7 +3987,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3529412, g: 0.7607844, b: 0.5137255, a: 1} + m_Color: {r: 0.11372549, g: 0.43529412, b: 0.24313726, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4117,7 +4117,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: -294.6, y: 32.6} + m_AnchoredPosition: {x: -294.59998, y: 32.6} m_SizeDelta: {x: -687.02, y: -144.54999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4869340034557023966 @@ -4426,7 +4426,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: -294.6, y: 32.6} + m_AnchoredPosition: {x: -294.59998, y: 32.6} m_SizeDelta: {x: -687.02, y: -144.54999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7636479305063396801 @@ -4506,7 +4506,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: -294.6, y: 32.6} + m_AnchoredPosition: {x: -294.59998, y: 32.6} m_SizeDelta: {x: -687.02, y: -144.54999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3595143587405963671 @@ -4840,8 +4840,8 @@ 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5110,7 +5110,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, y: -607.3} + m_AnchoredPosition: {x: 0, y: -607.3} m_SizeDelta: {x: 384.31, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1834093620742243404 @@ -5519,7 +5519,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 316.9, y: -5.13} - m_SizeDelta: {x: 207.48, y: 59.05} + m_SizeDelta: {x: 207.48, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1105859977975416785 CanvasRenderer: @@ -5549,7 +5549,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5710,7 +5710,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.7338, y: -430} + m_AnchoredPosition: {x: -1.7338, y: -408} m_SizeDelta: {x: 908.3, y: 351.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8777387514132076526 @@ -5803,7 +5803,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8941177, g: 0.6784314, b: 0.227451, a: 1} + m_Color: {r: 0.3584906, g: 0.2771291, b: 0.10653258, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5812,7 +5812,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab index 1a3a78b826..47c5fbfe5f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/FourQuadrantPopup.prefab @@ -449,7 +449,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: -84.3, y: 25.5} + m_AnchoredPosition: {x: -77.1, y: 25.5} m_SizeDelta: {x: 485.7, y: 45.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1901329860 @@ -2402,7 +2402,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: -84.3, y: 25.5} + m_AnchoredPosition: {x: -77.1, y: 25.5} m_SizeDelta: {x: 485.7, y: 45.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1949181401140364081 @@ -2882,7 +2882,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: -84.3, y: 25.5} + m_AnchoredPosition: {x: -77.1, y: 25.5} m_SizeDelta: {x: 485.7, y: 45.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4934843604327724347 @@ -3132,7 +3132,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: -84.3, y: 25.5} + m_AnchoredPosition: {x: -77.1, y: 25.5} m_SizeDelta: {x: 485.7, y: 45.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4051951444159669759 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 608a4d6fa0..806e62aee3 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2440,16 +2440,16 @@ Language = { [12439] = GetLanguageStrById("最高战力每提升%s万可提升1级修为"), [12440] = GetLanguageStrById("当前共鸣：%s级"), [12441] = GetLanguageStrById("下级共鸣：%s级"), - [12442] = GetLanguageStrById("全体%s加成 +%s%%"), + [12442] = GetLanguageStrById("全体%s加成 +%s%%"), [12443] = GetLanguageStrById("全体%s加成 +%s%%"), [12444] = GetLanguageStrById("修行等级不满足进阶条件"), [12445] = GetLanguageStrById("%s神将%s+%s"), [12446] = GetLanguageStrById("四象心法-"), [12447] = GetLanguageStrById("四象心法-%s已强化圆满！"), - [12448] = GetLanguageStrById("进阶后,四种属性全部提升%s%%"), + [12448] = GetLanguageStrById("进阶后,四种属性全部提升%s%%"), [12449] = GetLanguageStrById("四种属性强化至上限后使用 %s进阶"), [12450] = GetLanguageStrById("%s神将%s"), - [12451] = GetLanguageStrById("修行到达%s期后方可进阶"), + [12451] = GetLanguageStrById("修行到达%s期后方可进阶"), [12452] = GetLanguageStrById("暂未开放..."), [12453] = GetLanguageStrById("%s解锁"), [12454] = GetLanguageStrById("通用天书"),