Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021

Assets/Scenes/Finish.unity

@@ -260,7 +260,7 @@ MonoBehaviour:
     was my first game in Unity, so it was a bit crappy.
 
     I also want to thank
-    @Tucan444 and his very helpful parrot Kio for helping me out.
+    @Tucan444 and his very helpful parrot Kyo for helping me out.
 
     I hope you
     enjoyed it.

Assets/Scenes/Level4.unity

@@ -6971,7 +6971,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 737155566}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 62.529984, y: 15.241393, z: 90}
+  m_LocalPosition: {x: 23.6826, y: 15.858, z: 90}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 48681355}
@@ -7022,7 +7022,7 @@ SpriteRenderer:
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 2
-  m_Size: {x: 400, y: 500}
+  m_Size: {x: 477.6949, y: 501.23328}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1

Assets/Scenes/Menu.unity

@@ -226,6 +226,7 @@ MonoBehaviour:
     m_Bits: 32
   sfx: {fileID: 1499575167}
   mouse: {fileID: 1949375702}
+  sr: {fileID: 231727548}
 --- !u!50 &231727551
 Rigidbody2D:
   serializedVersion: 4

Assets/Scenes/Tutorial.unity

@@ -52939,7 +52939,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 8
+  orthographic size: 10.433199
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2

Assets/Scripts/MenuPlay.cs

@@ -8,6 +8,9 @@ public class MenuPlay : MonoBehaviour
     public LayerMask contactFilter;
     public AudioSource sfx;
     public MenuMouse mouse;
+    public SpriteRenderer sr;
+    private bool hover = false;
+    private bool previous_hover = false;
     // Start is called before the first frame update
     void Start()
     {
@@ -17,11 +20,25 @@ public class MenuPlay : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (Input.GetMouseButtonDown(0)){
-            if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){
+        if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){
+            if (Input.GetMouseButtonDown(0)){
                 sfx.Play();
                 SceneManager.LoadScene("Tutorial");
             }
+
+            previous_hover = hover;
+            hover = true;
+        } else {
+            previous_hover = hover;
+            hover = false;
+        } 
+
+        if (hover != previous_hover) {
+            if(hover) {
+                sr.color = new Color(202f / 255f, 202f / 255f, 242f / 255f, 201f / 255f);
+            } else {
+                sr.color = new Color(149f / 255f, 189f / 255f, 253f / 255f, 201f / 255f);
+            }
         }
     }
 }

ProjectSettings/ProjectSettings.asset

@@ -558,7 +558,7 @@ PlayerSettings:
   webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 0
+  webGLCompressionFormat: 2
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0

README.md

@@ -1,5 +1,7 @@
 # GeoJam2021
 
-Hello this will be my entry to the [GeoJam2021](https://itch.io/jam/geojam-2021) hosted by [Icoso](https://www.youtube.com/channel/UCL7FCx3MrwKGYFEs91Lz0yg)
+Hello this will be my entry to the [GeoJam2021](https://itch.io/jam/geojam-2021)hosted by [Icoso](https://www.youtube.com/channel/UCL7FCx3MrwKGYFEs91Lz0yg)
+
+This game was coded with [@Tucan444](https://github.com/Tucan444/) 
 
 [Assets](Assets.md)

UserSettings/EditorUserSettings.asset

@@ -9,31 +9,49 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c73150012147b623d28393930
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c73150012147c623d28393930
-      flags: 0
-    RecentlyUsedScenePath-4:
+<<<<<<< Updated upstream
       value: 22424703114646680e0b0227036c731500121478623d28393930
       flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c73150012147f623d28393930
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c73150012147e623d28393930
-      flags: 0
-    RecentlyUsedScenePath-7:
+    RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c731500121479623d28393930
       flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c73150012147f623d28393930
+=======
+      value: 22424703114646680e0b0227036c73150012147b623d28393930
+      flags: 0
+    RecentlyUsedScenePath-2:
+      value: 22424703114646680e0b0227036c73150012147c623d28393930
+      flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646680e0b0227036c731500121478623d28393930
+>>>>>>> Stashed changes
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 22424703114646680e0b0227036c73150012147c623d28393930
+      flags: 0
+    RecentlyUsedScenePath-5:
+<<<<<<< Updated upstream
+      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
+=======
+      value: 22424703114646680e0b0227036c731500121479623d28393930
+>>>>>>> Stashed changes
+      flags: 0
+    RecentlyUsedScenePath-6:
+      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
+      flags: 0
+    RecentlyUsedScenePath-7:
+<<<<<<< Updated upstream
+      value: 22424703114646680e0b0227036c73150012147b623d28393930
+=======
+      value: 22424703114646680e0b0227036c7919181e0b22623d28393930
+>>>>>>> Stashed changes
+      flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c72151802563f22213229
+      value: 22424703114646680e0b0227036c73150012147e623d28393930
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
+      value: 22424703114646680e0b0227036c72151802563f22213229
       flags: 0
     UnityRemoteCompression:
       value: 337f73

WebGL build/TemplateData/style.css

@@ -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 { 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; 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 { float: right; width: 38px; height: 38px; background: url('fullscreen-button.png') no-repeat center }
+#unity-mobile-warning { position: absolute; left: 50%; top: 5%; transform: translate(-50%); background: white; padding: 10px; display: none }

WebGL build/index.html

@@ -0,0 +1,87 @@
+<!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 | GeoJam 2021</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=960 height=600></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-mobile-warning">
+        WebGL builds are not supported on mobile devices.
+      </div>
+      <div id="unity-footer">
+        <div id="unity-webgl-logo"></div>
+        <div id="unity-fullscreen-button"></div>
+        <div id="unity-build-title">GeoJam 2021</div>
+      </div>
+    </div>
+    <script>
+      var buildUrl = "Build";
+      var loaderUrl = buildUrl + "/WebGL build.loader.js";
+      var config = {
+        dataUrl: buildUrl + "/WebGL build.data",
+        frameworkUrl: buildUrl + "/WebGL build.framework.js",
+        codeUrl: buildUrl + "/WebGL build.wasm",
+        streamingAssetsUrl: "StreamingAssets",
+        companyName: "BRN Systems",
+        productName: "GeoJam 2021",
+        productVersion: "1.0",
+      };
+
+      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 mobileWarning = document.querySelector("#unity-mobile-warning");
+
+      // 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 (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
+        container.className = "unity-mobile";
+        // Avoid draining fillrate performance on mobile devices,
+        // and default/override low DPI mode on mobile browsers.
+        config.devicePixelRatio = 1;
+        mobileWarning.style.display = "block";
+        setTimeout(() => {
+          mobileWarning.style.display = "none";
+        }, 5000);
+      } else {
+        canvas.style.width = "960px";
+        canvas.style.height = "600px";
+      }
+      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>