shaogen1995 пре 4 недеља
родитељ
комит
e38fb30edb
58 измењених фајлова са 941 додато и 337 уклоњено
  1. BIN
      public/unityMo/Build/Build.data.unityweb
  2. BIN
      public/unityMo/Build/Build.framework.js.unityweb
  3. 1 1
      public/unityMo/Build/Build.loader.js
  4. BIN
      public/unityMo/Build/Build.wasm.unityweb
  5. 347 114
      public/unityMo/StreamingAssets/Settings.json
  6. BIN
      public/unityMo/StreamingAssets/aa/WebGL/089c7ab93c27a929ecb0cbb575f4147c.bundle
  7. BIN
      public/unityMo/StreamingAssets/aa/WebGL/0c7d9fe059db2ee83f04ec4894355538.bundle
  8. BIN
      public/unityMo/StreamingAssets/aa/WebGL/0cfa26d92f2aa9ec3f6b127e37e19928.bundle
  9. BIN
      public/unityMo/StreamingAssets/aa/WebGL/12570a22233b8e31ae27644dbcfe8e98.bundle
  10. BIN
      public/unityMo/StreamingAssets/aa/WebGL/1f4f6856c5caec206fca42ebaaa7919f.bundle
  11. BIN
      public/unityMo/StreamingAssets/aa/WebGL/1fdbed01508125f1bbe8926c09ca0d2e.bundle
  12. BIN
      public/unityMo/StreamingAssets/aa/WebGL/2c352ba22942b872b574485b0b4384da.bundle
  13. BIN
      public/unityMo/StreamingAssets/aa/WebGL/2e10bd011dcfe194a54037622fdea2d9.bundle
  14. BIN
      public/unityMo/StreamingAssets/aa/WebGL/3b9adc28bc1734efbd67fd7d207cd380.bundle
  15. BIN
      public/unityMo/StreamingAssets/aa/WebGL/3cc2bf7191e4c141f94847bc9e2ec165.bundle
  16. BIN
      public/unityMo/StreamingAssets/aa/WebGL/4d0b6aa8264949a568c452d2c79d8312.bundle
  17. BIN
      public/unityMo/StreamingAssets/aa/WebGL/70dd350ae0c35589e9c5059d2523eeec.bundle
  18. BIN
      public/unityMo/StreamingAssets/aa/WebGL/7adf775361ca6e72918ffddb174b07ab.bundle
  19. BIN
      public/unityMo/StreamingAssets/aa/WebGL/84c50e06568f07e196412fa1bf98bee4.bundle
  20. BIN
      public/unityMo/StreamingAssets/aa/WebGL/9cf96dc4528eac0215c219b70cbcf4d4.bundle
  21. BIN
      public/unityMo/StreamingAssets/aa/WebGL/d078ced9a95dca98f3830330be5ace9c.bundle
  22. BIN
      public/unityMo/StreamingAssets/aa/WebGL/d1c8a5b8339fe0f585144eb59bb093c4.bundle
  23. BIN
      public/unityMo/StreamingAssets/aa/WebGL/de801cfbd560353b0e517bed99a133b6.bundle
  24. BIN
      public/unityMo/StreamingAssets/aa/WebGL/e3ff228125d82f0307b9fcd91d17330c.bundle
  25. BIN
      public/unityMo/StreamingAssets/aa/WebGL/ed5b1b75119bd2126a9d609a18d08a78.bundle
  26. BIN
      public/unityMo/StreamingAssets/aa/WebGL/f1791d0a6f5c2c029b608731c7e720bd.bundle
  27. BIN
      public/unityMo/StreamingAssets/aa/WebGL/f495ebcc1be471e80b1eeefb3b34f5e0.bundle
  28. BIN
      public/unityMo/StreamingAssets/aa/WebGL/f63c2a07093bd541f0c1f2104a82313d.bundle
  29. BIN
      public/unityMo/StreamingAssets/aa/WebGL/f9e6c2827344ae404bed18f5b511740d.bundle
  30. BIN
      public/unityMo/StreamingAssets/aa/catalog.bin
  31. 1 1
      public/unityMo/StreamingAssets/aa/catalog.hash
  32. 1 1
      public/unityMo/StreamingAssets/aa/settings.json
  33. 24 7
      public/unityMo/export_main.js
  34. BIN
      public/unityPc/Build/Build.data.unityweb
  35. BIN
      public/unityPc/Build/Build.framework.js.unityweb
  36. 1 1
      public/unityPc/Build/Build.loader.js
  37. BIN
      public/unityPc/Build/Build.wasm.unityweb
  38. 347 114
      public/unityPc/StreamingAssets/Settings.json
  39. BIN
      public/unityPc/StreamingAssets/aa/WebGL/089c7ab93c27a929ecb0cbb575f4147c.bundle
  40. BIN
      public/unityPc/StreamingAssets/aa/WebGL/3cc2bf7191e4c141f94847bc9e2ec165.bundle
  41. BIN
      public/unityPc/StreamingAssets/aa/WebGL/4d0b6aa8264949a568c452d2c79d8312.bundle
  42. BIN
      public/unityPc/StreamingAssets/aa/catalog.bin
  43. 1 1
      public/unityPc/StreamingAssets/aa/catalog.hash
  44. 1 1
      public/unityPc/StreamingAssets/aa/settings.json
  45. 25 7
      public/unityPc/export_main.js
  46. BIN
      src/assets/img/A6_policy_detail_bg.jpg
  47. BIN
      src/assets/img/A6_policy_detail_bg.png
  48. BIN
      src/assets/img/A6_sangzang_home_bg.jpg
  49. BIN
      src/assets/img/A6_sangzang_home_bg.png
  50. BIN
      src/assets/img/A7base3_iconA.png
  51. 1 1
      src/assets/styles/base.less
  52. 3 3
      src/pages/A0base/data.ts
  53. 54 20
      src/pages/A6ybwx/Sangzang/components/Policy/index.module.scss
  54. 3 3
      src/pages/A6ybwx/Sangzang/components/Policy/index.tsx
  55. 67 41
      src/pages/A6ybwx/Sangzang/index.module.scss
  56. 44 15
      src/pages/A6ybwx/Sangzang/index.tsx
  57. 2 2
      src/pages/A6ybwx/index.tsx
  58. 18 4
      src/pages/A8byzh/index.tsx

BIN
public/unityMo/Build/Build.data.unityweb


BIN
public/unityMo/Build/Build.framework.js.unityweb


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/unityMo/Build/Build.loader.js


BIN
public/unityMo/Build/Build.wasm.unityweb


+ 347 - 114
public/unityMo/StreamingAssets/Settings.json

@@ -4,28 +4,32 @@
   "modelControlAnimationTime": 0.8,
   "panels": [
     {
-      "name": "DefaultVirtualCamera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -6.5,
-      "cameraY": 0,
-      "model": {
+      "name": "Panel1Camera",
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
         "rotation": {
-          "x": 5,
-          "y": -180,
+          "x": 0,
+          "y": 0,
           "z": 0
         }
-      }
-    },
-    {
-      "name": "Panel1Camera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -6.5,
-      "cameraY": 0,
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -33,13 +37,31 @@
     },
     {
       "name": "Panel2Camera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -9,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.5,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -47,13 +69,31 @@
     },
     {
       "name": "Panel3Camera",
-      "cameraOrthographicSize": 5.4,
-      "viewportX": 0.5,
-      "offset": 0,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -10
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -61,28 +101,64 @@
     },
     {
       "name": "Panel4Camera",
-      "cameraOrthographicSize": 6.4,
-      "viewportX": 0,
-      "offset": -7.5,
-      "cameraY": 0.6,
-      "model": {
+      "rotationNotAllowed": true,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
         "rotation": {
-          "x": -5,
+          "x": 0,
           "y": 0,
           "z": 0
         }
       },
-      "rotationNotAllowed": true
+      "model": {
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      }
     },
     {
       "name": "Panel5Camera",
-      "cameraOrthographicSize": 9,
-      "viewportX": 0.5,
-      "offset": 0,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -15
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -92,15 +168,28 @@
   "hotspots": [
     {
       "name": "佛龛",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2,
         "position": {
-          "y": 0.8,
-          "z": -20
+          "x": 0,
+          "y": 1.5,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -113,15 +202,28 @@
     },
     {
       "name": "佛像",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2,
         "position": {
+          "x": 0,
+          "y": 0.8,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
           "y": 0,
-          "z": -20
+          "z": 0
         }
       },
       "model": {
@@ -134,15 +236,28 @@
     },
     {
       "name": "佛龛两侧",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5.4,
-        "viewportX": 0.5,
-        "offset": -2.6,
         "position": {
+          "x": 0,
+          "y": 0.8,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
           "y": 0,
-          "z": -20
+          "z": 0
         }
       },
       "model": {
@@ -155,15 +270,28 @@
     },
     {
       "name": "佛龛上部",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2.4,
         "position": {
-          "y": 2,
-          "z": -20
+          "x": 0,
+          "y": 3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -176,15 +304,28 @@
     },
     {
       "name": "佛龛下部",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2.4,
         "position": {
-          "y": -4.5,
-          "z": -20
+          "x": 0,
+          "y": -3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -197,15 +338,28 @@
     },
     {
       "name": "畏兽",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
-       "camera": {
-        "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.2,
+      "camera": {
         "position": {
-          "y": 2,
-          "z": -20
+          "x": 0,
+          "y": 3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -218,15 +372,28 @@
     },
     {
       "name": "飞天",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-         "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.4,
         "position": {
-          "y": -1.5,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -239,15 +406,28 @@
     },
     {
       "name": "摩尼宝珠",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
-     "camera": {
-         "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.4,
+      "camera": {
         "position": {
+          "x": 0,
           "y": -3,
-          "z": -20
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -262,56 +442,96 @@
   "inscriptions": [
     {
       "name": "碑额",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 2,
-        "viewportX": 0,
-        "offset": 0,
         "position": {
-          "y": 4.4,
-          "z": -20
+          "x": 1.4,
+          "y": 4.1,
+          "z": -5
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
         "rotation": {
           "x": 0,
-          "y": 0,
+          "y": -90,
           "z": 0
         }
       }
     },
     {
       "name": "碑文1",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 2,
-        "viewportX": 0,
-        "offset": 0,
         "position": {
-          "y": 3.6,
-          "z": -20
+          "x": 1.6,
+          "y": 3.4,
+          "z": -5
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
         "rotation": {
           "x": 0,
-          "y": 0,
+          "y": -180,
           "z": 0
         }
       }
-    },{
+    },
+    {
       "name": "碑文2",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 6.4,
-        "viewportX": 0,
-        "offset": -7,
         "position": {
-          "y": 0.6,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -324,15 +544,28 @@
     },
     {
       "name": "碑文3",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
-       "camera": {
-        "cameraOrthographicSize": 6.4,
-        "viewportX": 0,
-        "offset": -7,
+      "camera": {
         "position": {
-          "y": 0.6,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {

BIN
public/unityMo/StreamingAssets/aa/WebGL/089c7ab93c27a929ecb0cbb575f4147c.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/0c7d9fe059db2ee83f04ec4894355538.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/0cfa26d92f2aa9ec3f6b127e37e19928.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/12570a22233b8e31ae27644dbcfe8e98.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/1f4f6856c5caec206fca42ebaaa7919f.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/1fdbed01508125f1bbe8926c09ca0d2e.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/2c352ba22942b872b574485b0b4384da.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/2e10bd011dcfe194a54037622fdea2d9.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/3b9adc28bc1734efbd67fd7d207cd380.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/3cc2bf7191e4c141f94847bc9e2ec165.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/4d0b6aa8264949a568c452d2c79d8312.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/70dd350ae0c35589e9c5059d2523eeec.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/7adf775361ca6e72918ffddb174b07ab.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/84c50e06568f07e196412fa1bf98bee4.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/9cf96dc4528eac0215c219b70cbcf4d4.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/d078ced9a95dca98f3830330be5ace9c.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/d1c8a5b8339fe0f585144eb59bb093c4.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/de801cfbd560353b0e517bed99a133b6.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/e3ff228125d82f0307b9fcd91d17330c.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/ed5b1b75119bd2126a9d609a18d08a78.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/f1791d0a6f5c2c029b608731c7e720bd.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/f495ebcc1be471e80b1eeefb3b34f5e0.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/f63c2a07093bd541f0c1f2104a82313d.bundle


BIN
public/unityMo/StreamingAssets/aa/WebGL/f9e6c2827344ae404bed18f5b511740d.bundle


BIN
public/unityMo/StreamingAssets/aa/catalog.bin


+ 1 - 1
public/unityMo/StreamingAssets/aa/catalog.hash

@@ -1 +1 @@
-f3de374e598de475ca592cdbad708d39
+4c9b429efcfb5761659ecf7b2bc038cd

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/unityMo/StreamingAssets/aa/settings.json


+ 24 - 7
public/unityMo/export_main.js

@@ -1,9 +1,24 @@
 let currentScene = 'TombstoneView'
+let isLoadingScene = false
 
 //场景加载进度回调
 window.loadSceneProgress = function (progress) {
   if (window.parent && window.parent !== window) {
-    window.parent.unityLoading(progress)
+    window.parent.unityLoading(Math.min(0.99, progress))
+  }
+}
+
+//场景准备加载回调
+window.startLoadScene = function () {
+  isLoadingScene = true
+}
+
+//场景已完成加载回调
+window.loadedScene = function () {
+  isLoadingScene = false
+
+  if (window.parent && window.parent !== window) {
+    window.parent.unityLoading(1)
   }
 }
 
@@ -12,17 +27,19 @@ window.setLoadSceneAnimationTime = function (animationTime) {
   window.unityInstance.SendMessage('SceneLoader', 'SetAnimationTime', animationTime)
 }
 
-//切换场景 场景支持以下参数 "TombstoneView", "RoomScene", "DrawingBoard"
+//切换场景 场景支持以下参数 "TombstoneView" (一单元), "TransitionScene" (空场景), "RoomScene" (碑中世界), "DrawingBoard" (碑影智绘), 切换之前必须判断是否有场景正在加载
 window.loadScene = function (sceneName) {
+  window.setLoadSceneAnimationTime(sceneName === 'DrawingBoard' ? 1 : 0)
+  window.unityInstance.SendMessage('SceneLoader', 'LoadScene', sceneName)
   currentScene = sceneName
+}
 
-  if (sceneName) {
-    window.setLoadSceneAnimationTime(sceneName === 'DrawingBoard' ? 1 : 0)
-    window.unityInstance.SendMessage('SceneLoader', 'LoadScene', sceneName)
-  }
+//是否正在加载场景
+window.isLoadingScene = function () {
+  return isLoadingScene
 }
 
 // 返回当前场景状态
-window.sceneStaRes = () => {
+window.sceneStaRes = function () {
   return currentScene
 }

BIN
public/unityPc/Build/Build.data.unityweb


BIN
public/unityPc/Build/Build.framework.js.unityweb


Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/unityPc/Build/Build.loader.js


BIN
public/unityPc/Build/Build.wasm.unityweb


+ 347 - 114
public/unityPc/StreamingAssets/Settings.json

@@ -4,28 +4,32 @@
   "modelControlAnimationTime": 0.8,
   "panels": [
     {
-      "name": "DefaultVirtualCamera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -6.5,
-      "cameraY": 0,
-      "model": {
+      "name": "Panel1Camera",
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
         "rotation": {
-          "x": 5,
-          "y": -180,
+          "x": 0,
+          "y": 0,
           "z": 0
         }
-      }
-    },
-    {
-      "name": "Panel1Camera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -6.5,
-      "cameraY": 0,
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -33,13 +37,31 @@
     },
     {
       "name": "Panel2Camera",
-      "cameraOrthographicSize": 7,
-      "viewportX": 0,
-      "offset": -9,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.5,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -47,13 +69,31 @@
     },
     {
       "name": "Panel3Camera",
-      "cameraOrthographicSize": 5.4,
-      "viewportX": 0.5,
-      "offset": 0,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -10
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -61,28 +101,64 @@
     },
     {
       "name": "Panel4Camera",
-      "cameraOrthographicSize": 6.4,
-      "viewportX": 0,
-      "offset": -7.5,
-      "cameraY": 0.6,
-      "model": {
+      "rotationNotAllowed": true,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
         "rotation": {
-          "x": -5,
+          "x": 0,
           "y": 0,
           "z": 0
         }
       },
-      "rotationNotAllowed": true
+      "model": {
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      }
     },
     {
       "name": "Panel5Camera",
-      "cameraOrthographicSize": 9,
-      "viewportX": 0.5,
-      "offset": 0,
-      "cameraY": 0,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "camera": {
+        "position": {
+          "x": 0,
+          "y": 0,
+          "z": -15
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      },
       "model": {
         "rotation": {
-          "x": 5,
+          "x": 0,
           "y": -180,
           "z": 0
         }
@@ -92,15 +168,28 @@
   "hotspots": [
     {
       "name": "佛龛",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2,
         "position": {
-          "y": 0.8,
-          "z": -20
+          "x": 0,
+          "y": 1.5,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -113,15 +202,28 @@
     },
     {
       "name": "佛像",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2,
         "position": {
+          "x": 0,
+          "y": 0.8,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
           "y": 0,
-          "z": -20
+          "z": 0
         }
       },
       "model": {
@@ -134,15 +236,28 @@
     },
     {
       "name": "佛龛两侧",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5.4,
-        "viewportX": 0.5,
-        "offset": -2.6,
         "position": {
+          "x": 0,
+          "y": 0.8,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
           "y": 0,
-          "z": -20
+          "z": 0
         }
       },
       "model": {
@@ -155,15 +270,28 @@
     },
     {
       "name": "佛龛上部",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2.4,
         "position": {
-          "y": 2,
-          "z": -20
+          "x": 0,
+          "y": 3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -176,15 +304,28 @@
     },
     {
       "name": "佛龛下部",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 5,
-        "viewportX": 0.5,
-        "offset": -2.4,
         "position": {
-          "y": -4.5,
-          "z": -20
+          "x": 0,
+          "y": -3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -197,15 +338,28 @@
     },
     {
       "name": "畏兽",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
-       "camera": {
-        "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.2,
+      "camera": {
         "position": {
-          "y": 2,
-          "z": -20
+          "x": 0,
+          "y": 3,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -218,15 +372,28 @@
     },
     {
       "name": "飞天",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
       "camera": {
-         "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.4,
         "position": {
-          "y": -1.5,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -239,15 +406,28 @@
     },
     {
       "name": "摩尼宝珠",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0.1,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 1,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0.8,
       "startIntensity": 0,
-     "camera": {
-         "cameraOrthographicSize": 4,
-        "viewportX": 0.5,
-        "offset": -1.4,
+      "camera": {
         "position": {
+          "x": 0,
           "y": -3,
-          "z": -20
+          "z": -8
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -262,56 +442,96 @@
   "inscriptions": [
     {
       "name": "碑额",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 2,
-        "viewportX": 0,
-        "offset": 0,
         "position": {
-          "y": 4.4,
-          "z": -20
+          "x": 1.4,
+          "y": 4.1,
+          "z": -5
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
         "rotation": {
           "x": 0,
-          "y": 0,
+          "y": -90,
           "z": 0
         }
       }
     },
     {
       "name": "碑文1",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 2,
-        "viewportX": 0,
-        "offset": 0,
         "position": {
-          "y": 3.6,
-          "z": -20
+          "x": 1.6,
+          "y": 3.4,
+          "z": -5
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
         "rotation": {
           "x": 0,
-          "y": 0,
+          "y": -180,
           "z": 0
         }
       }
-    },{
+    },
+    {
       "name": "碑文2",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
       "camera": {
-        "cameraOrthographicSize": 6.4,
-        "viewportX": 0,
-        "offset": -7,
         "position": {
-          "y": 0.6,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {
@@ -324,15 +544,28 @@
     },
     {
       "name": "碑文3",
-      "animationTime": 0.8,
+      "dragBlock": {
+        "anchorsMin": {
+          "x": 0,
+          "y": 0
+        },
+        "anchorsMax": {
+          "x": 0.4,
+          "y": 1
+        }
+      },
+      "intensityAnimationTime": 0,
       "startIntensity": 0,
-       "camera": {
-        "cameraOrthographicSize": 6.4,
-        "viewportX": 0,
-        "offset": -7,
+      "camera": {
         "position": {
-          "y": 0.6,
-          "z": -20
+          "x": 0,
+          "y": 0,
+          "z": -13
+        },
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0
         }
       },
       "model": {

BIN
public/unityPc/StreamingAssets/aa/WebGL/089c7ab93c27a929ecb0cbb575f4147c.bundle


BIN
public/unityPc/StreamingAssets/aa/WebGL/3cc2bf7191e4c141f94847bc9e2ec165.bundle


BIN
public/unityPc/StreamingAssets/aa/WebGL/4d0b6aa8264949a568c452d2c79d8312.bundle


BIN
public/unityPc/StreamingAssets/aa/catalog.bin


+ 1 - 1
public/unityPc/StreamingAssets/aa/catalog.hash

@@ -1 +1 @@
-015185cbf7f77ef66a49c038e7dc360e
+4c9b429efcfb5761659ecf7b2bc038cd

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
public/unityPc/StreamingAssets/aa/settings.json


+ 25 - 7
public/unityPc/export_main.js

@@ -1,9 +1,24 @@
 let currentScene = 'TombstoneView'
+let isLoadingScene = false
 
 //场景加载进度回调
 window.loadSceneProgress = function (progress) {
   if (window.parent && window.parent !== window) {
-    window.parent.unityLoading(progress)
+    window.parent.unityLoading(Math.min(0.99, progress))
+  }
+}
+
+//场景准备加载回调
+window.startLoadScene = function () {
+  isLoadingScene = true
+}
+
+//场景已完成加载回调
+window.loadedScene = function () {
+  isLoadingScene = false
+
+  if (window.parent && window.parent !== window) {
+    window.parent.unityLoading(1)
   }
 }
 
@@ -12,16 +27,19 @@ window.setLoadSceneAnimationTime = function (animationTime) {
   window.unityInstance.SendMessage('SceneLoader', 'SetAnimationTime', animationTime)
 }
 
-//切换场景 场景支持以下参数 "TombstoneView", "RoomScene", "DrawingBoard"
+//切换场景 场景支持以下参数 "TombstoneView" (一单元), "TransitionScene" (空场景), "RoomScene" (碑中世界), "DrawingBoard" (碑影智绘), 切换之前必须判断是否有场景正在加载
 window.loadScene = function (sceneName) {
+  window.setLoadSceneAnimationTime(sceneName === 'DrawingBoard' ? 1 : 0)
+  window.unityInstance.SendMessage('SceneLoader', 'LoadScene', sceneName)
   currentScene = sceneName
-  if (sceneName) {
-    window.setLoadSceneAnimationTime(sceneName === 'DrawingBoard' ? 1 : 0)
-    window.unityInstance.SendMessage('SceneLoader', 'LoadScene', sceneName)
-  }
+}
+
+//是否正在加载场景
+window.isLoadingScene = function () {
+  return isLoadingScene
 }
 
 // 返回当前场景状态
-window.sceneStaRes = () => {
+window.sceneStaRes = function () {
   return currentScene
 }

BIN
src/assets/img/A6_policy_detail_bg.jpg


BIN
src/assets/img/A6_policy_detail_bg.png


BIN
src/assets/img/A6_sangzang_home_bg.jpg


BIN
src/assets/img/A6_sangzang_home_bg.png


BIN
src/assets/img/A7base3_iconA.png


+ 1 - 1
src/assets/styles/base.less

@@ -597,7 +597,7 @@ textarea {
 
 // @keyframes opacityCss {
 //   0% {
-//     opacity: 0.5;
+//     opacity: 0.2;
 //   }
 //   100% {
 //     opacity: 1;

+ 3 - 3
src/pages/A0base/data.ts

@@ -25,7 +25,7 @@ export const unityShow = (val: boolean) => {
 }
 
 // 获取当前场景key
-export const getUnityKey = () => {
+export const getUnityKey = (val:'sceneStaRes') => {
   let key = ''
 
   const dom: any = document.getElementById('modalIframe')
@@ -33,7 +33,7 @@ export const getUnityKey = () => {
     const iframeWindow = dom.contentWindow
 
     if (iframeWindow.sceneStaRes) {
-      key = iframeWindow.sceneStaRes()
+      key = iframeWindow[val]()
     }
   }
   return key
@@ -47,7 +47,7 @@ export const cutUnityFu = (
   const dom: any = document.getElementById('modalIframe')
 
   if (dom.src.includes('unity')) {
-    const res = getUnityKey()
+    const res = getUnityKey('sceneStaRes')
 
     if (res !== val) {
       unityShow(true)

+ 54 - 20
src/pages/A6ybwx/Sangzang/components/Policy/index.module.scss

@@ -3,12 +3,13 @@
   height: 100%;
   position: absolute;
   z-index: 3;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background: url(../../../../../assets/img/A6_policy_detail_bg.png) no-repeat center center;
-  background-size: 100% 100%;
+  top: 0%;
+  left: 0%;
+  background-color: #804b2a;
+  // background: url(../../../../../assets/img/A6_policy_detail_bg.jpg) no-repeat center center;
+  // background-size: 100% 100%;
   overflow: hidden;
+
   :global {
     .back {
       width: 80px;
@@ -19,15 +20,21 @@
       left: 4%;
       cursor: pointer;
 
-      & > img {
+      &>img {
         height: 100%;
         object-fit: fill;
       }
     }
+
     .containner {
+      position: absolute;
+      top: 0;
+      left: 0;
       width: 100%;
-      height: 100%;
+      height: 102%;
       overflow: auto;
+      // overflow-y: hidden;
+      // overflow-y: hidden;
       &::-webkit-scrollbar {
         width: 0;
         height: 0;
@@ -40,11 +47,13 @@
         white-space: nowrap;
         overflow-x: hidden;
       }
+
       .tabItem {
         display: inline-block;
         width: auto;
         vertical-align: top;
         height: 100%;
+
         .history1 {
           display: inline-block;
           vertical-align: top;
@@ -52,6 +61,7 @@
           height: 100%;
           background-color: rgba(128, 75, 42, 1);
           box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
+
           .txt {
             width: 25px;
             line-height: 25px;
@@ -63,16 +73,19 @@
             padding-top: 80px;
             margin: 0 auto;
           }
+
           .bottom {
             width: 100%;
             height: 54%;
-            & > img {
+
+            &>img {
               width: 100%;
               height: 100%;
               object-fit: fill;
             }
           }
         }
+
         .historyDetail {
           width: auto;
           height: 100%;
@@ -94,24 +107,28 @@
             color: rgba(69, 68, 55, 1);
             white-space: normal;
             transition: width 0.6s ease-in-out, padding 0.86s ease-in-out, opacity 0.3s ease-in-out;
+
             &::-webkit-scrollbar {
               width: 0;
               height: 0;
             }
           }
+
           .part1 {
-            background: url(../../../../../assets/img/A6_policy_part_bg1.png) no-repeat center
-              center;
+            background: url(../../../../../assets/img/A6_policy_part_bg1.png) no-repeat center center;
             background-size: 100% 100%;
+
             .part1txt {
               width: 100%;
               height: 80%;
               overflow: auto;
+
               &::-webkit-scrollbar {
                 width: 0;
                 height: 0;
               }
             }
+
             .from {
               width: 100%;
               height: fit-content;
@@ -120,14 +137,17 @@
               color: rgba(124, 75, 54, 1);
               font-size: 14px;
               line-height: 16px;
+
               &::-webkit-scrollbar {
                 width: 0;
                 height: 0;
               }
+
               .fromtxt {
                 width: 100%;
                 height: fit-content;
               }
+
               .author {
                 text-align: right;
                 width: 100%;
@@ -135,6 +155,7 @@
               }
             }
           }
+
           .part2 {
             display: inline-block;
             position: relative;
@@ -143,16 +164,19 @@
             gap: 10px;
             background: url(../../../../../assets/img/A6_policy_part_bg.png) no-repeat center center;
             background-size: 100% 100%;
+
             .imgBox {
               width: 100%;
               height: 76%;
               display: flex;
               flex-direction: column;
               justify-content: space-between;
-              & > img {
+
+              &>img {
                 height: 78%;
                 object-fit: contain;
               }
+
               .from {
                 text-align: center;
                 height: 20%;
@@ -161,6 +185,7 @@
                 line-height: 16px;
                 color: rgba(124, 75, 54, 0.7);
               }
+
               .name,
               .time {
                 writing-mode: vertical-lr;
@@ -173,6 +198,7 @@
                 font-size: 22px;
                 height: 50%;
               }
+
               .changeBar {
                 position: absolute;
                 top: 50%;
@@ -185,6 +211,7 @@
                 align-items: center;
                 justify-content: center;
                 gap: 10px;
+
                 .yuan,
                 .ta {
                   opacity: 0.6;
@@ -195,7 +222,8 @@
                   justify-content: center;
                   position: relative;
                   font-size: 15px;
-                  & > img {
+
+                  &>img {
                     position: absolute;
                     top: 50%;
                     left: 50%;
@@ -205,10 +233,12 @@
                     object-fit: contain;
                   }
                 }
+
                 .cActive {
                   opacity: 1;
                 }
               }
+
               .time {
                 right: 0;
                 font-size: 16px;
@@ -217,6 +247,7 @@
                 line-height: 20px;
               }
             }
+
             .desc {
               letter-spacing: 0px;
               line-height: 20px;
@@ -224,6 +255,7 @@
               height: 20%;
               white-space: normal;
               overflow: auto;
+
               &::-webkit-scrollbar {
                 width: 0;
                 height: 0;
@@ -244,6 +276,7 @@
       display: flex;
       align-items: center;
       gap: 20px;
+
       .dot {
         align-self: flex-start;
         width: 60px;
@@ -253,6 +286,7 @@
         justify-content: center;
         flex-direction: column;
         margin: 0 20px;
+
         .txt {
           width: 100%;
           height: 15px;
@@ -262,11 +296,13 @@
           letter-spacing: 1px;
           color: rgba(69, 68, 55, 1);
         }
-        & > img {
+
+        &>img {
           height: 24px;
           object-fit: contain;
         }
       }
+
       .lineContainner {
         position: absolute;
         top: 50%;
@@ -276,15 +312,13 @@
         height: 2px;
         display: flex;
         align-items: center;
-        background: linear-gradient(
-          90deg,
-          rgba(93, 96, 96, 0.2) 0%,
-          rgba(93, 96, 96, 1) 50%,
-          rgba(93, 96, 96, 0.2) 100%
-        );
+        background: linear-gradient(90deg,
+            rgba(93, 96, 96, 0.2) 0%,
+            rgba(93, 96, 96, 1) 50%,
+            rgba(93, 96, 96, 0.2) 100%);
         background-size: 5px 2px;
         background-repeat: repeat-x;
       }
     }
   }
-}
+}

+ 3 - 3
src/pages/A6ybwx/Sangzang/components/Policy/index.tsx

@@ -59,7 +59,7 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
           {myData.policy.map((item, index) => (
             <div className='tabItem' ref={itemRef} key={item.title}>
               <div className={`history1`} onClick={() => handleItemClick(index + 1)}>
-                <div className='txt'> {item.title}</div>
+                <div className='txt songFont'> {item.title}</div>
                 <div className='bottom'>
                   <img src={item.bottomPic} alt='' />
                 </div>
@@ -136,10 +136,10 @@ function Policy({ setShowTab }: { setShowTab: (tab: number) => void }) {
       <div className='timeLine'>
         <div className='lineContainner' />
         {myData.policy.map((item, index) => (
-          <div className='dot' key={item.title}>
+          <div className='dot' key={item.title} onClick={()=>setCurrentItem(index+1)}>
             <div className='txt'>{item.title}</div>
             <img
-              src={require(`@/assets/img/A7base3_icon${currentItem - 1 === index ? '' : '_n'}.png`)}
+              src={require(`@/assets/img/A7base3_icon${currentItem - 1 === index ? 'A' : '_n'}.png`)}
               alt=''
             />
           </div>

+ 67 - 41
src/pages/A6ybwx/Sangzang/index.module.scss

@@ -6,13 +6,14 @@
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
-  background: url(../../../assets/img/A6_sangzang_home_bg.png) no-repeat center center;
+  background: url(../../../assets/img/A6_sangzang_home_bg.jpg) no-repeat center center;
   background-size: 100% 100%;
 
   &:global(.sangzangHome_show) {
     opacity: 1;
     pointer-events: auto;
   }
+
   :global {
     .back {
       width: 80px;
@@ -23,88 +24,113 @@
       left: 4%;
       cursor: pointer;
 
-      & > img {
+      &>img {
         height: 100%;
         object-fit: fill;
       }
     }
+
     .homeLeft {
       position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-84%, -51%);
-      width: 445px;
+      top: 14%;
+      left: 8%;
+      width: 385px;
       height: 68%;
       display: flex;
-      flex-direction: column;
-      gap: 10px;
-      .htitle {
-        width: 100%;
-        height: 100px;
-        font-size: 16px;
-        line-height: 24px;
-        color: rgba(69, 68, 55, 1);
-      }
-      .hcontent {
+      align-items: center;
+
+      .homeLeftBox {
         width: 100%;
-        height: calc(100% - 85px);
+        max-height: 100%;
         display: flex;
         flex-direction: column;
         gap: 10px;
+        text-align: justify;
         overflow: auto;
-        &::-webkit-scrollbar {
-          width: 0px;
-          height: 0px;
+
+        .htitle {
+          width: 100%;
+          font-size: 16px;
+          line-height: 26px;
+          color: rgba(69, 68, 55, 1);
         }
-        .hitem {
+
+        .hcontent {
           width: 100%;
-          height: fit-content;
-          font-size: 15px;
-          line-height: 18px;
-          letter-spacing: 2px;
-          font-weight: 400;
-          color: rgba(124, 75, 54, 1);
-          opacity: 0.7;
-          .htxt {
-            width: 100%;
-            height: fit-content;
+          display: flex;
+          flex-direction: column;
+          gap: 10px;
+          overflow: auto;
+
+          &::-webkit-scrollbar {
+            width: 0px;
+            height: 0px;
           }
-          .hfrom {
+
+          .hitem {
             width: 100%;
-            text-align: right;
             height: fit-content;
+            font-size: 13px;
+            line-height: 18px;
+            letter-spacing: 1px;
+            font-weight: 400;
+            color: rgba(124, 75, 54, 1);
+            opacity: 0.7;
+           
+            // margin-bottom: 10px;
+
+            .htxt {
+              width: 100%;
+              height: fit-content;
+            }
+
+            .hfrom {
+              width: 100%;
+              text-align: right;
+              height: fit-content;
+            //    position: relative;
+            // top: -4px;
+              // margin-bottom: 5px;
+            }
+            .lastTxt{
+              text-align: right;
+            }
           }
         }
       }
+
+
     }
 
     .btnContainner {
-      width: 450px;
+      width: 430px;
       height: 50px;
       position: absolute;
       bottom: 5%;
-      left: 50%;
+      left: 48%;
       transform: translate(-84%, 2%);
       display: flex;
-      align-items: center;
+      // align-items: center;
       justify-content: center;
       gap: 20px;
       cursor: pointer;
+
       .btn {
-        width: 220px;
+        width: 210px;
         height: 50px;
-        font-size: 16px;
+        font-size: 17px;
         line-height: 48px;
         text-align: center;
         color: rgba(255, 233, 182, 1);
         background: url(../../../assets/img/A6_sangzang_btn1.png) no-repeat center center;
-        background-size: 100% 100%;
+        background-size: cover;
       }
+
       .btn2 {
         color: rgba(124, 75, 54, 1);
         background: url(../../../assets/img/A6_sangzang_btn2.png) no-repeat center center;
-        background-size: 100% 100%;
+        background-size: cover;
       }
     }
   }
-}
+}

+ 44 - 15
src/pages/A6ybwx/Sangzang/index.tsx

@@ -1,5 +1,5 @@
-import React, { useState } from "react";
-import styles from "./index.module.scss";
+import React, { useState } from 'react'
+import styles from './index.module.scss'
 import Sangzangys from './components/Sangzangys/index'
 import Policy from './components/Policy/index'
 function SangzangHome({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
@@ -9,28 +9,57 @@ function SangzangHome({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
       <div className='back' onClick={() => setGotoTab(0)}>
         <img src={require('@/assets/img/btn_back.png')} alt='' />
       </div>
-      <div className="homeLeft">
-        <div className="htitle">程哲碑一直以其造像碑与墓碑的“两面性”而备受关注,丧葬因素与佛教因素的结合在程哲碑上得到了微妙而深刻的体现。这种融汇礼教伦理、宗教信仰与时代风尚的丧葬艺术,彰显了北朝社会结构的多元特征。</div>
-        <div className="hcontent">
-          <div className="hitem">
-            <div className="htxt">长治天平元年造像碑(即程哲碑),是造像碑与墓碑结合在一起的情况。</div>
-            <div className="hfrom">——王静芬 <br />《中国石碑:一种象征形式在佛教传入之前和之后的运用》</div>
+      <div className='homeLeft'>
+        <div className='homeLeftBox'>
+          <div className='htitle'>
+            程哲碑一直以其造像碑与墓碑的“两面性”而备受关注,丧葬因素与佛教因素的结合在程哲碑上得到了微妙而深刻的体现。这种融汇礼教伦理、宗教信仰与时代风尚的丧葬艺术,彰显了北朝社会结构的多元特征。
+          </div>
+          <div className='hcontent'>
+            <div className='hitem'>
+              <div className='htxt'>
+                长治天平元年造像碑(即程哲碑),是造像碑与墓碑结合在一起的情况。
+              </div>
+              <div className='hfrom'>——李静杰《佛教造像碑》</div>
+              {/* <div className='lastTxt'></div> */}
+            </div>
+
+            <div className='hitem'>
+              <div className='htxt'>程哲碑是装饰了佛教雕像的墓碑。</div>
+              <div className='hfrom'>——王静芬</div>
+              <div className='lastTxt'>《中国石碑:一种象征形式在佛教传入之前和之后的运用》</div>
+            </div>
+
+            <div className='hitem'>
+              <div className='htxt'>程哲碑应该立于家族墓地。</div>
+              <div className='hfrom'>——胡春涛《山西五至八世纪造像碑的图像志研究》</div>
+              {/* <div className='lastTxt'></div> */}
+            </div>
+
+             <div className='hitem'>
+              <div className='htxt'>程哲碑应是包含了佛教造像的墓碑。</div>
+              <div className='hfrom'>——周桂香、郭志成《试论程哲碑及其历史艺术价值》</div>
+              {/* <div className='lastTxt'></div> */}
+            </div>
           </div>
-        </div>
 
+     
+        </div>
       </div>
-      <div className="btnContainner">
-        <div className="btn btn1" onClick={() => setShowTab(2)}>碑禁政策与程哲碑</div>
-        <div className="btn btn2" onClick={() => setShowTab(1)}>程哲碑丧葬因素</div>
+      <div className='btnContainner'>
+        <div className='btn btn1 songFont' onClick={() => setShowTab(2)}>
+          碑禁政策与程哲碑
+        </div>
+        <div className='btn btn2 songFont' onClick={() => setShowTab(1)}>
+          程哲碑丧葬因素
+        </div>
       </div>
 
       {showTab === 2 && <Policy setShowTab={setShowTab} />}
       {showTab === 1 && <Sangzangys setShowTab={setShowTab} />}
-
     </div>
   )
 }
 
-const MemoSangzangHome = React.memo(SangzangHome);
+const MemoSangzangHome = React.memo(SangzangHome)
 
-export default MemoSangzangHome;
+export default MemoSangzangHome

+ 2 - 2
src/pages/A6ybwx/index.tsx

@@ -22,7 +22,7 @@ function A6ybwx() {
   const [lodingScene, setLodingScene] = useState(true)
 
   useEffect(() => {
-    const unityKey = getUnityKey()
+    const unityKey = getUnityKey('sceneStaRes')
     if (unityKey === 'RoomScene') {
       setLodingScene(false)
     }
@@ -137,7 +137,7 @@ function A6ybwx() {
       {gotoTab === 3 && <SangzangHome setGotoTab={setGotoTab} />}
 
       {/* 进度条 */}
-      <Zloding isShow={isEnter && lodingScene} bacNum={2} />
+      <Zloding isShow={isEnter && lodingScene} bacNum={2}/>
     </div>
   )
 }

+ 18 - 4
src/pages/A8byzh/index.tsx

@@ -1,9 +1,9 @@
-import React, { useEffect } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { cutUnityFu } from '../A0base/data'
 function A8byzh() {
   useEffect(() => {
-    cutUnityFu('DrawingBoard',()=>{})
+    cutUnityFu('DrawingBoard', () => {})
   }, [])
 
   const fromPath =
@@ -13,10 +13,24 @@ function A8byzh() {
     window.location.replace(fromPath ? `#/${fromPath}` : '#/base')
   }
 
-  useEffect(() => {})
+  const [show, setShow] = useState(false)
+
+  const flagRef = useRef(true)
+
+  useEffect(() => {
+    // 加载完成之后才显示返回按钮
+    window.unityLoading = (progress: number) => {
+      const num = Math.round(Number(progress * 100))
+
+      if (num >= 100 && flagRef.current) {
+        setShow(true)
+        flagRef.current = false
+      }
+    }
+  })
   return (
     <div className={styles.A8byzh}>
-      <div className='back' onClick={backToBase}>
+      <div className='back' onClick={backToBase} hidden={!show}>
         <img src={require('@/assets/img/btn_back.png')} alt='' />
       </div>
     </div>