心魔修改提交

dev_chengFeng
jiaoyangna 2021-09-03 18:56:46 +08:00
parent 17f6cb8ff1
commit 5af2fc261d
3 changed files with 3 additions and 2 deletions

View File

@ -2427,6 +2427,7 @@ EXPEDITON_POPUP_TYPE={
Trail=4,--试炼 Trail=4,--试炼
Greed = 5,--贪婪 Greed = 5,--贪婪
Monster = 6,--心魔试炼 Monster = 6,--心魔试炼
Monster = 8,--心魔试炼
FourElementMonster = 7,-- 四灵试炼 FourElementMonster = 7,-- 四灵试炼
} }

View File

@ -14,7 +14,7 @@ local contentScripts = {
--贪婪 --贪婪
[5]= {view=require("Modules/Expedition/View/ExpeditionMonsterInfo_Greed"),panelName="ExpeditionMonsterInfo_Greed",type=EXPEDITON_POPUP_TYPE.Greed}, [5]= {view=require("Modules/Expedition/View/ExpeditionMonsterInfo_Greed"),panelName="ExpeditionMonsterInfo_Greed",type=EXPEDITON_POPUP_TYPE.Greed},
[6]= {view=require("Modules/Expedition/View/MonsterCampFormationInfo"),panelName="MonsterCampFormationInfo",type = EXPEDITON_POPUP_TYPE.Monster}, [6]= {view=require("Modules/Expedition/View/MonsterCampFormationInfo"),panelName="MonsterCampFormationInfo",type = EXPEDITON_POPUP_TYPE.MonsterXinMo},
-- 四灵试炼 boss -- 四灵试炼 boss
[7]= {view=require("Modules/Expedition/View/MonsterFormationInfo"),panelName="MonsterFormationInfo",type = EXPEDITON_POPUP_TYPE.FourElementMonster}, [7]= {view=require("Modules/Expedition/View/MonsterFormationInfo"),panelName="MonsterFormationInfo",type = EXPEDITON_POPUP_TYPE.FourElementMonster},
} }

View File

@ -69,7 +69,7 @@ function MonsterCampSingleWave:OnOpen(_sortingOrder)
Util.SetParticleSortLayer(self.effect.gameObject, _sortingOrder + 1) Util.SetParticleSortLayer(self.effect.gameObject, _sortingOrder + 1)
Util.AddOnceClick(self.btn, function() Util.AddOnceClick(self.btn, function()
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.Monster,self.data.Id) UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.MonsterXinMo,self.data.Id)
end) end)
Util.AddOnceClick(self.fight, function() Util.AddOnceClick(self.fight, function()
LogGreen(self.data.Id) LogGreen(self.data.Id)