From afe171ec3b14a747f05791e79753dfb9d08991b9 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Wed, 14 Oct 2020 17:35:50 +0800 Subject: [PATCH 1/5] Added scu. --- 10_ElsaQueen/elsa.scu | Bin 0 -> 4815 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 10_ElsaQueen/elsa.scu diff --git a/10_ElsaQueen/elsa.scu b/10_ElsaQueen/elsa.scu new file mode 100644 index 0000000000000000000000000000000000000000..a12b08c7ecfd1d3391738baf0adf4bc2683b96af GIT binary patch literal 4815 zcmdtmM{;u476wodAaV{S=V&r`1ad=txm>Q-{|E4z9~n<>KmGV~Ch<5*i60W5cT*m>lAq5e5^?86;@Px>d6lf>BrgRiK4j84$tU?FpX8H# zl27tUKFKHfm^I|fW2BtZl95-*N>1`pkm93)m^EbTG1AT%d6lf>BrgRiKB|ohV%Cu9 z$H+LpN>*}`mx2@@D~oEQf|xaA<}qHKvyzj%6r^aD=tQh8Dvl~*=8VM1N>1`pkfLXz zYte~VT~r)Z#LS^%{Bq7$*Ys5q*K znM21YNYOcVE_Ne299@e}#Ok8rs3K+#9iwP`?sDv0>_&7rx)z;?)kVcoMa&$!#Fxxp z;!AvqFYzV5#FzLIU*b!AnJ@EYzRZ{TGGFG)e3>uvWxmW;_zGX)D}05o@D;woSNIBF z;VXQVukuyC%2)X+U*)TOm9O$uzRK758eijUe2uU1HNM8z_!?j1YkZxr^L4(?*ZDeM z=j(i(uk&@j&Nui5-{2d3gKzK+zQH&62H)Tte3NhTO}@!D`6l1wn|zaR@=d$pYQVne!vg-0YBge{D2?u1Af2{_yIrU zhy0Kq@e5BVWK_>{FI;aGk(U;_!&Rr zXZ(zx@iTtL&-fWX=jZ&KpYwBm&d>QdKj-KCoS*Xxe!(yJ1;5}I{DNQb3x2^b_yxb@ zm;91n@=JcnFZm_Ew9Ex+Zr{FdMHJATLS_#MCF zcl?gu@jHIU@Aw`6EC2l?Nw+VOlC)&xRkD(kycDFE*zvp5OC(e$VguJ-_Go z{DD942mZhx_yd375Bz~Y@CW|DANeDHw+i9hit{=}d76My1Q z{E0vDC;r5r`7?j!&-|G`^Jo6dpZPO?=Fj|vzwj6S!e96cf8j6ug}?9@{=#4RD}Uv$ z{FT4*SN_Uh`73|rul$X_@i+d)-}oDU<8SnuL!y}zd{Qvh}N9yh4*$X@I#ebPoZ|~3Ua^j0$*=g_C$6ubhPHpmE iUlBa@WB(fbSn~g#D(643 Date: Wed, 14 Oct 2020 18:38:09 +0800 Subject: [PATCH 2/5] [09_TheUnknown] Updated the settings. --- 09_TheUnknown/unknown.act | Bin 0 -> 451 bytes 09_TheUnknown/unknown1014.scu | Bin 0 -> 8087 bytes _Startup/09_TheUnknown.bat | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 09_TheUnknown/unknown.act create mode 100644 09_TheUnknown/unknown1014.scu diff --git a/09_TheUnknown/unknown.act b/09_TheUnknown/unknown.act new file mode 100644 index 0000000000000000000000000000000000000000..45bec89669c08f4acbbdd2382fb3b36210b32506 GIT binary patch literal 451 zcmbV|y$ZrW5QM*^5CpAleE}sR7TSqoXJ@)VP!cd0O^ETY_q}!QRHE33OK$IWc4lvK zdAhvBh0A-KX;8xvROi5sjaJ4WH_L6|kjsITLj^LP0nKP6gzNsPpPtv0M6 z%o^mkuj9M(5BVw4@=IbQ_Up>RYQqY`tU-SNI(|6+lxX=SF%oN*uoL0x!ivKx!pz?# z96u#meo2hP`cBxjuoL0x!ivKx!puR3BU*k*jKumX>~Pq%uoL0x!ivKx!puR3*okm;VZ~t;VdkLY_&D>&@o{_{AIHb>aeN#f$H(z;d^{h|$Mf-gJRi@; z^YMHldC!3ZKHK@F{#MpUS85seCG*%BS+Fd@7&Hr}C+M8lT3e@o9V-pT?*0X?z-=#;5UV zd^(@br}OE2I-ky`^XYs#pU$WA>3jyC!DsLpdJU)-ly>`FuW~&*$^`0=|GR;0yQyzJM>_ z3-|)QfG^++_(HyrFXRjPLcWkM-l=V zp0DTY`Fg&dujlLe2EKuB;2Zb`zJYJx8~6skfp6d&_(r~wZ{!>KM!u16goCY>goCY>goCY>goCY>goCY@%!nQ!Ks`DVVEZ|0l%X1T_o_!ho}Z{b_`R=$;Q=ec`C)#TALfVoVSbn&=7;$aeuN+4NB9wbgdgEY_z`}DAK^#%QGS#kNq&-_3;Y7Vz%TF%`~ttgFYt@}BEQHl@{9Z; zzsN80i~J(L$S?9s{1U&!FY!zK62HVR@k{&?zr-)`%ltCG%rEoH{4&4HFZ0X%GQZ3( z^DF!czrwHZEBp$-!mscv{0hIqukfq-;*u&ad<9{5rqRuk-8tI={}Z^BepIzrk2%$@q7FpzsK+K`}{t?&+qg5{64?W@ALcoKEKcJ^9TF^f50E` z2mAqlz#s4j`~iQ!AMl6#A%Dmp@`wB(f5;#5hx{Rb$RF}WUW1Nwj&zQ6j&zQ6j&zQ6 zj&zQ6j&zQ6j&zRsWB!;w=8ySf{+K`JkNIQ%m_O!E_!ItwKjBaK6aIuh;ZOJz{)9i_ zPx({+lt1N9`BVOsKjlyPQ~s1c<bL z`A7bdf8-zeNB)t2{*8a* z-}pEFjeq0c_&5HIf8*czcmAD!=im8v{+)m4-}!g`oqy*)_z(Vr|KLCP5B`Jy;6L~e z{)7MEKlxAolmFyD`A`0n|KvaUPyUntV(g-=XypFoHUE74Ph9fv-DOYg QsDHje|9vw2h>eW+e-<>m>;M1& literal 0 HcmV?d00001 diff --git a/_Startup/09_TheUnknown.bat b/_Startup/09_TheUnknown.bat index fd23bc4..58c800e 100644 --- a/_Startup/09_TheUnknown.bat +++ b/_Startup/09_TheUnknown.bat @@ -1,6 +1,6 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=09_TheUnknown timeout /t 8 -CD "C:\Users\UltraCombos\Desktop" +CD "%root%\%device%" start "" "unknown.act" From aea0f619e9aede52d5cead1ce2649748686b4e68 Mon Sep 17 00:00:00 2001 From: LH Date: Tue, 27 Oct 2020 15:19:47 +0800 Subject: [PATCH 3/5] Added 05_BallPool 8M --- .../.sync/IgnoreList | 42 +++++++++++++++++++ .../Build/.gitkeep | 1 + .../Material/.gitkeep | 1 + 3 files changed, 44 insertions(+) create mode 100644 05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList create mode 100644 05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep create mode 100644 05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList b/05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList new file mode 100644 index 0000000..1d07dcc --- /dev/null +++ b/05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList @@ -0,0 +1,42 @@ +# IgnoreList is a UTF-8 encoded .txt file that helps you specify single files, paths and rules +# for ignoring during the synchronization job. It supports "?" and "*" wildcard symbols. +# +# +# OS generated files # +$RECYCLE.BIN +$Recycle.Bin +System Volume Information +lost+found +.DocumentRevisions-V100 +.TemporaryItems +.fseventsd +.iCloud +.DS_Store +.DS_Store? +.Spotlight-V100 +.Trashes +.Trash-* +ehthumbs.db +desktop.ini +Thumbs.db +~* +*~ +.~lock.* +*.part +*.filepart +.csync_journal.db +.csync_journal.db.tmp +*.swn +*.swp +*.swo +.dropbox +.dropbox.attr +*.crdownload +@eaDir +@SynoResource +.@__thumb +.thumbnails +._* + +#Project-19050-Frozen2/_Deploy_PC +.gitkeep diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep new file mode 100644 index 0000000..0e8c54b --- /dev/null +++ b/05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep @@ -0,0 +1 @@ +#gitkeep file diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep new file mode 100644 index 0000000..0e8c54b --- /dev/null +++ b/05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep @@ -0,0 +1 @@ +#gitkeep file From 9117e72a50199c8255ad46db445f13147f5340e6 Mon Sep 17 00:00:00 2001 From: LH Date: Tue, 27 Oct 2020 17:17:51 +0800 Subject: [PATCH 4/5] Added 05_BallPool 8M --- .../.sync/IgnoreList | 0 .../Build/.gitkeep | 0 .../Material/.gitkeep | 0 _Setup/README.md | 3 +-- _Setup/[UnityBuild] 05_BallPool _8M.bat | 5 +++++ _Setup/conf/UnityBuild-05_BallPool_8M.conf | 16 ++++++++++++++++ _Startup/05_BallPool_8M.bat | 11 +++++++++++ 7 files changed, 33 insertions(+), 2 deletions(-) rename 05_BallPool/{UnityBuild-20038-05_BallPool-8M => UnityBuild-20038-05_BallPool_8M}/.sync/IgnoreList (100%) rename 05_BallPool/{UnityBuild-20038-05_BallPool-8M => UnityBuild-20038-05_BallPool_8M}/Build/.gitkeep (100%) rename 05_BallPool/{UnityBuild-20038-05_BallPool-8M => UnityBuild-20038-05_BallPool_8M}/Material/.gitkeep (100%) create mode 100644 _Setup/[UnityBuild] 05_BallPool _8M.bat create mode 100644 _Setup/conf/UnityBuild-05_BallPool_8M.conf create mode 100644 _Startup/05_BallPool_8M.bat diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList b/05_BallPool/UnityBuild-20038-05_BallPool_8M/.sync/IgnoreList similarity index 100% rename from 05_BallPool/UnityBuild-20038-05_BallPool-8M/.sync/IgnoreList rename to 05_BallPool/UnityBuild-20038-05_BallPool_8M/.sync/IgnoreList diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool_8M/Build/.gitkeep similarity index 100% rename from 05_BallPool/UnityBuild-20038-05_BallPool-8M/Build/.gitkeep rename to 05_BallPool/UnityBuild-20038-05_BallPool_8M/Build/.gitkeep diff --git a/05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool_8M/Material/.gitkeep similarity index 100% rename from 05_BallPool/UnityBuild-20038-05_BallPool-8M/Material/.gitkeep rename to 05_BallPool/UnityBuild-20038-05_BallPool_8M/Material/.gitkeep diff --git a/_Setup/README.md b/_Setup/README.md index dd693a5..019425d 100644 --- a/_Setup/README.md +++ b/_Setup/README.md @@ -7,11 +7,10 @@ | 03_RoyalGallery_Navigator | BHVO6SHJWB7P7HJI7HCYW6OX7ZXU2FIGD | | 04_IceSlide | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE | | 05_BallPool | BKSEQCSBPGPYNBRLPTRPQUZD7EZ674VAC | +| 05_BallPool_8M | BRXWJM2IB2CEIDR3H3R7CWROWYSAGWUOM | | 06_SylphOlaf | BNP3MLVJDJSIHYDQH2BTD65VK4DRKVBOW | | 07_EnchantedForest | BWX73V5N2XSAESUDQ2AWH3VVUEXTKXAHG | | 08_DarkSea | BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH | | 09_TheUnknown | BFWM45DGCBEQ3HKHJHAAT3DDOCEDUBJRU | | ConfigClient | B3OFX4VTMYZ7XFWHG7NC64B2FZGR3BTZZ | - - diff --git a/_Setup/[UnityBuild] 05_BallPool _8M.bat b/_Setup/[UnityBuild] 05_BallPool _8M.bat new file mode 100644 index 0000000..b195bc8 --- /dev/null +++ b/_Setup/[UnityBuild] 05_BallPool _8M.bat @@ -0,0 +1,5 @@ +@ECHO OFF +TASKKILL /IM "Resilio Sync.exe" /F +COPY /Y conf\UnityBuild-05_BallPool_8M.conf "%USERPROFILE%\AppData\Roaming\Resilio Sync\sync.conf" +START "" "%USERPROFILE%\AppData\Roaming\Resilio Sync\Resilio Sync.exe" +REM PAUSE \ No newline at end of file diff --git a/_Setup/conf/UnityBuild-05_BallPool_8M.conf b/_Setup/conf/UnityBuild-05_BallPool_8M.conf new file mode 100644 index 0000000..ad452a9 --- /dev/null +++ b/_Setup/conf/UnityBuild-05_BallPool_8M.conf @@ -0,0 +1,16 @@ +//samples can be found here: http://internal.getsync.com/support/sample.conf +{ + "shared_folders" : + [ + { + "secret" : "BRXWJM2IB2CEIDR3H3R7CWROWYSAGWUOM", + "dir" : "C:/UC/Project-19050-Frozen2/_Deploy_PC/05_BallPool/UnityBuild-20038-05_BallPool_8M", // * required field + "use_relay_server" : true, // use relay server when direct connection fails + "use_tracker" : true, + "search_lan" : true, + "use_sync_trash" : false, // enable SyncArchive to store files deleted on remote devices + "overwrite_changes" : true, // restore modified files to original version, ONLY for Read-Only folders + "selective_sync" : false//, // add folder in selective sync mode + } + ] +} diff --git a/_Startup/05_BallPool_8M.bat b/_Startup/05_BallPool_8M.bat new file mode 100644 index 0000000..0c6f961 --- /dev/null +++ b/_Startup/05_BallPool_8M.bat @@ -0,0 +1,11 @@ +set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set device=05_BallPool +timeout /t 8 +start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" +timeout /t 8 +start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" +timeout /t 8 +CD "%root%\%device%\UnityBuild-19050-05_BallPool_8M\Build" +start "" "Unity_2018_Frozen.exe" +timeout /t 8 +start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" From 2f533b0e9f8fb5d2ab15a378e8d28441a50a0b48 Mon Sep 17 00:00:00 2001 From: Frozen2-Deveoper Date: Tue, 10 Nov 2020 15:00:14 +0800 Subject: [PATCH 5/5] [06_SylphOlaf] Updated to new asset. --- .gitignore | 1 + .../data/setting/AppEasyVideoPlayer.xml | 8 ++++---- 06_SylphOlaf/AppEasyVideoPlayer/imgui.ini | 15 --------------- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 06_SylphOlaf/AppEasyVideoPlayer/imgui.ini diff --git a/.gitignore b/.gitignore index 4898184..2cb7068 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /08_DarkSea/UnityBuild-19050-08_DarkSea .DS_Store +/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini diff --git a/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml b/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml index 0abcb6d..a6867e4 100644 --- a/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml +++ b/06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml @@ -11,18 +11,18 @@ true true - 59.9775 + 59.9962 60 true false - 977 + 1001 603 1920 - 1080 + 1200 false false @@ -46,7 +46,7 @@ EasyVideoPlayer - ../../Material/6-SylphOlaf_hap_sound.avi + ../../Material/6-SylphOlaf_hap_sound-20200929.avi false true 1 diff --git a/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini b/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini deleted file mode 100644 index 50cd1f8..0000000 --- a/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini +++ /dev/null @@ -1,15 +0,0 @@ -[Window][Debug##Default] -Pos=60,60 -Size=400,400 -Collapsed=0 - -[Window][AppEasyVideoPlayer] -Pos=10,10 -Size=450,686 -Collapsed=0 - -[Window][AppEasyVideoPlayer::Info] -Pos=400,266 -Size=177,71 -Collapsed=0 -