From 458ab29053148bf349c363e943941dc1a30b0703 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 28 May 2021 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B8=85=E9=99=A4Log=E3=80=91?= =?UTF-8?q?=E6=B8=85=E6=A5=9A=E9=83=A8=E5=88=86Log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/ArenaTopMatch/ArenaTopMatchManager.lua | 2 +- .../~Lua/Modules/Expert/PatFaceManager.lua | 10 +++++----- .../~Lua/Modules/FightLevel/FightLevelManager.lua | 6 +++--- .../Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua | 5 +++-- .../~Lua/Modules/Guild/MyGuildManager.lua | 4 ++-- .../Guild/RedPacketView/GuildRedPacketManager.lua | 6 +++--- .../ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Mail/MailManager.lua | 2 +- .../~Lua/Modules/Map/EndLessMapManager.lua | 2 +- .../Modules/Mission/QinglongSerectTreasureManager.lua | 2 +- .../~Lua/Modules/Net/IndicationManager.lua | 4 ++-- .../ManagedResources/~Lua/Modules/Net/NetManager.lua | 4 ++-- .../~Lua/Modules/Operating/OperatingManager.lua | 6 +++--- .../~Lua/Modules/Player/AutoRecoverManager.lua | 2 +- .../~Lua/Modules/Player/RedPointData.lua | 2 +- .../~Lua/Modules/Recruit/RecruitManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Shop/ShopManager.lua | 2 +- 17 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index c8f652d5b2..949e1e0c05 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -96,7 +96,7 @@ function this.RequestTopMatchBaseInfo(func) this.RefreshBaseInfo() -- 发送更新事件 Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate) - Log(string.format("巅峰战基础信息 state = %s, progress = %s, endTime = %s, myrank = %s", msg.joinState, msg.progress, msg.endTime, msg.myrank)) + -- Log(string.format("巅峰战基础信息 state = %s, progress = %s, endTime = %s, myrank = %s", msg.joinState, msg.progress, msg.endTime, msg.myrank)) if func then func() end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 293f5f26e6..071d2997f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -164,11 +164,11 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) elseif v.Type == 6 then--巅峰战 local curState = ArenaTopMatchManager.GetBaseData().battleState local battleStage = ArenaTopMatchManager.GetBaseData().battleStage - if battleStage and curState then - Log(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values) - else - Log(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values) - end + -- if battleStage and curState then + -- Log(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values) + -- else + -- Log(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values) + -- end -- if v.OpenRules[2] == curState and type == 2 and battleStage >= v.Values then --and type == 2 if (curState and curState >= v.OpenRules[2] and curState <= v.CloseRules[2]) and (battleStage and battleStage >= v.Values) then--v.Values 2 > 1 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 07da351058..19e0b25c59 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -54,7 +54,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup) if msg then for i = 1, #msg.chapter do local singleHardStageChapter = allChapterData[msg.chapter[i].chapterId] - LogYellow("msg.chapter[i].chapterId "..msg.chapter[i].chapterId.." "..msg.chapter[i].stars.." node num "..#msg.chapter[i].node.." reward num "..#msg.chapter[i].reward.." singleHardStageChapter.stars "..singleHardStageChapter.stars) + Log("msg.chapter[i].chapterId "..msg.chapter[i].chapterId.." "..msg.chapter[i].stars.." node num "..#msg.chapter[i].node.." reward num "..#msg.chapter[i].reward.." singleHardStageChapter.stars "..singleHardStageChapter.stars) singleHardStageChapter.chapterId = msg.chapter[i].chapterId if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then this.SetisShowChapterOpenPopup(true) @@ -110,7 +110,7 @@ function this.GetCurChapterId() return curChapterId end function this.SetisShowChapterOpenPopup(_isShowChapterOpenPopup) - LogYellow("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup)) + Log("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup)) isShowChapterOpenPopup = _isShowChapterOpenPopup end function this.GetisShowChapterOpenPopup() @@ -155,7 +155,7 @@ function this.FightLevelFightBattle(_fightLevelData, callBack) curFormationTypeDef = FormationTypeDef.FIGHT_ASSISTANTLEVEL end NetManager.HardStageFightRequest(_fightLevelData.nodeId, curFormationTypeDef,function (msg)--FIGHT_LEVEL - LogYellow("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) + Log("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) HardStageFightResponseMsg = msg curBattlefightLevelData = _fightLevelData if _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua index c893e2c026..6a432edd97 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua @@ -13,6 +13,7 @@ function this.InitRewardData() local actSingleData = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Id",ActData.activityId) Data.activityId = ActData.activityId Data.ActState = ActData.value + -- LogError("fuxinggaozhao:"..tostring(ActData.value)) Data.startTime = ActData.startTime Data.rewards = {} -- LogYellow("表数据数量:"..tostring(#configData)) @@ -66,12 +67,12 @@ function this.CheckRedPoint() elseif Data.ActState == 1 then for i = 1, #Data.rewards do if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then - LogBlue("Return true") + -- LogBlue("Return true") return true end end end - LogBlue("Return false") + -- LogBlue("Return false") return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index 1134845932..4dd83b4951 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -216,7 +216,7 @@ function MyGuildManager.SetMyGuidRedPackage(data) if data then for key, value in pairs(data) do if value.id and value.num then - LogError(" 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 @@ -720,7 +720,7 @@ function MyGuildManager.SetAllGuildHelpInfo(msg) hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量 end end - LogRed(" 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua index 960f7c63c5..44e05e00b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua @@ -18,15 +18,15 @@ function this.CheckGuildRedPacketRedPoint() -- end local list=MyGuildManager.GetMyGuidRedPackage() if list then - LogRed("检测发红包红点") + -- LogRed("检测发红包红点") for key, value in pairs(list) do if value and value.num and value.num>0 then - LogError("444444444444") + -- LogError("444444444444") return true end end end - LogError("5555555555") + -- LogError("5555555555") return false end function this.CheckIsCanGetPackage() diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 333119f265..74ab3eed48 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -95,7 +95,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) heroData.star = _msgHeroData.star heroData.lv = _msgHeroData.level heroData.breakId = _msgHeroData.breakId - LogGreen("heroData.id:"..heroData.id.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId) + -- LogGreen("heroData.id:"..heroData.id.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId) heroData.upStarId = _msgHeroData.starBreakId heroData.skinId = _msgHeroData.skinId heroData.createTime = _msgHeroData.createTimelocal diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua index 5f46a9f45a..fef013e0d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailManager.lua @@ -85,7 +85,7 @@ function this.GetStringByStringformat(inputStr) tostring(msgStr[5]), tostring(msgStr[6]) ) - LogPink("returnStr:"..returnStr) + -- LogPink("returnStr:"..returnStr) return returnStr end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 797a4ee793..7892cb7956 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -278,7 +278,7 @@ function this.InitSingleEndlessHero(_msgHeroData) heroData.lv = _msgHeroData.level heroData.breakId = _msgHeroData.breakId heroData.upStarId = _msgHeroData.starBreakId - LogGreen("_msgHeroData.heroId:".._msgHeroData.heroId.." heroData.dynamicId:"..heroData.dynamicId.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId) + --LogGreen("_msgHeroData.heroId:".._msgHeroData.heroId.." heroData.dynamicId:"..heroData.dynamicId.." _msgHeroData.starBreakId:".._msgHeroData.starBreakId) heroData.createTime = _msgHeroData.createTimelocal heroData.lockState = _msgHeroData.lockState heroData.createtype = _msgHeroData.createtype diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index b9f0180d4d..9e6425cf41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -104,7 +104,7 @@ function this.UpdateTreasureState2() end function this.UpdateTrailWeekTime(msg) - LogRed("msg.weekTime:"..msg.weekTime) + -- LogRed("msg.weekTime:"..msg.weekTime) this.traiWeekTime = msg.weekTime end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 462b0a8911..ff3483eb78 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -390,7 +390,7 @@ function this.RefreshGiftGoods(buffer) msg:ParseFromString(data) OperatingManager.SetBasicValues(msg.GiftGoodsInfo) Game.GlobalEvent:DispatchEvent(GameEvent.GrowGift.RechargeGift) - LogYellow("发送了GameEvent.GrowGift.RechargeGift") + -- LogYellow("发送了GameEvent.GrowGift.RechargeGift") end -- 接收服务器好友申请,添加 @@ -743,7 +743,7 @@ function this.RefreshMapData(buffer) local data = buffer:DataByte() local msg = MapInfoProto_pb.EndlessMapChange() msg:ParseFromString(data) - LogGreen("推送的世界ID " .. msg.mapId) + Log("推送的世界ID " .. msg.mapId) EndLessMapManager.openMapId = msg.mapId NetManager.RefreshEnergyRequest({1},function() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index fa86485f23..6811d04198 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -2516,7 +2516,7 @@ end -- 发送福利红包 function this.RequestWelfareRedPacket(_id,func) local data = PlayerInfoProto_pb.WelfareRedPacketSendRequest() - LogError("redpacket id==".._id) + -- LogError("redpacket id==".._id) data.id=_id local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_RESPONSE, msg, function(buffer) @@ -2537,7 +2537,7 @@ function this.RequestWelfareRedPacket(func) Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, msg, function(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.WelfareRedPacketPush() - LogError("********************") + -- Log("********************") msg:ParseFromString(data) if msg.redpacket then MyGuildManager.SetMyGuidRedPackage(msg.redpacket) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 71ff5fe757..03f729ab58 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -39,9 +39,9 @@ function this.SetBasicValues(giftGoodsList) for _, giftGoodsInfo in ipairs(giftGoodsList) do if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) - LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" - ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" - ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) + -- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" + -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" + -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then else if giftGoodsInfoList[rechargeConfigLocal.Type] then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index ef0b99bcf5..77d79a99f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -113,7 +113,7 @@ function this.Initialize() BagManager.bagDatas[itemId].num = BagManager.bagDatas[itemId].num + deltaNum BagManager.bagDatas[itemId].nextFlushTime = BagManager.bagDatas[itemId].nextFlushTime + deltaTime - LogPink("自动恢复物品数量刷新:"..itemId.."|"..BagManager.bagDatas[itemId].num.."|"..BagManager.bagDatas[itemId].nextFlushTime) + Log("自动恢复物品数量刷新:"..itemId.."|"..BagManager.bagDatas[itemId].num.."|"..BagManager.bagDatas[itemId].nextFlushTime) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua index a5d6fedf18..284f97f238 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedPointData.lua @@ -59,7 +59,7 @@ function RedPointData:SetParent(child, parent) end -- 一个子节点只能有一个父节点 if _parentIndex[child] then - LogError("红点id == " .. child.. ",重复设置了父级,请检查") + -- LogError("红点id == " .. child.. ",重复设置了父级,请检查") return end -- 设置子节点对应的父节点 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 8c28f6aa21..989f8d98e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -203,7 +203,7 @@ function this.InitPreData() end) --元素 - LogPink("#this.previewElementData:"..#this.previewElementData) + -- Log("#this.previewElementData:"..#this.previewElementData) table.sort(this.previewElementData, function(a, b) if (itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity) then if (a.Quality == b.Quality) then diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index e69f80c26c..ef394e1841 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -43,7 +43,7 @@ end --- 重新获取商店数据 function this.RequestAllShopData(func) - LogRed("商店") + Log("重新获取商店数据") NetManager.RequestMainShopData(func) end