【BUG】修改某些收集Load报错问题

assets/bundle/gui/eliminate/prefab/gameOver.prefab

@@ -31,17 +31,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 118
       },
       {
-        "__id__": 128
+        "__id__": 120
       },
       {
-        "__id__": 130
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 132
+      "__id__": 124
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -453,19 +453,16 @@
       },
       {
         "__id__": 97
-      },
-      {
-        "__id__": 105
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 123
+        "__id__": 115
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 117
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2249,171 +2246,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "guide",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 24
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 98
-      },
-      {
-        "__id__": 100
-      },
-      {
-        "__id__": 102
-      }
-    ],
-    "_prefab": {
-      "__id__": 104
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 253,
-      "y": -423,
-      "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__": 97
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 99
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 120,
-      "height": 129
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "10YsOmDU5J0o235jzuo4k2"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 97
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 101
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "1883e639-28b3-4d59-96db-57ffaa299715@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9cT6e75TVJubqKZ16agwNw"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 97
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 103
-    },
-    "playOnLoad": false,
-    "_clips": [
-      {
-        "__uuid__": "f1b91ca4-bfcd-4774-a8e7-c741ea10beff",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "5eWcS2MXRPppnx4EqBgC2H"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b29az5GaFABpAKXI69ylfR",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "ProgressBar",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2422,29 +2254,29 @@
     },
     "_children": [
       {
-        "__id__": 106
+        "__id__": 98
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 104
       },
       {
-        "__id__": 114
+        "__id__": 106
       },
       {
-        "__id__": 116
+        "__id__": 108
       },
       {
-        "__id__": 118
+        "__id__": 110
       },
       {
-        "__id__": 120
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 114
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2481,20 +2313,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 105
+      "__id__": 97
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 107
+        "__id__": 99
       },
       {
-        "__id__": 109
+        "__id__": 101
       }
     ],
     "_prefab": {
-      "__id__": 111
+      "__id__": 103
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2531,11 +2363,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 98
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 108
+      "__id__": 100
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2559,11 +2391,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 98
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 110
+      "__id__": 102
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2617,11 +2449,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2645,11 +2477,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 115
+      "__id__": 107
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2690,14 +2522,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 117
+      "__id__": 109
     },
     "_barSprite": {
-      "__id__": 109
+      "__id__": 101
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -2715,11 +2547,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 119
+      "__id__": 111
     },
     "controller": false,
     "watchPath": "",
@@ -2743,11 +2575,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 105
+      "__id__": 97
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 121
+      "__id__": 113
     },
     "watchPath": "*.cd",
     "foreachChildMode": false,
@@ -2770,7 +2602,7 @@
     "valueComponentActionValue": "",
     "watchNodes": [
       {
-        "__id__": 106
+        "__id__": 98
       }
     ],
     "_id": ""
@@ -2802,7 +2634,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 124
+      "__id__": 116
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2843,7 +2675,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 119
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2871,10 +2703,8 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 129
+      "__id__": 121
     },
-    "lab_bar": null,
-    "progressBar": null,
     "_id": ""
   },
   {
@@ -2891,7 +2721,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 131
+      "__id__": 123
     },
     "_alignFlags": 45,
     "_target": null,

assets/bundle/gui/eliminate/prefab/popup/UnlockFunction.prefab

@@ -29,19 +29,22 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 44
       },
       {
-        "__id__": 40
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -843,6 +846,145 @@
     "nestedPrefabInstanceRoots": null
   },
   {
+    "__type__": "cc.Node",
+    "_name": "Node",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 39
+      },
+      {
+        "__id__": 41
+      }
+    ],
+    "_prefab": {
+      "__id__": 43
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 330.825,
+      "y": -372.179,
+      "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__": 38
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 40
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 180,
+      "height": 195
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "27ZbqC/SxLwZl5yQcXyBYY"
+  },
+  {
+    "__type__": "dragonBones.ArmatureDisplay",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 42
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "playTimes": -1,
+    "premultipliedAlpha": false,
+    "_defaultArmatureIndexValue": 0,
+    "_dragonAsset": {
+      "__uuid__": "3bb38972-7753-4c70-a62a-eef56011c90a",
+      "__expectedType__": "dragonBones.DragonBonesAsset"
+    },
+    "_dragonAtlasAsset": {
+      "__uuid__": "bb8091c7-c86b-43aa-a918-7106553e4736",
+      "__expectedType__": "dragonBones.DragonBonesAtlasAsset"
+    },
+    "_armatureName": "Armature",
+    "_animationName": "newAnimation",
+    "_animationIndexValue": 1,
+    "_defaultCacheModeValue": 0,
+    "_timeScale": 1,
+    "_playTimes": -1,
+    "_debugBones": false,
+    "_enableBatch": false,
+    "_sockets": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e49/Cg8BJPsI17cjDg8rC5"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "94kylPKYpNPJXUqc9098tq",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
@@ -852,7 +994,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -880,7 +1022,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 47
     },
     "_id": ""
   },

assets/bundle/gui/eliminate/skeletal.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "a714a378-5574-46a6-9d7a-2c694153b6e4",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundle/gui/eliminate/skeletal/FingerClick_ske.json

@@ -0,0 +1,141 @@
+{
+    "frameRate": 24,
+    "isGlobal": 0,
+    "name": "FingerClick",
+    "version": "5.0",
+    "armature": [
+        {
+            "slot": [
+                {
+                    "color": {},
+                    "name": "shouzhi",
+                    "parent": "shouzhi"
+                }
+            ],
+            "type": "Armature",
+            "name": "Armature",
+            "frameRate": 24,
+            "skin": [
+                {
+                    "slot": [
+                        {
+                            "display": [
+                                {
+                                    "path": "shouzhi",
+                                    "type": "image",
+                                    "name": "shouzhi",
+                                    "transform": {
+                                        "y": 3.6017,
+                                        "skX": 133.4857,
+                                        "skY": 133.4857,
+                                        "x": 96.2702
+                                    }
+                                }
+                            ],
+                            "name": "shouzhi"
+                        }
+                    ],
+                    "name": ""
+                }
+            ],
+            "animation": [
+                {
+                    "slot": [],
+                    "frame": [],
+                    "ik": [],
+                    "playTimes": 0,
+                    "ffd": [],
+                    "duration": 20,
+                    "name": "newAnimation",
+                    "bone": [
+                        {
+                            "frame": [
+                                {
+                                    "duration": 20,
+                                    "transform": {}
+                                }
+                            ],
+                            "name": "root"
+                        },
+                        {
+                            "frame": [
+                                {
+                                    "duration": 10,
+                                    "transform": {
+                                        "y": -71.0984,
+                                        "x": -60.9988
+                                    },
+                                    "tweenEasing": 0
+                                },
+                                {
+                                    "duration": 10,
+                                    "transform": {
+                                        "y": -158.7173,
+                                        "x": -133.9031
+                                    },
+                                    "tweenEasing": 0
+                                },
+                                {
+                                    "duration": 0,
+                                    "transform": {
+                                        "y": -71.0984,
+                                        "x": -60.9988
+                                    }
+                                }
+                            ],
+                            "name": "shouzhi"
+                        },
+                        {
+                            "frame": [
+                                {
+                                    "duration": 20,
+                                    "transform": {}
+                                }
+                            ],
+                            "name": "bone"
+                        }
+                    ]
+                }
+            ],
+            "defaultActions": [
+                {
+                    "gotoAndPlay": "newAnimation"
+                }
+            ],
+            "ik": [],
+            "bone": [
+                {
+                    "transform": {},
+                    "name": "root"
+                },
+                {
+                    "length": 100,
+                    "transform": {
+                        "y": 72.8,
+                        "skX": -133.4857,
+                        "skY": -133.4857,
+                        "x": 65.35
+                    },
+                    "parent": "root",
+                    "name": "shouzhi"
+                },
+                {
+                    "length": 147,
+                    "transform": {
+                        "skX": 4.586,
+                        "skY": 4.586,
+                        "x": 100.3381
+                    },
+                    "parent": "shouzhi",
+                    "name": "bone"
+                }
+            ],
+            "aabb": {
+                "width": 180,
+                "y": -97.0271412388544,
+                "height": 195,
+                "x": -88.28737793534435
+            }
+        }
+    ]
+}

assets/bundle/gui/eliminate/skeletal/FingerClick_ske.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.2",
+  "importer": "dragonbones",
+  "imported": true,
+  "uuid": "3bb38972-7753-4c70-a62a-eef56011c90a",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundle/gui/eliminate/skeletal/FingerClick_tex.json

@@ -0,0 +1,15 @@
+{
+    "width": 256,
+    "imagePath": "FingerClick_tex.png",
+    "height": 256,
+    "name": "FingerClick",
+    "SubTexture": [
+        {
+            "width": 180,
+            "y": 1,
+            "height": 195,
+            "name": "shouzhi",
+            "x": 1
+        }
+    ]
+}

assets/bundle/gui/eliminate/skeletal/FingerClick_tex.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.2",
+  "importer": "dragonbones-atlas",
+  "imported": true,
+  "uuid": "bb8091c7-c86b-43aa-a918-7106553e4736",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/bundle/gui/eliminate/skeletal/FingerClick_tex.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "8fb916ec-5aee-49bb-9127-590b532f77d2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "8fb916ec-5aee-49bb-9127-590b532f77d2@6c48a",
+      "displayName": "FingerClick_tex",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "8fb916ec-5aee-49bb-9127-590b532f77d2",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "8fb916ec-5aee-49bb-9127-590b532f77d2@f9941",
+      "displayName": "FingerClick_tex",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -37,
+        "offsetY": 29.5,
+        "trimX": 1,
+        "trimY": 1,
+        "width": 180,
+        "height": 195,
+        "rawWidth": 256,
+        "rawHeight": 256,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -90,
+            -97.5,
+            0,
+            90,
+            -97.5,
+            0,
+            -90,
+            97.5,
+            0,
+            90,
+            97.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            255,
+            181,
+            255,
+            1,
+            60,
+            181,
+            60
+          ],
+          "nuv": [
+            0.00390625,
+            0.234375,
+            0.70703125,
+            0.234375,
+            0.00390625,
+            0.99609375,
+            0.70703125,
+            0.99609375
+          ],
+          "minPos": [
+            -90,
+            -97.5,
+            0
+          ],
+          "maxPos": [
+            90,
+            97.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8fb916ec-5aee-49bb-9127-590b532f77d2@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "8fb916ec-5aee-49bb-9127-590b532f77d2@6c48a"
+  }
+}

assets/bundle/gui/loading/loading.prefab

@@ -31,17 +31,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 87
       },
       {
-        "__id__": 91
+        "__id__": 89
       },
       {
-        "__id__": 93
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 93
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1040,13 +1040,10 @@
     "_components": [
       {
         "__id__": 84
-      },
-      {
-        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1945,44 +1942,6 @@
     "fileId": "b4QGwviIVKzZEMmXZbTmLX"
   },
   {
-    "__type__": "47052uw/Y5O1LXaLObj4ARx",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 46
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 87
-    },
-    "watchPath": "*.btn_show",
-    "foreachChildMode": false,
-    "condition": 0,
-    "foreachChildType": 0,
-    "valueA": 0,
-    "valueB": 0,
-    "valueAction": 0,
-    "valueActionOpacity": 0,
-    "valueActionColor": {
-      "__type__": "cc.Color",
-      "r": 155,
-      "g": 155,
-      "b": 155,
-      "a": 255
-    },
-    "valueComponentName": "",
-    "valueComponentProperty": "",
-    "valueComponentDefaultValue": "",
-    "valueComponentActionValue": "",
-    "watchNodes": [],
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9cMyyKg+xESo4zPOOWOj2Y"
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2005,7 +1964,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 88
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2033,7 +1992,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 90
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2069,7 +2028,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 92
     },
     "_id": ""
   },

assets/script/game/common/manager/ADHandler.ts

@@ -66,6 +66,7 @@ export class ADHandler {
 
     //启屏广告关闭
     adSplashClose = async () => {
+        console.log("启屏广告关闭")
         smc.game.GameModel.isShowAd = false;
         if (oops.gui.has(UIID.KindTips)) oops.gui.remove(UIID.KindTips);
         if (oops.gui.has(UIID.Retention)) oops.gui.remove(UIID.Retention);
@@ -99,6 +100,13 @@ export class ADHandler {
     adRewardLoadFailed = (str: string) => {
         smc.game.GameModel.isShowAd = false;
         console.log('[广告] 激励视频展示失败', str);
+        //展示失败
+        if (smc.game.GameModel.viewType === "revive_reward") {
+            const score = smc.game.GameModel.curScore;
+            smc.game.GameModel.viewType = "";
+            smc.game.GameModel.curScore = Math.floor(score / 2);
+            oops.message.dispatchEvent(GameEvent.RestartGame);
+        }
     };
 
     adRewardClose = (state: boolean) => {

assets/script/game/initialize/view/LoadingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 16:23:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-21 10:09:52
+ * @LastEditTime: 2025-04-21 14:29:26
  * @Description: loading界面
  */
 import { _decorator, Toggle } from "cc";
@@ -144,9 +144,6 @@ export class LoadingViewComp extends CCVMParentComp {
         this.data.prompt = oops.language.getLangByID("loading_load_player");
         await ModuleUtil.addViewUiAsync(smc.account, EliminateViewComp, UIID.Eliminate);
         // await ModuleUtil.addViewUiAsync(smc.account, EliminateView, UIID.Eliminate);
-
-
-
         ModuleUtil.removeViewUi(this.ent, LoadingViewComp, UIID.Loading);
     }
 

assets/script/game/view/EliminateViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:01:09
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-21 10:39:43
+ * @LastEditTime: 2025-04-21 11:01:14
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -417,12 +417,12 @@ export class EliminateViewComp extends CCComp {
             // 填满前两列，除去 [2][0] 这个位置，制造一个L型缺口
             for (let r = 0; r < this.rows; r++) {
                 for (let c = 0; c < 2; c++) {
-                    if (r === 2 && c === 0) continue // 留一个空位用于放置旋转后的L型砖块
-                    if (r === 1 && c === 0) continue // 留一个空位用于放置旋转后的L型砖块
-                    if (r === 3 && c === 0) continue // 留一个空位用于放置旋转后的L型砖块
-                    if (r === 2 && c === 1) continue // 留一个空位用于放置旋转后的L型砖块
-                    if (r === 1 && c === 1) continue // 留一个空位用于放置旋转后的L型砖块
-                    if (r === 3 && c === 1) continue // 留一个空位用于放置旋转后的L型砖块
+                    if (r === 2 && c === 0) continue
+                    if (r === 1 && c === 0) continue
+                    if (r === 3 && c === 0) continue
+                    if (r === 2 && c === 1) continue
+                    if (r === 1 && c === 1) continue
+                    if (r === 3 && c === 1) continue
                     const g = this.gridList[r][c]
                     g.status = 1
                     g.type = 1;

assets/script/game/view/GameOverView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-27 18:19:53
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-17 18:55:23
+ * @LastEditTime: 2025-04-21 11:33:46
  * @Description: 游戏结束界面
  */
 import { _decorator, Label, ProgressBar } from 'cc';