【灵脉秘境】提交

dev_chengFeng
ZhangBiao 2021-11-18 10:26:14 +08:00
parent 790fe1c88f
commit e174e24bc1
4 changed files with 51 additions and 21 deletions

View File

@ -376,7 +376,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -456,7 +456,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -534,6 +534,8 @@ function this.ShowBattleResult(result, msg)
end
elseif fightType == BATTLE_TYPE.TASUILINGXIAO then
this.ShowBattleResultByTaSuiLingXiao()
elseif fightType == BATTLE_TYPE.LINGMAIMIJING then
this:ClosePanel()
else
LogRed("result:"..tostring(result))
if result == 0 then -- 失败
@ -671,6 +673,28 @@ function this.ShowBattleResultByTaSuiLingXiao()
end, 0.1):Start()
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)
-- body

View File

@ -74,23 +74,29 @@ function this.StartFight()
else
NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg)
this.root:ClosePanel()
local arg = {}
arg.panelType=2
LogRed("msg.result:"..tostring(msg.result))
arg.result = msg.result
arg.blue = {}
arg.blue.uid = PlayerManager.uid
arg.blue.name = PlayerManager.nickName
arg.blue.head = PlayerManager.head
arg.blue.frame = HeadManager.GetCurFrameId()
arg.red= {}
arg.red.uid = this.nodeData.uid
arg.red.name = this.nodeData.name
arg.red.head = this.nodeData.head
arg.red.frame = this.nodeData.headFrame
-- 不用回放直接显示结果
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
local fightData = BattleManager.GetBattleServerData(msg)
LingMaiMiJingManager.battleResult = msg
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.LINGMAIMIJING,function ()
local arg = {}
arg.panelType=2
LogRed("msg.result:"..tostring(msg.result))
arg.result = msg.result
arg.blue = {}
arg.blue.uid = PlayerManager.uid
arg.blue.name = PlayerManager.nickName
arg.blue.head = PlayerManager.head
arg.blue.frame = HeadManager.GetCurFrameId()
arg.red= {}
arg.red.uid = this.nodeData.uid
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

View File

@ -78,8 +78,8 @@ function LingMaiMiJingPanel:BindEvent()
Util.AddClick(self.jumpBtn,function()
if self.inputField.text ~= "" then
local num = tonumber(self.inputField.text)
if num > 250 then
num = 250
if num > 50 then
num = 50
elseif num < 0 then
num = 1
end