diff --git a/assets/resources/game/gui/card.prefab b/assets/resources/game/gui/card.prefab index d9d8f38b..68f9efb2 100644 --- a/assets/resources/game/gui/card.prefab +++ b/assets/resources/game/gui/card.prefab @@ -28,20 +28,20 @@ "__id__": 34 }, { - "__id__": 40 + "__id__": 66 }, { - "__id__": 56 + "__id__": 82 } ], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 90 } ], "_prefab": { - "__id__": 66 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -277,7 +277,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 130, - "height": 150 + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -382,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -106.15, + "y": -127.4, "z": 0 }, "_lrot": { @@ -846,24 +846,34 @@ }, { "__type__": "cc.Node", - "_name": "icon", + "_name": "show", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 35 }, { - "__id__": 37 + "__id__": 43 + }, + { + "__id__": 51 + } + ], + "_active": true, + "_components": [ + { + "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 39 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -894,6 +904,556 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 34 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 36 + }, + { + "__id__": 38 + }, + { + "__id__": 40 + } + ], + "_prefab": { + "__id__": 42 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 37 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 252, + "height": 392 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7fiyciHJIoaiAOyDZ4Dvc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 33, + "g": 55, + "b": 70, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "260d01c4-5936-4c90-8ff9-b892c60b2e48@8ed5b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e9FUEBNM1EgJhP7hCQXwGb" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 41 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 140, + "_originalHeight": 190, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "14e1rdbBxBnIIjQVoGbiNY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "acCfKrvQ9FnK/OwueyWP13", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "InnerBg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 34 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 44 + }, + { + "__id__": 46 + }, + { + "__id__": 48 + } + ], + "_prefab": { + "__id__": 50 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 232, + "height": 272 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "89nsHg3BtKC5CMkx7vpECH" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 51, + "g": 82, + "b": 100, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "260d01c4-5936-4c90-8ff9-b892c60b2e48@e230b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "553+NAb8JPiKQz2z/yPft0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 49 + }, + "_alignFlags": 45, + "_target": null, + "_left": 5, + "_right": 5, + "_top": 30, + "_bottom": 30, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 130, + "_originalHeight": 120, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "70a2BIWX5MI4IEGDVJaPfw" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c6simtQ5JAhqoqY1+vBVJX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 34 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 52 + }, + { + "__id__": 54 + }, + { + "__id__": 56 + }, + { + "__id__": 58 + } + ], + "_prefab": { + "__id__": 60 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 53 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 232, + "height": 272 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b81jrjsmdKg7Dyfnf1hkpN" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 51, + "g": 82, + "b": 100, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "260d01c4-5936-4c90-8ff9-b892c60b2e48@e230b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51SR6lwNxDKLhGpnv0HMIR" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 57 + }, + "_alignFlags": 45, + "_target": null, + "_left": 5, + "_right": 5, + "_top": 30, + "_bottom": 30, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 130, + "_originalHeight": 120, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bdjuCNO0pOVJSxjYn3Wd1y" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 59 + }, + "_type": 3, + "_inverted": true, + "_segments": 64, + "_alphaThreshold": 0.2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "74jAL3ta5I14CBMc+zXLZ4" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "804/Pvc9BGt6ZiTBpDupJa", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -904,12 +1464,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", - "width": 130, - "height": 150 + "width": 126, + "height": 196 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -932,14 +1492,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 64 }, "_alignFlags": 45, "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -981,23 +1541,23 @@ }, "_children": [ { - "__id__": 41 + "__id__": 67 } ], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 75 }, { - "__id__": 51 + "__id__": 77 }, { - "__id__": 53 + "__id__": 79 } ], "_prefab": { - "__id__": 55 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -1034,23 +1594,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 66 }, "_children": [], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 68 }, { - "__id__": 44 + "__id__": 70 }, { - "__id__": 46 + "__id__": 72 } ], "_prefab": { - "__id__": 48 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -1087,11 +1647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1115,11 +1675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1160,11 +1720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 73 }, "playOnLoad": false, "_clips": [ @@ -1202,11 +1762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", @@ -1230,11 +1790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 78 }, "_type": 0, "_inverted": false, @@ -1252,11 +1812,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 80 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1317,17 +1877,17 @@ "_active": true, "_components": [ { - "__id__": 57 + "__id__": 83 }, { - "__id__": 59 + "__id__": 85 }, { - "__id__": 61 + "__id__": 87 } ], "_prefab": { - "__id__": 63 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1364,16 +1924,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", "width": 260, - "height": 300 + "height": 400 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1392,11 +1952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1437,11 +1997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 82 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 88 }, "_alignFlags": 45, "_target": null, @@ -1490,12 +2050,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", "width": 130, - "height": 150 + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 9254272f..84a5c739 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -103,7 +103,7 @@ "__id__": 410 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 642 @@ -269,7 +269,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1420, - "height": 760 + "height": 810 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -391,7 +391,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 720, - "height": 385 + "height": 410 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -499,7 +499,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 350, + "y": 384.879, "z": 0 }, "_lrot": { @@ -549,7 +549,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -314.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -561,8 +561,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -685,7 +685,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -258.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -697,8 +697,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -821,7 +821,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -202.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -833,8 +833,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -957,7 +957,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -146.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -969,8 +969,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -1093,7 +1093,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -90.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -1105,8 +1105,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -1229,7 +1229,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -34.5, - "y": 0, + "y": 3.293, "z": 0 }, "_lrot": { @@ -1241,8 +1241,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.9, - "y": 0.9, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -1386,7 +1386,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 325, + "_bottom": 359.879, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1502,7 +1502,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 215, + "y": 265, "z": 0 }, "_lrot": { @@ -1556,7 +1556,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "07HIuowPhD96HCgf7J0j2+", + "fileId": "6eroR+4HJIz63z9XkBi6wV", "prefabRootNode": { "__id__": 1 }, @@ -1586,7 +1586,7 @@ "propertyPath": [ "_name" ], - "value": "c1" + "value": "card1" }, { "__type__": "cc.TargetInfo", @@ -1605,7 +1605,7 @@ "value": { "__type__": "cc.Vec3", "x": -280, - "y": 25, + "y": 0, "z": 0 } }, @@ -1668,7 +1668,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "befduC9ahNiZY7cLWih/GJ", + "fileId": "0eZb4j6epBraams/T+54xK", "prefabRootNode": { "__id__": 1 }, @@ -1698,7 +1698,7 @@ "propertyPath": [ "_name" ], - "value": "c2" + "value": "card2" }, { "__type__": "cc.TargetInfo", @@ -1717,7 +1717,7 @@ "value": { "__type__": "cc.Vec3", "x": -140, - "y": 25, + "y": 0, "z": 0 } }, @@ -1780,7 +1780,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c70WqiunxF8KMxor9luR3C", + "fileId": "d19wYfuq9Iwq6q5PQimWql", "prefabRootNode": { "__id__": 1 }, @@ -1810,7 +1810,7 @@ "propertyPath": [ "_name" ], - "value": "c3" + "value": "card3" }, { "__type__": "cc.TargetInfo", @@ -1829,7 +1829,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 25, + "y": 0, "z": 0 } }, @@ -1892,7 +1892,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "37TmIvHKxNqq5wichjR/Ud", + "fileId": "efmPHq9aBFf5KKANbd9y/C", "prefabRootNode": { "__id__": 1 }, @@ -1922,7 +1922,7 @@ "propertyPath": [ "_name" ], - "value": "c4" + "value": "card4" }, { "__type__": "cc.TargetInfo", @@ -1941,7 +1941,7 @@ "value": { "__type__": "cc.Vec3", "x": 140, - "y": 25, + "y": 0, "z": 0 } }, @@ -2004,7 +2004,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e6oC+I08dE1oQerl+tHqno", + "fileId": "1fz+bPEzdKdJI8eL7WPk7r", "prefabRootNode": { "__id__": 1 }, @@ -2034,7 +2034,7 @@ "propertyPath": [ "_name" ], - "value": "c5" + "value": "card5" }, { "__type__": "cc.TargetInfo", @@ -2053,7 +2053,7 @@ "value": { "__type__": "cc.Vec3", "x": 280, - "y": 25, + "y": 0, "z": 0 } }, @@ -2209,7 +2209,7 @@ "_left": 0, "_right": 0, "_top": 15, - "_bottom": 115, + "_bottom": 165, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2982,7 +2982,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 390, + "y": 415, "z": 0 }, "_lrot": { @@ -5853,7 +5853,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 390, + "_bottom": 415, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -13813,6 +13813,7 @@ "__type__": "463c7iN7clDbLBuuJ6fqWQv", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 410 }, @@ -14003,6 +14004,7 @@ "__type__": "e7482dUVpJEJZzHkqJl1ZWP", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -14042,7 +14044,7 @@ "__id__": 650 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 690 @@ -15019,6 +15021,7 @@ "__type__": "11498TbVJpO6qmZ8m9k55Zx", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 649 }, @@ -19772,6 +19775,7 @@ "__type__": "ee99bEQ89lEtavAHQsY2sba", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 },