【寻宝迷踪】提交
parent
1c0880abbf
commit
4edc9a855b
|
@ -973,7 +973,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0}
|
||||||
m_AnchorMax: {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_SizeDelta: {x: 100, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7733369986452347242
|
--- !u!222 &7733369986452347242
|
||||||
|
@ -14813,7 +14813,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &6122998974980818414
|
--- !u!224 &6122998974980818414
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1069,6 +1069,7 @@ JumpType = {
|
||||||
SheJiDaDianShangDian = 20060, --社稷大典商店
|
SheJiDaDianShangDian = 20060, --社稷大典商店
|
||||||
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
||||||
XingChenShangDian = 20059, --星辰商店
|
XingChenShangDian = 20059, --星辰商店
|
||||||
|
XunBaoMiZongShangDian = 20260, --寻宝迷踪商店
|
||||||
|
|
||||||
ChaoFanRuSheng = 20061,
|
ChaoFanRuSheng = 20061,
|
||||||
zhenqibaoge = 20002,
|
zhenqibaoge = 20002,
|
||||||
|
|
|
@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate)
|
||||||
this.CheckMoneyProgress(v)
|
this.CheckMoneyProgress(v)
|
||||||
this.mission[v.activityId] = 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
|
for n, m in ipairs(v.mission) do
|
||||||
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||||
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||||
|
|
|
@ -17,6 +17,7 @@ function this:InitComponent(gameObject)
|
||||||
self.scrollView.moveTween.MomentumAmount = 1
|
self.scrollView.moveTween.MomentumAmount = 1
|
||||||
self.scrollView.moveTween.Strength = 2
|
self.scrollView.moveTween.Strength = 2
|
||||||
|
|
||||||
|
self.itemList = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:BindEvent()
|
function this:BindEvent()
|
||||||
|
@ -37,14 +38,21 @@ function this:OnShow(_parent,...)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:Refresh(isTop,isAni)
|
function this:Refresh(isTop,isAni)
|
||||||
local heroList = self.actData.FreelyData
|
local dataList = self.actData.FreelyData
|
||||||
self.scrollView:SetData(heroList, function (index, item)
|
self.scrollView:SetData(dataList, function (index, item)
|
||||||
this:ShowSingleItem(item, heroList[index],index)
|
this:ShowSingleItem(item, dataList[index],index)
|
||||||
end,not isTop,not isAni)
|
end,not isTop,not isAni)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:ShowSingleItem(go,data,index)
|
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
|
end
|
||||||
|
|
||||||
function this:OnClose()
|
function this:OnClose()
|
||||||
|
|
|
@ -210,10 +210,15 @@ local TypeUpdateFunc = {
|
||||||
end
|
end
|
||||||
for i = 1, #rewards do
|
for i = 1, #rewards do
|
||||||
local data = {}
|
local data = {}
|
||||||
|
data.Id = rewards[i].Id
|
||||||
data.Reward = rewards[i].Reward
|
data.Reward = rewards[i].Reward
|
||||||
data.ItemName = rewards[i].ItemName
|
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
|
end
|
||||||
|
table.sort(curData.FreelyData,function (a,b)
|
||||||
|
return a.Id < b.Id
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -677,9 +677,6 @@ local jumpDic = {
|
||||||
[JumpType.XinJiangLaiXiShangDian] = function (data)
|
[JumpType.XinJiangLaiXiShangDian] = function (data)
|
||||||
this.JumpActivity(JumpType.XinJiangLaiXiShangDian,data[1])
|
this.JumpActivity(JumpType.XinJiangLaiXiShangDian,data[1])
|
||||||
end,
|
end,
|
||||||
[JumpType.QianKunShangDian] = function (data)
|
|
||||||
this.JumpActivity(JumpType.QianKunShangDian,data[1])
|
|
||||||
end,
|
|
||||||
|
|
||||||
[JumpType.SheJiDaDianShangDian] = function (data)
|
[JumpType.SheJiDaDianShangDian] = function (data)
|
||||||
this.JumpActivity(JumpType.SheJiDaDianShangDian,data[1])
|
this.JumpActivity(JumpType.SheJiDaDianShangDian,data[1])
|
||||||
|
@ -691,6 +688,9 @@ local jumpDic = {
|
||||||
[JumpType.XingChenShangDian] = function (data)
|
[JumpType.XingChenShangDian] = function (data)
|
||||||
this.JumpActivity(JumpType.XingChenShangDian,data[1])
|
this.JumpActivity(JumpType.XingChenShangDian,data[1])
|
||||||
end,
|
end,
|
||||||
|
[JumpType.XunBaoMiZongShangDian] = function (data) --寻宝迷踪
|
||||||
|
this.JumpActivity(JumpType.XunBaoMiZongShangDian,data[1])
|
||||||
|
end,
|
||||||
[JumpType.FightLevel] = function (data)
|
[JumpType.FightLevel] = function (data)
|
||||||
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -38,7 +38,7 @@ function XunBaoMiZong:BindEvent()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(self.btnShop,function ()
|
Util.AddOnceClick(self.btnShop,function ()
|
||||||
PopupTipPanel.ShowTip("商店")
|
JumpManager.GoJump(40021)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(self.btnGO,function ()
|
Util.AddOnceClick(self.btnGO,function ()
|
||||||
|
|
Loading…
Reference in New Issue