bug修复
parent
5edb6c9234
commit
1f5440c2e6
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 9.8 KiB |
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 673fd15aecdb90b48bc37f734b772919
|
||||
spriteID: 88364f6a96b52cf4097453afa8141b2b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
@ -84,6 +84,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
|||
heroData.star = _msgHeroData.star
|
||||
heroData.lv = _msgHeroData.level
|
||||
heroData.breakId = _msgHeroData.breakId
|
||||
LogGreen("heroData.id:"..heroData.id.." heroData.breakId:"..heroData.breakId)
|
||||
heroData.upStarId = _msgHeroData.starBreakId
|
||||
heroData.createTime = _msgHeroData.createTimelocal
|
||||
heroData.lockState = _msgHeroData.lockState
|
||||
|
@ -2104,13 +2105,19 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
|||
if not curHeroData then
|
||||
return
|
||||
end
|
||||
local pId
|
||||
if curHeroData.breakId == 0 then
|
||||
pId=0
|
||||
else
|
||||
pId= heroRankUpConfig[curHeroData.breakId].Phase[2]
|
||||
end
|
||||
local heroReturnConfig =
|
||||
ConfigManager.TryGetConfigDataByDoubleKey(
|
||||
ConfigName.HeroReturn,
|
||||
"HeroId",
|
||||
curHeroData.id,
|
||||
"Star",
|
||||
curHeroData.breakId
|
||||
pId
|
||||
)
|
||||
local rewardShowStr1 = {}
|
||||
ShowItemlist[heroReturnConfig.HeroId] = {heroReturnConfig.HeroId,1,curHeroData.star}
|
||||
|
|
|
@ -128,9 +128,7 @@ function OperatingPanel:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.MonthCard.OnMonthCardUpdate, self.RefreshMonthCardData,self)
|
||||
end
|
||||
function OperatingPanel:RefreshMonthCardData()
|
||||
-- LogError("self.selectTabIndex 1 "..self.selectTabIndex)
|
||||
if self.selectTabIndex == 2 then
|
||||
-- LogError("self.selectTabIndex 2 "..self.selectTabIndex)
|
||||
self.operatingContents[2]:OnShow(self.sortingOrder,nil, self.selectTabIndex)
|
||||
end
|
||||
end
|
||||
|
@ -145,12 +143,9 @@ function OperatingPanel:OnClose()
|
|||
end
|
||||
|
||||
function OperatingPanel:OnDestroy()
|
||||
LogRed("Remove UpVIew")
|
||||
SubUIManager.Close(self.UpView)
|
||||
|
||||
ClearRedPointObject(RedPointType.CumulativeSignIn)
|
||||
ClearRedPointObject(RedPointType.GrowthGift)
|
||||
-- ClearRedPointObject(RedPointType.ContinuityRecharge)
|
||||
ClearRedPointObject(RedPointType.GiftPage)
|
||||
ClearRedPointObject(RedPointType.MonthCard)
|
||||
ClearRedPointObject(RedPointType.TimeLimited)
|
||||
|
@ -248,11 +243,23 @@ function OperatingPanel:RefreshTabStatus()
|
|||
|
||||
self.operateTabs[10]:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) ~= nil)
|
||||
self.operateTabs[11]:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) ~= nil)
|
||||
|
||||
elseif self.showType==ShowType.MonthFund.type then
|
||||
--- 7 跟 8 是活动开启
|
||||
self.operateTabs[7]:SetActive(OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128))--, SALARY_TYPE.BASE_128
|
||||
self.operateTabs[8]:SetActive(OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328))--, SALARY_TYPE.BASE_328
|
||||
|
||||
|
||||
end
|
||||
--活动暂时关闭,开启时删掉就好了==========================================================================================================================
|
||||
self.operateTabs[1]:SetActive(false)
|
||||
self.operateTabs[9]:SetActive(false)
|
||||
self.operateTabs[3]:SetActive(false)
|
||||
self.operateTabs[10]:SetActive(false)
|
||||
self.operateTabs[11]:SetActive(false)
|
||||
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
|
||||
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
|
||||
--活动暂时关闭==========================================================================================================================
|
||||
end
|
||||
|
||||
function OperatingPanel:GetPriorityIndex()
|
||||
|
|
|
@ -6,6 +6,7 @@ local tarHero={}--当前筛选后显示英雄列表
|
|||
local selectHeroData={}--选择的英雄list did = data
|
||||
local oldChoosed=nil--上一个选中英雄
|
||||
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
local heroRankupConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
|
||||
|
||||
local costItemId = 0
|
||||
|
||||
|
@ -169,11 +170,17 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
|
||||
--等表配全后再启用
|
||||
for k,v in pairs(selectHeroData) do
|
||||
local pId
|
||||
local curHeroData =HeroManager.GetSingleHeroData(v.dynamicId)
|
||||
if not curHeroData then return end
|
||||
local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",curHeroData.breakId)
|
||||
if curHeroData.breakId == 0 then
|
||||
pId=0
|
||||
else
|
||||
pId= heroRankupConfig[curHeroData.breakId].Phase[2]
|
||||
end
|
||||
local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",pId)
|
||||
if not heroReturnConfig then
|
||||
LogRed("HeroId"..curHeroData.id.."Star"..curHeroData.breakId)
|
||||
LogRed("HeroId"..curHeroData.id.."Star"..pId)
|
||||
heroUseCount= 50
|
||||
heroUseItemId = 16
|
||||
else
|
||||
|
|
|
@ -243,8 +243,14 @@ function TreasureOfHeavenPanel:ShowTime()
|
|||
self.localTimer = nil
|
||||
end
|
||||
local t = TreasureOfHeavenManger.GetLimitTime()
|
||||
local time
|
||||
self.localTimer = Timer.New(function()
|
||||
this.time.text=TimeToDHMS(t-GetTimeStamp())
|
||||
time = t-GetTimeStamp()
|
||||
if t-GetTimeStamp() <= 0 then
|
||||
time = 0
|
||||
t = TreasureOfHeavenManger.GetLimitTime()
|
||||
end
|
||||
this.time.text=TimeToDHMS(time)
|
||||
end,1,-1,true)
|
||||
self.localTimer:Start()
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue