Ver Fonte

修改 UI 模型

DGJ há 1 ano atrás
pai
commit
f28fa010bd

+ 34 - 0
miniprogram/assets/animation/jingyu.json

@@ -0,0 +1,34 @@
+{
+  "keyframe": {
+    "parent": {
+      "0": {
+        "rotation": [0, 0, 0]
+      },
+      "100": {
+        "rotation": [0, 6.28, 0]
+      }
+    },
+    "child": {
+      "0": {
+        "position":  [2, 0, -10]
+      },
+      "100": {
+        "position":  [2, 0, 10]
+      }
+    }
+  },
+  "animation": {
+    "parent": {
+      "keyframe": "parent",
+      "duration": 8,
+      "ease": "linear",
+      "loop": -1
+    },
+    "child": {
+      "keyframe": "child",
+      "duration": 20,
+      "ease": "linear",
+      "loop": -1
+    }
+  }
+}

BIN
miniprogram/assets/image/saomiao.png


+ 1 - 1
miniprogram/components/xr-classic-saomiao/index.wxml

@@ -5,7 +5,7 @@
   </xr-assets>
 
     <xr-node node-id="MarkerNode">
-      <xr-ar-tracker node-id="Marker" mode="Marker" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/1.jpg" bind:ar-tracker-switch="handleTrackerSwitch"
+      <xr-ar-tracker node-id="Marker" mode="Marker" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rizhaoSaomiao.jpg" bind:ar-tracker-switch="handleTrackerSwitch"
       bind:ar-tracker-state="handleARTrackerState">
       </xr-ar-tracker>
 

+ 82 - 0
miniprogram/components/xr-classic-show/index.js

@@ -1,3 +1,4 @@
+
 Component({
   behaviors: [require('../common/share-behavior').default],
   properties: {
@@ -111,6 +112,87 @@ Component({
       
       this.triggerEvent('sceneReady', {width: scene.width, height: scene.height});
 
+
+
+      const fireworkField = xrScene.getElementById("firework");
+      const tempSystem = fireworkField.getComponent('custom-particle')
+      tempSystem.addSizeGradient(0,0.2);
+      tempSystem.addSizeGradient(3,1);
+      var myData ={}
+      myData = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,0.3,0.1,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter = tempSystem.createSubEmitter(myData)
+      subEmitter.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem.subEmitters = [subEmitter]
+
+
+      const fireworkField2 = xrScene.getElementById("firework2");
+      const tempSystem2 = fireworkField2.getComponent('custom-particle')
+      tempSystem2.addSizeGradient(0,0.2);
+      tempSystem2.addSizeGradient(3,1);
+      var myData2 ={}
+      myData2 = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0.1, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,0.5,0.8,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter2 = tempSystem2.createSubEmitter(myData2)
+      subEmitter2.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem2.subEmitters = [subEmitter2]
+
+      const fireworkField3 = xrScene.getElementById("firework3");
+      const tempSystem3 = fireworkField3.getComponent('custom-particle')
+      tempSystem3.addSizeGradient(0,0.2);
+      tempSystem3.addSizeGradient(3,1);
+      var myData3 ={}
+      myData3 = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0.1, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,1,0.5,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter3 = tempSystem3.createSubEmitter(myData3)
+      subEmitter3.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem3.subEmitters = [subEmitter3]
+
     },
     handleAssetsProgress: function({detail}) {
       this.triggerEvent('assetsProgress', detail.value);

+ 48 - 3
miniprogram/components/xr-classic-show/index.wxml

@@ -1,7 +1,7 @@
 <xr-scene ar-system="modes:threeDof ; planeMode: 1;" bind:ready="handleReady" bind:ar-ready="handleARReady">
   
   <xr-assets bind:progress="handleAssetsProgress" bind:loaded="handleAssetsLoaded">
-    <xr-asset-load type="gltf" asset-id="gltf-kun" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/5.glb" />
+    <xr-asset-load type="gltf" asset-id="gltf-kun" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/kun2.glb" />
 
     <xr-asset-load type="gltf" asset-id="gltf-long" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/2low_poly_dragon_white_dh10.glb" />
 
@@ -14,15 +14,33 @@
     <xr-asset-load type="gltf" asset-id="gltf-paopao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/PaoPao1.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-bubble" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/bubble.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-birdslow" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/phoenix_bird_slow4.glb" />
-    <xr-asset-load type="gltf" asset-id="gltf-qipao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/%E6%B0%94%E6%B3%A1.glb" />
+    <xr-asset-load type="gltf" asset-id="gltf-qipao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/bubble4.glb" />
+
+
+
+    <xr-asset-load asset-id="anim" type="keyframe" src="/assets/animation/miku-kawaii-animation.json"/>    
+    <xr-asset-load type="gltf" asset-id="miku-kawaii" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/phoenix_bird.glb" />
+  
+    <xr-asset-load asset-id="animyu" type="keyframe" src="/assets/animation/jingyu.json"/>    
+    <xr-asset-load type="gltf" asset-id="miku-yu" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/2ryukin_goldfish.glb" />
+
+    <xr-asset-load type="texture" asset-id="particle-texture" src="https://mmbizwxaminiprogram-1258344707.cos.ap-guangzhou.myqcloud.com/xr-frame/demo/particles/point.png" />
+    <xr-asset-load type="texture" asset-id="flarePicture" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/flare.png" />
+
+
   </xr-assets>
   <xr-env node-id="World" env-data="env1"/>
     <xr-node>
     
-      <xr-gltf id="kun" node-id="kun" scale="30 30 30" position="-0.3 -0.5 -5" rotation="0 0 0"   model="gltf-kun" anim-autoplay  />
+      <xr-gltf id="kun" node-id="kun" scale="1 1 1" position="-0.3 -5 -15" rotation="0 90 0"   model="gltf-kun" anim-autoplay  />
 
       <xr-gltf id="long" node-id="long" scale="40 40 40" position="-2.3 -0.5 -4" rotation="0 0 0"   model="gltf-long" anim-autoplay  />
   
+  
+    <xr-gltf 
+    wx:if="true"
+    id="qipao" node-id="qipao" scale="  1 1 1" position="-0.5 0 -2" rotation="0 -100 0"   model="gltf-qipao" anim-autoplay  />
+
       <xr-gltf 
     wx:if="true"
     id="denglong" node-id="denglong" scale="1 1 1" position="-0.5 0 -3" rotation="0 -100 0"   model="gltf-denglong" anim-autoplay  />
@@ -41,6 +59,7 @@
 
 
     </xr-node>
+
     <xr-node position="4.3 0 -15" anim-keyframe="anim" anim-autoplay="clip:parent">
       <xr-node position="0 0 -5" rotation="0 0 0" anim-keyframe="anim" anim-autoplay="clip:child">
         <xr-gltf position="0 0 0"  scale="0.01 0.01 0.01" rotation="0 180 0" model="gltf-birdslow" anim-keyframe="anim" anim-autoplay></xr-gltf>
@@ -75,7 +94,33 @@
    -->
     </xr-node>
 
+    
+  
+    <xr-node node-id="target" position="0 1 0" />
+    <xr-gltf position="1.8 -0.5 1.5" scale="0.12 0.12 0.12" rotation="0 0 0" model="miku" anim-autoplay></xr-gltf>
+      <xr-node position="0 0 -2" rotation="0 160 0" anim-keyframe="animyu" anim-autoplay="clip:child">
+        <xr-gltf  scale="0.1 0.1 0.1" rotation="0 -90 0" model="miku-yu" anim-keyframe="animyu" anim-autoplay></xr-gltf>
+    </xr-node>
+
+    <xr-node>
+      <xr-custom-particle id="firework" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
 
+    <xr-custom-particle id="firework2" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
+
+    <xr-custom-particle id="firework3" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
+
+  </xr-node>
+
+  
     <xr-camera
       id="camera" node-id="camera" position="1 1 1" clear-color="0.925 0.925 0.925 1"
       background="ar" is-ar-camera

+ 82 - 0
miniprogram/components/xr-classic-showsix/index.js

@@ -1,3 +1,4 @@
+
 Component({
   behaviors: [require('../common/share-behavior').default],
   properties: {
@@ -111,6 +112,87 @@ Component({
       
       this.triggerEvent('sceneReady', {width: scene.width, height: scene.height});
 
+
+
+      const fireworkField = xrScene.getElementById("firework");
+      const tempSystem = fireworkField.getComponent('custom-particle')
+      tempSystem.addSizeGradient(0,0.2);
+      tempSystem.addSizeGradient(3,1);
+      var myData ={}
+      myData = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,0.3,0.1,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter = tempSystem.createSubEmitter(myData)
+      subEmitter.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem.subEmitters = [subEmitter]
+
+
+      const fireworkField2 = xrScene.getElementById("firework2");
+      const tempSystem2 = fireworkField2.getComponent('custom-particle')
+      tempSystem2.addSizeGradient(0,0.2);
+      tempSystem2.addSizeGradient(3,1);
+      var myData2 ={}
+      myData2 = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0.1, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,0.5,0.8,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter2 = tempSystem2.createSubEmitter(myData2)
+      subEmitter2.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem2.subEmitters = [subEmitter2]
+
+      const fireworkField3 = xrScene.getElementById("firework3");
+      const tempSystem3 = fireworkField3.getComponent('custom-particle')
+      tempSystem3.addSizeGradient(0,0.2);
+      tempSystem3.addSizeGradient(3,1);
+      var myData3 ={}
+      myData3 = {
+        "capacity": 100,
+        "emitRate": 0,  //子发射器不进行每秒发射
+        "burstCount": 100, // 一次爆发200粒子
+        "burstTime": 0.1, // 爆发延时为0
+        "burstCycle": 1, // 发射一次
+        "size":[0.05],
+        "startColor":[1,1,0.5,1],
+        "endColor":[1,1,1,0],
+        "emitterType":"SphereShape",
+        "emitterProps": [["radius","0.5"]],
+        "lifeTime":[1], // 粒子生命周期为3秒
+        "stopDuration":[2], // 子发射器生命周期为3秒
+        "speed":"2",
+        "texture":"flarePicture"
+      }
+      var subEmitter3 = tempSystem3.createSubEmitter(myData3)
+      subEmitter3.state = 1 // 设置为1为当粒子消失后出现作用子发射器
+      //可以规定多个子发射器的阵列
+      tempSystem3.subEmitters = [subEmitter3]
+
     },
     handleAssetsProgress: function({detail}) {
       this.triggerEvent('assetsProgress', detail.value);

+ 50 - 3
miniprogram/components/xr-classic-showsix/index.wxml

@@ -1,7 +1,7 @@
 <xr-scene ar-system="modes:Plane ; planeMode: 1;" bind:ready="handleReady" bind:ar-ready="handleARReady">
   
   <xr-assets bind:progress="handleAssetsProgress" bind:loaded="handleAssetsLoaded">
-    <xr-asset-load type="gltf" asset-id="gltf-kun" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/5.glb" />
+    <xr-asset-load type="gltf" asset-id="gltf-kun" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/kun2.glb" />
 
     <xr-asset-load type="gltf" asset-id="gltf-long" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/2low_poly_dragon_white_dh10.glb" />
 
@@ -14,15 +14,33 @@
     <xr-asset-load type="gltf" asset-id="gltf-paopao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/PaoPao1.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-bubble" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/bubble.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-birdslow" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/phoenix_bird_slow4.glb" />
-    <xr-asset-load type="gltf" asset-id="gltf-qipao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/%E6%B0%94%E6%B3%A1.glb" />
+    <xr-asset-load type="gltf" asset-id="gltf-qipao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/bubble4.glb" />
+
+
+
+    <xr-asset-load asset-id="anim" type="keyframe" src="/assets/animation/miku-kawaii-animation.json"/>    
+    <xr-asset-load type="gltf" asset-id="miku-kawaii" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/phoenix_bird.glb" />
+  
+    <xr-asset-load asset-id="animyu" type="keyframe" src="/assets/animation/jingyu.json"/>    
+    <xr-asset-load type="gltf" asset-id="miku-yu" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/2ryukin_goldfish.glb" />
+
+    <xr-asset-load type="texture" asset-id="particle-texture" src="https://mmbizwxaminiprogram-1258344707.cos.ap-guangzhou.myqcloud.com/xr-frame/demo/particles/point.png" />
+    <xr-asset-load type="texture" asset-id="flarePicture" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXModel/flare.png" />
+
+
   </xr-assets>
   <xr-env node-id="World" env-data="env1"/>
     <xr-node>
     
-      <xr-gltf id="kun" node-id="kun" scale="30 30 30" position="-0.3 -0.5 -5" rotation="0 0 0"   model="gltf-kun" anim-autoplay  />
+      <xr-gltf id="kun" node-id="kun" scale="1 1 1" position="-0.3 -5 -15" rotation="0 90 0"   model="gltf-kun" anim-autoplay  />
 
       <xr-gltf id="long" node-id="long" scale="40 40 40" position="-2.3 -0.5 -4" rotation="0 0 0"   model="gltf-long" anim-autoplay  />
   
+  
+    <xr-gltf 
+    wx:if="true"
+    id="qipao" node-id="qipao" scale="  1 1 1" position="-0.5 0 -2" rotation="0 -100 0"   model="gltf-qipao" anim-autoplay  />
+
       <xr-gltf 
     wx:if="true"
     id="denglong" node-id="denglong" scale="1 1 1" position="-0.5 0 -3" rotation="0 -100 0"   model="gltf-denglong" anim-autoplay  />
@@ -41,6 +59,7 @@
 
 
     </xr-node>
+
     <xr-node position="4.3 0 -15" anim-keyframe="anim" anim-autoplay="clip:parent">
       <xr-node position="0 0 -5" rotation="0 0 0" anim-keyframe="anim" anim-autoplay="clip:child">
         <xr-gltf position="0 0 0"  scale="0.01 0.01 0.01" rotation="0 180 0" model="gltf-birdslow" anim-keyframe="anim" anim-autoplay></xr-gltf>
@@ -75,7 +94,33 @@
    -->
     </xr-node>
 
+    
+  
+    <xr-node node-id="target" position="0 1 0" />
+    <xr-gltf position="1.8 -0.5 1.5" scale="0.12 0.12 0.12" rotation="0 0 0" model="miku" anim-autoplay></xr-gltf>
+      <xr-node position="0 0 -2" rotation="0 160 0" anim-keyframe="animyu" anim-autoplay="clip:child">
+        <xr-gltf  scale="0.1 0.1 0.1" rotation="0 -90 0" model="miku-yu" anim-keyframe="animyu" anim-autoplay></xr-gltf>
+    </xr-node>
+
+    <xr-node>
+      <xr-custom-particle id="firework" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
+
+    <xr-custom-particle id="firework2" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
 
+    <xr-custom-particle id="firework3" emitter-type="SphereShape" emitter-props="radius:1,arc:0.5" position="0 3 -20" start-color="1 0 0 1" end-color="1 1 0 1"  burstCount="1" capacity="2" speed="3.4 3.8" size="0" emit-rate="2" life-time="1" angle="0"  
+        rotation="0 0 90"
+        texture="particle-texture">
+    </xr-custom-particle>
+
+  </xr-node>
+
+  
     <xr-camera
       id="camera" node-id="camera" position="1 1 1" clear-color="0.925 0.925 0.925 1"
       background="ar" is-ar-camera
@@ -88,6 +133,8 @@
   </xr-node>
 
 
+
+
 </xr-scene>
 
 

+ 2 - 2
miniprogram/pages/ar-classic/scene-classic-saomiao/index.wxml

@@ -20,13 +20,13 @@
   <view  wx:if="{{!loadedSaoMiao}}" style="position: absolute; display: flex; justify-content: center; align-items: center; left: 146rpx; top: 261rpx; width: 100%; height: 441rpx; background-color: rgba(0, 0, 0,0); text-align: center; line-height: 24px; box-sizing: content-box">
 
     
-  <image class="saomiao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/saomiao.png'    style="position: relative; left: -143rpx; top: 92rpx; width: 753rpx; height: 818rpx; display: flex; box-sizing: border-box"></image>
+  <image class="saomiao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rizhaoSaomiao2.png'    style="position: relative; left: -143rpx; top: 92rpx; width: 753rpx; height: 818rpx; display: flex; box-sizing: border-box"></image>
   </view>
 
   <view  wx:if="{{!loadedSaoMiao}}" style="position: absolute; display: flex; justify-content: center; align-items: center; left: 146rpx; top: 261rpx; width: 100%; height: 441rpx; background-color: rgba(0, 0, 0,0); text-align: center; line-height: 24px; box-sizing: content-box">
 
     
-<image class="shibietu" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/shibietu.png'    style="position: relative; left: -150rpx; top: 856rpx; width: 750rpx; height: 268rpx; display: flex; box-sizing: border-box"></image>
+<!--<image class="shibietu" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/shibietu.png'    style="position: relative; left: -150rpx; top: 856rpx; width: 750rpx; height: 268rpx; display: flex; box-sizing: border-box"></image>-->
 </view>
   <view  style="position: absolute; display: flex; justify-content: center; align-items: center; left: 146rpx; top: 261rpx; width: 100%; height: 441rpx; background-color: rgba(0, 0, 0,0); text-align: center; line-height: 24px; box-sizing: content-box">
 

+ 17 - 2
miniprogram/pages/ar-classic/scene-classic-show/index.js

@@ -1,4 +1,18 @@
 var sceneReadyBehavior = require('../../behavior-scene/scene-ready');
+// 自定义组件
+import '../../../xr-custom/components/AutoRotate';
+import '../../../xr-custom/components/Particle/SystemProperty/BasicParticle';
+import '../../../xr-custom/components/Particle/index';
+import '../../../xr-custom/elements/xr-auto-rotate-touchable-gltf';
+import '../../../xr-custom/elements/xr-custom-particle';
+// 自定义Geometry
+import '../../../xr-custom/assets/geometry-star';
+import '../../../xr-custom/assets/geometry-specialCylinder';
+// 自定义材质
+import '../../../xr-custom/elements/xr-shining-star';
+// 自定义effect
+import '../../../xr-custom/assets/effect-shining';
+import '../../../xr-custom/assets/effect-last-record-final';
 //var capate = require("G:/GUnityProject/WXXR/miniprogram/components/xr-classic-show/index.js");
 Page({
   behaviors:[sceneReadyBehavior],
@@ -31,7 +45,7 @@ Page({
     products:[],
     modelImg:[
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E9%B8%BE%E9%B8%9F%E9%A2%84%E8%A7%88%E5%9B%BE.png',
-      'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E5%BA%94%E9%BE%99%E9%A2%84%E8%A7%88%E5%9B%BE.png',
+      'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E8%A7%A3%E9%94%81%E7%A5%9E%E5%85%BD-%E5%BA%94%E9%BE%99%E9%A2%84%E8%A7%88%E5%9B%BE2.png',
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E5%A4%AB%E8%AF%B8%E9%A2%84%E8%A7%88%E5%9B%BE.png',
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E7%8B%BB%E7%8C%8A%E9%A2%84%E8%A7%88%E5%9B%BE.png',
     ],
@@ -69,6 +83,7 @@ Page({
                 
                 for(var i =0;i<products2.length;i++){
                   products2[i]["modelImg"] = modelImgs[i];
+                  products2[i].price = products2[i].price/100;
                   if(products2[i].activate){
                     that.setData({uiShowIndex:i});
                   }
@@ -195,7 +210,7 @@ Page({
     this.setData({isStartluxiang:false});
     this.setData({recordState: 0});
     wx.showToast({
-      title: '视频录制完成',
+      title: '视频已保存至相册',
     });
   },
   changeCaptureState(e) {

+ 12 - 13
miniprogram/pages/ar-classic/scene-classic-show/index.wxml

@@ -24,13 +24,6 @@
         uiShowIndex ="{{uiShowIndex}}"
      
     />
-
-
-
- 
-
-
-
 <!--<videw wx:if="{{!loaded}}"-->
   <view  wx:if="{{!loaded}}" style="position: absolute;display: flex; justify-content: center; align-items: center; left: 0;top: 0;width: 100%;height:100%;background-color: rgba(0, 0, 0,1); text-align: center;line-height: 24px;">
     <text style="color: white;font-size: 18px;">{{progressInfo}}</text>
@@ -51,15 +44,18 @@
   
  
   <button class="tapbtn2" plain="true" bindtap="clickZhaoHuan"  style="position: fixed; right: 30rpx; top: 450rpx; width:180rpx; height: 160rpx" >
-  <image class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!zhaohuanstate}}" class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{zhaohuanstate}}" class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 <button class="tapbtn3" plain="true" bindtap="clickPaiZhao"  style="position: fixed; right: 30rpx; top: 650rpx; width:180rpx; height: 160rpx">
-  <image class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!paizhaostate}}" class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{paizhaostate}}" class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 <button class="tapbtn4" plain="true" bindtap="clickLuXiang"  style="position: fixed; right: 30rpx; top: 850rpx; width:180rpx; height: 160rpx">
-  <image class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!luxiangstate}}" class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image  wx:if="{{luxiangstate}}" class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luzhiBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 
@@ -69,7 +65,7 @@
 
   <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanText.png'    style="position: fixed; left: 100rpx; top: 1070rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box">
   </image>
-  
+  ssssssssss
 
   <button class="tapbtn5" plain="false" bindtap="ClickzhaohuanSS"  style="position: fixed; left:230rpx; top: 1190rpx; ">
     <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn.png'    style="position: fixed; left:230rpx; top: 1190rpx; width: 300rpx; height: 100rpx; display: flex; box-sizing: border-box"></image>
@@ -138,7 +134,7 @@
  <swiper-item wx:for="{{products}}"  >
         <image class="bg_main" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/ui-bg.png' style="position: absolute; top: 1030rpx; left: 80rpx; ">      
           <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:50rpx; font-size:38rpx; font-weight: bold;">{{item.name}}</view>
-           <view style="color: rgb(5, 19, 148); position: absolute; right: 150rpx; top:50rpx; font-size:38rpx; font-weight: bold;">¥{{item.price}}</view>
+           <view style="color: rgb(106, 172, 186); position: absolute; right: 150rpx; top:50rpx; font-size:38rpx; font-weight: bold;">¥{{item.price}}</view>
            <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:125rpx; font-size:25rpx; font-weight: bold; width:395rpx;  ">{{item.attach}}</view>
            <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:170rpx; font-size:25rpx; width:395rpx;  ">{{item.desc}}</view>
 
@@ -156,8 +152,11 @@
          
         </image>
 
-        <image class="modelImg" src="{{item.modelImg}}" style="position: absolute; top:300rpx; left: 80rpx; width: 600rpx; height: 600rpx; ">
+        <image wx:if="{{!item.activate}}" class="modelImg" src="{{item.modelImg}}" style="position: absolute; top:300rpx; left: 80rpx; width: 600rpx; height: 600rpx; ">
         </image>
+
+        <image wx:if="{{item.activate}}" class="modelImg" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E8%AF%B7%E7%8E%AF%E9%A1%BE%E5%9B%9B%E5%91%A8%E5%AF%BB%E6%89%BE%E7%A5%9E%E5%85%BD.png' style="position: absolute; top:940rpx; left: 150rpx; width: 400rpx; height: 80rpx; "/>
+
   </swiper-item>
   
 </swiper>

+ 17 - 2
miniprogram/pages/ar-classic/scene-classic-showsix/index.js

@@ -1,4 +1,18 @@
 var sceneReadyBehavior = require('../../behavior-scene/scene-ready');
+// 自定义组件
+import '../../../xr-custom/components/AutoRotate';
+import '../../../xr-custom/components/Particle/SystemProperty/BasicParticle';
+import '../../../xr-custom/components/Particle/index';
+import '../../../xr-custom/elements/xr-auto-rotate-touchable-gltf';
+import '../../../xr-custom/elements/xr-custom-particle';
+// 自定义Geometry
+import '../../../xr-custom/assets/geometry-star';
+import '../../../xr-custom/assets/geometry-specialCylinder';
+// 自定义材质
+import '../../../xr-custom/elements/xr-shining-star';
+// 自定义effect
+import '../../../xr-custom/assets/effect-shining';
+import '../../../xr-custom/assets/effect-last-record-final';
 //var capate = require("G:/GUnityProject/WXXR/miniprogram/components/xr-classic-show/index.js");
 Page({
   behaviors:[sceneReadyBehavior],
@@ -31,7 +45,7 @@ Page({
     products:[],
     modelImg:[
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E9%B8%BE%E9%B8%9F%E9%A2%84%E8%A7%88%E5%9B%BE.png',
-      'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E5%BA%94%E9%BE%99%E9%A2%84%E8%A7%88%E5%9B%BE.png',
+      'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E8%A7%A3%E9%94%81%E7%A5%9E%E5%85%BD-%E5%BA%94%E9%BE%99%E9%A2%84%E8%A7%88%E5%9B%BE2.png',
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E5%A4%AB%E8%AF%B8%E9%A2%84%E8%A7%88%E5%9B%BE.png',
       'https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E9%80%89%E6%8B%A9%E7%A5%9E%E5%85%BD-%E7%8B%BB%E7%8C%8A%E9%A2%84%E8%A7%88%E5%9B%BE.png',
     ],
@@ -69,6 +83,7 @@ Page({
                 
                 for(var i =0;i<products2.length;i++){
                   products2[i]["modelImg"] = modelImgs[i];
+                  products2[i].price = products2[i].price/100;
                   if(products2[i].activate){
                     that.setData({uiShowIndex:i});
                   }
@@ -195,7 +210,7 @@ Page({
     this.setData({isStartluxiang:false});
     this.setData({recordState: 0});
     wx.showToast({
-      title: '视频录制完成',
+      title: '视频已保存至相册',
     });
   },
   changeCaptureState(e) {

+ 12 - 13
miniprogram/pages/ar-classic/scene-classic-showsix/index.wxml

@@ -24,13 +24,6 @@
         uiShowIndex ="{{uiShowIndex}}"
      
     />
-
-
-
- 
-
-
-
 <!--<videw wx:if="{{!loaded}}"-->
   <view  wx:if="{{!loaded}}" style="position: absolute;display: flex; justify-content: center; align-items: center; left: 0;top: 0;width: 100%;height:100%;background-color: rgba(0, 0, 0,1); text-align: center;line-height: 24px;">
     <text style="color: white;font-size: 18px;">{{progressInfo}}</text>
@@ -51,15 +44,18 @@
   
  
   <button class="tapbtn2" plain="true" bindtap="clickZhaoHuan"  style="position: fixed; right: 30rpx; top: 450rpx; width:180rpx; height: 160rpx" >
-  <image class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!zhaohuanstate}}" class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{zhaohuanstate}}" class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 <button class="tapbtn3" plain="true" bindtap="clickPaiZhao"  style="position: fixed; right: 30rpx; top: 650rpx; width:180rpx; height: 160rpx">
-  <image class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!paizhaostate}}" class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{paizhaostate}}" class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 <button class="tapbtn4" plain="true" bindtap="clickLuXiang"  style="position: fixed; right: 30rpx; top: 850rpx; width:180rpx; height: 160rpx">
-  <image class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image wx:if="{{!luxiangstate}}" class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+  <image  wx:if="{{luxiangstate}}" class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luzhiBtn2.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
 </button>
 
 
@@ -69,7 +65,7 @@
 
   <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanText.png'    style="position: fixed; left: 100rpx; top: 1070rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box">
   </image>
-  
+  ssssssssss
 
   <button class="tapbtn5" plain="false" bindtap="ClickzhaohuanSS"  style="position: fixed; left:230rpx; top: 1190rpx; ">
     <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn.png'    style="position: fixed; left:230rpx; top: 1190rpx; width: 300rpx; height: 100rpx; display: flex; box-sizing: border-box"></image>
@@ -138,7 +134,7 @@
  <swiper-item wx:for="{{products}}"  >
         <image class="bg_main" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/ui-bg.png' style="position: absolute; top: 1030rpx; left: 80rpx; ">      
           <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:50rpx; font-size:38rpx; font-weight: bold;">{{item.name}}</view>
-           <view style="color: rgb(5, 19, 148); position: absolute; right: 150rpx; top:50rpx; font-size:38rpx; font-weight: bold;">¥{{item.price}}</view>
+           <view style="color: rgb(106, 172, 186); position: absolute; right: 150rpx; top:50rpx; font-size:38rpx; font-weight: bold;">¥{{item.price}}</view>
            <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:125rpx; font-size:25rpx; font-weight: bold; width:395rpx;  ">{{item.attach}}</view>
            <view style="color: rgb(26, 26, 26); position: absolute; left: 70rpx; top:170rpx; font-size:25rpx; width:395rpx;  ">{{item.desc}}</view>
 
@@ -156,8 +152,11 @@
          
         </image>
 
-        <image class="modelImg" src="{{item.modelImg}}" style="position: absolute; top:300rpx; left: 80rpx; width: 600rpx; height: 600rpx; ">
+        <image wx:if="{{!item.activate}}" class="modelImg" src="{{item.modelImg}}" style="position: absolute; top:300rpx; left: 80rpx; width: 600rpx; height: 600rpx; ">
         </image>
+
+        <image wx:if="{{item.activate}}" class="modelImg" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/%E8%AF%B7%E7%8E%AF%E9%A1%BE%E5%9B%9B%E5%91%A8%E5%AF%BB%E6%89%BE%E7%A5%9E%E5%85%BD.png' style="position: absolute; top:940rpx; left: 150rpx; width: 400rpx; height: 80rpx; "/>
+
   </swiper-item>
   
 </swiper>

+ 1 - 1
miniprogram/pages/ar-classic/scene-classic-tujian/index.wxml

@@ -1,7 +1,7 @@
 <view class="tujian-container">
   <scroll-view scroll-y="{{true}}" style="width:100%;height:{{sysheight}}px;">
      <view class="img-size">
-         <image src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/SStujian.png" mode="widthFix" class="liucheng-img" style="width: 95%;"></image>
+         <image src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/SStujian2.png" mode="widthFix" class="liucheng-img" style="width: 95%;"></image>
      </view>
 </scroll-view>
 </view>

BIN
miniprogram/pages/ar/plane-ar-v2-marker/move.gif