Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Deploy-19050-Frozen2-PC

.gitignore

@@ -5,3 +5,4 @@
 /08_DarkSea/UnityBuild-19050-08_DarkSea
 
 .DS_Store
+/06_SylphOlaf/AppEasyVideoPlayer/imgui.ini

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

05_BallPool/UnityBuild-20038-05_BallPool_8M/Build/.gitkeep

@@ -0,0 +1 @@
+#gitkeep file

05_BallPool/UnityBuild-20038-05_BallPool_8M/Material/.gitkeep

@@ -0,0 +1 @@
+#gitkeep file

06_SylphOlaf/AppEasyVideoPlayer/data/setting/AppEasyVideoPlayer.xml

@@ -11,18 +11,18 @@
 		<IsEnableMessage>true</IsEnableMessage>
 		<IsMessageAutoGone>true</IsMessageAutoGone>
 	</Settings4ofxImGuiParameter>
-	<fps>59.9775</fps>
+	<fps>59.9962</fps>
 	<graphic IsOpen="true">
 		<framerate>60</framerate>
 		<vsync>true</vsync>
 		<hidden_cursor>false</hidden_cursor>
 		<app_size>
-			<X>977</X>
+			<X>1001</X>
 			<Y>603</Y>
 		</app_size>
 		<fbo_size>
 			<X>1920</X>
-			<Y>1080</Y>
+			<Y>1200</Y>
 		</fbo_size>
 		<draw_to_screen>false</draw_to_screen>
 		<fullscreen>false</fullscreen>
@@ -46,7 +46,7 @@
 		<sender_name>EasyVideoPlayer</sender_name>
 	</spout>
 	<movie IsOpen="true">
-		<path>../../Material/6-SylphOlaf_hap_sound.avi</path>
+		<path>../../Material/6-SylphOlaf_hap_sound-20200929.avi</path>
 		<is_abs>false</is_abs>
 		<is_loop>true</is_loop>
 		<volume>1</volume>

06_SylphOlaf/AppEasyVideoPlayer/imgui.ini

@@ -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
-

_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 |
 
-
-

_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

_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
+    }
+  ]
+}

_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"

_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"