From 3daf6a11b37339848fcadd76befd18bf748f50e7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 10 Mar 2021 11:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D=E6=B4=BB=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Mission/MissionDailyPanel.prefab | 97 ++++++++++++++++++- ...ssionDailyPanel_QingLongSecretTreasure.lua | 6 +- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 317f1d4978..145ba9a602 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -3257,6 +3257,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1918779212887374031} + - {fileID: 7477322209160810193} m_Father: {fileID: 1918779212270220639} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4464,7 +4465,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -18.55} + m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 459.73, y: 37.1} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1918779212887373872 @@ -9220,6 +9221,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6860646687044628261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7477322209160810193} + - component: {fileID: 3756077877038525707} + - component: {fileID: 8707570722145572194} + - component: {fileID: 5811088695344504971} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7477322209160810193 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6860646687044628261} + 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: 3291570141714537517} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 26, y: -19} + m_SizeDelta: {x: 459.73, y: 37.1} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3756077877038525707 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6860646687044628261} + m_CullTransparentMesh: 0 +--- !u!114 &8707570722145572194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6860646687044628261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -1 +--- !u!114 &5811088695344504971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6860646687044628261} + 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.3018868, g: 0.3018868, b: 0.3018868, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 27 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6D3B\u52A8\u65F6\u95F4\uFF1A" + LanguageIndex: 11708 --- !u!1 &6906709250642857206 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index b993a84bad..8b39819b9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -16,7 +16,8 @@ function this:InitComponent(gameObject) this.quesBtn = Util.GetGameObject(this.gameObject, "bg/quesBtn") this.helpPosition= this.quesBtn:GetComponent("RectTransform").localPosition this.tips = Util.GetGameObject(this.gameObject, "bg/topBar/tips"):GetComponent("Text") - this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/Text"):GetComponent("Text") + this.timeTxt = Util.GetGameObject(this.gameObject, "bg/topBar/time/Text"):GetComponent("Text") + this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/time"):GetComponent("Text") this.buyBtn = Util.GetGameObject(this.gameObject, "bg/topBar/button/buyBtn") this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text") @@ -95,7 +96,8 @@ function this:OnShow(_parent,...) end this.tips.text = Language[11323] local startTime,endTime,endTimeScale = QinglongSerectTreasureManager.GetTimeStartToEnd() - this.time.text = Language[10584]..startTime.."-"..endTime + this.timeTxt.text = Language[10584] + this.time.text = startTime.."-"..endTime this.remainTime.text = Language[10470]..TimeToDHMS(tonumber(endTimeScale) - GetTimeStamp()) this:ShowTime(endTimeScale) this.refresh(true,true)