diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index d7d44f8b..21d423e7 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -457,7 +457,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -320, + "y": 45.781, "z": 0 }, "_lrot": { diff --git a/assets/resources/gui/element/cardlite.prefab b/assets/resources/gui/element/cardlite.prefab index 95ba6ffd..8fd8454d 100644 --- a/assets/resources/gui/element/cardlite.prefab +++ b/assets/resources/gui/element/cardlite.prefab @@ -2614,7 +2614,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 9.319, + "y": 0, "z": 0 }, "_lrot": { @@ -2626,8 +2626,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -2, - "y": 2, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -2743,8 +2743,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 110, - "height": 140 + "width": 90, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2793,10 +2793,10 @@ }, "_alignFlags": 45, "_target": null, - "_left": 5, - "_right": 5, - "_top": 5, - "_bottom": 5, + "_left": 15, + "_right": 15, + "_top": 35, + "_bottom": 35, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index b3290596..6ff9b9b5 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -1278,7 +1278,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 418.582, + "y": 455.0319999999999, "z": 0 }, "_lrot": { @@ -1391,7 +1391,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 62.986, + "y": 16.443, "z": 0 }, "_lrot": { @@ -1403,8 +1403,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -2, - "y": 2, + "x": -3.5, + "y": 3.5, "z": 1 }, "_mobility": 0, @@ -3659,7 +3659,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -284.764, + "y": -372.919, "z": 0 }, "_lrot": { @@ -7862,7 +7862,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -425.062, + "y": -513.217, "z": 0 }, "_lrot": { @@ -9811,7 +9811,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -580.609, + "y": -673.509, "z": 0 } }, @@ -10313,7 +10313,7 @@ "_target": null, "_left": 4.999999999999986, "_right": 5.000000000000014, - "_top": 101.418, + "_top": 64.96800000000007, "_bottom": 1028.909, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -11284,7 +11284,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 200 + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12101,7 +12101,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 2200, - "height": 200 + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12229,7 +12229,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 200 + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12351,7 +12351,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 200 + "height": 230 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12376,12 +12376,12 @@ "__prefab": { "__id__": 619 }, - "_alignFlags": 45, + "_alignFlags": 44, "_target": null, "_left": 0, "_right": 0, - "_top": 957.384, - "_bottom": 122.61600000000004, + "_top": 942.384, + "_bottom": 107.61600000000004, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index b888e720..5ce5dfe6 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -30,18 +30,18 @@ ], "_active": true, "_components": [ - { - "__id__": 290 - }, - { - "__id__": 292 - }, { "__id__": 294 + }, + { + "__id__": 296 + }, + { + "__id__": 298 } ], "_prefab": { - "__id__": 296 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -4009,6 +4009,12 @@ }, { "__id__": 289 + }, + { + "__id__": 290 + }, + { + "__id__": 292 } ], "removedComponents": [] @@ -4040,7 +4046,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 1177.658, + "y": 1175, "z": 0 } }, @@ -4083,7 +4089,7 @@ "propertyPath": [ "_top" ], - "value": 67.34200000000021 + "value": 70 }, { "__type__": "cc.TargetInfo", @@ -4121,6 +4127,38 @@ ], "value": true }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 291 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "71PjuREPhL54gIRBLnZ//L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 293 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "41v9yb+khAT5fF0JOnsr2d" + ] + }, { "__type__": "cc.UITransform", "_name": "GameUI", @@ -4131,7 +4169,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -4159,7 +4197,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 297 }, "_alignFlags": 45, "_target": null, @@ -4195,7 +4233,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 299 }, "debugMode": false, "_id": "" @@ -4216,19 +4254,19 @@ "instance": null, "targetOverrides": [ { - "__id__": 297 + "__id__": 301 }, { - "__id__": 300 + "__id__": 304 }, { - "__id__": 303 + "__id__": 307 }, { - "__id__": 306 + "__id__": 310 }, { - "__id__": 309 + "__id__": 313 } ], "nestedPrefabInstanceRoots": [ @@ -4273,7 +4311,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 298 + "__id__": 302 }, "propertyPath": [ "hero1" @@ -4282,7 +4320,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 299 + "__id__": 303 } }, { @@ -4303,7 +4341,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 301 + "__id__": 305 }, "propertyPath": [ "hero2" @@ -4312,7 +4350,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 302 + "__id__": 306 } }, { @@ -4333,7 +4371,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 304 + "__id__": 308 }, "propertyPath": [ "hero3" @@ -4342,7 +4380,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 305 + "__id__": 309 } }, { @@ -4363,7 +4401,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 307 + "__id__": 311 }, "propertyPath": [ "hero4" @@ -4372,7 +4410,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 308 + "__id__": 312 } }, { @@ -4393,7 +4431,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 310 + "__id__": 314 }, "propertyPath": [ "hero5" @@ -4402,7 +4440,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 311 + "__id__": 315 } }, { diff --git a/assets/resources/gui/ui5.plist.meta b/assets/resources/gui/ui5.plist.meta index 725c42ae..309b7070 100644 --- a/assets/resources/gui/ui5.plist.meta +++ b/assets/resources/gui/ui5.plist.meta @@ -118,8 +118,8 @@ "rawHeight": 54, "borderTop": 0, "borderBottom": 0, - "borderLeft": 44.5, - "borderRight": 44.5, + "borderLeft": 44, + "borderRight": 44, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -4994,8 +4994,8 @@ "rawHeight": 45, "borderTop": 0, "borderBottom": 0, - "borderLeft": 40.5, - "borderRight": 40.5, + "borderLeft": 40, + "borderRight": 40, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -5040,8 +5040,8 @@ "rawHeight": 42, "borderTop": 0, "borderBottom": 0, - "borderLeft": 34.5, - "borderRight": 34.5, + "borderLeft": 34, + "borderRight": 34, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -5086,8 +5086,8 @@ "rawHeight": 42, "borderTop": 0, "borderBottom": 0, - "borderLeft": 34.5, - "borderRight": 34.5, + "borderLeft": 34, + "borderRight": 34, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/ui6.plist.meta b/assets/resources/gui/ui6.plist.meta index ec98c3bf..2bd69801 100644 --- a/assets/resources/gui/ui6.plist.meta +++ b/assets/resources/gui/ui6.plist.meta @@ -3934,8 +3934,8 @@ "height": 57, "rawWidth": 90, "rawHeight": 57, - "borderTop": 28.5, - "borderBottom": 28.5, + "borderTop": 28, + "borderBottom": 28, "borderLeft": 45, "borderRight": 45, "packable": true,