From 2a552d07304a64227bd130380df6149b52dce341 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 29 May 2021 15:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B8=8F=E7=A2=8E=E5=87=8C=E9=9C=84?= =?UTF-8?q?=E3=80=91=E5=BC=95=E5=AF=BC=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationManager.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua | 6 ++++++ Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Recruit/TenRecruitPanel.lua | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 08537d8edb..119a4340c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -11,7 +11,7 @@ end function this.MakeAEmptyTeam(teamId) local oTeam = {} - Log("TeamId" .. teamId) + -- Log("TeamId" .. teamId) oTeam.teamId = teamId if teamId < FormationTypeDef.FORMATION_ARENA_DEFEND then oTeam.teamName = Language[10676]--Language[10677] .. tostring(teamId) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index e87ceefa5e..60c7cba039 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -71,6 +71,12 @@ function this.OnFunctionOpen(funcId) end --LogGreen(tostring(AppConst.isGuide)) local guideId = GlobalSystemConfig[funcId].GuideId + if GuideConfig[guideId].IsOpen > 0 then + if not ActivityGiftManager.IsActivityTypeOpen(ActivityGiftManager.GetActivityTypeFromId(GuideConfig[guideId].IsOpen)) then + Log("活动:"..tostring(GuideConfig[guideId].IsOpen).."未开启,引导Id:"..guideId.."未执行!") + return + end + end if guideId and guideId ~= 0 and not funcDic[guideId] then table.insert(_FuncGuideList, guideId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 74ab3eed48..36731fd6d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -72,7 +72,7 @@ function this.InitHeroData(_msgHeroList) this.heroResolveLicence[tonumber(hero_resolve_licence[i])] = tonumber(hero_resolve_licence[i]) end this.UpdateHeroLvEnd() - Log("服务端推送英雄数量:" .. #_msgHeroList) + -- Log("服务端推送英雄数量:" .. #_msgHeroList) for i = 1, #_msgHeroList do this.UpdateHeroDatas(_msgHeroList[i], true) end @@ -2599,7 +2599,7 @@ function this.GetHeroReturnItems2(ShowItemlist, allRewardData) local curReward = {} curReward.id = ShowItemlist[i][1] curReward.num = ShowItemlist[i][2] - LogBlue("curReward.id:"..curReward.id.." curReward.num"..curReward.num) + -- LogBlue("curReward.id:"..curReward.id.." curReward.num"..curReward.num) curReward.itemConfig = itemConfig[curReward.id] if allRewardData[curReward.id] == nil then allRewardData[curReward.id] = curReward diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 0b7c5f9640..bd09258b98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -630,7 +630,7 @@ end -----------++++++++++++++++++++++++++++++++++++++++ socket +++++++++++++++++++++++++++++ -- 请求连接socket function this.RequestSocketLogin() - LogRed("请求连接Socket") + Log("请求连接Socket") RequestPanel.Show(Language[11143]) SocketManager.Disconnect(SocketType.LOGIN) SocketManager.AddNetwork(SocketType.LOGIN, LoginManager.SocketAddress, LoginManager.SocketPort) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 880d923824..ae10c24bd9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -115,7 +115,7 @@ function this.PlayerInfoRequest(func) PlayerManager.userCreateTime = msg.userCreateTime PatFaceManager.SetisFirstLogVal(msg.isDayFirst) SoulPrintManager.soulEquipPool = msg.SoulEquipPool - LogBlue("msg.player.designation "..msg.player.designation.." msg.player.decrotion "..msg.player.decrotion.." msg.player.ride "..msg.player.ride) + Log("msg.player.designation "..msg.player.designation.." msg.player.decrotion "..msg.player.decrotion.." msg.player.ride "..msg.player.ride) PlayerManager.designation = msg.player.designation--称号 PlayerManager.skin = msg.player.decrotion--皮肤 PlayerManager.ride = msg.player.ride--坐骑 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua index b4fe7ad617..b84d157b81 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua @@ -105,7 +105,7 @@ function TenRecruitPanel:OnOpen(...) for i = 1, #_roleDatas do cardList[i]:OnOpen(_roleDatas[i].id,false,false,-1,self.sortingOrder) local heorConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,_roleDatas[i].heroId) - LogBlue("heorConfig.Star:"..heorConfig.Star) + -- LogBlue("heorConfig.Star:"..heorConfig.Star) if heorConfig and heorConfig.Star >= 5 then HeroManager.DetectionOpenFiveStarActivity(heorConfig.Star) end