Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-06 17:37:48 +08:00
commit 8d2576e185
20 changed files with 130 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: b7ebc3f2d874cc34aaaafeb362b0a36c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: ab41ca36aabc65345889a7d0eff8a307
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 69e1577286ecb1f4b8088832ad29711a
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 5af22994c413fb649825e42fceb23311
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -102,6 +102,7 @@ GameEvent = {
-- 刷新英雄血量
RefreshHeroHp="Map.RefreshHeroHp",
StopWalk="Map.StopWalk",
MaskState = "Map.MaskState"
},
Event = {
PointTrigger = "Event.PointTrigger",

View File

@ -132,6 +132,7 @@ function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
Game.GlobalEvent:AddEvent(GameEvent.Map.StopWalk, this.StopWalking)
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
-- Game.GlobalEvent:AddEvent(GameEvent.Map.MaskState, this.MaskState)
missionView.AddListener()
playerView.AddListener()
@ -151,6 +152,7 @@ function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.StopWalk, this.StopWalking)
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
-- Game.GlobalEvent:RemoveEvent(GameEvent.Map.MaskState, this.MaskState)
missionView.RemoveListener()
playerView.RemoveListener()
@ -247,9 +249,9 @@ end
function this.InitCarbonSet()
-- 面板遮罩
this.Mask:SetActive(true)
this.MaskState(1)
local timer = Timer.New(function()
this.Mask:SetActive(false)
this.MaskState(0)
end, 2.5)
timer:Start()
--如果是在序章
@ -258,6 +260,11 @@ function this.InitCarbonSet()
end
--设置遮罩开关 1 是开 其他都是关
function this.MaskState(state)
this.Mask:SetActive(state == 1)
end
-- 根据副本的类型显示组件
function this.InitCompShow(type)
this.leftUp:SetActive(type == 2)

View File

@ -31,10 +31,12 @@ end
function this:BindEvent()
Util.AddClick(this.e_cancelBtn,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
self:ClosePanel()
end)
Util.AddClick(this.btnBack,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
self:ClosePanel()
end)
@ -66,16 +68,21 @@ function this:BindEvent()
local fightData = BattleManager.GetBattleServerData(msg)
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
--更新精气值
LogGreen(Language[12222]..msg.essenceValue)
MapTrialManager.powerValue = msg.essenceValue
--召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
MapTrialManager.UpdatePowerValue(0)
end
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
-- 延迟一秒刷新显示,避免战斗界面关闭时地图界面没有打开,无法监听删点事件,导致怪物点无法删除的问题
Timer.New(function()
-- 刷新数据
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
end, 0.2):Start()
end)
self:ClosePanel()
end)

View File

@ -231,7 +231,8 @@ function this.UpdatePowerValue()
this.powerPercent.text = _value
this.sliderValue.fillAmount = _value / 100
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
-- LogPurple("战斗结束")
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
-- -1时召唤boss
if powerValue == -1 then
this.bossEffect:SetActive(true)--进图显示召唤boss

View File

@ -465,6 +465,8 @@ function this.EdgeEventTrigger(u, v)
end
Log(Language[11304] .. MapManager.mapPointList[pos])
-- LogGreen("事件开始")
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,1)
--如果英雄阵亡 无法选择其进行战斗
local num = #MapManager.trialHeroInfo

View File

@ -119,7 +119,7 @@ function this.ClosePanelRefreshData()
end
--界面关闭时调用(用于子类重写)
function BattleFailPopup:OnClose()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
end
--界面销毁时调用(用于子类重写)

View File

@ -294,6 +294,22 @@ namespace Spine.Unity {
//this.UpdateMaterial(); // TODO: This allocates memory.
}
#endregion
}
protected override void OnDestroy()
{
if( meshBuffers != null)
{
var c = meshBuffers.GetCurrent();
if( c != null)
c.Dispose();
var n = meshBuffers.GetNext();
if( n != null)
{
n.Dispose();
}
}
}
#endregion
}
}