From 1ed63af6ed6603231d84551ff7b65eb28c5879fc Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 5 Jun 2023 11:45:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AEspine=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/cell/side_bar_idle_cell.lua | 4 ++-- lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/app/ui/main_city/cell/side_bar_idle_cell.lua b/lua/app/ui/main_city/cell/side_bar_idle_cell.lua index 6b659715..ede99e12 100644 --- a/lua/app/ui/main_city/cell/side_bar_idle_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_idle_cell.lua @@ -9,8 +9,8 @@ function SideBarIdleCell:getIsOpen() return DataManager.IdleData:getIsOpen() end -function SideBarIdleCell:getIconRes() - return "main_btn_hang" +function SideBarIdleCell:getSpineName() + return "ui_main_btn_hang" end function SideBarIdleCell:onClick() diff --git a/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua b/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua index fb1dbc22..ddfbb7fb 100644 --- a/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua @@ -9,8 +9,8 @@ function SideBarSevenDaysCell:getIsOpen() return DataManager.SevenDayData:getIsOpen() end -function SideBarSevenDaysCell:getIconRes() - return "main_btn_sevenday" +function SideBarSevenDaysCell:getSpineName() + return "ui_main_btn_sevenday" end function SideBarSevenDaysCell:onClick() From 447456612e92f36f780b7882ea6cc3ff7843e6b0 Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 5 Jun 2023 12:03:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=91=E7=8C=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_result_ui.lua | 2 +- lua/app/userdata/activity/gold_pig/gold_pig_data.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 75dccdb2..c30d1e94 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -195,7 +195,7 @@ function BattleResultUI:tryShowGoldPig() local currGemCount = DataManager.GoldPigData:getCount() local maxGemCount = DataManager.GoldPigData:getMaxCount() if lastGemCount > currGemCount then - lastGemCount = 0 + lastGemCount = currGemCount end self.goldPigGemTx:setText("+" .. currGemCount - lastGemCount) GFunc.centerImgAndTx(self.goldPigGemImg, self.goldPigGemTx, 0, -4) diff --git a/lua/app/userdata/activity/gold_pig/gold_pig_data.lua b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua index 9d7c369f..34b7a24f 100644 --- a/lua/app/userdata/activity/gold_pig/gold_pig_data.lua +++ b/lua/app/userdata/activity/gold_pig/gold_pig_data.lua @@ -70,6 +70,7 @@ function GoldPigData:checkOpen() self.nextShowTime = self.endTime + self:getTimeOverCD() if Time:getServerTime() >= self.endTime then -- 超过时间该消失了 self.data.isOpen = false + self:levelDown() else self.data.isOpen = true DataManager:registerDataCd("GoldPigData") @@ -96,6 +97,7 @@ function GoldPigData:addGoldPigCount() return end if self.data.count >= info.max_diamond then -- 已经满了 + self.lastCount = self.data.count return end self.lastCount = self.data.count