diff --git a/Assets/Data/Inventory/BaseInventory.asset b/Assets/Data/Inventory/BaseInventory.asset index ef65854..5bc7a7c 100644 --- a/Assets/Data/Inventory/BaseInventory.asset +++ b/Assets/Data/Inventory/BaseInventory.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fb94665e70a106a7e0a4ca21efd8c70634b208c2c9bcc75a6601c8a846c559b -size 1186 +oid sha256:c81ff8a2a9d20a7dbf315a47e3f940b787afa602a751c355d85b064e6b90a9fd +size 1313 diff --git a/Assets/Data/Logic Blocks/Missile.asset b/Assets/Data/Logic Blocks/Missile.asset index 0dcbf75..c6eacb2 100644 --- a/Assets/Data/Logic Blocks/Missile.asset +++ b/Assets/Data/Logic Blocks/Missile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1407c67c7a52ce8f47e9373bd2c3663187ab8993f107ef768d5db368c59bc873 -size 573 +oid sha256:f41bc326800dd1e6b56d27fe30a4bc8e8fe02db38d6753dc156ce3416db2c0ab +size 651 diff --git a/Assets/Scripts/Browser/BrowserServer.cs b/Assets/Scripts/Browser/BrowserServer.cs index 2e87a6a..04f559f 100644 --- a/Assets/Scripts/Browser/BrowserServer.cs +++ b/Assets/Scripts/Browser/BrowserServer.cs @@ -13,6 +13,10 @@ public class BrowserServer : MonoBehaviour [Tooltip("Local Path in Streaming Assets")] private string LocalPath; + [SerializeField] + [Tooltip("Site to redirect to if android")] + private string redirectSite; + [SerializeField] [Tooltip("Browsers by default use 80")] private int port = 80; diff --git a/Assets/Scripts/Browser/SimpleHttpsServer.cs b/Assets/Scripts/Browser/SimpleHttpsServer.cs index 778af99..581460b 100644 --- a/Assets/Scripts/Browser/SimpleHttpsServer.cs +++ b/Assets/Scripts/Browser/SimpleHttpsServer.cs @@ -142,8 +142,8 @@ class SimpleHTTPServer try { HttpListenerContext context = _listener.GetContext(); - UnityEngine.Debug.Log("client Connected to webpage"); Process(context); + } catch (Exception ex) { diff --git a/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png b/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png new file mode 100644 index 0000000..cf6b402 --- /dev/null +++ b/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c963d84120be6c9dbd55078d72c6872b193294304954c55db22267f0d5317452 +size 7257 diff --git a/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png.meta b/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png.meta new file mode 100644 index 0000000..fce06d1 --- /dev/null +++ b/Assets/StreamingAssets/WebGLBuild/TemplateData/logo.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 73ef2099cc3789e4082152b3e189b9a7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/WebGLBuild/index.html b/Assets/StreamingAssets/WebGLBuild/index.html index 4fb88d3..de8b8f8 100644 --- a/Assets/StreamingAssets/WebGLBuild/index.html +++ b/Assets/StreamingAssets/WebGLBuild/index.html @@ -1,25 +1,132 @@ + - - Unity WebGL Player | Pet.Move() - - - - - + + %UNITY_WEB_NAME% + + -
-
-
- -
-
Pet.Move()
-
+
+
+ + +
+ + + + + diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta new file mode 100644 index 0000000..ae3159c --- /dev/null +++ b/Assets/WebGLTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce76274a22d5f1749afb0d99b29039dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate.meta b/Assets/WebGLTemplates/BetterTemplate.meta new file mode 100644 index 0000000..e4a9862 --- /dev/null +++ b/Assets/WebGLTemplates/BetterTemplate.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f25bb8e07ed2f4b20aa116e1c94cea0a +folderAsset: yes +timeCreated: 1510669965 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate/index.html b/Assets/WebGLTemplates/BetterTemplate/index.html new file mode 100644 index 0000000..de8b8f8 --- /dev/null +++ b/Assets/WebGLTemplates/BetterTemplate/index.html @@ -0,0 +1,132 @@ + + + + + + + %UNITY_WEB_NAME% + + + + +
+
+ + +
+
+ + + + + + + diff --git a/Assets/WebGLTemplates/BetterTemplate/index.html.meta b/Assets/WebGLTemplates/BetterTemplate/index.html.meta new file mode 100644 index 0000000..26c861c --- /dev/null +++ b/Assets/WebGLTemplates/BetterTemplate/index.html.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21a732ac9afba41ce9d0f72567db331f +timeCreated: 1510670098 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate/logo.png b/Assets/WebGLTemplates/BetterTemplate/logo.png new file mode 100644 index 0000000..cf6b402 --- /dev/null +++ b/Assets/WebGLTemplates/BetterTemplate/logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c963d84120be6c9dbd55078d72c6872b193294304954c55db22267f0d5317452 +size 7257 diff --git a/Assets/WebGLTemplates/BetterTemplate/logo.png.meta b/Assets/WebGLTemplates/BetterTemplate/logo.png.meta new file mode 100644 index 0000000..1088498 --- /dev/null +++ b/Assets/WebGLTemplates/BetterTemplate/logo.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d315c2e7033ee40bc86d677b2255a3f0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index af5910d..fec7366 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81dc2bb76c1a5b7639713c40b44bce40b5757f89e1fe33e7033950ea47e88071 +oid sha256:7be799905646e6d7aaab37702ab8e14db03f14e8814c42bb9471fdcb8028125e size 1282 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 15dc092..6ec3cc0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33ce654bd4b3898466537593d9c857378b5209e6a58a289ec29fb28490560b89 -size 20897 +oid sha256:10e0a66072f7571cd5504c1b3fbbcb9214e19f7d90c8737713b00926e1b56bac +size 20900