From 016f0159e560f52177ba8e7a1b0806fe0c78f08d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 23 Sep 2021 14:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 2 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 14 +++++++------- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../GeneralPanel/GeneralTreasureMangaer.lua | 2 +- .../~Lua/Modules/Player/JumpManager.lua | 9 +++++++++ .../Modules/Ranking/RankingSingleListPanel.lua | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 4997abc402..ff1d625cb2 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -10881,7 +10881,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: -13 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 1eef9fe75b..dafb1632a4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -9025,8 +9025,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -25} - m_SizeDelta: {x: 80, y: 100} + m_AnchoredPosition: {x: 32.5, y: -25} + m_SizeDelta: {x: 65, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7558685581109309511 CanvasRenderer: @@ -23517,7 +23517,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -160.2} - m_SizeDelta: {x: 241, y: 50} + m_SizeDelta: {x: 188, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1738108596221402211 CanvasRenderer: @@ -33402,8 +33402,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 160.5, y: -25} - m_SizeDelta: {x: 161, y: 64.41} + m_AnchoredPosition: {x: 126.5, y: -25} + m_SizeDelta: {x: 123, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1690593810971012593 CanvasRenderer: @@ -33435,10 +33435,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 0 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a2d12b484f..6e5bea2e7e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1113,6 +1113,7 @@ JumpType = { firstRecharge = 30001, ZhiZunJiangShi = 30002, SurpriseBox = 40001,--惊喜礼盒 + QiJieShiLian = 40026,--七界试炼 linglongShangShi = 20005, } diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua index ff45683fd6..4679ffd540 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua @@ -3,7 +3,7 @@ local this = GeneralTreasureMangaer function this.Initialize() this.TreasureList = { - [ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure,itemId = 1240}, + [ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure,itemId = 1242}, } this.InitConfigData() end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 89810115a8..fd7a497a6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -776,6 +776,15 @@ local jumpDic = { [JumpType.linglongShangShi] = function(data) this.JumpActivity(JumpType.linglongShangShi,data[1]) end, + [JumpType.QiJieShiLian] = function(data) + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then + UIManager.OpenPanel(UIName.QiJieShiLianPanel) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.QIJIESHILIAN)) + this.isOpen = false + return + end + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 053ac59048..d03473b138 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -356,7 +356,7 @@ function this.AddPlayerInfoClick(root,uid,serverName) elseif sData.rankType == RANK_TYPE.WORLDARENA then UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2) elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 - UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,serverName and serverName or nil) + UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, uid) end