diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab index dd3c3ab3d3..c3e4f45cc5 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab @@ -956,7 +956,6 @@ RectTransform: - {fileID: 3241267629678625390} - {fileID: 3241267629593443510} - {fileID: 3241267629725516866} - - {fileID: 3241267629619513680} m_Father: {fileID: 3241267629037983134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1308,6 +1307,7 @@ RectTransform: m_Children: - {fileID: 2993252843031817248} - {fileID: 3241267628795801173} + - {fileID: 3241267629619513680} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1812,12 +1812,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3241267628795801173} - m_RootOrder: 4 + m_Father: {fileID: 3241267629037983134} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 89.99994} + m_AnchoredPosition: {x: 70, y: 90} m_SizeDelta: {x: 140, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629619513684 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 742130734e..1eef9fe75b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -9025,7 +9025,7 @@ 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: -35} + m_AnchoredPosition: {x: 40, y: -25} m_SizeDelta: {x: 80, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7558685581109309511 @@ -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: 70} + m_SizeDelta: {x: 241, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1738108596221402211 CanvasRenderer: @@ -33402,7 +33402,7 @@ 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: -35} + m_AnchoredPosition: {x: 160.5, y: -25} m_SizeDelta: {x: 161, y: 64.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1690593810971012593 diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab index 2a81b75b7d..a75b02f552 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab @@ -2477,7 +2477,7 @@ 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: -60.78, y: 0.0000029206276} + m_AnchoredPosition: {x: -60.78, y: -12} m_SizeDelta: {x: 300.59998, y: 41.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1498924668911105406 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 2fa43826cb..5c523e7fbe 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -109,10 +109,14 @@ function this.OnTabChange(index) this.text2.text = string.format("前10名奖励需个人贡献值达到%s分才能获取", 2500) this.text2.color = UIColor.RED end - elseif curRankType == 3 or curRankType == 4 then + elseif curRankType == 3 then this.ShowRewardInfo() this.text.text = Language[10758] this.RefreshMyInfo() + elseif curRankType == 4 then + this.ShowRewardInfo() + this.text.text = "排行奖励将在周日23:30后通过邮件发放" + this.RefreshMyInfo() end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index ce6345d238..e12feb20e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -2,13 +2,13 @@ require("Base/BasePanel") local GeneralTreasurePanel = Inherit(BasePanel) local itemnum = 0 local LocalData = { - [ActivityTypeDef.QiJieTreasure] = {hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升密保等级,激活密保后还可领取额外奖励"},--七界秘宝 + [ActivityTypeDef.QiJieTreasure] = {hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 } --初始化组件(用于子类重写) function GeneralTreasurePanel:InitComponent() self.spLoader = SpriteLoader.New() --topBar/btnBack - self.btnBack = Util.GetGameObject(self.transform, "bg/btnBack") + self.btnBack = Util.GetGameObject(self.transform, "btnBack") self.buyBtn = Util.GetGameObject(self.transform, "bg/topBar/buyBtn") self.Text1 = Util.GetGameObject(self.buyBtn, "buy"):GetComponent("Text") self.topBarImg = Util.GetGameObject(self.transform, "bg/topBar"):GetComponent("Image")