diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 7215a3fd1f..12040bd2eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -35985,9 +35985,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -548.86} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5602079545849984728 @@ -36275,9 +36275,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -767.29} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1515287188817918812 @@ -76507,9 +76507,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 6 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: 0, y: -1422.5798} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3253678623016334174 @@ -89140,7 +89140,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 0.9 - m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$0.99" + m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n6\n\u5143" LanguageIndex: 0 --- !u!1 &1599836006760387995 GameObject: @@ -89169,15 +89169,15 @@ RectTransform: m_GameObject: {fileID: 1599836006760387995} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 1188323177024200088} 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: -73.79998, y: -58.5} - m_SizeDelta: {x: 38, y: 50} + m_AnchoredPosition: {x: 92, y: -61} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599836006760387996 CanvasRenderer: @@ -89207,7 +89207,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: e5ae86d5bb54abd40986c361c56e505e, type: 3} + m_Sprite: {fileID: 21300000, guid: 8433faecc652d374ab2a8398d559dfcb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -89251,7 +89251,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: -9.3, y: -66} + m_AnchoredPosition: {x: -64, y: -66} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599836007671335418 @@ -118196,9 +118196,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 9 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: 0, y: -2077.8696} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &352105450593286701 @@ -139538,9 +139538,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -330.43} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4183130594691691997 @@ -194693,10 +194693,10 @@ RectTransform: m_Father: {fileID: 4953878265078755386} 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: 594.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 297.1, y: -22.5} + m_SizeDelta: {x: 594.2, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817061654922696 CanvasRenderer: @@ -200555,9 +200555,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 7 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: 0, y: -1641.0098} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1514830361088202235 @@ -207866,9 +207866,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} m_RootOrder: 8 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: 0, y: -1859.4397} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8657082432405232145 @@ -208711,7 +208711,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 167.83, y: 684.5} - m_SizeDelta: {x: 594.2, y: 0} + m_SizeDelta: {x: 594.2, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4953878265078755380 CanvasRenderer: @@ -208832,7 +208832,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.0000019073, y: 0} - m_SizeDelta: {x: 838.1, y: 0} + m_SizeDelta: {x: 838.1, y: 2189.8696} m_Pivot: {x: 0.5, y: 1} --- !u!114 &385353760370003947 MonoBehaviour: @@ -226442,9 +226442,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -112} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &347261519494395572 @@ -241638,9 +241638,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -985.72} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8818913707777223369 @@ -247578,7 +247578,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5633248320576759341 RectTransform: m_ObjectHideFlags: 0 @@ -253879,7 +253879,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 167.83, y: 684.5} - m_SizeDelta: {x: 594.2, y: 0} + m_SizeDelta: {x: 594.2, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7097480920010974223 CanvasRenderer: @@ -254346,10 +254346,10 @@ RectTransform: m_Father: {fileID: 2597592455288846907} 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: 594.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 297.1, y: -17.5} + m_SizeDelta: {x: 594.2, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2777627761568600087 CanvasRenderer: @@ -283727,9 +283727,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -1204.1499} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7792564941164481903 diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index 43d1287379..642e1edf9d 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -35878,7 +35878,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 0.7 - m_Text: "\u7D2F\u5145\u6EE1$1" + m_Text: "\u7D2F\u5145\u6EE11\u5143" LanguageIndex: 0 --- !u!1 &4075015836899280644 GameObject: @@ -36355,7 +36355,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: ae10eef3900dd3a478c63f6003648e1d, type: 3} + m_Sprite: {fileID: 21300000, guid: e7a69d4f2a1c558449fad34f1a5660ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -37297,7 +37297,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: 58b4e8b7e86fd664ebdd7eb6c4205673, type: 3} + m_Sprite: {fileID: 21300000, guid: d4c1fa3a7f3e89f4397073ee3d74c589, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38343,7 +38343,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 0.7 - m_Text: "\u7D2F\u5145\u503C$15" + m_Text: "\u7D2F\u5145\u503C15\u5143" LanguageIndex: 0 --- !u!1001 &6359050367270521292 PrefabInstance: diff --git a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab index 38e19e550f..984f2980ef 100644 --- a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab @@ -171,7 +171,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: 5, y: -70} + m_AnchoredPosition: {x: 5, y: -86} m_SizeDelta: {x: 720, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9137462790466722241 @@ -249,6 +249,7 @@ RectTransform: - {fileID: 6231850540444929965} - {fileID: 3339472883357455100} - {fileID: 9147922952771934793} + - {fileID: 6168525265727620343} m_Father: {fileID: 8025763709527437539} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1297,6 +1298,86 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &8444623620162218367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6168525265727620343} + - component: {fileID: 8996716670784611152} + - component: {fileID: 3993943430035340357} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6168525265727620343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8444623620162218367} + 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: 4168792694004356739} + 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: -269} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8996716670784611152 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8444623620162218367} + m_CullTransparentMesh: 0 +--- !u!114 &3993943430035340357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8444623620162218367} + 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.909804, g: 0.8000001, b: 0.5372549, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u9650\u8D2D1\u6B21" + LanguageIndex: 0 --- !u!1 &8526276543331923421 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua index c6b3d44760..f630389c0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua @@ -94,7 +94,7 @@ end function TimeLimitSkin:SetTime() local time = gift.endTime - this.time.text = Language[11496]..TimeToFelaxible(time-GetTimeStamp()) + this.time.text = Language[10023]..TimeToFelaxible(time-GetTimeStamp()) if this.localTimer then this.localTimer:Stop() this.localTimer = nil @@ -105,7 +105,7 @@ function TimeLimitSkin:SetTime() OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, gift.goodsId) self:ClosePanel() end - this.time.text = Language[11496]..TimeToFelaxible(lefttime) + this.time.text = Language[10023]..TimeToFelaxible(lefttime) lefttime = lefttime - 1 end,1,-1,true) this.localTimer:Start()