Merge branch 'cocos-main'
# Conflicts: # docker-conf/conf.d/nginx.conf # nginx.conf # scratch-blocks/build.py # scratch-blocks/cleanup.sh # scratch-blocks/i18n/create_messages.py # scratch-blocks/i18n/dedup_json.py # scratch-blocks/i18n/js_to_json.py # scratch-blocks/i18n/json_to_js.py # scratch-blocks/i18n/sync_tx_translations.js # scratch-blocks/i18n/xliff_to_json.py # scratch-blocks/local_build.sh # scratch-blocks/media/icons/control_forever.svg # scratch-blocks/media/icons/control_repeat.svg # scratch-blocks/media/icons/control_wait.svg # scratch-blocks/media/icons/event_broadcast_blue.svg # scratch-blocks/media/icons/event_broadcast_coral.svg # scratch-blocks/media/icons/event_broadcast_green.svg # scratch-blocks/media/icons/event_broadcast_magenta.svg # scratch-blocks/media/icons/event_broadcast_orange.svg # scratch-blocks/media/icons/event_broadcast_purple.svg # scratch-blocks/media/icons/event_when-broadcast-received_blue.svg # scratch-blocks/media/icons/event_when-broadcast-received_coral.svg # scratch-blocks/media/icons/event_when-broadcast-received_green.svg # scratch-blocks/media/icons/event_when-broadcast-received_magenta.svg # scratch-blocks/media/icons/event_when-broadcast-received_orange.svg # scratch-blocks/media/icons/event_when-broadcast-received_purple.svg # scratch-blocks/media/icons/event_whenflagclicked.svg # scratch-blocks/media/icons/set-led_blue.svg # scratch-blocks/media/icons/set-led_coral.svg # scratch-blocks/media/icons/set-led_green.svg # scratch-blocks/media/icons/set-led_magenta.svg # scratch-blocks/media/icons/set-led_mystery.svg # scratch-blocks/media/icons/set-led_orange.svg # scratch-blocks/media/icons/set-led_purple.svg # scratch-blocks/media/icons/set-led_white.svg # scratch-blocks/media/icons/set-led_yellow.svg # scratch-blocks/media/icons/wedo_motor-clockwise.svg # scratch-blocks/media/icons/wedo_motor-counterclockwise.svg # scratch-blocks/media/icons/wedo_when-distance_close.svg # scratch-blocks/media/icons/wedo_when-tilt-backward.svg # scratch-blocks/media/icons/wedo_when-tilt-forward.svg # scratch-blocks/media/icons/wedo_when-tilt-left.svg # scratch-blocks/media/icons/wedo_when-tilt-right.svg # scratch-blocks/media/icons/wedo_when-tilt.svg # scratch-blocks/package-lock.json # scratch-blocks/pull_from_blockly.sh # scratch-gui/competitio_login/index.html # scratch-gui/package-lock.json # scratch-gui/package.json # scratch-gui/prune-gh-pages.sh # scratch-gui/src/components/menu-bar/menu-bar.css # scratch-gui/src/components/menu-bar/menu-bar.jsx # scratch-gui/src/components/nopermission-modal/NoPermissionModal.jsx # scratch-gui/src/components/stage-cpp-unity/currentLevelChoose.jsx # scratch-gui/src/components/stage-cpp-unity/stage-unity.jsx # scratch-gui/src/components/stage-cpp/cpp-parser.js # scratch-gui/src/components/stage-cpp/stage-cpp-clang.jsx # scratch-gui/src/components/stage-cpp/stage-cpp.css # scratch-gui/src/components/stage-python-unity/currentLevelChoose.jsx # scratch-gui/src/components/stage-python-unity/stage-unity.jsx # scratch-gui/src/components/stage-python/stage-python.css # scratch-gui/src/components/stage-python/stage-python.jsx # scratch-gui/src/components/stage-unity/currentLevelChoose.jsx # scratch-gui/src/components/stage-unity/stage-unity.jsx # scratch-gui/src/lib/libraries/decks/steps/add-effects.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-add-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-change-color.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-jump.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-move.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-say-something.es.png # scratch-gui/src/lib/libraries/decks/steps/animate-char-talk.es.png # scratch-gui/src/lib/libraries/decks/steps/change-size.es.png # scratch-gui/src/lib/libraries/decks/steps/chase-game-change-score.es.png # scratch-gui/src/lib/libraries/decks/steps/chase-game-move-randomly.es.png # scratch-gui/src/lib/libraries/decks/steps/chase-game-play-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/chase-game-right-left.es.png # scratch-gui/src/lib/libraries/decks/steps/chase-game-up-down.es.png # scratch-gui/src/lib/libraries/decks/steps/cn-backdrop.es.png # scratch-gui/src/lib/libraries/decks/steps/cn-collect.es.png # scratch-gui/src/lib/libraries/decks/steps/cn-glide.es.png # scratch-gui/src/lib/libraries/decks/steps/cn-say.es.png # scratch-gui/src/lib/libraries/decks/steps/cn-score.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-01-say-something.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-02-animate.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-03-select-different-character.LTR.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-04-use-minus-sign.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-05-grow-shrink.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-06-select-another-different-character.LTR.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-07-jump.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-08-change-scenes.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-09-glide-around.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-10-change-costumes.es.png # scratch-gui/src/lib/libraries/decks/steps/code-cartoon-11-choose-more-characters.LTR.png # scratch-gui/src/lib/libraries/decks/steps/fly-choose-character.LTR.png # scratch-gui/src/lib/libraries/decks/steps/fly-flying-heart.es.png # scratch-gui/src/lib/libraries/decks/steps/fly-keep-score.es.png # scratch-gui/src/lib/libraries/decks/steps/fly-make-interactive.es.png # scratch-gui/src/lib/libraries/decks/steps/fly-move-scenery.es.png # scratch-gui/src/lib/libraries/decks/steps/fly-object-to-collect.LTR.png # scratch-gui/src/lib/libraries/decks/steps/fly-say-something.es.png # scratch-gui/src/lib/libraries/decks/steps/fly-select-flyer.LTR.png # scratch-gui/src/lib/libraries/decks/steps/fly-switch-costume.es.png # scratch-gui/src/lib/libraries/decks/steps/glide-around-back-and-forth.es.png # scratch-gui/src/lib/libraries/decks/steps/glide-around-point.es.png # scratch-gui/src/lib/libraries/decks/steps/hide-show.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-change-costumes.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-choose-another-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/imagine-choose-another-sprite.LTR.png # scratch-gui/src/lib/libraries/decks/steps/imagine-choose-any-sprite.LTR.png # scratch-gui/src/lib/libraries/decks/steps/imagine-choose-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/imagine-choose-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-click-green-flag.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-fly-around.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-glide-to-point.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-grow-shrink.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-left-right.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-type-what-you-want.es.png # scratch-gui/src/lib/libraries/decks/steps/imagine-up-down.es.png # scratch-gui/src/lib/libraries/decks/steps/move-arrow-keys-left-right.es.png # scratch-gui/src/lib/libraries/decks/steps/move-arrow-keys-up-down.es.png # scratch-gui/src/lib/libraries/decks/steps/music-make-beat.es.png # scratch-gui/src/lib/libraries/decks/steps/music-make-beatbox.es.png # scratch-gui/src/lib/libraries/decks/steps/music-make-song.es.png # scratch-gui/src/lib/libraries/decks/steps/music-play-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/name-change-color.es.png # scratch-gui/src/lib/libraries/decks/steps/name-grow.es.png # scratch-gui/src/lib/libraries/decks/steps/name-play-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/name-spin.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-add-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/pong-add-ball-sprite.LTR.png # scratch-gui/src/lib/libraries/decks/steps/pong-add-code-to-ball.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-bounce-around.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-choose-score.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-game-over.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-insert-change-score.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-move-the-paddle.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-reset-score.es.png # scratch-gui/src/lib/libraries/decks/steps/pong-select-ball.LTR.png # scratch-gui/src/lib/libraries/decks/steps/pop-game-change-color.es.png # scratch-gui/src/lib/libraries/decks/steps/pop-game-change-score.es.png # scratch-gui/src/lib/libraries/decks/steps/pop-game-play-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/pop-game-random-position.es.png # scratch-gui/src/lib/libraries/decks/steps/pop-game-reset-score.es.png # scratch-gui/src/lib/libraries/decks/steps/record-a-sound-choose-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/record-a-sound-click-record.es.png # scratch-gui/src/lib/libraries/decks/steps/record-a-sound-play-your-sound.es.png # scratch-gui/src/lib/libraries/decks/steps/record-a-sound-press-record-button.es.png # scratch-gui/src/lib/libraries/decks/steps/record-a-sound-sounds-tab.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-change-color.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-grow-shrink.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-move-around.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-say-something.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-set-voice.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-song.es.png # scratch-gui/src/lib/libraries/decks/steps/speech-spin.es.png # scratch-gui/src/lib/libraries/decks/steps/spin-point-in-direction.es.png # scratch-gui/src/lib/libraries/decks/steps/spin-turn.es.png # scratch-gui/src/lib/libraries/decks/steps/story-conversation.es.png # scratch-gui/src/lib/libraries/decks/steps/story-hide-character.es.png # scratch-gui/src/lib/libraries/decks/steps/story-say-something.es.png # scratch-gui/src/lib/libraries/decks/steps/story-show-character.es.png # scratch-gui/src/lib/libraries/decks/steps/story-switch-backdrop.es.png # scratch-gui/src/lib/libraries/decks/steps/switch-costumes.es.png # scratch-gui/src/lib/libraries/decks/steps/talking-10-choose-third-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/talking-12-dance-moves.es.png # scratch-gui/src/lib/libraries/decks/steps/talking-2-choose-sprite.LTR.png # scratch-gui/src/lib/libraries/decks/steps/talking-4-choose-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/talking-6-choose-another-sprite.LTR.png # scratch-gui/src/lib/libraries/decks/steps/talking-7-move-around.es.png # scratch-gui/src/lib/libraries/decks/steps/talking-8-choose-another-backdrop.LTR.png # scratch-gui/src/lib/libraries/decks/steps/video-animate.es.png # scratch-gui/src/lib/libraries/decks/steps/video-pet.es.png # scratch-gui/src/lib/libraries/decks/steps/video-pop.es.png # scratch-gui/src/playground/aboutus.ejs # scratch-gui/src/playground/checkStatus.js # scratch-gui/src/playground/competition.ejs # scratch-gui/src/playground/competition.js # scratch-gui/src/playground/competition_list.ejs # scratch-gui/src/playground/competition_list.js # scratch-gui/src/playground/competition_sum.ejs # scratch-gui/src/playground/competition_sum.js # scratch-gui/src/playground/config.js # scratch-gui/src/playground/home.ejs # scratch-gui/src/playground/import-check.js # scratch-gui/src/playground/leaderboard.ejs # scratch-gui/src/playground/login-new.ejs # scratch-gui/src/playground/login.ejs # scratch-gui/src/playground/login.js # scratch-gui/src/playground/matchsum.js # scratch-gui/src/playground/programming-learning.ejs # scratch-gui/src/playground/programming-learning.js # scratch-gui/src/playground/signup-new.ejs # scratch-gui/src/playground/third-part-login.js # scratch-gui/src/playground/welcome.ejs # scratch-gui/src/playground/welcome.js # scratch-gui/static/css/welcome-new.css # scratch-gui/static/pyodide/pyodide.asm.wasm.br # scratch-gui/static/unity/Build/mstest5.data.br # scratch-gui/static/unity/Build/mstest5.framework.js.br # scratch-gui/static/unity/Build/mstest5.loader.js # scratch-gui/static/unity/Build/mstest5.wasm.br # scratch-gui/static/unity/StreamingAssets/aa/AddressablesLink/link.xml # scratch-gui/static/unity/StreamingAssets/aa/catalog.json # scratch-gui/static/unity/StreamingAssets/aa/settings.json # scratch-gui/webpack.config.js # scratch-l10n/scripts/build-data.js # scratch-l10n/scripts/build-i18n-src.js # scratch-l10n/scripts/tw-push.js # scratch-l10n/scripts/tx-pull-help-articles.js # scratch-l10n/scripts/tx-pull-help-names.js # scratch-l10n/scripts/tx-pull-locale-articles.js # scratch-l10n/scripts/tx-pull-www.js # scratch-l10n/scripts/tx-push-help.js # scratch-l10n/scripts/tx-push-src.js # scratch-l10n/scripts/update-translations.sh # scratch-l10n/scripts/validate-www.js # scratch-vm/package-lock.json # scratch-vm/src/extensions/scratch3_music/assets/instruments/11-saxophone/36.mp3 # scratch-vm/src/extensions/scratch3_music/assets/instruments/11-saxophone/60.mp3 # scratch-vm/src/extensions/scratch3_music/assets/instruments/11-saxophone/84.mp3 # scratch-vm/src/extensions/scratch3_music/assets/instruments/5-electric-guitar/60.mp3 # scratch-vm/test/fixtures/sprite.json
This commit is contained in:
Evan
@@ -19,6 +19,7 @@
|
||||
</assembly>
|
||||
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AtlasSpriteProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
|
||||
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
{"m_LocatorId":"AddressablesMainContentCatalog","m_InternalIds":["{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/3a39a2fdbd0f8ff8fd8c45af6f501323_unitybuiltinshaders_4e3f3287f87530dc92b6848cadda5230.bundle","{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/defaultlocalgroup_assets_all_1ce56b855f516f502851ed5426dab24b.bundle","{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/defaultlocalgroup_scenes_all_44c83ead579edde0422cd5707e20fce8.bundle"]}
|
||||
{"m_LocatorId":"AddressablesMainContentCatalog","m_InternalIds":["{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/3a39a2fdbd0f8ff8fd8c45af6f501323_unitybuiltinshaders_4e3f3287f87530dc92b6848cadda5230.bundle","{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/defaultlocalgroup_assets_all_1ce56b855f516f502851ed5426dab24b.bundle","{UnityEngine.AddressableAssets.Addressables.RuntimePath}/WebGL/defaultlocalgroup_scenes_all_44c83ead579edde0422cd5707e20fce8.bundle"]}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"m_buildTarget":"WebGL","m_SettingsHash":"a811a4198949919c23c31723503490ea","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[7,76,85,110,105,116,121,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,114,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,75,85,110,105,116,121,69,110,103,105,110,101,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,109,101,110,116,46,82,101,115,111,117,114,99,101,80,114,111,118,105,100,101,114,115,46,80,114,111,118,105,100,101,114,76,111,97,100,82,101,113,117,101,115,116,79,112,116,105,111,110,115,50,0,0,0,123,0,34,0,109,0,95,0,73,0,103,0,110,0,111,0,114,0,101,0,70,0,97,0,105,0,108,0,117,0,114,0,101,0,115,0,34,0,58,0,116,0,114,0,117,0,101,0,125,0]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.22.3","m_maxConcurrentWebRequests":3,"m_CatalogRequestsTimeout":0}
|
||||
{"m_buildTarget":"WebGL","m_SettingsHash":"a811a4198949919c23c31723503490ea","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[7,76,85,110,105,116,121,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,114,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,75,85,110,105,116,121,69,110,103,105,110,101,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,109,101,110,116,46,82,101,115,111,117,114,99,101,80,114,111,118,105,100,101,114,115,46,80,114,111,118,105,100,101,114,76,111,97,100,82,101,113,117,101,115,116,79,112,116,105,111,110,115,50,0,0,0,123,0,34,0,109,0,95,0,73,0,103,0,110,0,111,0,114,0,101,0,70,0,97,0,105,0,108,0,117,0,114,0,101,0,115,0,34,0,58,0,116,0,114,0,117,0,101,0,125,0]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.22.3","m_maxConcurrentWebRequests":3,"m_CatalogRequestsTimeout":0}
|
||||
|
||||
BIN
scratch-gui/static/unity/TemplateData/MemoryProfiler.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/MemoryProfiler.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 665 B |
BIN
scratch-gui/static/unity/TemplateData/favicon.ico
Normal file
BIN
scratch-gui/static/unity/TemplateData/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
scratch-gui/static/unity/TemplateData/fullscreen-button.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/fullscreen-button.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 175 B |
Binary file not shown.
|
After Width: | Height: | Size: 96 B |
Binary file not shown.
|
After Width: | Height: | Size: 109 B |
BIN
scratch-gui/static/unity/TemplateData/progress-bar-full-dark.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/progress-bar-full-dark.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 74 B |
Binary file not shown.
|
After Width: | Height: | Size: 84 B |
16
scratch-gui/static/unity/TemplateData/style.css
Normal file
16
scratch-gui/static/unity/TemplateData/style.css
Normal file
@@ -0,0 +1,16 @@
|
||||
body { padding: 0; margin: 0 }
|
||||
#unity-container { position: absolute }
|
||||
#unity-container.unity-desktop { left: 50%; top: 50%; transform: translate(-50%, -50%) }
|
||||
#unity-container.unity-mobile { position: fixed; width: 100%; height: 100% }
|
||||
#unity-canvas { background: #231F20 }
|
||||
.unity-mobile #unity-canvas { width: 100%; height: 100% }
|
||||
#unity-loading-bar { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); display: none }
|
||||
#unity-logo { width: 154px; height: 130px; background: url('unity-logo-dark.png') no-repeat center }
|
||||
#unity-progress-bar-empty { width: 141px; height: 18px; margin-top: 10px; margin-left: 6.5px; background: url('progress-bar-empty-dark.png') no-repeat center }
|
||||
#unity-progress-bar-full { width: 0%; height: 18px; margin-top: 10px; background: url('progress-bar-full-dark.png') no-repeat center }
|
||||
#unity-footer { position: relative }
|
||||
.unity-mobile #unity-footer { display: none }
|
||||
#unity-webgl-logo { float:left; width: 204px; height: 38px; background: url('webgl-logo.png') no-repeat center }
|
||||
#unity-build-title { float: right; margin-right: 10px; line-height: 38px; font-family: arial; font-size: 18px }
|
||||
#unity-fullscreen-button { cursor:pointer; float: right; width: 38px; height: 38px; background: url('fullscreen-button.png') no-repeat center }
|
||||
#unity-warning { position: absolute; left: 50%; top: 5%; transform: translate(-50%); background: white; padding: 10px; display: none }
|
||||
BIN
scratch-gui/static/unity/TemplateData/unity-logo-dark.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/unity-logo-dark.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
BIN
scratch-gui/static/unity/TemplateData/unity-logo-light.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/unity-logo-light.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
BIN
scratch-gui/static/unity/TemplateData/webgl-logo.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/webgl-logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
BIN
scratch-gui/static/unity/TemplateData/webmemd-icon.png
Normal file
BIN
scratch-gui/static/unity/TemplateData/webmemd-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
131
scratch-gui/static/unity/index.html
Normal file
131
scratch-gui/static/unity/index.html
Normal file
@@ -0,0 +1,131 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<title>Unity WebGL Player | Web A</title>
|
||||
<link rel="shortcut icon" href="TemplateData/favicon.ico">
|
||||
<link rel="stylesheet" href="TemplateData/style.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="unity-container" class="unity-desktop">
|
||||
<canvas id="unity-canvas" width=800 height=900 tabindex="-1"></canvas>
|
||||
<div id="unity-loading-bar">
|
||||
<div id="unity-logo"></div>
|
||||
<div id="unity-progress-bar-empty">
|
||||
<div id="unity-progress-bar-full"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="unity-warning"> </div>
|
||||
<div id="unity-footer">
|
||||
<div id="unity-webgl-logo"></div>
|
||||
<div id="unity-fullscreen-button"></div>
|
||||
<div id="unity-build-title">Web A</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
|
||||
var container = document.querySelector("#unity-container");
|
||||
var canvas = document.querySelector("#unity-canvas");
|
||||
var loadingBar = document.querySelector("#unity-loading-bar");
|
||||
var progressBarFull = document.querySelector("#unity-progress-bar-full");
|
||||
var fullscreenButton = document.querySelector("#unity-fullscreen-button");
|
||||
var warningBanner = document.querySelector("#unity-warning");
|
||||
|
||||
// Shows a temporary message banner/ribbon for a few seconds, or
|
||||
// a permanent error message on top of the canvas if type=='error'.
|
||||
// If type=='warning', a yellow highlight color is used.
|
||||
// Modify or remove this function to customize the visually presented
|
||||
// way that non-critical warnings and error messages are presented to the
|
||||
// user.
|
||||
function unityShowBanner(msg, type) {
|
||||
function updateBannerVisibility() {
|
||||
warningBanner.style.display = warningBanner.children.length ? 'block' : 'none';
|
||||
}
|
||||
var div = document.createElement('div');
|
||||
div.innerHTML = msg;
|
||||
warningBanner.appendChild(div);
|
||||
if (type == 'error') div.style = 'background: red; padding: 10px;';
|
||||
else {
|
||||
if (type == 'warning') div.style = 'background: yellow; padding: 10px;';
|
||||
setTimeout(function() {
|
||||
warningBanner.removeChild(div);
|
||||
updateBannerVisibility();
|
||||
}, 5000);
|
||||
}
|
||||
updateBannerVisibility();
|
||||
}
|
||||
|
||||
var buildUrl = "Build";
|
||||
var loaderUrl = buildUrl + "/mstest5.loader.js";
|
||||
var config = {
|
||||
dataUrl: buildUrl + "/mstest5.data.br",
|
||||
frameworkUrl: buildUrl + "/mstest5.framework.js.br",
|
||||
codeUrl: buildUrl + "/mstest5.wasm.br",
|
||||
streamingAssetsUrl: "StreamingAssets",
|
||||
companyName: "DefaultCompany",
|
||||
productName: "Web A",
|
||||
productVersion: "1.0",
|
||||
showBanner: unityShowBanner,
|
||||
};
|
||||
|
||||
// By default, Unity keeps WebGL canvas render target size matched with
|
||||
// the DOM size of the canvas element (scaled by window.devicePixelRatio)
|
||||
// Set this to false if you want to decouple this synchronization from
|
||||
// happening inside the engine, and you would instead like to size up
|
||||
// the canvas DOM size and WebGL render target sizes yourself.
|
||||
// config.matchWebGLToCanvasSize = false;
|
||||
|
||||
// If you would like all file writes inside Unity Application.persistentDataPath
|
||||
// directory to automatically persist so that the contents are remembered when
|
||||
// the user revisits the site the next time, uncomment the following line:
|
||||
// config.autoSyncPersistentDataPath = true;
|
||||
// This autosyncing is currently not the default behavior to avoid regressing
|
||||
// existing user projects that might rely on the earlier manual
|
||||
// JS_FileSystem_Sync() behavior, but in future Unity version, this will be
|
||||
// expected to change.
|
||||
|
||||
if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
|
||||
// Mobile device style: fill the whole browser client area with the game canvas:
|
||||
|
||||
var meta = document.createElement('meta');
|
||||
meta.name = 'viewport';
|
||||
meta.content = 'width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, shrink-to-fit=yes';
|
||||
document.getElementsByTagName('head')[0].appendChild(meta);
|
||||
container.className = "unity-mobile";
|
||||
canvas.className = "unity-mobile";
|
||||
|
||||
// To lower canvas resolution on mobile devices to gain some
|
||||
// performance, uncomment the following line:
|
||||
// config.devicePixelRatio = 1;
|
||||
|
||||
|
||||
} else {
|
||||
// Desktop style: Render the game canvas in a window that can be maximized to fullscreen:
|
||||
|
||||
canvas.style.width = "800px";
|
||||
canvas.style.height = "900px";
|
||||
}
|
||||
|
||||
loadingBar.style.display = "block";
|
||||
|
||||
var script = document.createElement("script");
|
||||
script.src = loaderUrl;
|
||||
script.onload = () => {
|
||||
createUnityInstance(canvas, config, (progress) => {
|
||||
progressBarFull.style.width = 100 * progress + "%";
|
||||
}).then((unityInstance) => {
|
||||
loadingBar.style.display = "none";
|
||||
fullscreenButton.onclick = () => {
|
||||
unityInstance.SetFullscreen(1);
|
||||
};
|
||||
}).catch((message) => {
|
||||
alert(message);
|
||||
});
|
||||
};
|
||||
|
||||
document.body.appendChild(script);
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user