diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin.png index 9371d48490..cebfda2b11 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin001.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin001.png index 3226533d8e..350a7a6e83 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin001.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_icon-wanxiangjin001.png differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3 new file mode 100644 index 0000000000..878e85120c Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta new file mode 100644 index 0000000000..5c37f59f1e --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dhdj_00042_attack_01.mp3.meta @@ -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: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3 new file mode 100644 index 0000000000..361fda4bdf Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta new file mode 100644 index 0000000000..44c24672b1 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_zgm_00039_001_03.mp3.meta @@ -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: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 index 76cc563135..1ccea3097f 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jls_00044_t3_attack.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 index af33732c52..81595c04c3 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jtxn_00045_t3_attack.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3 new file mode 100644 index 0000000000..5e7717c480 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta new file mode 100644 index 0000000000..31b8742a88 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_sgb_00041_t3_attack.mp3.meta @@ -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: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3 new file mode 100644 index 0000000000..9868f0c99f Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta new file mode 100644 index 0000000000..50683b1203 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_yj_00040_t3_attackchong.mp3.meta @@ -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: diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 6f49a515ba..50fd287f93 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -102,6 +102,7 @@ GameEvent = { -- 刷新英雄血量 RefreshHeroHp="Map.RefreshHeroHp", StopWalk="Map.StopWalk", + MaskState = "Map.MaskState" }, Event = { PointTrigger = "Event.PointTrigger", diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 82450d0c27..d07d7aae1c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index de66c8a943..ee4859c582 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index d470afa75c..3fbf32da1a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua index 463179f480..4d466622e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index bb7f31cc0e..4e6970f3f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -119,7 +119,7 @@ function this.ClosePanelRefreshData() end --界面关闭时调用(用于子类重写) function BattleFailPopup:OnClose() - + Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0) end --界面销毁时调用(用于子类重写) diff --git a/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs b/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs index d6db6967c8..5b2419e60c 100644 --- a/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs +++ b/Assets/Spine/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs @@ -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 + } } diff --git a/data_execl/base_data/AudioConfig.xlsx b/data_execl/base_data/AudioConfig.xlsx index adfe218204..8a30f6494d 100644 Binary files a/data_execl/base_data/AudioConfig.xlsx and b/data_execl/base_data/AudioConfig.xlsx differ