From b5a29c9152310dc12b35067bf86ca991317bde60 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 21 Mar 2022 18:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 7 ++++--- .../~Lua/Modules/Formation/FormationPanelV2.lua | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5a4b7a5d9e..edfbe2186b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -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,6 +2077,7 @@ PLAYER_INFO_VIEW_TYPE = { TOP_MATCH = 9,--巅峰赛编队 QIJIESHILIAN = 10,--七界试炼编队 LINGMAIMIJING = 11,--灵脉秘境编队 + ExploreFight = 12,--探索挑战编队 } --限时达人 周卡 限时活动 拍脸 异妖直购 @@ -2772,7 +2773,7 @@ BATTLE_TYPE = { LINGMAIMIJING = 25, -- 灵脉秘境 XUAN_YUAN_MIRROR = 26, -- 轩辕宝镜 TRIAL_FIGHT = 27, -- 森罗幻境 - + ExploreEvent = 28, -- 探索事件 } --isRankingMainPanelShow:_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人) --本服排行 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 68a188fe16..69b3c33dab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -71,6 +71,7 @@ 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()