【灵脉秘境】提交
parent
790fe1c88f
commit
e174e24bc1
|
@ -376,7 +376,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -456,7 +456,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
|
|
@ -534,6 +534,8 @@ function this.ShowBattleResult(result, msg)
|
||||||
end
|
end
|
||||||
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
|
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
|
||||||
this.ShowBattleResultByTaSuiLingXiao()
|
this.ShowBattleResultByTaSuiLingXiao()
|
||||||
|
elseif fightType == BATTLE_TYPE.LINGMAIMIJING then
|
||||||
|
this:ClosePanel()
|
||||||
else
|
else
|
||||||
LogRed("result:"..tostring(result))
|
LogRed("result:"..tostring(result))
|
||||||
if result == 0 then -- 失败
|
if result == 0 then -- 失败
|
||||||
|
@ -671,6 +673,28 @@ function this.ShowBattleResultByTaSuiLingXiao()
|
||||||
end, 0.1):Start()
|
end, 0.1):Start()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.ShowBattleResultByLingMaiMiJing()
|
||||||
|
-- 延时执行避免事件冲突
|
||||||
|
Timer.New(function()
|
||||||
|
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||||
|
if bestData then
|
||||||
|
-- 胜利显示本场比赛的表现最好的英雄
|
||||||
|
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||||
|
-- 打开关卡奖励界面
|
||||||
|
UIManager.OpenPanel(UIName.RewardItemPopup, CommonActPageManager.TaSuiLingXiaoMsg.drop, 1,function(isBackBattle)
|
||||||
|
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||||
|
if not isBackBattle then
|
||||||
|
if _BattleBestPopup then
|
||||||
|
_BattleBestPopup:ClosePanel()
|
||||||
|
end
|
||||||
|
this:ClosePanel()
|
||||||
|
end
|
||||||
|
end, 7,true,true)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end, 0.1):Start()
|
||||||
|
end
|
||||||
|
|
||||||
-- 战斗波次变化回调
|
-- 战斗波次变化回调
|
||||||
function this.OnOrderChanged(order)
|
function this.OnOrderChanged(order)
|
||||||
-- body
|
-- body
|
||||||
|
|
|
@ -74,23 +74,29 @@ function this.StartFight()
|
||||||
else
|
else
|
||||||
NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg)
|
NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg)
|
||||||
this.root:ClosePanel()
|
this.root:ClosePanel()
|
||||||
local arg = {}
|
|
||||||
arg.panelType=2
|
|
||||||
LogRed("msg.result:"..tostring(msg.result))
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
arg.result = msg.result
|
LingMaiMiJingManager.battleResult = msg
|
||||||
arg.blue = {}
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.LINGMAIMIJING,function ()
|
||||||
arg.blue.uid = PlayerManager.uid
|
local arg = {}
|
||||||
arg.blue.name = PlayerManager.nickName
|
arg.panelType=2
|
||||||
arg.blue.head = PlayerManager.head
|
LogRed("msg.result:"..tostring(msg.result))
|
||||||
arg.blue.frame = HeadManager.GetCurFrameId()
|
arg.result = msg.result
|
||||||
arg.red= {}
|
arg.blue = {}
|
||||||
arg.red.uid = this.nodeData.uid
|
arg.blue.uid = PlayerManager.uid
|
||||||
arg.red.name = this.nodeData.name
|
arg.blue.name = PlayerManager.nickName
|
||||||
arg.red.head = this.nodeData.head
|
arg.blue.head = PlayerManager.head
|
||||||
arg.red.frame = this.nodeData.headFrame
|
arg.blue.frame = HeadManager.GetCurFrameId()
|
||||||
|
arg.red= {}
|
||||||
-- 不用回放直接显示结果
|
arg.red.uid = this.nodeData.uid
|
||||||
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
|
arg.red.name = this.nodeData.name
|
||||||
|
arg.red.head = this.nodeData.head
|
||||||
|
arg.red.frame = this.nodeData.headFrame
|
||||||
|
-- 不用回放直接显示结果
|
||||||
|
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
|
||||||
|
end):SetResult(msg.result)
|
||||||
|
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -78,8 +78,8 @@ function LingMaiMiJingPanel:BindEvent()
|
||||||
Util.AddClick(self.jumpBtn,function()
|
Util.AddClick(self.jumpBtn,function()
|
||||||
if self.inputField.text ~= "" then
|
if self.inputField.text ~= "" then
|
||||||
local num = tonumber(self.inputField.text)
|
local num = tonumber(self.inputField.text)
|
||||||
if num > 250 then
|
if num > 50 then
|
||||||
num = 250
|
num = 50
|
||||||
elseif num < 0 then
|
elseif num < 0 then
|
||||||
num = 1
|
num = 1
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue