From 4edc9a855bfacdb58ced3f390ec779937a030937 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 5 Aug 2021 17:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7=E8=B8=AA?= =?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 --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 4 ++-- .../~Lua/Common/GlobalDefine.lua | 1 + .../Modules/ActivityGift/ActivityGiftManager.lua | 2 +- .../View/GeneralBigPopup_XunBaoMiZong.lua | 16 ++++++++++++---- .../Modules/NewActivity/CommonActPageManager.lua | 7 ++++++- .../~Lua/Modules/Player/JumpManager.lua | 6 +++--- .../Modules/XunBaoMiZong/XunBaoMiZongPanel.lua | 2 +- 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 5e8c5ecd33..411ee706a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -973,7 +973,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 15} + m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7733369986452347242 @@ -14813,7 +14813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6122998974980818414 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 387808075c..a27d4162b9 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1069,6 +1069,7 @@ JumpType = { SheJiDaDianShangDian = 20060, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店 XingChenShangDian = 20059, --星辰商店 + XunBaoMiZongShangDian = 20260, --寻宝迷踪商店 ChaoFanRuSheng = 20061, zhenqibaoge = 20002, diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 9714163fa1..d09614e732 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do --LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua index ca73f15572..0383667dc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XunBaoMiZong.lua @@ -17,6 +17,7 @@ function this:InitComponent(gameObject) self.scrollView.moveTween.MomentumAmount = 1 self.scrollView.moveTween.Strength = 2 + self.itemList = {} end function this:BindEvent() @@ -37,14 +38,21 @@ function this:OnShow(_parent,...) end function this:Refresh(isTop,isAni) - local heroList = self.actData.FreelyData - self.scrollView:SetData(heroList, function (index, item) - this:ShowSingleItem(item, heroList[index],index) + local dataList = self.actData.FreelyData + self.scrollView:SetData(dataList, function (index, item) + this:ShowSingleItem(item, dataList[index],index) end,not isTop,not isAni) end function this:ShowSingleItem(go,data,index) - -- body + go:SetActive(true) + local rate = Util.GetGameObject(go,"rate"):GetComponent("Text") + rate.text = data.WeightShow + if not self.itemList[index] then + self.itemList[index] = SubUIManager.Open(SubUIConfig.ItemView, go.transform) + end + self.itemList[index]:OnOpen(false,data.Reward,1,true,false,false,self.sortingOrder) + end function this:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9f07ba8a0e..dfe3671e34 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -210,10 +210,15 @@ local TypeUpdateFunc = { end for i = 1, #rewards do local data = {} + data.Id = rewards[i].Id data.Reward = rewards[i].Reward data.ItemName = rewards[i].ItemName - data.WeightShow = string.format("%.2f%",rewards[i].WeightShow/weightAll*100) --rewards[i].WeightShow/weightAll*100.."%" + data.WeightShow = string.format("%.2f",rewards[i].WeightShow/weightAll*100).."%" --rewards[i].WeightShow/weightAll*100.."%" + table.insert(curData.FreelyData,data) end + table.sort(curData.FreelyData,function (a,b) + return a.Id < b.Id + end) end } diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 5e8f7b9169..4f14f083c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -677,9 +677,6 @@ local jumpDic = { [JumpType.XinJiangLaiXiShangDian] = function (data) this.JumpActivity(JumpType.XinJiangLaiXiShangDian,data[1]) end, - [JumpType.QianKunShangDian] = function (data) - this.JumpActivity(JumpType.QianKunShangDian,data[1]) - end, [JumpType.SheJiDaDianShangDian] = function (data) this.JumpActivity(JumpType.SheJiDaDianShangDian,data[1]) @@ -691,6 +688,9 @@ local jumpDic = { [JumpType.XingChenShangDian] = function (data) this.JumpActivity(JumpType.XingChenShangDian,data[1]) end, + [JumpType.XunBaoMiZongShangDian] = function (data) --寻宝迷踪 + this.JumpActivity(JumpType.XunBaoMiZongShangDian,data[1]) + end, [JumpType.FightLevel] = function (data) UIManager.OpenPanel(UIName.FightLevelChapterPanel) end, diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua index dabf5513ac..10a5ee18f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua @@ -38,7 +38,7 @@ function XunBaoMiZong:BindEvent() end) Util.AddOnceClick(self.btnShop,function () - PopupTipPanel.ShowTip("商店") + JumpManager.GoJump(40021) end) Util.AddOnceClick(self.btnGO,function ()