diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index 24a5da1546..e18405c490 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -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 --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua index 6f0fde5e3f..31c0deaf43 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua index 4a7d17de36..0264fa8db5 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index ecb0f2c128..91773a8197 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 1fa813ad4f..375a698e94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -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