init

assets/Bundles/GetPrize/GetPrize.prefab

@@ -267,7 +267,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "64lnYZTKlLZ56cDXjMpMVK"
+    "fileId": "506ZTHLC9ETpSRpP2UjH7B"
   },
   {
     "__type__": "cc.Sprite",
@@ -309,7 +309,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e03uUGXc5Osohj23Rkl+0F"
+    "fileId": "55YXngkWVKFrhx5rIC3v/8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -319,7 +319,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b4de9pNl1IoZvKMhHFdme0",
+    "fileId": "55abP80+ZDDq4HcbCVYknO",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -400,7 +400,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c9kYnK93tGcafidaM8H69n"
+    "fileId": "feluDUZ05MLpOAb0g4ubLr"
   },
   {
     "__type__": "cc.Sprite",
@@ -442,7 +442,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "11HvJdyQpCt4Nh65R2g+Mo"
+    "fileId": "0eeEkqXOxDSoJ4oCKqSczQ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -452,7 +452,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d58qN36IpJNo9BnRf8d5QL",
+    "fileId": "fe+dPeo25CDomSAhK4JJ2P",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -533,7 +533,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "feGEUZC1ZBdZh8RbYUCf/E"
+    "fileId": "11ul/ZiLJK17nESiysOvI8"
   },
   {
     "__type__": "cc.Sprite",
@@ -575,7 +575,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3dUyPFyOZOYqA/dp39NbN5"
+    "fileId": "afWdsnM49IL72KH8FU4bUG"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -585,7 +585,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a43+vcEAlFUqagfieEiAza",
+    "fileId": "af6D45Ap1PnYQ3e0AcWvhk",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -852,7 +852,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "bcCHOSWtpN0JkWoKSLUrm5"
+    "fileId": "9edvE7rVNE0pwtpPryZkfA"
   },
   {
     "__type__": "cc.Sprite",
@@ -894,7 +894,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c7HoC4XFpO4IT+it/+oTaR"
+    "fileId": "80oy100+ZIl63VXOpB4gzQ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -904,7 +904,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "319+jB9/1Io6ka7eV4Cn1p",
+    "fileId": "8dka+QInhLZLM2P+BdAFzF",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -985,7 +985,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2WMhT7dZLc4SRL1v3rN7u"
+    "fileId": "ce76PQszBAV5heF6at//ju"
   },
   {
     "__type__": "cc.Sprite",
@@ -1027,7 +1027,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "15ne0iuMlMoKPp30gaIMaD"
+    "fileId": "e7n4l89HZATo/cvuaSoIi2"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1037,7 +1037,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b9GpISB7xA36ZDf7KoDTp8",
+    "fileId": "e9TtFBr7xJbL2Sg7pPVfG9",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1118,7 +1118,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d2/5Gwo1VKgZimFclCRx9J"
+    "fileId": "69mIXqVfNC2oknPM/QjQ+U"
   },
   {
     "__type__": "cc.Sprite",
@@ -1160,7 +1160,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "59Ys7G02lIpoV+06Wpo2w9"
+    "fileId": "1fSc3SqOZFIID0XYXBnPdk"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1170,7 +1170,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a7CRU+5rNPn6oiJFfXov7B",
+    "fileId": "da/utkEe5IdLUZZgQzEH7O",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null

assets/Bundles/MainGame/png/横幅/无尽模式.png.meta → assets/Bundles/MainGame/png/横幅/bannerBg黄.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "081e6f77-5816-4ab7-be1e-cc9917759e54",
+  "uuid": "491d6347-9425-4f63-9663-01870a4e1f11",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "081e6f77-5816-4ab7-be1e-cc9917759e54@6c48a",
-      "displayName": "无尽模式",
+      "uuid": "491d6347-9425-4f63-9663-01870a4e1f11@6c48a",
+      "displayName": "bannerBg黄",
       "id": "6c48a",
       "name": "texture",
       "userData": {
-        "wrapModeS": "mirrored-repeat",
-        "wrapModeT": "mirrored-repeat",
-        "imageUuidOrDatabaseUri": "081e6f77-5816-4ab7-be1e-cc9917759e54",
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "491d6347-9425-4f63-9663-01870a4e1f11",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "081e6f77-5816-4ab7-be1e-cc9917759e54@f9941",
-      "displayName": "无尽模式",
+      "uuid": "491d6347-9425-4f63-9663-01870a4e1f11@f9941",
+      "displayName": "bannerBg黄",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,11 +45,11 @@
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
-        "trimY": 31,
-        "width": 1620,
-        "height": 450,
-        "rawWidth": 1620,
-        "rawHeight": 512,
+        "trimY": 0,
+        "width": 1624,
+        "height": 402,
+        "rawWidth": 1624,
+        "rawHeight": 402,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -810,
-            -225,
+            -812,
+            -201,
             0,
-            810,
-            -225,
+            812,
+            -201,
             0,
-            -810,
-            225,
+            -812,
+            201,
             0,
-            810,
-            225,
+            812,
+            201,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             0,
-            481,
-            1620,
-            481,
+            402,
+            1624,
+            402,
             0,
-            31,
-            1620,
-            31
+            0,
+            1624,
+            0
           ],
           "nuv": [
             0,
-            0.060546875,
+            0,
             1,
-            0.060546875,
             0,
-            0.939453125,
+            0,
+            1,
             1,
-            0.939453125
+            1
           ],
           "minPos": [
-            -810,
-            -225,
+            -812,
+            -201,
             0
           ],
           "maxPos": [
-            810,
-            225,
+            812,
+            201,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "081e6f77-5816-4ab7-be1e-cc9917759e54@6c48a",
+        "imageUuidOrDatabaseUri": "491d6347-9425-4f63-9663-01870a4e1f11@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "081e6f77-5816-4ab7-be1e-cc9917759e54@6c48a"
+    "redirect": "491d6347-9425-4f63-9663-01870a4e1f11@6c48a"
   }
 }

assets/Bundles/MainGame/svga/红色横幅.svga.meta

+{"ver":"1.0.0","importer":"*","imported":true,"uuid":"74044a11-8363-459a-bd96-65714c6b9f05","files":[".json",".svga"],"subMetas":{},"userData":{}}

assets/Bundles/MainGame/svga/结算横幅.svga.meta

-{
-  "ver": "1.0.0",
-  "importer": "*",
-  "imported": true,
-  "uuid": "8dda1ff4-1ba5-44ad-a490-facd665a0c6d",
-  "files": [
-    ".json",
-    ".svga"
-  ],
-  "subMetas": {},
-  "userData": {}
-}

assets/Bundles/MainGame/svga/黄色横幅.svga.meta

+{"ver":"1.0.0","importer":"*","imported":true,"uuid":"08ae9b53-9ceb-405f-b692-4f2838ec1ce6","files":[".json",".svga"],"subMetas":{},"userData":{}}

assets/Scripts/AutoSkin.ts

@@ -85,11 +85,9 @@ export class AutoSkin extends Component {
         if (+type == 1) {
             // 赵一鸣，红色版本
             this.skinNodeArr.forEach((skNode: SkinNode) => {
-                if (!skNode.node) return;
-
-                if (skNode.type == ESkinType.Sprite && skNode.skin1) {
+                if (skNode.node && skNode.type == ESkinType.Sprite && skNode.skin1) {
                     skNode.node.getComponent(Sprite).spriteFrame = skNode.skin1;
-                } else if (skNode.type == ESkinType.Label && skNode.color1) {
+                } else if (skNode.node && skNode.type == ESkinType.Label && skNode.color1) {
                     skNode.node.getComponent(Label).color = skNode.color1;
                 } else if (skNode.type == ESkinType.Node) {
                     skNode.node1.active = true;
@@ -100,17 +98,14 @@ export class AutoSkin extends Component {
         } else {
             // 零食很忙，黄色版本
             this.skinNodeArr.forEach((skNode: SkinNode) => {
-                if (!skNode.node) return;
-
-                if (skNode.type == ESkinType.Sprite && skNode.skin2) {
+                if (skNode.node && skNode.type == ESkinType.Sprite && skNode.skin2) {
                     skNode.node.getComponent(Sprite).spriteFrame = skNode.skin2;
-                } else if (skNode.type == ESkinType.Label && skNode.color2) {
+                } else if (skNode.node && skNode.type == ESkinType.Label && skNode.color2) {
                     skNode.node.getComponent(Label).color = skNode.color2;
                 } else if (skNode.type == ESkinType.Node) {
                     skNode.node1.active = false;
                     skNode.node2.active = true;
                 }
-
             });
         }
     }

assets/Scripts/Scenes/MainGame/Components/Target.ts

@@ -4,6 +4,7 @@ import Svga from "../../../../Component/Svga/Svga";
 import { ECard, EPropType, ESporpType } from "../Common/Enums";
 import { progress } from "./progress";
 import { AudioMgr } from "db://assets/core_tgx/base/AudioMgr";
+import { isType1 } from "../../../AppTool";
 
 const { ccclass, property, executeInEditMode } = _decorator;
 
@@ -27,6 +28,8 @@ export class Target extends Component {
     @property(Node) mask: Node = null;
 
     @property(Node) svga: Node = null;
+    @property(Node) svga1: Node = null;
+    @property(Node) svga2: Node = null;
 
     @property(Node) bannerBg: Node = null;
 
@@ -81,6 +84,12 @@ export class Target extends Component {
         });
         this.cdFlicker.active = false;
 
+        if (isType1()) {
+            this.svga = this.svga1;
+        } else {
+            this.svga = this.svga2;
+        }
+
     }
 
     onDestroy() {

assets/Scripts/Scenes/MainGame/MainGame.ts

@@ -26,7 +26,6 @@ import { PropManager } from "./Manager/PropManager";
 import { CardManager } from "./Manager/CardManager";
 import { LuckyBagManager } from "./Manager/LuckyBagManager";
 import GameFailPanel from "../../Panels/GameFailPanel";
-import { GameLoading } from "./GameLoading";
 import { HomeScene } from "../HomeScene";
 import { sendWebNet, WebNetName } from "../../Utils/WebNet/WebNet";
 import GameRevivePanel from "../../Panels/GameRevivePanel";
@@ -259,8 +258,8 @@ export class MainGame extends Scene {
 
         if (!currentStage || currentStage == 3) {
 
-            PropManager.ins.init(gameStore.startInfo?.barrierFlag ? 1 : 3);
-            CardManager.ins.init(gameStore.startInfo?.barrierFlag ? 1 : 3);
+            PropManager.ins.init(gameStore.startInfo?.barrierFlag ? 2 : 5);
+            CardManager.ins.init(gameStore.startInfo?.barrierFlag ? 2 : 5);
             LuckyBagManager.ins.init();
             await Target.ins.showTarget3();
             // await PreCd.ins.startCd();

assets/Scripts/Scenes/MainGame/Snake.ts

@@ -392,7 +392,7 @@ export class Snake extends Component {
         const pre = this.bodyArr[len - 1] || this.head;
 
         newBody.angle = pre.angle;
-        newBody.setPosition(pre.position);
+        newBody.setPosition(999999, 999999);
         newBody.setScale(this.scale, this.scale);
         this.node.insertChild(newBody, 1);