diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua index 050fa398f8..1c30378e98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightEndLvUpPanel.lua @@ -74,8 +74,8 @@ function FightEndLvUpPanel:OnOpen(...) oldLevel=data[1] curLevel=data[2] callBack = data[3] - --Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnLevelChange) - -- Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend,FacePanelType.UpgradePac) + Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnLevelChange) + Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend,FacePanelType.UpgradePac) this.ShowPanelData() SubmitExtraData({type = SDKSubMitType.TYPE_LEVEL_UP}) --TalentManager.SetLevelEffect() diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index c6529c1246..2d5cb9d501 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -834,6 +834,7 @@ function this.BattleLogic() end --刷新挂机奖励 --this.IntiReward() + this.UpdateOpenSeverWelfare() else PopupTipPanel.ShowTip("服务器战斗验证失败") end @@ -1811,7 +1812,7 @@ function this.UpdateOpenSeverWelfare() this.OpenSeverWelfareiconText.gameObject:SetActive(false) end LogError("FightPointPassManager.lastPassFightId=="..FightPointPassManager.lastPassFightId.." FightPointPassManager.curOpenFight=="..FightPointPassManager.curOpenFight) - local curPassLevelSortId =soldierStageConfig[FightPointPassManager.lastPassFightId].id --FightPointPassManager.lastPassFightId ~= FightPointPassManager.curOpenFight and soldierStageConfig[FightPointPassManager.lastPassFightId].id or 0 + local curPassLevelSortId = FightPointPassManager.soldierLayerId --FightPointPassManager.lastPassFightId ~= FightPointPassManager.curOpenFight and soldierStageConfig[FightPointPassManager.lastPassFightId].id or 0 LogError("curMissionConfig.Values[2][1]==============="..curMissionConfig.Values[2][1]) local getRewardLevelSortId = soldierStageConfig[curMissionConfig.Values[2][1]].id this.OpenSeverWelfareRed:SetActive(isShowRed) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 1cb807f2db..99ffe08009 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -273,6 +273,7 @@ end --判定是否在强制引导阶段 function this.IsInMainGuide() + LogError("openDic[GuideType.Force]============"..openDic[GuideType.Force]) return openDic[GuideType.Force] and openDic[GuideType.Force] ~= -1 end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 9af36316a3..79ea8ad7ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -7809,7 +7809,8 @@ function NetManager.RecruitSoldierRequest(_func) SmallSoldierManager.changeSolider=msg.soldier UIManager.OpenPanel(UIName.SmallSoldierInfoPanel,type,msg.soldier) if msg.drop then - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1) + --屏蔽小兵奖励 + --UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1) end if _func then _func()