浏览代码

[音频] 音乐位置信息 临时解决方案 部分合并冲突重新实现

chaimignze 1 年之前
父节点
当前提交
665110eea2

二进制
Content/Audio_Temp/NewCompositeCurveTable.uasset


二进制
Content/Audio_Temp/NewSoundAttenuation.uasset


二进制
Content/Audio_Temp/NewSoundClass.uasset


二进制
Content/Audio_Temp/NewSoundEffectSourcePresetChain.uasset


二进制
Content/Audio_Temp/WaitingRoom_Test01.uasset


二进制
Content/Maps/Map002.umap


+ 10 - 10
codeTetrees_WwiseProject/codeTetrees_WwiseProject.admin.validationcache

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ValidationCache Version="1" SchemaVersion="110">
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Virtual Acoustics\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Virtual Acoustics\Default Work Unit.wwu" DateLow="1689936798" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Triggers\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Switches\Default Work Unit.wwu" DateLow="1689935967" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Switches\Default Work Unit.wwu" DateLow="1690206053" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\States\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Soundcaster Sessions\Default Work Unit.wwu" DateLow="1689935967" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Soundcaster Sessions\Default Work Unit.wwu" DateLow="1690206053" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\SoundBanks\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Queries\Factory Queries.wwu" DateLow="1689142420" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Queries\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
@@ -13,19 +13,19 @@
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Modulators\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Mixing Sessions\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Metadata\Default Work Unit.wwu" DateLow="1689142420" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Master-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1689935966" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Interactive Music Hierarchy\Default Work Unit.wwu" DateLow="1689935966" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Master-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1690206052" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Interactive Music Hierarchy\Default Work Unit.wwu" DateLow="1690206052" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Game Parameters\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Events\Default Work Unit.wwu" DateLow="1689935965" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Effects\Factory Effects.wwu" DateLow="1689935965" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Events\Default Work Unit.wwu" DateLow="1690206051" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Effects\Factory Effects.wwu" DateLow="1690206051" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Effects\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Dynamic Dialogue\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Conversion Settings\Factory Conversion Settings.wwu" DateLow="1689142419" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Conversion Settings\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Control Surface Sessions\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\codeTetrees_WwiseProject.wproj" DateLow="1689142420" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\codeTetrees_WwiseProject.admin.wsettings" DateLow="1689935967" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\codeTetrees_WwiseProject.admin.wsettings" DateLow="1690206053" DateHigh="0"/>
 	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Audio Devices\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Attenuations\Default Work Unit.wwu" DateLow="1689142419" DateHigh="0"/>
-	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Actor-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1689935965" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Attenuations\Default Work Unit.wwu" DateLow="1690206051" DateHigh="0"/>
+	<ValidationCacheItem File="D:\TeTreesDemo\codeTetrees\codeTetrees_WwiseProject\Actor-Mixer Hierarchy\Default Work Unit.wwu" DateLow="1690206051" DateHigh="0"/>
 </ValidationCache>