diff --git a/assets/resources/common/prefab/notify.prefab b/assets/resources/common/prefab/notify.prefab index 45d20e2b..9ff58e88 100644 --- a/assets/resources/common/prefab/notify.prefab +++ b/assets/resources/common/prefab/notify.prefab @@ -22,11 +22,20 @@ "__id__": 2 }, { - "__id__": 18 + "__id__": 8 + }, + { + "__id__": 14 } ], "_active": true, "_components": [ + { + "__id__": 22 + }, + { + "__id__": 24 + }, { "__id__": 26 }, @@ -35,18 +44,15 @@ }, { "__id__": 30 - }, - { - "__id__": 32 } ], "_prefab": { - "__id__": 34 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 378.105, + "y": 555, "z": 0 }, "_lrot": { @@ -74,35 +80,28 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "Title_LineTopBottom_04_BgGlow", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 3 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 11 + "__id__": 3 }, { - "__id__": 13 - }, - { - "__id__": 15 + "__id__": 5 } ], "_prefab": { - "__id__": 17 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", - "x": 40, + "x": 0, "y": 0, "z": 0 }, @@ -129,75 +128,22 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "magic_fire_OTHER2_0_Buff_0-0", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - } - ], - "_prefab": { - "__id__": 10 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -332.552, - "y": -18.643, - "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__": 3 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 5 + "__id__": 4 }, "_contentSize": { "__type__": "cc.Size", - "width": 256, - "height": 256 + "width": 900, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -208,7 +154,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0aAQZY/YxHxoNVABytrSlf" + "fileId": "f9jyKw5ShNoJ2tJ61nCiff" }, { "__type__": "cc.Sprite", @@ -216,11 +162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 6 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -228,17 +174,17 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 255, - "b": 255, + "g": 234, + "b": 82, "a": 255 }, "_spriteFrame": { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@a173d", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@4b8c8", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -253,36 +199,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3b0xszIglAipphoExE3Kwd" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "83d8ae69-fe53-4647-8fdc-e64122f41a38", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "83d8ae69-fe53-4647-8fdc-e64122f41a38", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "47yc7AFURPV5l/hMtxFzE3" + "fileId": "a9qOrxgrdK1aBgRpnzsqZ8" }, { "__type__": "cc.PrefabInfo", @@ -292,27 +209,77 @@ "asset": { "__id__": 0 }, - "fileId": "82qSwrn7xCLbofCxdNFAIw", + "fileId": "78y9TdIYpF9LnXEisVhnm7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "ToastMessage_01_Line", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5.34, + "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__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 10 }, "_contentSize": { "__type__": "cc.Size", - "width": 580, - "height": 120 + "width": 920, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -323,7 +290,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13p+HaCX9IhoUyY1HwAluk" + "fileId": "25jZ6z/wVBjIR2hXpaumEc" }, { "__type__": "cc.Sprite", @@ -331,24 +298,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 114, + "g": 107, + "b": 107, "a": 255 }, "_spriteFrame": { - "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564@b85e5", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@59571", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -368,43 +335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "48Qxk3L7xByalrmpQgPSQ+" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_alignFlags": 40, - "_target": null, - "_left": 100, - "_right": 20, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 92, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bfc70Fog5LhbmCnjv0/qfA" + "fileId": "ccY5o+S9VJlLgFoYbgBplj" }, { "__type__": "cc.PrefabInfo", @@ -414,7 +345,7 @@ "asset": { "__id__": 0 }, - "fileId": "45fXlFwSZN1qpi/xXKkYUz", + "fileId": "2aMb6mwMNJC4nfNswoQOwF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -430,22 +361,22 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + }, { "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 } ], "_prefab": { - "__id__": 25 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", - "x": 30, + "x": 0, "y": 0, "z": 0 }, @@ -478,15 +409,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 16 }, "_contentSize": { "__type__": "cc.Size", - "width": 500, + "width": 600, "height": 54.4 }, "_anchorPoint": { @@ -506,11 +437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 18 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -525,8 +456,8 @@ "_string": "信息", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 35, + "_fontSize": 35, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 3, @@ -574,11 +505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 20 }, "_params": [], "_dataID": "", @@ -611,7 +542,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -639,7 +570,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 25 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -681,7 +612,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 27 }, "playOnLoad": true, "_clips": [ @@ -710,13 +641,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 29 }, "lab_content": { - "__id__": 21 + "__id__": 17 }, "animation": { - "__id__": 30 + "__id__": 26 }, "_id": "" }, @@ -724,6 +655,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "965Ml9gPBIqJ2+GUadTe+K" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 10, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2zw+Or45DsIUs9Ufp1kbN" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/gui/anim/tip.anim b/assets/resources/gui/anim/tip.anim index d5f3568b..b1b5c5da 100644 --- a/assets/resources/gui/anim/tip.anim +++ b/assets/resources/gui/anim/tip.anim @@ -7,11 +7,11 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 4, + "sample": 12, "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 1.25, + "_duration": 0.6666666666666666, "_hash": 500763545, "_tracks": [ { @@ -62,30 +62,45 @@ "__type__": "cc.ObjectCurve", "_times": [ 0, + 0.08333333333333333, + 0.16666666666666666, 0.25, + 0.3333333333333333, + 0.4166666666666667, 0.5, - 0.75, - 1 + 0.5833333333333334 ], "_values": [ { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@a173d", + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@aecf9", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@d4730", + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@f3b7f", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@28e77", + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@e0613", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@a5804", + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@c227e", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@0c3ca", + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@536d9", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@df200", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@08a4b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "940c5506-25f7-4fa7-9bab-b426b471f9a1@08ca7", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/gui/element/guide_step.prefab b/assets/resources/gui/element/guide_step.prefab index d18fcc81..a3191c9e 100644 --- a/assets/resources/gui/element/guide_step.prefab +++ b/assets/resources/gui/element/guide_step.prefab @@ -27,21 +27,21 @@ ], "_active": true, "_components": [ + { + "__id__": 55 + }, + { + "__id__": 57 + }, + { + "__id__": 67 + }, { "__id__": 69 - }, - { - "__id__": 71 - }, - { - "__id__": 81 - }, - { - "__id__": 83 } ], "_prefab": { - "__id__": 85 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -290,7 +290,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "77am+qJrpI9pbHIjxWFWB1", + "fileId": "e7jZoqK6dKYLaOgseFE1rC", "prefabRootNode": { "__id__": 1 }, @@ -319,32 +319,11 @@ { "__id__": 52 }, + { + "__id__": 53 + }, { "__id__": 54 - }, - { - "__id__": 55 - }, - { - "__id__": 57 - }, - { - "__id__": 59 - }, - { - "__id__": 61 - }, - { - "__id__": 63 - }, - { - "__id__": 65 - }, - { - "__id__": 66 - }, - { - "__id__": 68 } ], "removedComponents": [] @@ -404,7 +383,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 630, - "y": -33.319, + "y": 243.948, "z": 0 }, "_lrot": { @@ -879,7 +858,7 @@ "_left": 0, "_right": 30, "_top": 1198.675, - "_bottom": -63.319, + "_bottom": 213.948, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -938,7 +917,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 970, + "y": 780, "z": 0 } }, @@ -978,30 +957,10 @@ "targetInfo": { "__id__": 51 }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 720, - "height": 300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ccHQEtJuZAcaCckGq+JhVV" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 - }, "propertyPath": [ "_alignFlags" ], - "value": 17 + "value": 41 }, { "__type__": "cc.TargetInfo", @@ -1012,157 +971,32 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 53 + "__id__": 51 }, "propertyPath": [ - "_right" + "_bottom" ], - "value": 620 + "value": 100 }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 680, - "height": 300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a1Tj8D5gNHgJVjUfhdPrlk" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 58 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 360, - "y": 150, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "67kg5YwcZBaIjN5qk6hfes" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 60 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 680, - "height": 313 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "098IVImrhLbJMQEXLcx1KO" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 62 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 460, - "y": 150, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "79YIQDtXNBi4+Fe9c3EQNE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -212.573, - "y": -101.674, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "8f5EdzC05FhrFO3eJrVhes" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 + "__id__": 51 }, "propertyPath": [ "_top" ], - "value": 10 + "value": 300 }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 67 + "__id__": 51 }, "propertyPath": [ - "_type" + "_originalHeight" ], - "value": 1 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "66m1QqP4dPyKY4bxErbD1b" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 67 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 204, - "g": 204, - "b": 204, - "a": 255 - } + "value": 200 }, { "__type__": "cc.UITransform", @@ -1174,7 +1008,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1202,10 +1036,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 58 }, "tipLabel": { - "__id__": 73 + "__id__": 59 }, "tipNode": { "__id__": 17 @@ -1228,11 +1062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 66 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1298,22 +1132,22 @@ "_active": true, "_components": [ { - "__id__": 75 + "__id__": 61 }, { - "__id__": 73 + "__id__": 59 }, { - "__id__": 77 + "__id__": 63 } ], "_prefab": { - "__id__": 79 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", - "x": 460, - "y": 150, + "x": 360, + "y": 100, "z": 0 }, "_lrot": { @@ -1345,15 +1179,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", - "width": 420, + "width": 620, "height": 54.4 }, "_anchorPoint": { @@ -1373,16 +1207,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 64 }, - "_alignFlags": 18, + "_alignFlags": 42, "_target": null, - "_left": 250, - "_right": 70, + "_left": 50, + "_right": 50, "_top": 106.3, "_bottom": 39.3, "_horizontalCenter": 100, @@ -1393,7 +1227,7 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 400, + "_originalWidth": 420, "_originalHeight": 54.4, "_alignMode": 2, "_lockFlags": 0, @@ -1430,7 +1264,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 68 }, "_alignFlags": 45, "_target": null, @@ -1466,7 +1300,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 70 }, "_id": "" }, @@ -1486,7 +1320,7 @@ "instance": null, "targetOverrides": [ { - "__id__": 86 + "__id__": 72 } ], "nestedPrefabInstanceRoots": [ @@ -1501,7 +1335,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 71 + "__id__": 57 }, "sourceInfo": null, "propertyPath": [ @@ -1511,7 +1345,7 @@ "__id__": 17 }, "targetInfo": { - "__id__": 87 + "__id__": 73 } }, { diff --git a/assets/resources/gui/element/tip.prefab b/assets/resources/gui/element/tip.prefab index 194fefb5..8bfeea37 100644 --- a/assets/resources/gui/element/tip.prefab +++ b/assets/resources/gui/element/tip.prefab @@ -157,7 +157,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 13.5, + "y": 205.51, "z": 0 }, "_lrot": { @@ -405,7 +405,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 680, - "height": 213 + "height": 212.99999999999997 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -502,8 +502,8 @@ "_target": null, "_left": 0, "_right": 0, - "_top": -20, - "_bottom": 7, + "_top": -212.01000000000002, + "_bottom": 199.01000000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -580,13 +580,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 73, + "g": 73, + "b": 73, "a": 255 }, "_spriteFrame": { - "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564@b85e5", + "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564@df277", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -601,7 +601,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -683,7 +686,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 460, + "x": 360, "y": 100, "z": 0 }, @@ -724,8 +727,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 420, - "height": 54.4 + "width": 620, + "height": 188.79999999999998 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -760,20 +763,20 @@ "b": 255, "a": 255 }, - "_string": "信息", + "_string": "伟大的勇者,欢迎来到 『像素大陆』", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 60, + "_fontSize": 60, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 80, "_overflow": 3, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": false, + "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 1, @@ -785,7 +788,7 @@ "b": 0, "a": 255 }, - "_outlineWidth": 2, + "_outlineWidth": 4, "_enableShadow": false, "_shadowColor": { "__type__": "cc.Color", @@ -818,10 +821,10 @@ "__prefab": { "__id__": 36 }, - "_alignFlags": 18, + "_alignFlags": 42, "_target": null, - "_left": 250, - "_right": 70, + "_left": 50, + "_right": 50, "_top": 106.3, "_bottom": 39.3, "_horizontalCenter": 100, @@ -832,7 +835,7 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 400, + "_originalWidth": 420, "_originalHeight": 54.4, "_alignMode": 2, "_lockFlags": 0, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 59de6268..8026efd1 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,14 +25,17 @@ "__id__": 280 }, { - "__id__": 1566 + "__id__": 1568 }, { - "__id__": 1606 + "__id__": 1608 } ], "_active": true, "_components": [ + { + "__id__": 1816 + }, { "__id__": 1818 }, @@ -41,13 +44,10 @@ }, { "__id__": 1822 - }, - { - "__id__": 1824 } ], "_prefab": { - "__id__": 1826 + "__id__": 1824 }, "_lpos": { "__type__": "cc.Vec3", @@ -2743,7 +2743,7 @@ "__id__": 125 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 127 @@ -2879,7 +2879,7 @@ "__id__": 125 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 133 @@ -6167,23 +6167,20 @@ "__id__": 574 }, { - "__id__": 601 + "__id__": 603 }, { - "__id__": 621 + "__id__": 623 }, { - "__id__": 1266 + "__id__": 1268 }, { - "__id__": 1344 + "__id__": 1346 } ], "_active": true, "_components": [ - { - "__id__": 1557 - }, { "__id__": 1559 }, @@ -6192,10 +6189,13 @@ }, { "__id__": 1563 + }, + { + "__id__": 1565 } ], "_prefab": { - "__id__": 1565 + "__id__": 1567 }, "_lpos": { "__type__": "cc.Vec3", @@ -12567,26 +12567,26 @@ "__id__": 575 }, { - "__id__": 581 + "__id__": 583 }, { - "__id__": 587 + "__id__": 589 } ], "_active": true, "_components": [ - { - "__id__": 593 - }, { "__id__": 595 }, { - "__id__": 598 + "__id__": 597 + }, + { + "__id__": 600 } ], "_prefab": { - "__id__": 600 + "__id__": 602 }, "_lpos": { "__type__": "cc.Vec3", @@ -12633,10 +12633,13 @@ }, { "__id__": 578 + }, + { + "__id__": 580 } ], "_prefab": { - "__id__": 580 + "__id__": 582 }, "_lpos": { "__type__": "cc.Vec3", @@ -12681,8 +12684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 260, - "height": 140 + "width": 200, + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -12718,7 +12721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@44c62", + "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564@91ae6", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -12733,13 +12736,52 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "6cd18ad7-7b15-43fc-b1bc-33a3973a6564", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", "fileId": "64qPAV7D9HsZhsl8BNUS3M" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 575 + }, + "_enabled": false, + "__prefab": { + "__id__": 581 + }, + "_alignFlags": 45, + "_target": null, + "_left": 73.076923, + "_right": 73.076923, + "_top": 44.96586253982704, + "_bottom": 44.96586253982704, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 260, + "_originalHeight": 140, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "de0/RHst5AEICUg9Yeox3K" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -12762,22 +12804,22 @@ "__id__": 574 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 582 + "__id__": 584 }, { - "__id__": 584 + "__id__": 586 } ], "_prefab": { - "__id__": 586 + "__id__": 588 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 23.096000000000004, + "y": 2.201, "z": 0 }, "_lrot": { @@ -12809,11 +12851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 581 + "__id__": 583 }, "_enabled": true, "__prefab": { - "__id__": 583 + "__id__": 585 }, "_contentSize": { "__type__": "cc.Size", @@ -12837,11 +12879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 581 + "__id__": 583 }, "_enabled": true, "__prefab": { - "__id__": 585 + "__id__": 587 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12901,19 +12943,19 @@ "_active": true, "_components": [ { - "__id__": 588 + "__id__": 590 }, { - "__id__": 590 + "__id__": 592 } ], "_prefab": { - "__id__": 592 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25.86500000000001, + "y": -2.889, "z": 0 }, "_lrot": { @@ -12945,11 +12987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 589 + "__id__": 591 }, "_contentSize": { "__type__": "cc.Size", @@ -12973,11 +13015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 587 + "__id__": 589 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 593 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13002,7 +13044,7 @@ "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": false, + "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, @@ -13058,12 +13100,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 594 + "__id__": 596 }, "_contentSize": { "__type__": "cc.Size", - "width": 240, - "height": 100 + "width": 300, + "height": 140 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -13086,11 +13128,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 598 }, "clickEvents": [ { - "__id__": 597 + "__id__": 599 } ], "_interactable": true, @@ -13156,16 +13198,16 @@ "node": { "__id__": 574 }, - "_enabled": false, + "_enabled": true, "__prefab": { - "__id__": 599 + "__id__": 601 }, "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 300, + "_bottom": 280, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -13207,31 +13249,31 @@ }, "_children": [ { - "__id__": 602 + "__id__": 604 }, { - "__id__": 608 + "__id__": 610 } ], "_active": true, "_components": [ - { - "__id__": 614 - }, { "__id__": 616 }, { "__id__": 618 + }, + { + "__id__": 620 } ], "_prefab": { - "__id__": 620 + "__id__": 622 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1140, + "y": 430.192, "z": 0 }, "_lrot": { @@ -13263,25 +13305,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 601 + "__id__": 603 }, "_children": [], "_active": true, "_components": [ { - "__id__": 603 + "__id__": 605 }, { - "__id__": 605 + "__id__": 607 } ], "_prefab": { - "__id__": 607 + "__id__": 609 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -7.174, + "y": 0, "z": 0 }, "_lrot": { @@ -13293,8 +13335,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, + "x": 0.9, + "y": 0.9, "z": 1 }, "_mobility": 0, @@ -13313,16 +13355,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 604 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 606 }, "_contentSize": { "__type__": "cc.Size", - "width": 240, - "height": 53 + "width": 150, + "height": 54.9 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -13341,11 +13383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 602 + "__id__": 604 }, "_enabled": true, "__prefab": { - "__id__": 606 + "__id__": 608 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13358,7 +13400,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8a53c", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8e19b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -13373,7 +13415,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -13389,8 +13434,6 @@ "__id__": 0 }, "fileId": "39v/VxgIxHComfHy58JMuz", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -13399,25 +13442,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 601 + "__id__": 603 }, "_children": [], "_active": true, "_components": [ { - "__id__": 609 + "__id__": 611 }, { - "__id__": 611 + "__id__": 613 } ], "_prefab": { - "__id__": 613 + "__id__": 615 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -1.02, + "y": 0, "z": 0 }, "_lrot": { @@ -13449,16 +13492,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 610 + "__id__": 612 }, "_contentSize": { "__type__": "cc.Size", - "width": 132.36181640625, - "height": 60.7 + "width": 95.68701171875, + "height": 48.1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -13477,11 +13520,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 608 + "__id__": 610 }, "_enabled": true, "__prefab": { - "__id__": 612 + "__id__": 614 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13496,17 +13539,17 @@ "_string": "第 1 关", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 35, - "_fontSize": 35, + "_actualFontSize": 25, + "_fontSize": 25, "_fontFamily": "Arial", - "_lineHeight": 45, + "_lineHeight": 35, "_overflow": 0, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": true, + "_isBold": false, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, @@ -13558,11 +13601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 603 }, "_enabled": true, "__prefab": { - "__id__": 615 + "__id__": 617 }, "_contentSize": { "__type__": "cc.Size", @@ -13586,18 +13629,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 603 }, "_enabled": true, "__prefab": { - "__id__": 617 + "__id__": 619 }, - "_alignFlags": 17, + "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, - "_top": 100, - "_bottom": 0, + "_top": 0, + "_bottom": 390.192, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -13622,11 +13665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 601 + "__id__": 603 }, "_enabled": true, "__prefab": { - "__id__": 619 + "__id__": 621 }, "_id": "" }, @@ -13657,26 +13700,23 @@ }, "_children": [ { - "__id__": 622 + "__id__": 624 }, { - "__id__": 630 + "__id__": 632 }, { - "__id__": 790 + "__id__": 792 }, { - "__id__": 1186 + "__id__": 1188 }, { - "__id__": 1241 + "__id__": 1243 } ], "_active": false, "_components": [ - { - "__id__": 1257 - }, { "__id__": 1259 }, @@ -13685,10 +13725,13 @@ }, { "__id__": 1263 + }, + { + "__id__": 1265 } ], "_prefab": { - "__id__": 1265 + "__id__": 1267 }, "_lpos": { "__type__": "cc.Vec3", @@ -13725,23 +13768,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 623 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 623 - }, { "__id__": 625 }, { "__id__": 627 + }, + { + "__id__": 629 } ], "_prefab": { - "__id__": 629 + "__id__": 631 }, "_lpos": { "__type__": "cc.Vec3", @@ -13778,11 +13821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 624 }, "_enabled": true, "__prefab": { - "__id__": 624 + "__id__": 626 }, "_contentSize": { "__type__": "cc.Size", @@ -13806,11 +13849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 624 }, "_enabled": true, "__prefab": { - "__id__": 626 + "__id__": 628 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13851,11 +13894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 622 + "__id__": 624 }, "_enabled": true, "__prefab": { - "__id__": 628 + "__id__": 630 }, "_alignFlags": 45, "_target": null, @@ -13900,30 +13943,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 623 }, "_children": [ { - "__id__": 631 + "__id__": 633 }, { - "__id__": 759 + "__id__": 761 }, { - "__id__": 773 + "__id__": 775 } ], "_active": true, "_components": [ { - "__id__": 785 + "__id__": 787 }, { - "__id__": 787 + "__id__": 789 } ], "_prefab": { - "__id__": 789 + "__id__": 791 }, "_lpos": { "__type__": "cc.Vec3", @@ -13960,36 +14003,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 630 + "__id__": 632 }, "_children": [ { - "__id__": 632 + "__id__": 634 }, { - "__id__": 662 + "__id__": 664 }, { - "__id__": 692 + "__id__": 694 }, { - "__id__": 722 + "__id__": 724 } ], "_active": true, "_components": [ - { - "__id__": 752 - }, { "__id__": 754 }, { "__id__": 756 + }, + { + "__id__": 758 } ], "_prefab": { - "__id__": 758 + "__id__": 760 }, "_lpos": { "__type__": "cc.Vec3", @@ -14024,17 +14067,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 631 + "__id__": 633 }, "_prefab": { - "__id__": 633 + "__id__": 635 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 632 + "__id__": 634 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -14042,7 +14085,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 634 + "__id__": 636 }, "targetOverrides": null }, @@ -14055,21 +14098,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 635 - }, { "__id__": 637 }, - { - "__id__": 638 - }, { "__id__": 639 }, { "__id__": 640 }, + { + "__id__": 641 + }, { "__id__": 642 }, @@ -14099,6 +14139,9 @@ }, { "__id__": 660 + }, + { + "__id__": 662 } ], "removedComponents": [] @@ -14106,7 +14149,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 638 }, "propertyPath": [ "_name" @@ -14122,7 +14165,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 638 }, "propertyPath": [ "_lpos" @@ -14137,7 +14180,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 638 }, "propertyPath": [ "_lrot" @@ -14153,7 +14196,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 636 + "__id__": 638 }, "propertyPath": [ "_euler" @@ -14168,7 +14211,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 641 + "__id__": 643 }, "propertyPath": [ "_verticalCenter" @@ -14184,7 +14227,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 643 + "__id__": 645 }, "propertyPath": [ "_contentSize" @@ -14201,27 +14244,6 @@ "0c3KhXoilPSJTPJkQGL/8e" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 645 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -14240,7 +14262,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -14251,6 +14273,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 651 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -14267,7 +14310,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 651 + "__id__": 653 }, "propertyPath": [ "_contentSize" @@ -14288,7 +14331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 653 + "__id__": 655 }, "propertyPath": [ "_contentSize" @@ -14309,7 +14352,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 655 + "__id__": 657 }, "propertyPath": [ "_contentSize" @@ -14329,7 +14372,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 657 + "__id__": 659 }, "propertyPath": [ "_lpos" @@ -14350,7 +14393,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 659 + "__id__": 661 }, "propertyPath": [ "_lpos" @@ -14371,7 +14414,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 661 + "__id__": 663 }, "propertyPath": [ "_lpos" @@ -14393,17 +14436,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 631 + "__id__": 633 }, "_prefab": { - "__id__": 663 + "__id__": 665 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 662 + "__id__": 664 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -14411,7 +14454,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 664 + "__id__": 666 }, "targetOverrides": null }, @@ -14424,21 +14467,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 665 - }, { "__id__": 667 }, - { - "__id__": 668 - }, { "__id__": 669 }, { "__id__": 670 }, + { + "__id__": 671 + }, { "__id__": 672 }, @@ -14468,6 +14508,9 @@ }, { "__id__": 690 + }, + { + "__id__": 692 } ], "removedComponents": [] @@ -14475,7 +14518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 666 + "__id__": 668 }, "propertyPath": [ "_name" @@ -14491,7 +14534,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 666 + "__id__": 668 }, "propertyPath": [ "_lpos" @@ -14506,7 +14549,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 666 + "__id__": 668 }, "propertyPath": [ "_lrot" @@ -14522,7 +14565,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 666 + "__id__": 668 }, "propertyPath": [ "_euler" @@ -14537,7 +14580,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 671 + "__id__": 673 }, "propertyPath": [ "_verticalCenter" @@ -14553,7 +14596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 673 + "__id__": 675 }, "propertyPath": [ "_contentSize" @@ -14570,27 +14613,6 @@ "0c3KhXoilPSJTPJkQGL/8e" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 675 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -14609,7 +14631,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -14620,6 +14642,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 681 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -14636,7 +14679,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 681 + "__id__": 683 }, "propertyPath": [ "_contentSize" @@ -14657,7 +14700,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 683 + "__id__": 685 }, "propertyPath": [ "_contentSize" @@ -14678,7 +14721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 685 + "__id__": 687 }, "propertyPath": [ "_contentSize" @@ -14698,7 +14741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 687 + "__id__": 689 }, "propertyPath": [ "_lpos" @@ -14719,7 +14762,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 689 + "__id__": 691 }, "propertyPath": [ "_lpos" @@ -14740,7 +14783,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 691 + "__id__": 693 }, "propertyPath": [ "_lpos" @@ -14762,17 +14805,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 631 + "__id__": 633 }, "_prefab": { - "__id__": 693 + "__id__": 695 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 692 + "__id__": 694 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -14780,7 +14823,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 694 + "__id__": 696 }, "targetOverrides": null }, @@ -14793,21 +14836,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 695 - }, { "__id__": 697 }, - { - "__id__": 698 - }, { "__id__": 699 }, { "__id__": 700 }, + { + "__id__": 701 + }, { "__id__": 702 }, @@ -14837,6 +14877,9 @@ }, { "__id__": 720 + }, + { + "__id__": 722 } ], "removedComponents": [] @@ -14844,7 +14887,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 696 + "__id__": 698 }, "propertyPath": [ "_name" @@ -14860,7 +14903,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 696 + "__id__": 698 }, "propertyPath": [ "_lpos" @@ -14875,7 +14918,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 696 + "__id__": 698 }, "propertyPath": [ "_lrot" @@ -14891,7 +14934,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 696 + "__id__": 698 }, "propertyPath": [ "_euler" @@ -14906,7 +14949,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 701 + "__id__": 703 }, "propertyPath": [ "_verticalCenter" @@ -14922,7 +14965,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 705 }, "propertyPath": [ "_contentSize" @@ -14939,27 +14982,6 @@ "0c3KhXoilPSJTPJkQGL/8e" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 705 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -14978,7 +15000,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -14989,6 +15011,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 711 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -15005,7 +15048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 711 + "__id__": 713 }, "propertyPath": [ "_contentSize" @@ -15026,7 +15069,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 713 + "__id__": 715 }, "propertyPath": [ "_contentSize" @@ -15047,7 +15090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 715 + "__id__": 717 }, "propertyPath": [ "_contentSize" @@ -15067,7 +15110,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 717 + "__id__": 719 }, "propertyPath": [ "_lpos" @@ -15088,7 +15131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 719 + "__id__": 721 }, "propertyPath": [ "_lpos" @@ -15109,7 +15152,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 721 + "__id__": 723 }, "propertyPath": [ "_lpos" @@ -15131,17 +15174,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 631 + "__id__": 633 }, "_prefab": { - "__id__": 723 + "__id__": 725 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 722 + "__id__": 724 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -15149,7 +15192,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 724 + "__id__": 726 }, "targetOverrides": null }, @@ -15162,21 +15205,18 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 725 - }, { "__id__": 727 }, - { - "__id__": 728 - }, { "__id__": 729 }, { "__id__": 730 }, + { + "__id__": 731 + }, { "__id__": 732 }, @@ -15206,6 +15246,9 @@ }, { "__id__": 750 + }, + { + "__id__": 752 } ], "removedComponents": [] @@ -15213,7 +15256,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 728 }, "propertyPath": [ "_name" @@ -15229,7 +15272,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 728 }, "propertyPath": [ "_lpos" @@ -15244,7 +15287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 728 }, "propertyPath": [ "_lrot" @@ -15260,7 +15303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 726 + "__id__": 728 }, "propertyPath": [ "_euler" @@ -15275,7 +15318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 731 + "__id__": 733 }, "propertyPath": [ "_verticalCenter" @@ -15291,7 +15334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 733 + "__id__": 735 }, "propertyPath": [ "_contentSize" @@ -15308,27 +15351,6 @@ "0c3KhXoilPSJTPJkQGL/8e" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 735 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -15347,7 +15369,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -15358,6 +15380,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 741 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -15374,7 +15417,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 741 + "__id__": 743 }, "propertyPath": [ "_contentSize" @@ -15395,7 +15438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 743 + "__id__": 745 }, "propertyPath": [ "_contentSize" @@ -15416,7 +15459,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 745 + "__id__": 747 }, "propertyPath": [ "_contentSize" @@ -15436,7 +15479,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 747 + "__id__": 749 }, "propertyPath": [ "_lpos" @@ -15457,7 +15500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 749 + "__id__": 751 }, "propertyPath": [ "_lpos" @@ -15478,7 +15521,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 751 + "__id__": 753 }, "propertyPath": [ "_lpos" @@ -15502,11 +15545,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 631 + "__id__": 633 }, "_enabled": true, "__prefab": { - "__id__": 753 + "__id__": 755 }, "_contentSize": { "__type__": "cc.Size", @@ -15530,11 +15573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 631 + "__id__": 633 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 757 }, "_alignFlags": 45, "_target": null, @@ -15566,11 +15609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 631 + "__id__": 633 }, "_enabled": true, "__prefab": { - "__id__": 757 + "__id__": 759 }, "_resizeMode": 1, "_layoutType": 3, @@ -15617,27 +15660,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 630 + "__id__": 632 }, "_children": [ { - "__id__": 760 + "__id__": 762 } ], "_active": true, "_components": [ - { - "__id__": 766 - }, { "__id__": 768 }, { "__id__": 770 + }, + { + "__id__": 772 } ], "_prefab": { - "__id__": 772 + "__id__": 774 }, "_lpos": { "__type__": "cc.Vec3", @@ -15674,20 +15717,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 759 + "__id__": 761 }, "_children": [], "_active": true, "_components": [ { - "__id__": 761 + "__id__": 763 }, { - "__id__": 763 + "__id__": 765 } ], "_prefab": { - "__id__": 765 + "__id__": 767 }, "_lpos": { "__type__": "cc.Vec3", @@ -15724,11 +15767,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 760 + "__id__": 762 }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 764 }, "_contentSize": { "__type__": "cc.Size", @@ -15752,11 +15795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 760 + "__id__": 762 }, "_enabled": true, "__prefab": { - "__id__": 764 + "__id__": 766 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15833,11 +15876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 759 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 769 }, "_contentSize": { "__type__": "cc.Size", @@ -15861,11 +15904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 759 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 771 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15906,11 +15949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 759 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 771 + "__id__": 773 }, "_alignFlags": 41, "_target": null, @@ -15955,24 +15998,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 630 + "__id__": 632 }, "_children": [ { - "__id__": 774 + "__id__": 776 } ], "_active": true, "_components": [ { - "__id__": 780 + "__id__": 782 }, { - "__id__": 782 + "__id__": 784 } ], "_prefab": { - "__id__": 784 + "__id__": 786 }, "_lpos": { "__type__": "cc.Vec3", @@ -16009,20 +16052,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 775 }, "_children": [], "_active": true, "_components": [ { - "__id__": 775 + "__id__": 777 }, { - "__id__": 777 + "__id__": 779 } ], "_prefab": { - "__id__": 779 + "__id__": 781 }, "_lpos": { "__type__": "cc.Vec3", @@ -16059,11 +16102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 778 }, "_contentSize": { "__type__": "cc.Size", @@ -16087,11 +16130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 778 + "__id__": 780 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16168,11 +16211,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 781 + "__id__": 783 }, "_contentSize": { "__type__": "cc.Size", @@ -16196,11 +16239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 785 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16254,11 +16297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 788 }, "_contentSize": { "__type__": "cc.Size", @@ -16282,11 +16325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 632 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 790 }, "_alignFlags": 44, "_target": null, @@ -16331,27 +16374,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 623 }, "_children": [ { - "__id__": 791 + "__id__": 793 }, { - "__id__": 1167 + "__id__": 1169 } ], "_active": true, "_components": [ { - "__id__": 1181 + "__id__": 1183 }, { - "__id__": 1183 + "__id__": 1185 } ], "_prefab": { - "__id__": 1185 + "__id__": 1187 }, "_lpos": { "__type__": "cc.Vec3", @@ -16388,48 +16431,48 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 790 + "__id__": 792 }, "_children": [ { - "__id__": 792 + "__id__": 794 }, { - "__id__": 838 + "__id__": 840 }, { - "__id__": 884 + "__id__": 886 }, { - "__id__": 930 + "__id__": 932 }, { - "__id__": 976 + "__id__": 978 }, { - "__id__": 1022 + "__id__": 1024 }, { - "__id__": 1068 + "__id__": 1070 }, { - "__id__": 1114 + "__id__": 1116 } ], "_active": true, "_components": [ - { - "__id__": 1160 - }, { "__id__": 1162 }, { "__id__": 1164 + }, + { + "__id__": 1166 } ], "_prefab": { - "__id__": 1166 + "__id__": 1168 }, "_lpos": { "__type__": "cc.Vec3", @@ -16464,17 +16507,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 793 + "__id__": 795 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 792 + "__id__": 794 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -16482,7 +16525,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 794 + "__id__": 796 }, "targetOverrides": null }, @@ -16495,29 +16538,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 795 - }, { "__id__": 797 }, - { - "__id__": 798 - }, { "__id__": 799 }, { "__id__": 800 }, + { + "__id__": 801 + }, { "__id__": 802 }, { - "__id__": 803 + "__id__": 804 }, { - "__id__": 804 + "__id__": 805 }, { "__id__": 806 @@ -16525,9 +16565,6 @@ { "__id__": 808 }, - { - "__id__": 809 - }, { "__id__": 810 }, @@ -16537,6 +16574,9 @@ { "__id__": 812 }, + { + "__id__": 813 + }, { "__id__": 814 }, @@ -16572,6 +16612,9 @@ }, { "__id__": 836 + }, + { + "__id__": 838 } ], "removedComponents": [] @@ -16579,7 +16622,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 798 }, "propertyPath": [ "_name" @@ -16595,7 +16638,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 798 }, "propertyPath": [ "_lpos" @@ -16610,7 +16653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 798 }, "propertyPath": [ "_lrot" @@ -16626,7 +16669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 798 }, "propertyPath": [ "_euler" @@ -16641,7 +16684,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 801 + "__id__": 803 }, "propertyPath": [ "_active" @@ -16658,7 +16701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 801 + "__id__": 803 }, "propertyPath": [ "_lscale" @@ -16673,7 +16716,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 801 + "__id__": 803 }, "propertyPath": [ "_lpos" @@ -16688,7 +16731,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 805 + "__id__": 807 }, "propertyPath": [ "_contentSize" @@ -16709,7 +16752,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 809 }, "propertyPath": [ "_top" @@ -16726,7 +16769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 809 }, "propertyPath": [ "_bottom" @@ -16736,7 +16779,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 809 }, "propertyPath": [ "_left" @@ -16746,7 +16789,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 809 }, "propertyPath": [ "_right" @@ -16756,7 +16799,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 807 + "__id__": 809 }, "propertyPath": [ "_isAbsTop" @@ -16766,7 +16809,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 813 + "__id__": 815 }, "propertyPath": [ "_active" @@ -16780,27 +16823,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 815 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -16819,7 +16841,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -16830,6 +16852,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 821 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -16846,7 +16889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 821 + "__id__": 823 }, "propertyPath": [ "_contentSize" @@ -16867,7 +16910,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 823 + "__id__": 825 }, "propertyPath": [ "_contentSize" @@ -16888,7 +16931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 825 + "__id__": 827 }, "propertyPath": [ "_lscale" @@ -16910,7 +16953,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 827 + "__id__": 829 }, "propertyPath": [ "_verticalCenter" @@ -16926,7 +16969,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 829 + "__id__": 831 }, "propertyPath": [ "_contentSize" @@ -16946,7 +16989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 831 + "__id__": 833 }, "propertyPath": [ "_contentSize" @@ -16966,7 +17009,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 833 + "__id__": 835 }, "propertyPath": [ "_lpos" @@ -16987,7 +17030,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 835 + "__id__": 837 }, "propertyPath": [ "_lpos" @@ -17008,7 +17051,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 837 + "__id__": 839 }, "propertyPath": [ "_lpos" @@ -17030,17 +17073,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 839 + "__id__": 841 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 838 + "__id__": 840 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -17048,7 +17091,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 840 + "__id__": 842 }, "targetOverrides": null }, @@ -17061,29 +17104,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 841 - }, { "__id__": 843 }, - { - "__id__": 844 - }, { "__id__": 845 }, { "__id__": 846 }, + { + "__id__": 847 + }, { "__id__": 848 }, { - "__id__": 849 + "__id__": 850 }, { - "__id__": 850 + "__id__": 851 }, { "__id__": 852 @@ -17091,9 +17131,6 @@ { "__id__": 854 }, - { - "__id__": 855 - }, { "__id__": 856 }, @@ -17103,6 +17140,9 @@ { "__id__": 858 }, + { + "__id__": 859 + }, { "__id__": 860 }, @@ -17138,6 +17178,9 @@ }, { "__id__": 882 + }, + { + "__id__": 884 } ], "removedComponents": [] @@ -17145,7 +17188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 842 + "__id__": 844 }, "propertyPath": [ "_name" @@ -17161,7 +17204,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 842 + "__id__": 844 }, "propertyPath": [ "_lpos" @@ -17176,7 +17219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 842 + "__id__": 844 }, "propertyPath": [ "_lrot" @@ -17192,7 +17235,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 842 + "__id__": 844 }, "propertyPath": [ "_euler" @@ -17207,7 +17250,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 849 }, "propertyPath": [ "_active" @@ -17224,7 +17267,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 849 }, "propertyPath": [ "_lscale" @@ -17239,7 +17282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 849 }, "propertyPath": [ "_lpos" @@ -17254,7 +17297,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 851 + "__id__": 853 }, "propertyPath": [ "_contentSize" @@ -17275,7 +17318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 855 }, "propertyPath": [ "_top" @@ -17292,7 +17335,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 855 }, "propertyPath": [ "_bottom" @@ -17302,7 +17345,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 855 }, "propertyPath": [ "_left" @@ -17312,7 +17355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 855 }, "propertyPath": [ "_right" @@ -17322,7 +17365,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 853 + "__id__": 855 }, "propertyPath": [ "_isAbsTop" @@ -17332,7 +17375,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 859 + "__id__": 861 }, "propertyPath": [ "_active" @@ -17346,27 +17389,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 861 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -17385,7 +17407,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -17396,6 +17418,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 867 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -17412,7 +17455,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 867 + "__id__": 869 }, "propertyPath": [ "_contentSize" @@ -17433,7 +17476,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 869 + "__id__": 871 }, "propertyPath": [ "_contentSize" @@ -17454,7 +17497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 871 + "__id__": 873 }, "propertyPath": [ "_lscale" @@ -17476,7 +17519,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 873 + "__id__": 875 }, "propertyPath": [ "_verticalCenter" @@ -17492,7 +17535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 875 + "__id__": 877 }, "propertyPath": [ "_contentSize" @@ -17512,7 +17555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 877 + "__id__": 879 }, "propertyPath": [ "_contentSize" @@ -17532,7 +17575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 879 + "__id__": 881 }, "propertyPath": [ "_lpos" @@ -17553,7 +17596,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 881 + "__id__": 883 }, "propertyPath": [ "_lpos" @@ -17574,7 +17617,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 885 }, "propertyPath": [ "_lpos" @@ -17596,17 +17639,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 885 + "__id__": 887 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 884 + "__id__": 886 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -17614,7 +17657,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 886 + "__id__": 888 }, "targetOverrides": null }, @@ -17627,29 +17670,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 887 - }, { "__id__": 889 }, - { - "__id__": 890 - }, { "__id__": 891 }, { "__id__": 892 }, + { + "__id__": 893 + }, { "__id__": 894 }, { - "__id__": 895 + "__id__": 896 }, { - "__id__": 896 + "__id__": 897 }, { "__id__": 898 @@ -17657,9 +17697,6 @@ { "__id__": 900 }, - { - "__id__": 901 - }, { "__id__": 902 }, @@ -17669,6 +17706,9 @@ { "__id__": 904 }, + { + "__id__": 905 + }, { "__id__": 906 }, @@ -17704,6 +17744,9 @@ }, { "__id__": 928 + }, + { + "__id__": 930 } ], "removedComponents": [] @@ -17711,7 +17754,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 888 + "__id__": 890 }, "propertyPath": [ "_name" @@ -17727,7 +17770,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 888 + "__id__": 890 }, "propertyPath": [ "_lpos" @@ -17742,7 +17785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 888 + "__id__": 890 }, "propertyPath": [ "_lrot" @@ -17758,7 +17801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 888 + "__id__": 890 }, "propertyPath": [ "_euler" @@ -17773,7 +17816,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 893 + "__id__": 895 }, "propertyPath": [ "_active" @@ -17790,7 +17833,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 893 + "__id__": 895 }, "propertyPath": [ "_lscale" @@ -17805,7 +17848,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 893 + "__id__": 895 }, "propertyPath": [ "_lpos" @@ -17820,7 +17863,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 897 + "__id__": 899 }, "propertyPath": [ "_contentSize" @@ -17841,7 +17884,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 901 }, "propertyPath": [ "_top" @@ -17858,7 +17901,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 901 }, "propertyPath": [ "_bottom" @@ -17868,7 +17911,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 901 }, "propertyPath": [ "_left" @@ -17878,7 +17921,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 901 }, "propertyPath": [ "_right" @@ -17888,7 +17931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 901 }, "propertyPath": [ "_isAbsTop" @@ -17898,7 +17941,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 905 + "__id__": 907 }, "propertyPath": [ "_active" @@ -17912,27 +17955,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 907 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -17951,7 +17973,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -17962,6 +17984,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 913 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -17978,7 +18021,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 913 + "__id__": 915 }, "propertyPath": [ "_contentSize" @@ -17999,7 +18042,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 915 + "__id__": 917 }, "propertyPath": [ "_contentSize" @@ -18020,7 +18063,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 917 + "__id__": 919 }, "propertyPath": [ "_lscale" @@ -18042,7 +18085,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 919 + "__id__": 921 }, "propertyPath": [ "_verticalCenter" @@ -18058,7 +18101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 921 + "__id__": 923 }, "propertyPath": [ "_contentSize" @@ -18078,7 +18121,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 923 + "__id__": 925 }, "propertyPath": [ "_contentSize" @@ -18098,7 +18141,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 925 + "__id__": 927 }, "propertyPath": [ "_lpos" @@ -18119,7 +18162,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 927 + "__id__": 929 }, "propertyPath": [ "_lpos" @@ -18140,7 +18183,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 929 + "__id__": 931 }, "propertyPath": [ "_lpos" @@ -18162,17 +18205,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 931 + "__id__": 933 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 930 + "__id__": 932 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -18180,7 +18223,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 932 + "__id__": 934 }, "targetOverrides": null }, @@ -18193,29 +18236,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 933 - }, { "__id__": 935 }, - { - "__id__": 936 - }, { "__id__": 937 }, { "__id__": 938 }, + { + "__id__": 939 + }, { "__id__": 940 }, { - "__id__": 941 + "__id__": 942 }, { - "__id__": 942 + "__id__": 943 }, { "__id__": 944 @@ -18223,9 +18263,6 @@ { "__id__": 946 }, - { - "__id__": 947 - }, { "__id__": 948 }, @@ -18235,6 +18272,9 @@ { "__id__": 950 }, + { + "__id__": 951 + }, { "__id__": 952 }, @@ -18270,6 +18310,9 @@ }, { "__id__": 974 + }, + { + "__id__": 976 } ], "removedComponents": [] @@ -18277,7 +18320,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 934 + "__id__": 936 }, "propertyPath": [ "_name" @@ -18293,7 +18336,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 934 + "__id__": 936 }, "propertyPath": [ "_lpos" @@ -18308,7 +18351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 934 + "__id__": 936 }, "propertyPath": [ "_lrot" @@ -18324,7 +18367,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 934 + "__id__": 936 }, "propertyPath": [ "_euler" @@ -18339,7 +18382,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 941 }, "propertyPath": [ "_active" @@ -18356,7 +18399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 941 }, "propertyPath": [ "_lscale" @@ -18371,7 +18414,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 939 + "__id__": 941 }, "propertyPath": [ "_lpos" @@ -18386,7 +18429,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 945 }, "propertyPath": [ "_contentSize" @@ -18407,7 +18450,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 947 }, "propertyPath": [ "_top" @@ -18424,7 +18467,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 947 }, "propertyPath": [ "_bottom" @@ -18434,7 +18477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 947 }, "propertyPath": [ "_left" @@ -18444,7 +18487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 947 }, "propertyPath": [ "_right" @@ -18454,7 +18497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 945 + "__id__": 947 }, "propertyPath": [ "_isAbsTop" @@ -18464,7 +18507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 951 + "__id__": 953 }, "propertyPath": [ "_active" @@ -18478,27 +18521,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 953 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -18517,7 +18539,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -18528,6 +18550,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 959 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -18544,7 +18587,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 959 + "__id__": 961 }, "propertyPath": [ "_contentSize" @@ -18565,7 +18608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 961 + "__id__": 963 }, "propertyPath": [ "_contentSize" @@ -18586,7 +18629,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 963 + "__id__": 965 }, "propertyPath": [ "_lscale" @@ -18608,7 +18651,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 965 + "__id__": 967 }, "propertyPath": [ "_verticalCenter" @@ -18624,7 +18667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 967 + "__id__": 969 }, "propertyPath": [ "_contentSize" @@ -18644,7 +18687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 969 + "__id__": 971 }, "propertyPath": [ "_contentSize" @@ -18664,7 +18707,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 971 + "__id__": 973 }, "propertyPath": [ "_lpos" @@ -18685,7 +18728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 973 + "__id__": 975 }, "propertyPath": [ "_lpos" @@ -18706,7 +18749,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 975 + "__id__": 977 }, "propertyPath": [ "_lpos" @@ -18728,17 +18771,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 977 + "__id__": 979 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 976 + "__id__": 978 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -18746,7 +18789,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 978 + "__id__": 980 }, "targetOverrides": null }, @@ -18759,29 +18802,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 979 - }, { "__id__": 981 }, - { - "__id__": 982 - }, { "__id__": 983 }, { "__id__": 984 }, + { + "__id__": 985 + }, { "__id__": 986 }, { - "__id__": 987 + "__id__": 988 }, { - "__id__": 988 + "__id__": 989 }, { "__id__": 990 @@ -18789,9 +18829,6 @@ { "__id__": 992 }, - { - "__id__": 993 - }, { "__id__": 994 }, @@ -18801,6 +18838,9 @@ { "__id__": 996 }, + { + "__id__": 997 + }, { "__id__": 998 }, @@ -18836,6 +18876,9 @@ }, { "__id__": 1020 + }, + { + "__id__": 1022 } ], "removedComponents": [] @@ -18843,7 +18886,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 980 + "__id__": 982 }, "propertyPath": [ "_name" @@ -18859,7 +18902,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 980 + "__id__": 982 }, "propertyPath": [ "_lpos" @@ -18874,7 +18917,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 980 + "__id__": 982 }, "propertyPath": [ "_lrot" @@ -18890,7 +18933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 980 + "__id__": 982 }, "propertyPath": [ "_euler" @@ -18905,7 +18948,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 985 + "__id__": 987 }, "propertyPath": [ "_active" @@ -18922,7 +18965,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 985 + "__id__": 987 }, "propertyPath": [ "_lscale" @@ -18937,7 +18980,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 985 + "__id__": 987 }, "propertyPath": [ "_lpos" @@ -18952,7 +18995,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 989 + "__id__": 991 }, "propertyPath": [ "_contentSize" @@ -18973,7 +19016,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 993 }, "propertyPath": [ "_top" @@ -18990,7 +19033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 993 }, "propertyPath": [ "_bottom" @@ -19000,7 +19043,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 993 }, "propertyPath": [ "_left" @@ -19010,7 +19053,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 993 }, "propertyPath": [ "_right" @@ -19020,7 +19063,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 991 + "__id__": 993 }, "propertyPath": [ "_isAbsTop" @@ -19030,7 +19073,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 997 + "__id__": 999 }, "propertyPath": [ "_active" @@ -19044,27 +19087,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 999 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -19083,7 +19105,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -19094,6 +19116,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1005 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -19110,7 +19153,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1005 + "__id__": 1007 }, "propertyPath": [ "_contentSize" @@ -19131,7 +19174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1007 + "__id__": 1009 }, "propertyPath": [ "_contentSize" @@ -19152,7 +19195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1009 + "__id__": 1011 }, "propertyPath": [ "_lscale" @@ -19174,7 +19217,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1011 + "__id__": 1013 }, "propertyPath": [ "_verticalCenter" @@ -19190,7 +19233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1013 + "__id__": 1015 }, "propertyPath": [ "_contentSize" @@ -19210,7 +19253,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1015 + "__id__": 1017 }, "propertyPath": [ "_contentSize" @@ -19230,7 +19273,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1017 + "__id__": 1019 }, "propertyPath": [ "_lpos" @@ -19251,7 +19294,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1019 + "__id__": 1021 }, "propertyPath": [ "_lpos" @@ -19272,7 +19315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1021 + "__id__": 1023 }, "propertyPath": [ "_lpos" @@ -19294,17 +19337,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 1023 + "__id__": 1025 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1022 + "__id__": 1024 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -19312,7 +19355,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 1024 + "__id__": 1026 }, "targetOverrides": null }, @@ -19325,29 +19368,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 1025 - }, { "__id__": 1027 }, - { - "__id__": 1028 - }, { "__id__": 1029 }, { "__id__": 1030 }, + { + "__id__": 1031 + }, { "__id__": 1032 }, { - "__id__": 1033 + "__id__": 1034 }, { - "__id__": 1034 + "__id__": 1035 }, { "__id__": 1036 @@ -19355,9 +19395,6 @@ { "__id__": 1038 }, - { - "__id__": 1039 - }, { "__id__": 1040 }, @@ -19367,6 +19404,9 @@ { "__id__": 1042 }, + { + "__id__": 1043 + }, { "__id__": 1044 }, @@ -19402,6 +19442,9 @@ }, { "__id__": 1066 + }, + { + "__id__": 1068 } ], "removedComponents": [] @@ -19409,7 +19452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1026 + "__id__": 1028 }, "propertyPath": [ "_name" @@ -19425,7 +19468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1026 + "__id__": 1028 }, "propertyPath": [ "_lpos" @@ -19440,7 +19483,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1026 + "__id__": 1028 }, "propertyPath": [ "_lrot" @@ -19456,7 +19499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1026 + "__id__": 1028 }, "propertyPath": [ "_euler" @@ -19471,7 +19514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1031 + "__id__": 1033 }, "propertyPath": [ "_active" @@ -19488,7 +19531,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1031 + "__id__": 1033 }, "propertyPath": [ "_lscale" @@ -19503,7 +19546,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1031 + "__id__": 1033 }, "propertyPath": [ "_lpos" @@ -19518,7 +19561,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1035 + "__id__": 1037 }, "propertyPath": [ "_contentSize" @@ -19539,7 +19582,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1039 }, "propertyPath": [ "_top" @@ -19556,7 +19599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1039 }, "propertyPath": [ "_bottom" @@ -19566,7 +19609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1039 }, "propertyPath": [ "_left" @@ -19576,7 +19619,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1039 }, "propertyPath": [ "_right" @@ -19586,7 +19629,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 1039 }, "propertyPath": [ "_isAbsTop" @@ -19596,7 +19639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1043 + "__id__": 1045 }, "propertyPath": [ "_active" @@ -19610,27 +19653,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 1045 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -19649,7 +19671,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -19660,6 +19682,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1051 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -19676,7 +19719,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1051 + "__id__": 1053 }, "propertyPath": [ "_contentSize" @@ -19697,7 +19740,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1055 }, "propertyPath": [ "_contentSize" @@ -19718,7 +19761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1057 }, "propertyPath": [ "_lscale" @@ -19740,7 +19783,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1057 + "__id__": 1059 }, "propertyPath": [ "_verticalCenter" @@ -19756,7 +19799,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1059 + "__id__": 1061 }, "propertyPath": [ "_contentSize" @@ -19776,7 +19819,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1061 + "__id__": 1063 }, "propertyPath": [ "_contentSize" @@ -19796,7 +19839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1063 + "__id__": 1065 }, "propertyPath": [ "_lpos" @@ -19817,7 +19860,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1065 + "__id__": 1067 }, "propertyPath": [ "_lpos" @@ -19838,7 +19881,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1067 + "__id__": 1069 }, "propertyPath": [ "_lpos" @@ -19860,17 +19903,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 1069 + "__id__": 1071 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1068 + "__id__": 1070 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -19878,7 +19921,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 1070 + "__id__": 1072 }, "targetOverrides": null }, @@ -19891,29 +19934,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 1071 - }, { "__id__": 1073 }, - { - "__id__": 1074 - }, { "__id__": 1075 }, { "__id__": 1076 }, + { + "__id__": 1077 + }, { "__id__": 1078 }, { - "__id__": 1079 + "__id__": 1080 }, { - "__id__": 1080 + "__id__": 1081 }, { "__id__": 1082 @@ -19921,9 +19961,6 @@ { "__id__": 1084 }, - { - "__id__": 1085 - }, { "__id__": 1086 }, @@ -19933,6 +19970,9 @@ { "__id__": 1088 }, + { + "__id__": 1089 + }, { "__id__": 1090 }, @@ -19968,6 +20008,9 @@ }, { "__id__": 1112 + }, + { + "__id__": 1114 } ], "removedComponents": [] @@ -19975,7 +20018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1074 }, "propertyPath": [ "_name" @@ -19991,7 +20034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1074 }, "propertyPath": [ "_lpos" @@ -20006,7 +20049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1074 }, "propertyPath": [ "_lrot" @@ -20022,7 +20065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1074 }, "propertyPath": [ "_euler" @@ -20037,7 +20080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1077 + "__id__": 1079 }, "propertyPath": [ "_active" @@ -20054,7 +20097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1077 + "__id__": 1079 }, "propertyPath": [ "_lscale" @@ -20069,7 +20112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1077 + "__id__": 1079 }, "propertyPath": [ "_lpos" @@ -20084,7 +20127,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1083 }, "propertyPath": [ "_contentSize" @@ -20105,7 +20148,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1085 }, "propertyPath": [ "_top" @@ -20122,7 +20165,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1085 }, "propertyPath": [ "_bottom" @@ -20132,7 +20175,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1085 }, "propertyPath": [ "_left" @@ -20142,7 +20185,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1085 }, "propertyPath": [ "_right" @@ -20152,7 +20195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1085 }, "propertyPath": [ "_isAbsTop" @@ -20162,7 +20205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1089 + "__id__": 1091 }, "propertyPath": [ "_active" @@ -20176,27 +20219,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 1091 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -20215,7 +20237,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -20226,6 +20248,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1097 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -20242,7 +20285,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1097 + "__id__": 1099 }, "propertyPath": [ "_contentSize" @@ -20263,7 +20306,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1099 + "__id__": 1101 }, "propertyPath": [ "_contentSize" @@ -20284,7 +20327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1101 + "__id__": 1103 }, "propertyPath": [ "_lscale" @@ -20306,7 +20349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1103 + "__id__": 1105 }, "propertyPath": [ "_verticalCenter" @@ -20322,7 +20365,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1105 + "__id__": 1107 }, "propertyPath": [ "_contentSize" @@ -20342,7 +20385,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1107 + "__id__": 1109 }, "propertyPath": [ "_contentSize" @@ -20362,7 +20405,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1109 + "__id__": 1111 }, "propertyPath": [ "_lpos" @@ -20383,7 +20426,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1113 }, "propertyPath": [ "_lpos" @@ -20404,7 +20447,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1115 }, "propertyPath": [ "_lpos" @@ -20426,17 +20469,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 791 + "__id__": 793 }, "_prefab": { - "__id__": 1115 + "__id__": 1117 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1114 + "__id__": 1116 }, "asset": { "__uuid__": "39d50326-6ef1-4c37-814e-a8034d3c1f2d", @@ -20444,7 +20487,7 @@ }, "fileId": "f6ZIZpbPVPF6MTrktCfZoL", "instance": { - "__id__": 1116 + "__id__": 1118 }, "targetOverrides": null }, @@ -20457,29 +20500,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 1117 - }, { "__id__": 1119 }, - { - "__id__": 1120 - }, { "__id__": 1121 }, { "__id__": 1122 }, + { + "__id__": 1123 + }, { "__id__": 1124 }, { - "__id__": 1125 + "__id__": 1126 }, { - "__id__": 1126 + "__id__": 1127 }, { "__id__": 1128 @@ -20487,9 +20527,6 @@ { "__id__": 1130 }, - { - "__id__": 1131 - }, { "__id__": 1132 }, @@ -20499,6 +20536,9 @@ { "__id__": 1134 }, + { + "__id__": 1135 + }, { "__id__": 1136 }, @@ -20534,6 +20574,9 @@ }, { "__id__": 1158 + }, + { + "__id__": 1160 } ], "removedComponents": [] @@ -20541,7 +20584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1120 }, "propertyPath": [ "_name" @@ -20557,7 +20600,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1120 }, "propertyPath": [ "_lpos" @@ -20572,7 +20615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1120 }, "propertyPath": [ "_lrot" @@ -20588,7 +20631,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1120 }, "propertyPath": [ "_euler" @@ -20603,7 +20646,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1123 + "__id__": 1125 }, "propertyPath": [ "_active" @@ -20620,7 +20663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1123 + "__id__": 1125 }, "propertyPath": [ "_lscale" @@ -20635,7 +20678,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1123 + "__id__": 1125 }, "propertyPath": [ "_lpos" @@ -20650,7 +20693,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1127 + "__id__": 1129 }, "propertyPath": [ "_contentSize" @@ -20671,7 +20714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1129 + "__id__": 1131 }, "propertyPath": [ "_top" @@ -20688,7 +20731,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1129 + "__id__": 1131 }, "propertyPath": [ "_bottom" @@ -20698,7 +20741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1129 + "__id__": 1131 }, "propertyPath": [ "_left" @@ -20708,7 +20751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1129 + "__id__": 1131 }, "propertyPath": [ "_right" @@ -20718,7 +20761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1129 + "__id__": 1131 }, "propertyPath": [ "_isAbsTop" @@ -20728,7 +20771,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1135 + "__id__": 1137 }, "propertyPath": [ "_active" @@ -20742,27 +20785,6 @@ "64Nl4MpNJC47Fbbva/KuuQ" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 1137 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 440 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f85eeQArJGcIMAq80IOKe4", - "easlX04mxG5ZvUxfbp4BQ9" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -20781,7 +20803,7 @@ "__type__": "cc.TargetInfo", "localID": [ "f85eeQArJGcIMAq80IOKe4", - "0adkCQpc9B4ZMzFRaIP9x9" + "easlX04mxG5ZvUxfbp4BQ9" ] }, { @@ -20792,6 +20814,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 340, + "height": 440 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f85eeQArJGcIMAq80IOKe4", + "0adkCQpc9B4ZMzFRaIP9x9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 1143 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 332, @@ -20808,7 +20851,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1143 + "__id__": 1145 }, "propertyPath": [ "_contentSize" @@ -20829,7 +20872,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1145 + "__id__": 1147 }, "propertyPath": [ "_contentSize" @@ -20850,7 +20893,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1147 + "__id__": 1149 }, "propertyPath": [ "_lscale" @@ -20872,7 +20915,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1149 + "__id__": 1151 }, "propertyPath": [ "_verticalCenter" @@ -20888,7 +20931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1151 + "__id__": 1153 }, "propertyPath": [ "_contentSize" @@ -20908,7 +20951,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1153 + "__id__": 1155 }, "propertyPath": [ "_contentSize" @@ -20928,7 +20971,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1155 + "__id__": 1157 }, "propertyPath": [ "_lpos" @@ -20949,7 +20992,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1157 + "__id__": 1159 }, "propertyPath": [ "_lpos" @@ -20970,7 +21013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1159 + "__id__": 1161 }, "propertyPath": [ "_lpos" @@ -20994,11 +21037,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 791 + "__id__": 793 }, "_enabled": true, "__prefab": { - "__id__": 1161 + "__id__": 1163 }, "_contentSize": { "__type__": "cc.Size", @@ -21022,11 +21065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 791 + "__id__": 793 }, "_enabled": true, "__prefab": { - "__id__": 1163 + "__id__": 1165 }, "_alignFlags": 45, "_target": null, @@ -21058,11 +21101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 791 + "__id__": 793 }, "_enabled": true, "__prefab": { - "__id__": 1165 + "__id__": 1167 }, "_resizeMode": 1, "_layoutType": 3, @@ -21109,27 +21152,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 790 + "__id__": 792 }, "_children": [ { - "__id__": 1168 + "__id__": 1170 } ], "_active": true, "_components": [ - { - "__id__": 1174 - }, { "__id__": 1176 }, { "__id__": 1178 + }, + { + "__id__": 1180 } ], "_prefab": { - "__id__": 1180 + "__id__": 1182 }, "_lpos": { "__type__": "cc.Vec3", @@ -21166,20 +21209,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1167 + "__id__": 1169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1169 + "__id__": 1171 }, { - "__id__": 1171 + "__id__": 1173 } ], "_prefab": { - "__id__": 1173 + "__id__": 1175 }, "_lpos": { "__type__": "cc.Vec3", @@ -21216,11 +21259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1170 }, "_enabled": true, "__prefab": { - "__id__": 1170 + "__id__": 1172 }, "_contentSize": { "__type__": "cc.Size", @@ -21244,11 +21287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1170 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1174 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21325,11 +21368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1167 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1175 + "__id__": 1177 }, "_contentSize": { "__type__": "cc.Size", @@ -21353,11 +21396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1167 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1177 + "__id__": 1179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21398,11 +21441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1167 + "__id__": 1169 }, "_enabled": true, "__prefab": { - "__id__": 1179 + "__id__": 1181 }, "_alignFlags": 40, "_target": null, @@ -21447,11 +21490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 790 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 1182 + "__id__": 1184 }, "_contentSize": { "__type__": "cc.Size", @@ -21475,11 +21518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 790 + "__id__": 792 }, "_enabled": true, "__prefab": { - "__id__": 1184 + "__id__": 1186 }, "_alignFlags": 44, "_target": null, @@ -21524,36 +21567,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 623 }, "_children": [ { - "__id__": 1187 + "__id__": 1189 }, { - "__id__": 1212 + "__id__": 1214 }, { - "__id__": 1218 + "__id__": 1220 }, { - "__id__": 1224 + "__id__": 1226 }, { - "__id__": 1230 + "__id__": 1232 } ], "_active": false, "_components": [ { - "__id__": 1236 + "__id__": 1238 }, { - "__id__": 1238 + "__id__": 1240 } ], "_prefab": { - "__id__": 1240 + "__id__": 1242 }, "_lpos": { "__type__": "cc.Vec3", @@ -21588,17 +21631,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1186 + "__id__": 1188 }, "_prefab": { - "__id__": 1188 + "__id__": 1190 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1187 + "__id__": 1189 }, "asset": { "__uuid__": "41a77c92-67f6-4685-8609-682e643aa8ca", @@ -21606,7 +21649,7 @@ }, "fileId": "4foJ4Sd5VJtr2JgTnv7kNd", "instance": { - "__id__": 1189 + "__id__": 1191 }, "targetOverrides": null }, @@ -21619,9 +21662,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 1190 - }, { "__id__": 1192 }, @@ -21650,10 +21690,13 @@ "__id__": 1208 }, { - "__id__": 1209 + "__id__": 1210 }, { "__id__": 1211 + }, + { + "__id__": 1213 } ], "removedComponents": [] @@ -21661,7 +21704,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1193 }, "propertyPath": [ "_name" @@ -21677,7 +21720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1193 + "__id__": 1195 }, "propertyPath": [ "_lpos" @@ -21698,7 +21741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1195 + "__id__": 1197 }, "propertyPath": [ "_lrot" @@ -21720,7 +21763,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1197 + "__id__": 1199 }, "propertyPath": [ "_euler" @@ -21741,7 +21784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1199 + "__id__": 1201 }, "propertyPath": [ "_contentSize" @@ -21761,7 +21804,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1201 + "__id__": 1203 }, "propertyPath": [ "_contentSize" @@ -21781,7 +21824,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1203 + "__id__": 1205 }, "propertyPath": [ "_contentSize" @@ -21801,7 +21844,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1205 + "__id__": 1207 }, "propertyPath": [ "_contentSize" @@ -21821,7 +21864,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1207 + "__id__": 1209 }, "propertyPath": [ "_contentSize" @@ -21841,7 +21884,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1197 + "__id__": 1199 }, "propertyPath": [ "_active" @@ -21851,7 +21894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1210 + "__id__": 1212 }, "propertyPath": [ "_right" @@ -21867,7 +21910,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1210 + "__id__": 1212 }, "propertyPath": [ "_left" @@ -21880,20 +21923,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1213 + "__id__": 1215 }, { - "__id__": 1215 + "__id__": 1217 } ], "_prefab": { - "__id__": 1217 + "__id__": 1219 }, "_lpos": { "__type__": "cc.Vec3", @@ -21930,11 +21973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1214 }, "_enabled": true, "__prefab": { - "__id__": 1214 + "__id__": 1216 }, "_contentSize": { "__type__": "cc.Size", @@ -21958,11 +22001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1214 }, "_enabled": true, "__prefab": { - "__id__": 1216 + "__id__": 1218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22016,20 +22059,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1219 + "__id__": 1221 }, { - "__id__": 1221 + "__id__": 1223 } ], "_prefab": { - "__id__": 1223 + "__id__": 1225 }, "_lpos": { "__type__": "cc.Vec3", @@ -22066,11 +22109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1218 + "__id__": 1220 }, "_enabled": true, "__prefab": { - "__id__": 1220 + "__id__": 1222 }, "_contentSize": { "__type__": "cc.Size", @@ -22094,11 +22137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1218 + "__id__": 1220 }, "_enabled": true, "__prefab": { - "__id__": 1222 + "__id__": 1224 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22152,20 +22195,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1225 + "__id__": 1227 }, { - "__id__": 1227 + "__id__": 1229 } ], "_prefab": { - "__id__": 1229 + "__id__": 1231 }, "_lpos": { "__type__": "cc.Vec3", @@ -22202,11 +22245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1224 + "__id__": 1226 }, "_enabled": true, "__prefab": { - "__id__": 1226 + "__id__": 1228 }, "_contentSize": { "__type__": "cc.Size", @@ -22230,11 +22273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1224 + "__id__": 1226 }, "_enabled": true, "__prefab": { - "__id__": 1228 + "__id__": 1230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22288,20 +22331,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1188 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1231 + "__id__": 1233 }, { - "__id__": 1233 + "__id__": 1235 } ], "_prefab": { - "__id__": 1235 + "__id__": 1237 }, "_lpos": { "__type__": "cc.Vec3", @@ -22338,11 +22381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1230 + "__id__": 1232 }, "_enabled": true, "__prefab": { - "__id__": 1232 + "__id__": 1234 }, "_contentSize": { "__type__": "cc.Size", @@ -22366,11 +22409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1230 + "__id__": 1232 }, "_enabled": true, "__prefab": { - "__id__": 1234 + "__id__": 1236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22424,11 +22467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1186 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1237 + "__id__": 1239 }, "_contentSize": { "__type__": "cc.Size", @@ -22452,11 +22495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1186 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1239 + "__id__": 1241 }, "_alignFlags": 44, "_target": null, @@ -22501,27 +22544,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 621 + "__id__": 623 }, "_children": [ { - "__id__": 1242 + "__id__": 1244 } ], "_active": true, "_components": [ - { - "__id__": 1250 - }, { "__id__": 1252 }, { "__id__": 1254 + }, + { + "__id__": 1256 } ], "_prefab": { - "__id__": 1256 + "__id__": 1258 }, "_lpos": { "__type__": "cc.Vec3", @@ -22558,23 +22601,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1241 + "__id__": 1243 }, "_children": [], "_active": false, "_components": [ - { - "__id__": 1243 - }, { "__id__": 1245 }, { "__id__": 1247 + }, + { + "__id__": 1249 } ], "_prefab": { - "__id__": 1249 + "__id__": 1251 }, "_lpos": { "__type__": "cc.Vec3", @@ -22611,11 +22654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1242 + "__id__": 1244 }, "_enabled": true, "__prefab": { - "__id__": 1244 + "__id__": 1246 }, "_contentSize": { "__type__": "cc.Size", @@ -22639,11 +22682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1242 + "__id__": 1244 }, "_enabled": true, "__prefab": { - "__id__": 1246 + "__id__": 1248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22707,11 +22750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1242 + "__id__": 1244 }, "_enabled": true, "__prefab": { - "__id__": 1248 + "__id__": 1250 }, "_alignFlags": 4, "_target": null, @@ -22756,11 +22799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1241 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1251 + "__id__": 1253 }, "_contentSize": { "__type__": "cc.Size", @@ -22784,11 +22827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1241 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1253 + "__id__": 1255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22829,11 +22872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1241 + "__id__": 1243 }, "_enabled": true, "__prefab": { - "__id__": 1255 + "__id__": 1257 }, "_alignFlags": 41, "_target": null, @@ -22878,11 +22921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 623 }, "_enabled": true, "__prefab": { - "__id__": 1258 + "__id__": 1260 }, "_contentSize": { "__type__": "cc.Size", @@ -22906,11 +22949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 623 }, "_enabled": true, "__prefab": { - "__id__": 1260 + "__id__": 1262 }, "_alignFlags": 45, "_target": null, @@ -22942,11 +22985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 623 }, "_enabled": true, "__prefab": { - "__id__": 1262 + "__id__": 1264 }, "_id": "" }, @@ -22960,11 +23003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 621 + "__id__": 623 }, "_enabled": true, "__prefab": { - "__id__": 1264 + "__id__": 1266 }, "_id": "" }, @@ -22995,20 +23038,17 @@ }, "_children": [ { - "__id__": 1267 + "__id__": 1269 }, { - "__id__": 1275 + "__id__": 1277 }, { - "__id__": 1291 + "__id__": 1293 } ], "_active": false, "_components": [ - { - "__id__": 1335 - }, { "__id__": 1337 }, @@ -23017,10 +23057,13 @@ }, { "__id__": 1341 + }, + { + "__id__": 1343 } ], "_prefab": { - "__id__": 1343 + "__id__": 1345 }, "_lpos": { "__type__": "cc.Vec3", @@ -23057,23 +23100,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1266 + "__id__": 1268 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1268 - }, { "__id__": 1270 }, { "__id__": 1272 + }, + { + "__id__": 1274 } ], "_prefab": { - "__id__": 1274 + "__id__": 1276 }, "_lpos": { "__type__": "cc.Vec3", @@ -23110,11 +23153,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1267 + "__id__": 1269 }, "_enabled": true, "__prefab": { - "__id__": 1269 + "__id__": 1271 }, "_contentSize": { "__type__": "cc.Size", @@ -23138,11 +23181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1267 + "__id__": 1269 }, "_enabled": true, "__prefab": { - "__id__": 1271 + "__id__": 1273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23183,11 +23226,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1267 + "__id__": 1269 }, "_enabled": true, "__prefab": { - "__id__": 1273 + "__id__": 1275 }, "_alignFlags": 45, "_target": null, @@ -23232,27 +23275,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1266 + "__id__": 1268 }, "_children": [ { - "__id__": 1276 + "__id__": 1278 } ], "_active": true, "_components": [ - { - "__id__": 1284 - }, { "__id__": 1286 }, { "__id__": 1288 + }, + { + "__id__": 1290 } ], "_prefab": { - "__id__": 1290 + "__id__": 1292 }, "_lpos": { "__type__": "cc.Vec3", @@ -23289,23 +23332,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1275 + "__id__": 1277 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1277 - }, { "__id__": 1279 }, { "__id__": 1281 + }, + { + "__id__": 1283 } ], "_prefab": { - "__id__": 1283 + "__id__": 1285 }, "_lpos": { "__type__": "cc.Vec3", @@ -23342,11 +23385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1276 + "__id__": 1278 }, "_enabled": true, "__prefab": { - "__id__": 1278 + "__id__": 1280 }, "_contentSize": { "__type__": "cc.Size", @@ -23370,11 +23413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1276 + "__id__": 1278 }, "_enabled": true, "__prefab": { - "__id__": 1280 + "__id__": 1282 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23438,11 +23481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1276 + "__id__": 1278 }, "_enabled": true, "__prefab": { - "__id__": 1282 + "__id__": 1284 }, "_alignFlags": 4, "_target": null, @@ -23487,11 +23530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1275 + "__id__": 1277 }, "_enabled": true, "__prefab": { - "__id__": 1285 + "__id__": 1287 }, "_contentSize": { "__type__": "cc.Size", @@ -23515,11 +23558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1275 + "__id__": 1277 }, "_enabled": true, "__prefab": { - "__id__": 1287 + "__id__": 1289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23560,11 +23603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1275 + "__id__": 1277 }, "_enabled": true, "__prefab": { - "__id__": 1289 + "__id__": 1291 }, "_alignFlags": 41, "_target": null, @@ -23609,33 +23652,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1266 + "__id__": 1268 }, "_children": [ { - "__id__": 1292 + "__id__": 1294 }, { - "__id__": 1310 + "__id__": 1312 } ], "_active": true, "_components": [ - { - "__id__": 1328 - }, { "__id__": 1330 }, { - "__id__": 1307 + "__id__": 1332 }, { - "__id__": 1332 + "__id__": 1309 + }, + { + "__id__": 1334 } ], "_prefab": { - "__id__": 1334 + "__id__": 1336 }, "_lpos": { "__type__": "cc.Vec3", @@ -23672,18 +23715,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1291 + "__id__": 1293 }, "_children": [ { - "__id__": 1293 + "__id__": 1295 } ], "_active": false, "_components": [ - { - "__id__": 1299 - }, { "__id__": 1301 }, @@ -23692,10 +23732,13 @@ }, { "__id__": 1305 + }, + { + "__id__": 1307 } ], "_prefab": { - "__id__": 1327 + "__id__": 1329 }, "_lpos": { "__type__": "cc.Vec3", @@ -23732,20 +23775,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1292 + "__id__": 1294 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1294 + "__id__": 1296 }, { - "__id__": 1296 + "__id__": 1298 } ], "_prefab": { - "__id__": 1298 + "__id__": 1300 }, "_lpos": { "__type__": "cc.Vec3", @@ -23782,11 +23825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1293 + "__id__": 1295 }, "_enabled": true, "__prefab": { - "__id__": 1295 + "__id__": 1297 }, "_contentSize": { "__type__": "cc.Size", @@ -23810,11 +23853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1293 + "__id__": 1295 }, "_enabled": true, "__prefab": { - "__id__": 1297 + "__id__": 1299 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23868,11 +23911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "__prefab": { - "__id__": 1300 + "__id__": 1302 }, "_contentSize": { "__type__": "cc.Size", @@ -23896,11 +23939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "__prefab": { - "__id__": 1302 + "__id__": 1304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23941,11 +23984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "__prefab": { - "__id__": 1304 + "__id__": 1306 }, "_alignFlags": 37, "_target": null, @@ -23977,17 +24020,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "__prefab": { - "__id__": 1306 + "__id__": 1308 }, "_scrollView": { - "__id__": 1307 + "__id__": 1309 }, "_handle": { - "__id__": 1296 + "__id__": 1298 }, "_direction": 1, "_enableAutoHide": false, @@ -24004,11 +24047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1293 }, "_enabled": true, "__prefab": { - "__id__": 1308 + "__id__": 1310 }, "bounceDuration": 0.23, "brake": 0.75, @@ -24019,7 +24062,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 1309 + "__id__": 1311 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -24035,23 +24078,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1310 + "__id__": 1312 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1320 - }, { "__id__": 1322 }, { "__id__": 1324 + }, + { + "__id__": 1326 } ], "_prefab": { - "__id__": 1326 + "__id__": 1328 }, "_lpos": { "__type__": "cc.Vec3", @@ -24088,18 +24131,15 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1291 + "__id__": 1293 }, "_children": [ { - "__id__": 1309 + "__id__": 1311 } ], "_active": true, "_components": [ - { - "__id__": 1311 - }, { "__id__": 1313 }, @@ -24108,10 +24148,13 @@ }, { "__id__": 1317 + }, + { + "__id__": 1319 } ], "_prefab": { - "__id__": 1319 + "__id__": 1321 }, "_lpos": { "__type__": "cc.Vec3", @@ -24148,11 +24191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1310 + "__id__": 1312 }, "_enabled": true, "__prefab": { - "__id__": 1312 + "__id__": 1314 }, "_contentSize": { "__type__": "cc.Size", @@ -24176,11 +24219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1310 + "__id__": 1312 }, "_enabled": true, "__prefab": { - "__id__": 1314 + "__id__": 1316 }, "_type": 0, "_inverted": false, @@ -24198,11 +24241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1310 + "__id__": 1312 }, "_enabled": true, "__prefab": { - "__id__": 1316 + "__id__": 1318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24244,11 +24287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1310 + "__id__": 1312 }, "_enabled": true, "__prefab": { - "__id__": 1318 + "__id__": 1320 }, "_alignFlags": 45, "_target": null, @@ -24293,11 +24336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1309 + "__id__": 1311 }, "_enabled": true, "__prefab": { - "__id__": 1321 + "__id__": 1323 }, "_contentSize": { "__type__": "cc.Size", @@ -24321,11 +24364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1309 + "__id__": 1311 }, "_enabled": true, "__prefab": { - "__id__": 1323 + "__id__": 1325 }, "_alignFlags": 41, "_target": null, @@ -24357,11 +24400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1309 + "__id__": 1311 }, "_enabled": true, "__prefab": { - "__id__": 1325 + "__id__": 1327 }, "_resizeMode": 0, "_layoutType": 3, @@ -24421,11 +24464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1293 }, "_enabled": true, "__prefab": { - "__id__": 1329 + "__id__": 1331 }, "_contentSize": { "__type__": "cc.Size", @@ -24449,11 +24492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1293 }, "_enabled": false, "__prefab": { - "__id__": 1331 + "__id__": 1333 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24494,11 +24537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1291 + "__id__": 1293 }, "_enabled": true, "__prefab": { - "__id__": 1333 + "__id__": 1335 }, "_alignFlags": 45, "_target": null, @@ -24543,11 +24586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1336 + "__id__": 1338 }, "_contentSize": { "__type__": "cc.Size", @@ -24571,11 +24614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1338 + "__id__": 1340 }, "_alignFlags": 45, "_target": null, @@ -24607,11 +24650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1340 + "__id__": 1342 }, "_id": "" }, @@ -24625,11 +24668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1266 + "__id__": 1268 }, "_enabled": true, "__prefab": { - "__id__": 1342 + "__id__": 1344 }, "_id": "" }, @@ -24660,35 +24703,35 @@ }, "_children": [ { - "__id__": 1345 + "__id__": 1347 }, { - "__id__": 1386 + "__id__": 1388 }, { - "__id__": 1427 + "__id__": 1429 }, { - "__id__": 1468 + "__id__": 1470 }, { - "__id__": 1509 + "__id__": 1511 } ], "_active": true, "_components": [ - { - "__id__": 1550 - }, { "__id__": 1552 }, { "__id__": 1554 + }, + { + "__id__": 1556 } ], "_prefab": { - "__id__": 1556 + "__id__": 1558 }, "_lpos": { "__type__": "cc.Vec3", @@ -24725,27 +24768,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1344 + "__id__": 1346 }, "_children": [ { - "__id__": 1346 + "__id__": 1348 }, { - "__id__": 1360 + "__id__": 1362 } ], "_active": true, "_components": [ { - "__id__": 1380 + "__id__": 1382 }, { - "__id__": 1382 + "__id__": 1384 } ], "_prefab": { - "__id__": 1385 + "__id__": 1387 }, "_lpos": { "__type__": "cc.Vec3", @@ -24782,27 +24825,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1345 + "__id__": 1347 }, "_children": [ { - "__id__": 1347 + "__id__": 1349 } ], "_active": true, "_components": [ - { - "__id__": 1353 - }, { "__id__": 1355 }, { "__id__": 1357 + }, + { + "__id__": 1359 } ], "_prefab": { - "__id__": 1359 + "__id__": 1361 }, "_lpos": { "__type__": "cc.Vec3", @@ -24839,20 +24882,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1346 + "__id__": 1348 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1348 + "__id__": 1350 }, { - "__id__": 1350 + "__id__": 1352 } ], "_prefab": { - "__id__": 1352 + "__id__": 1354 }, "_lpos": { "__type__": "cc.Vec3", @@ -24889,11 +24932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1347 + "__id__": 1349 }, "_enabled": true, "__prefab": { - "__id__": 1349 + "__id__": 1351 }, "_contentSize": { "__type__": "cc.Size", @@ -24917,11 +24960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1347 + "__id__": 1349 }, "_enabled": true, "__prefab": { - "__id__": 1351 + "__id__": 1353 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24978,11 +25021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1346 + "__id__": 1348 }, "_enabled": true, "__prefab": { - "__id__": 1354 + "__id__": 1356 }, "_contentSize": { "__type__": "cc.Size", @@ -25006,11 +25049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1346 + "__id__": 1348 }, "_enabled": true, "__prefab": { - "__id__": 1356 + "__id__": 1358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25051,11 +25094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1346 + "__id__": 1348 }, "_enabled": true, "__prefab": { - "__id__": 1358 + "__id__": 1360 }, "_alignFlags": 45, "_target": null, @@ -25100,30 +25143,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1345 + "__id__": 1347 }, "_children": [ { - "__id__": 1361 + "__id__": 1363 }, { - "__id__": 1367 + "__id__": 1369 } ], "_active": true, "_components": [ - { - "__id__": 1373 - }, { "__id__": 1375 }, { "__id__": 1377 + }, + { + "__id__": 1379 } ], "_prefab": { - "__id__": 1379 + "__id__": 1381 }, "_lpos": { "__type__": "cc.Vec3", @@ -25160,20 +25203,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1360 + "__id__": 1362 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1362 + "__id__": 1364 }, { - "__id__": 1364 + "__id__": 1366 } ], "_prefab": { - "__id__": 1366 + "__id__": 1368 }, "_lpos": { "__type__": "cc.Vec3", @@ -25210,11 +25253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1361 + "__id__": 1363 }, "_enabled": true, "__prefab": { - "__id__": 1363 + "__id__": 1365 }, "_contentSize": { "__type__": "cc.Size", @@ -25238,11 +25281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1361 + "__id__": 1363 }, "_enabled": true, "__prefab": { - "__id__": 1365 + "__id__": 1367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25299,20 +25342,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1360 + "__id__": 1362 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1368 + "__id__": 1370 }, { - "__id__": 1370 + "__id__": 1372 } ], "_prefab": { - "__id__": 1372 + "__id__": 1374 }, "_lpos": { "__type__": "cc.Vec3", @@ -25349,11 +25392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1367 + "__id__": 1369 }, "_enabled": true, "__prefab": { - "__id__": 1369 + "__id__": 1371 }, "_contentSize": { "__type__": "cc.Size", @@ -25377,11 +25420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1367 + "__id__": 1369 }, "_enabled": true, "__prefab": { - "__id__": 1371 + "__id__": 1373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25458,11 +25501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1360 + "__id__": 1362 }, "_enabled": true, "__prefab": { - "__id__": 1374 + "__id__": 1376 }, "_contentSize": { "__type__": "cc.Size", @@ -25486,11 +25529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1360 + "__id__": 1362 }, "_enabled": true, "__prefab": { - "__id__": 1376 + "__id__": 1378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25531,11 +25574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1360 + "__id__": 1362 }, "_enabled": true, "__prefab": { - "__id__": 1378 + "__id__": 1380 }, "_alignFlags": 45, "_target": null, @@ -25580,11 +25623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1345 + "__id__": 1347 }, "_enabled": true, "__prefab": { - "__id__": 1381 + "__id__": 1383 }, "_contentSize": { "__type__": "cc.Size", @@ -25608,15 +25651,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1345 + "__id__": 1347 }, "_enabled": true, "__prefab": { - "__id__": 1383 + "__id__": 1385 }, "clickEvents": [ { - "__id__": 1384 + "__id__": 1386 } ], "_interactable": true, @@ -25691,27 +25734,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1344 + "__id__": 1346 }, "_children": [ { - "__id__": 1387 + "__id__": 1389 }, { - "__id__": 1401 + "__id__": 1403 } ], "_active": true, "_components": [ { - "__id__": 1421 + "__id__": 1423 }, { - "__id__": 1423 + "__id__": 1425 } ], "_prefab": { - "__id__": 1426 + "__id__": 1428 }, "_lpos": { "__type__": "cc.Vec3", @@ -25748,27 +25791,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1386 + "__id__": 1388 }, "_children": [ { - "__id__": 1388 + "__id__": 1390 } ], "_active": true, "_components": [ - { - "__id__": 1394 - }, { "__id__": 1396 }, { "__id__": 1398 + }, + { + "__id__": 1400 } ], "_prefab": { - "__id__": 1400 + "__id__": 1402 }, "_lpos": { "__type__": "cc.Vec3", @@ -25805,20 +25848,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1387 + "__id__": 1389 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1389 + "__id__": 1391 }, { - "__id__": 1391 + "__id__": 1393 } ], "_prefab": { - "__id__": 1393 + "__id__": 1395 }, "_lpos": { "__type__": "cc.Vec3", @@ -25855,11 +25898,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1388 + "__id__": 1390 }, "_enabled": true, "__prefab": { - "__id__": 1390 + "__id__": 1392 }, "_contentSize": { "__type__": "cc.Size", @@ -25883,11 +25926,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1388 + "__id__": 1390 }, "_enabled": true, "__prefab": { - "__id__": 1392 + "__id__": 1394 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25941,11 +25984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1387 + "__id__": 1389 }, "_enabled": true, "__prefab": { - "__id__": 1395 + "__id__": 1397 }, "_contentSize": { "__type__": "cc.Size", @@ -25969,11 +26012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1387 + "__id__": 1389 }, "_enabled": true, "__prefab": { - "__id__": 1397 + "__id__": 1399 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26014,11 +26057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1387 + "__id__": 1389 }, "_enabled": true, "__prefab": { - "__id__": 1399 + "__id__": 1401 }, "_alignFlags": 45, "_target": null, @@ -26063,30 +26106,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1386 + "__id__": 1388 }, "_children": [ { - "__id__": 1402 + "__id__": 1404 }, { - "__id__": 1408 + "__id__": 1410 } ], "_active": true, "_components": [ - { - "__id__": 1414 - }, { "__id__": 1416 }, { "__id__": 1418 + }, + { + "__id__": 1420 } ], "_prefab": { - "__id__": 1420 + "__id__": 1422 }, "_lpos": { "__type__": "cc.Vec3", @@ -26123,20 +26166,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1401 + "__id__": 1403 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1403 + "__id__": 1405 }, { - "__id__": 1405 + "__id__": 1407 } ], "_prefab": { - "__id__": 1407 + "__id__": 1409 }, "_lpos": { "__type__": "cc.Vec3", @@ -26173,11 +26216,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1402 + "__id__": 1404 }, "_enabled": true, "__prefab": { - "__id__": 1404 + "__id__": 1406 }, "_contentSize": { "__type__": "cc.Size", @@ -26201,11 +26244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1402 + "__id__": 1404 }, "_enabled": true, "__prefab": { - "__id__": 1406 + "__id__": 1408 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26259,20 +26302,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1401 + "__id__": 1403 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1409 + "__id__": 1411 }, { - "__id__": 1411 + "__id__": 1413 } ], "_prefab": { - "__id__": 1413 + "__id__": 1415 }, "_lpos": { "__type__": "cc.Vec3", @@ -26309,11 +26352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1408 + "__id__": 1410 }, "_enabled": true, "__prefab": { - "__id__": 1410 + "__id__": 1412 }, "_contentSize": { "__type__": "cc.Size", @@ -26337,11 +26380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1408 + "__id__": 1410 }, "_enabled": true, "__prefab": { - "__id__": 1412 + "__id__": 1414 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26418,11 +26461,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1401 + "__id__": 1403 }, "_enabled": true, "__prefab": { - "__id__": 1415 + "__id__": 1417 }, "_contentSize": { "__type__": "cc.Size", @@ -26446,11 +26489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1401 + "__id__": 1403 }, "_enabled": true, "__prefab": { - "__id__": 1417 + "__id__": 1419 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26491,11 +26534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1401 + "__id__": 1403 }, "_enabled": true, "__prefab": { - "__id__": 1419 + "__id__": 1421 }, "_alignFlags": 45, "_target": null, @@ -26540,11 +26583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1386 + "__id__": 1388 }, "_enabled": true, "__prefab": { - "__id__": 1422 + "__id__": 1424 }, "_contentSize": { "__type__": "cc.Size", @@ -26568,15 +26611,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1386 + "__id__": 1388 }, "_enabled": true, "__prefab": { - "__id__": 1424 + "__id__": 1426 }, "clickEvents": [ { - "__id__": 1425 + "__id__": 1427 } ], "_interactable": true, @@ -26651,27 +26694,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1344 + "__id__": 1346 }, "_children": [ { - "__id__": 1428 + "__id__": 1430 }, { - "__id__": 1442 + "__id__": 1444 } ], "_active": true, "_components": [ { - "__id__": 1462 + "__id__": 1464 }, { - "__id__": 1464 + "__id__": 1466 } ], "_prefab": { - "__id__": 1467 + "__id__": 1469 }, "_lpos": { "__type__": "cc.Vec3", @@ -26708,27 +26751,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1427 + "__id__": 1429 }, "_children": [ { - "__id__": 1429 + "__id__": 1431 } ], "_active": true, "_components": [ - { - "__id__": 1435 - }, { "__id__": 1437 }, { "__id__": 1439 + }, + { + "__id__": 1441 } ], "_prefab": { - "__id__": 1441 + "__id__": 1443 }, "_lpos": { "__type__": "cc.Vec3", @@ -26765,20 +26808,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1428 + "__id__": 1430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1430 + "__id__": 1432 }, { - "__id__": 1432 + "__id__": 1434 } ], "_prefab": { - "__id__": 1434 + "__id__": 1436 }, "_lpos": { "__type__": "cc.Vec3", @@ -26815,11 +26858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1429 + "__id__": 1431 }, "_enabled": true, "__prefab": { - "__id__": 1431 + "__id__": 1433 }, "_contentSize": { "__type__": "cc.Size", @@ -26843,11 +26886,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1429 + "__id__": 1431 }, "_enabled": true, "__prefab": { - "__id__": 1433 + "__id__": 1435 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26901,11 +26944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1428 + "__id__": 1430 }, "_enabled": true, "__prefab": { - "__id__": 1436 + "__id__": 1438 }, "_contentSize": { "__type__": "cc.Size", @@ -26929,11 +26972,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1428 + "__id__": 1430 }, "_enabled": true, "__prefab": { - "__id__": 1438 + "__id__": 1440 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26974,11 +27017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1428 + "__id__": 1430 }, "_enabled": true, "__prefab": { - "__id__": 1440 + "__id__": 1442 }, "_alignFlags": 45, "_target": null, @@ -27023,30 +27066,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1427 + "__id__": 1429 }, "_children": [ { - "__id__": 1443 + "__id__": 1445 }, { - "__id__": 1449 + "__id__": 1451 } ], "_active": true, "_components": [ - { - "__id__": 1455 - }, { "__id__": 1457 }, { "__id__": 1459 + }, + { + "__id__": 1461 } ], "_prefab": { - "__id__": 1461 + "__id__": 1463 }, "_lpos": { "__type__": "cc.Vec3", @@ -27083,20 +27126,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1442 + "__id__": 1444 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1444 + "__id__": 1446 }, { - "__id__": 1446 + "__id__": 1448 } ], "_prefab": { - "__id__": 1448 + "__id__": 1450 }, "_lpos": { "__type__": "cc.Vec3", @@ -27133,11 +27176,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1443 + "__id__": 1445 }, "_enabled": true, "__prefab": { - "__id__": 1445 + "__id__": 1447 }, "_contentSize": { "__type__": "cc.Size", @@ -27161,11 +27204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1443 + "__id__": 1445 }, "_enabled": true, "__prefab": { - "__id__": 1447 + "__id__": 1449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27219,20 +27262,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1442 + "__id__": 1444 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1450 + "__id__": 1452 }, { - "__id__": 1452 + "__id__": 1454 } ], "_prefab": { - "__id__": 1454 + "__id__": 1456 }, "_lpos": { "__type__": "cc.Vec3", @@ -27269,11 +27312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1449 + "__id__": 1451 }, "_enabled": true, "__prefab": { - "__id__": 1451 + "__id__": 1453 }, "_contentSize": { "__type__": "cc.Size", @@ -27297,11 +27340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1449 + "__id__": 1451 }, "_enabled": true, "__prefab": { - "__id__": 1453 + "__id__": 1455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27378,11 +27421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1442 + "__id__": 1444 }, "_enabled": true, "__prefab": { - "__id__": 1456 + "__id__": 1458 }, "_contentSize": { "__type__": "cc.Size", @@ -27406,11 +27449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1442 + "__id__": 1444 }, "_enabled": true, "__prefab": { - "__id__": 1458 + "__id__": 1460 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27451,11 +27494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1442 + "__id__": 1444 }, "_enabled": true, "__prefab": { - "__id__": 1460 + "__id__": 1462 }, "_alignFlags": 45, "_target": null, @@ -27500,11 +27543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1427 + "__id__": 1429 }, "_enabled": true, "__prefab": { - "__id__": 1463 + "__id__": 1465 }, "_contentSize": { "__type__": "cc.Size", @@ -27528,15 +27571,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1427 + "__id__": 1429 }, "_enabled": true, "__prefab": { - "__id__": 1465 + "__id__": 1467 }, "clickEvents": [ { - "__id__": 1466 + "__id__": 1468 } ], "_interactable": true, @@ -27611,27 +27654,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1344 + "__id__": 1346 }, "_children": [ { - "__id__": 1469 + "__id__": 1471 }, { - "__id__": 1483 + "__id__": 1485 } ], "_active": false, "_components": [ { - "__id__": 1503 + "__id__": 1505 }, { - "__id__": 1505 + "__id__": 1507 } ], "_prefab": { - "__id__": 1508 + "__id__": 1510 }, "_lpos": { "__type__": "cc.Vec3", @@ -27668,27 +27711,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1468 + "__id__": 1470 }, "_children": [ { - "__id__": 1470 + "__id__": 1472 } ], "_active": true, "_components": [ - { - "__id__": 1476 - }, { "__id__": 1478 }, { "__id__": 1480 + }, + { + "__id__": 1482 } ], "_prefab": { - "__id__": 1482 + "__id__": 1484 }, "_lpos": { "__type__": "cc.Vec3", @@ -27725,20 +27768,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1469 + "__id__": 1471 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1471 + "__id__": 1473 }, { - "__id__": 1473 + "__id__": 1475 } ], "_prefab": { - "__id__": 1475 + "__id__": 1477 }, "_lpos": { "__type__": "cc.Vec3", @@ -27775,11 +27818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1470 + "__id__": 1472 }, "_enabled": true, "__prefab": { - "__id__": 1472 + "__id__": 1474 }, "_contentSize": { "__type__": "cc.Size", @@ -27803,11 +27846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1470 + "__id__": 1472 }, "_enabled": true, "__prefab": { - "__id__": 1474 + "__id__": 1476 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27861,11 +27904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1469 + "__id__": 1471 }, "_enabled": true, "__prefab": { - "__id__": 1477 + "__id__": 1479 }, "_contentSize": { "__type__": "cc.Size", @@ -27889,11 +27932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1469 + "__id__": 1471 }, "_enabled": true, "__prefab": { - "__id__": 1479 + "__id__": 1481 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27934,11 +27977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1469 + "__id__": 1471 }, "_enabled": true, "__prefab": { - "__id__": 1481 + "__id__": 1483 }, "_alignFlags": 45, "_target": null, @@ -27983,30 +28026,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1468 + "__id__": 1470 }, "_children": [ { - "__id__": 1484 + "__id__": 1486 }, { - "__id__": 1490 + "__id__": 1492 } ], "_active": true, "_components": [ - { - "__id__": 1496 - }, { "__id__": 1498 }, { "__id__": 1500 + }, + { + "__id__": 1502 } ], "_prefab": { - "__id__": 1502 + "__id__": 1504 }, "_lpos": { "__type__": "cc.Vec3", @@ -28043,20 +28086,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1483 + "__id__": 1485 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1485 + "__id__": 1487 }, { - "__id__": 1487 + "__id__": 1489 } ], "_prefab": { - "__id__": 1489 + "__id__": 1491 }, "_lpos": { "__type__": "cc.Vec3", @@ -28093,11 +28136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1484 + "__id__": 1486 }, "_enabled": true, "__prefab": { - "__id__": 1486 + "__id__": 1488 }, "_contentSize": { "__type__": "cc.Size", @@ -28121,11 +28164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1484 + "__id__": 1486 }, "_enabled": true, "__prefab": { - "__id__": 1488 + "__id__": 1490 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28179,20 +28222,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1483 + "__id__": 1485 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1491 + "__id__": 1493 }, { - "__id__": 1493 + "__id__": 1495 } ], "_prefab": { - "__id__": 1495 + "__id__": 1497 }, "_lpos": { "__type__": "cc.Vec3", @@ -28229,11 +28272,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1490 + "__id__": 1492 }, "_enabled": true, "__prefab": { - "__id__": 1492 + "__id__": 1494 }, "_contentSize": { "__type__": "cc.Size", @@ -28257,11 +28300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1490 + "__id__": 1492 }, "_enabled": true, "__prefab": { - "__id__": 1494 + "__id__": 1496 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28338,11 +28381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1483 + "__id__": 1485 }, "_enabled": true, "__prefab": { - "__id__": 1497 + "__id__": 1499 }, "_contentSize": { "__type__": "cc.Size", @@ -28366,11 +28409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1483 + "__id__": 1485 }, "_enabled": true, "__prefab": { - "__id__": 1499 + "__id__": 1501 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28411,11 +28454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1483 + "__id__": 1485 }, "_enabled": true, "__prefab": { - "__id__": 1501 + "__id__": 1503 }, "_alignFlags": 45, "_target": null, @@ -28460,11 +28503,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1468 + "__id__": 1470 }, "_enabled": true, "__prefab": { - "__id__": 1504 + "__id__": 1506 }, "_contentSize": { "__type__": "cc.Size", @@ -28488,15 +28531,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1468 + "__id__": 1470 }, "_enabled": true, "__prefab": { - "__id__": 1506 + "__id__": 1508 }, "clickEvents": [ { - "__id__": 1507 + "__id__": 1509 } ], "_interactable": true, @@ -28571,27 +28614,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1344 + "__id__": 1346 }, "_children": [ { - "__id__": 1510 + "__id__": 1512 }, { - "__id__": 1524 + "__id__": 1526 } ], "_active": false, "_components": [ { - "__id__": 1544 + "__id__": 1546 }, { - "__id__": 1546 + "__id__": 1548 } ], "_prefab": { - "__id__": 1549 + "__id__": 1551 }, "_lpos": { "__type__": "cc.Vec3", @@ -28628,27 +28671,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1509 + "__id__": 1511 }, "_children": [ { - "__id__": 1511 + "__id__": 1513 } ], "_active": true, "_components": [ - { - "__id__": 1517 - }, { "__id__": 1519 }, { "__id__": 1521 + }, + { + "__id__": 1523 } ], "_prefab": { - "__id__": 1523 + "__id__": 1525 }, "_lpos": { "__type__": "cc.Vec3", @@ -28685,20 +28728,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1510 + "__id__": 1512 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1512 + "__id__": 1514 }, { - "__id__": 1514 + "__id__": 1516 } ], "_prefab": { - "__id__": 1516 + "__id__": 1518 }, "_lpos": { "__type__": "cc.Vec3", @@ -28735,11 +28778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1513 }, "_enabled": true, "__prefab": { - "__id__": 1513 + "__id__": 1515 }, "_contentSize": { "__type__": "cc.Size", @@ -28763,11 +28806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1511 + "__id__": 1513 }, "_enabled": true, "__prefab": { - "__id__": 1515 + "__id__": 1517 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28821,11 +28864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1512 }, "_enabled": true, "__prefab": { - "__id__": 1518 + "__id__": 1520 }, "_contentSize": { "__type__": "cc.Size", @@ -28849,11 +28892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1512 }, "_enabled": true, "__prefab": { - "__id__": 1520 + "__id__": 1522 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -28894,11 +28937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1510 + "__id__": 1512 }, "_enabled": true, "__prefab": { - "__id__": 1522 + "__id__": 1524 }, "_alignFlags": 45, "_target": null, @@ -28943,30 +28986,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1509 + "__id__": 1511 }, "_children": [ { - "__id__": 1525 + "__id__": 1527 }, { - "__id__": 1531 + "__id__": 1533 } ], "_active": true, "_components": [ - { - "__id__": 1537 - }, { "__id__": 1539 }, { "__id__": 1541 + }, + { + "__id__": 1543 } ], "_prefab": { - "__id__": 1543 + "__id__": 1545 }, "_lpos": { "__type__": "cc.Vec3", @@ -29003,20 +29046,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1524 + "__id__": 1526 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1526 + "__id__": 1528 }, { - "__id__": 1528 + "__id__": 1530 } ], "_prefab": { - "__id__": 1530 + "__id__": 1532 }, "_lpos": { "__type__": "cc.Vec3", @@ -29053,11 +29096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1525 + "__id__": 1527 }, "_enabled": true, "__prefab": { - "__id__": 1527 + "__id__": 1529 }, "_contentSize": { "__type__": "cc.Size", @@ -29081,11 +29124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1525 + "__id__": 1527 }, "_enabled": true, "__prefab": { - "__id__": 1529 + "__id__": 1531 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29139,20 +29182,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1524 + "__id__": 1526 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1532 + "__id__": 1534 }, { - "__id__": 1534 + "__id__": 1536 } ], "_prefab": { - "__id__": 1536 + "__id__": 1538 }, "_lpos": { "__type__": "cc.Vec3", @@ -29189,11 +29232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1531 + "__id__": 1533 }, "_enabled": true, "__prefab": { - "__id__": 1533 + "__id__": 1535 }, "_contentSize": { "__type__": "cc.Size", @@ -29217,11 +29260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1531 + "__id__": 1533 }, "_enabled": true, "__prefab": { - "__id__": 1535 + "__id__": 1537 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29298,11 +29341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1524 + "__id__": 1526 }, "_enabled": true, "__prefab": { - "__id__": 1538 + "__id__": 1540 }, "_contentSize": { "__type__": "cc.Size", @@ -29326,11 +29369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1524 + "__id__": 1526 }, "_enabled": true, "__prefab": { - "__id__": 1540 + "__id__": 1542 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29371,11 +29414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1524 + "__id__": 1526 }, "_enabled": true, "__prefab": { - "__id__": 1542 + "__id__": 1544 }, "_alignFlags": 45, "_target": null, @@ -29420,11 +29463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1509 + "__id__": 1511 }, "_enabled": true, "__prefab": { - "__id__": 1545 + "__id__": 1547 }, "_contentSize": { "__type__": "cc.Size", @@ -29448,15 +29491,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1509 + "__id__": 1511 }, "_enabled": true, "__prefab": { - "__id__": 1547 + "__id__": 1549 }, "clickEvents": [ { - "__id__": 1548 + "__id__": 1550 } ], "_interactable": true, @@ -29531,11 +29574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1344 + "__id__": 1346 }, "_enabled": true, "__prefab": { - "__id__": 1551 + "__id__": 1553 }, "_contentSize": { "__type__": "cc.Size", @@ -29559,11 +29602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1344 + "__id__": 1346 }, "_enabled": true, "__prefab": { - "__id__": 1553 + "__id__": 1555 }, "_resizeMode": 1, "_layoutType": 1, @@ -29597,11 +29640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1344 + "__id__": 1346 }, "_enabled": true, "__prefab": { - "__id__": 1555 + "__id__": 1557 }, "_alignFlags": 44, "_target": null, @@ -29650,7 +29693,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1558 + "__id__": 1560 }, "_contentSize": { "__type__": "cc.Size", @@ -29678,7 +29721,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1560 + "__id__": 1562 }, "_alignFlags": 21, "_target": null, @@ -29714,7 +29757,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1562 + "__id__": 1564 }, "_id": "" }, @@ -29732,7 +29775,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1564 + "__id__": 1566 }, "_alignFlags": 45, "_target": null, @@ -29781,32 +29824,32 @@ }, "_children": [ { - "__id__": 1567 + "__id__": 1569 }, { - "__id__": 1575 + "__id__": 1577 }, { - "__id__": 1583 + "__id__": 1585 }, { - "__id__": 1591 + "__id__": 1593 } ], "_active": false, "_components": [ - { - "__id__": 1599 - }, { "__id__": 1601 }, { "__id__": 1603 + }, + { + "__id__": 1605 } ], "_prefab": { - "__id__": 1605 + "__id__": 1607 }, "_lpos": { "__type__": "cc.Vec3", @@ -29843,23 +29886,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1566 + "__id__": 1568 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1568 - }, { "__id__": 1570 }, { "__id__": 1572 + }, + { + "__id__": 1574 } ], "_prefab": { - "__id__": 1574 + "__id__": 1576 }, "_lpos": { "__type__": "cc.Vec3", @@ -29896,11 +29939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1567 + "__id__": 1569 }, "_enabled": true, "__prefab": { - "__id__": 1569 + "__id__": 1571 }, "_contentSize": { "__type__": "cc.Size", @@ -29924,11 +29967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1567 + "__id__": 1569 }, "_enabled": true, "__prefab": { - "__id__": 1571 + "__id__": 1573 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -29969,11 +30012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1567 + "__id__": 1569 }, "_enabled": true, "__prefab": { - "__id__": 1573 + "__id__": 1575 }, "_alignFlags": 45, "_target": null, @@ -30018,23 +30061,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1566 + "__id__": 1568 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1576 - }, { "__id__": 1578 }, { "__id__": 1580 + }, + { + "__id__": 1582 } ], "_prefab": { - "__id__": 1582 + "__id__": 1584 }, "_lpos": { "__type__": "cc.Vec3", @@ -30071,11 +30114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1575 + "__id__": 1577 }, "_enabled": true, "__prefab": { - "__id__": 1577 + "__id__": 1579 }, "_contentSize": { "__type__": "cc.Size", @@ -30099,11 +30142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1575 + "__id__": 1577 }, "_enabled": true, "__prefab": { - "__id__": 1579 + "__id__": 1581 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30144,11 +30187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1575 + "__id__": 1577 }, "_enabled": true, "__prefab": { - "__id__": 1581 + "__id__": 1583 }, "_alignFlags": 45, "_target": null, @@ -30193,23 +30236,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1566 + "__id__": 1568 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1584 - }, { "__id__": 1586 }, { "__id__": 1588 + }, + { + "__id__": 1590 } ], "_prefab": { - "__id__": 1590 + "__id__": 1592 }, "_lpos": { "__type__": "cc.Vec3", @@ -30246,11 +30289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1583 + "__id__": 1585 }, "_enabled": true, "__prefab": { - "__id__": 1585 + "__id__": 1587 }, "_contentSize": { "__type__": "cc.Size", @@ -30274,11 +30317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1583 + "__id__": 1585 }, "_enabled": true, "__prefab": { - "__id__": 1587 + "__id__": 1589 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30319,11 +30362,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1583 + "__id__": 1585 }, "_enabled": true, "__prefab": { - "__id__": 1589 + "__id__": 1591 }, "playOnLoad": true, "_clips": [ @@ -30361,23 +30404,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1566 + "__id__": 1568 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1592 - }, { "__id__": 1594 }, { "__id__": 1596 + }, + { + "__id__": 1598 } ], "_prefab": { - "__id__": 1598 + "__id__": 1600 }, "_lpos": { "__type__": "cc.Vec3", @@ -30414,11 +30457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1591 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1593 + "__id__": 1595 }, "_contentSize": { "__type__": "cc.Size", @@ -30442,11 +30485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1591 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1595 + "__id__": 1597 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -30487,11 +30530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1591 + "__id__": 1593 }, "_enabled": true, "__prefab": { - "__id__": 1597 + "__id__": 1599 }, "playOnLoad": true, "_clips": [ @@ -30529,11 +30572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1566 + "__id__": 1568 }, "_enabled": true, "__prefab": { - "__id__": 1600 + "__id__": 1602 }, "_contentSize": { "__type__": "cc.Size", @@ -30557,11 +30600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1566 + "__id__": 1568 }, "_enabled": true, "__prefab": { - "__id__": 1602 + "__id__": 1604 }, "_alignFlags": 45, "_target": null, @@ -30593,11 +30636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1566 + "__id__": 1568 }, "_enabled": true, "__prefab": { - "__id__": 1604 + "__id__": 1606 }, "_id": "" }, @@ -30628,26 +30671,23 @@ }, "_children": [ { - "__id__": 1607 - }, - { - "__id__": 1807 + "__id__": 1609 } ], "_active": true, "_components": [ + { + "__id__": 1809 + }, { "__id__": 1811 }, { "__id__": 1813 - }, - { - "__id__": 1815 } ], "_prefab": { - "__id__": 1817 + "__id__": 1815 }, "_lpos": { "__type__": "cc.Vec3", @@ -30684,27 +30724,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1606 + "__id__": 1608 }, "_children": [ { - "__id__": 1608 + "__id__": 1610 }, { - "__id__": 1656 + "__id__": 1658 }, { - "__id__": 1704 + "__id__": 1706 }, { - "__id__": 1752 + "__id__": 1754 } ], "_active": true, "_components": [ - { - "__id__": 1798 - }, { "__id__": 1800 }, @@ -30713,15 +30750,18 @@ }, { "__id__": 1804 + }, + { + "__id__": 1806 } ], "_prefab": { - "__id__": 1806 + "__id__": 1808 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 40.865, "z": 0 }, "_lrot": { @@ -30753,30 +30793,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1607 + "__id__": 1609 }, "_children": [ { - "__id__": 1609 + "__id__": 1611 }, { - "__id__": 1617 + "__id__": 1619 }, { - "__id__": 1623 + "__id__": 1625 }, { - "__id__": 1633 + "__id__": 1635 } ], "_active": true, "_components": [ { - "__id__": 1653 + "__id__": 1655 } ], "_prefab": { - "__id__": 1655 + "__id__": 1657 }, "_lpos": { "__type__": "cc.Vec3", @@ -30813,27 +30853,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1608 + "__id__": 1610 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1610 - }, { "__id__": 1612 }, { "__id__": 1614 + }, + { + "__id__": 1616 } ], "_prefab": { - "__id__": 1616 + "__id__": 1618 }, "_lpos": { "__type__": "cc.Vec3", - "x": 105, + "x": 70, "y": 0, "z": 0 }, @@ -30846,8 +30886,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -30866,16 +30906,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1609 + "__id__": 1611 }, "_enabled": true, "__prefab": { - "__id__": 1611 + "__id__": 1613 }, "_contentSize": { "__type__": "cc.Size", - "width": 190, - "height": 45 + "width": 200, + "height": 55 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -30894,24 +30934,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1609 + "__id__": 1611 }, "_enabled": true, "__prefab": { - "__id__": 1613 + "__id__": 1615 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 26, - "g": 21, - "b": 45, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8e19b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -30942,15 +30982,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1609 + "__id__": 1611 }, "_enabled": true, "__prefab": { - "__id__": 1615 + "__id__": 1617 }, "_alignFlags": 40, "_target": null, - "_left": 10, + "_left": 0, "_right": 0, "_top": 0, "_bottom": 0, @@ -30991,20 +31031,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1608 + "__id__": 1610 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1618 + "__id__": 1620 }, { - "__id__": 1620 + "__id__": 1622 } ], "_prefab": { - "__id__": 1622 + "__id__": 1624 }, "_lpos": { "__type__": "cc.Vec3", @@ -31021,8 +31061,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.45, - "y": 0.45, + "x": 0.35, + "y": 0.35, "z": 1 }, "_mobility": 0, @@ -31041,11 +31081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1617 + "__id__": 1619 }, "_enabled": true, "__prefab": { - "__id__": 1619 + "__id__": 1621 }, "_contentSize": { "__type__": "cc.Size", @@ -31069,11 +31109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1617 + "__id__": 1619 }, "_enabled": true, "__prefab": { - "__id__": 1621 + "__id__": 1623 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31130,14 +31170,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1608 + "__id__": 1610 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1624 - }, { "__id__": 1626 }, @@ -31146,14 +31183,17 @@ }, { "__id__": 1630 + }, + { + "__id__": 1632 } ], "_prefab": { - "__id__": 1632 + "__id__": 1634 }, "_lpos": { "__type__": "cc.Vec3", - "x": 93.546, + "x": 88.14, "y": 0, "z": 0 }, @@ -31186,15 +31226,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1623 + "__id__": 1625 }, "_enabled": true, "__prefab": { - "__id__": 1625 + "__id__": 1627 }, "_contentSize": { "__type__": "cc.Size", - "width": 120, + "width": 80, "height": 35 }, "_anchorPoint": { @@ -31214,11 +31254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1623 + "__id__": 1625 }, "_enabled": true, "__prefab": { - "__id__": 1627 + "__id__": 1629 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31233,8 +31273,8 @@ "_string": "999999", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 23, + "_fontSize": 25, "_fontFamily": "Arial", "_lineHeight": 35, "_overflow": 2, @@ -31282,15 +31322,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1623 + "__id__": 1625 }, "_enabled": true, "__prefab": { - "__id__": 1629 + "__id__": 1631 }, "_alignFlags": 10, "_target": null, - "_left": 33.54600000000001, + "_left": 48.14, "_right": -15, "_top": 0, "_bottom": 0, @@ -31318,11 +31358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1623 + "__id__": 1625 }, "_enabled": false, "__prefab": { - "__id__": 1631 + "__id__": 1633 }, "templateMode": true, "watchPath": "data.data.gold", @@ -31355,35 +31395,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1608 + "__id__": 1610 }, "_children": [ { - "__id__": 1634 + "__id__": 1636 }, { - "__id__": 1640 + "__id__": 1642 } ], "_active": true, "_components": [ - { - "__id__": 1646 - }, { "__id__": 1648 }, { "__id__": 1650 + }, + { + "__id__": 1652 } ], "_prefab": { - "__id__": 1652 + "__id__": 1654 }, "_lpos": { "__type__": "cc.Vec3", - "x": 178, - "y": 0, + "x": 31.36399999999999, + "y": -10.198, "z": 0 }, "_lrot": { @@ -31395,8 +31435,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.4, + "y": 1.4, "z": 1 }, "_mobility": 0, @@ -31415,20 +31455,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1633 + "__id__": 1635 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1635 + "__id__": 1637 }, { - "__id__": 1637 + "__id__": 1639 } ], "_prefab": { - "__id__": 1639 + "__id__": 1641 }, "_lpos": { "__type__": "cc.Vec3", @@ -31465,11 +31505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1634 + "__id__": 1636 }, "_enabled": true, "__prefab": { - "__id__": 1636 + "__id__": 1638 }, "_contentSize": { "__type__": "cc.Size", @@ -31493,20 +31533,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1634 + "__id__": 1636 }, "_enabled": true, "__prefab": { - "__id__": 1638 + "__id__": 1640 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 71, "g": 255, - "b": 255, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -31551,20 +31591,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1633 + "__id__": 1635 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1641 + "__id__": 1643 }, { - "__id__": 1643 + "__id__": 1645 } ], "_prefab": { - "__id__": 1645 + "__id__": 1647 }, "_lpos": { "__type__": "cc.Vec3", @@ -31601,11 +31641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1640 + "__id__": 1642 }, "_enabled": true, "__prefab": { - "__id__": 1642 + "__id__": 1644 }, "_contentSize": { "__type__": "cc.Size", @@ -31629,11 +31669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1640 + "__id__": 1642 }, "_enabled": true, "__prefab": { - "__id__": 1644 + "__id__": 1646 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -31687,11 +31727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1633 + "__id__": 1635 }, "_enabled": true, "__prefab": { - "__id__": 1647 + "__id__": 1649 }, "_contentSize": { "__type__": "cc.Size", @@ -31715,20 +31755,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1633 + "__id__": 1635 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 1649 + "__id__": 1651 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 71, "g": 255, - "b": 255, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -31760,16 +31800,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1633 + "__id__": 1635 }, "_enabled": true, "__prefab": { - "__id__": 1651 + "__id__": 1653 }, "_alignFlags": 32, "_target": null, "_left": 48, - "_right": 0, + "_right": 77.83600000000001, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -31809,15 +31849,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1608 + "__id__": 1610 }, "_enabled": true, "__prefab": { - "__id__": 1654 + "__id__": 1656 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 140, "height": 50 }, "_anchorPoint": { @@ -31850,34 +31890,34 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1607 + "__id__": 1609 }, "_children": [ { - "__id__": 1657 + "__id__": 1659 }, { - "__id__": 1665 + "__id__": 1667 }, { - "__id__": 1671 + "__id__": 1673 }, { - "__id__": 1681 + "__id__": 1683 } ], "_active": true, "_components": [ { - "__id__": 1701 + "__id__": 1703 } ], "_prefab": { - "__id__": 1703 + "__id__": 1705 }, "_lpos": { "__type__": "cc.Vec3", - "x": -135, + "x": -195, "y": 0, "z": 0 }, @@ -31910,27 +31950,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1656 + "__id__": 1658 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1658 - }, { "__id__": 1660 }, { "__id__": 1662 + }, + { + "__id__": 1664 } ], "_prefab": { - "__id__": 1664 + "__id__": 1666 }, "_lpos": { "__type__": "cc.Vec3", - "x": 105, + "x": 70, "y": 0, "z": 0 }, @@ -31943,8 +31983,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -31963,16 +32003,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1657 + "__id__": 1659 }, "_enabled": true, "__prefab": { - "__id__": 1659 + "__id__": 1661 }, "_contentSize": { "__type__": "cc.Size", - "width": 190, - "height": 45 + "width": 200, + "height": 55 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -31991,24 +32031,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1657 + "__id__": 1659 }, "_enabled": true, "__prefab": { - "__id__": 1661 + "__id__": 1663 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 26, - "g": 21, - "b": 45, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8e19b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -32039,15 +32079,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1657 + "__id__": 1659 }, "_enabled": true, "__prefab": { - "__id__": 1663 + "__id__": 1665 }, "_alignFlags": 40, "_target": null, - "_left": 10, + "_left": 0, "_right": 0, "_top": 0, "_bottom": 0, @@ -32088,20 +32128,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1656 + "__id__": 1658 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1666 + "__id__": 1668 }, { - "__id__": 1668 + "__id__": 1670 } ], "_prefab": { - "__id__": 1670 + "__id__": 1672 }, "_lpos": { "__type__": "cc.Vec3", @@ -32118,8 +32158,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.45, - "y": 0.45, + "x": 0.35, + "y": 0.35, "z": 1 }, "_mobility": 0, @@ -32138,11 +32178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1665 + "__id__": 1667 }, "_enabled": true, "__prefab": { - "__id__": 1667 + "__id__": 1669 }, "_contentSize": { "__type__": "cc.Size", @@ -32166,11 +32206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1665 + "__id__": 1667 }, "_enabled": true, "__prefab": { - "__id__": 1669 + "__id__": 1671 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32227,14 +32267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1656 + "__id__": 1658 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1672 - }, { "__id__": 1674 }, @@ -32243,14 +32280,17 @@ }, { "__id__": 1678 + }, + { + "__id__": 1680 } ], "_prefab": { - "__id__": 1680 + "__id__": 1682 }, "_lpos": { "__type__": "cc.Vec3", - "x": 93.546, + "x": 88.14, "y": 0, "z": 0 }, @@ -32283,15 +32323,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1671 + "__id__": 1673 }, "_enabled": true, "__prefab": { - "__id__": 1673 + "__id__": 1675 }, "_contentSize": { "__type__": "cc.Size", - "width": 120, + "width": 80, "height": 35 }, "_anchorPoint": { @@ -32311,11 +32351,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1671 + "__id__": 1673 }, "_enabled": true, "__prefab": { - "__id__": 1675 + "__id__": 1677 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32330,8 +32370,8 @@ "_string": "999999", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 23, + "_fontSize": 25, "_fontFamily": "Arial", "_lineHeight": 35, "_overflow": 2, @@ -32379,15 +32419,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1671 + "__id__": 1673 }, "_enabled": true, "__prefab": { - "__id__": 1677 + "__id__": 1679 }, "_alignFlags": 10, "_target": null, - "_left": 33.54600000000001, + "_left": 48.14, "_right": -15, "_top": 0, "_bottom": 0, @@ -32415,11 +32455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1671 + "__id__": 1673 }, "_enabled": false, "__prefab": { - "__id__": 1679 + "__id__": 1681 }, "templateMode": true, "watchPath": "data.data.diamond", @@ -32452,35 +32492,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1656 + "__id__": 1658 }, "_children": [ { - "__id__": 1682 + "__id__": 1684 }, { - "__id__": 1688 + "__id__": 1690 } ], "_active": true, "_components": [ - { - "__id__": 1694 - }, { "__id__": 1696 }, { "__id__": 1698 + }, + { + "__id__": 1700 } ], "_prefab": { - "__id__": 1700 + "__id__": 1702 }, "_lpos": { "__type__": "cc.Vec3", - "x": 178, - "y": 0, + "x": 31.364000000000004, + "y": -10.198, "z": 0 }, "_lrot": { @@ -32492,8 +32532,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.4, + "y": 1.4, "z": 1 }, "_mobility": 0, @@ -32512,20 +32552,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1681 + "__id__": 1683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1683 + "__id__": 1685 }, { - "__id__": 1685 + "__id__": 1687 } ], "_prefab": { - "__id__": 1687 + "__id__": 1689 }, "_lpos": { "__type__": "cc.Vec3", @@ -32562,11 +32602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1682 + "__id__": 1684 }, "_enabled": true, "__prefab": { - "__id__": 1684 + "__id__": 1686 }, "_contentSize": { "__type__": "cc.Size", @@ -32590,20 +32630,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1682 + "__id__": 1684 }, "_enabled": true, "__prefab": { - "__id__": 1686 + "__id__": 1688 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 71, "g": 255, - "b": 255, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -32648,20 +32688,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1681 + "__id__": 1683 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1689 + "__id__": 1691 }, { - "__id__": 1691 + "__id__": 1693 } ], "_prefab": { - "__id__": 1693 + "__id__": 1695 }, "_lpos": { "__type__": "cc.Vec3", @@ -32698,11 +32738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1688 + "__id__": 1690 }, "_enabled": true, "__prefab": { - "__id__": 1690 + "__id__": 1692 }, "_contentSize": { "__type__": "cc.Size", @@ -32726,11 +32766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1688 + "__id__": 1690 }, "_enabled": true, "__prefab": { - "__id__": 1692 + "__id__": 1694 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32784,11 +32824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1681 + "__id__": 1683 }, "_enabled": true, "__prefab": { - "__id__": 1695 + "__id__": 1697 }, "_contentSize": { "__type__": "cc.Size", @@ -32812,11 +32852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1681 + "__id__": 1683 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 1697 + "__id__": 1699 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -32857,16 +32897,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1681 + "__id__": 1683 }, "_enabled": true, "__prefab": { - "__id__": 1699 + "__id__": 1701 }, "_alignFlags": 32, "_target": null, "_left": 48, - "_right": 0, + "_right": 77.836, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -32906,15 +32946,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1656 + "__id__": 1658 }, "_enabled": true, "__prefab": { - "__id__": 1702 + "__id__": 1704 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 140, "height": 50 }, "_anchorPoint": { @@ -32947,30 +32987,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1607 + "__id__": 1609 }, "_children": [ { - "__id__": 1705 + "__id__": 1707 }, { - "__id__": 1713 + "__id__": 1715 }, { - "__id__": 1719 + "__id__": 1721 }, { - "__id__": 1729 + "__id__": 1731 } ], "_active": false, "_components": [ { - "__id__": 1749 + "__id__": 1751 } ], "_prefab": { - "__id__": 1751 + "__id__": 1753 }, "_lpos": { "__type__": "cc.Vec3", @@ -33007,23 +33047,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1704 + "__id__": 1706 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1706 - }, { "__id__": 1708 }, { "__id__": 1710 + }, + { + "__id__": 1712 } ], "_prefab": { - "__id__": 1712 + "__id__": 1714 }, "_lpos": { "__type__": "cc.Vec3", @@ -33040,8 +33080,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -33060,16 +33100,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1705 + "__id__": 1707 }, "_enabled": true, "__prefab": { - "__id__": 1707 + "__id__": 1709 }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 45 + "width": 1864.285714, + "height": 55 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -33088,24 +33128,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1705 + "__id__": 1707 }, "_enabled": true, "__prefab": { - "__id__": 1709 + "__id__": 1711 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 26, - "g": 21, - "b": 45, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@549c9", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8e19b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -33120,7 +33160,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -33133,15 +33176,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1705 + "__id__": 1707 }, "_enabled": true, "__prefab": { - "__id__": 1711 + "__id__": 1713 }, "_alignFlags": 40, "_target": null, - "_left": 10, + "_left": 0, "_right": 0, "_top": 0, "_bottom": 0, @@ -33182,20 +33225,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1704 + "__id__": 1706 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1714 + "__id__": 1716 }, { - "__id__": 1716 + "__id__": 1718 } ], "_prefab": { - "__id__": 1718 + "__id__": 1720 }, "_lpos": { "__type__": "cc.Vec3", @@ -33212,8 +33255,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.45, - "y": 0.45, + "x": 0.35, + "y": 0.35, "z": 1 }, "_mobility": 0, @@ -33232,11 +33275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1713 + "__id__": 1715 }, "_enabled": true, "__prefab": { - "__id__": 1715 + "__id__": 1717 }, "_contentSize": { "__type__": "cc.Size", @@ -33260,11 +33303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1713 + "__id__": 1715 }, "_enabled": true, "__prefab": { - "__id__": 1717 + "__id__": 1719 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33321,14 +33364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1704 + "__id__": 1706 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1720 - }, { "__id__": 1722 }, @@ -33337,14 +33377,17 @@ }, { "__id__": 1726 + }, + { + "__id__": 1728 } ], "_prefab": { - "__id__": 1728 + "__id__": 1730 }, "_lpos": { "__type__": "cc.Vec3", - "x": 40.502, + "x": 35.096, "y": 0, "z": 0 }, @@ -33377,15 +33420,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1719 + "__id__": 1721 }, "_enabled": true, "__prefab": { - "__id__": 1721 + "__id__": 1723 }, "_contentSize": { "__type__": "cc.Size", - "width": 110, + "width": 80, "height": 35 }, "_anchorPoint": { @@ -33405,11 +33448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1719 + "__id__": 1721 }, "_enabled": true, "__prefab": { - "__id__": 1723 + "__id__": 1725 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33425,7 +33468,7 @@ "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 20, - "_fontSize": 20, + "_fontSize": 25, "_fontFamily": "Arial", "_lineHeight": 35, "_overflow": 2, @@ -33473,11 +33516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1719 + "__id__": 1721 }, "_enabled": true, "__prefab": { - "__id__": 1725 + "__id__": 1727 }, "_alignFlags": 10, "_target": null, @@ -33509,11 +33552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1719 + "__id__": 1721 }, "_enabled": false, "__prefab": { - "__id__": 1727 + "__id__": 1729 }, "templateMode": true, "watchPath": "data.data.meat", @@ -33546,35 +33589,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1704 + "__id__": 1706 }, "_children": [ { - "__id__": 1730 + "__id__": 1732 }, { - "__id__": 1736 + "__id__": 1738 } ], "_active": true, "_components": [ - { - "__id__": 1742 - }, { "__id__": 1744 }, { "__id__": 1746 + }, + { + "__id__": 1748 } ], "_prefab": { - "__id__": 1748 + "__id__": 1750 }, "_lpos": { "__type__": "cc.Vec3", - "x": 148, - "y": 0, + "x": 70.164, + "y": -10.198, "z": 0 }, "_lrot": { @@ -33586,8 +33629,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.4, + "y": 1.4, "z": 1 }, "_mobility": 0, @@ -33606,20 +33649,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1729 + "__id__": 1731 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1731 + "__id__": 1733 }, { - "__id__": 1733 + "__id__": 1735 } ], "_prefab": { - "__id__": 1735 + "__id__": 1737 }, "_lpos": { "__type__": "cc.Vec3", @@ -33656,11 +33699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1730 + "__id__": 1732 }, "_enabled": true, "__prefab": { - "__id__": 1732 + "__id__": 1734 }, "_contentSize": { "__type__": "cc.Size", @@ -33684,20 +33727,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1730 + "__id__": 1732 }, "_enabled": true, "__prefab": { - "__id__": 1734 + "__id__": 1736 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 71, "g": 255, - "b": 255, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -33742,20 +33785,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1729 + "__id__": 1731 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1737 + "__id__": 1739 }, { - "__id__": 1739 + "__id__": 1741 } ], "_prefab": { - "__id__": 1741 + "__id__": 1743 }, "_lpos": { "__type__": "cc.Vec3", @@ -33792,11 +33835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1736 + "__id__": 1738 }, "_enabled": true, "__prefab": { - "__id__": 1738 + "__id__": 1740 }, "_contentSize": { "__type__": "cc.Size", @@ -33820,11 +33863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1736 + "__id__": 1738 }, "_enabled": true, "__prefab": { - "__id__": 1740 + "__id__": 1742 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33878,11 +33921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1729 + "__id__": 1731 }, "_enabled": true, "__prefab": { - "__id__": 1743 + "__id__": 1745 }, "_contentSize": { "__type__": "cc.Size", @@ -33906,11 +33949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1729 + "__id__": 1731 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 1745 + "__id__": 1747 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -33951,11 +33994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1729 + "__id__": 1731 }, "_enabled": true, "__prefab": { - "__id__": 1747 + "__id__": 1749 }, "_alignFlags": 32, "_target": null, @@ -34000,15 +34043,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1704 + "__id__": 1706 }, "_enabled": true, "__prefab": { - "__id__": 1750 + "__id__": 1752 }, "_contentSize": { "__type__": "cc.Size", - "width": 170, + "width": 140, "height": 50 }, "_anchorPoint": { @@ -34041,34 +34084,34 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1607 + "__id__": 1609 }, "_children": [ { - "__id__": 1753 + "__id__": 1755 }, { - "__id__": 1761 + "__id__": 1763 }, { - "__id__": 1767 + "__id__": 1769 }, { - "__id__": 1775 + "__id__": 1777 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 1795 + "__id__": 1797 } ], "_prefab": { - "__id__": 1797 + "__id__": 1799 }, "_lpos": { "__type__": "cc.Vec3", - "x": 80, + "x": -40, "y": 0, "z": 0 }, @@ -34101,27 +34144,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1752 + "__id__": 1754 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1754 - }, { "__id__": 1756 }, { "__id__": 1758 + }, + { + "__id__": 1760 } ], "_prefab": { - "__id__": 1760 + "__id__": 1762 }, "_lpos": { "__type__": "cc.Vec3", - "x": 105, + "x": 70, "y": 0, "z": 0 }, @@ -34134,8 +34177,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -34154,16 +34197,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1753 + "__id__": 1755 }, "_enabled": true, "__prefab": { - "__id__": 1755 + "__id__": 1757 }, "_contentSize": { "__type__": "cc.Size", - "width": 190, - "height": 45 + "width": 200, + "height": 55 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -34182,24 +34225,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1753 + "__id__": 1755 }, "_enabled": true, "__prefab": { - "__id__": 1757 + "__id__": 1759 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 26, - "g": 21, - "b": 45, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8fe5f", + "__uuid__": "49c583b3-d566-4c79-9e4c-bd0ca4a4b717@8e19b", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -34230,15 +34273,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1753 + "__id__": 1755 }, "_enabled": true, "__prefab": { - "__id__": 1759 + "__id__": 1761 }, "_alignFlags": 40, "_target": null, - "_left": 10, + "_left": 0, "_right": 0, "_top": 0, "_bottom": 0, @@ -34279,20 +34322,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1752 + "__id__": 1754 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1762 + "__id__": 1764 }, { - "__id__": 1764 + "__id__": 1766 } ], "_prefab": { - "__id__": 1766 + "__id__": 1768 }, "_lpos": { "__type__": "cc.Vec3", @@ -34309,8 +34352,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.45, - "y": 0.45, + "x": 0.35, + "y": 0.35, "z": 1 }, "_mobility": 0, @@ -34329,11 +34372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1761 + "__id__": 1763 }, "_enabled": true, "__prefab": { - "__id__": 1763 + "__id__": 1765 }, "_contentSize": { "__type__": "cc.Size", @@ -34357,11 +34400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1761 + "__id__": 1763 }, "_enabled": true, "__prefab": { - "__id__": 1765 + "__id__": 1767 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34418,27 +34461,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1752 + "__id__": 1754 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 1768 - }, { "__id__": 1770 }, { "__id__": 1772 + }, + { + "__id__": 1774 } ], "_prefab": { - "__id__": 1774 + "__id__": 1776 }, "_lpos": { "__type__": "cc.Vec3", - "x": 93.546, + "x": 88.14, "y": 0, "z": 0 }, @@ -34471,15 +34514,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1767 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1769 + "__id__": 1771 }, "_contentSize": { "__type__": "cc.Size", - "width": 120, + "width": 80, "height": 35 }, "_anchorPoint": { @@ -34499,11 +34542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1767 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1771 + "__id__": 1773 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34518,8 +34561,8 @@ "_string": "999999", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 20, + "_fontSize": 25, "_fontFamily": "Arial", "_lineHeight": 35, "_overflow": 2, @@ -34567,15 +34610,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1767 + "__id__": 1769 }, "_enabled": true, "__prefab": { - "__id__": 1773 + "__id__": 1775 }, "_alignFlags": 10, "_target": null, - "_left": 33.54600000000001, + "_left": 48.14, "_right": -15, "_top": 0, "_bottom": 0, @@ -34616,35 +34659,35 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1752 + "__id__": 1754 }, "_children": [ { - "__id__": 1776 + "__id__": 1778 }, { - "__id__": 1782 + "__id__": 1784 } ], "_active": true, "_components": [ - { - "__id__": 1788 - }, { "__id__": 1790 }, { "__id__": 1792 + }, + { + "__id__": 1794 } ], "_prefab": { - "__id__": 1794 + "__id__": 1796 }, "_lpos": { "__type__": "cc.Vec3", - "x": 178, - "y": 0, + "x": 31.364000000000004, + "y": -10.198, "z": 0 }, "_lrot": { @@ -34656,8 +34699,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.4, + "y": 1.4, "z": 1 }, "_mobility": 0, @@ -34676,20 +34719,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1775 + "__id__": 1777 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1777 + "__id__": 1779 }, { - "__id__": 1779 + "__id__": 1781 } ], "_prefab": { - "__id__": 1781 + "__id__": 1783 }, "_lpos": { "__type__": "cc.Vec3", @@ -34726,11 +34769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1776 + "__id__": 1778 }, "_enabled": true, "__prefab": { - "__id__": 1778 + "__id__": 1780 }, "_contentSize": { "__type__": "cc.Size", @@ -34754,20 +34797,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1776 + "__id__": 1778 }, "_enabled": true, "__prefab": { - "__id__": 1780 + "__id__": 1782 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, + "r": 71, "g": 255, - "b": 255, + "b": 0, "a": 255 }, "_spriteFrame": { @@ -34812,20 +34855,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1775 + "__id__": 1777 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1783 + "__id__": 1785 }, { - "__id__": 1785 + "__id__": 1787 } ], "_prefab": { - "__id__": 1787 + "__id__": 1789 }, "_lpos": { "__type__": "cc.Vec3", @@ -34862,11 +34905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1782 + "__id__": 1784 }, "_enabled": true, "__prefab": { - "__id__": 1784 + "__id__": 1786 }, "_contentSize": { "__type__": "cc.Size", @@ -34890,11 +34933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1782 + "__id__": 1784 }, "_enabled": true, "__prefab": { - "__id__": 1786 + "__id__": 1788 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -34948,11 +34991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1775 + "__id__": 1777 }, "_enabled": true, "__prefab": { - "__id__": 1789 + "__id__": 1791 }, "_contentSize": { "__type__": "cc.Size", @@ -34976,11 +35019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1775 + "__id__": 1777 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 1791 + "__id__": 1793 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -35021,16 +35064,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1775 + "__id__": 1777 }, "_enabled": true, "__prefab": { - "__id__": 1793 + "__id__": 1795 }, "_alignFlags": 32, "_target": null, "_left": 48, - "_right": 0, + "_right": 77.836, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -35070,15 +35113,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1752 + "__id__": 1754 }, "_enabled": true, "__prefab": { - "__id__": 1796 + "__id__": 1798 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 140, "height": 50 }, "_anchorPoint": { @@ -35111,11 +35154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1607 + "__id__": 1609 }, "_enabled": true, "__prefab": { - "__id__": 1799 + "__id__": 1801 }, "_contentSize": { "__type__": "cc.Size", @@ -35139,11 +35182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1607 + "__id__": 1609 }, "_enabled": true, "__prefab": { - "__id__": 1801 + "__id__": 1803 }, "_alignFlags": 8, "_target": null, @@ -35175,11 +35218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1607 + "__id__": 1609 }, "_enabled": true, "__prefab": { - "__id__": 1803 + "__id__": 1805 }, "_resizeMode": 0, "_layoutType": 1, @@ -35213,11 +35256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1607 + "__id__": 1609 }, "_enabled": true, "__prefab": { - "__id__": 1805 + "__id__": 1807 }, "_alignFlags": 40, "_target": null, @@ -35257,105 +35300,17 @@ "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.Node", - "_name": "mission", + "__type__": "cc.UITransform", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, - "_parent": { - "__id__": 1606 + "node": { + "__id__": 1608 }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1808 - } - ], - "_prefab": { + "_enabled": true, + "__prefab": { "__id__": 1810 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -138.648, - "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__": 1807 - }, - "_enabled": true, - "__prefab": { - "__id__": 1809 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 400, - "height": 80 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ebst0OIRpMu5qy/yE5RHCL" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "31m4DWu79MtJL9b2D3/39j", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1606 - }, - "_enabled": true, - "__prefab": { - "__id__": 1812 - }, "_contentSize": { "__type__": "cc.Size", "width": 720, @@ -35378,11 +35333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1606 + "__id__": 1608 }, "_enabled": true, "__prefab": { - "__id__": 1814 + "__id__": 1812 }, "_alignFlags": 17, "_target": null, @@ -35414,11 +35369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1606 + "__id__": 1608 }, "_enabled": true, "__prefab": { - "__id__": 1816 + "__id__": 1814 }, "_id": "" }, @@ -35449,7 +35404,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1819 + "__id__": 1817 }, "_contentSize": { "__type__": "cc.Size", @@ -35477,7 +35432,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1821 + "__id__": 1819 }, "_alignFlags": 45, "_target": null, @@ -35513,7 +35468,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1823 + "__id__": 1821 }, "_id": "" }, @@ -35531,7 +35486,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1825 + "__id__": 1823 }, "_id": "" }, @@ -35551,48 +35506,48 @@ "instance": null, "targetOverrides": [ { - "__id__": 1827 + "__id__": 1825 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1187 + "__id__": 1189 }, { - "__id__": 1114 + "__id__": 1116 }, { - "__id__": 1068 + "__id__": 1070 }, { - "__id__": 1022 + "__id__": 1024 }, { - "__id__": 976 + "__id__": 978 }, { - "__id__": 930 + "__id__": 932 }, { - "__id__": 884 + "__id__": 886 }, { - "__id__": 838 + "__id__": 840 }, { - "__id__": 792 + "__id__": 794 }, { - "__id__": 722 + "__id__": 724 }, { - "__id__": 692 + "__id__": 694 }, { - "__id__": 662 + "__id__": 664 }, { - "__id__": 632 + "__id__": 634 }, { "__id__": 545 @@ -35611,17 +35566,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1187 + "__id__": 1189 }, "sourceInfo": { - "__id__": 1828 + "__id__": 1826 }, "propertyPath": [], "target": { - "__id__": 1187 + "__id__": 1189 }, "targetInfo": { - "__id__": 1829 + "__id__": 1827 } }, { diff --git a/assets/resources/gui/ui1.plist.meta b/assets/resources/gui/ui1.plist.meta index 65c217c6..423bc404 100644 --- a/assets/resources/gui/ui1.plist.meta +++ b/assets/resources/gui/ui1.plist.meta @@ -2831,7 +2831,7 @@ "height": 53, "rawWidth": 50, "rawHeight": 53, - "borderTop": 26.5, + "borderTop": 26, "borderBottom": 0, "borderLeft": 25, "borderRight": 25, @@ -2877,8 +2877,8 @@ "height": 53, "rawWidth": 50, "rawHeight": 53, - "borderTop": 26.5, - "borderBottom": 26.5, + "borderTop": 26, + "borderBottom": 26, "borderLeft": 25, "borderRight": 25, "packable": true, @@ -3337,10 +3337,10 @@ "height": 61, "rawWidth": 57, "rawHeight": 61, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 30, + "borderBottom": 31, + "borderLeft": 28.5, + "borderRight": 28.5, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -3475,10 +3475,10 @@ "height": 48, "rawWidth": 40, "rawHeight": 48, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 20, + "borderBottom": 28, + "borderLeft": 20, + "borderRight": 20, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -12859,10 +12859,10 @@ "height": 56, "rawWidth": 54, "rawHeight": 56, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 28, + "borderBottom": 28, + "borderLeft": 27, + "borderRight": 27, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -16815,10 +16815,10 @@ "height": 80, "rawWidth": 244, "rawHeight": 80, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 40, + "borderBottom": 40, + "borderLeft": 122, + "borderRight": 122, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/ui2.plist.meta b/assets/resources/gui/ui2.plist.meta index 90d3d5f5..d417ee77 100644 --- a/assets/resources/gui/ui2.plist.meta +++ b/assets/resources/gui/ui2.plist.meta @@ -1911,7 +1911,7 @@ "height": 110, "rawWidth": 160, "rawHeight": 110, - "borderTop": 55, + "borderTop": 52, "borderBottom": 55, "borderLeft": 80, "borderRight": 80, @@ -2049,8 +2049,8 @@ "height": 51, "rawWidth": 52, "rawHeight": 51, - "borderTop": 25.5, - "borderBottom": 25.5, + "borderTop": 25, + "borderBottom": 25, "borderLeft": 26, "borderRight": 26, "packable": true, diff --git a/assets/script/game/common/config/Guide.ts b/assets/script/game/common/config/Guide.ts index ff326700..f3714a0d 100644 --- a/assets/script/game/common/config/Guide.ts +++ b/assets/script/game/common/config/Guide.ts @@ -67,72 +67,72 @@ export const GuideConfig: { [key: number]: IGuideStep } = { 0: { id: "welcome", type: GuideStepType.WAIT,key:0, targetPath: "root/gui/LayerUI/role_controller/mission_home/start/name", - tipText: "伟大的勇者,欢迎来到 『像素大陆』,可恶的兽人日常入侵我们的村庄,请带领您的英雄抵御兽人的入侵吧!", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 600 }, - nextStep: "start_battle", waitTime: 2, end_event: "click", noInput: true, - + tipText: "伟大的勇者,欢迎来到 『像素大陆』", + handOffset: { x: 42, y: -45 }, + nextStep: "start_battle", waitTime: 5, end_event: "click", noInput: true, }, 1: { id: "start_battle", type: GuideStepType.CLICK,key:1, targetPath: "root/gui/LayerUI/role_controller/mission_home/start/name", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + tipText: "请带领您的英雄抵御兽人的入侵吧!", + handOffset: { x: 42, y: -45 }, // 42 45是手指的偏移量 0 0是提示的偏移量 }, 2: { id: "hero_page", type: GuideStepType.CLICK,key:2, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/role_controller/mission_home/btns/heros", - tipText: "伟大的勇者,感谢你愿意加入我们,可以到酒馆招募更多英雄增强队伍", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + tipText: "在酒馆招募更多英雄增强队伍", + handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 600 }, }, 3: { id: "to_hero_info", type: GuideStepType.CLICK,key:3, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/role_controller/mission_home/heros_page", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 } // 向上偏移50像素,避免遮挡 + handOffset: { x: 42, y: -45 }, }, 4: { id: "do_hero_info", type: GuideStepType.CLICK,key:4, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/Hinfo/unLock", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }// 向上偏移50像素,避免遮挡 + handOffset: { x: 42, y: -45 }, }, 5: { id: "up_lv_hero", type: GuideStepType.CLICK,key:5, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/Hinfo/upBtn", - handOffset: { x: 42, y: -45 },tipOffset: { x: 0, y: 200 } // 向上偏移50像素,避免遮挡 + handOffset: { x: 42, y: -45 }, }, 6: { id: "close_hinfo", type: GuideStepType.CLICK,key:6, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/Hinfo/back", - handOffset: { x: 42, y: -45 },tipOffset: { x: 0, y: 200 } // 向上偏移50像素,避免遮挡 + handOffset: { x: 42, y: -45 } }, 7: { id: "to_mission", type: GuideStepType.CLICK,key:7, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/role_controller/mission_home/btns/fight", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + handOffset: { x: 42, y: -45 }, }, 8: { id: "to_add_hero", type: GuideStepType.CLICK,key:8, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/role_controller/mission_home/readyheros/hero3", - tipText: "伟大的勇者,请设置你的上阵英雄", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + tipText: "可以随时调整上阵英雄", + handOffset: { x: 42, y: -45 }, }, 9: { id: "to_hero_select", type: GuideStepType.CLICK,key:9, // 使用相对路径,从场景根节点开始查找 targetPath: "root/gui/LayerUI/hero_select/main/view/heros/hero2", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + handOffset: { x: 42, y: -45 }, }, 10: { id: "start_battle", type: GuideStepType.CLICK,key:10, targetPath: "root/gui/LayerUI/role_controller/mission_home/start/name", - tipText: "伟大的勇者,请再次为我们抵御兽人的入侵吧!", - handOffset: { x: 42, y: -45 }, tipOffset: { x: 0, y: 200 }, + tipText: "享受战斗的乐趣吧!", + handOffset: { x: 42, y: -45 }, // 42 45是手指的偏移量 0 0是提示的偏移量 }, };