英雄基金

lua/app/module/maincity/maincity_const.lua

@@ -30,6 +30,7 @@ MainCityConst.MAIN_MODULE = {
 MainCityConst.LEFT_SIDE_BARS = {
 	"app/ui/main_city/cell/side_bar_idle_cell",
 	"app/ui/main_city/cell/side_bar_growth_fund_cell",
+	"app/ui/main_city/cell/side_bar_hero_fund_cell",
 	"app/ui/main_city/cell/side_bar_seven_days_cell",
 	"app/ui/main_city/cell/side_bar_activity_cell",
 	-- gm放最后一个

lua/app/ui/activity/hero_fund/cell/fund_cell.lua

@@ -19,7 +19,7 @@ function FundCell:refresh(level, data)
         self.rewardCell1:refreshByConfig(reward, isGet, isGet)
     end
     self.rewardCell1:showLock(false)
-    if DataManager.HeroData:getFreeCanGet(level) then
+    if DataManager.HeroFundData:getFreeCanGet(level) then
         self.rewardCell1.baseObject:addRedPoint(50, 50, 0.6)
         self.rewardCell1:addClickListener(function()
             self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.FREE)
@@ -35,7 +35,7 @@ function FundCell:refresh(level, data)
         self.rewardCell2:refreshByConfig(reward, isGet, isGet)
     end
     self.rewardCell2:showLock(not DataManager.HeroFundData:getProBought())
-    if DataManager.HeroData:getProCanGet(level) then
+    if DataManager.HeroFundData:getProCanGet(level) then
         self.rewardCell2.baseObject:addRedPoint(50, 50, 0.6)
         self.rewardCell2:addClickListener(function()
             self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.PRO)
@@ -51,7 +51,7 @@ function FundCell:refresh(level, data)
         self.rewardCell3:refreshByConfig(reward, isGet, isGet)
     end
     self.rewardCell3:showLock(not DataManager.HeroFundData:getUtralBought())
-    if DataManager.HeroData:getUtralCanGet(level) then
+    if DataManager.HeroFundData:getUtralCanGet(level) then
         self.rewardCell3.baseObject:addRedPoint(50, 50, 0.6)
         self.rewardCell3:addClickListener(function()
             self:onClickReward(level, DataManager.HeroFundData.REWARD_TYPE.UTRAL)

lua/app/ui/activity/hero_fund/hero_fund_ui.lua

@@ -60,7 +60,7 @@ function HeroFundUI:refreshBtns()
         probtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1])
         probtn:setTouchEnable(true)
         probtn:addClickListener(function()
-            ModuleManager.HeroFundManager:purcharse(DataManager.HeroData:getProActId())
+            ModuleManager.HeroFundManager:purcharse(DataManager.HeroFundData:getProActId())
         end)
 
         proBtntx:setText(DataManager.HeroFundData:getProPrice())
@@ -77,7 +77,7 @@ function HeroFundUI:refreshBtns()
         utralbtn:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1])
         utralbtn:setTouchEnable(true)
         utralbtn:addClickListener(function()
-            ModuleManager.HeroFundManager:purcharse(DataManager.HeroData:getUtralActId())
+            ModuleManager.HeroFundManager:purcharse(DataManager.HeroFundData:getUtralActId())
         end)
 
         utralBtntx:setText(DataManager.HeroFundData:gettUtralPrice())
@@ -90,7 +90,8 @@ function HeroFundUI:_refreshScrollrect()
         return
     end
 
-    self.scrollRectComp = self.uiMap["activity_herofund_ui.bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
+    local uiMap = self.root:genAllChildren()
+    self.scrollRectComp = uiMap["activity_herofund_ui.bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
     self.scrollRectComp:addInitCallback(function()
 		return FUND_CELL
 	end)

lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua

@@ -0,0 +1,50 @@
+local SideBarBaseCellComp = require "app/ui/main_city/cell/side_bar_base_cell"
+local SideBarHeroFundCell = class("SideBarHeroFundCell", SideBarBaseCellComp)
+
+function SideBarHeroFundCell:getModuleKey()
+    return ModuleManager.MODULE_KEY.SEVEN_DAY
+end
+
+function SideBarHeroFundCell:getHasPurchase()
+    return false
+end
+
+function SideBarHeroFundCell:getIsOpen()
+    return DataManager.HeroFundData:getIsOpen()
+end
+
+function SideBarHeroFundCell:getSpineName()
+    return "ui_main_btn_sevenday"
+end
+
+function SideBarHeroFundCell:onClick()
+    ModuleManager.HeroFundManager:showMainUI()
+end
+
+function SideBarHeroFundCell:getIsShowRedPoint()
+    return DataManager.HeroFundData:getHaveReward()
+end
+
+function SideBarHeroFundCell:onRefresh()
+    self.timeBg:setVisible(true)
+    self:_refreshTime()
+end
+
+function SideBarHeroFundCell:updateTime()
+    if self:getIsOpen() then
+        self:_refreshTime()
+    else
+        self:closeBtn()
+    end
+end
+
+function SideBarHeroFundCell:_refreshTime()
+    local remainTime = DataManager.HeroFundData:getRemainTime()
+    if remainTime >= 0 then
+        self.timeTx:setText(GFunc.getTimeStr(remainTime))
+    else
+        self.timeTx:setText("00:00:00")
+    end
+end
+
+return SideBarHeroFundCell

lua/app/ui/main_city/cell/side_bar_hero_fund_cell.lua.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 07f3f4c6518d616448dfb3093dbe841c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/userdata/activity/hero_fund/hero_fund_data.lua

@@ -35,6 +35,7 @@ end
 
 function HeroFundData:init(data)
     data = data or {}
+    self.endTime = Time:getServerTime() + 2000
 
     local cfg = self:getConfig()
     self.waveLevelListCount = 0
@@ -59,7 +60,7 @@ function HeroFundData:init(data)
     -- end)
 
     -- DataManager:registerCrossDayFunc("HeroFundData", function()
-    --     if not ModuleManager:checkIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY) then
+    --     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
     --         return
     --     end
 
@@ -76,7 +77,7 @@ function HeroFundData:setDirty()
 end
 
 function HeroFundData:getIsOpen()
-    if not ModuleManager:checkIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY) then
+    if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
         return false
     end