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/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings-backup.json b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings-backup.json new file mode 100644 index 0000000..b69b3bf --- /dev/null +++ b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings-backup.json @@ -0,0 +1,238 @@ +{ + "properties": [ + { + "type": 4, + "key": "MainCamera.cam_x", + "value": "-0.329861", + "range": { + "x": -5.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "MainCamera.cam_y", + "value": "5", + "range": { + "x": 5.0, + "y": 10.0 + } + }, + { + "type": 4, + "key": "MainCamera.key_movement", + "value": "0.1", + "range": { + "x": 0.05000000074505806, + "y": 0.5 + } + }, + { + "type": 2, + "key": "iceVFX.lifetime", + "value": "5", + "range": { + "x": 1.0, + "y": 10.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_ice_spawn_rate", + "value": "40000", + "range": { + "x": 10000.0, + "y": 60000.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_flake_spawn_rate", + "value": "5000", + "range": { + "x": 1000.0, + "y": 10000.0 + } + }, + { + "type": 2, + "key": "iceVFX.flying_flake_spawn_rate", + "value": "1000", + "range": { + "x": 100.0, + "y": 3000.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_frost_size", + "value": "0.3", + "range": { + "x": 0.10000000149011612, + "y": 0.800000011920929 + } + }, + { + "type": 4, + "key": "iceVFX.max_frost_size", + "value": "0.5", + "range": { + "x": 0.30000001192092898, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_spike_size", + "value": "0.3", + "range": { + "x": 0.009999999776482582, + "y": 0.5 + } + }, + { + "type": 4, + "key": "iceVFX.max_spike_size", + "value": "0.6", + "range": { + "x": 0.10000000149011612, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_flake_size", + "value": "0", + "range": { + "x": 0.0, + "y": 0.10000000149011612 + } + }, + { + "type": 4, + "key": "iceVFX.max_flake_size", + "value": "0.1", + "range": { + "x": 0.05000000074505806, + "y": 0.30000001192092898 + } + }, + { + "type": 4, + "key": "iceVFX.ground_post_alpha", + "value": "0", + "range": { + "x": -1.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.flake_alpha", + "value": "1", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 3, + "key": "SceneController.debugMode", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.Emitter_x", + "value": "3.5", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "SceneController.Target_x", + "value": "-5", + "range": { + "x": -5.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.growing_speed", + "value": "0.003920139", + "range": { + "x": 0.0, + "y": 0.05000000074505806 + } + }, + { + "type": 2, + "key": "SceneController.delay_sec", + "value": "2", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "PostProcess.post_exposure", + "value": "-0.6", + "range": { + "x": -2.0, + "y": 2.0 + } + }, + { + "type": 4, + "key": "PostProcess.contrast", + "value": "100", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.saturation", + "value": "-20", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_intensity", + "value": "1", + "range": { + "x": 0.0, + "y": 3.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_threshold", + "value": "0.6", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "PostProcess.vignette_intensity", + "value": "0.3", + "range": { + "x": 0.0, + "y": 1.0 + } + } + ] +} \ No newline at end of file diff --git a/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json new file mode 100644 index 0000000..21e4a79 --- /dev/null +++ b/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/settings.json @@ -0,0 +1,238 @@ +{ + "properties": [ + { + "type": 4, + "key": "MainCamera.cam_x", + "value": "-1.032934", + "range": { + "x": -5.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "MainCamera.cam_y", + "value": "5", + "range": { + "x": 5.0, + "y": 10.0 + } + }, + { + "type": 4, + "key": "MainCamera.key_movement", + "value": "0.1", + "range": { + "x": 0.05000000074505806, + "y": 0.5 + } + }, + { + "type": 2, + "key": "iceVFX.lifetime", + "value": "2", + "range": { + "x": 1.0, + "y": 10.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_ice_spawn_rate", + "value": "40000", + "range": { + "x": 10000.0, + "y": 60000.0 + } + }, + { + "type": 2, + "key": "iceVFX.ground_flake_spawn_rate", + "value": "5407", + "range": { + "x": 1000.0, + "y": 10000.0 + } + }, + { + "type": 2, + "key": "iceVFX.flying_flake_spawn_rate", + "value": "1489", + "range": { + "x": 100.0, + "y": 3000.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_frost_size", + "value": "0.2850499", + "range": { + "x": 0.10000000149011612, + "y": 0.800000011920929 + } + }, + { + "type": 4, + "key": "iceVFX.max_frost_size", + "value": "0.7754303", + "range": { + "x": 0.30000001192092898, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_spike_size", + "value": "0.3", + "range": { + "x": 0.009999999776482582, + "y": 0.5 + } + }, + { + "type": 4, + "key": "iceVFX.max_spike_size", + "value": "0.6", + "range": { + "x": 0.10000000149011612, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.min_flake_size", + "value": "0", + "range": { + "x": 0.0, + "y": 0.10000000149011612 + } + }, + { + "type": 4, + "key": "iceVFX.max_flake_size", + "value": "0.1286162", + "range": { + "x": 0.05000000074505806, + "y": 0.30000001192092898 + } + }, + { + "type": 4, + "key": "iceVFX.ground_post_alpha", + "value": "0", + "range": { + "x": -1.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "iceVFX.flake_alpha", + "value": "1", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 3, + "key": "SceneController.debugMode", + "value": "false", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.Emitter_x", + "value": "3.5", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "SceneController.Target_x", + "value": "-5", + "range": { + "x": -5.0, + "y": 0.0 + } + }, + { + "type": 4, + "key": "SceneController.growing_speed", + "value": "0.003920139", + "range": { + "x": 0.0, + "y": 0.05000000074505806 + } + }, + { + "type": 2, + "key": "SceneController.delay_sec", + "value": "2", + "range": { + "x": 0.0, + "y": 5.0 + } + }, + { + "type": 4, + "key": "PostProcess.post_exposure", + "value": "-0.6", + "range": { + "x": -2.0, + "y": 2.0 + } + }, + { + "type": 4, + "key": "PostProcess.contrast", + "value": "100", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.saturation", + "value": "-20", + "range": { + "x": -100.0, + "y": 100.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_intensity", + "value": "1", + "range": { + "x": 0.0, + "y": 3.0 + } + }, + { + "type": 4, + "key": "PostProcess.bloom_threshold", + "value": "0.6", + "range": { + "x": 0.0, + "y": 1.0 + } + }, + { + "type": 4, + "key": "PostProcess.vignette_intensity", + "value": "0.3", + "range": { + "x": 0.0, + "y": 1.0 + } + } + ] +} \ No newline at end of file diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml index e40559c..4f73382 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/corners.xml @@ -1,20 +1,20 @@ - 116.093368530 - 45.093383789 + 168.093368530 + 58.093383789 - 438.906646729 - 33.000000000 + 329.906646729 + 85.093383789 - 434.906616211 - 363.906646729 + 325.906616211 + 345.906646729 - 133.093368530 - 326.906616211 + 166.093368530 + 343.906616211 diff --git a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml index 4382756..aa98ca8 100644 --- a/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml +++ b/01_ForstCoronation/ofxKinectV2TouchApp/data/kinect2.xml @@ -7,8 +7,8 @@ 20 1 1 - -5, -5, 0.489796 - 5, 5, 3.59184 + -5, -5, 0.244898 + 5, 5, 3.10204 5 0.2 diff --git a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml index aad8be5..10135fe 100644 --- a/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/01_ForstCoronation/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -1,8 +1,8 @@ -1 +0 0 -1 -0 -0 +0 +1 +1 1 0 60 @@ -36,20 +36,20 @@ 0.000000000 0.000000000 - 0.002148234 - -0.497786552 + 0.002148424 + -0.497786343 1.000000000 0.000000000 1.000488281 - -0.501044810 + -0.501044750 0.000000000 0.333333343 - 0.002408855 - 0.001302082 + 0.002408981 + 0.001302242 1.000000000 @@ -61,13 +61,13 @@ 0.000000000 1.000000000 0.002929688 - 0.998697996 + 0.998698294 1.000000000 1.000000000 1.000488281 - 1.001302123 + 1.001302242 diff --git a/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json b/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json new file mode 100644 index 0000000..04fabb5 --- /dev/null +++ b/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/settings_config.json @@ -0,0 +1,22 @@ +{ + "properties": [ + { + "type": 2, + "key": "Misc.language", + "value": "1", + "range": { + "x": 0.0, + "y": 7.0 + } + }, + { + "type": 3, + "key": "Misc.isTaiwanNo1", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + } + ] +} \ No newline at end of file diff --git a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml index 7baa79f..05e29df 100644 --- a/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/04_IceSlide/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -2,7 +2,7 @@ 0 0 1 -0 +1 1 0 60 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/01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool_8M/Build/.gitkeep similarity index 100% rename from 01_ForstCoronation/UnityBuild-19050-01_ForstCoronation/Build/.gitkeep rename to 05_BallPool/UnityBuild-20038-05_BallPool_8M/Build/.gitkeep diff --git a/05_BallPool/UnityBuild-19050-05_BallPool/Material/.gitkeep b/05_BallPool/UnityBuild-20038-05_BallPool_8M/Material/.gitkeep similarity index 100% rename from 05_BallPool/UnityBuild-19050-05_BallPool/Material/.gitkeep rename to 05_BallPool/UnityBuild-20038-05_BallPool_8M/Material/.gitkeep diff --git a/05_BallPool/ofxCCVApp/data/settings.xml b/05_BallPool/ofxCCVApp/data/settings.xml index 6538280..f3f7374 100644 --- a/05_BallPool/ofxCCVApp/data/settings.xml +++ b/05_BallPool/ofxCCVApp/data/settings.xml @@ -1,8 +1,8 @@ - 187 - 36 + 741 + 37 396 781 @@ -36,9 +36,9 @@ 1 - + 8 - 121 + 86 false @@ -51,7 +51,7 @@ 0 0 - + false false @@ -61,12 +61,12 @@ true - 12 + 6 true - 21 - 6 + 39 + 2 true diff --git a/05_BallPool/ofxCCVApp/imgui.ini b/05_BallPool/ofxCCVApp/imgui.ini index 3b47927..7930ff0 100644 --- a/05_BallPool/ofxCCVApp/imgui.ini +++ b/05_BallPool/ofxCCVApp/imgui.ini @@ -4,7 +4,7 @@ Size=400,400 Collapsed=0 [Window][Settings] -Pos=-111,13 +Pos=741,37 Size=396,781 Collapsed=0 diff --git a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml index 1c80c45..94f4428 100644 --- a/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/05_BallPool/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -6,16 +6,16 @@ 1 0 60 -2177.000000000 -126.000000000 +185.000000000 +145.000000000 1280.000000000 960.000000000 - 0.000000000 + 0.221157864 0.000000000 - 0.333333343 - 1.000000000 + 0.329446077 + 0.329446077 0.000000000 0.000000000 @@ -36,124 +36,26 @@ 0.000000000 0.000000000 - 0.000694444 - 0.012500000 + 0.057291668 + 0.014166667 1.000000000 0.000000000 - 0.328645825 - 0.002500000 + 0.906250000 + 0.006666667 0.000000000 1.000000000 - 0.000347221 - 0.996666789 + 0.088541664 + 0.834999979 1.000000000 1.000000000 - 0.328993082 - 0.970833361 - - - - - - 0.333333343 - 0.000000000 - 0.333333343 - 1.000000000 - - 0.000000000 - 0.000000000 - 0.000000000 - 0.000000000 - - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - - 1 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.338020831 - 0.007500000 - - - 1.000000000 - 0.000000000 - 0.664409697 - 0.012499994 - - - 0.000000000 - 1.000000000 - 0.338715285 - 0.959166646 - - - 1.000000000 - 1.000000000 - 0.661631942 - 0.933333337 - - - - - - 0.666666687 - 0.000000000 - 0.333333313 - 1.000000000 - - 0.000000000 - 0.000000000 - 0.000000000 - 0.000000000 - - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - 1 0.75 0.5 0.25 0 - - 1 - 25 - 25 - 1 - 1 - - - 0.000000000 - 0.000000000 - 0.673263907 - 0.010000000 - - - 1.000000000 - 0.000000000 - 0.995312512 - 0.005833333 - - - 0.000000000 - 1.000000000 - 0.671701372 - 0.984166682 - - - 1.000000000 - 1.000000000 - 0.997742951 - 0.959166646 + 0.887499988 + 0.826666653 diff --git a/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml b/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml index 0a0adff..415ab8c 100644 --- a/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml +++ b/05_BallPool/ucProjectionMappingUI/data/settings/spout_settings.xml @@ -1,3 +1,3 @@ - Spout Camera + Spout Sender diff --git a/05_BallPool/ucURGCalibration/data/settings.xml b/05_BallPool/ucURGCalibration/data/settings.xml index 3a649eb..0201ebb 100644 --- a/05_BallPool/ucURGCalibration/data/settings.xml +++ b/05_BallPool/ucURGCalibration/data/settings.xml @@ -1,5 +1,5 @@ - 897.959, 163.265 + 490, 328 0, 0 diff --git a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml index b14240c..07e1d5e 100644 --- a/05_BallPool/ucURGCalibration/data/settings/urg_0.xml +++ b/05_BallPool/ucURGCalibration/data/settings/urg_0.xml @@ -1,9 +1,9 @@
- 192.168.0.10 + 192.168.234.151 10940 - -135 - 135 + -90.9184 + 89.5408 5 0.3 30 @@ -19,8 +19,8 @@ 0, 0, 0, 1, 1 - 641 - 159 + 490 + 328 0.122449 25.5102 0.5 diff --git a/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml b/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml index f12788c..773d0b2 100644 --- a/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml +++ b/05_BallPool/ucURGCalibration/data/settings/urg_homo_0.xml @@ -1,18 +1,18 @@ - 1429.108276367 - 2288.440429688 + 392.306030273 + -2830.184326172 - 1429.107910156 - -2914.256835938 + 326.922851563 + 2167.005615234 - -112.085693359 - -2876.894531250 + 3222.492919922 + 2307.114257813 - -93.405029297 - 2307.121337891 + 3250.513427734 + -3045.017578125 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/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml index f8f1cf5..673185d 100644 --- a/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml +++ b/06_SylphOlaf/ucProjectionMappingUI/data/settings/homo_setting.xml @@ -42,8 +42,8 @@ 1.000000000 0.000000000 - 0.961458325 - 0.010833334 + 0.960937560 + 0.010000000 0.000000000 @@ -54,8 +54,8 @@ 1.000000000 1.000000000 - 0.951041460 - 0.986666679 + 0.951562226 + 0.982500017 diff --git a/07_EnchantedForest/OSC2UltraControl/FreeImage.dll b/07_EnchantedForest/OSC2UltraControl/FreeImage.dll new file mode 100644 index 0000000..ddf9120 Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/FreeImage.dll differ diff --git a/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe b/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe new file mode 100644 index 0000000..0ce0f0c Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/OSC2UltraControl.exe differ diff --git a/07_EnchantedForest/OSC2UltraControl/data/Test.xml b/07_EnchantedForest/OSC2UltraControl/data/Test.xml new file mode 100644 index 0000000..462c75e --- /dev/null +++ b/07_EnchantedForest/OSC2UltraControl/data/Test.xml @@ -0,0 +1,23 @@ + + + + + 0 + 0 + 640 + 480 + + false + false + true + true + true + + 1 + + 0 + 0 + 0 + 0 + + diff --git a/07_EnchantedForest/OSC2UltraControl/fmodex64.dll b/07_EnchantedForest/OSC2UltraControl/fmodex64.dll new file mode 100644 index 0000000..c8fe2bf Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/fmodex64.dll differ diff --git a/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll b/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll new file mode 100644 index 0000000..b4412cf Binary files /dev/null and b/07_EnchantedForest/OSC2UltraControl/fmodexL64.dll differ diff --git a/07_EnchantedForest/Resolume Arena/Compositions/EnchantedForest.avc b/07_EnchantedForest/Resolume Arena/Compositions/EnchantedForest.avc new file mode 100644 index 0000000..a6c5428 --- /dev/null +++ b/07_EnchantedForest/Resolume Arena/Compositions/EnchantedForest.avc @@ -0,0 +1,2712 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/07_EnchantedForest/Resolume Arena/Presets/Advanced Output/EnchantedForest.xml b/07_EnchantedForest/Resolume Arena/Presets/Advanced Output/EnchantedForest.xml new file mode 100644 index 0000000..8429655 --- /dev/null +++ b/07_EnchantedForest/Resolume Arena/Presets/Advanced Output/EnchantedForest.xml @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll b/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll new file mode 100644 index 0000000..ddf9120 Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/FreeImage.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml new file mode 100644 index 0000000..3a1667f --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/Ultra Control to DMX.xml @@ -0,0 +1,140 @@ + + + + + 0 + 0 + 640 + 480 + + false + false + true + true + true + + USB Serial Port (COM3) + USB Serial Port (COM3) + + 0 + 0 + 0 + 0 + 79 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml new file mode 100644 index 0000000..03e5137 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/giant.xml @@ -0,0 +1,4 @@ + + 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120 + OUTPUT + \ No newline at end of file diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml new file mode 100644 index 0000000..6115074 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/data/UltraControl2DMX/settings.xml @@ -0,0 +1,4 @@ + + 1,2,3,4 + OUTPUT + \ No newline at end of file diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll b/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll new file mode 100644 index 0000000..c8fe2bf Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/fmodex64.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll b/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll new file mode 100644 index 0000000..b4412cf Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/fmodexL64.dll differ diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini b/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini new file mode 100644 index 0000000..93fcfc9 --- /dev/null +++ b/07_EnchantedForest/ofxUltracontrol2DMX/imgui.ini @@ -0,0 +1,15 @@ +[Window][Debug##Default] +Pos=60,60 +Size=400,400 +Collapsed=0 + +[Window][Ultra Control to DMX] +Pos=0,0 +Size=640,480 +Collapsed=0 + +[Window][Ultra Control to DMX::Info] +Pos=224,204 +Size=192,71 +Collapsed=0 + diff --git a/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe b/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe new file mode 100644 index 0000000..3fc1213 Binary files /dev/null and b/07_EnchantedForest/ofxUltracontrol2DMX/ofxUltracontrol2DMX.exe differ diff --git a/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/settings.json b/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/settings.json new file mode 100644 index 0000000..3178036 --- /dev/null +++ b/08_DarkSea/UnityBuild-19050-08_DarkSea/Build/settings.json @@ -0,0 +1,94 @@ +{ + "properties": [ + { + "type": 4, + "key": "StatManager.fade_sec", + "value": "1", + "range": { + "x": 0.10000000149011612, + "y": 3.0 + } + }, + { + "type": 2, + "key": "StatManager.loop_to_trigger", + "value": "2", + "range": { + "x": 1.0, + "y": 10.0 + } + }, + { + "type": 3, + "key": "StatManager.use_horse_sound", + "value": "True", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 3, + "key": "TUIO_Event.VisualizeTouches", + "value": "False", + "range": { + "x": 0.0, + "y": 0.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.frame_gap", + "value": "30", + "range": { + "x": 1.0, + "y": 30.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.delta_threshold", + "value": "100", + "range": { + "x": 50.0, + "y": 300.0 + } + }, + { + "type": 2, + "key": "TUIO_Event.snow_size", + "value": "512", + "range": { + "x": 128.0, + "y": 1024.0 + } + }, + { + "type": 4, + "key": "TUIO_Event.img_fade_speed", + "value": "0.02", + "range": { + "x": 0.009999999776482582, + "y": 0.10000000149011612 + } + }, + { + "type": 4, + "key": "TUIO_Event.img_wait_sec", + "value": "2", + "range": { + "x": 0.009999999776482582, + "y": 5.0 + } + }, + { + "type": 4, + "key": "TUIO_Event.snow_alpha_max", + "value": "1", + "range": { + "x": 0.009999999776482582, + "y": 1.0 + } + } + ] +} \ No newline at end of file diff --git a/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml b/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml index ab2038f..ecabc4d 100644 --- a/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml +++ b/08_DarkSea/ucURGCalibration/data/settings/urg_0.xml @@ -1,6 +1,6 @@
- 192.168.234.210 + 192.168.0.10 10940 -135 135 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 Queen.act b/10_ElsaQueen/Elsa Queen.act new file mode 100644 index 0000000..02f5170 Binary files /dev/null and b/10_ElsaQueen/Elsa Queen.act differ diff --git a/10_ElsaQueen/Material/ElsaQueen5.png b/10_ElsaQueen/Material/ElsaQueen5.png new file mode 100644 index 0000000..9d64ed8 Binary files /dev/null and b/10_ElsaQueen/Material/ElsaQueen5.png 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/_Setup/conf/UnityBuild-08_DarkSea.conf b/_Setup/conf/UnityBuild-08_DarkSea.conf index 2de6af7..80c7a3d 100644 --- a/_Setup/conf/UnityBuild-08_DarkSea.conf +++ b/_Setup/conf/UnityBuild-08_DarkSea.conf @@ -4,7 +4,7 @@ [ { "secret" : "BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH", - "dir" : "E:/UC/Project-19050-Frozen2/_Deploy_PC/08_DarkSea/UnityBuild-19050-08_DarkSea", // * required field + "dir" : "C:/UC/Project-19050-Frozen2/_Deploy_PC/08_DarkSea/UnityBuild-19050-08_DarkSea", // * required field "use_relay_server" : true, // use relay server when direct connection fails "use_tracker" : true, "search_lan" : true, diff --git a/_Startup/05_BallPool.bat b/_Startup/05_BallPool.bat index 16ca232..930ac55 100644 --- a/_Startup/05_BallPool.bat +++ b/_Startup/05_BallPool.bat @@ -5,6 +5,7 @@ start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" timeout /t 8 start "" "%root%\%device%\ofxCCVApp\ofxCCVApp.exe" timeout /t 8 -start "" "%root%\%device%\UnityBuild-19050-05_BallPool\Build\..." +CD "%root%\%device%\UnityBuild-19050-05_BallPool\Build" +start "" "Unity_2018_Frozen.exe" timeout /t 8 start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" 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/07_EnchantedForest.bat b/_Startup/07_EnchantedForest.bat index f7679f7..7d91e97 100644 --- a/_Startup/07_EnchantedForest.bat +++ b/_Startup/07_EnchantedForest.bat @@ -1,6 +1,8 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=07_EnchantedForest timeout /t 8 -start "" "%root%\%device%\AppEasyVideoPlayer\AppEasyVideoPlayer.exe" +start "" "%root%\%device%\ofxUltracontrol2DMX\ofxUltracontrol2DMX.exe" timeout /t 8 -start "" "%root%\%device%\ucProjectionMappingUI\ucProjectionMappingUI.exe" +start "" "%root%\%device%\OSC2UltraControl\OSC2UltraControl.exe" +timeout /t 8 +start "" "C:\Users\UltraCombos\Documents\Resolume Arena\Compositions\EnchantedForest.avc" \ No newline at end of file diff --git a/_Startup/08_DarkSea.bat b/_Startup/08_DarkSea.bat index a752397..95cd951 100644 --- a/_Startup/08_DarkSea.bat +++ b/_Startup/08_DarkSea.bat @@ -1,5 +1,5 @@ set root=C:\UC\Project-19050-Frozen2\_Deploy_PC -set root_fast=E:\UC\Project-19050-Frozen2\_Deploy_PC +set root_fast=C:\UC\Project-19050-Frozen2\_Deploy_PC set device=08_DarkSea timeout /t 8 start "" "%root%\%device%\ucURGCalibration\ucURGCalibration.exe" diff --git a/_Startup/09_TheUnknown.bat b/_Startup/09_TheUnknown.bat new file mode 100644 index 0000000..58c800e --- /dev/null +++ b/_Startup/09_TheUnknown.bat @@ -0,0 +1,6 @@ +set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set device=09_TheUnknown +timeout /t 8 +CD "%root%\%device%" +start "" "unknown.act" + diff --git a/_Startup/10_ElsaQueen.bat b/_Startup/10_ElsaQueen.bat new file mode 100644 index 0000000..00b304c --- /dev/null +++ b/_Startup/10_ElsaQueen.bat @@ -0,0 +1,6 @@ +set root=C:\UC\Project-19050-Frozen2\_Deploy_PC +set device=10_ElsaQueen +timeout /t 8 +CD "%root%\%device%" +start "" "Elsa Queen.act" + diff --git a/_Utils/create_auto_shutdown.bat b/_Utils/create_auto_shutdown.bat index d6057f4..a232b5b 100644 --- a/_Utils/create_auto_shutdown.bat +++ b/_Utils/create_auto_shutdown.bat @@ -4,4 +4,4 @@ ECHO Create Auto Shutdown Schtask. SCHTASKS /CREATE /SC DAILY /TN "auto_shutdown" /TR "SHUTDOWN /P /F" /ST 20:00 -PAUSE +PAUSE0 \ No newline at end of file