Revert "冲突提交"

This reverts commit b5a29c9152.
dev_chengFeng
jiaoyangna 2022-03-22 11:06:54 +08:00
parent 1ab08284a4
commit 5348a49256
2 changed files with 3 additions and 5 deletions

View File

@ -1334,7 +1334,7 @@ FORMATION_TYPE = {
QIJIESHILIAN=26,--七界试炼编队
LINGMAIMIJING=27,--灵脉秘境编队
ExploreFunc = 28,
ExploreEvent = 29,
}
--活动Type定义
@ -2045,7 +2045,7 @@ FormationTypeDef = {
Explore3 = 3103,
Explore4 = 3104,
Explore5 = 3105,
ExploreEvent = 3110,
FORMATION_TEMPORARY = 10000, --临时编队, 编队用
FORMATION_TEMPORARY_PROP = 10001, -- 临时编队, 属性计算用
}
@ -2077,7 +2077,6 @@ PLAYER_INFO_VIEW_TYPE = {
TOP_MATCH = 9,--巅峰赛编队
QIJIESHILIAN = 10,--七界试炼编队
LINGMAIMIJING = 11,--灵脉秘境编队
ExploreFight = 12,--探索挑战编队
}
--限时达人 周卡 限时活动 拍脸 异妖直购
@ -2774,7 +2773,7 @@ BATTLE_TYPE = {
LINGMAIMIJING = 25, -- 灵脉秘境
XUAN_YUAN_MIRROR = 26, -- 轩辕宝镜
TRIAL_FIGHT = 27, -- 森罗幻境
ExploreEvent = 28, -- 探索事件
}
--isRankingMainPanelShow_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人)
--本服排行

View File

@ -71,7 +71,6 @@ this.PanelOptionView = {
[FORMATION_TYPE.QIJIESHILIAN]="Modules/Formation/View/QiJieFormation",
[FORMATION_TYPE.LINGMAIMIJING]="Modules/Formation/View/LingMaiFormation",
[FORMATION_TYPE.ExploreFunc]="Modules/Formation/View/ExploreFormation",
[FORMATION_TYPE.ExploreEvent]="Modules/Formation/View/ExploreEventFormation",
}
function this:InitComponent()
this.spLoader = SpriteLoader.New()