diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab index 662d64315a..de4f01086c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab @@ -112,10 +112,10 @@ RectTransform: m_Father: {fileID: 1644627164} 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_SizeDelta: {x: 0, y: 48.77} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 303, y: -24.385} + m_SizeDelta: {x: 36, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &83303293 CanvasRenderer: @@ -304,7 +304,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 749036027} - m_RootOrder: 8 + 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} @@ -670,7 +670,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &749036027 RectTransform: m_ObjectHideFlags: 0 @@ -687,7 +687,6 @@ RectTransform: - {fileID: 2113596637} - {fileID: 1408974802} - {fileID: 1496923168} - - {fileID: 848968185} - {fileID: 1913185728} - {fileID: 1644627164} - {fileID: 179227798} @@ -731,10 +730,10 @@ RectTransform: m_Father: {fileID: 1644627164} 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: 48.77} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 18, y: -24.385} + m_SizeDelta: {x: 36, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &809119151 CanvasRenderer: @@ -810,10 +809,10 @@ RectTransform: m_Father: {fileID: 1644627164} 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: 48.77} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126, y: -24.385} + m_SizeDelta: {x: 180, y: 48.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &834940287 CanvasRenderer: @@ -858,86 +857,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6700\u9AD8\u901A\u5173\uFF1A" LanguageIndex: 0 ---- !u!1 &848968184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 848968185} - - component: {fileID: 848968187} - - component: {fileID: 3220569399742598462} - m_Layer: 5 - m_Name: myInfo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &848968185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848968184} - 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_Children: [] - m_Father: {fileID: 749036027} - 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} - m_AnchoredPosition: {x: 0, y: -571} - m_SizeDelta: {x: 164.13, y: 39.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &848968187 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848968184} - m_CullTransparentMesh: 0 ---- !u!114 &3220569399742598462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 848968184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.882353, g: 0.8745099, b: 0.7803922, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6211\u7684\u6392\u540D\uFF1A" - LanguageIndex: 0 --- !u!1 &853391236 GameObject: m_ObjectHideFlags: 0 @@ -1548,10 +1467,10 @@ RectTransform: m_Father: {fileID: 1644627164} 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_SizeDelta: {x: 0, y: 48.77} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 257.43106, y: -24.385} + m_SizeDelta: {x: 69, y: 48.77} m_Pivot: {x: 0.6004501, y: 0.5} --- !u!222 &1542909634 CanvasRenderer: @@ -1831,12 +1750,12 @@ RectTransform: - {fileID: 305564107} - {fileID: 83303291} m_Father: {fileID: 749036027} - m_RootOrder: 7 + m_RootOrder: 6 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: 4, y: -581.52} - m_SizeDelta: {x: 0, y: 65.37} + m_SizeDelta: {x: 321, y: 65.37} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &794197693459959892 MonoBehaviour: @@ -2250,11 +2169,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 749036027} - m_RootOrder: 6 + 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} - m_AnchoredPosition: {x: 164, y: -571} + m_AnchoredPosition: {x: 0, y: -571} m_SizeDelta: {x: 164.13, y: 39.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1913185730 @@ -2292,7 +2211,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -18025,10 +17944,8 @@ RectTransform: - {fileID: 6752530349988418563} - {fileID: 1601293870136146815} - {fileID: 6032482182591102795} - - {fileID: 4663304603562795509} - {fileID: 8800335089930180538} - {fileID: 1102974759548419427} - - {fileID: 5568331810189637042} - {fileID: 8385314012138609394} m_Father: {fileID: 1749343158} m_RootOrder: 8 @@ -20489,86 +20406,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4620367754280225682 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4663304603562795509} - - component: {fileID: 5790058971553328183} - - component: {fileID: 1152832779657533598} - m_Layer: 5 - m_Name: myInfo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4663304603562795509 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4620367754280225682} - 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_Children: [] - m_Father: {fileID: 6859544939796263621} - 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} - m_AnchoredPosition: {x: -8, y: -612} - m_SizeDelta: {x: 174.95, y: 60.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5790058971553328183 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4620367754280225682} - m_CullTransparentMesh: 0 ---- !u!114 &1152832779657533598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4620367754280225682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.882353, g: 0.8745099, b: 0.7803922, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6211\u7684\u6392\u540D\uFF1A" - LanguageIndex: 0 --- !u!1 &4642875030176818995 GameObject: m_ObjectHideFlags: 0 @@ -21299,12 +21136,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6859544939796263621} - m_RootOrder: 6 + 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} - m_AnchoredPosition: {x: 169.28996, y: -612} - m_SizeDelta: {x: 179.64, y: 47.44} + m_AnchoredPosition: {x: -230, y: -612} + m_SizeDelta: {x: 420, y: 47.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5724748639834269356 CanvasRenderer: @@ -21338,14 +21175,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 50 + m_MaxSize: 36 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u672A\u4E0A\u699C" LanguageIndex: 0 @@ -22045,7 +21882,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6859544939796263621} - 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} @@ -22590,12 +22427,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6859544939796263621} - m_RootOrder: 9 + 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: 168, y: -649} - m_SizeDelta: {x: 179.64, y: 47.44} + m_AnchoredPosition: {x: 230, y: -612} + m_SizeDelta: {x: 420, y: 47.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &714262719346631100 CanvasRenderer: @@ -22629,14 +22466,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 50 - m_Alignment: 3 + m_MaxSize: 36 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7B2C682\u6CE2" LanguageIndex: 0 @@ -23240,86 +23077,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u901A\u5173\u9635\u5BB9" LanguageIndex: 0 ---- !u!1 &8623408597480964344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5568331810189637042} - - component: {fileID: 7088705496420780131} - - component: {fileID: 4560815330507278337} - m_Layer: 5 - m_Name: myInfo (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5568331810189637042 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8623408597480964344} - 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_Children: [] - m_Father: {fileID: 6859544939796263621} - 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} - m_AnchoredPosition: {x: -9.2500305, y: -647.89996} - m_SizeDelta: {x: 174.87, y: 59.1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7088705496420780131 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8623408597480964344} - m_CullTransparentMesh: 0 ---- !u!114 &4560815330507278337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8623408597480964344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.882353, g: 0.8745099, b: 0.7803922, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6700\u9AD8\u7EAA\u5F55\uFF1A" - LanguageIndex: 0 --- !u!1 &9204090217251755891 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab index 6d15212683..fa62d3f949 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanelV2.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334} m_Children: [] m_Father: {fileID: 9193158905020371500} - 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} @@ -15908,7 +15908,7 @@ RectTransform: m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334} m_Children: [] m_Father: {fileID: 9193158905020371500} - m_RootOrder: 6 + 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} @@ -54785,8 +54785,8 @@ RectTransform: - {fileID: 1585578433879240968} - {fileID: 1418986498347948236} - {fileID: 3682491641363753976} - - {fileID: 5333837363576207506} - {fileID: 6532840170437637994} + - {fileID: 5333837363576207506} m_Father: {fileID: 1915107041368105942} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index a4c2228976..c3a5176058 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -34,8 +34,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: 215.3, y: -76} - m_SizeDelta: {x: 598, y: 47.2} + m_AnchoredPosition: {x: 257.15002, y: -76} + m_SizeDelta: {x: 514.3, y: 47.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2736126529659177549 CanvasRenderer: @@ -69,15 +69,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 34 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.8 m_Text: "\u656C\u8BF7\u671F\u5F85" LanguageIndex: 0 --- !u!1 &575870042541593201 @@ -1265,7 +1265,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8206971610972396468 CanvasRenderer: @@ -1359,7 +1359,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4249339089310537242 CanvasRenderer: @@ -1393,14 +1393,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 49 + m_MaxSize: 38 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6311\u6218" LanguageIndex: 0 @@ -1975,8 +1975,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: 741.43, y: -146.9} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 754.06, y: -146.9} + m_SizeDelta: {x: 246.27, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5679312751743760484 CanvasRenderer: @@ -2090,15 +2090,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 10 - m_Right: 20 - m_Top: 0 - m_Bottom: 0 + m_Right: 15 + m_Top: 5 + m_Bottom: 5 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlHeight: 0 --- !u!114 &8478906388492734174 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2106,7 +2106,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6261543353929489563} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2120,7 +2120,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6261543353929489563} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2317,7 +2317,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1228854611522056942 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab index fabd6c375c..99a85ce26c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHalidomPanel.prefab @@ -676,7 +676,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5C1A\u672A\u83B7\u5F97\u5723\u7269" diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 061cad8e31..d5b275faf4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -6022,7 +6022,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 23.2, y: -86.100006} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 550, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8737532196289447247 CanvasRenderer: @@ -6062,7 +6062,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: "\u4ECA\u65E5\u5DF2\u5B8C\u6210\u6C42\u63F4\u6B21\u6570\uFF080/2\uFF09" diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 40214a704b..e23e19baf3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -33593,8 +33593,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 1.28, y: 0} + m_SizeDelta: {x: -53.85, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7025266801647225083 CanvasRenderer: @@ -33900,8 +33900,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.74, y: 0} + m_SizeDelta: {x: -52.11, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8394785584122011416 CanvasRenderer: @@ -54168,8 +54168,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.8, y: 0} + m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3336424220850891208 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab index 0af1f136e3..ce7ef02672 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab @@ -8571,8 +8571,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.42, y: 0} + m_SizeDelta: {x: -58.59, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4332567396074811292 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab index cb0cb60b54..a99406a423 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab @@ -962,8 +962,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: 0.0000044107} - m_SizeDelta: {x: 210.16, y: 100} + m_AnchoredPosition: {x: -0.31, y: 3.71} + m_SizeDelta: {x: 199.66, y: 92.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2221021030169868733 CanvasRenderer: @@ -1020,7 +1020,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: "\u53D1\u7EA2\u5305\u699C" LanguageIndex: 0 --- !u!1 &1892384971158860509 @@ -4938,8 +4938,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.91999817, y: 0.61999893} + m_SizeDelta: {x: -52.33, y: -9.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5355707703054156365 CanvasRenderer: @@ -6138,7 +6138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &284008168457238637 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPopup.prefab index 70cd9a5e76..75fe1e6a18 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPopup.prefab @@ -99,8 +99,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: -100.8} - m_SizeDelta: {x: 533.09, y: 40.66} + m_AnchoredPosition: {x: 0, y: -112.22} + m_SizeDelta: {x: 533.09, y: 63.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4483327862298011213 CanvasRenderer: @@ -134,13 +134,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7F8E\u5999\u7684\u4E00\u5929\uFF0C\u4ECA\u5929\u662F\u503C\u5F97\u5E86\u795D\u7684\u65E5\u5B50" @@ -488,7 +488,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: 453.38, y: 104.29} + m_AnchoredPosition: {x: 576, y: 110} m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &414120470775780947 @@ -791,7 +791,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: 276.74997, y: 0} + m_AnchoredPosition: {x: 274, y: -24} m_SizeDelta: {x: 71.6, y: 71.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9119233542703530756 @@ -1078,7 +1078,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: 0, y: -69} + m_AnchoredPosition: {x: 0, y: -52.1} m_SizeDelta: {x: 322, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2240919555150761369 @@ -1498,7 +1498,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: 179.2, y: 1} + m_AnchoredPosition: {x: 176.45, y: -23} m_SizeDelta: {x: 123.5, y: 58.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6365644596602966377 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/GuildSkillUpLvPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/GuildSkillUpLvPopup.prefab index e403136ca9..170751093b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/GuildSkillUpLvPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/GuildSkillUpLvPopup.prefab @@ -3827,8 +3827,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: 2.0999985, y: -0.7800102} - m_SizeDelta: {x: 210, y: 84} + m_AnchoredPosition: {x: -2.125, y: -0.7800102} + m_SizeDelta: {x: 197.17, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1783170944214104819 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab index b6010ad646..bdb17615a5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab @@ -1437,15 +1437,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 48 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 0.8 m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 --- !u!1 &6811389661399957699 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index f1ae2a30fd..956a9a11a8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -25088,7 +25088,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: -330.21, y: 0} + m_AnchoredPosition: {x: -300, y: 0} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3155064536918438900 @@ -28198,7 +28198,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.6, y: -54.5} - m_SizeDelta: {x: 386, y: 64.4} + m_SizeDelta: {x: 400, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2834772432760440570 CanvasRenderer: @@ -28232,15 +28232,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 50 + m_MaxSize: 38 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.8 m_Text: "\u91CD\u7F6E\u540E\u83B7\u5F97" LanguageIndex: 11253 --- !u!1 &7875933058227807210 @@ -34205,7 +34205,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: 286.9, y: 0} + m_AnchoredPosition: {x: 300, y: 0} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &951960641677808849 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index 3aa1fbfa0b..3be6d500c1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -109456,8 +109456,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: -1.199997, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.29000092} + m_SizeDelta: {x: -52.25, y: -9.86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4862823466565720546 CanvasRenderer: @@ -109499,7 +109499,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: "\u8F6C\u8BA9\u4F1A\u957F" LanguageIndex: 0 --- !u!1 &3103759999633739729 @@ -114501,8 +114501,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: -1.199997, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.83000183, y: 1.1599998} + m_SizeDelta: {x: -52.74, y: -10.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5040868909211270686 CanvasRenderer: @@ -114544,7 +114544,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: "\u59D4\u4EFB\u7BA1\u7406" LanguageIndex: 0 --- !u!1 &3252502697051738566 @@ -134616,8 +134616,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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.58000183, y: 0.58000183} + m_SizeDelta: {x: -53.32, y: -9.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8875742405583106441 CanvasRenderer: @@ -134659,7 +134659,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: "\u9A71\u9010\u5DE5\u4F1A" LanguageIndex: 0 --- !u!1 &4191496791905366497 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua index 05b981c3e0..86b2f038e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua @@ -200,11 +200,11 @@ function this.SetPlayerInfo(ranks,myRankInfo) local myRank = myRankInfo.rank if myRank == -1 then - this.monsterRank.text = Language[10036] - this.monsterWave.text = Language[10036] + this.monsterRank.text = Language[10103]..Language[10036] + this.monsterWave.text = Language[11685]..Language[10036] elseif myRank > 0 then - this.monsterRank.text = tostring(myRank) - this.monsterWave.text = Language[10262] .. myWave .. Language[10266] + this.monsterRank.text = Language[10103]..tostring(myRank) + this.monsterWave.text = GetLanguageStrById("最高纪录:")..Language[10262] .. myWave .. Language[10266] end end -- 其他玩家的排行 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 7c22d40187..f5ce39c6eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -252,6 +252,7 @@ function this.SetData(root, data, ldata) goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuangse") power.text = _power--string.format(Language[10288], _power) power.transform.parent.gameObject:SetActive(true) + tip.gameObject:SetActive(false) if CarbonManager.IsDailyCarbonPass(data.Id) then type=2 goBtnText.text=Language[10289]