From 19faccd312ac8890e0218d7193520ac4820e0e7c Mon Sep 17 00:00:00 2001 From: Oliver Wong Date: Wed, 15 Apr 2026 21:05:17 +0800 Subject: [PATCH] feat: Add switch container functionality --- Assets/Resources/AudioData/AudioObject.bytes | Bin 9237 -> 6590 bytes .../Audios/au_coreplay_choose_v120_a.wav | 3 + .../Audios/au_coreplay_choose_v120_a.wav.meta | 23 ++++ .../Audios/au_coreplay_clear_v120_a.wav | 3 + .../Audios/au_coreplay_clear_v120_a.wav.meta | 23 ++++ .../Audios/au_coreplay_unchoose_v120_a.wav | 3 + .../au_coreplay_unchoose_v120_a.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_choose_cloud1.wav | 3 + ..._ui_button_corePlay_choose_cloud1.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_choose_cloud2.wav | 3 + ..._ui_button_corePlay_choose_cloud2.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_choose_cloud3.wav | 3 + ..._ui_button_corePlay_choose_cloud3.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_choose_ice1.wav | 3 + ...fx_ui_button_corePlay_choose_ice1.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_choose_ice2.wav | 3 + ...fx_ui_button_corePlay_choose_ice2.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_choose_ice3.wav | 3 + ...fx_ui_button_corePlay_choose_ice3.wav.meta | 23 ++++ ...au_sfx_ui_button_corePlay_clear_cloud1.wav | 3 + ...x_ui_button_corePlay_clear_cloud1.wav.meta | 23 ++++ ...au_sfx_ui_button_corePlay_clear_cloud2.wav | 3 + ...x_ui_button_corePlay_clear_cloud2.wav.meta | 23 ++++ ...au_sfx_ui_button_corePlay_clear_cloud3.wav | 3 + ...x_ui_button_corePlay_clear_cloud3.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_clear_ice1.wav | 3 + ...sfx_ui_button_corePlay_clear_ice1.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_clear_ice2.wav | 3 + ...sfx_ui_button_corePlay_clear_ice2.wav.meta | 23 ++++ .../au_sfx_ui_button_corePlay_clear_ice3.wav | 3 + ...sfx_ui_button_corePlay_clear_ice3.wav.meta | 23 ++++ ...sfx_ui_button_corePlay_unchoose_cloud1.wav | 3 + ...i_button_corePlay_unchoose_cloud1.wav.meta | 23 ++++ ...sfx_ui_button_corePlay_unchoose_cloud2.wav | 3 + ...i_button_corePlay_unchoose_cloud2.wav.meta | 23 ++++ ...sfx_ui_button_corePlay_unchoose_cloud3.wav | 3 + ...i_button_corePlay_unchoose_cloud3.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_unchoose_ice1.wav | 3 + ..._ui_button_corePlay_unchoose_ice1.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_unchoose_ice2.wav | 3 + ..._ui_button_corePlay_unchoose_ice2.wav.meta | 23 ++++ ...u_sfx_ui_button_corePlay_unchoose_ice3.wav | 3 + ..._ui_button_corePlay_unchoose_ice3.wav.meta | 23 ++++ Assets/Scenes/SampleScene.unity | 10 +- .../OCES/Audio/Generated/AudioEnumIds.cs | 3 + .../OCES/Audio/Generated/AudioEnums.cs | 7 ++ .../OCES/Audio/Generated/AudioObject.cs | 15 +++ .../Audio/Generated/AudioObjectDefinitions.cs | 104 ++++++++++-------- .../OCES/Audio/HandWritten/AudioObject.cs | 71 ++++++++++++ .../Audio/HandWritten/AudioObject.cs.meta | 3 + .../OCES/Audio/HandWritten/AudioSystem.cs | 56 ++++++++-- .../Audio/HandWritten/DebugInfoCollector.cs | 7 +- .../HandWritten/HandWrittenDefinitions.cs | 7 ++ .../HandWritten/LongAudio/MusicStateRouter.cs | 15 ++- .../HandWritten/LongAudio/MusicSystem.cs | 6 + .../OCES/Audio/HandWritten/SfxSystem.cs | 5 - Assets/Scripts/OCES/ButtonInvoker.cs | 2 +- 57 files changed, 782 insertions(+), 75 deletions(-) create mode 100644 Assets/Resources/Audios/au_coreplay_choose_v120_a.wav create mode 100644 Assets/Resources/Audios/au_coreplay_choose_v120_a.wav.meta create mode 100755 Assets/Resources/Audios/au_coreplay_clear_v120_a.wav create mode 100644 Assets/Resources/Audios/au_coreplay_clear_v120_a.wav.meta create mode 100644 Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav create mode 100644 Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav.meta create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav create mode 100644 Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav.meta create mode 100644 Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs create mode 100644 Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs.meta diff --git a/Assets/Resources/AudioData/AudioObject.bytes b/Assets/Resources/AudioData/AudioObject.bytes index f0560b93d0013f9958a55688d2c8bb4ab556d61c..fd3a83e7f03da4d03c6e8ff21f99a0cdab7c1fbb 100644 GIT binary patch literal 6590 zcmb`L`&ZOP6vut6z(NqA)oSg7S|7E=c6ZT5`%;z_{lR)X7446EVi?&RLc+;rQGP>v zD2gv?vGr9?L2b1H)!HgTrT+{`c29rp@AOXQ2A6$EcD8d)$Z~V%GvB%QPBKaBk|j%) z;!)kK%3Up*qR0tZQ^DvodewVd2ClS+Kv`|tS48aQMJ-2^zggF{6RomNTp7hl@*$@> zqMeM8!$cvHLE8CPE084sYd%tfJ@LpKAF@XuT9XJqh%E=~7g`T-iN8#ngZH?I z~ zXT)X2xDApQ&Wqe+9>Ifm1e^brOv}~nJDdob?QlaeApVE z=B<)CVAESxwZo2({jw1Y1Q+}lTJT@vn)KLTR^PAnsnG{8=N?zZxgRTQkXIMg#STr)%$z?x zbFGB5y@uo}Mt1TBCa2{OwR<)DycP_!ho6zSbFdCMm5jrmgx3*-K`T8A>k(MHFRmqw z%p?e`luO9N8}6(fb_r>C6G0UY2(qwxc5=YHc{??D8bqeYPg~>Dvr{ABMO$$xehYi} z9X8F301MbYd*8l4Wu3q45Q}BLjZ7BQ(vwt=yz+fXmA`i0L5hFBrY8v9lYqf##YJob z^r1bf4v-$AL`a9MChF1;uBNZgnEj8<3nSL0A^Xl0Ll>Eicabd|(q&a5i9}R8p$caI z*zDwV2}$0Vjcp~Oj#zWzvDJ5lOYJ5X%N{rpUF#&OU=7}}Z_L;~{b7$@Fvp1IE@ zt^tWPZ2P_UWL!)p;5|lQJMaZthvJs#HY8UvGP|oe+xi7{lW#wQGs$!M5Nx!EUrfee z&ql;9pDxPurLu4L++5y;PTljjkHB2q*2?A3NMvuK@(%8F2*BSJaMZTMWtAjI{lR3{ zF{0N8f;pB@j-@fjvOUMLV-?-yeLr9g-nFhgtPgJ6;f$O4$oLl|FQxB;nMU+-PeJ&R zS7$h9#HJj}&K%3GY)dduyFh1nTabo^wil&Eh0ZM^G=x2}2MEv^IPC?`wY==y2p4IO z|BJUBdCMcB?v7iWBAP(j!x!Oxy9v99eY(u~S)vIMWe1N&WvSq!n!ZOBZad);or-Yq z=ze(O8OLBo3D-S4D)ddNaN7l!Xpaqa^&dYOQ#Au*#T2>+h)G&fHRz){M%p_HYJCAe z03UGvnVXx-T*n`K8^DmeI0yIy2A~7_0uAAiFW3;?;R`i{cMA5|^XVT)t#f~;{(OoO zvqMA8nOd0}y}Nx5$ESFef*UC~Ou@Tc@bJv+lGh5|8Bu&zzOSC&Pi0+0fY zPJoWFK68wuns=1NLR4S~Fz b{>o{^No+1W306652HxC4-rOARCDhM<^ZxKw literal 9237 zcmcIp>r)h07T3gx;2?s*keINnd2Eu6yP%0l_RE$7tEMVzS)%4+S2J^&>7}Q8s=Ehd zKYwag??LITi^z=-o+ug3B=st7r?|1Gw z_i@g-Kijcm$4>k!J|S?ST9M~DnG*#N8V~*T+n?v432o`280W>$2pe_^@jOBlo{%K5 zJO1Z{pQ?85%VUh$Hb)Dxcg6ykS=@d9Fa03&G$kN)^8b$&>nTF|cELA?A_+Kq4p z0QXa|nIw>AqiXL1M@R*Tvp*8nknb?WUhz@%G8v4QC&r#XeGu1Whkn)Y?;>Yx}Y) zHuVU|HkaqMue;UhuW%@IC!=_&4|P(yqYj{CkHK2UIozvW#O{SgcjtRuIrcXVd5*{t zNrLUp@wR;samwl>HXsVA9x05k-*DlMmk@EUiD>u(M8=bD!i3cNzXAlbWub}S*tRcY z|01)$bK|~(0B98V);)wkrKf_TtfU&(V@^RA_I))mIs?;%d0#_-Jq7?+w|sNCOTB$B z)_WP0iqBux=A)Y{lhBGj`MInTTNWCa)Z!jkV0zC({o#t%H)9~>i}fAEGL7cm_*IBg za4I4=p99~;-i4<{Nhb8{27&S9XOY9umbTpcDQPCWmjpOLE{i`JkKbHZI~UddNo{aQ zpI$K`^R)8oi0L^iae|M?a-G;Bc+}3h&E=>Ir@di?J4sjx;nc^ATHBZ-?cPklnH#!S z5}SzN(R!!#TkHDWC4FkZ5!_n{S8Bpt5d1_kS5S$G3A?w8W(w|2{$#T;zO;D7C^gpp!J#aa-+v=t!CO5UIorFMo0=$VOy{!#!q%nRe9Xx0H?` zVv&hx?k+~Sn&yAIa~m~J`S$~Or!5QF2m>(;VMDtlmZQl|+mE-lY!@PJp8ot0KAnXe ziT-rN*5D$Ov>IBy0Dq;mK~5ktsX7x0H4v$)x+X(%G(&PML-KxxbcgX_0DKx z3sp5oK0pPxJ@OxT-AVHon|-?mgtqz}&tUp6L-J9E(NK^fz0P45K)yqXD*(G6GdqN&E-Th>!@i)kokNJBHHpWU8Rke7(rA( z4Th&@DdQ6(f+VPS0V`a{A@DyTL8lt;qw2Du2F4HT zR#HmLeN-QKqE2d78}`%f1e*u z`gmOM`~i6m=N?bWG;l%kM}_S0{t4;c%Q~i1I&{@DG5*;R zBRcJw82^Hd2W`g4i!BGCQU{go*v2ioW3Sw=GWTw)rE-4%6)9e}p$HS=zYxx3>Aeel zIZ>@Y{ta1djh{yD$@j^HnD4vNTKG4ZF_i}Nxu#x~HsEDmU)mO*O%}igJg6k=*uWP&fmITZBGL208Q$`braDGyz zu8yfsR@H?;t>=o19dpLU2QrkWJ_{0>?$9f-Lr|cC;5fGSnAWS7==C8?V(soK+)L(E z+WO;tY2_<~GO4AEM5R3Gb$e=()@PQ*Ia)b1{=e=6BM zpO+q_Fm_6y2(yBblp0x-50(rm!<$Q!r*koWeLf%HWSd@OFoJU{gBT`48iCd`0*fcv zIiHs+NMLL$DFlMT2@%2=6k6Y!Ha2W7NEiD`A5v7IBNA4^#c!+|lPLCNNgE$9o#J9F z{kCJ_1Wq{%mx~5Ph1&fEWEpB_r`opanrHxtUQHWOml9pHZhSYuH_kHW z-XBCBW7AAJXPbw5$4cYEZbP;-5(&Xo#|gh|7_L&EjmB?Gt4}x7;a+`uRqg9^ZN6dT z+gV+vP7i9=XG}bpU{06ERa-~Mkx+<8NuQ^YxG>L%ElI?v)_+1vC59VlI%X6~uxMhe z_aE0+^hk?s^socEU(dXcTr%jui)H-^#&c0;V|KH1h0k&!D Am;e9( diff --git a/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav b/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav new file mode 100644 index 0000000..a1777e5 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc7ccfdee0f01db75ad7f711a882bafcbba926ab4b56ca5a8139b61a61438452 +size 25390 diff --git a/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav.meta b/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav.meta new file mode 100644 index 0000000..2ef1475 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_choose_v120_a.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a4397a33fe4d245cc99d63997647d8cd +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav b/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav new file mode 100755 index 0000000..344a089 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b2240788e75d99495afc696ff799ea3decb12b688f8d70204ccb263ee2cdc33 +size 60198 diff --git a/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav.meta b/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav.meta new file mode 100644 index 0000000..e6567e0 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_clear_v120_a.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 64e1436220f4d401995ec856766c2e7a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav b/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav new file mode 100644 index 0000000..8450ce0 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbe6075cd9273a677325d70110d20d0c3370cc5384bcec2ea382c625c5327803 +size 24878 diff --git a/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav.meta b/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav.meta new file mode 100644 index 0000000..8b78cc9 --- /dev/null +++ b/Assets/Resources/Audios/au_coreplay_unchoose_v120_a.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6aa709a35a9da42029251eb3819256cf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav new file mode 100644 index 0000000..475dae2 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3c2598e7a026ee06eb59543e61f6fe76a3cf6e82e2a60cd0e02bc91692aad34 +size 50302 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav.meta new file mode 100644 index 0000000..1c31459 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e01161c5ac9a44c29826c87aef56bc85 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav new file mode 100644 index 0000000..a72189a --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eabeeb6531214e11edb75eb431549d34fb9be3f8ef3a2d85af7153d320b34f45 +size 46846 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav.meta new file mode 100644 index 0000000..fc483d4 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 61608f7e047d4485bbc30b5ddd8cec5e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav new file mode 100644 index 0000000..9854302 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50b6eb6ce3b94bc5820ea99f37c31f90f14ffa1e49117a24ed13a26353f2c4ce +size 51312 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav.meta new file mode 100644 index 0000000..1c87d13 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_cloud3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cbe1f9ae435844fc68535585de6a7968 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav new file mode 100644 index 0000000..abfc0fa --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b14699694066f1380a141868acd0d7929f27753cf8c9cda744cd7aa89622443 +size 3910 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav.meta new file mode 100644 index 0000000..0e96772 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5c8f89c6913b4476fa87963914fbd8ad +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav new file mode 100644 index 0000000..64c5a03 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7ca46584189d68fe100f8309031638668dcdccf7cae5cda5293fe1051351669 +size 3374 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav.meta new file mode 100644 index 0000000..ff44951 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0c17690bc257842a596a6506d05faaac +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav new file mode 100644 index 0000000..ae1e200 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9093028c85e922ab7139d9d331fdadc39b90731fe014e575ad8b3c164afd3f3 +size 3722 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav.meta new file mode 100644 index 0000000..a141a3e --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_choose_ice3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 115a82924c82b432b9b9d1639dd840ea +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav new file mode 100644 index 0000000..1657035 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a70ad7b198760ca165aa7e59b6d555e60efe6014b49f42881093fc40edbe788e +size 92420 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav.meta new file mode 100644 index 0000000..826f10e --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 50382ffb9ae0941d191a1fab99d72ed8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav new file mode 100644 index 0000000..5304e23 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98078ceac07b15744931d59e53f3439b18f15f82c76f23eb028e2a425496e2cb +size 78084 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav.meta new file mode 100644 index 0000000..e5d96c6 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6db1f59903e64438a9ec6c5bfb6b356a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav new file mode 100644 index 0000000..bc55c43 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4616de49897b54c0b84849306b70d9b922c066062f39a8aebc73667a60c601f5 +size 101756 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav.meta new file mode 100644 index 0000000..51c3af1 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_cloud3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f30159797c65949c4b62554227e06ab7 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav new file mode 100644 index 0000000..df297aa --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f969b0f379c732abf1e236fbb3173f3f84b1066e86f99ae58ea5fea95062411 +size 52962 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav.meta new file mode 100644 index 0000000..c606f2d --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8c2fd558ca9764b088c75fd1ac9b33fc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav new file mode 100644 index 0000000..aeb42f3 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8bc693cdd7bc5d0a4aa179d89b7e243a946ec02af7db895ee6b6d368f2ff14f +size 55368 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav.meta new file mode 100644 index 0000000..40ad787 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 787f7f6573521464c83b4db264b42338 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav new file mode 100644 index 0000000..b48aaab --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02919e30255b9e371a8c185b6e90779bb03409042c8f89989b9e797727d6d561 +size 53088 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav.meta new file mode 100644 index 0000000..5439d6c --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_clear_ice3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c1da157e1c4ef48488cf20c909aca237 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav new file mode 100644 index 0000000..65d26c0 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6c5037b796a72dfd0427cf5e9162ec643d50a784e405c4e739d4a30cab98f76 +size 50516 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav.meta new file mode 100644 index 0000000..5d87d3a --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 500927f6125c8460da8b59798919f8c5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav new file mode 100644 index 0000000..f400281 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e7bb150d1eb8f0de538366dfcc9d45314cfa7b0f1879d6d544c5b8264f3c21f +size 53286 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav.meta new file mode 100644 index 0000000..7204d01 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bcae844b708874c8d93054abbff8f578 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav new file mode 100644 index 0000000..59e9f85 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b033cb3e4a4fa18f728791db4b5a588a198acbcf37ba6aadef13c21342acbc2 +size 49026 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav.meta new file mode 100644 index 0000000..dbafa4f --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_cloud3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0f7651a5f9baa4e1a9ce848455f6a5e5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav new file mode 100644 index 0000000..732107f --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85add992db6df0921b3155313365886bd2411e15d182f20112888ee5acda98fe +size 3912 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav.meta new file mode 100644 index 0000000..7c65bc6 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bd51e45fa0b7745f4b2a3368868e7cf4 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav new file mode 100644 index 0000000..e8e744c --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f665fc93b9c559a28aec62c8fddfe818d8a4414634887dcadefc3691997f0b +size 3372 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav.meta new file mode 100644 index 0000000..4554202 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 86e2506072cae4ddca84c3a1719a1860 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav new file mode 100644 index 0000000..ef9bf89 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f355ac2a4b1e022d7dfa5a6587dc5d0365c4d448c3c9b38838eb443f23b264f +size 3722 diff --git a/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav.meta b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav.meta new file mode 100644 index 0000000..8495574 --- /dev/null +++ b/Assets/Resources/Audios/au_sfx_ui_button_corePlay_unchoose_ice3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8616f153dfd974b99b6f48ac3a87d6fc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.5 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5a4ffe8..17aec8f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -192,7 +192,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Game) + m_Text: SetState(Ice) --- !u!222 &17265521 CanvasRenderer: m_ObjectHideFlags: 0 @@ -344,7 +344,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 1 @@ -702,7 +702,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Guitar) + m_Text: SetState(Cloud) --- !u!222 &519563563 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1881,7 +1881,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ce47fe7df364a8fa37501256e5b5155, type: 3} m_Name: m_EditorClassIdentifier: - targetGameState: 4 + targetGameState: 2 enableLowpass: 0 --- !u!114 &1542973985 MonoBehaviour: @@ -2319,7 +2319,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Home) + m_Text: SetState(Normal) --- !u!222 &1798358789 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/OCES/Audio/Generated/AudioEnumIds.cs b/Assets/Scripts/OCES/Audio/Generated/AudioEnumIds.cs index 199092b..decab45 100644 --- a/Assets/Scripts/OCES/Audio/Generated/AudioEnumIds.cs +++ b/Assets/Scripts/OCES/Audio/Generated/AudioEnumIds.cs @@ -9,9 +9,12 @@ namespace OCES.Audio { public const uint GameState = 1; + public const uint TileMaterial = 2; + public static void RegisterAllGameState() { StateGroupRegistry.Register(1); + StateGroupRegistry.Register(2); } } } diff --git a/Assets/Scripts/OCES/Audio/Generated/AudioEnums.cs b/Assets/Scripts/OCES/Audio/Generated/AudioEnums.cs index 04d5468..60dc6e3 100644 --- a/Assets/Scripts/OCES/Audio/Generated/AudioEnums.cs +++ b/Assets/Scripts/OCES/Audio/Generated/AudioEnums.cs @@ -15,4 +15,11 @@ namespace OCES.Audio Bass = 6, // 测试用值 } + public enum TileMaterial + { + Normal, // 普通牌 + Ice, // 冰 + Cloud, // 云 + } + } diff --git a/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs b/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs index 50683c3..dcc6696 100644 --- a/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs +++ b/Assets/Scripts/OCES/Audio/Generated/AudioObject.cs @@ -98,6 +98,7 @@ public partial class AudioObject : IBinarySerializable /// 0 = 随机播放 /// 1 = 顺序播放 /// 2 = 混合播放 + /// 3 = 切换播放 /// public ContainerType ContainerType { get; set; } @@ -147,6 +148,16 @@ public partial class AudioObject : IBinarySerializable /// public int VolumeStep { get; set; } + /// + /// 要绑定的 StateGroup ID + /// + public uint SwitchGroupId { get; set; } + + /// + /// 匹配失败时的备用 AudioObject ID + /// + public uint DefaultSwitchId { get; set; } + public void DeSerialize(BinaryReader reader) { @@ -186,6 +197,8 @@ public partial class AudioObject : IBinarySerializable VolumeStepThreshold = reader.ReadUInt32(); Volume = reader.ReadInt32(); VolumeStep = reader.ReadInt32(); + SwitchGroupId = reader.ReadUInt32(); + DefaultSwitchId = reader.ReadUInt32(); } public void Serialize(BinaryWriter writer) @@ -225,6 +238,8 @@ public partial class AudioObject : IBinarySerializable writer.Write(VolumeStepThreshold); writer.Write(Volume); writer.Write(VolumeStep); + writer.Write(SwitchGroupId); + writer.Write(DefaultSwitchId); } } diff --git a/Assets/Scripts/OCES/Audio/Generated/AudioObjectDefinitions.cs b/Assets/Scripts/OCES/Audio/Generated/AudioObjectDefinitions.cs index e54a9e6..712ba12 100644 --- a/Assets/Scripts/OCES/Audio/Generated/AudioObjectDefinitions.cs +++ b/Assets/Scripts/OCES/Audio/Generated/AudioObjectDefinitions.cs @@ -73,53 +73,36 @@ public static class AudioObjectDefinitions { "NVHeartbeats", 56 }, { "au_sfx_notice_level_countDown_edge", 57 }, { "au_sfx_notice_level_countDown_time", 58 }, - { "sfx_amb_desert", 2000 }, - { "sfx_amb_forest", 2001 }, - { "sfx_anim_common_item_fly", 3000 }, - { "sfx_anim_corePlay_character_footstep_grass", 3001 }, - { "sfx_anim_corePlay_character_footstep_sand", 3002 }, - { "sfx_anim_corePlay_character_footstep_stone", 3003 }, - { "sfx_anim_corePlay_fireBall", 3004 }, - { "sfx_anim_corePlay_freeze", 3005 }, - { "sfx_anim_corePlay_getIn_devil", 3006 }, - { "sfx_anim_corePlay_getIn_dragon", 3007 }, - { "sfx_anim_corePlay_getIn_ghost", 3008 }, - { "sfx_anim_corePlay_newBoxFromStorage", 3009 }, - { "sfx_anim_corePlay_shield_broke_wood", 3010 }, - { "sfx_anim_corePlay_shield_broke_crystal", 3011 }, - { "sfx_anim_corePlay_shield_broke_eggRoll", 3012 }, - { "sfx_anim_corePlay_shield_show_crystal", 3013 }, - { "sfx_anim_corePlay_shield_show_eggRoll", 3014 }, - { "sfx_anim_corePlay_shield_show_wood", 3015 }, - { "sfx_anim_corePlay_shield_underAttack_wood", 3016 }, - { "sfx_anim_corePlay_shield_underAttack_crystal", 3017 }, - { "sfx_anim_corePlay_shield_underAttack_eggRoll", 3018 }, - { "sfx_anim_corePlay_slow", 3019 }, - { "sfx_anim_corePlay_speedUp", 3020 }, - { "sfx_anim_corePlay_useProp_", 3021 }, - { "sfx_anim_cutScene_in", 3022 }, - { "sfx_anim_cutScene_out", 3023 }, - { "sfx_notice_common_negative", 4000 }, - { "sfx_notice_corePlay_losing", 4001 }, - { "sfx_notice_corePlay_restart", 4002 }, - { "sfx_notice_corePlay_warning", 4003 }, - { "sfx_notice_guide", 4004 }, - { "sfx_notice_spinWheel_click", 4005 }, - { "sfx_notice_spinWheel_getReward", 4006 }, - { "sfx_notice_corePlay_levelStart_hard", 4007 }, - { "sfx_ui_labelSwitch_home", 5000 }, - { "sfx_ui_panel_common_close", 5001 }, - { "sfx_ui_panel_common_open", 5002 }, - { "sfx_ui_panel_continue_open", 5003 }, - { "sfx_ui_panel_corePlay_guide_open", 5004 }, - { "sfx_ui_panel_initPack_open", 5005 }, - { "sfx_ui_panel_piggyBank_close", 5006 }, - { "sfx_ui_panel_piggyBank_open", 5007 }, - { "sfx_ui_panel_removeAds_open", 5008 }, - { "0", 5009 }, - { "sfx_ui_panel_summerPack_open", 5010 }, - { "sfx_ui_panel_unlockItem_open", 5011 }, - { "voice_princess_fear", 9000 }, + { "0,62", 59 }, + { "1,65", 59 }, + { "2,68", 59 }, + { "0,63", 60 }, + { "1,66", 60 }, + { "2,69", 60 }, + { "0,64", 61 }, + { "1,67", 61 }, + { "2,70", 61 }, + { "au_coreplay_choose_v120_a", 62 }, + { "au_coreplay_unchoose_v120_a", 63 }, + { "au_coreplay_clear_v120_a", 64 }, + { "au_sfx_ui_button_corePlay_choose_ice1", 65 }, + { "au_sfx_ui_button_corePlay_choose_ice2", 65 }, + { "au_sfx_ui_button_corePlay_choose_ice3", 65 }, + { "au_sfx_ui_button_corePlay_unchoose_ice1", 66 }, + { "au_sfx_ui_button_corePlay_unchoose_ice2", 66 }, + { "au_sfx_ui_button_corePlay_unchoose_ice3", 66 }, + { "au_sfx_ui_button_corePlay_clear_ice1", 67 }, + { "au_sfx_ui_button_corePlay_clear_ice2", 67 }, + { "au_sfx_ui_button_corePlay_clear_ice3", 67 }, + { "au_sfx_ui_button_corePlay_choose_cloud1", 68 }, + { "au_sfx_ui_button_corePlay_choose_cloud2", 68 }, + { "au_sfx_ui_button_corePlay_choose_cloud3", 68 }, + { "au_sfx_ui_button_corePlay_unchoose_cloud1", 69 }, + { "au_sfx_ui_button_corePlay_unchoose_cloud2", 69 }, + { "au_sfx_ui_button_corePlay_unchoose_cloud3", 69 }, + { "au_sfx_ui_button_corePlay_clear_cloud1", 70 }, + { "au_sfx_ui_button_corePlay_clear_cloud2", 70 }, + { "au_sfx_ui_button_corePlay_clear_cloud3", 70 }, }; public static readonly HashSet AmbiguousNames = new() @@ -147,6 +130,33 @@ public static class AudioObjectDefinitions "Chinese Number 08", "Chinese Number 09", "Chinese Number 10", + "0,62", + "1,65", + "2,68", + "0,63", + "1,66", + "2,69", + "0,64", + "1,67", + "2,70", + "au_sfx_ui_button_corePlay_choose_ice1", + "au_sfx_ui_button_corePlay_choose_ice2", + "au_sfx_ui_button_corePlay_choose_ice3", + "au_sfx_ui_button_corePlay_unchoose_ice1", + "au_sfx_ui_button_corePlay_unchoose_ice2", + "au_sfx_ui_button_corePlay_unchoose_ice3", + "au_sfx_ui_button_corePlay_clear_ice1", + "au_sfx_ui_button_corePlay_clear_ice2", + "au_sfx_ui_button_corePlay_clear_ice3", + "au_sfx_ui_button_corePlay_choose_cloud1", + "au_sfx_ui_button_corePlay_choose_cloud2", + "au_sfx_ui_button_corePlay_choose_cloud3", + "au_sfx_ui_button_corePlay_unchoose_cloud1", + "au_sfx_ui_button_corePlay_unchoose_cloud2", + "au_sfx_ui_button_corePlay_unchoose_cloud3", + "au_sfx_ui_button_corePlay_clear_cloud1", + "au_sfx_ui_button_corePlay_clear_cloud2", + "au_sfx_ui_button_corePlay_clear_cloud3", }; } } diff --git a/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs b/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs new file mode 100644 index 0000000..2133f92 --- /dev/null +++ b/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace OCES.Audio +{ + public partial class AudioObjectConfig + { + Dictionary> m_switchMapping; + + internal void PreParseSwitchMappings() + { + this.m_switchMapping = new Dictionary>(); + foreach (AudioObject audioObject in AudioObjectList()) + { + if (audioObject.ContainerType != ContainerType.Switch) continue; + this.m_switchMapping[audioObject.Id] = ParseSwitchMapping(audioObject); + } + } + + public AudioObject GetMappingResult(uint switchContainerId, Enum enumState) + { + if (!this.m_switchMapping.TryGetValue(switchContainerId, out Dictionary switchMapping)) + return null; + + return switchMapping.TryGetValue(enumState.GetHashCode(), out uint audioObjectId) ? QueryById(audioObjectId) : null; + + } + + Dictionary ParseSwitchMapping(AudioObject switchContainer) + { + Dictionary switchMapping = new(); + foreach (string name in switchContainer.Name) + { + string[] parts = name.Split(','); + if(parts.Length != 2) + { + Debug.LogWarning($"[AudioSystem] 无法解析 Switch Container {switchContainer.Id} 的映射关系！请检查表"); + continue; + } + + if (!int.TryParse(parts[0].Trim(), out int stateValue)) + { + Debug.LogWarning($"[AudioSystem] 无法解析 映射关系！请查表"); + continue; + } + + if (!uint.TryParse(parts[1].Trim(), out uint childId)) + { + Debug.LogWarning(""); + continue; + } + + switchMapping.Add(stateValue, childId); + } + return switchMapping; + } + + internal AudioObject GetDefaultSwitchOrFallback(AudioObject switchContainer) + { + if (switchContainer.DefaultSwitchId == 0) + return null; + AudioObject defaultChildAudioObject = QueryById(switchContainer.DefaultSwitchId); + if (defaultChildAudioObject != null) + return defaultChildAudioObject; + + Debug.LogWarning($"[AudioSystem] DefaultSwitch AudioObject {switchContainer.DefaultSwitchId} 不存在。"); + return null; + } + } +} diff --git a/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs.meta b/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs.meta new file mode 100644 index 0000000..9de33f9 --- /dev/null +++ b/Assets/Scripts/OCES/Audio/HandWritten/AudioObject.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 68c35969f92d4bb0ba3239d852115c53 +timeCreated: 1776244015 \ No newline at end of file diff --git a/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs b/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs index 1153bba..3a0aa3f 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/AudioSystem.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.IO; using UnityEngine; using UnityEngine.Audio; @@ -9,7 +10,9 @@ namespace OCES.Audio public class AudioSystem : MonoBehaviour { public static AudioSystem Instance { get; private set; } - + // ReSharper disable once MemberCanBePrivate.Global + public IReadOnlyDictionary ActiveStates { get; private set; } + const string k_audioConfigPath = "AudioData"; const string k_audioResourcePath = "Audios"; @@ -20,7 +23,7 @@ namespace OCES.Audio AudioGroupConfig m_groups; AudioMixer m_mixer; Tween m_lowpassTween; - + // ───────────────────────────────────────────── // 公开接口 // ───────────────────────────────────────────── @@ -36,6 +39,16 @@ namespace OCES.Audio public void Play(AudioObject audioObject, Action onPlay = null) { + if (audioObject.ContainerType == ContainerType.Switch) + { + audioObject = ResolveSwitchContainer(audioObject); + if (audioObject == null) + { + Debug.Log("[AudioSystem] 无法解析Switch Container，检查配置表！"); + return; + } + } + this.m_sfxSystem.TryPlay(audioObject, onPlay); } @@ -43,8 +56,7 @@ namespace OCES.Audio { Play((uint)audioId); } - - + [Obsolete("Use Play(uint) instead")] public void Play(string audioName) { @@ -108,6 +120,7 @@ namespace OCES.Audio public void SetState(TEnum state) where TEnum : Enum { this.m_musicSystem.OnStateChanged(state); + ActiveStates = this.m_musicSystem.ActiveStates; } // ───────────────────────────────────────────── @@ -133,6 +146,7 @@ namespace OCES.Audio AudioSourcePool sfxPool = new(sfxPoolRoot.transform); // 不传 mixer group，让 SfxSystem 自己设置 this.m_sfxSystem = gameObject.AddComponent(); this.m_audioObjects = AudioConfigLoader.Load($"{k_audioConfigPath}/AudioObject"); + this.m_audioObjects.PreParseSwitchMappings(); this.m_groups = AudioConfigLoader.Load($"{k_audioConfigPath}/AudioGroup"); this.m_sfxSystem.Initialize(this.m_groups, this.m_mixer, sfxPool); // 传入 pool @@ -172,10 +186,38 @@ namespace OCES.Audio // ── 注册 StateGroup ── EnumIds.RegisterAllGameState(); + ActiveStates = new Dictionary(); + // ── 启动默认音乐与环境音 ── // 触发一次初始状态，让音乐系统从默认状态开始匹配 //SetState(GameState.Home); } + + AudioObject ResolveSwitchContainer(AudioObject switchContainer) + { + // 遍历 ActiveStates 找到 TypeId 匹配的枚举类型 + Enum currentStateValue = null; + bool foundGroup = false; + foreach (KeyValuePair keyValuePair in ActiveStates) + { + if (StateGroupRegistry.GetTypeId(keyValuePair.Key) != switchContainer.SwitchGroupId) continue; + currentStateValue = keyValuePair.Value; + foundGroup = true; + break; + } + + if (!foundGroup) + { + Debug.LogWarning($"[AudioSystem] Switch Container {switchContainer.Id} 找不到 TypeId={switchContainer.SwitchGroupId} 对应的状态组。"); + return this.m_audioObjects.GetDefaultSwitchOrFallback(switchContainer); + } + + // 解析AudioObject对象 + AudioObject childContainer = this.m_audioObjects.GetMappingResult(switchContainer.Id, currentStateValue); + return childContainer ?? this.m_audioObjects.GetDefaultSwitchOrFallback(switchContainer); + } + + } public static class AudioConfigLoader @@ -194,9 +236,9 @@ namespace OCES.Audio try { - var config = new T(); - using var ms = new MemoryStream(File.ReadAllBytes(path)); - using var reader = new BinaryReader(ms); + T config = new T(); + using MemoryStream ms = new(File.ReadAllBytes(path)); + using BinaryReader reader = new(ms); config.DeSerialize(reader); return config; } diff --git a/Assets/Scripts/OCES/Audio/HandWritten/DebugInfoCollector.cs b/Assets/Scripts/OCES/Audio/HandWritten/DebugInfoCollector.cs index e29ef90..64b7328 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/DebugInfoCollector.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/DebugInfoCollector.cs @@ -14,7 +14,7 @@ namespace OCES.Audio.Editor public Dictionary ClipConcurrentCount = new(); public List ActiveSounds = new(); - public Dictionary ActiveStates = new(); + public Dictionary ActiveStates = new(); readonly StringBuilder m_stringBuilder = new(); Text m_textComponent; @@ -35,10 +35,9 @@ namespace OCES.Audio.Editor this.m_stringBuilder.Clear(); this.m_stringBuilder.AppendLine("Current States:"); - foreach (KeyValuePair activeState in this.ActiveStates) + foreach (KeyValuePair activeState in this.ActiveStates) { - string enumName = Enum.GetName(activeState.Key, activeState.Value) ?? activeState.Value.ToString(); - this.m_stringBuilder.AppendLine($"{activeState.Key.Name} is {enumName}"); + this.m_stringBuilder.AppendLine($"{activeState.Key.Name} is {activeState.Value}"); } this.m_stringBuilder.AppendLine(); diff --git a/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs b/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs index c24ea55..e361d5a 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/HandWrittenDefinitions.cs @@ -29,6 +29,7 @@ namespace OCES.Audio Random = 0, Sequence, Blend, + Switch, } public enum BlendCrossFadeType @@ -84,4 +85,10 @@ namespace OCES.Audio public partial class MusicPath : IPathEntry { } public partial class AmbiencePath : IPathEntry { } + + public class SwitchEntry + { + public uint SwitchValue; + public uint AudioObjectId; + } } diff --git a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicStateRouter.cs b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicStateRouter.cs index 84f773f..7abb7ac 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicStateRouter.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicStateRouter.cs @@ -9,8 +9,10 @@ namespace OCES.Audio /// public class MusicStateRouter { - // key: StateGroup enum Type，value: 当前激活的 enum 整数值 - readonly Dictionary m_activeStates = new(); + + // key: StateGroup enum Type，value: 当前激活的 enum 值 + readonly Dictionary m_activeStates = new(); + readonly MusicPathConfig m_musicPaths; readonly AmbiencePathConfig m_ambiencePaths; @@ -18,6 +20,7 @@ namespace OCES.Audio // 上一次匹配到的 PathId，用于 Transition 表的 FromPathId 查询 public uint LastMusicPathId { get; private set; } public uint LastAmbiencePathId { get; private set; } + internal IReadOnlyDictionary ActiveStates { get { return this.m_activeStates; }} public MusicStateRouter(MusicPathConfig musicPaths, AmbiencePathConfig ambiencePaths) { @@ -31,8 +34,8 @@ namespace OCES.Audio public void SetState(TEnum state, out uint musicContainerId, out uint ambienceContainerId) where TEnum : Enum { - // Dictionary 天然保证同一 StateGroup 只保留最新值，直接覆盖即可 - this.m_activeStates[typeof(TEnum)] = Convert.ToInt32(state); + // Dictionary 天然保证同一 StateGroup 只保留最新值，直接覆盖即可 + this.m_activeStates[typeof(TEnum)] = state; musicContainerId = MatchBestPath(this.m_musicPaths.MusicPathList(), out uint musicPathId); ambienceContainerId = MatchBestPath(this.m_ambiencePaths.AmbiencePathList(), out uint ambiencePathId); @@ -99,9 +102,9 @@ namespace OCES.Audio } bool conditionMet = false; - foreach (KeyValuePair kv in this.m_activeStates) + foreach (KeyValuePair kv in this.m_activeStates) { - if (StateGroupRegistry.GetTypeId(kv.Key) != typeId || kv.Value != stateValue) + if (StateGroupRegistry.GetTypeId(kv.Key) != typeId || Convert.ToInt32(kv.Value) != stateValue) continue; conditionMet = true; break; diff --git a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicSystem.cs b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicSystem.cs index 3ce82ad..51a5aed 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicSystem.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/LongAudio/MusicSystem.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using UnityEngine; namespace OCES.Audio @@ -16,6 +17,11 @@ namespace OCES.Audio // 记录上一次两个通道各自匹配到的 PathId，用于查 Transition 表 uint m_lastMusicPathId; uint m_lastAmbiencePathId; + + internal IReadOnlyDictionary ActiveStates + { + get { return this.m_stateRouter.ActiveStates; } + } public void Initialize( MusicSegmentConfig segments, diff --git a/Assets/Scripts/OCES/Audio/HandWritten/SfxSystem.cs b/Assets/Scripts/OCES/Audio/HandWritten/SfxSystem.cs index 3a45b24..751fe10 100644 --- a/Assets/Scripts/OCES/Audio/HandWritten/SfxSystem.cs +++ b/Assets/Scripts/OCES/Audio/HandWritten/SfxSystem.cs @@ -488,8 +488,6 @@ namespace OCES.Audio DecrementClipCount(active.AudioObject.Id); this.m_activeSounds.Remove(active); - // TryStopHaptic(active.AudioObject.Haptic); - this.m_pool.ReturnToPool(active.Source.gameObject); } @@ -511,8 +509,6 @@ namespace OCES.Audio DecrementClipCount(active.AudioObject.Id); this.m_activeSounds.Remove(active); this.m_pool.ReturnToPool(active.Source.gameObject); - - // TryStopHaptic(active.AudioObject.Haptic); } static void TryStartHaptic(ActiveSound active) @@ -526,7 +522,6 @@ namespace OCES.Audio { HapticSystem.Instance.Stop(hapticId); } - } /// diff --git a/Assets/Scripts/OCES/ButtonInvoker.cs b/Assets/Scripts/OCES/ButtonInvoker.cs index 7f1a878..ca9623f 100644 --- a/Assets/Scripts/OCES/ButtonInvoker.cs +++ b/Assets/Scripts/OCES/ButtonInvoker.cs @@ -7,7 +7,7 @@ namespace OCES { public class ButtonInvoker : MonoBehaviour { - public GameState targetGameState; + public TileMaterial targetGameState; public bool enableLowpass; Button m_button;