From 6a053ea36f4a75fa64d0627324ee2f8b97827d66 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sat, 20 Jan 2024 20:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 6 +++--- .../~Lua/Modules/Formation/FormationManager.lua | 14 +++++++------- .../Modules/GeneralPanel/GeneralTreasurePanel.lua | 2 +- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5402703c97..8bcdd75e05 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3068,8 +3068,8 @@ rankKingList={ [1] = { bgImage = "UI_hz_ls_47", name = "星数排行" ,rankType [17] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = 0,RankingListMainSortId = 20}, --跨服(界面中) [18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21},--跨服排行版部分 - [32] = { bgImage = "", name = "七界试炼排行" ,rankType = RANK_TYPE.QIJIESHILIAN_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 - [33] = { bgImage = "", name = "灵脉秘境排行" ,rankType = RANK_TYPE.LINGMAIMIJING_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 + [32] = { bgImage = "", name = "推进城排行" ,rankType = RANK_TYPE.QIJIESHILIAN_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 + [33] = { bgImage = "", name = "空岛夺宝排行" ,rankType = RANK_TYPE.LINGMAIMIJING_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 --排行榜按钮中跨服排行 [19] = { bgImage = "UI_hz_ls_47", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5}, [20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6}, @@ -3098,7 +3098,7 @@ rankKingList={ [1] = { bgImage = "UI_hz_ls_47", name = "星数排行" ,rankType [44] = { bgImage = "", name = "霸气排行" ,rankType = RANK_TYPE.SoulSign2,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [45] = { bgImage = "", name = "关卡冲榜" ,rankType = RANK_TYPE.Level_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [46] = { bgImage = "", name = "战力冲榜" ,rankType = RANK_TYPE.FightValue_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, - [47] = { bgImage = "", name = "心魔冲榜" ,rankType = RANK_TYPE.Demons_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [47] = { bgImage = "", name = "四海冲榜" ,rankType = RANK_TYPE.Demons_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [48] = { bgImage = "", name = "山河冲榜" ,rankType = RANK_TYPE.ShanHe_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [49] = { bgImage = "", name = "伟大航路前段" ,rankType = RANK_TYPE.GodsWayTower,activiteId = 1,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [50] = { bgImage = "", name = "伟大航路后段" ,rankType = RANK_TYPE.GodsWayTower,activiteId = 2,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index ce582ccac7..f63acb39d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -41,9 +41,9 @@ function this.MakeAEmptyTeam(teamId) elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then oTeam.teamName = "罗浮争锋"-- 1601 elseif teamId == FormationTypeDef.FIGHT_LEVEL then - oTeam.teamName = "山河社稷图"-- 1701 + oTeam.teamName = "征服四海"-- 1701 elseif teamId == FormationTypeDef.FIGHT_ASSISTANTLEVEL then - oTeam.teamName = "山河社稷图"-- 1801 + oTeam.teamName = "征服四海"-- 1801 elseif teamId == FormationTypeDef.FORMATION_YUXUNLUNDAO1 then oTeam.teamName = "玉虚论道1队"-- 2001 elseif teamId == FormationTypeDef.FORMATION_YUXUNLUNDAO2 then @@ -51,15 +51,15 @@ function this.MakeAEmptyTeam(teamId) elseif teamId == FormationTypeDef.FORMATION_YUXUNLUNDAO3 then oTeam.teamName = "玉虚论道3队"-- 2003 elseif teamId == FormationTypeDef.FourElement_PEOPLE then - oTeam.teamName = "四灵试炼人"-- 3001 + oTeam.teamName = "四海历练"-- 3001 elseif teamId == FormationTypeDef.FourElement_BUDDHIST then - oTeam.teamName = "四灵试炼佛"-- 3002 + oTeam.teamName = "四海历练"-- 3002 elseif teamId == FormationTypeDef.FourElement_MAGIC then - oTeam.teamName = "四灵试炼妖"-- 3003 + oTeam.teamName = "四海历练"-- 3003 elseif teamId == FormationTypeDef.FourElement_TAOIST then - oTeam.teamName = "四灵试炼道"-- 3004 + oTeam.teamName = "四海历练"-- 3004 elseif teamId == FormationTypeDef.FORMATION_QIJIESHILIAN then - oTeam.teamName = "七界试炼"-- 2101 + oTeam.teamName = "推进城"-- 2101 elseif teamId == FormationTypeDef.GodsWayTower_Two_1 then oTeam.teamName = "二队1"-- 2101 elseif teamId == FormationTypeDef.GodsWayTower_Two_2 then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index 542043a44f..cadf53bf3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -2,7 +2,7 @@ require("Base/BasePanel") local GeneralTreasurePanel = Inherit(BasePanel) local itemnum = 0 local LocalData = { - [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "UI_hz_qj_18",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 + [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "UI_hz_qj_18",unLockType = 4,Tips = "挑战推进城,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 } local id=0 --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 34b99e8817..d5c839d3a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -75,7 +75,7 @@ local _ViewConfig = { }, [PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN] = { formationType = FormationTypeDef.FORMATION_QIJIESHILIAN, - tip = "七界试炼阵容:", + tip = "推进城阵容:", isAddFriend = false, btnType = { -- {name = "切磋", func = 7},