diff --git a/Assets/Scenes/skatepark terraintest/SkateTest.meta b/Assets/Scenes/skatepark terraintest/SkateTest.meta new file mode 100644 index 0000000000000000000000000000000000000000..123fa3d1cbe41f43a85013fde0d4bf79228112d6 --- /dev/null +++ b/Assets/Scenes/skatepark terraintest/SkateTest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6863d327db79e6e4c884a39205cd56e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/skatepark terraintest/SkateTest.unity b/Assets/Scenes/skatepark terraintest/SkateTest.unity index c1825c63aa49b6350ca11e1e5830c7cd3a6b95be..0932f1827b46ebc20429070c0bab7154f24512a9 100644 --- a/Assets/Scenes/skatepark terraintest/SkateTest.unity +++ b/Assets/Scenes/skatepark terraintest/SkateTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,8 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 5447d14278017da428e49f38cd55cd79, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 3b3f7400d3526e9429c39d03afb714b3, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -302,7 +302,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.0029542, y: 1} + m_SensorSize: {x: 2.141661, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -622,7 +622,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.0029542, y: 1} + m_SensorSize: {x: 2.141661, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1221,7 +1221,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.0029542, y: 1} + m_SensorSize: {x: 2.141661, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1364,6 +1364,7 @@ MonoBehaviour: vistesseDeSaut: 10 gravite: 20 yavant: 0 + yapres: 0 --- !u!4 &1359441164 Transform: m_ObjectHideFlags: 0 @@ -1436,7 +1437,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669101011} - m_LocalRotation: {x: 0.018189477, y: -0.000000014901163, z: 0.0000000018626454, w: 0.9998346} + m_LocalRotation: {x: 0.018189477, y: -0.000000037252907, z: 0.000000008381904, w: 0.9998346} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1481,7 +1482,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.0029542, y: 1} + m_SensorSize: {x: 2.141661, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset b/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..b84dac1dfb0101c4a51f3a037012df10c5115fd1 Binary files /dev/null and b/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset differ diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset.meta b/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..e30931ec11f76f29d24d7a1adba2ba70281eea58 --- /dev/null +++ b/Assets/Scenes/skatepark terraintest/SkateTest/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5447d14278017da428e49f38cd55cd79 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..133d1d4c264b83a911623ca2e8785a607df67038 Binary files /dev/null and b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..258b966c5b74d1e39a6b46eaa5934ddcffdfd5b9 --- /dev/null +++ b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: a90f2197cf38b6e47b5d605294d9d4a3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr new file mode 100644 index 0000000000000000000000000000000000000000..80bb6ca3dc611dc09c2f3349572f3c14aebf3b5c Binary files /dev/null and b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000000000000000000000000000000000000..74fa6450111e5348aab06d141829e98b9a304a8f --- /dev/null +++ b/Assets/Scenes/skatepark terraintest/SkateTest/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 16008a275fa6a08479898e091b1e8ecb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr b/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr new file mode 100644 index 0000000000000000000000000000000000000000..73bac30ef33673ab9a32e0391853b5056010c298 Binary files /dev/null and b/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr.meta b/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000000000000000000000000000000000000..189e26e111667dfb56abc0f7a9cb64f37810008e --- /dev/null +++ b/Assets/Scenes/skatepark terraintest/SkateTest/ReflectionProbe-0.exr.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 8d526ae96aa6b294e996714becf0e047 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UI.cs b/Assets/Scripts/UI/UI.cs index 87db81ac31aa5a772573e29356a48c939450133f..97bf8cee6a40cf64a747985c199831af98264c05 100644 --- a/Assets/Scripts/UI/UI.cs +++ b/Assets/Scripts/UI/UI.cs @@ -39,6 +39,7 @@ public class UI : MonoBehaviour browser.RegisterFunction("quitGame", args => Application.Quit()); browser.RegisterFunction("PlaySound", args => this.PlaySound(args[0])); browser.RegisterFunction("createGame", args => this.createGame()); + browser.RegisterFunction("loadScene", args => this.loadScene(args[0])); browser.RegisterFunction("reEnableHubInput", args => this.reEnableHubInput()); browserPointer = GameObject.Find("Browser (GUI)").GetComponent<PointerUIGUI>(); } @@ -56,11 +57,11 @@ public class UI : MonoBehaviour } public void createGame(){ - browser.CallFunction("showLoading"); loadScene("Hub"); } public void loadScene(string sceneName){ + browser.CallFunction("showLoading"); StartCoroutine(chargerSceneArrierePlan(sceneName)); } diff --git a/BrowserAssets/UI/css/hub.css b/BrowserAssets/UI/css/hub.css index 707b5d1400c69eb79db160d979da033f720c9094..922cec9fd83fe7ac601eb29ceff2c590137edc70 100644 --- a/BrowserAssets/UI/css/hub.css +++ b/BrowserAssets/UI/css/hub.css @@ -1,4 +1,5 @@ @import "base.css"; +@import "loading.css"; .infoText{ position: fixed; bottom: 2%; diff --git a/BrowserAssets/UI/css/loading.css b/BrowserAssets/UI/css/loading.css new file mode 100644 index 0000000000000000000000000000000000000000..fb529ab32098c35993a2a548217f8012b16c6053 --- /dev/null +++ b/BrowserAssets/UI/css/loading.css @@ -0,0 +1,29 @@ +/* Loading */ +#loading{ + display: none; +} + +.loading-anim-pos { + position: fixed; + bottom: 0; + right: 0; + margin: 20vh; +} + +.circle-inter { + position: absolute; + width: 11vh; + height: 11vh; + margin:-50% 0 0 -100%; + animation:spin1 1s linear infinite; +} +.circle-outer { + position: absolute; + width: 11vh; + height: 11vh; + margin:-50% 0 0 -100%; + animation:spin2 1s linear infinite; +} +@keyframes spin1 { 100% { transform: rotate(360deg); transform:rotate(360deg); } }} +@keyframes spin2 { 100% { transform: rotate(-360deg); transform:rotate(-360deg); } } + diff --git a/BrowserAssets/UI/css/mainMenu.css b/BrowserAssets/UI/css/mainMenu.css index 55eca279f9e8ab887fdb83a1728bfd12f56ae35f..be0f782265d17fc63cec29c9c6b2608ad48a6951 100644 --- a/BrowserAssets/UI/css/mainMenu.css +++ b/BrowserAssets/UI/css/mainMenu.css @@ -1,4 +1,5 @@ @import "base.css"; +@import "loading.css"; body{ background-color: white; } @@ -58,35 +59,4 @@ body{ width: 75%; transition: all .25s; background-image: url("../images/bande-verte.png"); -} - - -/* Loading */ -#loading{ - display: none; -} - -.loading-anim-pos { - position: fixed; - bottom: 0; - right: 0; - margin: 20vh; -} - -.circle-inter { - position: absolute; - width: 11vh; - height: 11vh; - margin:-50% 0 0 -100%; - animation:spin1 1s linear infinite; -} -.circle-outer { - position: absolute; - width: 11vh; - height: 11vh; - margin:-50% 0 0 -100%; - animation:spin2 1s linear infinite; -} -@keyframes spin1 { 100% { transform: rotate(360deg); transform:rotate(360deg); } }} -@keyframes spin2 { 100% { transform: rotate(-360deg); transform:rotate(-360deg); } } - +} \ No newline at end of file diff --git a/BrowserAssets/UI/hub.html b/BrowserAssets/UI/hub.html index 5a12d5c49b8531b3e2973f8efb130188abc87a01..d04f01759b7dd1ddac9419ba4e3182c132dcbb85 100644 --- a/BrowserAssets/UI/hub.html +++ b/BrowserAssets/UI/hub.html @@ -15,6 +15,13 @@ </div> <span>pour rejoindre l'épreuvre <span id="gameName"></span>.</span> </div> + + <div id="loading"> + <div class="loading-anim-pos"> + <img class="circle-inter" src="images/inter-circle.png" alt="" width="120" height="120"> + <img class="circle-outer" src="images/outer-circle.png" alt="" width="120" height="120"> + </div> + </div> <script src="js/uiHandler.js" type="text/javascript"></script> <script type="text/javascript"> @@ -44,6 +51,8 @@ uiWindowGameList.debug = false; uiWindowGameList.preferHide = true; // Pemet de ne pas supprimer le code html au moment de la fermeture de la fenêtre uiWindowGameList.closeAction = "reEnableHubInput();aWindowsHasBeenOpened = false;"; // Fonction créée au runtime par UI.cs + uiWindowGameList.acceptable = true; + uiWindowGameList.acceptAction = "loadScene('SkateTest');"; // Puis on l'initialise (pour la créer et prendre en compte les paramètres) uiWindowGameList.init(); @@ -62,7 +71,7 @@ uiWindowGameList.show(); aWindowsHasBeenOpened = true; }else{ - console.log("Une uiWindow a déjà été ouverte!"); + console.log("Jeu inconnu!"); } } @@ -123,6 +132,17 @@ } } + function showLoading(){ + document.body.style.backgroundColor = "black"; + document.body.querySelectorAll('*').forEach(function(node) { + if(node.id == "loading" || document.getElementById("loading").contains(node)){ + node.style.display = "block"; + }else{ + node.style.display = "none"; + } + }); + } + function removeElement(str) { diff --git a/BrowserAssets/UI/js/uiHandler.js b/BrowserAssets/UI/js/uiHandler.js index 3a3081b110c668503ceb106479281773c7e9b6d9..4cda504450b5c063fcc7a24e9223ad7932d5fbdb 100644 --- a/BrowserAssets/UI/js/uiHandler.js +++ b/BrowserAssets/UI/js/uiHandler.js @@ -1,12 +1,14 @@ function UIWindow() { this.id="uiWindow-"+generateUniqueId(); this.closable = true; + this.acceptable = false; // Ça n'a pas été implémenté au début, alors on va laisser false this.preferHide = false; this.waitAssetsLoading = true; this.showAnimation = null; this.hideAnimation = null; this.debug = false; this.closeAction = null; + this.acceptAction = null; //this.init(); // Détecter les touches du clavier appuyées @@ -18,6 +20,10 @@ function UIWindow() { }else{ this.close(); } + }else if(event.key == "Enter"){ + if(this.acceptable == true){ + this.accept(); + } } }, false); } @@ -80,6 +86,26 @@ UIWindow.prototype.init = function() { } actionContainer.appendChild(closeButton); } + + if(this.acceptable == true){ + var acceptButton = document.createElement("div"); + acceptButton.className = "item"; + var acceptIconDiv = document.createElement("div"); + acceptIconDiv.className = "icon"; + var acceptIcon = document.createElement("icon"); + acceptIcon.className = "keyboard-key enter dark"; + + var text = document.createElement("span"); + text.innerHTML = "Valider"; + + acceptIconDiv.appendChild(acceptIcon); + acceptButton.appendChild(acceptIconDiv); + acceptButton.appendChild(text); + acceptButton.addEventListener("click", function(){ + this.accept(); + }.bind(this)); + actionContainer.appendChild(acceptButton); + } mainContainer.appendChild(contentContainer); mainContainer.appendChild(actionContainer); @@ -110,6 +136,13 @@ UIWindow.prototype.hide = function() { if(this.debug == true) console.log("UIWindow with id " + this.id + " hided"); } +UIWindow.prototype.accept = function() { + if(this.acceptAction != null){ + eval(this.acceptAction); + } + if(this.debug == true) console.log("UIWindow with id " + this.id + " accepted"); +} + // Cette fonction servira à ajouter des élément selon les règles de l'interface UIWindow.prototype.addElement = function(type, content, parent) { if(parent == null){ diff --git a/BrowserAssets/UI/mainMenu.html b/BrowserAssets/UI/mainMenu.html index 435e266039c53990d1ce0c6adac49798289f5aad..89a3172a7bf912b3532fc4f7a378fda44d8a5a5e 100644 --- a/BrowserAssets/UI/mainMenu.html +++ b/BrowserAssets/UI/mainMenu.html @@ -78,8 +78,8 @@ } function showLoading(){ + document.body.style.backgroundColor = "black"; document.body.querySelectorAll('*').forEach(function(node) { - document.body.style.backgroundColor = "black"; if(node.id == "loading" || document.getElementById("loading").contains(node)){ node.style.display = "block"; }else{ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 1f68739cb6d84c09275e207852ba239f1b56a03a..e0e2a9e807c9bd7cbefd8a32b9e949ba74924c9d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -20,5 +20,8 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Paintball/egypt.unity guid: 9fc0d4010bbf28b4594072e72b8655ab + - enabled: 1 + path: Assets/Scenes/skatepark terraintest/SkateTest.unity + guid: eb42c57e6107d234ea1ce47f3388473c m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}