Merge branch 'china/dev' into china/test

dev_chengFeng
zhangshanxue 2022-03-22 14:06:02 +08:00
commit 7ae1f1f311
5 changed files with 19 additions and 13 deletions

View File

@ -87,7 +87,9 @@ function ExploreMainPanel:InitComponent()
self.helpBtn = Util.GetGameObject(self.gameObject, "btns/helpBtn")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.rankBtn = Util.GetGameObject(self.gameObject, "btns/rankBtn")
self.taskBtn = Util.GetGameObject(self.gameObject, "btns/taskBtn")
self.rankBtn:SetActive(false)
self.taskBtn = Util.GetGameObject(self.gameObject, "btns/taskBtn")
self.taskBtn:SetActive(false)
end
--绑定事件(用于子类重写)

View File

@ -131,7 +131,7 @@ function this.activityBtnTimeShow()
end
end
s()
this.activityBtnTime = Timer.New(s, 1)
this.activityBtnTime = Timer.New(s, 1,-1,false)
this.activityBtnTime:Start()
end

View File

@ -130,7 +130,7 @@ function FightLevelTrialPanel:SetNumbers()
time = time - 1
self.leftTime.text = string.format(Language[10512].."%s",TimeToFelaxible(time))
if time <= 0 then
self:ClosePanel()
self:OnClose()
end
end,1,-1,true)
self.timer:Start()

View File

@ -60,17 +60,21 @@ function this.InitAllRewardData()
end
end
function this.GetRewardDataById(id)
for k,v in ipairs(this.rewardData) do
if v.id == id then
return v
end
end
end
function this.UpdateStatus()
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian)
for k,v in pairs(this.rewardData) do
if temp[v.id] then
v.state = temp[v.id].state
v.progress = temp[v.id].progress
if ( v.state < 2 and temp[v.id].progress >= v.value[2][1]) then
v.state = 1
else
v.state = 0
end
for k,v in ipairs(temp) do
local data = this.GetRewardDataById(v.missionId)
if data then
data.state = v.state
data.progress = v.progress
end
end
CheckRedPointStatus(RedPointType.NiuQiChongTian_1)

View File

@ -33,7 +33,7 @@ function this.InitTypeTaskList(_userMissionList)
userMissionList.takeTimes = _userMissionList[i].takeTimes
userMissionList.heroId = _userMissionList[i].heroId
userMissionList.lock = _userMissionList[i].lock
LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
--LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
if not TypeTaskData[_userMissionList[i].type] then
TypeTaskData[_userMissionList[i].type] = {}
end