shaogen1995 2 år sedan
förälder
incheckning
fb8bd7401b

BIN
web/public/program/Build/Build13.data.unityweb


BIN
web/public/program/Build/Build13.framework.js.unityweb


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
web/public/program/Build/Build13.loader.js


BIN
web/public/program/Build/Build13.wasm.unityweb


+ 4 - 4
web/public/program/ServiceWorker.js

@@ -1,9 +1,9 @@
 const cacheName = "DefaultCompany-HeNanMuseum-0.1";
 const contentToCache = [
-    "Build/Build12.loader.js",
-    "Build/Build12.framework.js.unityweb",
-    "Build/Build12.data.unityweb",
-    "Build/Build12.wasm.unityweb",
+    "Build/Build13.loader.js",
+    "Build/Build13.framework.js.unityweb",
+    "Build/Build13.data.unityweb",
+    "Build/Build13.wasm.unityweb",
     "TemplateData/style.css"
 
 ];

+ 165 - 0
web/public/program/index copy 2.html

@@ -0,0 +1,165 @@
+<!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 | HeNanMuseum</title>
+  <link rel="shortcut icon" href="TemplateData/favicon.ico">
+  <link rel="stylesheet" href="TemplateData/style.css">
+  <link rel="manifest" href="manifest.webmanifest">
+</head>
+
+<body>
+  <div id="unity-container">
+    <canvas id="unity-canvas" width=960 height=600 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>
+  <script>
+    window.addEventListener("load", function () {
+      if ("serviceWorker" in navigator) {
+        navigator.serviceWorker.register("ServiceWorker.js");
+      }
+    });
+
+    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 warningBanner = document.querySelector("#unity-warning");
+    let unityInstance = null
+    // 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 + "/Build11.loader.js";
+    var config = {
+      dataUrl: buildUrl + "/Build11.data.unityweb",
+      frameworkUrl: buildUrl + "/Build11.framework.js.unityweb",
+      codeUrl: buildUrl + "/Build11.wasm.unityweb",
+      streamingAssetsUrl: "StreamingAssets",
+      companyName: "DefaultCompany",
+      productName: "HeNanMuseum",
+      productVersion: "0.1",
+      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 (/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);
+    }
+
+    loadingBar.style.display = "block";
+
+    var script = document.createElement("script");
+    script.src = loaderUrl;
+    script.onload = () => {
+      createUnityInstance(canvas, config, (progress) => {
+        progressBarFull.style.width = 100 * progress + "%";
+      }).then((instance) => {
+        loadingBar.style.display = "none";
+        // 新添加
+        unityInstance = instance
+      }).catch((message) => {
+        alert(message);
+      });
+    };
+    document.body.appendChild(script);
+
+
+
+    // 新添加
+    window.onShareImage = (img) => {
+      console.log('result:', img);
+      window.parent.postMessage({
+          source: 'shareImg',
+          data: img,
+        },
+        "*")
+    }
+
+
+    window.addEventListener('message', (res) => {
+      console.log('result:', unityInstance);
+      if (!unityInstance) return
+      if (Object.prototype.toString.call(res.data) == "[object Object]") {
+        let data = res.data.data;
+
+        // 切换模块
+        if (res.data.source === "changeBlock") {
+          console.log('result:changeBlock', data);
+          unityInstance.SendMessage('Main', 'OnClickModule', data);
+        }
+
+        // 切换类型
+        else if (res.data.source === "clickTypeBtn") {
+          unityInstance.SendMessage('Main', 'OnClickType', data === 'block' ? 0 : 1);
+          console.log('result:OnClickType', data === 'block' ? 0 : 1);
+        }
+
+        // 点击子项
+        else if (res.data.source === "clickItemBtn") {
+          unityInstance.SendMessage('Main', 'OnClickItem', data);
+          console.log('result:OnClickItem', data);
+        }
+
+        // 保存
+        else if (res.data.source === "Save") {
+          unityInstance.SendMessage('Main', 'Save');
+        }
+
+        // 取消
+        else if (res.data.source === "Cancel") {
+          unityInstance.SendMessage('Main', 'Cancel');
+        }
+
+
+        // 图片回调
+        else if (res.data.source === "CallShareImage") {
+          unityInstance.SendMessage('Main', 'CallShareImage');
+        }
+
+
+      }
+    })
+  </script>
+</body>
+
+</html>

+ 25 - 12
web/public/program/index copy.html

@@ -59,11 +59,11 @@
     }
 
     var buildUrl = "Build";
-    var loaderUrl = buildUrl + "/Build11.loader.js";
+    var loaderUrl = buildUrl + "/Build12.loader.js";
     var config = {
-      dataUrl: buildUrl + "/Build11.data.unityweb",
-      frameworkUrl: buildUrl + "/Build11.framework.js.unityweb",
-      codeUrl: buildUrl + "/Build11.wasm.unityweb",
+      dataUrl: buildUrl + "/Build12.data.unityweb",
+      frameworkUrl: buildUrl + "/Build12.framework.js.unityweb",
+      codeUrl: buildUrl + "/Build12.wasm.unityweb",
       streamingAssetsUrl: "StreamingAssets",
       companyName: "DefaultCompany",
       productName: "HeNanMuseum",
@@ -95,7 +95,7 @@
         progressBarFull.style.width = 100 * progress + "%";
       }).then((instance) => {
         loadingBar.style.display = "none";
-        // 新添加
+
         unityInstance = instance
       }).catch((message) => {
         alert(message);
@@ -104,18 +104,33 @@
     document.body.appendChild(script);
 
 
-
-    // 新添加
+    // 新添加(以下全是)
     window.onShareImage = (img) => {
       console.log('result:', img);
       window.parent.postMessage({
-        source: 'shareImg',
-        data: img,
-      },
+          source: 'shareImg',
+          data: img,
+        },
         "*")
     }
 
 
+    window.Internal_ShowTouchErrorTips = (data) => {
+      console.log('result:', data);
+    }
+
+    window.showTouchErrorTips = (data) => {
+      console.log('result:', data);
+    }
+
+    window._Internal_ShowTouchErrorTips = (data) => {
+      console.log('result:', data);
+    }
+
+
+
+
+
     window.addEventListener('message', (res) => {
       console.log('result:', unityInstance);
       if (!unityInstance) return
@@ -159,8 +174,6 @@
 
       }
     })
-
-
   </script>
 </body>
 

+ 8 - 11
web/public/program/index.html

@@ -34,6 +34,7 @@
     var progressBarFull = document.querySelector("#unity-progress-bar-full");
     var warningBanner = document.querySelector("#unity-warning");
     let unityInstance = null
+
     // 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.
@@ -59,11 +60,11 @@
     }
 
     var buildUrl = "Build";
-    var loaderUrl = buildUrl + "/Build12.loader.js";
+    var loaderUrl = buildUrl + "/Build13.loader.js";
     var config = {
-      dataUrl: buildUrl + "/Build12.data.unityweb",
-      frameworkUrl: buildUrl + "/Build12.framework.js.unityweb",
-      codeUrl: buildUrl + "/Build12.wasm.unityweb",
+      dataUrl: buildUrl + "/Build13.data.unityweb",
+      frameworkUrl: buildUrl + "/Build13.framework.js.unityweb",
+      codeUrl: buildUrl + "/Build13.wasm.unityweb",
       streamingAssetsUrl: "StreamingAssets",
       companyName: "DefaultCompany",
       productName: "HeNanMuseum",
@@ -108,9 +109,9 @@
     window.onShareImage = (img) => {
       console.log('result:', img);
       window.parent.postMessage({
-        source: 'shareImg',
-        data: img,
-      },
+          source: 'shareImg',
+          data: img,
+        },
         "*")
     }
 
@@ -129,8 +130,6 @@
 
 
 
-
-
     window.addEventListener('message', (res) => {
       console.log('result:', unityInstance);
       if (!unityInstance) return
@@ -174,8 +173,6 @@
 
       }
     })
-
-
   </script>
 </body>