fix(role_controller): 调整角色控制器预制体的布局参数

修正了界面中角色控制器的位置和对齐参数，适配新的界面布局需求

assets/resources/game/map/map_rpg.prefab

@@ -21968,7 +21968,7 @@
       "__id__": 945
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 947
@@ -22223,7 +22223,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Rounded Rectangle 2402",
+    "_name": "bg",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -22248,7 +22248,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -384.011,
+      "y": -384.01099999999997,
       "z": 0
     },
     "_lrot": {
@@ -22288,7 +22288,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1080,
+      "width": 710,
       "height": 700
     },
     "_anchorPoint": {
@@ -22362,12 +22362,12 @@
     "__prefab": {
       "__id__": 965
     },
-    "_alignFlags": 2,
+    "_alignFlags": 4,
     "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
+    "_left": -490,
+    "_right": -490,
+    "_top": 134.01100000000002,
+    "_bottom": -734.011,
     "_horizontalCenter": 0,
     "_verticalCenter": -434.011,
     "_isAbsLeft": true,
@@ -22376,8 +22376,8 @@
     "_isAbsBottom": true,
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
+    "_originalWidth": 1080,
+    "_originalHeight": 700,
     "_alignMode": 2,
     "_lockFlags": 0,
     "_id": ""
@@ -22440,11 +22440,19 @@
       "__id__": 970
     },
     "bgImg": null,
-    "bg_anm": null,
+    "bg_anm": {
+      "__id__": 31
+    },
     "bg_anm1": null,
-    "bg_anm2": null,
-    "bg_anm3": null,
-    "bg_anm4": null,
+    "bg_anm2": {
+      "__id__": 71
+    },
+    "bg_anm3": {
+      "__id__": 93
+    },
+    "bg_anm4": {
+      "__id__": 939
+    },
     "_id": ""
   },
   {

assets/resources/gui/element/heromove.prefab

@@ -111,8 +111,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -1.5,
-      "y": 1.5,
+      "x": -1.3,
+      "y": 1.3,
       "z": 1
     },
     "_mobility": 0,
@@ -279,8 +279,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -1.5,
-      "y": 1.5,
+      "x": -1.3,
+      "y": 1.3,
       "z": 1
     },
     "_mobility": 0,
@@ -447,8 +447,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -1.5,
-      "y": 1.5,
+      "x": -1.3,
+      "y": 1.3,
       "z": 1
     },
     "_mobility": 0,
@@ -615,8 +615,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -1.5,
-      "y": 1.5,
+      "x": -1.3,
+      "y": 1.3,
       "z": 1
     },
     "_mobility": 0,
@@ -783,8 +783,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": -1.5,
-      "y": 1.5,
+      "x": -1.3,
+      "y": 1.3,
       "z": 1
     },
     "_mobility": 0,

assets/resources/gui/element/mission.prefab

@@ -7017,7 +7017,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 7.392,
-      "y": -98.741,
+      "y": 26.435,
       "z": 0
     },
     "_lrot": {
@@ -7058,7 +7058,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 167,
-      "height": 450
+      "height": 600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/resources/gui/role_controller.prefab

@@ -30,18 +30,18 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 303
-      },
-      {
-        "__id__": 305
-      },
       {
         "__id__": 307
+      },
+      {
+        "__id__": 309
+      },
+      {
+        "__id__": 311
       }
     ],
     "_prefab": {
-      "__id__": 309
+      "__id__": 313
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6170,7 +6170,7 @@
     "_right": 0,
     "_top": 0,
     "_bottom": 0,
-    "_horizontalCenter": 0,
+    "_horizontalCenter": -76.841,
     "_verticalCenter": 200,
     "_isAbsLeft": true,
     "_isAbsRight": true,
@@ -6214,7 +6214,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -76.841,
       "y": 840,
       "z": 0
     }
@@ -6630,6 +6630,15 @@
       },
       {
         "__id__": 302
+      },
+      {
+        "__id__": 303
+      },
+      {
+        "__id__": 305
+      },
+      {
+        "__id__": 306
       }
     ],
     "removedComponents": []
@@ -6661,7 +6670,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 1215.86,
+      "y": 1232.315,
       "z": 0
     }
   },
@@ -6696,6 +6705,42 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 304
+    },
+    "propertyPath": [
+      "_top"
+    ],
+    "value": 12.68500000000006
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "52mhkKH89DVKECWS3HY4Qh"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 304
+    },
+    "propertyPath": [
+      "_alignFlags"
+    ],
+    "value": 17
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 304
+    },
+    "propertyPath": [
+      "_bottom"
+    ],
+    "value": 1193.667
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "GameUI<UITransform>",
@@ -6706,7 +6751,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 304
+      "__id__": 308
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -6734,7 +6779,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 306
+      "__id__": 310
     },
     "_alignFlags": 45,
     "_target": null,
@@ -6770,7 +6815,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 308
+      "__id__": 312
     },
     "debugMode": false,
     "_id": ""

assets/script/game/map/CardController.ts

@@ -66,7 +66,7 @@ export class CardControllerComp extends CCComp {
      */
     onAdded(args:any){
         mLogger.log(this.debugMode, 'CardController', "CardControllerComp onAdded",args)
-        smc.map.MapView.scene.mapLayer.node.getChildByName("loading").active=false;
+        // smc.map.MapView.scene.mapLayer.node.getChildByName("loading").active=false;
     }
 
     /**

assets/script/game/map/MissionCardComp.ts

@@ -492,7 +492,7 @@ export class MissionCardComp extends CCComp {
      * @returns { needCount: 合成所需数量, maxLv: 最大合成等级 }
      */
     private getMergeRule(): { needCount: number, maxLv: number } {
-        let needCount = FightSet.MERGE_NEED === 2 ? 2 : 3;
+        let needCount = FightSet.MERGE_NEED ? FightSet.MERGE_NEED:2
         let maxLv = Math.max(1, Math.floor(FightSet.MERGE_MAX ?? 3));
         ecs.query(ecs.allOf(MissionHeroCompComp)).forEach((entity: ecs.Entity) => {
             const comp = entity.get(MissionHeroCompComp);