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/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 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 - diff --git a/09_TheUnknown/unknown.act b/09_TheUnknown/unknown.act new file mode 100644 index 0000000..45bec89 Binary files /dev/null and b/09_TheUnknown/unknown.act differ diff --git a/09_TheUnknown/unknown1014.scu b/09_TheUnknown/unknown1014.scu new file mode 100644 index 0000000..b120807 Binary files /dev/null and b/09_TheUnknown/unknown1014.scu differ diff --git a/10_ElsaQueen/elsa.scu b/10_ElsaQueen/elsa.scu new file mode 100644 index 0000000..a12b08c Binary files /dev/null and b/10_ElsaQueen/elsa.scu differ 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" 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"