woso_javan преди 4 месеца
родител
ревизия
56a09c15b4

+ 4 - 2
assets/core_tgx/base/ad/AdvertMgr.ts

@@ -41,7 +41,9 @@ export class AdvertMgr {
             },
             error(err) {
                 // console.log('The ad failed to load');
-                tgxUITips.show(err)
+                tgxUITips.show(err);
+                AudioMgr.inst.resume();
+                GtagMgr.inst.doGameDot(GtagType.ad_error);
             }
         });
     }
@@ -73,7 +75,7 @@ export class AdvertMgr {
             error(err: any) {
                 // console.log(`激励广告错误:${err}`);
                 tgxUITips.show(err);
-                EventDispatcher.instance.emit(ADEvent.REWARD_VIDEO_ERROR);
+                // EventDispatcher.instance.emit(ADEvent.REWARD_VIDEO_ERROR);
                 AudioMgr.inst.resume();
                 GtagMgr.inst.doGameDot(GtagType.ad_error);
             }

+ 1 - 1
assets/module_movecar/RoosterMoveCar.ts

@@ -228,7 +228,7 @@ export class RoosterMoveCar extends Component {
     }
 
     onUpdateLvl() {
-        const lbScrews = find('Canvas/GameUI/TopLeft/TitleLvl/LbLvl')!.getComponent(Label);
+        const lbScrews = find('Canvas/GameUI/TitleLvl/LbLvl')!.getComponent(Label);
         const { level } = LevelManager.instance.levelModel;
         lbScrews.string = `${level}`;
     }

BIN
assets/module_movecar/Textures/nums.png


+ 134 - 0
assets/module_movecar/Textures/nums.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.26",
+  "importer": "image",
+  "imported": true,
+  "uuid": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be@6c48a",
+      "displayName": "nums",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "nearest",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be@f9941",
+      "displayName": "nums",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 1,
+        "width": 400,
+        "height": 58,
+        "rawWidth": 400,
+        "rawHeight": 60,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -200,
+            -29,
+            0,
+            200,
+            -29,
+            0,
+            -200,
+            29,
+            0,
+            200,
+            29,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            59,
+            400,
+            59,
+            0,
+            1,
+            400,
+            1
+          ],
+          "nuv": [
+            0,
+            0.016666666666666666,
+            1,
+            0.016666666666666666,
+            0,
+            0.9833333333333333,
+            1,
+            0.9833333333333333
+          ],
+          "minPos": [
+            -200,
+            -29,
+            0
+          ],
+          "maxPos": [
+            200,
+            29,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be@f9941"
+  }
+}

+ 0 - 0
assets/module_movecar/label-atlas.labelatlas


+ 135 - 0
assets/module_movecar/label-atlas.labelatlas.meta

@@ -0,0 +1,135 @@
+{
+  "ver": "1.0.1",
+  "importer": "label-atlas",
+  "imported": true,
+  "uuid": "1f79fc84-95f3-4392-9c73-004659a41d9f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "itemWidth": 40,
+    "itemHeight": 60,
+    "fontSize": 52.8,
+    "startChar": "0",
+    "spriteFrameUuid": "b92c198a-10e7-4ec8-b48e-65df0ac4a8be@f9941",
+    "_fntConfig": {
+      "commonHeight": 60,
+      "fontSize": 52,
+      "atlasName": "nums",
+      "fontDefDictionary": {
+        "48": {
+          "rect": {
+            "x": 0,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "49": {
+          "rect": {
+            "x": 40,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "50": {
+          "rect": {
+            "x": 80,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "51": {
+          "rect": {
+            "x": 120,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "52": {
+          "rect": {
+            "x": 160,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "53": {
+          "rect": {
+            "x": 200,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "54": {
+          "rect": {
+            "x": 240,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "55": {
+          "rect": {
+            "x": 280,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "56": {
+          "rect": {
+            "x": 320,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        },
+        "57": {
+          "rect": {
+            "x": 360,
+            "y": 0,
+            "width": 40,
+            "height": 60
+          },
+          "xOffset": 0,
+          "yOffset": 0,
+          "xAdvance": 40
+        }
+      },
+      "kerningDict": {}
+    }
+  }
+}

+ 77 - 77
assets/module_movecar/rooster_movecar.scene

@@ -5070,6 +5070,9 @@
       {
         "__id__": 168
       },
+      {
+        "__id__": 179
+      },
       {
         "__id__": 185
       }
@@ -6120,18 +6123,15 @@
       },
       {
         "__id__": 173
-      },
-      {
-        "__id__": 177
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 183
+        "__id__": 177
       },
       {
-        "__id__": 184
+        "__id__": 178
       }
     ],
     "_prefab": null,
@@ -6492,33 +6492,85 @@
     },
     "_id": "ec3qEoJHVABoxGd3CvrvsV"
   },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 168
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": "d0TcHh5mFPMZsmfTTtOr2h"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 168
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_alignFlags": 9,
+    "_target": null,
+    "_left": 30,
+    "_right": 0,
+    "_top": 40.000000000000114,
+    "_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": "f382WzED1EIKcBD4MRB3XH"
+  },
   {
     "__type__": "cc.Node",
     "_name": "TitleLvl",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 168
+      "__id__": 142
     },
     "_children": [
       {
-        "__id__": 178
+        "__id__": 180
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 181
+        "__id__": 183
       },
       {
-        "__id__": 182
+        "__id__": 184
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 310,
-      "y": 35,
+      "x": 30,
+      "y": 755,
       "z": 0
     },
     "_lrot": {
@@ -6550,23 +6602,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 177
+      "__id__": 179
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 179
+        "__id__": 181
       },
       {
-        "__id__": 180
+        "__id__": 182
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 80,
-      "y": 5,
+      "x": 70,
+      "y": 3,
       "z": 0
     },
     "_lrot": {
@@ -6598,14 +6650,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 178
+      "__id__": 180
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 23.189453125,
-      "height": 67
+      "width": 38.46,
+      "height": 50
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6620,7 +6672,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 178
+      "__id__": 180
     },
     "_enabled": true,
     "__prefab": null,
@@ -6635,7 +6687,7 @@
       "a": 255
     },
     "_string": "1",
-    "_horizontalAlign": 0,
+    "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 50,
     "_fontSize": 50,
@@ -6644,8 +6696,8 @@
     "_overflow": 0,
     "_enableWrapText": false,
     "_font": {
-      "__uuid__": "23a47957-4ba6-41f7-999f-a5fbf8a48aed",
-      "__expectedType__": "cc.TTFFont"
+      "__uuid__": "1f79fc84-95f3-4392-9c73-004659a41d9f",
+      "__expectedType__": "cc.LabelAtlas"
     },
     "_isSystemFontUsed": false,
     "_spacingX": 0,
@@ -6685,7 +6737,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 177
+      "__id__": 179
     },
     "_enabled": true,
     "__prefab": null,
@@ -6707,7 +6759,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 177
+      "__id__": 179
     },
     "_enabled": true,
     "__prefab": null,
@@ -6740,58 +6792,6 @@
     "_atlas": null,
     "_id": "9d7XRXPplBL4iJ4ENdw1rf"
   },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 168
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": "d0TcHh5mFPMZsmfTTtOr2h"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 168
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 9,
-    "_target": null,
-    "_left": 30,
-    "_right": 0,
-    "_top": 40.000000000000114,
-    "_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": "f382WzED1EIKcBD4MRB3XH"
-  },
   {
     "__type__": "cc.Node",
     "_name": "Pai",

+ 1 - 1
assets/start/Config/GlobalConfig.ts

@@ -1,5 +1,5 @@
 export const GlobalConfig = {
-    isDebug: false,
+    isDebug: true,
     initilizeLevel: 1,//初始关卡
     levelTotal: 10,   //最大关卡等级
 }