Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb

assets/Scene/GameScene.fire

@@ -7402,8 +7402,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -13.529,
-        -60,
+        -4.385,
+        -62.29,
         0,
         0,
         0,
@@ -7553,7 +7553,7 @@
       "ctor": "Float64Array",
       "array": [
         -103.331,
-        -60,
+        -60.197,
         0,
         0,
         0,
@@ -7865,8 +7865,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 200,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7877,7 +7877,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        3.388,
+        14.787,
         7.421,
         0,
         0,
@@ -7943,7 +7943,7 @@
       "ctor": "Float64Array",
       "array": [
         125.9,
-        3.914,
+        1.555,
         0,
         0,
         0,
@@ -15267,7 +15267,7 @@
       "ctor": "Float64Array",
       "array": [
         15.137,
-        753.348,
+        738.462,
         0,
         0,
         0,

assets/Script/Block.ts

@@ -768,6 +768,7 @@ export default class Block extends cc.Component {
      
     setVibrate(type, count){
         // return;
+        console.log("最新:",cc.fx.GameConfig.GM_INFO.vibrateOpen,type);
         if(!cc.fx.GameConfig.GM_INFO.vibrateOpen){
             return;
         }
@@ -778,8 +779,10 @@ export default class Block extends cc.Component {
                 wx.vibrateShort({
                     type: type,
                     success: () => {
+                        console.log("震动成功1111111111")
                     },
                     fail: (err) => {
+                        console.log("震动失败1111111111",err);
                     }
                 });
             } else {
@@ -795,8 +798,10 @@ export default class Block extends cc.Component {
                     wx.vibrateShort({
                         type: type,
                         success: () => {
+                            console.log("震动成功222222222")
                         },
                         fail: (err) => {
+                            console.log("震动失败222222222",err);
                         }
                     });
                 } else {