From 64d267b23259bb57a6be9c7374f6f8820fd90ad4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 7 Mar 2021 15:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page4.prefab | 42 ++----------------- .../Modules/DynamicActivity/QianKunBox.lua | 4 +- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 786f7ff697..106bfec3eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -2324,7 +2324,6 @@ GameObject: m_Component: - component: {fileID: 5215762483168328321} - component: {fileID: 1626503262693759488} - - component: {fileID: 8984862507142941154} m_Layer: 0 m_Name: tips2 m_TagString: Untagged @@ -2360,41 +2359,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853214350168000572} m_CullTransparentMesh: 0 ---- !u!114 &8984862507142941154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853214350168000572} - 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.92549026, g: 0.8431373, b: 0.58431375, a: 1} - m_RaycastTarget: 0 - 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: 31 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A" - LanguageIndex: 0 --- !u!1 &2098103636765792368 GameObject: m_ObjectHideFlags: 0 @@ -7608,8 +7572,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: 187.05, y: -1} - m_SizeDelta: {x: 177.79, y: 50} + m_AnchoredPosition: {x: 71, y: -1} + m_SizeDelta: {x: 410, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6683108616488038909 CanvasRenderer: @@ -7646,7 +7610,7 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 3 m_MaxSize: 30 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 2f1d0f31aa..17ee338860 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -246,9 +246,9 @@ function QianKunBox:timeCountDown() self.btnTime.text = TimeToHMS(timeDown) -- self.shopData = ShopManager.GetShopDataByType(SHOP_TYPE.QIANKUNBOX_SHOP)--获取活动信息 self.shopData =ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox) - self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)--活动结束的倒计时 + self.leftUpTime.text = Language[10512]..self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)--活动结束的倒计时 self.timer = Timer.New(function() - self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime) + self.leftUpTime.text =Language[10512].. self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime) self.btnTime.text = TimeToHMS(timeDown) if timeDown < 1 then self.timer:Stop()