diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 2680d5045e..165541ec73 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1335,7 +1335,7 @@ function this.CheckRedpointUpperMonthCard(red) if not actInfo then return false end - LogGreen("actInfo.value:"..actInfo.value) + --LogGreen("actInfo.value:"..actInfo.value) if actInfo.value ~= 2 then return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 489f56db64..285862d9a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -92,7 +92,7 @@ function this.InitExpeditionData(msg) --Log("#msg.equipIds "..#msg.equipIds) for i = 1, #msg.equipIds do local singleHalidomInfo = {} - LogPink("singleHalidomInfo.id ".. msg.equipIds[i].id.." "..msg.equipIds[i].equiptId) + --LogPink("singleHalidomInfo.id ".. msg.equipIds[i].id.." "..msg.equipIds[i].equiptId) singleHalidomInfo.id = msg.equipIds[i].id--动态id singleHalidomInfo.equiptId = msg.equipIds[i].equiptId this.allHoly[singleHalidomInfo.id] =singleHalidomInfo diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index a8739f9520..c7da17dde4 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -55,7 +55,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup) if msg then for i = 1, #msg.chapter do local singleHardStageChapter = allChapterData[msg.chapter[i].chapterId] - Log("chapterId:"..msg.chapter[i].chapterId)--.." stars"..msg.chapter[i].stars.." node"..#msg.chapter[i].node.."reward:"..#msg.chapter[i].reward.." needStars:"..singleHardStageChapter.stars) + ----Log("chapterId:"..msg.chapter[i].chapterId)--.." stars"..msg.chapter[i].stars.." node"..#msg.chapter[i].node.."reward:"..#msg.chapter[i].reward.." needStars:"..singleHardStageChapter.stars) singleHardStageChapter.chapterId = msg.chapter[i].chapterId if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then this.SetisShowChapterOpenPopup(true) @@ -114,7 +114,7 @@ function this.GetCurChapterId() return curChapterId end function this.SetisShowChapterOpenPopup(_isShowChapterOpenPopup) - Log("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup)) + ----Log("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup)) isShowChapterOpenPopup = _isShowChapterOpenPopup end function this.GetisShowChapterOpenPopup() @@ -161,7 +161,7 @@ function this.FightLevelFightBattle(_fightLevelData, callBack) curFormationTypeDef = FormationTypeDef.FIGHT_ASSISTANTLEVEL end NetManager.HardStageFightRequest(_fightLevelData.nodeId, curFormationTypeDef,function (msg)--FIGHT_LEVEL - -- Log("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) + -- ----Log("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) HardStageFightResponseMsg = msg curBattlefightLevelData = _fightLevelData -- local result = msg.stars > 0 and 1 or 0 @@ -354,7 +354,7 @@ end local _DailyRewardData = {} function this.SetDailyRewardData(msg) - Log("山河每日奖励:"..tostring(msg.isTake)) + ----Log("山河每日奖励:"..tostring(msg.isTake)) _DailyRewardData = {} _DailyRewardData.state = msg.isTake and 1 or 0 -- 0 未领取 1 已领取 -- 刷新红点状态 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 4d21d86995..2f3c94bb89 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -91,7 +91,7 @@ function this.OnFriendDataRefresh(type, msg) friendData.userTitle=msg.Friends.userTitle --friendData.isHaveApplication=1 this.friendAllData[friendData.id] = friendData - Log("好友列表" .. friendData.id) + --Log("好友列表" .. friendData.id) end if (type == 3) then local friendData = this.CreateFriendData() @@ -136,7 +136,7 @@ function this.GetFriendInfoRequest(type, msg) friendData.userTitle=msg.Friends[i].userTitle --friendData.isHaveApplication=1 this.friendAllData[friendData.id] = friendData - Log("好友列表" .. friendData.id) + --Log("好友列表" .. friendData.id) end Game.GlobalEvent:DispatchEvent(GameEvent.Friend.OnFriendList, this.friendAllData) elseif (type == 3) then @@ -358,7 +358,7 @@ function this.FriendRewardRedPointShow() for i, v in pairs(this.friendAllData) do if v.haveReward == 1 and this.MaxEnergyGet >= 1 then isShow = true - Log("哈哈哈哈哈哈哈哈哈哈哈22") + --Log("哈哈哈哈哈哈哈哈哈哈哈22") break end end @@ -369,7 +369,7 @@ function this.FriendApplicationRedPointShow() local isShow = false if (table.nums(this.friendApplicationData) > 0) then isShow = true - Log("哈哈哈哈哈哈哈哈哈哈哈") + --Log("哈哈哈哈哈哈哈哈哈哈哈") end return isShow end @@ -570,7 +570,7 @@ function this.InitUpdateEquipData(_equipData, heroData) if itemConfig[equipdata.id] then equipdata.icon = GetResourcePath(itemConfig[equipdata.id].ResourceID) else - Log("装备表找不到此id " .. equipdata.id) + --Log("装备表找不到此id " .. equipdata.id) return end equipdata.frame = GetQuantityImageByquality(equipdata.equipConfig.Quality)--ItemQuality[equipdata.equipConfig.Quality].icon @@ -650,7 +650,7 @@ function this.InitSingleTreasureData(_singleData,heroData) single.icon=GetResourcePath(itemConfig[staticId].ResourceID) single.strongConfig=this.GetCurrTreasureLvConfig(1,currJewel.LevelupPool,_singleData.exp) single.refineConfig=this.GetCurrTreasureLvConfig(2,currJewel.RankupPool,_singleData.rebuildLevel) - LogGreen("single.treePool:"..single.fourTotal.." _singleData.fourSpirit:".._singleData.fourSpirit) + --LogGreen("single.treePool:"..single.fourTotal.." _singleData.fourSpirit:".._singleData.fourSpirit) --LogGreen("天宫推送宝器 _singleData.id ".._singleData.id) allTreasures[_singleData.id]=single end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index a2ebd4e995..f97e4e17da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -47,7 +47,7 @@ function MyGuildManager.SetMyGuildInfo(msg) -- 公会信息 this.MyGuildInfo = msg.familyBaseInfo this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作 - Log("我的公会ID:"..this.MyGuildInfo.id) + --Log("我的公会ID:"..this.MyGuildInfo.id) if this.MyGuildInfo.id then PlayerManager.familyId = this.MyGuildInfo.id end @@ -91,12 +91,12 @@ end -- 设置公会中玩家得行走数据 function MyGuildManager.SetWalkData(msg) this._MemWalkData = {} - --Log("==============公会行走数据初始化") + ----Log("==============公会行走数据初始化") for i, data in ipairs(msg.familyWalkIndicaiton) do - --Log("uid = "..data.uid..", name = "..data.name..", 当前位置 = "..data.curPos) + ----Log("uid = "..data.uid..", name = "..data.name..", 当前位置 = "..data.curPos) this._MemWalkData[data.uid] = data end - --Log("==============公会行走数据初始化") + ----Log("==============公会行走数据初始化") end -- 更新行走数据 function MyGuildManager.UpdateWalkData(msg) @@ -104,8 +104,8 @@ function MyGuildManager.UpdateWalkData(msg) this._MemWalkData = {} end this._MemWalkData[msg.uid] = msg - --Log("#NAME?") - Log("uid = "..msg.uid..", name = "..msg.name..", 当前位置 = "..msg.curPos) + ----Log("#NAME?") + --Log("uid = "..msg.uid..", name = "..msg.name..", 当前位置 = "..msg.curPos) Game.GlobalEvent:DispatchEvent(GameEvent.Guild.WalkUpdate, msg) end -- 获取所有行走数据 @@ -219,7 +219,7 @@ function MyGuildManager.SetMyGuidRedPackage(data) if data then for key, value in pairs(data) do if value.id and value.num then - -- Log(" package id =="..value.id.." num=="..value.num) + -- --Log(" package id =="..value.id.." num=="..value.num) local aaa={} aaa.num=value.num list[value.id]=aaa @@ -730,7 +730,7 @@ function MyGuildManager.SetAllGuildHelpInfo(msg) local singleHelpInfo = {} singleHelpInfo.uid = msg.guildHelpInfoIndication[i].uid singleHelpInfo.name = PracticeManager.SetNameColor(msg.guildHelpInfoIndication[i].name,msg.guildHelpInfoIndication[i].practiceLevel) - Log("singleHelpInfo.name:"..tostring(singleHelpInfo.name)) + --Log("singleHelpInfo.name:"..tostring(singleHelpInfo.name)) singleHelpInfo.guildHelpInfo = {} for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do if msg.guildHelpInfoIndication[i].guildHelpInfo[j].num ~= -1 then @@ -739,7 +739,7 @@ function MyGuildManager.SetAllGuildHelpInfo(msg) hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量 end end - Log(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid) + --Log(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid) this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo end end @@ -908,7 +908,7 @@ function MyGuildManager.GetMyAidOtherGuildHelpRedPoint() end --LogGreen("aidMaxNum "..aidMaxNum .." ".. value.guildHelpInfo[j].num .." "..value.uid .." ".. PlayerManager.uid) if aidMaxNum > value.guildHelpInfo[j].num then - Log("公会军团援助红点返回true") + --Log("公会军团援助红点返回true") return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index d69d26120a..b6c4043c7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -744,7 +744,7 @@ function this.GetCultivationPros() allPros[data1[i][1]] = 0 else allPros[data1[i][1]] = data1[i][2] + data2[i][2]*this.CultivationLevel - LogRed("Id:"..tostring(data1[i][1]).." value:"..tostring(allPros[data1[i][1]])) + --LogRed("Id:"..tostring(data1[i][1]).." value:"..tostring(allPros[data1[i][1]])) end end return allPros diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index a2ea62393e..91da548fe2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -41,9 +41,9 @@ end --请求排行榜下面数据 function this.RequestNextWarPowerPageData(fun) - if cur_isMax then - --LogGreen(Language[12215]) - return + if cur_isMax then + --LogGreen(Language[12215]) + return end -- Log("cur_rankIndex "..cur_rankIndex) local isCross = 0 @@ -72,7 +72,7 @@ function this.ReceiveRankingData(msg,fun) --滚动数据 local length=#this.curRankingData for i, rank in ipairs(msg.ranks) do - --LogGreen("UserRank "..rank.rankInfo.rank.." userName "..rank.userName.." rank.rankInfo.param1 "..rank.rankInfo.param1.." practiceLevel:"..rank.practiceLevel) + -- LogGreen("UserRank:"..rank.rankInfo.rank.." userName:"..rank.userName.." userGuide:"..rank.guildName.." rank.rankInfo.param1:"..rank.rankInfo.param1.." rank.rankInfo.param2:"..rank.rankInfo.param2.." practiceLevel:"..rank.practiceLevel) rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel) --rank.crossScore=100 this.curRankingData[length+i]=rank @@ -161,7 +161,7 @@ function this.RefreshRedPoint1() if proud then --i 是编队类型 for i, v in pairs(proud) do - if v == 0 and allFirstRankProud[i].uid > 0 and + if v == 0 and allFirstRankProud[i].uid > 0 and (i == RANK_TYPE.FIGHT_LEVEL_RANK or i == RANK_TYPE.FORCE_CURR_RANK or i == RANK_TYPE.GUILD_FORCE_RANK or i == RANK_TYPE.MONSTER_RANK) then--没有膜拜过 --i <= 4 前四个本服 return true end @@ -184,7 +184,7 @@ function this.RefreshRedPoint2() if proud and PlayerManager.isCross == 1 then --i 是编队类型 for i, v in pairs(proud) do - if v == 0 and allFirstRankProud[i].uid > 0 and + if v == 0 and allFirstRankProud[i].uid > 0 and (i == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or i == RANK_TYPE.JUMPSERVER_MONSTER_RANK or i == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or i == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK) then--没有膜拜过--i > 4 后四个跨服 return true end