From e8a1bf84da2427bcb2d75dc6c982cd605ffe59cc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 12 Sep 2024 19:37:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=BF=9B=E5=9F=8E=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AE=87=E5=AE=99=E7=94=9F=E6=88=90=E6=8C=91=E6=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/CarbonTypePanel.prefab | 6 +++--- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Modules/Formation/FormationManager.lua | 2 +- .../~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab index 261a970b00..fb9f36866c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab @@ -111,8 +111,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -10.6, y: 779.29} - m_SizeDelta: {x: 391.32, y: 111.1} + m_AnchoredPosition: {x: 0, y: 779.29} + m_SizeDelta: {x: 533.5, y: 111.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &575112474 CanvasRenderer: @@ -155,7 +155,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6D77\u4E0A\u593A\u5B9D" + m_Text: "\u4EBA\u9020\u4EBA\u6311\u6218" --- !u!114 &575112476 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 6a3f5ec1aa..9582689558 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3069,7 +3069,7 @@ 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},--跨服排行版部分 + [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 = Language[12097] ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5,showBg="UI_hz_ls_54"}, diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 33278e4d24..cd3ec4018a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -59,7 +59,7 @@ function this.MakeAEmptyTeam(teamId) elseif teamId == FormationTypeDef.FourElement_TAOIST then 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 cadf53bf3a..aa2100bee7 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 e9bef9f29a..953017f4d9 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}, diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 5a6a39e614..59c55c2987 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -31,7 +31,7 @@ local _ShopPage = { }, [SHOP_PAGE.JUMPSERVER] = { -- 云游 default = "UI_hz_gonghui_32", lock = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32", - rpType = RedPointType.Shop_Page_Roam,name="推进城" + rpType = RedPointType.Shop_Page_Roam,name="宇宙生存挑战" }, [SHOP_PAGE.YUANSHEN] = { -- 元神 default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33",name="元神商店"