【清除Log】清楚部分Log
parent
613434d1fd
commit
458ab29053
|
@ -96,7 +96,7 @@ function this.RequestTopMatchBaseInfo(func)
|
||||||
this.RefreshBaseInfo()
|
this.RefreshBaseInfo()
|
||||||
-- 发送更新事件
|
-- 发送更新事件
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate)
|
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
|
if func then func() end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -164,11 +164,11 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||||
elseif v.Type == 6 then--巅峰战
|
elseif v.Type == 6 then--巅峰战
|
||||||
local curState = ArenaTopMatchManager.GetBaseData().battleState
|
local curState = ArenaTopMatchManager.GetBaseData().battleState
|
||||||
local battleStage = ArenaTopMatchManager.GetBaseData().battleStage
|
local battleStage = ArenaTopMatchManager.GetBaseData().battleStage
|
||||||
if battleStage and curState then
|
-- if battleStage and curState then
|
||||||
Log(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values)
|
-- Log(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values)
|
||||||
else
|
-- else
|
||||||
Log(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values)
|
-- Log(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values)
|
||||||
end
|
-- end
|
||||||
-- if v.OpenRules[2] == curState and type == 2 and battleStage >= v.Values then
|
-- if v.OpenRules[2] == curState and type == 2 and battleStage >= v.Values then
|
||||||
--and type == 2
|
--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
|
if (curState and curState >= v.OpenRules[2] and curState <= v.CloseRules[2]) and (battleStage and battleStage >= v.Values) then--v.Values 2 > 1
|
||||||
|
|
|
@ -54,7 +54,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
|
||||||
if msg then
|
if msg then
|
||||||
for i = 1, #msg.chapter do
|
for i = 1, #msg.chapter do
|
||||||
local singleHardStageChapter = allChapterData[msg.chapter[i].chapterId]
|
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
|
singleHardStageChapter.chapterId = msg.chapter[i].chapterId
|
||||||
if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then
|
if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then
|
||||||
this.SetisShowChapterOpenPopup(true)
|
this.SetisShowChapterOpenPopup(true)
|
||||||
|
@ -110,7 +110,7 @@ function this.GetCurChapterId()
|
||||||
return curChapterId
|
return curChapterId
|
||||||
end
|
end
|
||||||
function this.SetisShowChapterOpenPopup(_isShowChapterOpenPopup)
|
function this.SetisShowChapterOpenPopup(_isShowChapterOpenPopup)
|
||||||
LogYellow("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup))
|
Log("山河社稷图 是否弹章节开启 "..tostring(_isShowChapterOpenPopup))
|
||||||
isShowChapterOpenPopup = _isShowChapterOpenPopup
|
isShowChapterOpenPopup = _isShowChapterOpenPopup
|
||||||
end
|
end
|
||||||
function this.GetisShowChapterOpenPopup()
|
function this.GetisShowChapterOpenPopup()
|
||||||
|
@ -155,7 +155,7 @@ function this.FightLevelFightBattle(_fightLevelData, callBack)
|
||||||
curFormationTypeDef = FormationTypeDef.FIGHT_ASSISTANTLEVEL
|
curFormationTypeDef = FormationTypeDef.FIGHT_ASSISTANTLEVEL
|
||||||
end
|
end
|
||||||
NetManager.HardStageFightRequest(_fightLevelData.nodeId, curFormationTypeDef,function (msg)--FIGHT_LEVEL
|
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
|
HardStageFightResponseMsg = msg
|
||||||
curBattlefightLevelData = _fightLevelData
|
curBattlefightLevelData = _fightLevelData
|
||||||
if _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
if _fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
||||||
|
|
|
@ -13,6 +13,7 @@ function this.InitRewardData()
|
||||||
local actSingleData = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Id",ActData.activityId)
|
local actSingleData = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Id",ActData.activityId)
|
||||||
Data.activityId = ActData.activityId
|
Data.activityId = ActData.activityId
|
||||||
Data.ActState = ActData.value
|
Data.ActState = ActData.value
|
||||||
|
-- LogError("fuxinggaozhao:"..tostring(ActData.value))
|
||||||
Data.startTime = ActData.startTime
|
Data.startTime = ActData.startTime
|
||||||
Data.rewards = {}
|
Data.rewards = {}
|
||||||
-- LogYellow("表数据数量:"..tostring(#configData))
|
-- LogYellow("表数据数量:"..tostring(#configData))
|
||||||
|
@ -66,12 +67,12 @@ function this.CheckRedPoint()
|
||||||
elseif Data.ActState == 1 then
|
elseif Data.ActState == 1 then
|
||||||
for i = 1, #Data.rewards do
|
for i = 1, #Data.rewards do
|
||||||
if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then
|
if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then
|
||||||
LogBlue("Return true")
|
-- LogBlue("Return true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogBlue("Return false")
|
-- LogBlue("Return false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -216,7 +216,7 @@ function MyGuildManager.SetMyGuidRedPackage(data)
|
||||||
if data then
|
if data then
|
||||||
for key, value in pairs(data) do
|
for key, value in pairs(data) do
|
||||||
if value.id and value.num then
|
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={}
|
local aaa={}
|
||||||
aaa.num=value.num
|
aaa.num=value.num
|
||||||
list[value.id]=aaa
|
list[value.id]=aaa
|
||||||
|
@ -720,7 +720,7 @@ function MyGuildManager.SetAllGuildHelpInfo(msg)
|
||||||
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||||
end
|
end
|
||||||
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
|
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -18,15 +18,15 @@ function this.CheckGuildRedPacketRedPoint()
|
||||||
-- end
|
-- end
|
||||||
local list=MyGuildManager.GetMyGuidRedPackage()
|
local list=MyGuildManager.GetMyGuidRedPackage()
|
||||||
if list then
|
if list then
|
||||||
LogRed("检测发红包红点")
|
-- LogRed("检测发红包红点")
|
||||||
for key, value in pairs(list) do
|
for key, value in pairs(list) do
|
||||||
if value and value.num and value.num>0 then
|
if value and value.num and value.num>0 then
|
||||||
LogError("444444444444")
|
-- LogError("444444444444")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogError("5555555555")
|
-- LogError("5555555555")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
function this.CheckIsCanGetPackage()
|
function this.CheckIsCanGetPackage()
|
||||||
|
|
|
@ -95,7 +95,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
||||||
heroData.star = _msgHeroData.star
|
heroData.star = _msgHeroData.star
|
||||||
heroData.lv = _msgHeroData.level
|
heroData.lv = _msgHeroData.level
|
||||||
heroData.breakId = _msgHeroData.breakId
|
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.upStarId = _msgHeroData.starBreakId
|
||||||
heroData.skinId = _msgHeroData.skinId
|
heroData.skinId = _msgHeroData.skinId
|
||||||
heroData.createTime = _msgHeroData.createTimelocal
|
heroData.createTime = _msgHeroData.createTimelocal
|
||||||
|
|
|
@ -85,7 +85,7 @@ function this.GetStringByStringformat(inputStr)
|
||||||
tostring(msgStr[5]),
|
tostring(msgStr[5]),
|
||||||
tostring(msgStr[6])
|
tostring(msgStr[6])
|
||||||
)
|
)
|
||||||
LogPink("returnStr:"..returnStr)
|
-- LogPink("returnStr:"..returnStr)
|
||||||
return returnStr
|
return returnStr
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -278,7 +278,7 @@ function this.InitSingleEndlessHero(_msgHeroData)
|
||||||
heroData.lv = _msgHeroData.level
|
heroData.lv = _msgHeroData.level
|
||||||
heroData.breakId = _msgHeroData.breakId
|
heroData.breakId = _msgHeroData.breakId
|
||||||
heroData.upStarId = _msgHeroData.starBreakId
|
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.createTime = _msgHeroData.createTimelocal
|
||||||
heroData.lockState = _msgHeroData.lockState
|
heroData.lockState = _msgHeroData.lockState
|
||||||
heroData.createtype = _msgHeroData.createtype
|
heroData.createtype = _msgHeroData.createtype
|
||||||
|
|
|
@ -104,7 +104,7 @@ function this.UpdateTreasureState2()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.UpdateTrailWeekTime(msg)
|
function this.UpdateTrailWeekTime(msg)
|
||||||
LogRed("msg.weekTime:"..msg.weekTime)
|
-- LogRed("msg.weekTime:"..msg.weekTime)
|
||||||
this.traiWeekTime = msg.weekTime
|
this.traiWeekTime = msg.weekTime
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -390,7 +390,7 @@ function this.RefreshGiftGoods(buffer)
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
OperatingManager.SetBasicValues(msg.GiftGoodsInfo)
|
OperatingManager.SetBasicValues(msg.GiftGoodsInfo)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.GrowGift.RechargeGift)
|
Game.GlobalEvent:DispatchEvent(GameEvent.GrowGift.RechargeGift)
|
||||||
LogYellow("发送了GameEvent.GrowGift.RechargeGift")
|
-- LogYellow("发送了GameEvent.GrowGift.RechargeGift")
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 接收服务器好友申请,添加
|
-- 接收服务器好友申请,添加
|
||||||
|
@ -743,7 +743,7 @@ function this.RefreshMapData(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = MapInfoProto_pb.EndlessMapChange()
|
local msg = MapInfoProto_pb.EndlessMapChange()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
LogGreen("推送的世界ID " .. msg.mapId)
|
Log("推送的世界ID " .. msg.mapId)
|
||||||
EndLessMapManager.openMapId = msg.mapId
|
EndLessMapManager.openMapId = msg.mapId
|
||||||
NetManager.RefreshEnergyRequest({1},function()
|
NetManager.RefreshEnergyRequest({1},function()
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -2516,7 +2516,7 @@ end
|
||||||
-- 发送福利红包
|
-- 发送福利红包
|
||||||
function this.RequestWelfareRedPacket(_id,func)
|
function this.RequestWelfareRedPacket(_id,func)
|
||||||
local data = PlayerInfoProto_pb.WelfareRedPacketSendRequest()
|
local data = PlayerInfoProto_pb.WelfareRedPacketSendRequest()
|
||||||
LogError("redpacket id==".._id)
|
-- LogError("redpacket id==".._id)
|
||||||
data.id=_id
|
data.id=_id
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_RESPONSE, msg, function(buffer)
|
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)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, msg, function(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
|
local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
|
||||||
LogError("********************")
|
-- Log("********************")
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if msg.redpacket then
|
if msg.redpacket then
|
||||||
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
|
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
|
||||||
|
|
|
@ -39,9 +39,9 @@ function this.SetBasicValues(giftGoodsList)
|
||||||
for _, giftGoodsInfo in ipairs(giftGoodsList) do
|
for _, giftGoodsInfo in ipairs(giftGoodsList) do
|
||||||
if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then
|
if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then
|
||||||
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
||||||
LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
-- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||||
..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||||
..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
-- ..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
|
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
||||||
else
|
else
|
||||||
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
||||||
|
|
|
@ -113,7 +113,7 @@ function this.Initialize()
|
||||||
BagManager.bagDatas[itemId].num = BagManager.bagDatas[itemId].num + deltaNum
|
BagManager.bagDatas[itemId].num = BagManager.bagDatas[itemId].num + deltaNum
|
||||||
BagManager.bagDatas[itemId].nextFlushTime = BagManager.bagDatas[itemId].nextFlushTime + deltaTime
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -59,7 +59,7 @@ function RedPointData:SetParent(child, parent)
|
||||||
end
|
end
|
||||||
-- 一个子节点只能有一个父节点
|
-- 一个子节点只能有一个父节点
|
||||||
if _parentIndex[child] then
|
if _parentIndex[child] then
|
||||||
LogError("红点id == " .. child.. ",重复设置了父级,请检查")
|
-- LogError("红点id == " .. child.. ",重复设置了父级,请检查")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- 设置子节点对应的父节点
|
-- 设置子节点对应的父节点
|
||||||
|
|
|
@ -203,7 +203,7 @@ function this.InitPreData()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--元素
|
--元素
|
||||||
LogPink("#this.previewElementData:"..#this.previewElementData)
|
-- Log("#this.previewElementData:"..#this.previewElementData)
|
||||||
table.sort(this.previewElementData, function(a, b)
|
table.sort(this.previewElementData, function(a, b)
|
||||||
if (itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity) then
|
if (itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity) then
|
||||||
if (a.Quality == b.Quality) then
|
if (a.Quality == b.Quality) then
|
||||||
|
|
|
@ -43,7 +43,7 @@ end
|
||||||
|
|
||||||
--- 重新获取商店数据
|
--- 重新获取商店数据
|
||||||
function this.RequestAllShopData(func)
|
function this.RequestAllShopData(func)
|
||||||
LogRed("商店")
|
Log("重新获取商店数据")
|
||||||
NetManager.RequestMainShopData(func)
|
NetManager.RequestMainShopData(func)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue