diff --git a/assets/resources/game/gui/card.prefab b/assets/resources/game/gui/card.prefab index e5da6b17..d72a1f0b 100644 --- a/assets/resources/game/gui/card.prefab +++ b/assets/resources/game/gui/card.prefab @@ -22,23 +22,23 @@ "__id__": 2 }, { - "__id__": 250 + "__id__": 258 }, { - "__id__": 268 + "__id__": 276 } ], "_active": true, "_components": [ { - "__id__": 311 + "__id__": 319 }, { - "__id__": 313 + "__id__": 321 } ], "_prefab": { - "__id__": 315 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -119,19 +119,22 @@ }, { "__id__": 229 + }, + { + "__id__": 245 } ], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 253 }, { - "__id__": 247 + "__id__": 255 } ], "_prefab": { - "__id__": 249 + "__id__": 257 }, "_lpos": { "__type__": "cc.Vec3", @@ -229,8 +232,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 230 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -404,8 +407,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 145, - "height": 210 + "width": 180, + "height": 280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -920,7 +923,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 18, + "y": 53.5, "z": 0 }, "_lrot": { @@ -1013,8 +1016,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 147, - "height": 168.23899999999998 + "width": 184, + "height": 169.23899999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1145,7 +1148,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 11.194, + "y": 14.454, "z": 0 }, "_lrot": { @@ -1417,7 +1420,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 22.085, + "y": 6.085, "z": 0 }, "_lrot": { @@ -1429,8 +1432,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, + "x": 1.9, + "y": 1.9, "z": 1 }, "_mobility": 0, @@ -1810,7 +1813,7 @@ "__id__": 35 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 75 @@ -1946,7 +1949,7 @@ "__id__": 35 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 81 @@ -1973,8 +1976,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, + "x": 1.8, + "y": 1.8, "z": 1 }, "_mobility": 0, @@ -2097,7 +2100,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -90.972, + "y": -119.498, "z": 0 }, "_lrot": { @@ -2109,8 +2112,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.5, + "y": 1.5, "z": 1 }, "_mobility": 0, @@ -2205,6 +2208,8 @@ "__id__": 0 }, "fileId": "4dzq6L1X5LO54Z88q7AgB4", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2221,8 +2226,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 137, - "height": 166 + "width": 174, + "height": 167 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2294,10 +2299,10 @@ }, "_alignFlags": 45, "_target": null, - "_left": 14, - "_right": 14, - "_top": 14, - "_bottom": 50, + "_left": 13, + "_right": 13, + "_top": 13, + "_bottom": 120, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2686,7 +2691,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0.567, - "y": -29.488, + "y": 9.16, "z": 0 }, "_lrot": { @@ -2698,8 +2703,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, + "x": 0.9, + "y": 0.9, "z": 1 }, "_mobility": 0, @@ -2825,15 +2830,15 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25.19999999999999, + "y": 15.320999999999998, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": 0.01745240643728351, + "w": 0.9998476951563913 }, "_lscale": { "__type__": "cc.Vec3", @@ -2847,7 +2852,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": 2 }, "_id": "" }, @@ -2865,8 +2870,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 120, - "height": 20 + "width": 180, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2904,10 +2909,10 @@ "_string": "这里是名字", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 18, - "_fontSize": 18, + "_actualFontSize": 25, + "_fontSize": 25, "_fontFamily": "Arial", - "_lineHeight": 20, + "_lineHeight": 30, "_overflow": 2, "_enableWrapText": true, "_font": null, @@ -2963,7 +2968,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 130.2, + "_top": 119.679, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3500,8 +3505,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -70.39700000000002, - "y": -88.711, + "x": -87.89700000000002, + "y": -123.71100000000001, "z": 0 }, "_lrot": { @@ -4269,8 +4274,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 73.106, - "y": -87.505, + "x": 90.606, + "y": -122.505, "z": 0 }, "_lrot": { @@ -5420,7 +5425,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0.567, - "y": -90.448, + "y": -125.448, "z": 0 }, "_lrot": { @@ -5432,8 +5437,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -5511,7 +5516,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 200, - "height": 80 + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5578,6 +5583,8 @@ "__id__": 0 }, "fileId": "f8WDttWGpFk7LsQ1Dnzb2N", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5644,7 +5651,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 44, + "width": 48, "height": 54.4 }, "_anchorPoint": { @@ -5683,8 +5690,8 @@ "_string": "装备", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 22, + "_fontSize": 22, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, @@ -5753,7 +5760,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 110, "height": 50 }, "_anchorPoint": { @@ -5780,6 +5787,204 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "info", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 246 + }, + { + "__id__": 248 + }, + { + "__id__": 250 + } + ], + "_prefab": { + "__id__": 252 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -60, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 245 + }, + "_enabled": true, + "__prefab": { + "__id__": 247 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 164, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4ir+7+bFAEp982p7WeTUa" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 245 + }, + "_enabled": true, + "__prefab": { + "__id__": 249 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "这是卡牌的说明字体需要小一点,不让放不下", + "_horizontalAlign": 0, + "_verticalAlign": 0, + "_actualFontSize": 17, + "_fontSize": 16, + "_fontFamily": "Arial", + "_lineHeight": 20, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "16l3L2y0FFEJsCN9G5AY8V" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 245 + }, + "_enabled": true, + "__prefab": { + "__id__": 251 + }, + "_alignFlags": 45, + "_target": null, + "_left": 18, + "_right": 18, + "_top": 170, + "_bottom": 50, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 46.255859375, + "_originalHeight": 54.4, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c7wBAx6eRIO4nWwP3fL93k" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b7nIjPJslJZaW1CkvmIbEW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -5790,12 +5995,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 254 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 230 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5818,7 +6023,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 256 }, "_alignFlags": 45, "_target": null, @@ -5867,26 +6072,26 @@ }, "_children": [ { - "__id__": 251 + "__id__": 259 } ], "_active": true, "_components": [ { - "__id__": 259 + "__id__": 267 }, { - "__id__": 261 + "__id__": 269 }, { - "__id__": 263 + "__id__": 271 }, { - "__id__": 265 + "__id__": 273 } ], "_prefab": { - "__id__": 267 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -5923,23 +6128,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 250 + "__id__": 258 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 260 }, { - "__id__": 254 + "__id__": 262 }, { - "__id__": 256 + "__id__": 264 } ], "_prefab": { - "__id__": 258 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -5976,11 +6181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6004,11 +6209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6049,11 +6254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 265 }, "playOnLoad": false, "_clips": [ @@ -6091,16 +6296,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 230 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6119,11 +6324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 270 }, "_type": 0, "_inverted": false, @@ -6141,11 +6346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 272 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6187,11 +6392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 274 }, "_alignFlags": 45, "_target": null, @@ -6239,35 +6444,35 @@ "__id__": 1 }, "_children": [ - { - "__id__": 269 - }, { "__id__": 277 }, { - "__id__": 283 + "__id__": 285 + }, + { + "__id__": 291 } ], "_active": true, "_components": [ { - "__id__": 303 + "__id__": 311 }, { - "__id__": 305 + "__id__": 313 }, { - "__id__": 307 + "__id__": 315 } ], "_prefab": { - "__id__": 310 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -148.244, + "y": -184.855, "z": 0 }, "_lrot": { @@ -6299,23 +6504,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 276 }, "_children": [], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 278 }, { - "__id__": 272 + "__id__": 280 }, { - "__id__": 274 + "__id__": 282 } ], "_prefab": { - "__id__": 276 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -6352,15 +6557,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", - "width": 533.3333333333334, + "width": 600, "height": 200 }, "_anchorPoint": { @@ -6380,11 +6585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 281 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6425,11 +6630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 283 }, "_alignFlags": 45, "_target": null, @@ -6474,20 +6679,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 276 }, "_children": [], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 286 }, { - "__id__": 280 + "__id__": 288 } ], "_prefab": { - "__id__": 282 + "__id__": 290 }, "_lpos": { "__type__": "cc.Vec3", @@ -6524,11 +6729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -6552,11 +6757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6633,27 +6838,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 268 + "__id__": 276 }, "_children": [ { - "__id__": 284 + "__id__": 292 }, { - "__id__": 290 + "__id__": 298 } ], "_active": false, "_components": [ { - "__id__": 298 + "__id__": 306 }, { - "__id__": 300 + "__id__": 308 } ], "_prefab": { - "__id__": 302 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -6690,20 +6895,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 291 }, "_children": [], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 293 }, { - "__id__": 287 + "__id__": 295 } ], "_prefab": { - "__id__": 289 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -6740,11 +6945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -6768,11 +6973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 284 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 296 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6826,23 +7031,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 283 + "__id__": 291 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 299 }, { - "__id__": 293 + "__id__": 301 }, { - "__id__": 295 + "__id__": 303 } ], "_prefab": { - "__id__": 297 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -6879,11 +7084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 300 }, "_contentSize": { "__type__": "cc.Size", @@ -6907,11 +7112,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 302 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6975,11 +7180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 304 }, "templateMode": false, "watchPath": "data.mission_data.call_gold", @@ -7010,11 +7215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 307 }, "_contentSize": { "__type__": "cc.Size", @@ -7038,11 +7243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 283 + "__id__": 291 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 309 }, "_alignFlags": 44, "_target": null, @@ -7087,15 +7292,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", - "width": 160, + "width": 180, "height": 60 }, "_anchorPoint": { @@ -7115,11 +7320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 314 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7157,15 +7362,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 268 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 316 }, "clickEvents": [ { - "__id__": 309 + "__id__": 317 } ], "_interactable": true, @@ -7205,7 +7410,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 268 + "__id__": 276 }, "_id": "" }, @@ -7246,12 +7451,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 320 }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 230 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7274,7 +7479,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 322 }, "_id": "" }, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 7248a0a8..1fe66b4a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -12954,7 +12954,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "cc.Node", @@ -13563,7 +13563,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -259.593, + "y": -225, "z": 0 }, "_lrot": { diff --git a/assets/script/game/map/CardsComp.ts b/assets/script/game/map/CardsComp.ts index c5846ee2..db69eba3 100644 --- a/assets/script/game/map/CardsComp.ts +++ b/assets/script/game/map/CardsComp.ts @@ -15,11 +15,11 @@ export class CardsCompComp extends CCComp { card1:any=null card2:any=null card3:any=null - card4:any=null + // card4:any=null card1c:CardComp=null card2c:CardComp=null card3c:CardComp=null - card4c:CardComp=null + // card4c:CardComp=null /** 卡牌展示队列 */ private cardQueue: Array<{type: GameEvent, data?: any}> = []; @@ -39,52 +39,52 @@ export class CardsCompComp extends CCComp { this.card1=this.node.getChildByName("card1") this.card2=this.node.getChildByName("card2") this.card3=this.node.getChildByName("card3") - this.card4=this.node.getChildByName("card4") + // this.card4=this.node.getChildByName("card4") this.card1c=this.card1.getComponent(CardComp) this.card2c=this.card2.getComponent(CardComp) this.card3c=this.card3.getComponent(CardComp) - this.card4c=this.card4.getComponent(CardComp) + // this.card4c=this.card4.getComponent(CardComp) } hero_select(){ - let list=getRandomCardsByType(cardType.HERO,4) + let list=getRandomCardsByType(cardType.HERO,3) console.log("[CardsComp]:英雄选择卡牌列表",list) this.card1c.hero_select(list[0]) this.card2c.hero_select(list[1]) this.card3c.hero_select(list[2]) - this.card4c.hero_select(list[3]) + // this.card4c.hero_select(list[3]) } hero_skill_select(){ - let list=getRandomCardsByType(cardType.SKILL,4) + let list=getRandomCardsByType(cardType.SKILL,3) console.log("[CardsComp]:技能选择卡牌列表",list) this.card1c.hero_skill_select(list[0]) this.card2c.hero_skill_select(list[1]) this.card3c.hero_skill_select(list[2]) - this.card4c.hero_skill_select(list[3]) + // this.card4c.hero_skill_select(list[3]) } equip_select(){ - let list=getRandomCardsByType(cardType.EQUIP,4) + let list=getRandomCardsByType(cardType.EQUIP,3) console.log("[CardsComp]:装备选择卡牌列表",list) this.card1c.equip_select(list[0]) this.card2c.equip_select(list[1]) this.card3c.equip_select(list[2]) - this.card4c.equip_select(list[3]) + // this.card4c.equip_select(list[3]) } func_select(){ - let list=getRandomCardsByType(cardType.SPECIAL,4) + let list=getRandomCardsByType(cardType.SPECIAL,3) console.log("[CardsComp]:功能选择卡牌列表",list) this.card1c.func_select(list[0]) this.card2c.func_select(list[1]) this.card3c.func_select(list[2]) - this.card4c.func_select(list[3]) + // this.card4c.func_select(list[3]) } random_select(){ this.card1c.random_select() this.card2c.random_select() this.card3c.random_select() - this.card4c.random_select() + // this.card4c.random_select() } /** 添加卡牌展示到队列 */