diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index c56a41c263..3d9a683407 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -12967,8 +12967,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: 98.5, y: 0} - m_SizeDelta: {x: 719, y: 1234} + m_AnchoredPosition: {x: -0.25, y: 0} + m_SizeDelta: {x: 916.5, y: 1234} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3451787949953087178 GameObject: @@ -13882,7 +13882,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5784819166342683563 RectTransform: m_ObjectHideFlags: 0 @@ -13901,8 +13901,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: 89, y: 66} - m_SizeDelta: {x: 700, y: 44} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 860, y: 44} m_Pivot: {x: 0.5, y: 1} --- !u!222 &29714517192058151 CanvasRenderer: @@ -13939,7 +13939,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 200 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -22674,8 +22674,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: 350.00006, y: 0} - m_SizeDelta: {x: 700, y: 44} + m_AnchoredPosition: {x: 510, y: 0} + m_SizeDelta: {x: 680, y: 44} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1862047479130278938 CanvasRenderer: @@ -22707,7 +22707,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -24236,10 +24236,10 @@ RectTransform: m_Father: {fileID: 5784819166342683563} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -83, y: -22} - m_SizeDelta: {x: 160, y: 44} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 80, y: 0} + m_SizeDelta: {x: 200, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5339714057364727546 CanvasRenderer: @@ -24271,7 +24271,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index 5d09a76390..bb3c762109 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -1764,7 +1764,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1055, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7472609110656960119 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 33e44be528..8b3d4d5f73 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2281,6 +2281,7 @@ GENERAL_POPUP_TYPE={ YuJianBet = 52, --御剑行竞猜 ShenHunShuXing = 54, + LingMaiRecord = 55,--灵脉秘境纪录 } --通用信息弹窗类型 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua index 834e1f3a5b..5487f37509 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua @@ -1,6 +1,7 @@ ----- 灵脉秘境纪录 ----- local this = {} +local lodeConfig = ConfigManager.GetConfig(ConfigName.LodeConfig) function this:InitComponent(gameObject) self.spLoader = SpriteLoader.New() self.scroll = Util.GetGameObject(gameObject,"Scroll") @@ -10,7 +11,7 @@ function this:InitComponent(gameObject) local rootHight = self.scroll.transform.rect.height local width = self.scroll.transform.rect.width self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform, - self.textPre,nil, Vector2.New(width, rootHight), 1, 1,Vector2.New(0, 0)) + self.textPre,nil, Vector2.New(width, rootHight), 1, 1,Vector2.New(0, 50)) self.ScrollView.moveTween.MomentumAmount = 1 self.ScrollView.moveTween.Strength = 2 self.ScrollView.elastic = false @@ -38,7 +39,16 @@ function this:Refresh() end function this:SetSingleData(_go,_data,_index) - LogGreen("type:"..tostring(_data.type).." defName:"..tostring(_data.defName).." userName:"..tostring(_data.userName).." lingMaiId:"..tostring(_data.lingMaiId).." time:"..tostring(_data.time).." practiceLevel:"..tostring(_data.practiceLevel)) + -- LogGreen("type:"..tostring(_data.type).." defName:"..tostring(_data.defName).." userName:"..tostring(_data.userName).." lingMaiId:"..tostring(_data.lingMaiId).." time:"..tostring(_data.time).." practiceLevel:"..tostring(_data.practiceLevel)) + local time = Util.GetGameObject(_go,"Time"):GetComponent("Text") + local desc = Util.GetGameObject(_go,"Desc"):GetComponent("Text") + + time.text = TimeStampToDateStr3(_data.time) + if _data.type == 1 then + desc.text = string.format("经过一番激烈的战斗,最终击败%s,占领%s,开始收集灵脉资源",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name) + elseif _data.type == 2 then + desc.text = string.format("大战过后,我方神将不敌%s,丢失%s",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name) + end end function this:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua index 5d97d58b6c..fc0977b9fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua @@ -96,7 +96,7 @@ end function this.OpenRecord() NetManager.LingMaiRecordRequest(function () - PopupTipPanel.ShowTip("打开纪录") + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.LingMaiRecord) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 38d93ee1cf..49f01fe800 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -61,12 +61,15 @@ function LingMaiMiJingPanel:BindEvent() LingMaiMiJingManager.OpenRecord() end) Util.AddOnceClick(self.rewardBtn, function() - UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,LingMaiMiJingManager.myPlaceId%250)--需要活动id,和我的排名 + table.sort(self.groupList, function (a,b) + return a.Id < b.Id + end ) + local num = LingMaiMiJingManager.myPlaceId - self.groupList[1].Id + 1 + UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,num)--需要活动id,和我的排名 end) Util.AddOnceClick(self.sortBtn, function() UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[33]) end) - Util.AddClick(self.lastBtn,function() LingMaiMiJingManager.curPage = LingMaiMiJingManager.curPage - 1 self:OnShow() @@ -78,8 +81,8 @@ function LingMaiMiJingPanel:BindEvent() Util.AddClick(self.jumpBtn,function() if self.inputField.text ~= "" then local num = tonumber(self.inputField.text) - if num > 50 then - num = 50 + if num > #self.groupList/5 then + num = #self.groupList/5 elseif num < 0 then num = 1 end @@ -114,6 +117,7 @@ function LingMaiMiJingPanel:OnShow() self:SetTime() self:SetMydata() self:SetVeins() + self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[LingMaiMiJingManager.myPlaceId].Group) self.lastBtn:SetActive(LingMaiMiJingManager.curPage - 1 > 0) self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 50) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 803bfa53f2..6b0988b43f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -489,6 +489,9 @@ function this.SpecialBtnShow() this.btnList[1]:SetActive(not bool) this.btnList[2]:SetActive(not bool) this.btnList[3]:SetActive(bool) + if LingMaiMiJingManager.myPlaceId < this.data.Id then + this.btnList[2]:SetActive(false) + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua index 68477f2dc4..1a87631062 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua @@ -93,6 +93,10 @@ function this.RefreshBtnShow() this.infoPopup.btnList[1]:SetActive(false) this.infoPopup.btnList[2]:SetActive(true) this.infoPopup.btnList[3]:SetActive(false) + if LingMaiMiJingManager.myPlaceId < this.data.Id then + this.infoPopup.btnBox:SetActive(false) + this.infoPopup.btnList[2]:SetActive(false) + end end end