From 5c7355d95102a319912c82bccbe1c4364f02e6dc Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Tue, 19 Sep 2023 20:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8F=B7=E5=9C=86=E6=9C=88=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=B7=E6=B1=82fix=E3=80=81=E7=AC=A6=E6=96=87?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E4=B8=AA=E6=95=B0=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/hero/runes_info_comp.lua              |  4 ++--
 .../activity/full_moon/full_moon_data.lua        | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua
index e91982c9..6f8a731d 100644
--- a/lua/app/ui/hero/runes_info_comp.lua
+++ b/lua/app/ui/hero/runes_info_comp.lua
@@ -155,7 +155,7 @@ function RunesInfoComp:autoQuenching()
             self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX))
         end
         self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, self.tempLevel))
-        self.txNum:setText(self.tempMaterialCount)
+        self.txNum:setText(GFunc.num2Str(self.tempMaterialCount))
         if self.tempMaterialCount < self.tempCostNum then
             -- 剩余材料不够，结束自动淬炼
             ModuleManager.RunesManager:reqSyncQuenching(true)
@@ -178,7 +178,7 @@ function RunesInfoComp:refreshLevelExp()
         self.txProg:setText(I18N:getGlobalText(I18N.GlobalConst.STR_MAX))
     end
     self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_1, DataManager.RunesData:getLevel()))
-    self.txNum:setText(DataManager.RunesData:getMaterialCount())
+    self.txNum:setText(GFunc.num2Str(DataManager.RunesData:getMaterialCount()))
 end
 
 -- 刷新符文
diff --git a/lua/app/userdata/activity/full_moon/full_moon_data.lua b/lua/app/userdata/activity/full_moon/full_moon_data.lua
index 970da844..3faf1bd6 100644
--- a/lua/app/userdata/activity/full_moon/full_moon_data.lua
+++ b/lua/app/userdata/activity/full_moon/full_moon_data.lua
@@ -12,6 +12,7 @@ end
 
 function FullMoonData:clear()
     DataManager:unregisterCrossDayFunc("FullMoonData")
+    DataManager:unregisterTryOpenFunc("FullMoonData")
 end
 
 -- 设置活动数据
@@ -25,6 +26,21 @@ function FullMoonData:setActStatus(data)
         Logger.logHighlight("圆月活动开启时间：")
         Logger.printTable(data)
     end
+
+    if not self:isOpen() then
+        -- 活动开启
+        DataManager:registerTryOpenFunc("FullMoonData", function()
+            if not self:isOpen() then
+                return
+            end
+            if not self:isOpenTime() then
+                return
+            end
+
+            DataManager:unregisterTryOpenFunc("FullMoonData")
+            ModuleManager.FullMoonManager:reqActData()
+        end)
+    end
 end
 
 -- 获取活动数据成功