xx 1 éve
szülő
commit
a5d478fe64
29 módosított fájl, 712 hozzáadás és 217 törlés
  1. 0 9
      assets/resources/audio.meta
  2. 0 9
      assets/resources/audio/music.meta
  3. BIN
      assets/resources/audio/music/bg_music.mp3
  4. 0 14
      assets/resources/audio/music/bg_music.mp3.meta
  5. 0 9
      assets/resources/audio/sound.meta
  6. BIN
      assets/resources/audio/sound/sound_add_coin.mp3
  7. 0 14
      assets/resources/audio/sound/sound_add_coin.mp3.meta
  8. BIN
      assets/resources/audio/sound/sound_btn.mp3
  9. 0 14
      assets/resources/audio/sound/sound_btn.mp3.meta
  10. BIN
      assets/resources/audio/sound/sound_err.mp3
  11. 0 14
      assets/resources/audio/sound/sound_err.mp3.meta
  12. BIN
      assets/resources/audio/sound/sound_fail.mp3
  13. 0 14
      assets/resources/audio/sound/sound_fail.mp3.meta
  14. BIN
      assets/resources/audio/sound/sound_right.mp3
  15. 0 14
      assets/resources/audio/sound/sound_right.mp3.meta
  16. BIN
      assets/resources/audio/sound/sound_win.mp3
  17. 0 14
      assets/resources/audio/sound/sound_win.mp3.meta
  18. 416 14
      assets/resources/prefabs/setting.prefab
  19. 1 1
      assets/scene/game.scene
  20. 15 0
      assets/script/data/server_play_list_data.ts
  21. 43 6
      assets/script/framework/audioManager.ts
  22. 0 1
      assets/script/game.ts
  23. 109 9
      assets/script/gameManager.ts
  24. 4 4
      assets/script/homepage/homepage.ts
  25. 16 4
      assets/script/homepage/setting.ts
  26. 8 4
      assets/script/launch/view_launch.ts
  27. 34 15
      assets/script/play_list/zhaocha_component/view_game_play_mei_nv_zhao_xi_jie.ts
  28. 30 14
      assets/script/play_list/zhaocha_font/view_game_play_han_zi_zhao_bu_tong.ts
  29. 36 20
      assets/script/play_list/zhaocha_up_down/view_game_play_shuang_tu_zhao_bu_tong.ts

+ 0 - 9
assets/resources/audio.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "e1831fbd-cfc8-4d02-921e-fdd5b5ad3445",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

+ 0 - 9
assets/resources/audio/music.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "1084afd9-2673-4afa-b49c-47e11badf347",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

BIN
assets/resources/audio/music/bg_music.mp3


+ 0 - 14
assets/resources/audio/music/bg_music.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "5c590a21-6630-4bfe-8a27-faebbd7d03bf",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

+ 0 - 9
assets/resources/audio/sound.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "de3b659c-8991-4801-963f-57731533b018",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

BIN
assets/resources/audio/sound/sound_add_coin.mp3


+ 0 - 14
assets/resources/audio/sound/sound_add_coin.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "8f887919-45e3-40c3-86fc-60ba9ba4e878",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

BIN
assets/resources/audio/sound/sound_btn.mp3


+ 0 - 14
assets/resources/audio/sound/sound_btn.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "afbd7eb1-41a4-45f4-a266-19f6a5743c49",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

BIN
assets/resources/audio/sound/sound_err.mp3


+ 0 - 14
assets/resources/audio/sound/sound_err.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "b2de1240-7b53-497d-abcf-98de5213fd4b",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

BIN
assets/resources/audio/sound/sound_fail.mp3


+ 0 - 14
assets/resources/audio/sound/sound_fail.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "e5e1b41f-3e5b-4fa3-9904-4f4146625d6b",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

BIN
assets/resources/audio/sound/sound_right.mp3


+ 0 - 14
assets/resources/audio/sound/sound_right.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "14e762ba-83aa-4e9c-b24e-e5c8b4462028",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

BIN
assets/resources/audio/sound/sound_win.mp3


+ 0 - 14
assets/resources/audio/sound/sound_win.mp3.meta

@@ -1,14 +0,0 @@
-{
-  "ver": "1.0.0",
-  "importer": "audio-clip",
-  "imported": true,
-  "uuid": "405082ec-ab19-4cd7-9f2c-8608da9f9a93",
-  "files": [
-    ".json",
-    ".mp3"
-  ],
-  "subMetas": {},
-  "userData": {
-    "downloadMode": 0
-  }
-}

+ 416 - 14
assets/resources/prefabs/setting.prefab

@@ -23,22 +23,25 @@
       },
       {
         "__id__": 12
+      },
+      {
+        "__id__": 96
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 106
       },
       {
-        "__id__": 92
+        "__id__": 108
       },
       {
-        "__id__": 94
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -282,19 +285,22 @@
       },
       {
         "__id__": 53
+      },
+      {
+        "__id__": 85
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 91
       },
       {
-        "__id__": 87
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1175,7 +1181,10 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": null,
+    "_normalSprite": {
+      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
@@ -1935,7 +1944,10 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": null,
+    "_normalSprite": {
+      "__uuid__": "4ff82dab-c0ff-4931-8ae2-13fff152d2cf@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
@@ -2054,6 +2066,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 12
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 88
+      }
+    ],
+    "_prefab": {
+      "__id__": 90
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -230.437,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 85
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 87
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 176.796875,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "30iyJWGDdE0IGLw99RtCd0"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 85
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 89
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "idasdasdasdasdasd",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "548f8wcb9GBpclqEyLXGZz"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4c4sfJWhRBX4vgv8/4ZbT5",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -2064,7 +2212,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2092,7 +2240,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 94
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2140,6 +2288,254 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Button",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 97
+      },
+      {
+        "__id__": 99
+      },
+      {
+        "__id__": 101
+      },
+      {
+        "__id__": 103
+      }
+    ],
+    "_prefab": {
+      "__id__": 105
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 187.5,
+      "y": -383.323,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 96
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 98
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 1,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "87tQ0Ju/NHdqRWEX6oQKtF"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 96
+    },
+    "_enabled": false,
+    "__prefab": {
+      "__id__": 100
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "59gF/SQR1IYomdQ01cpdB4"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 96
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 102
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 0,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_hoverSprite": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_pressedSprite": {
+      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_disabledSprite": {
+      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 96
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b38DstJsBNWKjbZbRF+J1X"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 96
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 104
+    },
+    "_alignFlags": 32,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3cy86KGUVDa7dupoBKNOkd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "b35vGYBCtAZK5Ug1+BRXZM",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -2150,7 +2546,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 107
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2178,7 +2574,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 109
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2214,11 +2610,17 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 111
     },
     "btn_back": {
       "__id__": 13
     },
+    "btn_check_user_id": {
+      "__id__": 96
+    },
+    "lab_user_id": {
+      "__id__": 85
+    },
     "btn_sound": {
       "__id__": 34
     },

+ 1 - 1
assets/scene/game.scene

@@ -275,7 +275,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 405.99999999999994,
+    "_orthoHeight": 406,
     "_near": 0,
     "_far": 1000,
     "_color": {

+ 15 - 0
assets/script/data/server_play_list_data.ts

@@ -1,9 +1,19 @@
 
 
+export class server_sys_info{
+    public sys_click_button_music:string;
+    public sys_close_button_music:string;
+    public sys_piped_music:string;
+    public sys_time_countdown_music:string;
+}
 export class node_and_index{
     public node:any;
     public index:number;
 }
+export class server_play_info {
+    public sys_info:server_sys_info;
+    public wf_list:server_play_list_data_item[]
+}
 export class server_play_list_data {
     public list:server_play_list_data_item[] = []
 }
@@ -27,6 +37,11 @@ export class server_play_list_data_item {
     "coin_number"= 0; //解锁金币
     "label_id"= 0; //=>”新上”,”2”=>”火热”
     "barrier_number": 3; // 关卡数量
+    "wf_piped_music": "https://zaoca.hainanmlwl.com/sysfiledata/duibi-bjyy.mp3";
+    "wf_victory_music": "https://zaoca.hainanmlwl.com/sysfiledata/sound_win.mp3";
+    "wf_fail_music": "https://zaoca.hainanmlwl.com/sysfiledata/sound_fail.mp3";
+    "wf_wrong_click_music": "https://zaoca.hainanmlwl.com/sysfiledata/sound_err.mp3";
+    "wf_right_click_music": "https://zaoca.hainanmlwl.com/sysfiledata/sound_right.mp3";
 }
 
 export class server_user_info {

+ 43 - 6
assets/script/framework/audioManager.ts

@@ -1,5 +1,5 @@
 import { Lodash } from './lodash';
-import { _decorator, AudioClip } from "cc";
+import { _decorator, assetManager, AudioClip } from "cc";
 import { StorageManager } from "./storageManager";
 import { ResourceUtil } from "./resourceUtil";
 const { ccclass, property } = _decorator;
@@ -57,20 +57,32 @@ export class AudioManager  {
      * @param {Boolean} loop 是否循环播放
      */
      public playMusic (name:string, loop: boolean) {
-        let path = 'audio/music/' + name;
+        // let path = 'audio/music/' + name;
+        let path = ''+ name;
         //微信特殊处理,除一开场的音乐,其余的放在子包里头
         // if (name !== 'click') {
         //     path =  path; //微信特殊处理,除一开场的音乐,其余的放在子包里头
         // }
          
-        ResourceUtil.loadRes(path, AudioClip, (err: any, clip: any)=> {
+        // ResourceUtil.loadRes(path, AudioClip, (err: any, clip: any)=> {
+        //     let tmp = {} as any;
+        //     tmp.clip = clip;
+        //     tmp.loop = loop;
+        //     tmp.isMusic = true;
+        //     this.audios[name] = tmp;
+        //     this.playClip(name, true); 
+        // });     
+
+
+
+        assetManager.loadRemote(name,  (err: any, clip: AudioClip)=> {
             let tmp = {} as any;
             tmp.clip = clip;
             tmp.loop = loop;
             tmp.isMusic = true;
             this.audios[name] = tmp;
             this.playClip(name, true); 
-        });     
+        });
     }
 
     /**
@@ -84,12 +96,36 @@ export class AudioManager  {
         }
 
         //音效一般是多个的,不会只有一个
-        let path = 'audio/sound/';
+        // let path = 'audio/sound/';
+        let path = '';
         // if (name !== 'click') {
         //     path = path; //微信特殊处理,除一开场的音乐,其余的放在子包里头
         // }
 
-        ResourceUtil.loadRes(path + name, AudioClip, (err: any, clip: any)=> {
+        // ResourceUtil.loadRes(path + name, AudioClip, (err: any, clip: any)=> {
+        //     let tmp = {} as any;
+        //     tmp.clip = clip;
+        //     tmp.loop = loop;
+        //     tmp.isMusic = false;
+        //     this.arrSound.push(tmp);
+
+        //     if (loop) {
+        //         this.audios[name] = tmp;
+        //         clip.setLoop(loop);
+        //     }
+
+        //     clip.setVolume(this.soundVolume);
+            
+        //     clip.playOneShot();
+
+        //     clip.once('ended', ()=>{
+        //         Lodash.remove(this.arrSound, (obj: any)=>{
+        //             return obj.clip === tmp.clip;
+        //         });
+        //     })
+        // });
+
+        assetManager.loadRemote(name,(err: any, clip: any)=> {
             let tmp = {} as any;
             tmp.clip = clip;
             tmp.loop = loop;
@@ -115,6 +151,7 @@ export class AudioManager  {
 
     public playClip (name: string, isMusic?: boolean) {
         // console.log('playClip: ' + JSON.stringify(this.audios));
+        this.stopAll()
         let audio = this.audios[name];
         // if (typeof audio.audioId === "number") {
         //     let state = cc.audioEngine.getState(audio.audioId);

+ 0 - 1
assets/script/game.ts

@@ -13,7 +13,6 @@ export class game extends Component {
         gameManager.setUiLayer(this.uiLayer);
         gameManager.setTopLayer(this.topLayer);
         gameManager.setWaitLayer(this.waitLayer);
-        AudioManager.instance.playMusic(config.MP3_PATH.BGM_MUSIC,true)
         this.schedule(()=>{
             gameManager.PreloadingLevelImg(()=>{
                 console.log("新关卡资源加载完成")

+ 109 - 9
assets/script/gameManager.ts

@@ -1,14 +1,16 @@
-import { _decorator, Component, instantiate, Node, Prefab, resources, sys } from 'cc';
-import { server_han_zi_zhao_bu_tong_data, server_mei_nv_zhao_xi_jie_data, server_play_list_data, server_shuang_tu_zhao_bu_tong_data, server_user_info, unlock_levels, unlock_levels_item } from './data/server_play_list_data';
+import { _decorator, assetManager, AudioClip, Component, instantiate, Node, Prefab, resources, SpriteFrame, sys } from 'cc';
+import { server_han_zi_zhao_bu_tong_data, server_mei_nv_zhao_xi_jie_data, server_play_info, server_play_list_data, server_shuang_tu_zhao_bu_tong_data, server_sys_info, server_user_info, unlock_levels, unlock_levels_item } from './data/server_play_list_data';
 import { config } from './config';
 import { ClientEvent } from './framework/clientEvent';
 import { http } from './http/http';
 import { StorageManager } from './framework/storageManager';
 import { tools } from './tools';
+import { AudioManager } from './framework/audioManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('gameManager')
 export class gameManager extends Component {
+    public static g_server_sys_info:server_sys_info = new server_sys_info();
     public static g_server_play_list_data:server_play_list_data = new server_play_list_data();
     // public static g_server_shuang_tu_zhao_bu_tong_data:server_shuang_tu_zhao_bu_tong_data = new server_shuang_tu_zhao_bu_tong_data();
     // public static g_server_han_zi_zhao_bu_tong_data:server_han_zi_zhao_bu_tong_data = new server_han_zi_zhao_bu_tong_data();
@@ -226,8 +228,9 @@ export class gameManager extends Component {
         console.log("set_server_user_data::",data);
     }
 
-    public static set_server_play_list_data(data){
-        gameManager.g_server_play_list_data.list = data;
+    public static set_server_play_list_data(data:server_play_info){
+        gameManager.g_server_play_list_data.list = data.wf_list;
+        gameManager.g_server_sys_info = data.sys_info;
         ClientEvent.dispatchEvent(config.EVENT_MSG.ON_INIT_GAME_LIST);
         console.log("set_server_play_list_data::",data);
     }
@@ -288,11 +291,13 @@ export class gameManager extends Component {
                                     call_back();
                                 }
                            }
-                            tools.loadRemoteImg(data.img1,(sf)=>{
+                            tools.loadRemoteImg(data.img1,(sf:SpriteFrame)=>{
+                                sf.addRef();
                                 img_count++;
                                 img_call_back();
                             })
                             tools.loadRemoteImg(data.img2,(sf)=>{
+                                sf.addRef();
                                 img_count++;
                                 img_call_back();
                             })
@@ -307,14 +312,17 @@ export class gameManager extends Component {
                                 }
                             }
                             tools.loadRemoteImg(data.default_img,(sf)=>{
+                                sf.addRef();
                                 img_count_font++;
                                 img_call_back_font();
                             })
                             tools.loadRemoteImg(data.find_img,(sf)=>{
+                                sf.addRef();
                                 img_count_font++;
                                 img_call_back_font();
                             })
                             tools.loadRemoteImg(data.d_img,(sf)=>{
+                                sf.addRef();
                                 img_count_font++;
                                 img_call_back_font();
                             })
@@ -329,6 +337,7 @@ export class gameManager extends Component {
                                 }
                             }
                             tools.loadRemoteImg(data.img,(sf)=>{
+                                sf.addRef();
                                 img_count_component++;
                                 img_call_back_component();
                             })
@@ -336,6 +345,7 @@ export class gameManager extends Component {
                             for (let index = 0; index < data.component.length; index++) {
                                 const element = data.component[index];
                                 tools.loadRemoteImg(element.img,(sf,id)=>{
+                                    sf.addRef();
                                     img_count_component++;
                                     img_call_back_component();
                                 },element.id);
@@ -348,11 +358,101 @@ export class gameManager extends Component {
         })
     }
 
-    // public static set_server_shuang_tu_zhao_bu_tong_data(data){
-    //     gameManager.g_server_shuang_tu_zhao_bu_tong_data.list = data;
-    //     console.log("set_server_shuang_tu_zhao_bu_tong_data::",data);
-    // }
+    //通用的关闭按钮点击音效
+    public static playCloseBtnSound( loop:boolean = false){
+        let path = gameManager.g_server_sys_info.sys_click_button_music;
+        AudioManager.instance.playSound(path,loop)
+    }
+    //通用的按钮点击音效
+    public static playBtnSound( loop:boolean = false){
+        let path = gameManager.g_server_sys_info.sys_close_button_music;
+        AudioManager.instance.playSound(path,loop)
+    }
+    //每个玩法的胜利音效
+    public static playWinSoundByCategoryId(id:number, loop:boolean = false){
+        let paht = gameManager.get_play_list_item_by_categoryid(id).wf_victory_music;
+        AudioManager.instance.playSound(paht,loop)
+    }
+    //每个玩法的失败音效
+    public static playFailSoundByCategoryId(id:number, loop:boolean = false){
+        let paht = gameManager.get_play_list_item_by_categoryid(id).wf_fail_music;
+        AudioManager.instance.playSound(paht,loop)
+    }
+
+    //每个玩法的正确音效
+    public static playRightSoundByCategoryId(id:number, loop:boolean = false){
+        let paht = gameManager.get_play_list_item_by_categoryid(id).wf_right_click_music;
+        AudioManager.instance.playSound(paht,loop)
+    }
+    //每个玩法的错误音效
+    public static playErrSoundByCategoryId(id:number, loop:boolean = false){
+        let paht = gameManager.get_play_list_item_by_categoryid(id).wf_wrong_click_music;
+        AudioManager.instance.playSound(paht,loop)
+    }
+
+    //每个玩法的背景音乐
+    public static playGamePlayMusicByCategoryId(id:number, loop:boolean = false){
+        let path = gameManager.get_play_list_item_by_categoryid(id).wf_piped_music;
+        AudioManager.instance.playMusic(path,loop)
+    }
+    //主页的背景音乐
+    public static playMainMusic(loop:boolean = false){
+        let path = gameManager.g_server_sys_info.sys_piped_music;
+        AudioManager.instance.playMusic(path,loop)
+    }
+
+    public static loadSysMusic(call_back){
+        let count = 0;
+        let call = ()=>{
+            count++;
+            if(count>=3){
+                call_back()
+            }
+        }
+        assetManager.loadRemote(gameManager.g_server_sys_info.sys_click_button_music,  (err: any, clip: AudioClip)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(gameManager.g_server_sys_info.sys_close_button_music,  (err: any, clip: AudioClip)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(gameManager.g_server_sys_info.sys_piped_music,  (err: any, clip: AudioClip)=> {
+            clip.addRef()
+            call()
+        });
+    }
 
+    public static loadPlayMusicByCategoryId(id,call_back){
+        let count = 0;
+        let call = ()=>{
+            count++;
+            if(count>=5){
+                call_back()
+            }
+        }
+        let paly_item = gameManager.get_play_list_item_by_categoryid(id);
+        assetManager.loadRemote(paly_item.wf_fail_music,  (err: any, clip: any)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(paly_item.wf_victory_music,  (err: any, clip: any)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(paly_item.wf_right_click_music,  (err: any, clip: any)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(paly_item.wf_wrong_click_music,  (err: any, clip: any)=> {
+            clip.addRef()
+            call()
+        });
+        assetManager.loadRemote(paly_item.wf_piped_music,  (err: any, clip: any)=> {
+            clip.addRef()
+            call()
+        });
+    }
 
     // public static set_server_han_zi_zhao_bu_tong_data(data){
     //     gameManager.g_server_han_zi_zhao_bu_tong_data.list = data;

+ 4 - 4
assets/script/homepage/homepage.ts

@@ -25,12 +25,12 @@ export class homepage extends Component {
     @property(Node) lab_coin:Node;
     protected start(): void {
         this.btn_setting.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             gameManager.addTopView(config.PREFAB_PATH.setting,()=>{});
         },this)
         // this.btn_coin.on(Node.EventType.TOUCH_END,()=>{
         //     tools.showToast("暂无金币!");
-        //     AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        //     gameManager.playBtnSound()
         // },this)
         ClientEvent.on(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER,this.onChangeCoinNumber.bind(this),this);
         ClientEvent.on(config.EVENT_MSG.ON_INIT_GAME_LIST,this.initPlayList.bind(this),this);
@@ -41,6 +41,7 @@ export class homepage extends Component {
         for (let index = 0; index < self.content.children.length; index++) {
             self.content.children[index].getComponent(play_list_item).updateView();
         }
+        gameManager.playMainMusic(true);
     }
     onChangeCoinNumber(){
         this.lab_coin.getComponent(Label).string = gameManager.get_user_coin()+"";
@@ -65,7 +66,6 @@ export class homepage extends Component {
             }
         }
 
-
         resources.load(config.PREFAB_PATH.play_list_item, Prefab, (err, prefab) => {
             if(err){
                 console.log("err::",err);
@@ -76,7 +76,7 @@ export class homepage extends Component {
     }
 
     onItemClick(data:server_play_list_data_item){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         switch(data.id){
             case config.PLAY_TYPE.YI_QI_ZHAO_CHA:
             {

+ 16 - 4
assets/script/homepage/setting.ts

@@ -1,24 +1,28 @@
-import { _decorator, Component, Node, Sprite, Toggle } from 'cc';
+import { _decorator, Component, Label, Node, Sprite, Toggle } from 'cc';
 import { StorageManager } from '../framework/storageManager';
 import { AudioManager } from '../framework/audioManager';
 import { config } from '../config';
+import { gameManager } from '../gameManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('setting')
 export class setting extends Component {
     @property(Node) btn_back:Node;
+    @property(Node) btn_check_user_id:Node;
+    @property(Node) lab_user_id:Node;
     @property(Node) btn_sound:Node;
     @property(Node) btn_music:Node;
     @property(Node) spr_sound:Node;
     @property(Node) spr_music:Node;
+    private touch_number:number = 0;
     start() {
         let self = this;
         this.btn_back.on(Node.EventType.TOUCH_END,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             self.close();
         },this);
         this.btn_sound.on(Node.EventType.TOUCH_END,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             if( this.btn_sound.getComponent(Toggle).isChecked){
                 AudioManager.instance.openSound()
             }else{
@@ -27,7 +31,7 @@ export class setting extends Component {
             this.updateStatus();
         },this);
         this.btn_music.on(Node.EventType.TOUCH_END,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             if( this.btn_music.getComponent(Toggle).isChecked){
                 AudioManager.instance.openMusic()
             }else{
@@ -35,6 +39,14 @@ export class setting extends Component {
             }
             this.updateStatus();
         },this);
+        this.btn_check_user_id.on(Node.EventType.TOUCH_START,()=>{
+            this.touch_number+=1;
+            if(this.touch_number===3){
+                this.lab_user_id.active = true;
+            }
+        },this)
+        this.lab_user_id.getComponent(Label).string = `id:${gameManager.userInfo.id}`
+        this.lab_user_id.active = false;
         this.updateStatus();
 
     }

+ 8 - 4
assets/script/launch/view_launch.ts

@@ -31,8 +31,7 @@ export class launch_view extends Component {
                     self.isStop = false;
                     let _data = JSON.parse(data);
                     if(_data.code==config.MSG_CODE.SUCCESS){
-                        let list:any[] =  _data.content;
-                        gameManager.set_server_play_list_data(list);
+                        gameManager.set_server_play_list_data( _data.content);
                     }
                 }
             })
@@ -69,7 +68,6 @@ export class launch_view extends Component {
                             http.post(config.api_url.get_open_id,{"code":code,"anonymous_code":anonymousCode},(err,data)=>{
                                 if(!err){
                                     let _data = JSON.parse(data);
-                                
                                     if(_data.code==config.MSG_CODE.SUCCESS){
                                         StorageManager.instance.setUserId(_data.content.openid);
                                         formData = {"openid":StorageManager.instance.getUserId(),"avatarUrl": ""}
@@ -180,6 +178,12 @@ export class launch_view extends Component {
                 this.isStop = false;
             }
         }
+        if(progress_number==70){
+            this.isStop = true;
+            gameManager.loadSysMusic(()=>{
+                this.isStop = false;
+            })
+        }
         if(progress_number>=100){
             this.finishLoading();
             this.unschedule(this.setupLoading)
@@ -192,8 +196,8 @@ export class launch_view extends Component {
 
     finishLoading(){
         console.log("finish");
-        ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
         ClientEvent.dispatchEvent(config.EVENT_MSG.ON_BACK_HOME_VIEW);
+        ClientEvent.dispatchEvent(config.EVENT_MSG.ON_CHANGE_COIN_NUMBER);
         this.node.removeFromParent();
     }
 }

+ 34 - 15
assets/script/play_list/zhaocha_component/view_game_play_mei_nv_zhao_xi_jie.ts

@@ -41,17 +41,17 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
     start() {
         let self = this;
         this.btn_back.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound();
             self.close();
         },this);
         this.btn_tip.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound();
             this.onTipBtnClick();
         },this);
         this.btn_pause.on(Node.EventType.TOUCH_START,()=>{
             self.isPause  = true;
             self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_start;
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound();
             gameManager.addTopView(config.PREFAB_PATH.pause,(node:Node)=>{
                 node.getComponent(pause).show(()=>{
                     self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_pause;
@@ -65,7 +65,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
 
     TOUCH_START_IMG_1(event: EventTouch){
         if(this.err_node_1!=null){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_ERR);
+            gameManager.playErrSoundByCategoryId(this.categoryid);
             this.error_sub_time()
             let v3 =  new Vec3(event.getUILocation().x,event.getUILocation().y,0);
             Tween.stopAllByTarget(this.err_node_1); 
@@ -94,6 +94,19 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
             
         }
     }
+    decRefSf(){
+        let self = this;
+        if(self.img_sf){
+            self.img_sf.decRef()
+            self.img_sf = null;
+        }
+        if(self.sfList.size>0){
+            self.sfList.forEach( (sf, key)=>{
+                sf.decRef()
+                sf = null;
+            })
+        }
+    }
     public initView(data:server_mei_nv_zhao_xi_jie_data_item,isUpdate=false){
         this.m_data = data;
         let count = 0;
@@ -101,12 +114,17 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
             this.node.active = false;
         }
         let self = this;
+        this.decRefSf();
+        self.sfList.clear()
         let call_back = ()=>{
             if(count>=this.m_data.component.length+1){
-                self.node.active = true;
-                gameManager.hideLoading();
-                self.initComponent();
-                self.initAnswerView();
+                gameManager.loadPlayMusicByCategoryId(this.categoryid,()=>{
+                    self.node.active = true;
+                    gameManager.hideLoading();
+                    self.initComponent();
+                    self.initAnswerView();
+                    gameManager.playGamePlayMusicByCategoryId(this.categoryid,true);
+                })
             }
         }
         tools.loadRemoteImg(this.m_data.img,(sf)=>{
@@ -207,7 +225,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
 
     onCircleClick(item:circle,id:number){
         if(!item.isFinish()){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_RIGHT);
+            gameManager.playRightSoundByCategoryId(this.categoryid)
             item.Finish()
             item.show()
             let n_i = this.finishComponent(id);
@@ -236,7 +254,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
                 tools.showToast("当前已是最后一关,敬请期待最新版本");
             }else{
                 gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
-                    AudioManager.instance.playSound(config.MP3_PATH.SOUND_WIN);
+                    gameManager.playWinSoundByCategoryId(this.categoryid)
                     node.getComponent(win).showMeiNvView(this.m_data,this.onWinOrdinaryClick.bind(this),this.onWinDoubleClick.bind(this));
                 });
             }
@@ -254,6 +272,7 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
     }
 
     close(){
+        this.decRefSf();
         ClientEvent.dispatchEvent(config.EVENT_MSG.ON_BACK_HOME_VIEW);
         this.node.removeFromParent();
     }
@@ -302,27 +321,27 @@ export class view_game_play_mei_nv_zhao_xi_jie extends Component {
 
     showFail(){
         gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_FAIL);
+            gameManager.playFailSoundByCategoryId(this.categoryid)
             node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
         })
     }
 
     onWinOrdinaryClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.nextLevel();
     }
 
     onWinDoubleClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
     }
 
     onFailExtendTimeClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.start_time_count(this.m_data.extend_time);
     }
 
     onFailReStartClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.initAnswerView();
         this.initComponent();
 

+ 30 - 14
assets/script/play_list/zhaocha_font/view_game_play_han_zi_zhao_bu_tong.ts

@@ -40,17 +40,17 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
     start() {
         let self = this;
         this.btn_back.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             self.close();
         },this);
         this.btn_tip.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             this.onTipBtnClick();
         },this);
         this.btn_pause.on(Node.EventType.TOUCH_START,()=>{
             self.isPause  = true;
             self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_start;
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             gameManager.addTopView(config.PREFAB_PATH.pause,(node:Node)=>{
                 node.getComponent(pause).show(()=>{
                     self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_pause;
@@ -73,11 +73,15 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
             this.node.active = false;
         }
         let self = this;
+        self.decRefSf();
         let call_back = ()=>{
             if(count>=3){
-                self.node.active = true;
-                gameManager.hideLoading();
-                self.initGrid();
+                gameManager.loadPlayMusicByCategoryId(this.categoryid,()=>{
+                    self.node.active = true;
+                    gameManager.hideLoading();
+                    self.initGrid();
+                    gameManager.playGamePlayMusicByCategoryId(this.categoryid,true);
+                })
             }
         }
         tools.loadRemoteImg(this.m_data.default_img,(sf)=>{
@@ -109,11 +113,11 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
     }
     onGridItemClick(item:font_grid_item){
        if(item.isRight()&&!item.isFinish()){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_RIGHT);
+            gameManager.playRightSoundByCategoryId(this.categoryid);
             item.Finish(this.d_img);
        }
        if(!item.isRight()){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_ERR);
+            gameManager.playErrSoundByCategoryId(this.categoryid);;
             this.error_sub_time()
             item.showErrStatus()
        }
@@ -123,7 +127,7 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
                 tools.showToast("当前已是最后一关,敬请期待最新版本");
             }else{
                 gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
-                    AudioManager.instance.playSound(config.MP3_PATH.SOUND_WIN);
+                    gameManager.playWinSoundByCategoryId(this.categoryid);
                     node.getComponent(win).showHanZiView(this.m_data,this.onWinOrdinaryClick.bind(this),this.onWinDoubleClick.bind(this));
                 });
             }
@@ -230,7 +234,7 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
 
     showFail(){
         gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_FAIL);
+            gameManager.playFailSoundByCategoryId(this.categoryid);
             node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
         })
     }
@@ -258,23 +262,35 @@ export class view_game_play_han_zi_zhao_bu_tong extends Component {
     }
     
     onWinOrdinaryClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.nextLevel();
     }
 
     onWinDoubleClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
     }
 
     onFailExtendTimeClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.start_time_count(this.m_data.extend_time);
     }
 
     onFailReStartClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.initGrid();
     }
+
+    decRefSf(){
+        let self = this;
+        if(self.default_img){
+            self.default_img.decRef()
+            self.default_img = null;
+        }
+        if(self.find_img){
+            self.find_img.decRef()
+            self.find_img = null;
+        }
+    }
 }
 
 

+ 36 - 20
assets/script/play_list/zhaocha_up_down/view_game_play_shuang_tu_zhao_bu_tong.ts

@@ -45,11 +45,11 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
     start() {
         let self = this;
         this.btn_back.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             self.close();
         },this);
         this.btn_amplify.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             if(self.cur_amplify_status==0){
                 self.cur_amplify_status = 1;
             }else{
@@ -58,7 +58,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
             self.updateAmplifyStatus();
         },this);
         this.btn_tip.on(Node.EventType.TOUCH_START,()=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             if(self.cur_amplify_status==1){
                 self.cur_amplify_status = 0;
                 self.updateAmplifyStatus();
@@ -69,7 +69,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
         this.btn_pause.on(Node.EventType.TOUCH_START,()=>{
             self.isPause  = true;
             self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_start;
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+            gameManager.playBtnSound()
             gameManager.addTopView(config.PREFAB_PATH.pause,(node:Node)=>{
                 node.getComponent(pause).show(()=>{
                     self.btn_pause.getComponent(Sprite).spriteFrame = self.sf_btn_pause;
@@ -85,7 +85,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
 
     TOUCH_START_IMG_1(event: EventTouch){
         if(this.err_node_1!=null){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_ERR);
+            gameManager.playErrSoundByCategoryId(this.categoryid);;
             this.error_sub_time()
             let v3 =  new Vec3(event.getUILocation().x,event.getUILocation().y,0);
             Tween.stopAllByTarget(this.err_node_1); 
@@ -99,7 +99,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
 
     TOUCH_START_IMG_2(event: EventTouch){
         if(this.err_node_2!=null){
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_ERR);
+            gameManager.playErrSoundByCategoryId(this.categoryid);;
             this.error_sub_time()
             let v3 =  new Vec3(event.getUILocation().x,event.getUILocation().y,0);
             Tween.stopAllByTarget(this.err_node_2); 
@@ -228,7 +228,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
             relative_node.Finish()
             relative_node.show()
             let count = this.getFinishNumber();
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_RIGHT);
+            gameManager.playRightSoundByCategoryId(this.categoryid);
             this.star_list.getComponent(star_list).showStartByNumber(count);
         }
 
@@ -238,7 +238,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
                 tools.showToast("当前已是最后一关,敬请期待最新版本");
             }else{
                 gameManager.addTopView(config.PREFAB_PATH.win,(node:Node)=>{
-                    AudioManager.instance.playSound(config.MP3_PATH.SOUND_WIN);
+                    gameManager.playWinSoundByCategoryId(this.categoryid);
                     node.getComponent(win).showZhaoBuTongView(this.m_data,this.onWinOrdinaryClick.bind(this),this.onWinDoubleClick.bind(this));
                 });
             }
@@ -257,21 +257,21 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
     }
 
     onWinOrdinaryClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.nextLevel();
     }
 
     onWinDoubleClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
     }
 
     onFailExtendTimeClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.start_time_count(this.m_data.extend_time);
     }
 
     onFailReStartClick(){
-        AudioManager.instance.playSound(config.MP3_PATH.SOUND_BTN);
+        gameManager.playBtnSound()
         this.initAnswerView();
     }
 
@@ -316,7 +316,7 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
 
     showFail(){
         gameManager.addUiView(config.PREFAB_PATH.fail,(node:Node)=>{
-            AudioManager.instance.playSound(config.MP3_PATH.SOUND_FAIL);
+            gameManager.playFailSoundByCategoryId(this.categoryid);
             node.getComponent(fail).showView(this.m_data.extend_time,this.onFailExtendTimeClick.bind(this),this.onFailReStartClick.bind(this),this.m_data.ads_restart)
         })
     }
@@ -332,15 +332,19 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
             this.node.active = false;
         }
         let self = this;
+        self.decRefSf()
         let call_back = ()=>{
             if(count>=2){
-                self.node.active = true;
-                self.img_1.getComponent(Sprite).spriteFrame = self.img_1_sf;
-                self.img_2.getComponent(Sprite).spriteFrame = self.img_2_sf;
-                self.initAnswerView();
-                self.lab_coin.getComponent(Label).string = gameManager.get_user_coin()+"";
-                self.lab_title.getComponent(Label).string = self.m_data.name;
-                gameManager.hideLoading();
+                gameManager.loadPlayMusicByCategoryId(this.categoryid,()=>{
+                    self.node.active = true;
+                    self.img_1.getComponent(Sprite).spriteFrame = self.img_1_sf;
+                    self.img_2.getComponent(Sprite).spriteFrame = self.img_2_sf;
+                    self.initAnswerView();
+                    self.lab_coin.getComponent(Label).string = gameManager.get_user_coin()+"";
+                    self.lab_title.getComponent(Label).string = self.m_data.name;
+                    gameManager.hideLoading();
+                    gameManager.playGamePlayMusicByCategoryId(this.categoryid,true);
+                })
             }
         }
         tools.loadRemoteImg(this.m_data.img1,(sf)=>{
@@ -358,6 +362,18 @@ export class view_game_play_shuang_tu_zhao_bu_tong extends Component {
         ClientEvent.dispatchEvent(config.EVENT_MSG.ON_BACK_HOME_VIEW);
         this.node.removeFromParent();
     }
+
+    decRefSf(){
+        let self = this;
+        if(self.img_1_sf){
+            self.img_1_sf.decRef()
+            self.img_1_sf = null;
+        }
+        if(self.img_2_sf){
+            self.img_2_sf.decRef()
+            self.img_2_sf = null;
+        }
+    }
 }