diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index 60ba3fd0c1..77c1e12b88 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -53,7 +53,7 @@ function EnvoyItem:OnOpen() if self.data.time - GetTimeStamp() > 0 then local content = "" - local money = math.ceil(self.data.time - GetTimeStamp()) / 432 + local money = math.ceil((self.data.time - GetTimeStamp()) / 432) content =string.format("是否花费%d妖晶直接恢复",money) MsgPanel.ShowTwo(content,function () diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index fb9b5b3a03..9b3b9e6361 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -58,10 +58,12 @@ end function this.UpdateHongMengDataGuards(hongmengGuards) this.hongmengGuards = hongmengGuards + LogGreen("hongmengGuards "..#this.hongmengGuards) for i = 1, #this.hongmengGuards do if this.hongmengGuards[i].time ~= 0 then -- body this.hongmengGuards[i].time = this.hongmengGuards[i].time + GetTimeStamp() + print(this.hongmengGuards[i].value) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index b8c3b087dd..e276be7e90 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -21,6 +21,7 @@ function this:AwakeLength() HeroCount = 0 Box = #HarmonyManager.hongmengHeroInfos; OpenBox = #HarmonyManager.hongmengHeroInfos+2 + print(Box.."@@@@@@@@@"..OpenBox) for i = 1, #HarmonyManager.hongmengHeroInfos do -- body if HarmonyManager.hongmengHeroInfos[i].heroId~="" then @@ -208,7 +209,10 @@ function this.SingleBoxDataShow(go,boxData,index) if HarmonyManager.RefreshOpenBoxPoint() then -- body CheckRedPointStatus(RedPointType.HongMeng_OpenBox) - redPoint:SetActive(true) + if Gold >= boxData.PropPrice[2] or DemonCrystal >= boxData.MoneyPrice[2] then + -- body + redPoint:SetActive(true) + end else end @@ -236,7 +240,8 @@ function this.SingleBoxDataShow(go,boxData,index) print(" 添加等级 ",HarmonyManager.GongMingBox) else local content = "" - local money = math.ceil(HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432 + print((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432) + local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432) content =string.format("是否花费%d妖晶直接恢复",money) MsgPanel.ShowTwo(content,function () @@ -296,17 +301,16 @@ function this:AddBoxFun(boxData) if Gold >= boxData.PropPrice[2] then content =string.format("是否花费%d玄黄之气解锁共鸣位置",boxData.PropPrice[2]) - elseif Gold < boxData.PropPrice[2] and DemonCrystal >= boxData.MoneyPrice[2] then - -- body + elseif Gold < boxData.PropPrice[2] then + -- body and DemonCrystal >= boxData.MoneyPrice[2] content=string.format("玄黄之气不足%d,是否直接花费%d妖晶解锁共鸣位置?",boxData.PropPrice[2],boxData.MoneyPrice[2]) - else - content = "妖晶不足!" + end MsgPanel.ShowTwo(content,function () end,function () if Gold < boxData.PropPrice[2] and DemonCrystal < boxData.MoneyPrice[2] then - + PopupTipPanel.ShowTip("妖晶不足!") return end --向服务器请求消息 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 99294ce9e2..3bffb32ff5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -271,7 +271,7 @@ function this.RefreshMissionList(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.MissionUpdateListIndication() msg:ParseFromString(data) - LogBlue("收到了服务器的刷新数据") + --LogBlue("收到了服务器的刷新数据") TaskManager.RefreshTypeTaskInfo(msg.userMissionInfo) Game.GlobalEvent:DispatchEvent(GameEvent.TreasureOfHeaven.TaskRefresh) end diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 0c688ef9e8..68fc6ecb75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -32,7 +32,7 @@ function this.InitTypeTaskList(_userMissionList) userMissionList.type = _userMissionList[i].type userMissionList.takeTimes = _userMissionList[i].takeTimes userMissionList.heroId = _userMissionList[i].heroId - -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) + --LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) if not TypeTaskData[_userMissionList[i].type] then TypeTaskData[_userMissionList[i].type] = {} end @@ -87,10 +87,13 @@ function this.GetCurShowAllAchievementData(type) for i = 1, #TypeTaskData[type] do local curTaskData = TypeTaskData[type][i] local curTaskConFigData = achievementConfig[curTaskData.missionId] + + -- LogGreen("curTaskData.missionId `````1 "..curTaskData.missionId) if ActTimeCtrlManager.SingleFuncState(curTaskConFigData.RefSysId) then + --LogGreen("curTaskData.missionId `````2 "..curTaskData.missionId.." curTaskData.state "..curTaskData.state) if curTaskConFigData.PreId == -1 or curShowAllOkAchievementData[curTaskConFigData.PreId] then if curTaskData.state ~= 2 then - --LogGreen("curTaskData.missionId "..curTaskData.missionId) + -- LogGreen("curTaskData.missionId "..curTaskData.missionId) curShowAllAchievementData[curTaskData.missionId] = curTaskData end end @@ -150,7 +153,7 @@ end --(后台推送刷新调用) function this.SetTypeTaskInfo(type, Id, state, progress, takeTimes,heroId) - -- LogError("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress) + --LogGreen("任务 "..type.." id:"..Id.." state:"..state.." progress "..progress) if not TypeTaskData[type] then TypeTaskData[type] = {} end