逍遥提交

jiaoyangna 2020-10-16 19:19:37 +08:00
parent 6db6317da2
commit 0703ea4f45
5 changed files with 25 additions and 5 deletions

View File

@ -727,7 +727,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 9
m_Left: 33
m_Right: 0
m_Top: 0
m_Bottom: 0
@ -2436,7 +2436,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: 1.61, y: -380.1}
m_AnchoredPosition: {x: -14, y: -380.1}
m_SizeDelta: {x: 919.2, y: 188}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4199615056215748742

View File

@ -1994,7 +1994,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: -7.6324615, y: 79}
m_AnchoredPosition: {x: -7.6324615, y: 93.9}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6134426996411187629

View File

@ -57,6 +57,11 @@ function this.StartXiaoYao()
this.InitLuckyTurnTables(msg)
elseif msg.pathType == 4 then
this.InitHeroData(msg.goodsInfo,2)
elseif msg.pathType == 0 then
LogRed("#msg.Drop:"..#msg.drop.itemlist)
LogRed("#msg.Drop1:"..#msg.drop.equipId )
LogRed("#msg.Drop2:"..#msg.drop.Hero )
LogRed("#msg.Drop3:"..#msg.drop.soulEquip )
end
Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.StartXiaoYao, msg)
end)
@ -142,6 +147,16 @@ function this.InitHeroData(goodsInfo,type)
LogGreen("得到的招募数量:"..#this.HeroData)
return this.HeroData
end
--刷新
function this.UpdateHeroData(id)
for i,v in ipairs(this.HeroData) do
if v.goodsIndex == id then
table.remove(this.HeroData,i)
end
end
end
--获取招募时间
function this.GetHeroDataTime()
if not this.HeroData or #this.HeroData < 1 then

View File

@ -149,7 +149,7 @@ function this.EventTrigger(_data)
Util.GetGameObject(this.gridParent.transform:GetChild(curGridIndex-1).gameObject,"eventPoint"):SetActive(false)
Log("触发事件类型为:".._data.pathType)
if _data.pathType==0 then --普通节点
LogGreen("普通奖励:"..#_data.drop)
elseif _data.pathType==1 then --宝箱
PopupTipPanel.ShowTip("获得一个宝箱!")
elseif _data.pathType==2 then --双倍节点

View File

@ -84,6 +84,11 @@ function XiaoyaoHeroGetPopup:BindEvent()
PopupTipPanel.ShowTip(itemConfig[costId].Name.."不足")
else
NetManager.XiaoyaoyouGetHeroRequest(curHeroData.goodsIndex,function(msg)
if this.testLiveGO then
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
this.testLiveGO = nil
end
XiaoYaoManager.UpdateHeroData(curHeroData.goodsIndex)
XiaoYaoManager.GetHeroIndex = 0
this:OnShow()
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop)
@ -228,7 +233,7 @@ function this.ShowHeroBuyInfo(_heroSConfigData)
if BagManager.GetItemCountById(costId) < costNum then
this.costNum.text = "<color=#FF0000>" .. costNum .. "</color>"
else
this.costNum.text = "<color=#1B262E>" .. costNum .. "</color>"
this.costNum.text = "<color=#C8AD83>" .. costNum .. "</color>"
end
end