diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 3f90ff22..626da48f 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.76990294 + - _EdgeValue: 0.9431098 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.23009706 + - _Opacity: 0.05689019 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png b/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png new file mode 100644 index 00000000..1c118915 --- /dev/null +++ b/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0040e2395cb4a4bc215f147d2890520a42b6c95f60612d37546606e32da9168 +size 59229 diff --git a/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png.meta b/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png.meta new file mode 100644 index 00000000..a71267f5 --- /dev/null +++ b/Assets/External VFXs/CartoonVFX9x/UIEffectCollecion_Megapack/Textures/Flare_Circle_White.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 801a03839a65e3042abae742e903cb62 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 1c96095a..2fc79647 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6aa997e33857efa64df6980d0348d4191edbb14bc174d1965c79d5dec4a6509 -size 7043517 +oid sha256:995a571392b2c817ca07fbf1bef5aafaa1590be6b42ba5d965fa7584feed0183 +size 7026764 diff --git a/Assets/Prefabs/GameElements/Track/CrossTrackPoint.prefab b/Assets/Prefabs/GameElements/Track/CrossTrackPoint.prefab index ed3049ed..d73e37e0 100644 --- a/Assets/Prefabs/GameElements/Track/CrossTrackPoint.prefab +++ b/Assets/Prefabs/GameElements/Track/CrossTrackPoint.prefab @@ -75,18 +75,17 @@ MonoBehaviour: parentElement: {fileID: 0} childElementList: [] trackListFolder: {fileID: 0} - nowAttachedTrack: {fileID: 0} - trackPositioner: {fileID: -320456605675426144} trackSwitch: value: 0 animations: [] trackPercent: value: 0 - currentAnimationIndex: 0 animations: [] isSwitchingReturnType: 0 lastReturnType: 0 returnType: 0 + nowAttachedTrack: {fileID: 0} + trackPositioner: {fileID: -320456605675426144} --- !u!114 &-320456605675426144 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes index 9966461e..564d2a04 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes index 84f78832..b1de77ad 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/CommandScripts.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes index 7c52809e..296520e9 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes index 98e46b5c..b30ed9e4 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Alunite Cas/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes index 89bd2cf2..27894f44 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes index ca7f3428..21d2ea4a 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/CommandScripts.bytes @@ -1 +1 @@ -NqsL^bHTnZq8dȕ}Oӯ V U0mgͫ7Q&;_@yN%3#W$ď"O" 0z}E'g;4ʦpIvHßZkՎO;ٞ(iD-σeZƍ`|{Ƌz_~ \ No newline at end of file +0".|cI{XlqEg]uM 'KYhu^jDh3DGמFNSjfC%,&͐ Yd+؄0S8#[QF{![VPOɻ0.#=Nh0$`?0"jιUnO`K[:- \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes index 9a2d4186..04834980 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/ProjectInfo.bytes @@ -1 +1 @@ -2Q659ŕJrEey[$R ~62VaE| ~ )j_n'C@`hw(ȄmTq.E4_'-(+5F8MBi4]DUiḈZ7Yk PO&|S-g[~hhRH)aԶ,`bi|O׆Ś \dauTWJhSN۬pRl=OJ-a !|y}CoQ◄ خE`)[AlK~Þ?4cAϯد}OjdP[0. `d,~m! s0LĝyAz \ No newline at end of file +DufԆs\ҧn*~K1ПiY&-YrPgܯ-?x'o عU?GYD7cu$c厝۫-AZ(cا*=g),X7Y6s~ڛȁv6Gg],wۍ!uׇ4:Mic'R\Dp3# R3ya_6=WV`o Ν@u˞oQd. jijDEa8$xm ^7mEo+Y6a>Z$ϋ?/^ezmeAKT`/N)~'E:nt=ufZ \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes index f66764ad..381d2a40 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Chaos Zone/Easy/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/Beatmap.bytes index 473eb5b7..fcccb21b 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/CommandScripts.bytes index 436bdedd..fba44dab 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/CommandScripts.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/CommandScripts.bytes @@ -1,2 +1,2 @@ -3&H x'A_iƀ Knq׬.^X:"?FopqЗG; -& '2O˚EN3KY-䮎N9NW,ktV.WDqli,BrW!4chogN< p> p5#=#7CPP53 \ No newline at end of file +etm#A*2`p*ͻ&0pnq;igcZ`bI|4>3·T 94/<{ ^zC~9ZHjID WdGF,}ouWR3D S̮$r>sv84o3ŭ +.փqLi2]=֖ \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/ProjectInfo.bytes index 5159ef78..c957c43d 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/SongInfo.bytes index e24f2b74..239051f3 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Farewell/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes index 7ed8aa0d..30283760 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes.meta index c4342bae..be10ab8a 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/Beatmap.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2d07768ea909cfb498ad7d94654ddb43 +guid: 8483718c446c7ed45b3b86df1288ce1d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes index 41542da7..4f926082 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes @@ -1 +1 @@ -~ǿmB 'j} Zp<+r8$ i ޑwX .`kChtc.M WPע[n}e_/ 'XZy8IMT#C#1Ll+hBV~j> xݒ/O Mk̖ \ No newline at end of file +.c8Ko+0ob.T@\Qdᮤ@`.A Kc\2 *lS~XqABwN7E2<݅Fw{:ocPvܘUSI9+qtRC/z(NDM)q5'P&g brНMiO,R<hE^ \ No newline at end of file diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes.meta index 8479b689..6d7814c2 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/CommandScripts.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6db0530f3f252ea49a8632143147055a +guid: cad57e5cfb75195408117eab9d49cb5b DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes index 31cd7673..05e0ea2a 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes.meta index b8677488..f4ae5773 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/ProjectInfo.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 026dad72b6da4aa4084dc964e0318385 +guid: f30fbeb27fd2d4447a921b871b5290f3 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes index 8064fde5..cc551357 100644 Binary files a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes and b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes differ diff --git a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes.meta b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes.meta index b17ac53c..65704b5c 100644 --- a/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes.meta +++ b/Assets/Resources/Beatmaps/Chapter0/Leave Worlds with Smile/Hard/SongInfo.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cabf01a814316254195299c0ec98c034 +guid: 368abe1a7c6070948b31ad33bdbcc8b7 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Chapter0.asset b/Assets/Resources/Chapter0.asset index 9b20781b..50974c6f 100644 --- a/Assets/Resources/Chapter0.asset +++ b/Assets/Resources/Chapter0.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20e39896d4db041e5a2d790e2f07a787c7bab891af2e2c8e81fcc61b08f87fc1 +oid sha256:ff45b4953b969f2d73dc36abafafe9bffb53157ae839400cb0a42e7ef32ef5a3 size 14157 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index e68ce573..52a6392d 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -10146,6 +10146,16 @@ MonoBehaviour: valueGuidInternal: WwiseObjectReference: {fileID: 11400000, guid: d277bb13d318c414999deb758c16baac, type: 2} + HighPassFilter: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: 2506771a66ac1e84f80022e7212bfc01, + type: 2} + LowPassFilter: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: 2ad6d003174f1ae4387341238ade2cb4, + type: 2} songTimeSegment: 0 pauseTimeSegment: 0 judgeOffset: 0 diff --git a/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/HighPassFilterEffect_BM.cs b/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/HighPassFilterEffect_BM.cs index dbee1a6e..f5201f69 100644 --- a/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/HighPassFilterEffect_BM.cs +++ b/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/HighPassFilterEffect_BM.cs @@ -5,6 +5,7 @@ namespace Ichni.RhythmGame.Beatmap public class HighPassFilterEffect_BM: EffectBase_BM { public float peak; + public bool useEQ; public AnimationCurve intensityCurve; public HighPassFilterEffect_BM() @@ -12,17 +13,17 @@ namespace Ichni.RhythmGame.Beatmap } - public HighPassFilterEffect_BM(float effectTime, float peak, AnimationCurve intensityCurve) + public HighPassFilterEffect_BM(float effectTime, float peak, bool useEQ, AnimationCurve intensityCurve) { - this.effectTime = 0; this.effectTime = effectTime; this.peak = peak; + this.useEQ = useEQ; this.intensityCurve = intensityCurve; } public override EffectBase ConvertToGameType(GameElement attachedGameElement) { - return new HighPassFilterEffect(effectTime, peak, intensityCurve); + return new HighPassFilterEffect(effectTime, peak, useEQ, intensityCurve); } } } diff --git a/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/LowPassFilterEffect_BM.cs b/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/LowPassFilterEffect_BM.cs index a5355070..c8c1443a 100644 --- a/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/LowPassFilterEffect_BM.cs +++ b/Assets/Scripts/DataCore/GameElements_BM/GenrealEffects/LowPassFilterEffect_BM.cs @@ -5,6 +5,7 @@ namespace Ichni.RhythmGame.Beatmap public class LowPassFilterEffect_BM: EffectBase_BM { public float bottom; + public bool useEQ; public AnimationCurve intensityCurve; public LowPassFilterEffect_BM() @@ -12,17 +13,17 @@ namespace Ichni.RhythmGame.Beatmap } - public LowPassFilterEffect_BM(float effectTime, float bottom, AnimationCurve intensityCurve) + public LowPassFilterEffect_BM(float effectTime, float bottom, bool useEQ, AnimationCurve intensityCurve) { - this.effectTime = 0; this.effectTime = effectTime; this.bottom = bottom; + this.useEQ = useEQ; this.intensityCurve = intensityCurve; } public override EffectBase ConvertToGameType(GameElement attachedGameElement) { - return new LowPassFilterEffect(effectTime, bottom, intensityCurve); + return new LowPassFilterEffect(effectTime, bottom, useEQ, intensityCurve); } } } diff --git a/Assets/Scripts/Game/Animations/Transform/Displacement.cs b/Assets/Scripts/Game/Animations/Transform/Displacement.cs index 29e1681e..89e43a63 100644 --- a/Assets/Scripts/Game/Animations/Transform/Displacement.cs +++ b/Assets/Scripts/Game/Animations/Transform/Displacement.cs @@ -12,8 +12,13 @@ namespace Ichni.RhythmGame #region [暴露属性字段与关联] Exposed Fields & References private TransformSubmodule targetTransformSubmodule; public FlexibleFloat positionX, positionY, positionZ; + + public static HashSet ActiveDisplacements = new HashSet(); #endregion + protected void OnEnable() { ActiveDisplacements.Add(this); } + protected void OnDisable() { ActiveDisplacements.Remove(this); } + #region [生命周期与工厂] Lifecycle & Factory public static Displacement GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, @@ -45,21 +50,65 @@ namespace Ichni.RhythmGame positionY.UpdateFlexibleFloat(songTime); positionZ.UpdateFlexibleFloat(songTime); - if (forceUpdate || positionX.returnType is FlexibleReturnType.MiddleExecuting || - positionY.returnType is FlexibleReturnType.MiddleExecuting || - positionZ.returnType is FlexibleReturnType.MiddleExecuting) + bool isMiddleExecuting = positionX.returnType is FlexibleReturnType.MiddleExecuting || + positionY.returnType is FlexibleReturnType.MiddleExecuting || + positionZ.returnType is FlexibleReturnType.MiddleExecuting; + + bool isSwitching = positionX.isSwitchingReturnType || positionY.isSwitchingReturnType || positionZ.isSwitchingReturnType; + + if (forceUpdate || isMiddleExecuting) { if(!forceUpdate) animationReturnType = FlexibleReturnType.MiddleExecuting; - Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value); - targetTransformSubmodule.positionOffset += currentPosition; - targetTransformSubmodule.positionDirtyMark = true; + + // 首帧合并退让保护 + bool shouldSkipFirstFrame = false; + if (!forceUpdate && isSwitching) + { + foreach (var d in ActiveDisplacements) + { + if (d != this && d.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (d.positionX.isSwitchingReturnType || d.positionY.isSwitchingReturnType || d.positionZ.isSwitchingReturnType) + { + shouldSkipFirstFrame = true; + break; + } + } + } + } + + if (!shouldSkipFirstFrame) + { + Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value); + targetTransformSubmodule.positionOffset += currentPosition; + targetTransformSubmodule.positionDirtyMark = true; + } } - else if (positionX.isSwitchingReturnType || positionY.isSwitchingReturnType || positionZ.isSwitchingReturnType) + else if (isSwitching) { - //animationReturnType = FlexibleReturnType.MiddleExecuting; - //Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value); - //targetTransformSubmodule.positionOffset += currentPosition; - //targetTransformSubmodule.positionDirtyMark = true; + // 最终帧补偿机制 + bool isAnyOtherExecuting = false; + foreach (var d in ActiveDisplacements) + { + if (d != this && d.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (d.positionX.returnType is FlexibleReturnType.MiddleExecuting || + d.positionY.returnType is FlexibleReturnType.MiddleExecuting || + d.positionZ.returnType is FlexibleReturnType.MiddleExecuting) + { + isAnyOtherExecuting = true; + break; + } + } + } + + if (!isAnyOtherExecuting) + { + animationReturnType = FlexibleReturnType.MiddleExecuting; + Vector3 currentPosition = new Vector3(positionX.value, positionY.value, positionZ.value); + targetTransformSubmodule.positionOffset += currentPosition; + targetTransformSubmodule.positionDirtyMark = true; + } } else { diff --git a/Assets/Scripts/Game/Animations/Transform/Scale.cs b/Assets/Scripts/Game/Animations/Transform/Scale.cs index 83e1a0fa..e060a235 100644 --- a/Assets/Scripts/Game/Animations/Transform/Scale.cs +++ b/Assets/Scripts/Game/Animations/Transform/Scale.cs @@ -11,8 +11,14 @@ namespace Ichni.RhythmGame #region [暴露属性字段与关联] Exposed Fields & References public TransformSubmodule targetTransformSubmodule; public FlexibleFloat scaleX, scaleY, scaleZ; + + // 静态跟踪全局激活的Scale组件，为了方便同物体的跨动画状态感应 + public static HashSet ActiveScales = new HashSet(); #endregion + protected void OnEnable() { ActiveScales.Add(this); } + protected void OnDisable() { ActiveScales.Remove(this); } + #region [生命周期与工厂] Lifecycle & Factory public static Scale GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, @@ -49,21 +55,65 @@ namespace Ichni.RhythmGame scaleY.UpdateFlexibleFloat(songTime); scaleZ.UpdateFlexibleFloat(songTime); - if (forceUpdate || scaleX.returnType is FlexibleReturnType.MiddleExecuting || - scaleY.returnType is FlexibleReturnType.MiddleExecuting || - scaleZ.returnType is FlexibleReturnType.MiddleExecuting) + bool isMiddleExecuting = scaleX.returnType is FlexibleReturnType.MiddleExecuting || + scaleY.returnType is FlexibleReturnType.MiddleExecuting || + scaleZ.returnType is FlexibleReturnType.MiddleExecuting; + + bool isSwitching = scaleX.isSwitchingReturnType || scaleY.isSwitchingReturnType || scaleZ.isSwitchingReturnType; + + if (forceUpdate || isMiddleExecuting) { if(!forceUpdate) animationReturnType = FlexibleReturnType.MiddleExecuting; - Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value); - targetTransformSubmodule.scaleOffset += currentScale; - targetTransformSubmodule.scaleDirtyMark = true; + + // 检查是否是刚开始的第一帧，且有其它同类动画正在收尾（避免两帧叠加导致 ScaleX2） + bool shouldSkipFirstFrame = false; + if (!forceUpdate && isSwitching) + { + foreach (var s in ActiveScales) + { + if (s != this && s.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (s.scaleX.isSwitchingReturnType || s.scaleY.isSwitchingReturnType || s.scaleZ.isSwitchingReturnType) + { + shouldSkipFirstFrame = true; + break; + } + } + } + } + + if (!shouldSkipFirstFrame) + { + Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value); + targetTransformSubmodule.scaleOffset += currentScale; + targetTransformSubmodule.scaleDirtyMark = true; + } } - else if (scaleX.isSwitchingReturnType || scaleY.isSwitchingReturnType || scaleZ.isSwitchingReturnType) + else if (isSwitching) { - //animationReturnType = FlexibleReturnType.MiddleExecuting; - //Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value); - //targetTransformSubmodule.scaleOffset += currentScale; - //targetTransformSubmodule.scaleDirtyMark = true; + // 【收尾保护】如果这个动画是附着物体的“最后的动画”的结束，额外更新彻底将其设为终定值 + bool isAnyOtherExecuting = false; + foreach (var s in ActiveScales) + { + if (s != this && s.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (s.scaleX.returnType is FlexibleReturnType.MiddleExecuting || + s.scaleY.returnType is FlexibleReturnType.MiddleExecuting || + s.scaleZ.returnType is FlexibleReturnType.MiddleExecuting) + { + isAnyOtherExecuting = true; + break; + } + } + } + + if (!isAnyOtherExecuting) + { + animationReturnType = FlexibleReturnType.MiddleExecuting; // 使系统认为有有效活动 + Vector3 currentScale = new Vector3(scaleX.value, scaleY.value, scaleZ.value); + targetTransformSubmodule.scaleOffset += currentScale; + targetTransformSubmodule.scaleDirtyMark = true; + } } else { diff --git a/Assets/Scripts/Game/Animations/Transform/Swirl.cs b/Assets/Scripts/Game/Animations/Transform/Swirl.cs index 6f9a7ed6..81b44092 100644 --- a/Assets/Scripts/Game/Animations/Transform/Swirl.cs +++ b/Assets/Scripts/Game/Animations/Transform/Swirl.cs @@ -12,8 +12,13 @@ namespace Ichni.RhythmGame #region [暴露属性字段与关联] Exposed Fields & References private TransformSubmodule targetTransformSubmodule; public FlexibleFloat eulerAngleX, eulerAngleY, eulerAngleZ; + + public static HashSet ActiveSwirls = new HashSet(); #endregion + protected void OnEnable() { ActiveSwirls.Add(this); } + protected void OnDisable() { ActiveSwirls.Remove(this); } + #region [生命周期与工厂] Lifecycle & Factory public static Swirl GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, @@ -43,22 +48,65 @@ namespace Ichni.RhythmGame eulerAngleY.UpdateFlexibleFloat(songTime); eulerAngleZ.UpdateFlexibleFloat(songTime); - if (forceUpdate || eulerAngleX.returnType is FlexibleReturnType.MiddleExecuting || - eulerAngleY.returnType is FlexibleReturnType.MiddleExecuting || - eulerAngleZ.returnType is FlexibleReturnType.MiddleExecuting) + bool isMiddleExecuting = eulerAngleX.returnType is FlexibleReturnType.MiddleExecuting || + eulerAngleY.returnType is FlexibleReturnType.MiddleExecuting || + eulerAngleZ.returnType is FlexibleReturnType.MiddleExecuting; + + bool isSwitching = eulerAngleX.isSwitchingReturnType || eulerAngleY.isSwitchingReturnType || eulerAngleZ.isSwitchingReturnType; + + if (forceUpdate || isMiddleExecuting) { if(!forceUpdate) animationReturnType = FlexibleReturnType.MiddleExecuting; - Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value); - targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles; - targetTransformSubmodule.eulerAnglesDirtyMark = true; + + // 首帧合并退让保护 + bool shouldSkipFirstFrame = false; + if (!forceUpdate && isSwitching) + { + foreach (var s in ActiveSwirls) + { + if (s != this && s.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (s.eulerAngleX.isSwitchingReturnType || s.eulerAngleY.isSwitchingReturnType || s.eulerAngleZ.isSwitchingReturnType) + { + shouldSkipFirstFrame = true; + break; + } + } + } + } + + if (!shouldSkipFirstFrame) + { + Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value); + targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles; + targetTransformSubmodule.eulerAnglesDirtyMark = true; + } } - else if (eulerAngleX.isSwitchingReturnType || eulerAngleY.isSwitchingReturnType || eulerAngleZ.isSwitchingReturnType) + else if (isSwitching) { - //animationReturnType = FlexibleReturnType.MiddleExecuting; - //Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value); - //targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles; - //Debug.Break(); - //targetTransformSubmodule.eulerAnglesDirtyMark = true; + // 最终帧补偿机制 + bool isAnyOtherExecuting = false; + foreach (var s in ActiveSwirls) + { + if (s != this && s.targetTransformSubmodule == this.targetTransformSubmodule) + { + if (s.eulerAngleX.returnType is FlexibleReturnType.MiddleExecuting || + s.eulerAngleY.returnType is FlexibleReturnType.MiddleExecuting || + s.eulerAngleZ.returnType is FlexibleReturnType.MiddleExecuting) + { + isAnyOtherExecuting = true; + break; + } + } + } + + if (!isAnyOtherExecuting) + { + animationReturnType = FlexibleReturnType.MiddleExecuting; + Vector3 currentEulerAngles = new Vector3(eulerAngleX.value, eulerAngleY.value, eulerAngleZ.value); + targetTransformSubmodule.eulerAnglesOffset += currentEulerAngles; + targetTransformSubmodule.eulerAnglesDirtyMark = true; + } } else { diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs index b4178f87..19dbd3f9 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/HighPassFilterEffect.cs @@ -1,40 +1,92 @@ using Ichni.RhythmGame.Beatmap; -using Lean.Pool; using UnityEngine; namespace Ichni.RhythmGame { - public class HighPassFilterEffect : EffectBase + /// + /// 高通滤波效果（Wwise RTPC 驱动版）。 + /// 在 Wwise 中需要创建名为 "Song_Highpass" 的 RTPC（范围 0~100）， + /// 并将其连接到 Music Bus 的 High-Pass Filter 参数（Built-in Parameter）。 + /// + /// BM 中存储的 peak 是 Unity AudioHighPassFilter.cutoffFrequency（Hz）， + /// 运行时使用对数公式转换为 Wwise RTPC（0~100），保持与 Unity 编辑器中一致的感知效果。 + /// 转换公式：rtpc = (ln(currentFreq) - ln(minFreq)) / (ln(maxFreq) - ln(minFreq)) * 100 + /// + /// 示例：3500 Hz → RTPC ≈ 76（与编辑器中 Unity HPF 3500Hz 感知等效） + /// + public partial class HighPassFilterEffect : EffectBase { #region [效果参数] Effect Parameters + // peak：BM 中存储的目标截止频率（Hz），语义与 Unity AudioHighPassFilter.cutoffFrequency 一致 public float peak; + public bool useEQ; public AnimationCurve intensityCurve; + + private const string RtpcName = "Song_Highpass"; + + // 人耳可听范围边界 + private const float MinFrequency = 20f; // 对应 RTPC = 0（无滤波） + private const float MaxFrequency = 20000f; // 对应 RTPC = 100（完全截止） + + // 幂次指数：调节频率到 RTPC 的曲线弯曲程度 + // 1.0 = 纯线性（效果太弱） + // 0.5 = 接近对数（效果太强） + // 0.65 = 推荐起点，可根据实际测试微调（向 1.0 调弱，向 0.5 调强） + private const float PowerExponent = 0.25f; #endregion - + #region [初始化] Initialization - public HighPassFilterEffect(float effectTime, float peak, AnimationCurve intensityCurve) + public HighPassFilterEffect(float effectTime, float peak, bool useEQ, AnimationCurve intensityCurve) + : base(effectTime) { - this.effectTime = 0; this.effectTime = effectTime; this.peak = peak; + this.useEQ = useEQ; this.intensityCurve = intensityCurve; } #endregion - - #region [效果逻辑覆盖] Effect Pattern Overrides - public override void Adjust() + + #region [频率转换] Hz → Wwise RTPC + /// + /// 将频率值（Hz）通过幂次曲线映射到 Wwise HPF RTPC（0~100）。 + /// 10 Hz → 0（无滤波），22000 Hz → 100（完全截止）。 + /// 调整 PowerExponent 可改变曲线弯曲程度：越小越像对数（强），越接近 1 越线性（弱）。 + /// + private static float FrequencyToRtpc(float frequencyHz) { - /*MMF_Player effect = LeanPool.Spawn(GameManager.Instance.basePrefabs.highPassFilterEffect).GetComponent(); - effect.GetFeedbackOfType().effectTime = effectTime; - effect.GetFeedbackOfType().RemapHighPassZero = 10; - effect.GetFeedbackOfType().RemapHighPassOne = peak; - effect.GetFeedbackOfType().ShakeHighPass = intensityCurve; - effect.PlayFeedbacks(); - LeanPool.Despawn(effect.gameObject, effectTime);*/ + float clampedFreq = Mathf.Clamp(frequencyHz, MinFrequency, MaxFrequency); + // 先归一化到 0~1（线性） + float normalized = (clampedFreq - MinFrequency) / (MaxFrequency - MinFrequency); + // 幂次变换：compressed = normalized^exponent，使曲线在低频段更灵敏 + float shaped = Mathf.Pow(normalized, PowerExponent); + return Mathf.Clamp(shaped * 100f, 0f, 100f); } #endregion + #region [效果逻辑覆盖] Effect Pattern Overrides + public override void PreExecute() { } + + public override void Execute() + { + // 在 10Hz（无效果）与 peak Hz（最强截止）之间基于曲线插值 + float intensity = intensityCurve != null ? intensityCurve.Evaluate(effectProgressPercent) : 0f; + float currentFreq = Mathf.Lerp(MinFrequency, peak, intensity); + + // 对数映射到 Wwise RTPC + float rtpcValue = FrequencyToRtpc(currentFreq); + GameManager.Instance.songPlayer.HighPassFilter.SetValue(GameManager.Instance.songPlayer.gameObject, rtpcValue); + } + + public override void Adjust() { ResetEffect(); } + public override void Recover() { ResetEffect(); } + public override void Disrupt() { ResetEffect(); } + + private void ResetEffect() + { + // RTPC = 0 → 10Hz → 无滤波 + GameManager.Instance.songPlayer.HighPassFilter.SetValue(GameManager.Instance.songPlayer.gameObject, 0f); + Debug.Log("HighPassFilterEffect reset: RTPC set to 0 (10Hz, no filter)"); + } + #endregion } - } - diff --git a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs index 959cac22..5a1f1a07 100644 --- a/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs +++ b/Assets/Scripts/Game/GameElements/GeneralEffects/MusicEffects/LowPassFilterEffect.cs @@ -1,42 +1,89 @@ -using System.Collections; -using System.Collections.Generic; using Ichni.RhythmGame.Beatmap; -using Lean.Pool; using UnityEngine; namespace Ichni.RhythmGame { - public class LowPassFilterEffect : EffectBase + /// + /// 低通滤波效果（Wwise RTPC 驱动版）。 + /// 在 Wwise 中需要创建名为 "Song_Lowpass" 的 RTPC（范围 0~100）， + /// 并将其连接到 Music Bus 的 Low-Pass Filter 参数（Built-in Parameter）。 + /// + /// BM 中存储的 bottom 是 Unity AudioLowPassFilter.cutoffFrequency（Hz）， + /// 运行时使用对数公式转换为 Wwise RTPC（0~100），保持与 Unity 编辑器中一致的感知效果。 + /// 转换公式：rtpc = (ln(maxFreq) - ln(currentFreq)) / (ln(maxFreq) - ln(minFreq)) * 100 + /// + public partial class LowPassFilterEffect : EffectBase { #region [效果参数] Effect Parameters + // bottom：BM 中存储的目标截止频率（Hz），语义与 Unity AudioLowPassFilter.cutoffFrequency 一致 public float bottom; + public bool useEQ; public AnimationCurve intensityCurve; + + private const string RtpcName = "Song_Lowpass"; + + // 人耳可听范围边界 + private const float MinFrequency = 20f; // 对应 RTPC = 100（完全截止） + private const float MaxFrequency = 20000f; // 对应 RTPC = 0（无滤波） + + // 幂次指数：调节频率到 RTPC 的曲线弯曲程度 + // 1.0 = 纯线性（效果太弱） + // 0.5 = 接近对数（效果太强） + // 0.65 = 推荐起点，可根据实际测试微调（向 1.0 调弱，向 0.5 调强） + private const float PowerExponent = 0.25f; #endregion - + #region [初始化] Initialization - public LowPassFilterEffect(float effectTime, float bottom, AnimationCurve intensityCurve) + public LowPassFilterEffect(float effectTime, float bottom, bool useEQ, AnimationCurve intensityCurve) + : base(effectTime) { - this.effectTime = 0; this.effectTime = effectTime; this.bottom = bottom; + this.useEQ = useEQ; this.intensityCurve = intensityCurve; } #endregion - - #region [效果逻辑覆盖] Effect Pattern Overrides - public override void Adjust() + + #region [频率转换] Hz → Wwise RTPC + /// + /// 将频率值（Hz）通过幂次曲线映射到 Wwise LPF RTPC（0~100）。 + /// 22000 Hz → 0（无滤波），趋近 10 Hz → 100（完全截止）。 + /// 调整 PowerExponent 可改变曲线弯曲程度：越小越像对数（强），越接近 1 越线性（弱）。 + /// + private static float FrequencyToRtpc(float frequencyHz) { - /*MMF_Player effect = LeanPool.Spawn(GameManager.Instance.basePrefabs.lowPassFilterEffect).GetComponent(); - effect.GetFeedbackOfType().effectTime = effectTime; - effect.GetFeedbackOfType().RemapLowPassZero = 22000; - effect.GetFeedbackOfType().RemapLowPassOne = bottom; - effect.GetFeedbackOfType().ShakeLowPass = intensityCurve; - effect.PlayFeedbacks(); - LeanPool.Despawn(effect.gameObject, effectTime);*/ + float clampedFreq = Mathf.Clamp(frequencyHz, MinFrequency, MaxFrequency); + // 先归一化：频率大 = 房内线性值大（无滤波方向） + float normalized = (clampedFreq - MinFrequency) / (MaxFrequency - MinFrequency); + // 幂次变换，然后反转（频率越低 = RTPC 越高 = 截止越强） + float shaped = Mathf.Pow(normalized, PowerExponent); + return Mathf.Clamp((1f - shaped) * 100f, 0f, 100f); } #endregion + #region [效果逻辑覆盖] Effect Pattern Overrides + public override void PreExecute() { } + + public override void Execute() + { + // 在 22000Hz（无效果）与 bottom Hz（最强截止）之间基于曲线插值 + float intensity = intensityCurve != null ? intensityCurve.Evaluate(effectProgressPercent) : 0f; + float currentFreq = Mathf.Lerp(MaxFrequency, bottom, intensity); + + // 对数映射到 Wwise RTPC + float rtpcValue = FrequencyToRtpc(currentFreq); + GameManager.Instance.songPlayer.LowPassFilter.SetValue(GameManager.Instance.songPlayer.gameObject, rtpcValue); + } + + public override void Adjust() { ResetEffect(); } + public override void Recover() { ResetEffect(); } + public override void Disrupt() { ResetEffect(); } + + private void ResetEffect() + { + // RTPC = 0 → 22000Hz → 无滤波 + GameManager.Instance.songPlayer.LowPassFilter.SetValue(GameManager.Instance.songPlayer.gameObject, 0f); + } + #endregion } - } - diff --git a/Assets/Scripts/Manager/SongPlayer.cs b/Assets/Scripts/Manager/SongPlayer.cs index e1c8d09a..d60d9474 100644 --- a/Assets/Scripts/Manager/SongPlayer.cs +++ b/Assets/Scripts/Manager/SongPlayer.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using AK.Wwise; using Sirenix.OdinInspector; using SLSUtilities.WwiseAssistance; using UnityEngine; @@ -21,6 +22,9 @@ namespace Ichni public Event ResumeMusicEvent; // 恢复播放背景音乐的事件 public Event PauseMusicEvent; // 暂停播放背景音乐的事件 public Event StopMusicEvent; // 停止播放背景音乐的事件 + + public RTPC HighPassFilter; + public RTPC LowPassFilter; private uint _playingId; public float songTimeSegment = 0; @@ -36,6 +40,7 @@ namespace Ichni InformationTransistor.instance.songSwitch.SetValue(gameObject); isLoading = true; isStarting = false; + } private void Update() @@ -73,12 +78,31 @@ namespace Ichni if (isPlaying) { + // 获取底层 Wwise 的当前正确时间 float currentSongSegment = PlaySegment() / 1000f - (judgeOffset / 1000f); - if (recordedSongSeg < currentSongSegment) + // 1. 让游戏时间先基于引擎渲染帧线性平滑推进 + songTimeSegment += Time.deltaTime * Time.timeScale; + + // 2. 计算当前平滑时间与底层实际音频时间的误差 + float difference = currentSongSegment - songTimeSegment; + + // 3. 时间校准逻辑 + // 如果偏差非常大（例如超过 50ms），说明游戏发生过卡顿停顿，强行同步消除误差 + if (Mathf.Abs(difference) > 0.05f) { songTimeSegment = currentSongSegment; - recordedSongSeg = currentSongSegment; + } + else + { + // 如果在正常范围内，使用微调去柔和追击这个误差，避免肉眼看到跳变（Jitter） + songTimeSegment += difference * 0.1f; + } + + // 保证时间不要神奇地倒退影响铺面逻辑 + if (songTimeSegment > recordedSongSeg) + { + recordedSongSeg = songTimeSegment; } } else if (isPausing) @@ -155,7 +179,7 @@ namespace Ichni int PlaySegment() { AkSegmentInfo segmentInfo = new AkSegmentInfo(); - AkSoundEngine.GetPlayingSegmentInfo(_playingId, segmentInfo,true); + AkUnitySoundEngine.GetPlayingSegmentInfo(_playingId, segmentInfo,true); return segmentInfo.iCurrentPosition; } diff --git a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h index d6092928..f63a61b4 100644 --- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h +++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h @@ -32,6 +32,21 @@ namespace AK static const AkUniqueID TOUCHTOSTART = 3357374771U; } // namespace EVENTS + namespace STATES + { + namespace NEW_STATE_GROUP + { + static const AkUniqueID GROUP = 2012657067U; + + namespace STATE + { + static const AkUniqueID NEW_STATE = 2021425847U; + static const AkUniqueID NONE = 748895195U; + } // namespace STATE + } // namespace NEW_STATE_GROUP + + } // namespace STATES + namespace SWITCHES { namespace CHAPTER @@ -93,6 +108,8 @@ namespace AK static const AkUniqueID PREVIEW_HIGHPASS = 4043093737U; static const AkUniqueID PREVIEW_LOWPASS = 363065643U; static const AkUniqueID PREVIEW_VOLUME = 2183069388U; + static const AkUniqueID SONG_EQ_FX_HIGHPASS = 1952074036U; + static const AkUniqueID SONG_EQ_FX_LOWPASS = 2159946616U; static const AkUniqueID SONG_HIGHPASS = 2191510614U; static const AkUniqueID SONG_LOWPASS = 3534982690U; static const AkUniqueID SONG_VOLUME = 2936015903U; diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 index d7e8c276..69b1f8cf 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 and b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest index fa562c5d..49c99e3a 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3651626393 +CRC: 2895117961 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse index b2cabc7e..f4625031 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse and b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest index 02562ad4..1abbd70f 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3493843915 +CRC: 1469715876 Hashes: AssetFileHash: serializedVersion: 2 - Hash: b83a70f98dab7639eabb8a7252d8a2ad + Hash: aea9f9c02d44ccbc30ef1a729b282012 TypeTreeHash: serializedVersion: 2 Hash: 8b453097cf816e7e6fe791950bd1564f IncrementalBuildHash: serializedVersion: 2 - Hash: 6b1fc4a47cbe62f4b9b11bf69bc4aa5a + Hash: 3ce5f6108ef84d1dc007dd85d000648a HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail_Sparks.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail_Sparks.mat index b2f057ae..07930b46 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail_Sparks.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/DTM_Trail_Sparks.mat @@ -83,7 +83,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: f70c6f348e906194489ca94eceafce16, type: 3} + m_Texture: {fileID: 2800000, guid: 801a03839a65e3042abae742e903cb62, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTexture: diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab index 3064c2c2..8f185e59 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab @@ -5127,7 +5127,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4577072593820393136} serializedVersion: 8 - lengthInSec: 100 + lengthInSec: 0.5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -5202,7 +5202,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 100 + scalar: 0.5 minScalar: 5 maxCurve: serializedVersion: 2 @@ -5690,7 +5690,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 gravitySource: 0 - maxNumParticles: 10 + maxNumParticles: 1 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -6116,7 +6116,7 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - cycleCount: 1 + cycleCount: 0 repeatInterval: 0.01 probability: 1 SizeModule: @@ -10004,7 +10004,7 @@ GameObject: - component: {fileID: 4577072593858437035} - component: {fileID: 4577072593858437034} m_Layer: 0 - m_Name: Beam1_Blue + m_Name: Main m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14885,7 +14885,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4577072594143320190} serializedVersion: 8 - lengthInSec: 100 + lengthInSec: 0.5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -14960,7 +14960,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 100 + scalar: 0.5 minScalar: 5 maxCurve: serializedVersion: 2 @@ -15448,7 +15448,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 gravitySource: 0 - maxNumParticles: 5 + maxNumParticles: 1 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 @@ -15874,7 +15874,7 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - cycleCount: 1 + cycleCount: 0 repeatInterval: 0.01 probability: 1 SizeModule: @@ -20037,8 +20037,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.8 - minScalar: 0.4 + scalar: 0.5 + minScalar: 0.3 maxCurve: serializedVersion: 2 m_Curve: @@ -20501,7 +20501,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 0.25 + value: 0.15 mode: 0 spread: 0 speed: @@ -20620,7 +20620,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 8 + scalar: 4 minScalar: 10 maxCurve: serializedVersion: 2 diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index 5c1f1bd4..28a0076c 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae08c61a44fa2631f1ec3c8a89a3abef05c12b0da27c1e6aeafa96a3013c19e3 -size 57886 +oid sha256:1cb80e3125f963a32dd3373ef7cf8255d30a78cd6c1b02bc2f9f26527e25108b +size 60777 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset b/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset new file mode 100644 index 00000000..ec6565b4 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6779c2936a650166c7e79226faba8cf4efbe9c7a5c477544aa61b195ac98fa55 +size 570 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset.meta b/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset.meta new file mode 100644 index 00000000..f665606e --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/329D5739-94A4-4CB2-BDC5-ECAAB3909372.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2506771a66ac1e84f80022e7212bfc01 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset b/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset new file mode 100644 index 00000000..f9024a7b --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:506fa1209c64b0db13e164453a1f91442f3f6714532f08d774908692db854e5d +size 562 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset.meta b/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset.meta new file mode 100644 index 00000000..44618bd3 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/8397044C-D218-4563-BE83-0CFFD54FEE39.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c32e34ea99232f458493953716f7aa3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset b/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset new file mode 100644 index 00000000..ae9cdcbe --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1729d58e238851a39709862ca9c4f3e59f955fd897bafaf49e708fd2fa856d9a +size 564 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset.meta b/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset.meta new file mode 100644 index 00000000..9cddb509 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/9595CF69-65FC-4731-85D1-239E39EB5F87.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d99b9cf72001bb4b8f5662d3f5718b2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset b/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset new file mode 100644 index 00000000..394f81d5 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29861cb01d2362aaa28a9394c49698c9abd7a102c477923706af46eeae2c0191 +size 569 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset.meta b/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset.meta new file mode 100644 index 00000000..e7a5d174 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/D4FD2DF9-5BEA-4EEC-BAB2-2CD641CB1646.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ad6d003174f1ae4387341238ade2cb4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset b/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset new file mode 100644 index 00000000..4d4f0b24 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:802149a97eb9b0faa062b3f79a2899469bbcf8819c01f65724b79ff12952da29 +size 563 diff --git a/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset.meta b/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset.meta new file mode 100644 index 00000000..18d9a59f --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/GameParameter/EC0BC6C0-68C4-4C2D-820B-74249581E738.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60c1458d8e2ea0047a3fc10673df8ffc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f9634ba3..c835614d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45d819846cf5948ae39ba203143e9acc99471cdd53620b973738d751580abb4c -size 28828 +oid sha256:550712f2a24e57448e692e17d6d96ac75a03fbae6016a1b3ac70d253f2351457 +size 28880 diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 1568be33..009463fe 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 55 + controlID: 54 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 112} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 56 + controlID: 55 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 112} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 57 + controlID: 56 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,11 +192,11 @@ MonoBehaviour: x: 0 y: 0 width: 1195.3334 - height: 564 + height: 570 m_MinSize: {x: 200, y: 56} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 58 + controlID: 57 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -216,7 +216,7 @@ MonoBehaviour: x: 0 y: 0 width: 298.66666 - height: 564 + height: 570 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 15} @@ -234,7 +234,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -242,17 +242,17 @@ MonoBehaviour: x: 298.66666 y: 0 width: 896.66675 - height: 564 + height: 570 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 16} - {fileID: 14} - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,9 +269,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 564 + y: 570 width: 1195.3334 - height: 249.33331 + height: 243.33331 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 19} @@ -333,7 +333,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 0 + y: 42.666668 width: 1706.6666 height: 36 m_SerializedDataModeController: @@ -602,7 +602,7 @@ MonoBehaviour: x: 298.6667 y: 78.66667 width: 894.66675 - height: 538 + height: 544 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -651,7 +651,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -661,9 +661,9 @@ MonoBehaviour: x: 0 y: 21 width: 894.66675 - height: 517 + height: 523 m_Scale: {x: 0.6989584, y: 0.6989584} - m_Translation: {x: 447.33337, y: 258.5} + m_Translation: {x: 447.33337, y: 261.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -671,12 +671,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -640 - y: -369.83603 + y: -374.12814 width: 1280 - height: 739.67206 + height: 748.2563 m_MinimalGUI: 1 m_defaultScale: 0.6989584 - m_LastWindowPixelSize: {x: 894.66675, y: 538} + m_LastWindowPixelSize: {x: 1342.0001, y: 816} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -706,9 +706,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 78.66667 width: 297.66666 - height: 538 + height: 544 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -729,9 +729,7 @@ MonoBehaviour: m_LastClickedID: m_Data: 0 m_ExpandedIDs: - - m_Data: -5200 - - m_Data: 68580 - - m_Data: 68598 + - m_Data: -1338 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -779,10 +777,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 299.66666 - y: 24 + x: 298.6667 + y: 78.66667 width: 894.66675 - height: 538 + height: 544 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -895,11 +893,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Light Settings index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -923,11 +921,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Constraints index: 6 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -937,11 +935,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Collisions index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -993,11 +991,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Occlusion Culling index: 8 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1007,11 +1005,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Physics Debugger index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1021,18 +1019,18 @@ MonoBehaviour: displayed: 0 id: Scene View/Scene Visibility index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 - dockPosition: 1 containerId: overlay-container--right - displayed: 0 + displayed: 1 id: Scene View/Particles index: 11 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-232.0,"y":-202.66668701171876},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' @@ -1231,11 +1229,11 @@ MonoBehaviour: displayed: 0 id: Brush Attributes index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1245,11 +1243,11 @@ MonoBehaviour: displayed: 0 id: unity-tool-contexts-toolbar index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1273,11 +1271,11 @@ MonoBehaviour: displayed: 0 id: Terrain Tools index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1287,11 +1285,11 @@ MonoBehaviour: displayed: 0 id: Brush Masks index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1301,11 +1299,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Lighting Visualization Colors index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1329,11 +1327,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Tile Palette Clipboard index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1343,11 +1341,11 @@ MonoBehaviour: displayed: 0 id: Scene View/PBR Validation Settings index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1357,11 +1355,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Tile Palette Brush Pick index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1371,11 +1369,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Sprite Swap index: 15 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1385,11 +1383,11 @@ MonoBehaviour: displayed: 0 id: SceneView/CamerasOverlay index: 16 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.333332061767579},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25.333332} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -1437,9 +1435,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -4.9583726, y: 41.911694, z: -67.22179} + m_Target: {x: 224.24973, y: 0, z: 3.1823473} speed: 2 - m_Value: {x: 0.0961701, y: -0.025038881, z: -0.73378515} + m_Value: {x: 224.24973, y: 0, z: 3.1823473} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1485,17 +1483,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.003131636, y: -0.99237376, z: -0.12167186, w: -0.025189295} + m_Target: {x: -0.057881955, y: -0.9295551, z: 0.32463765, w: -0.16567348} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.057874423, y: -0.9294341, z: 0.3245954, w: -0.16565192} m_Size: - m_Target: 47.974464 + m_Target: 0.8660254 speed: 2 - m_Value: 0.7283937 + m_Value: 0.8660254 m_Ortho: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1509,7 +1507,7 @@ MonoBehaviour: m_FarClip: 1000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.08635472, y: -0.90288734, z: 0.21522357, w: 0.36232075} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 16} @@ -1547,10 +1545,10 @@ MonoBehaviour: m_TextWithWhitespace: "Animator\u200B" m_Pos: serializedVersion: 2 - x: -2112 - y: -7.9999924 - width: 1342.6666 - height: 871.3333 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1674,10 +1672,10 @@ MonoBehaviour: m_TextWithWhitespace: "Rendering Debugger\u200B" m_Pos: serializedVersion: 2 - x: -2112 - y: -7.9999924 - width: 1342.6666 - height: 870.6667 + x: 298.6667 + y: 78.66667 + width: 894.66675 + height: 544 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1718,9 +1716,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 588 + y: 648.6667 width: 1194.3334 - height: 223.33331 + height: 217.33331 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1745,7 +1743,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/ThemeBundles/DepartureToMultiverse/Materials/Track + - Packages/com.unity.2d.animation/Editor/SpriteLib/SpriteSwapOverlay m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1755,25 +1753,20 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/ThemeBundles/DepartureToMultiverse/Materials/Track + - Packages/com.unity.2d.animation/Editor/SpriteLib/SpriteSwapOverlay m_LastFoldersGridSize: 16 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_LastLocalAssetsSearchArea: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 587} + scrollPos: {x: 0, y: 586.6667} m_SelectedIDs: - - m_Data: 68246 + - m_Data: 84694 m_LastClickedID: - m_Data: 68246 + m_Data: 84694 m_ExpandedIDs: - m_Data: 0 - - m_Data: 67516 - - m_Data: 67518 - - m_Data: 67520 - - m_Data: 67522 - - m_Data: 67524 - m_Data: 67526 - m_Data: 67528 - m_Data: 67530 @@ -1831,10 +1824,21 @@ MonoBehaviour: - m_Data: 67634 - m_Data: 67636 - m_Data: 67638 + - m_Data: 67640 + - m_Data: 67642 + - m_Data: 67644 + - m_Data: 67648 + - m_Data: 67650 + - m_Data: 84696 + - m_Data: 84698 + - m_Data: 84700 + - m_Data: 84926 + - m_Data: 1000000000 + - m_Data: 2147483647 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Prefabs + m_OriginalName: Prefabs m_EditFieldRect: serializedVersion: 2 x: 0 @@ -1842,10 +1846,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 0 + m_Data: 68060 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 11} @@ -1863,11 +1867,6 @@ MonoBehaviour: m_Data: 0 m_ExpandedIDs: - m_Data: 0 - - m_Data: 67516 - - m_Data: 67518 - - m_Data: 67520 - - m_Data: 67522 - - m_Data: 67524 - m_Data: 67526 - m_Data: 67528 - m_Data: 67530 @@ -1925,6 +1924,12 @@ MonoBehaviour: - m_Data: 67634 - m_Data: 67636 - m_Data: 67638 + - m_Data: 67640 + - m_Data: 67642 + - m_Data: 67644 + - m_Data: 67646 + - m_Data: 67648 + - m_Data: 67650 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1961,8 +1966,8 @@ MonoBehaviour: - m_Data: 68026 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Story + m_OriginalName: Story m_EditFieldRect: serializedVersion: 2 x: 0 @@ -1970,10 +1975,10 @@ MonoBehaviour: width: 0 height: 0 m_UserData: - m_Data: 0 + m_Data: 68090 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 m_ClientGUIView: {fileID: 11} @@ -2011,9 +2016,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 642.6667 + y: 648.6667 width: 1194.3334 - height: 223.33331 + height: 217.33331 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2091,9 +2096,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 643.3334 + y: 648.6667 width: 1194.3334 - height: 222.66669 + height: 217.33331 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2129,8 +2134,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1196.3334 - y: 24 + x: 1195.3334 + y: 78.66667 width: 510.33325 height: 787.3333 m_SerializedDataModeController: @@ -2149,7 +2154,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 312.99988 + m_CachedPref: -312.99988 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -2204,7 +2209,7 @@ MonoBehaviour: m_CachedPref: 184.33334 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 59760 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 @@ -2235,8 +2240,8 @@ MonoBehaviour: serializedVersion: 2 x: 1195.3334 y: 78.66667 - width: 510.33337 - height: 787.3334 + width: 510.33325 + height: 787.3333 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2256,7 +2261,7 @@ MonoBehaviour: m_CachedPref: 165.66669 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 59760 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/ichni Official_WwiseProject/.cache/LMDB/data.mdb b/ichni Official_WwiseProject/.cache/LMDB/data.mdb index 56e2cc75..692096fa 100644 Binary files a/ichni Official_WwiseProject/.cache/LMDB/data.mdb and b/ichni Official_WwiseProject/.cache/LMDB/data.mdb differ diff --git a/ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat b/ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat index 4c66a05a..460bf4db 100644 Binary files a/ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat and b/ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat differ diff --git a/ichni Official_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/ichni Official_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu index 52d9434c..b1aecb3c 100644 --- a/ichni Official_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -912,12 +912,12 @@ 0 - 100 + 0 5 100 - 0 + 100 37 @@ -947,12 +947,12 @@ 0 - 100 + 0 5 100 - 0 + 100 37 diff --git a/ichni Official_WwiseProject/Effects/Default Work Unit.wwu b/ichni Official_WwiseProject/Effects/Default Work Unit.wwu index 247c18d2..39d0d5a0 100644 --- a/ichni Official_WwiseProject/Effects/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Effects/Default Work Unit.wwu @@ -1,6 +1,17 @@ - + + + + + + + + + + + + diff --git a/ichni Official_WwiseProject/Game Parameters/Default Work Unit.wwu b/ichni Official_WwiseProject/Game Parameters/Default Work Unit.wwu index c8e3377b..bffc9959 100644 --- a/ichni Official_WwiseProject/Game Parameters/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Game Parameters/Default Work Unit.wwu @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -36,12 +36,16 @@ - + + + - + + + @@ -49,6 +53,16 @@ + + + + + + + + + + diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.bnk index 24c36d24..2cb4e61a 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.txt index 039735f1..a289da8d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Init.txt @@ -1,3 +1,10 @@ +State Group ID Name Wwise Object Path Notes + 2012657067 New_State_Group \Default Work Unit\New_State_Group + +State ID Name State Group Notes + 748895195 None New_State_Group + 2021425847 New_State New_State_Group + Game Parameter ID Name Wwise Object Path Notes 336603982 SoundFXVolume \Default Work Unit\General\SoundFXVolume 2346531308 MusicVolume \Default Work Unit\General\MusicVolume @@ -10,6 +17,9 @@ Audio Bus ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Master\Music 4056684167 Master \Default Work Unit\Master +Effect plug-ins ID Name Type Notes + 3657550167 New_Parametric_EQ Wwise Parametric EQ + Audio Devices ID Name Type Notes 2317455096 No_Output No Output 3859886410 System System diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/117017922.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/117017922.wem new file mode 100644 index 00000000..c9e00971 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/117017922.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/155392418.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/155392418.wem new file mode 100644 index 00000000..808f5177 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/155392418.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/297299101.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/297299101.wem new file mode 100644 index 00000000..75834cbc Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/297299101.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/449180690.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/449180690.wem new file mode 100644 index 00000000..742c6520 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/Media/449180690.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/PluginInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/PluginInfo.xml index 2d03833c..7c954f84 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/PluginInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/PluginInfo.xml @@ -1,8 +1,9 @@ + - {802CB29E-2A07-E260-0929-231C7A375A1D} + {2D9908DD-F310-B72A-6A93-C4857A60342A} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/SoundbanksInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/SoundbanksInfo.xml index ea16d2f1..8b57633d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/SoundbanksInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/SoundbanksInfo.xml @@ -9,10 +9,13 @@ - + Init Init.bnk + + + @@ -21,21 +24,37 @@ - + + + + + + + + + - + - + + + + + + + + + @@ -74,7 +93,7 @@ - + ichni ichni.bnk @@ -96,9 +115,11 @@ Solitudes.wav E7/{E7A079FC-19C0-27A9-D561-9726E4746299}.wem - + Stay.wav + Media/117017922.wem 17/{17139540-42D9-EBED-486A-3258A9B89B88}.wem + 2954 影虎。 - Last Remains (1).wav @@ -108,9 +129,11 @@ 影虎。 - Last Remains (1).wav 9D/{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem - + flick.wav + Media/155392418.wem A4/{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem + 3186 Your Shadow.wav @@ -136,9 +159,11 @@ OERA - register@fantobia.wav 02/{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem - + hold end.wav + Media/297299101.wem DC/{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem + 3380 Fate Of Fear.wav @@ -160,9 +185,11 @@ DJ_SoraArshi _Chaos Zone_Bpm200.wav 23/{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem - + tap.wav + Media/449180690.wem 86/{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem + 2756 LWS2 - SHENG.wav @@ -293,6 +320,12 @@ A2/{A2750C0F-53AE-CCED-9BA6-EE645C954830}.wem + + + + + + @@ -484,78 +517,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -567,48 +678,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -634,10 +793,12 @@ + + - + - + @@ -679,5 +840,5 @@ - {8067B477-89EA-9C7E-3ECD-FBA2B2ADB127} + {18202000-687D-B92B-2BB1-A6DA73841FB9} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.bnk index 7f67bdb5..7b45941d 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.txt index 3ee632bd..cbd3f2a3 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Android/ichni.txt @@ -49,34 +49,40 @@ Switch ID Name Switch Group Notes Game Parameter ID Name Wwise Object Path Notes 363065643 Preview_Lowpass \Default Work Unit\Menu\Preview_Lowpass + 1952074036 Song_EQ_FX_Highpass \Default Work Unit\Game\Song_EQ_FX_Highpass + 2159946616 Song_EQ_FX_Lowpass \Default Work Unit\Game\Song_EQ_FX_Lowpass 2183069388 Preview_Volume \Default Work Unit\Menu\Preview_Volume 2191510614 Song_Highpass \Default Work Unit\Game\Song_Highpass 2936015903 Song_Volume \Default Work Unit\Game\Song_Volume 3534982690 Song_Lowpass \Default Work Unit\Game\Song_Lowpass 4043093737 Preview_Highpass \Default Work Unit\Menu\Preview_Highpass +Effect plug-ins ID Name Type Notes + 634184631 Highpass Wwise Parametric EQ + 789380690 Lowpass Wwise Parametric EQ + In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size 38389979 Absolutely：0 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A6\{A6CC8C62-FA05-7B7E-3CF0-61027837024C}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Absolutely：0\Absolutely：0 2790984 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold 2879 63536287 asymptotical stability feat_ 花隈千冬 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E2\{E266A4D6-7FE1-CCBE-CEF9-1617700D6148}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\asymptotical stability feat_ 花隈千冬 546411 96387914 Solitudes D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E7\{E7A079FC-19C0-27A9-D561-9726E4746299}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Solitudes\Solitudes 3099804 - 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 7027 + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 2954 133621670 影虎。 - Last Remains D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\6E\{6E6709A0-B267-28AF-2973-BA0935BD53DE}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\影虎。 - Last Remains 353612 138413318 影虎。 - Last Remains (1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\9D\{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Last Remains\影虎。 - Last Remains (1) 3098495 - 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 5235 + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 3186 158073328 YourShadow D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\2A\{2ACE4F97-1AB5-99A4-7152-AE49B1BEA5FA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\YourShadow 560183 162440105 SelectDifficulty D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\38\{381B6FA0-78E9-4375-536E-D1F624BC57A5}.wem \Actor-Mixer Hierarchy\Default Work Unit\MenuUI\SongSelection\SelectDifficulty 7871 250022371 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\94\{94D596BB-318A-3919-6251-03B25CDF17E4}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Fate Of Fear\Fate Of Fear 2581016 252332174 Space Rain D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\42\{42C14792-6B82-D8E8-5AF8-258CB844A795}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Space Rain\Space Rain 2591745 267185326 Mr_ Weq - Lunar Shade D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C1\{C1D044C9-11CE-EE4A-504D-D5A5B5DD955E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Mr_ Weq - Lunar Shade\Mr_ Weq - Lunar Shade 2180184 282623311 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\02\{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\OERA - register@fantobia 686573 - 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 16427 + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 3380 311563945 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C9\{C98B786F-4A27-6363-FB81-FF9987B9C8EA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Fate Of Fear 495080 323831960 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C8\{C8362DE2-9020-58AC-75E8-A02B91D8A690}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\OERA - register @fantobia\OERA - register@fantobia 3505214 327648178 Chapter 0 Tutorial D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DF\{DFECFF67-99F1-C319-ACB5-91DEC00F5294}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Chapter 0 Tutorial\Chapter 0 Tutorial 2318534 348654809 氷点 - Chikanya 3版 (1)(1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E5\{E53780CB-353B-62A2-7F1C-41F9AA6BE65A}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\氷点 - Chikanya\氷点 - Chikanya 3版 (1)(1) 2790514 414347351 DJ_SoraArshi _Chaos Zone_Bpm200 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\23\{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\DJ_SoraArshi _Chaos Zone_Bpm200\DJ_SoraArshi _Chaos Zone_Bpm200 2456034 - 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 3996 + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 2756 467475788 LWS2 - SHENG D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A3\{A335407C-D134-89B8-8516-C6EA181E68C5}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\LWS2 - SHENG\LWS2 - SHENG 2046656 527664484 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\5E\{5E382DE5-9DDC-EDA6-7D3C-0900517EA70E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Drowning in a Moment（ichni Original）\Drowning in a Moment（ichni Original） 3613172 539313031 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\75\{754BFF64-B13E-0EB7-0A3B-DC551759A04C}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Drowning in a Moment（ichni Original） 467208 @@ -112,4 +118,8 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size Streamed Audio ID Name Audio source file Generated audio file Wwise Object Path Notes 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem 58083349.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem 117017922.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem 155392418.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem 297299101.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem 449180690.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk index a9f39a1d..95ee0392 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.txt index 039735f1..a289da8d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Init.txt @@ -1,3 +1,10 @@ +State Group ID Name Wwise Object Path Notes + 2012657067 New_State_Group \Default Work Unit\New_State_Group + +State ID Name State Group Notes + 748895195 None New_State_Group + 2021425847 New_State New_State_Group + Game Parameter ID Name Wwise Object Path Notes 336603982 SoundFXVolume \Default Work Unit\General\SoundFXVolume 2346531308 MusicVolume \Default Work Unit\General\MusicVolume @@ -10,6 +17,9 @@ Audio Bus ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Master\Music 4056684167 Master \Default Work Unit\Master +Effect plug-ins ID Name Type Notes + 3657550167 New_Parametric_EQ Wwise Parametric EQ + Audio Devices ID Name Type Notes 2317455096 No_Output No Output 3859886410 System System diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/117017922.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/117017922.wem new file mode 100644 index 00000000..c9e00971 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/117017922.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/155392418.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/155392418.wem new file mode 100644 index 00000000..808f5177 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/155392418.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/297299101.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/297299101.wem new file mode 100644 index 00000000..75834cbc Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/297299101.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/449180690.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/449180690.wem new file mode 100644 index 00000000..742c6520 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/Media/449180690.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml index 7091aaf8..4afbb62d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/PluginInfo.xml @@ -1,8 +1,9 @@ + - {2DF3E370-A572-513D-8013-5B6E63623995} + {7A93DBF5-C17C-0C12-A2B2-61A113DBCB1B} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml index ceaaa6b1..17950656 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml @@ -9,10 +9,13 @@ - + Init Init.bnk + + + @@ -21,21 +24,37 @@ - + + + + + + + + + - + - + + + + + + + + + @@ -74,7 +93,7 @@ - + ichni ichni.bnk @@ -96,9 +115,11 @@ Solitudes.wav E7/{E7A079FC-19C0-27A9-D561-9726E4746299}.wem - + Stay.wav + Media/117017922.wem 17/{17139540-42D9-EBED-486A-3258A9B89B88}.wem + 2954 影虎。 - Last Remains (1).wav @@ -108,9 +129,11 @@ 影虎。 - Last Remains (1).wav 9D/{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem - + flick.wav + Media/155392418.wem A4/{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem + 3186 Your Shadow.wav @@ -136,9 +159,11 @@ OERA - register@fantobia.wav 02/{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem - + hold end.wav + Media/297299101.wem DC/{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem + 3380 Fate Of Fear.wav @@ -160,9 +185,11 @@ DJ_SoraArshi _Chaos Zone_Bpm200.wav 23/{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem - + tap.wav + Media/449180690.wem 86/{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem + 2756 LWS2 - SHENG.wav @@ -293,6 +320,12 @@ A2/{A2750C0F-53AE-CCED-9BA6-EE645C954830}.wem + + + + + + @@ -484,78 +517,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -567,48 +678,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -634,10 +793,12 @@ + + - + - + @@ -679,5 +840,5 @@ - {24B779FB-1300-5EC2-85FB-4D5033D5CDE6} + {34C60103-DF18-DCED-0F58-159C6D7B56DF} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.bnk index 7f67bdb5..7b45941d 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.txt index 3ee632bd..cbd3f2a3 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Mac/ichni.txt @@ -49,34 +49,40 @@ Switch ID Name Switch Group Notes Game Parameter ID Name Wwise Object Path Notes 363065643 Preview_Lowpass \Default Work Unit\Menu\Preview_Lowpass + 1952074036 Song_EQ_FX_Highpass \Default Work Unit\Game\Song_EQ_FX_Highpass + 2159946616 Song_EQ_FX_Lowpass \Default Work Unit\Game\Song_EQ_FX_Lowpass 2183069388 Preview_Volume \Default Work Unit\Menu\Preview_Volume 2191510614 Song_Highpass \Default Work Unit\Game\Song_Highpass 2936015903 Song_Volume \Default Work Unit\Game\Song_Volume 3534982690 Song_Lowpass \Default Work Unit\Game\Song_Lowpass 4043093737 Preview_Highpass \Default Work Unit\Menu\Preview_Highpass +Effect plug-ins ID Name Type Notes + 634184631 Highpass Wwise Parametric EQ + 789380690 Lowpass Wwise Parametric EQ + In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size 38389979 Absolutely：0 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A6\{A6CC8C62-FA05-7B7E-3CF0-61027837024C}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Absolutely：0\Absolutely：0 2790984 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold 2879 63536287 asymptotical stability feat_ 花隈千冬 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E2\{E266A4D6-7FE1-CCBE-CEF9-1617700D6148}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\asymptotical stability feat_ 花隈千冬 546411 96387914 Solitudes D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E7\{E7A079FC-19C0-27A9-D561-9726E4746299}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Solitudes\Solitudes 3099804 - 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 7027 + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 2954 133621670 影虎。 - Last Remains D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\6E\{6E6709A0-B267-28AF-2973-BA0935BD53DE}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\影虎。 - Last Remains 353612 138413318 影虎。 - Last Remains (1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\9D\{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Last Remains\影虎。 - Last Remains (1) 3098495 - 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 5235 + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 3186 158073328 YourShadow D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\2A\{2ACE4F97-1AB5-99A4-7152-AE49B1BEA5FA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\YourShadow 560183 162440105 SelectDifficulty D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\38\{381B6FA0-78E9-4375-536E-D1F624BC57A5}.wem \Actor-Mixer Hierarchy\Default Work Unit\MenuUI\SongSelection\SelectDifficulty 7871 250022371 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\94\{94D596BB-318A-3919-6251-03B25CDF17E4}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Fate Of Fear\Fate Of Fear 2581016 252332174 Space Rain D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\42\{42C14792-6B82-D8E8-5AF8-258CB844A795}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Space Rain\Space Rain 2591745 267185326 Mr_ Weq - Lunar Shade D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C1\{C1D044C9-11CE-EE4A-504D-D5A5B5DD955E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Mr_ Weq - Lunar Shade\Mr_ Weq - Lunar Shade 2180184 282623311 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\02\{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\OERA - register@fantobia 686573 - 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 16427 + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 3380 311563945 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C9\{C98B786F-4A27-6363-FB81-FF9987B9C8EA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Fate Of Fear 495080 323831960 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C8\{C8362DE2-9020-58AC-75E8-A02B91D8A690}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\OERA - register @fantobia\OERA - register@fantobia 3505214 327648178 Chapter 0 Tutorial D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DF\{DFECFF67-99F1-C319-ACB5-91DEC00F5294}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Chapter 0 Tutorial\Chapter 0 Tutorial 2318534 348654809 氷点 - Chikanya 3版 (1)(1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E5\{E53780CB-353B-62A2-7F1C-41F9AA6BE65A}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\氷点 - Chikanya\氷点 - Chikanya 3版 (1)(1) 2790514 414347351 DJ_SoraArshi _Chaos Zone_Bpm200 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\23\{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\DJ_SoraArshi _Chaos Zone_Bpm200\DJ_SoraArshi _Chaos Zone_Bpm200 2456034 - 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 3996 + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 2756 467475788 LWS2 - SHENG D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A3\{A335407C-D134-89B8-8516-C6EA181E68C5}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\LWS2 - SHENG\LWS2 - SHENG 2046656 527664484 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\5E\{5E382DE5-9DDC-EDA6-7D3C-0900517EA70E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Drowning in a Moment（ichni Original）\Drowning in a Moment（ichni Original） 3613172 539313031 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\75\{754BFF64-B13E-0EB7-0A3B-DC551759A04C}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Drowning in a Moment（ichni Original） 467208 @@ -112,4 +118,8 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size Streamed Audio ID Name Audio source file Generated audio file Wwise Object Path Notes 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem 58083349.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem 117017922.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem 155392418.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem 297299101.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem 449180690.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk index 1dd3a5fc..a192f657 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.txt index 039735f1..a289da8d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Init.txt @@ -1,3 +1,10 @@ +State Group ID Name Wwise Object Path Notes + 2012657067 New_State_Group \Default Work Unit\New_State_Group + +State ID Name State Group Notes + 748895195 None New_State_Group + 2021425847 New_State New_State_Group + Game Parameter ID Name Wwise Object Path Notes 336603982 SoundFXVolume \Default Work Unit\General\SoundFXVolume 2346531308 MusicVolume \Default Work Unit\General\MusicVolume @@ -10,6 +17,9 @@ Audio Bus ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Master\Music 4056684167 Master \Default Work Unit\Master +Effect plug-ins ID Name Type Notes + 3657550167 New_Parametric_EQ Wwise Parametric EQ + Audio Devices ID Name Type Notes 2317455096 No_Output No Output 3859886410 System System diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/117017922.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/117017922.wem new file mode 100644 index 00000000..c9e00971 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/117017922.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/155392418.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/155392418.wem new file mode 100644 index 00000000..808f5177 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/155392418.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/297299101.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/297299101.wem new file mode 100644 index 00000000..75834cbc Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/297299101.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/449180690.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/449180690.wem new file mode 100644 index 00000000..742c6520 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/Media/449180690.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml index 68479873..4c9843ae 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/PluginInfo.xml @@ -1,8 +1,9 @@ + - {0A13F4BA-B100-584C-1D1C-B9267B7D267A} + {8655D358-E1E6-3394-3DF2-330BBE9C7F1E} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml index aa08ecf6..272dc9bd 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml @@ -9,10 +9,13 @@ - + Init Init.bnk + + + @@ -21,21 +24,37 @@ - + + + + + + + + + - + - + + + + + + + + + @@ -74,7 +93,7 @@ - + ichni ichni.bnk @@ -96,9 +115,11 @@ Solitudes.wav E7/{E7A079FC-19C0-27A9-D561-9726E4746299}.wem - + Stay.wav + Media/117017922.wem 17/{17139540-42D9-EBED-486A-3258A9B89B88}.wem + 2954 影虎。 - Last Remains (1).wav @@ -108,9 +129,11 @@ 影虎。 - Last Remains (1).wav 9D/{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem - + flick.wav + Media/155392418.wem A4/{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem + 3186 Your Shadow.wav @@ -136,9 +159,11 @@ OERA - register@fantobia.wav 02/{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem - + hold end.wav + Media/297299101.wem DC/{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem + 3380 Fate Of Fear.wav @@ -160,9 +185,11 @@ DJ_SoraArshi _Chaos Zone_Bpm200.wav 23/{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem - + tap.wav + Media/449180690.wem 86/{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem + 2756 LWS2 - SHENG.wav @@ -293,6 +320,12 @@ A2/{A2750C0F-53AE-CCED-9BA6-EE645C954830}.wem + + + + + + @@ -484,78 +517,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -567,48 +678,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -634,10 +793,12 @@ + + - + - + @@ -679,5 +840,5 @@ - {D7C3F860-A429-60CB-EE09-202FE31F8D34} + {7EDC888A-AB0C-5C90-F1C9-F38108EEA8C4} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.bnk index 7f67bdb5..7b45941d 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.txt index 3ee632bd..cbd3f2a3 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/Windows/ichni.txt @@ -49,34 +49,40 @@ Switch ID Name Switch Group Notes Game Parameter ID Name Wwise Object Path Notes 363065643 Preview_Lowpass \Default Work Unit\Menu\Preview_Lowpass + 1952074036 Song_EQ_FX_Highpass \Default Work Unit\Game\Song_EQ_FX_Highpass + 2159946616 Song_EQ_FX_Lowpass \Default Work Unit\Game\Song_EQ_FX_Lowpass 2183069388 Preview_Volume \Default Work Unit\Menu\Preview_Volume 2191510614 Song_Highpass \Default Work Unit\Game\Song_Highpass 2936015903 Song_Volume \Default Work Unit\Game\Song_Volume 3534982690 Song_Lowpass \Default Work Unit\Game\Song_Lowpass 4043093737 Preview_Highpass \Default Work Unit\Menu\Preview_Highpass +Effect plug-ins ID Name Type Notes + 634184631 Highpass Wwise Parametric EQ + 789380690 Lowpass Wwise Parametric EQ + In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size 38389979 Absolutely：0 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A6\{A6CC8C62-FA05-7B7E-3CF0-61027837024C}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Absolutely：0\Absolutely：0 2790984 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold 2879 63536287 asymptotical stability feat_ 花隈千冬 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E2\{E266A4D6-7FE1-CCBE-CEF9-1617700D6148}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\asymptotical stability feat_ 花隈千冬 546411 96387914 Solitudes D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E7\{E7A079FC-19C0-27A9-D561-9726E4746299}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Solitudes\Solitudes 3099804 - 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 7027 + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 2954 133621670 影虎。 - Last Remains D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\6E\{6E6709A0-B267-28AF-2973-BA0935BD53DE}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\影虎。 - Last Remains 353612 138413318 影虎。 - Last Remains (1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\9D\{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Last Remains\影虎。 - Last Remains (1) 3098495 - 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 5235 + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 3186 158073328 YourShadow D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\2A\{2ACE4F97-1AB5-99A4-7152-AE49B1BEA5FA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\YourShadow 560183 162440105 SelectDifficulty D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\38\{381B6FA0-78E9-4375-536E-D1F624BC57A5}.wem \Actor-Mixer Hierarchy\Default Work Unit\MenuUI\SongSelection\SelectDifficulty 7871 250022371 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\94\{94D596BB-318A-3919-6251-03B25CDF17E4}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Fate Of Fear\Fate Of Fear 2581016 252332174 Space Rain D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\42\{42C14792-6B82-D8E8-5AF8-258CB844A795}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Space Rain\Space Rain 2591745 267185326 Mr_ Weq - Lunar Shade D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C1\{C1D044C9-11CE-EE4A-504D-D5A5B5DD955E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Mr_ Weq - Lunar Shade\Mr_ Weq - Lunar Shade 2180184 282623311 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\02\{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\OERA - register@fantobia 686573 - 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 16427 + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 3380 311563945 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C9\{C98B786F-4A27-6363-FB81-FF9987B9C8EA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Fate Of Fear 495080 323831960 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C8\{C8362DE2-9020-58AC-75E8-A02B91D8A690}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\OERA - register @fantobia\OERA - register@fantobia 3505214 327648178 Chapter 0 Tutorial D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DF\{DFECFF67-99F1-C319-ACB5-91DEC00F5294}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Chapter 0 Tutorial\Chapter 0 Tutorial 2318534 348654809 氷点 - Chikanya 3版 (1)(1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E5\{E53780CB-353B-62A2-7F1C-41F9AA6BE65A}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\氷点 - Chikanya\氷点 - Chikanya 3版 (1)(1) 2790514 414347351 DJ_SoraArshi _Chaos Zone_Bpm200 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\23\{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\DJ_SoraArshi _Chaos Zone_Bpm200\DJ_SoraArshi _Chaos Zone_Bpm200 2456034 - 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 3996 + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 2756 467475788 LWS2 - SHENG D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A3\{A335407C-D134-89B8-8516-C6EA181E68C5}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\LWS2 - SHENG\LWS2 - SHENG 2046656 527664484 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\5E\{5E382DE5-9DDC-EDA6-7D3C-0900517EA70E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Drowning in a Moment（ichni Original）\Drowning in a Moment（ichni Original） 3613172 539313031 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\75\{754BFF64-B13E-0EB7-0A3B-DC551759A04C}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Drowning in a Moment（ichni Original） 467208 @@ -112,4 +118,8 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size Streamed Audio ID Name Audio source file Generated audio file Wwise Object Path Notes 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem 58083349.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem 117017922.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem 155392418.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem 297299101.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem 449180690.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.bnk index e2e9f478..f6d5c37b 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.txt index 039735f1..a289da8d 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Init.txt @@ -1,3 +1,10 @@ +State Group ID Name Wwise Object Path Notes + 2012657067 New_State_Group \Default Work Unit\New_State_Group + +State ID Name State Group Notes + 748895195 None New_State_Group + 2021425847 New_State New_State_Group + Game Parameter ID Name Wwise Object Path Notes 336603982 SoundFXVolume \Default Work Unit\General\SoundFXVolume 2346531308 MusicVolume \Default Work Unit\General\MusicVolume @@ -10,6 +17,9 @@ Audio Bus ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Master\Music 4056684167 Master \Default Work Unit\Master +Effect plug-ins ID Name Type Notes + 3657550167 New_Parametric_EQ Wwise Parametric EQ + Audio Devices ID Name Type Notes 2317455096 No_Output No Output 3859886410 System System diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/117017922.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/117017922.wem new file mode 100644 index 00000000..c9e00971 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/117017922.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/155392418.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/155392418.wem new file mode 100644 index 00000000..808f5177 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/155392418.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/297299101.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/297299101.wem new file mode 100644 index 00000000..75834cbc Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/297299101.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/449180690.wem b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/449180690.wem new file mode 100644 index 00000000..742c6520 Binary files /dev/null and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/Media/449180690.wem differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/PluginInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/PluginInfo.xml index b8f51ac9..ffcec44b 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/PluginInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/PluginInfo.xml @@ -1,8 +1,9 @@ + - {8CB3618D-DD81-7D30-5186-C091F2DCF93D} + {0E936471-D4A8-A442-7C28-86B4DCEE218B} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/SoundbanksInfo.xml b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/SoundbanksInfo.xml index 833a50ef..419c3d9f 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/SoundbanksInfo.xml +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/SoundbanksInfo.xml @@ -9,10 +9,13 @@ - + Init Init.bnk + + + @@ -21,21 +24,37 @@ - + + + + + + + + + - + - + + + + + + + + + @@ -74,7 +93,7 @@ - + ichni ichni.bnk @@ -96,9 +115,11 @@ Solitudes.wav E7/{E7A079FC-19C0-27A9-D561-9726E4746299}.wem - + Stay.wav + Media/117017922.wem 17/{17139540-42D9-EBED-486A-3258A9B89B88}.wem + 2954 影虎。 - Last Remains (1).wav @@ -108,9 +129,11 @@ 影虎。 - Last Remains (1).wav 9D/{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem - + flick.wav + Media/155392418.wem A4/{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem + 3186 Your Shadow.wav @@ -136,9 +159,11 @@ OERA - register@fantobia.wav 02/{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem - + hold end.wav + Media/297299101.wem DC/{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem + 3380 Fate Of Fear.wav @@ -160,9 +185,11 @@ DJ_SoraArshi _Chaos Zone_Bpm200.wav 23/{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem - + tap.wav + Media/449180690.wem 86/{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem + 2756 LWS2 - SHENG.wav @@ -293,6 +320,12 @@ A2/{A2750C0F-53AE-CCED-9BA6-EE645C954830}.wem + + + + + + @@ -484,78 +517,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -567,48 +678,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -634,10 +793,12 @@ + + - + - + @@ -679,5 +840,5 @@ - {107F3550-F82C-43C1-23A1-050C3424EA4C} + {45ADC04A-FC11-3A15-0BD4-143A5ECED9AE} diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.bnk b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.bnk index 7f67bdb5..7b45941d 100644 Binary files a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.bnk and b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.bnk differ diff --git a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.txt b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.txt index 3ee632bd..cbd3f2a3 100644 --- a/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.txt +++ b/ichni Official_WwiseProject/GeneratedSoundBanks/iOS/ichni.txt @@ -49,34 +49,40 @@ Switch ID Name Switch Group Notes Game Parameter ID Name Wwise Object Path Notes 363065643 Preview_Lowpass \Default Work Unit\Menu\Preview_Lowpass + 1952074036 Song_EQ_FX_Highpass \Default Work Unit\Game\Song_EQ_FX_Highpass + 2159946616 Song_EQ_FX_Lowpass \Default Work Unit\Game\Song_EQ_FX_Lowpass 2183069388 Preview_Volume \Default Work Unit\Menu\Preview_Volume 2191510614 Song_Highpass \Default Work Unit\Game\Song_Highpass 2936015903 Song_Volume \Default Work Unit\Game\Song_Volume 3534982690 Song_Lowpass \Default Work Unit\Game\Song_Lowpass 4043093737 Preview_Highpass \Default Work Unit\Menu\Preview_Highpass +Effect plug-ins ID Name Type Notes + 634184631 Highpass Wwise Parametric EQ + 789380690 Lowpass Wwise Parametric EQ + In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size 38389979 Absolutely：0 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A6\{A6CC8C62-FA05-7B7E-3CF0-61027837024C}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Absolutely：0\Absolutely：0 2790984 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold 2879 63536287 asymptotical stability feat_ 花隈千冬 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E2\{E266A4D6-7FE1-CCBE-CEF9-1617700D6148}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\asymptotical stability feat_ 花隈千冬 546411 96387914 Solitudes D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E7\{E7A079FC-19C0-27A9-D561-9726E4746299}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Solitudes\Solitudes 3099804 - 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 7027 + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay 2954 133621670 影虎。 - Last Remains D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\6E\{6E6709A0-B267-28AF-2973-BA0935BD53DE}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter1\影虎。 - Last Remains 353612 138413318 影虎。 - Last Remains (1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\9D\{9DB049A7-1168-0EA9-B744-BA4852E26271}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\Last Remains\影虎。 - Last Remains (1) 3098495 - 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 5235 + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick 3186 158073328 YourShadow D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\2A\{2ACE4F97-1AB5-99A4-7152-AE49B1BEA5FA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\YourShadow 560183 162440105 SelectDifficulty D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\38\{381B6FA0-78E9-4375-536E-D1F624BC57A5}.wem \Actor-Mixer Hierarchy\Default Work Unit\MenuUI\SongSelection\SelectDifficulty 7871 250022371 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\94\{94D596BB-318A-3919-6251-03B25CDF17E4}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Fate Of Fear\Fate Of Fear 2581016 252332174 Space Rain D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\42\{42C14792-6B82-D8E8-5AF8-258CB844A795}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Space Rain\Space Rain 2591745 267185326 Mr_ Weq - Lunar Shade D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C1\{C1D044C9-11CE-EE4A-504D-D5A5B5DD955E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Mr_ Weq - Lunar Shade\Mr_ Weq - Lunar Shade 2180184 282623311 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\02\{0236ECF4-DE2E-D74E-2409-37DF4E355E35}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\OERA - register@fantobia 686573 - 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 16427 + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold 3380 311563945 Fate Of Fear D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C9\{C98B786F-4A27-6363-FB81-FF9987B9C8EA}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Fate Of Fear 495080 323831960 OERA - register@fantobia D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\C8\{C8362DE2-9020-58AC-75E8-A02B91D8A690}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\OERA - register @fantobia\OERA - register@fantobia 3505214 327648178 Chapter 0 Tutorial D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DF\{DFECFF67-99F1-C319-ACB5-91DEC00F5294}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Chapter 0 Tutorial\Chapter 0 Tutorial 2318534 348654809 氷点 - Chikanya 3版 (1)(1) D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\E5\{E53780CB-353B-62A2-7F1C-41F9AA6BE65A}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter1\氷点 - Chikanya\氷点 - Chikanya 3版 (1)(1) 2790514 414347351 DJ_SoraArshi _Chaos Zone_Bpm200 D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\23\{230461F4-C406-43FD-C32D-8AFDDF565F90}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\DJ_SoraArshi _Chaos Zone_Bpm200\DJ_SoraArshi _Chaos Zone_Bpm200 2456034 - 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 3996 + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap 2756 467475788 LWS2 - SHENG D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A3\{A335407C-D134-89B8-8516-C6EA181E68C5}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\LWS2 - SHENG\LWS2 - SHENG 2046656 527664484 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\5E\{5E382DE5-9DDC-EDA6-7D3C-0900517EA70E}.wem \Interactive Music Hierarchy\Default Work Unit\Game\Songs\Chapter0\Drowning in a Moment（ichni Original）\Drowning in a Moment（ichni Original） 3613172 539313031 Drowning in a Moment（ichni Original） D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\75\{754BFF64-B13E-0EB7-0A3B-DC551759A04C}.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Preview\Chapter0\Drowning in a Moment（ichni Original） 467208 @@ -112,4 +118,8 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size Streamed Audio ID Name Audio source file Generated audio file Wwise Object Path Notes 58083349 New_StartHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\37\{3709A23B-51ED-D20D-88F8-3FF44A35BFF9}.wem 58083349.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_StartHold + 117017922 New_Stay D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\17\{17139540-42D9-EBED-486A-3258A9B89B88}.wem 117017922.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Stay + 155392418 New_Flick D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\A4\{A4F37C21-F821-6D22-2E41-9BF64C4BD099}.wem 155392418.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Flick + 297299101 New_EndHold D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\DC\{DCD0B3AA-9C43-2D61-1C27-ACE6FEE79A7A}.wem 297299101.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_EndHold + 449180690 New_Tap D:\Projects\ichni Official\ichni Official_WwiseProject\.cache\86\{86B5A5D4-7973-CD65-D333-703C0FBF6DA3}.wem 449180690.wem \Actor-Mixer Hierarchy\Default Work Unit\Game\Note\New_Tap diff --git a/ichni Official_WwiseProject/Interactive Music Hierarchy/Default Work Unit.wwu b/ichni Official_WwiseProject/Interactive Music Hierarchy/Default Work Unit.wwu index 69f1a37c..9cece1a0 100644 --- a/ichni Official_WwiseProject/Interactive Music Hierarchy/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Interactive Music Hierarchy/Default Work Unit.wwu @@ -2311,6 +2311,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 20 + 5 + + + 100 + 20000 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 20 + 5 + + + 100 + 20000 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 5 + + + 0.001 + 0 + 0 + + + 99.999 + 0 + 0 + + + 100 + 0 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 20 + 5 + + + 100 + 20000 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 20 + 5 + + + 100 + 20000 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 5 + + + 99.999 + 0 + 0 + + + 100 + 1 + 37 + + + + + + + + + + + + + + + @@ -2374,7 +2671,7 @@ 100 - 0 + 100 37 @@ -2409,7 +2706,7 @@ 100 - 0 + 100 37 diff --git a/ichni Official_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu b/ichni Official_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu index 5be5fcad..aecbad7e 100644 --- a/ichni Official_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Master-Mixer Hierarchy/Default Work Unit.wwu @@ -11,7 +11,27 @@ + + + + True + + + + + + + + + + + + + + + + diff --git a/ichni Official_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu b/ichni Official_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu index ed7ea2b2..73ac50b4 100644 --- a/ichni Official_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/Soundcaster Sessions/Default Work Unit.wwu @@ -1,6 +1,20 @@ - + + + + + + + + + + + + + + + diff --git a/ichni Official_WwiseProject/States/Default Work Unit.wwu b/ichni Official_WwiseProject/States/Default Work Unit.wwu index 30785d59..6b39dff7 100644 --- a/ichni Official_WwiseProject/States/Default Work Unit.wwu +++ b/ichni Official_WwiseProject/States/Default Work Unit.wwu @@ -1,6 +1,15 @@ - + + + + + + + + + + diff --git a/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.validationcache b/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.validationcache index 59be0b1a..20fd6e22 100644 --- a/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.validationcache +++ b/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.validationcache @@ -2,9 +2,9 @@ - - - + + + @@ -13,19 +13,19 @@ - - + + - - + + - + - + diff --git a/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.wsettings b/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.wsettings index a763883d..4b9d9132 100644 --- a/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.wsettings +++ b/ichni Official_WwiseProject/ichni Official_WwiseProject.soull.wsettings @@ -4,6 +4,7 @@ + @@ -48,7 +49,7 @@ - + @@ -65,7 +66,7 @@ - + @@ -92,12 +93,13 @@ + - + @@ -123,6 +125,22 @@ + + + + + + + + + + + + + + + + @@ -131,22 +149,38 @@ - + - + - - + + - + - + + + + + + + + + + + + + + + + + @@ -177,14 +211,16 @@ + - - + + + - - + + @@ -231,6 +267,9 @@ + + + @@ -242,6 +281,17 @@ + + + + + + + + + + + @@ -308,6 +358,17 @@ + + + + + + + + + + + @@ -351,7 +412,7 @@ - +