Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
gaoxin 2020-08-27 18:35:51 +08:00
commit 51abf7d496
2 changed files with 5 additions and 1 deletions

View File

@ -749,7 +749,11 @@ function this.OnDeadCount(startTime, lastPos)
-- 角色死亡不出图, 立马设置遮罩,让你瞎几把点
-- this.deadRoot:SetActive(true)
local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)
and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)==1) and 1 or 0
if t==1 then
UIManager.OpenPanel(UIName.BattleFailPopup,nil,false,nil,12)
end
ctrlView.SetCtrlState(false)
-- 无尽副本中死亡扣行动力