战斗页面

assets/bundles/battleGame/prefab/BattleGame.prefab

@@ -9972,7 +9972,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 3,
+    "_transition": 0,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/bundles/battleGame/prefab/营地血条.prefab

@@ -20,19 +20,22 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 14
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 20
       },
       {
-        "__id__": 16
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 24
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -332,6 +335,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "保护派派",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -43.859,
+      "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__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 45.7599983215332,
+      "height": 52.790000915527344
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.4755244979683985,
+      "y": 0.3559386359093728
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f5/i6nMStGQb2+BCobRDcY"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_skeletonData": {
+      "__uuid__": "7349a7a2-5944-4811-993a-0febfe291be3",
+      "__expectedType__": "sp.SkeletonData"
+    },
+    "defaultSkin": "default",
+    "defaultAnimation": "待机",
+    "_premultipliedAlpha": false,
+    "_timeScale": 1,
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "cfLPcS9oxASqTT67HsdQl9"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "8egfQqvRhCGLfXhalDzSH8",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -342,7 +481,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -370,7 +509,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -414,6 +553,7 @@
       "__id__": 0
     },
     "fileId": "e1uX9LxBJNRqVgq//ID0oy",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundles/first/config/Battlebuff.json

@@ -17,7 +17,7 @@
         "desc": "一定几率召唤出倍率卡，拖到数字上升1级或2级",
         "icon": "倍率卡",
         "quality": 4,
-        "type": 1,
+        "type": 2,
         "functiontype": 2,
         "functionpar": "1000,80,20",
         "weight": 1,
@@ -79,7 +79,7 @@
         "quality": 3,
         "type": 2,
         "functiontype": 7,
-        "functionpar": 50003000,
+        "functionpar": "5000,3000",
         "weight": 1,
         "price": 120
     },
@@ -185,7 +185,7 @@
         "desc": "一定几率召唤出属性卡，拖到数字上随机变换一个属性",
         "icon": "属性卡",
         "quality": 3,
-        "type": 1,
+        "type": 2,
         "functiontype": 16,
         "functionpar": 1000,
         "weight": 1,

assets/bundles/first/config/Const.json

@@ -220,5 +220,11 @@
         "desc": "星期7地图id",
         "para": 0,
         "para1": "6,1,2"
+    },
+    {
+        "id": 38,
+        "desc": "战斗中看视频加金币次数和对应数量，次数就是数组长度",
+        "para": 0,
+        "para1": "30,100,200"
     }
 ]

assets/bundles/icons/img/金币.png.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "838b701a-0e28-49f7-8d4d-175b36c48b6d@6c48a",
-      "displayName": "仙桃",
+      "displayName": "金币",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,20 +35,20 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "838b701a-0e28-49f7-8d4d-175b36c48b6d@f9941",
-      "displayName": "仙桃",
+      "displayName": "金币",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -4,
+        "offsetY": 0,
-        "trimX": 8,
+        "trimX": 0,
-        "trimY": 24,
+        "trimY": 0,
-        "width": 184,
+        "width": 49,
-        "height": 160,
+        "height": 47,
-        "rawWidth": 200,
+        "rawWidth": 49,
-        "rawHeight": 200,
+        "rawHeight": 47,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -92,
+            -24.5,
-            -80,
+            -23.5,
             0,
-            92,
+            24.5,
-            -80,
+            -23.5,
             0,
-            -92,
+            -24.5,
-            80,
+            23.5,
             0,
-            92,
+            24.5,
-            80,
+            23.5,
             0
           ],
           "indexes": [
@@ -82,33 +82,33 @@
             3
           ],
           "uv": [
-            8,
+            0,
-            176,
+            47,
-            192,
+            49,
-            176,
+            47,
-            8,
+            0,
-            16,
+            0,
-            192,
+            49,
-            16
+            0
           ],
           "nuv": [
-            0.04,
+            0,
-            0.08,
+            0,
-            0.96,
+            1,
-            0.08,
+            0,
-            0.04,
+            0,
-            0.88,
+            1,
-            0.96,
+            1,
-            0.88
+            1
           ],
           "minPos": [
-            -92,
+            -24.5,
-            -80,
+            -23.5,
             0
           ],
           "maxPos": [
-            92,
+            24.5,
-            80,
+            23.5,
             0
           ]
         },

assets/mx/components/list/List.ts

@@ -397,8 +397,7 @@ export default class List extends Component {
 
     /** ScrollView.view（Mask 裁剪区）尺寸，用于虚拟列表可视范围计算 */
     private _getViewUt(): UITransform {
-        const viewNode = this._scrollView?.view as Node | null;
+        return this._scrollView?.view ?? this._thisNodeUt;
-        return viewNode?.getComponent(UITransform) ?? this._thisNodeUt;
     }
 
     //----------------------------------------------------------------------------

assets/mx/module/merge/core/MergeSession.ts

@@ -84,7 +84,7 @@ export class MergeSession {
         this._coordOf = options.coordOf;
         this.bag = new BagBoard(options.bagSlotCount ?? 5);
         this.map = new MapTileBoard();
-        this._upgrade = new UpgradeSystem(this._config);
+        this._upgrade = new UpgradeSystem();
     }
 
     get compositions(): readonly ComposedUnit[] {

assets/res/spine/保护派派.atlas

@@ -0,0 +1,55 @@
+
+保护派派.png
+size: 194,67
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+π
+  rotate: true
+  xy: 139, 21
+  size: 46, 40
+  orig: 46, 40
+  offset: 0, 0
+  index: -1
+抖动1
+  rotate: true
+  xy: 0, 0
+  size: 67, 68
+  orig: 68, 68
+  offset: 0, 0
+  index: -1
+抖动2
+  rotate: false
+  xy: 70, 2
+  size: 67, 65
+  orig: 68, 65
+  offset: 0, 0
+  index: -1
+眼1
+  rotate: true
+  xy: 139, 2
+  size: 17, 21
+  orig: 20, 23
+  offset: 1, 1
+  index: -1
+眼2
+  rotate: true
+  xy: 162, 2
+  size: 17, 21
+  orig: 20, 23
+  offset: 1, 1
+  index: -1
+眼泪
+  rotate: false
+  xy: 181, 47
+  size: 13, 20
+  orig: 13, 20
+  offset: 0, 0
+  index: -1
+眼睛2
+  rotate: false
+  xy: 181, 37
+  size: 6, 8
+  orig: 8, 10
+  offset: 1, 1
+  index: -1

assets/res/spine/保护派派.atlas.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.0.0",
+  "importer": "*",
+  "imported": true,
+  "uuid": "9dbebd97-b7db-41b2-9c9f-c632b77aedd2",
+  "files": [
+    ".atlas",
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/res/spine/保护派派.json.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.2.7",
+  "importer": "spine-data",
+  "imported": true,
+  "uuid": "7349a7a2-5944-4811-993a-0febfe291be3",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "atlasUuid": "9dbebd97-b7db-41b2-9c9f-c632b77aedd2"
+  }
+}

assets/res/spine/保护派派.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "74485d02-37cf-43f9-b793-460ffa49be2f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "74485d02-37cf-43f9-b793-460ffa49be2f@6c48a",
+      "displayName": "保护派派",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "74485d02-37cf-43f9-b793-460ffa49be2f",
+        "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": "74485d02-37cf-43f9-b793-460ffa49be2f@f9941",
+      "displayName": "保护派派",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 194,
+        "height": 67,
+        "rawWidth": 194,
+        "rawHeight": 67,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -97,
+            -33.5,
+            0,
+            97,
+            -33.5,
+            0,
+            -97,
+            33.5,
+            0,
+            97,
+            33.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            67,
+            194,
+            67,
+            0,
+            0,
+            194,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -97,
+            -33.5,
+            0
+          ],
+          "maxPos": [
+            97,
+            33.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "74485d02-37cf-43f9-b793-460ffa49be2f@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "74485d02-37cf-43f9-b793-460ffa49be2f@6c48a"
+  }
+}