From 8125ed131e6068ceaa801d32cac5c628c5634a53 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 18 Nov 2021 13:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E8=84=89=E7=A7=98=E5=A2=83?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/LingMaiMiJin/LingMaiMiJingPanel.prefab | 202 +++++++++--------- .../LingMaiMiJing/LingMaiMiJingPanel.lua | 16 +- .../~Lua/Modules/Main/GMPanel.lua | 2 +- 3 files changed, 114 insertions(+), 106 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index bb3c762109..aae25ff573 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -509,10 +509,10 @@ RectTransform: m_Father: {fileID: 1842823396863996063} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8988996156452702118 MonoBehaviour: @@ -692,10 +692,10 @@ RectTransform: m_Father: {fileID: 6631983890740397021} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &62249326517734551 MonoBehaviour: @@ -752,10 +752,10 @@ RectTransform: m_Father: {fileID: 5203893333679927233} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -26.5} + m_SizeDelta: {x: 150, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &32742218520094907 CanvasRenderer: @@ -890,10 +890,10 @@ RectTransform: m_Father: {fileID: 5203893333679927233} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -63} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8942666373066514662 MonoBehaviour: @@ -1273,10 +1273,10 @@ RectTransform: m_Father: {fileID: 1147139038742370520} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -63} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2609894674940647455 MonoBehaviour: @@ -1335,10 +1335,10 @@ RectTransform: m_Father: {fileID: 551752266169988291} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6161151644569124203 MonoBehaviour: @@ -1395,9 +1395,9 @@ RectTransform: m_Father: {fileID: 8766448444334068963} 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: 130, y: -20} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7190309387099235569 @@ -1682,10 +1682,10 @@ RectTransform: m_Father: {fileID: 1147139038742370520} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -26.5} + m_SizeDelta: {x: 150, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6425459783618059530 CanvasRenderer: @@ -1764,7 +1764,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: 0, y: 0} + m_AnchoredPosition: {x: 1055, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7472609110656960119 @@ -1837,10 +1837,10 @@ RectTransform: m_Father: {fileID: 2949866619754448957} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1716998955595445076 MonoBehaviour: @@ -2115,7 +2115,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1147139038742370520 RectTransform: m_ObjectHideFlags: 0 @@ -2135,7 +2135,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172, y: 156.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 103} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8317500237339409211 CanvasRenderer: @@ -3455,10 +3455,10 @@ RectTransform: m_Father: {fileID: 3704911933904687104} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &9033052328951720016 MonoBehaviour: @@ -3594,10 +3594,10 @@ RectTransform: m_Father: {fileID: 3167724344109322160} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -26.5} + m_SizeDelta: {x: 150, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5596306739388018305 CanvasRenderer: @@ -4261,9 +4261,9 @@ RectTransform: m_Father: {fileID: 1334215945499992631} 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: 40, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2620402281264139515 @@ -4335,9 +4335,9 @@ RectTransform: m_Father: {fileID: 8064964827093833889} 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: 130, y: -20} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8446541904246468798 @@ -4732,9 +4732,9 @@ RectTransform: m_Father: {fileID: 8766448444334068963} 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: 40, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6432320542066895967 @@ -4793,7 +4793,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5203893333679927233 RectTransform: m_ObjectHideFlags: 0 @@ -4813,7 +4813,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172, y: 156.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 103} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7330801162935369683 CanvasRenderer: @@ -4921,9 +4921,9 @@ RectTransform: m_Father: {fileID: 4315313552769486584} 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: 40, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8928505379944031014 @@ -5135,7 +5135,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2096849522900285200 RectTransform: m_ObjectHideFlags: 0 @@ -5155,7 +5155,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172, y: 156.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 103} m_Pivot: {x: 0.5, y: 1} --- !u!222 &601348966315467245 CanvasRenderer: @@ -5461,9 +5461,9 @@ RectTransform: m_Father: {fileID: 4315313552769486584} 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: 130, y: -20} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2184525584959230361 @@ -5798,9 +5798,9 @@ RectTransform: m_Father: {fileID: 6019350341501038457} 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: 40, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5702729696239517783 @@ -5935,10 +5935,10 @@ RectTransform: m_Father: {fileID: 3167724344109322160} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -63} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4787173470154544457 MonoBehaviour: @@ -6364,7 +6364,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3167724344109322160 RectTransform: m_ObjectHideFlags: 0 @@ -6384,7 +6384,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172, y: 156.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 103} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5586744175584459329 CanvasRenderer: @@ -6492,9 +6492,9 @@ RectTransform: m_Father: {fileID: 8064964827093833889} 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: 40, y: -20} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5501188446171539552 @@ -6642,10 +6642,10 @@ RectTransform: m_Father: {fileID: 2096849522900285200} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -26.5} + m_SizeDelta: {x: 150, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6397734973286700941 CanvasRenderer: @@ -6721,10 +6721,10 @@ RectTransform: m_Father: {fileID: 2096849522900285200} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -63} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5675748319130969391 MonoBehaviour: @@ -7060,10 +7060,10 @@ RectTransform: m_Father: {fileID: 4862785947611947866} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -63} + m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3046243077893898961 MonoBehaviour: @@ -7200,10 +7200,10 @@ RectTransform: m_Father: {fileID: 4862785947611947866} 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: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: -26.5} + m_SizeDelta: {x: 150, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4233464141616994112 CanvasRenderer: @@ -7279,9 +7279,9 @@ RectTransform: m_Father: {fileID: 6019350341501038457} 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: 130, y: -20} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3597611247373855420 @@ -8353,9 +8353,9 @@ RectTransform: m_Father: {fileID: 1334215945499992631} 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: 130, y: -20} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2010343805065070851 @@ -8558,7 +8558,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4862785947611947866 RectTransform: m_ObjectHideFlags: 0 @@ -8578,7 +8578,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172, y: 156.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 240, y: 103} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4431994444534580997 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 49f01fe800..e8cf8df001 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -28,7 +28,7 @@ function LingMaiMiJingPanel:InitComponent() self.rewardList = {} self.jump = Util.GetGameObject(self.bottom,"Jump") self.jumpBtn = Util.GetGameObject(self.jump,"btnJump") - self.leftTime = Util.GetGameObject(self.jump,"Time/Text"):GetComponent("Text") + self.battleTime = Util.GetGameObject(self.jump,"Time/Text"):GetComponent("Text") self.inputField = Util.GetGameObject(self.jump, "Input/InputField"):GetComponent("InputField") --rightBtns @@ -147,6 +147,7 @@ function LingMaiMiJingPanel:SetMydata() self.TextTip:SetActive(true) self.rewardGrid:SetActive(false) end + self.battleTime.text = string.format("剩余挑战次数:%s",5) ForceRebuildLayout(self.bottom.transform) end @@ -156,10 +157,13 @@ function LingMaiMiJingPanel:SetVeins() local data = self.data.lingmaiData[i] local title = Util.GetGameObject(go,"title/Name"):GetComponent("Text") local num = Util.GetGameObject(go,"title/Num"):GetComponent("Text") + local obtain = Util.GetGameObject(go,"obtain") local name = Util.GetGameObject(go,"obtain/name"):GetComponent("Text") local grid = Util.GetGameObject(go,"obtain/grid") local rewardPre = Util.GetGameObject(grid,"rewardPre") rewardPre:SetActive(false) + -- obtain:SetActive(LingMaiMiJingManager.state == 1) + obtain:SetActive(true) title.text = data.veinName num.text = data.No @@ -181,7 +185,11 @@ function LingMaiMiJingPanel:SetVeins() Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( "%s/分",data.RewardList[j][2]) end Util.AddOnceClick(go,function () - UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.serverName and data.serverName or nil,data) + -- if LingMaiMiJingManager.state == 1 then + UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.LINGMAIMIJING,data.serverName and data.serverName or nil,data) + -- else + -- PopupTipPanel.ShowTip("灵脉秘境未开启!") + -- end end) end end @@ -198,11 +206,11 @@ function LingMaiMiJingPanel:SetTime() local timeStayAtHere = GetTimeStamp() - self.data.startTime self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 )) local text = TEXTLIST[self.data.state] - self.leftTime.text = string.format(text,TimeToFelaxible(time)) + self.leftTime.text = string.format(text,TimeToHMS(time)) self.timer = Timer.New(function () time = time - 1 timeStayAtHere = timeStayAtHere + 1 - self.leftTime.text = string.format(text,TimeToFelaxible(time)) + self.leftTime.text = string.format(text,TimeToHMS(time)) self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 )) if time <= 0 then self:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 5380e8b02a..fa616acde6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -354,7 +354,7 @@ function this.GetMoney() local time = Timer.New(function () NetManager.GMEvent(moneyList[index]) index = index + 1 - end, 1, 6, true) + end, 1, 10, true) time:Start() end -- 测试跳转