puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
CloudJ 2023-06-05 14:10:29 +08:00
commit 6581df1b5c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/ui/battle/battle_result_ui.lua
View File

@ -195,7 +195,7 @@ function BattleResultUI:tryShowGoldPig()
local currGemCount = DataManager.GoldPigData:getCount() local currGemCount = DataManager.GoldPigData:getCount()
local maxGemCount = DataManager.GoldPigData:getMaxCount() local maxGemCount = DataManager.GoldPigData:getMaxCount()
if lastGemCount > currGemCount then if lastGemCount > currGemCount then
lastGemCount = 0 lastGemCount = currGemCount
end end
self.goldPigGemTx:setText("+" .. currGemCount - lastGemCount) self.goldPigGemTx:setText("+" .. currGemCount - lastGemCount)
GFunc.centerImgAndTx(self.goldPigGemImg, self.goldPigGemTx, 0, -4) GFunc.centerImgAndTx(self.goldPigGemImg, self.goldPigGemTx, 0, -4)

4
lua/app/ui/main_city/cell/side_bar_idle_cell.lua
View File

@ -9,8 +9,8 @@ function SideBarIdleCell:getIsOpen()
return DataManager.IdleData:getIsOpen() return DataManager.IdleData:getIsOpen()
end end
function SideBarIdleCell:getIconRes() function SideBarIdleCell:getSpineName()
return "main_btn_hang" return "ui_main_btn_hang"
end end
function SideBarIdleCell:onClick() function SideBarIdleCell:onClick()

4
lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua
View File

@ -9,8 +9,8 @@ function SideBarSevenDaysCell:getIsOpen()
return DataManager.SevenDayData:getIsOpen() return DataManager.SevenDayData:getIsOpen()
end end
function SideBarSevenDaysCell:getIconRes() function SideBarSevenDaysCell:getSpineName()
return "main_btn_sevenday" return "ui_main_btn_sevenday"
end end
function SideBarSevenDaysCell:onClick() function SideBarSevenDaysCell:onClick()

2
lua/app/userdata/activity/gold_pig/gold_pig_data.lua
View File

@ -70,6 +70,7 @@ function GoldPigData:checkOpen()
self.nextShowTime = self.endTime + self:getTimeOverCD() self.nextShowTime = self.endTime + self:getTimeOverCD()
if Time:getServerTime() >= self.endTime then -- 超过时间该消失了 if Time:getServerTime() >= self.endTime then -- 超过时间该消失了
self.data.isOpen = false self.data.isOpen = false
self:levelDown()
else else
self.data.isOpen = true self.data.isOpen = true
DataManager:registerDataCd("GoldPigData") DataManager:registerDataCd("GoldPigData")
@ -96,6 +97,7 @@ function GoldPigData:addGoldPigCount()
return return
end end
if self.data.count >= info.max_diamond then -- 已经满了 if self.data.count >= info.max_diamond then -- 已经满了
self.lastCount = self.data.count
return return
end end
self.lastCount = self.data.count self.lastCount = self.data.count