123

assets/resources/effect/particle/weiqi/tuowei.plist

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>angle</key>
-    <integer>0</integer>
-    <key>angleVariance</key>
-    <integer>360</integer>
-    <key>blendFuncDestination</key>
-    <integer>771</integer>
-    <key>blendFuncSource</key>
-    <integer>770</integer>
-    <key>duration</key>
-    <integer>-1</integer>
-    <key>emitterType</key>
-    <integer>0</integer>
-    <key>finishColorAlpha</key>
-    <integer>1</integer>
-    <key>finishColorBlue</key>
-    <integer>1</integer>
-    <key>finishColorGreen</key>
-    <integer>1</integer>
-    <key>finishColorRed</key>
-    <integer>1</integer>
-    <key>finishColorVarianceAlpha</key>
-    <integer>1</integer>
-    <key>finishColorVarianceBlue</key>
-    <integer>0</integer>
-    <key>finishColorVarianceGreen</key>
-    <integer>0</integer>
-    <key>finishColorVarianceRed</key>
-    <integer>0</integer>
-    <key>finishParticleSize</key>
-    <integer>0</integer>
-    <key>finishParticleSizeVariance</key>
-    <integer>0</integer>
-    <key>gravityx</key>
-    <integer>0</integer>
-    <key>gravityy</key>
-    <integer>0</integer>
-    <key>maxParticles</key>
-    <integer>100</integer>
-    <key>maxRadius</key>
-    <integer>20</integer>
-    <key>maxRadiusVariance</key>
-    <integer>0</integer>
-    <key>minRadius</key>
-    <integer>40</integer>
-    <key>particleLifespan</key>
-    <real>0.20000000298023224</real>
-    <key>particleLifespanVariance</key>
-    <real>0.5</real>
-    <key>radialAccelVariance</key>
-    <integer>50</integer>
-    <key>radialAcceleration</key>
-    <integer>-100</integer>
-    <key>rotatePerSecond</key>
-    <integer>0</integer>
-    <key>rotatePerSecondVariance</key>
-    <integer>0</integer>
-    <key>rotationEnd</key>
-    <integer>0</integer>
-    <key>rotationEndVariance</key>
-    <integer>0</integer>
-    <key>rotationStart</key>
-    <integer>0</integer>
-    <key>rotationStartVariance</key>
-    <integer>0</integer>
-    <key>sourcePositionVariancex</key>
-    <integer>0</integer>
-    <key>sourcePositionVariancey</key>
-    <integer>0</integer>
-    <key>sourcePositionx</key>
-    <real>373.7277526855469</real>
-    <key>sourcePositiony</key>
-    <real>478.40472412109375</real>
-    <key>speed</key>
-    <integer>100</integer>
-    <key>speedVariance</key>
-    <integer>0</integer>
-    <key>startColorAlpha</key>
-    <integer>1</integer>
-    <key>startColorBlue</key>
-    <integer>1</integer>
-    <key>startColorGreen</key>
-    <integer>1</integer>
-    <key>startColorRed</key>
-    <integer>1</integer>
-    <key>startColorVarianceAlpha</key>
-    <integer>1</integer>
-    <key>startColorVarianceBlue</key>
-    <integer>0</integer>
-    <key>startColorVarianceGreen</key>
-    <integer>0</integer>
-    <key>startColorVarianceRed</key>
-    <integer>0</integer>
-    <key>startParticleSize</key>
-    <integer>50</integer>
-    <key>startParticleSizeVariance</key>
-    <integer>50</integer>
-    <key>tangentialAccelVariance</key>
-    <integer>0</integer>
-    <key>tangentialAcceleration</key>
-    <integer>0</integer>
-    <key>spriteFrameUuid</key>
-    <string>a28b8261-be09-47df-aaa7-db3b6edebc3e</string>
-    <key>positionType</key>
-    <integer>0</integer>
-    <key>rotationIsDir</key>
-    <false/>
-    <key>minRadiusVariance</key>
-    <integer>0</integer>
-    <key>emissionRate</key>
-    <integer>100</integer>
-  </dict>
-</plist>

assets/resources/effect/particle/weiqi/tuowei.plist.meta

@@ -1,70 +0,0 @@
-{
-  "ver": "1.0.2",
-  "importer": "particle",
-  "imported": true,
-  "uuid": "8b65bb78-ebfe-43de-8a96-5b63f07fa117",
-  "files": [
-    ".json",
-    ".plist"
-  ],
-  "subMetas": {},
-  "userData": {
-    "totalParticles": 100,
-    "life": 0.20000000298023224,
-    "lifeVar": 0.5,
-    "emissionRate": 100,
-    "duration": -1,
-    "srcBlendFactor": 770,
-    "dstBlendFactor": 771,
-    "startColor": {
-      "_val": 4294967295
-    },
-    "startColorVar": {
-      "_val": 4278190080
-    },
-    "endColor": {
-      "_val": 4294967295
-    },
-    "endColorVar": {
-      "_val": 4278190080
-    },
-    "startSize": 50,
-    "startSizeVar": 50,
-    "endSize": 0,
-    "endSizeVar": 0,
-    "positionType": 0,
-    "sourcePos": {
-      "x": 0,
-      "y": 0
-    },
-    "posVar": {
-      "x": 0,
-      "y": 0
-    },
-    "angle": 0,
-    "angleVar": 360,
-    "startSpin": 0,
-    "startSpinVar": 0,
-    "endSpin": 0,
-    "endSpinVar": 0,
-    "emitterMode": 0,
-    "gravity": {
-      "x": 0,
-      "y": 0
-    },
-    "speed": 100,
-    "speedVar": 0,
-    "radialAccel": -100,
-    "radialAccelVar": 50,
-    "tangentialAccel": 0,
-    "tangentialAccelVar": 0,
-    "rotationIsDir": false,
-    "startRadius": 0,
-    "startRadiusVar": 0,
-    "endRadius": 0,
-    "endRadiusVar": 0,
-    "rotatePerS": 0,
-    "rotatePerSVar": 0,
-    "spriteFrameUuid": "a28b8261-be09-47df-aaa7-db3b6edebc3e@f9941"
-  }
-}

assets/resources/prefabs/game.prefab

@@ -3728,7 +3728,7 @@
     "endSize": 0,
     "endSizeVar": 0,
     "startSpin": 0,
-    "startSpinVar": 100,
+    "startSpinVar": 0,
     "endSpin": 0,
     "endSpinVar": 0,
     "sourcePos": {
@@ -3765,10 +3765,7 @@
     "_preview": true,
     "preview": true,
     "_custom": true,
-    "_file": {
-      "__uuid__": "8b65bb78-ebfe-43de-8a96-5b63f07fa117",
-      "__expectedType__": "cc.ParticleAsset"
-    },
+    "_file": null,
     "_spriteFrame": {
       "__uuid__": "ac74ded3-27d5-4c24-8f40-56fc4893ad29@f9941",
       "__expectedType__": "cc.SpriteFrame"

assets/script/manager/audioManager.ts

@@ -42,25 +42,30 @@ export class audioManager extends Component {
             }
         }
     }
-    public playBGM(clip:AudioClip){
-        if(this.getSound().clip!=null){
-            this.getSound().stop()
-            this.getSound().clip = null;
+
+    public stopAllBGM(){
+        if(this.audios_map.get(config.AUDIO.game_bgm)!=null){
+            this.audios_map.get(config.AUDIO.game_bgm).getComponent(AudioSource).stop()
+        }
+
+        if(this.audios_map.get(config.AUDIO.home_bgm)!=null){
+            this.audios_map.get(config.AUDIO.home_bgm).getComponent(AudioSource).stop()
         }
-        this.getSound().clip = clip;
-        this.getSound().loop = true;
-        this.getSound().play()
+    }
+    public playBGM(clip_node:Node){
+        this.stopAllBGM()
+        clip_node.getComponent(AudioSource).play()
     }
     public playMusic(path:string){
         if(this.audios_map.get(path)!=null){
-            this.playBGM(this.audios_map.get(path).getComponent(AudioSource).clip)
+            this.playBGM(this.audios_map.get(path))
         }else{
             ResourceUtil.loadRes(path, AudioClip, (err: any, clip: any)=> {
                 let node = new Node
                 node.parent = this.node
                 node.addComponent(AudioSource).clip = clip
                 this.audios_map.set(path,node)
-                this.playBGM(node.addComponent(AudioSource).clip)
+                this.playBGM(node)
             });
         }
     }
@@ -71,6 +76,7 @@ export class audioManager extends Component {
         }
         let loop:boolean = false
         let play = (node)=>{
+            node.getComponent(AudioSource).stop()
             node.getComponent(AudioSource).play()
 
             // node.getComponent(AudioSource).playOneShot(node.getComponent(AudioSource).clip,soundVolume?soundVolume:this.soundVolume)