修改提交

jiaoyangna 2020-10-15 20:30:11 +08:00
parent 6180692b3f
commit 63ea323a06
4 changed files with 36 additions and 21 deletions

View File

@ -155,10 +155,10 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 20
m_Top: 40
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 20
m_Spacing: -15
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -393,7 +393,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: 51, y: 59}
m_AnchoredPosition: {x: -51, y: 59}
m_SizeDelta: {x: 48, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1789385679139084008
@ -727,12 +727,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 9
m_Right: 0
m_Top: 0
m_Bottom: 20
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 20
m_Spacing: 12
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -1560,8 +1560,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: 0, y: 115.13}
m_SizeDelta: {x: 916, y: 896.45}
m_AnchoredPosition: {x: 0, y: -58.223}
m_SizeDelta: {x: 916, y: 1243.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3615097020972840977
CanvasRenderer:

View File

@ -52,7 +52,7 @@ function this.StartXiaoYao()
NetManager.JourneyDoResponse(this.curMapId,function (msg)
--0、普通节点 1、奖励节点 2、双倍节点 3、额外骰子节点 4、招募英雄节点 5、怪物节点 6,转盘
if msg.pathType == 5 then
--this.InitMonsterData(msg.monster,2)
this.InitMonsterData(msg.monster,2)
elseif msg.pathType == 6 then
this.InitLuckyTurnTables(msg)
elseif msg.pathType == 4 then
@ -75,6 +75,7 @@ function this.InitLuckyTurnTables(msg)
this.luckyluckyTurnTableRemainTime = msg.overTime
end
LogGreen("幸运转盘剩余次数:"..this.luckyluckyTurnTableTimes)
LogGreen("幸运转盘剩余时间:"..this.luckyluckyTurnTableRemainTime)
end
-- type 1初始化 2添加 hero

View File

@ -248,15 +248,23 @@ function this.InitShowEvent()
if mapData.diceNum>1 then --骰子x2
-- body
end
if mapData.randomTime>0 and mapData.randomNum>0 then
this.rouleBtn:SetActive(true)
end
if mapData.monsterInfo then
this.bossBtn:SetActive(true)
end
if mapData.goodsInfo then
this.shopBtn:SetActive(true)
end
if XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0 then
this.rouleBtn:SetActive(true)
else
this.rouleBtn:SetActive(false)
end
local temp = XiaoYaoManager.GetMonsterDatas()
if temp and #temp > 0 then
this.bossBtn:SetActive(true)
else
this.bossBtn:SetActive(false)
end
local temp = XiaoYaoManager.GetHeroDatas()
if temp and #temp > 0 then
this.shopBtn:SetActive(true)
else
this.shopBtn:SetActive(false)
end
end
function this.MapMove(curX,moveTime)

View File

@ -233,8 +233,10 @@ end
--界面关闭时调用(用于子类重写)
function XiaoyaoHeroGetPopup:OnClose()
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
this.testLiveGO = nil
if this.testLiveGO then
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
this.testLiveGO = nil
end
if this.Timer then
this.timer:Stop()
this.timer = nil
@ -243,6 +245,10 @@ end
--界面销毁时调用(用于子类重写)
function XiaoyaoHeroGetPopup:OnDestroy()
if this.testLiveGO then
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
this.testLiveGO = nil
end
if this.Timer then
this.timer:Stop()
this.timer = nil