diff --git a/assets/resources/gui/auie/button.prefab b/assets/resources/gui/auie/button.prefab index db0977b7..cd068240 100644 --- a/assets/resources/gui/auie/button.prefab +++ b/assets/resources/gui/auie/button.prefab @@ -29,16 +29,19 @@ }, { "__id__": 26 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 84 } ], "_prefab": { - "__id__": 78 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -78,7 +81,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 3 @@ -108,8 +111,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -253,7 +256,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 11 @@ -283,8 +286,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -428,7 +431,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 19 @@ -458,8 +461,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -594,6 +597,181 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Button01_l_Yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 27 + }, + { + "__id__": 29 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 33 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "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__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 250, + "height": 133.33333333333334 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f56shr5D9N2aJyQ8kZt9jR" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@0e901", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7828VPg/9KFqdBBkwVgGO8" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 80, + "_originalHeight": 142, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "046yIkdV9ETpWKshcgcsYj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "66oR8aJCtH4IcgUpTJF6an", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "Node", @@ -604,29 +782,29 @@ }, "_children": [ { - "__id__": 27 + "__id__": 35 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 51 + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 77 }, { - "__id__": 71 + "__id__": 79 }, { - "__id__": 73 + "__id__": 81 } ], "_prefab": { - "__id__": 75 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -665,20 +843,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 26 + "__id__": 34 }, "_children": [], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 36 }, { - "__id__": 30 + "__id__": 38 } ], "_prefab": { - "__id__": 32 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -715,11 +893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -743,11 +921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 35 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 39 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -826,27 +1004,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 26 + "__id__": 34 }, "_children": [ { - "__id__": 34 - }, - { - "__id__": 40 - } - ], - "_active": true, - "_components": [ - { - "__id__": 46 + "__id__": 42 }, { "__id__": 48 } ], + "_active": true, + "_components": [ + { + "__id__": 54 + }, + { + "__id__": 56 + } + ], "_prefab": { - "__id__": 50 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -883,20 +1061,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 43 }, { - "__id__": 37 + "__id__": 45 } ], "_prefab": { - "__id__": 39 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -933,11 +1111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -961,11 +1139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1019,20 +1197,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 49 }, { - "__id__": 43 + "__id__": 51 } ], "_prefab": { - "__id__": 45 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -1069,11 +1247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -1097,11 +1275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1178,11 +1356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 55 }, "_contentSize": { "__type__": "cc.Size", @@ -1206,11 +1384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 57 }, "_resizeMode": 1, "_layoutType": 1, @@ -1259,27 +1437,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 26 + "__id__": 34 }, "_children": [ { - "__id__": 52 - }, - { - "__id__": 58 - } - ], - "_active": false, - "_components": [ - { - "__id__": 64 + "__id__": 60 }, { "__id__": 66 } ], + "_active": false, + "_components": [ + { + "__id__": 72 + }, + { + "__id__": 74 + } + ], "_prefab": { - "__id__": 68 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1316,20 +1494,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 51 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 61 }, { - "__id__": 55 + "__id__": 63 } ], "_prefab": { - "__id__": 57 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1366,11 +1544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1394,11 +1572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1455,20 +1633,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 51 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 67 }, { - "__id__": 61 + "__id__": 69 } ], "_prefab": { - "__id__": 63 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -1505,11 +1683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1533,11 +1711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 70 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1614,11 +1792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1642,11 +1820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 75 }, "_resizeMode": 1, "_layoutType": 1, @@ -1693,11 +1871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 78 }, "_contentSize": { "__type__": "cc.Size", @@ -1721,11 +1899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 80 }, "_alignFlags": 45, "_target": null, @@ -1757,11 +1935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 82 }, "_resizeMode": 1, "_layoutType": 2, @@ -1812,7 +1990,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", diff --git a/assets/resources/gui/auie/hbg.prefab b/assets/resources/gui/auie/hbg.prefab index f4176a46..39f07bfe 100644 --- a/assets/resources/gui/auie/hbg.prefab +++ b/assets/resources/gui/auie/hbg.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 11 + "__id__": 26 }, { - "__id__": 34 + "__id__": 54 }, { - "__id__": 57 + "__id__": 83 }, { - "__id__": 80 + "__id__": 112 }, { - "__id__": 103 + "__id__": 141 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 126 + "__id__": 170 }, { - "__id__": 128 + "__id__": 172 } ], "_prefab": { - "__id__": 130 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -95,10 +95,10 @@ "__id__": 2 }, "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", "__expectedType__": "cc.Prefab" }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", + "fileId": "b4ICzk8RFDq6KzVMReui0b", "instance": { "__id__": 4 }, @@ -106,7 +106,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b07gB1EX9B7bgt1SSMJuZf", + "fileId": "abu85ezhxDCr4OpV3yEMwU", "prefabRootNode": { "__id__": 1 }, @@ -127,152 +127,27 @@ }, { "__id__": 10 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_name" - ], - "value": "yellow" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ee9HwyGFhDTarF97iXfEHu" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 12 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 11 - }, - "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", - "__expectedType__": "cc.Prefab" - }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", - "instance": { - "__id__": 13 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "c1YknG2hdD7YYNoBiQUeEP", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ + }, + { + "__id__": 12 + }, { "__id__": 14 }, { "__id__": 16 }, - { - "__id__": 17 - }, { "__id__": 18 }, { - "__id__": 19 + "__id__": 20 }, { - "__id__": 21 + "__id__": 22 }, { - "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 27 - }, - { - "__id__": 29 - }, - { - "__id__": 31 - }, - { - "__id__": 33 + "__id__": 24 } ], "removedComponents": [] @@ -280,23 +155,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_name" ], - "value": "blue" + "value": "red" }, { "__type__": "cc.TargetInfo", "localID": [ - "ee9HwyGFhDTarF97iXfEHu" + "b4ICzk8RFDq6KzVMReui0b" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_lpos" @@ -311,7 +186,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_lrot" @@ -327,7 +202,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_euler" @@ -342,131 +217,41 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 20 + "__id__": 11 }, "propertyPath": [ - "_color" + "_contentSize" ], "value": { - "__type__": "cc.Color", - "r": 34, - "g": 71, - "b": 121, - "a": 255 + "__type__": "cc.Size", + "width": 230, + "height": 370 } }, { "__type__": "cc.TargetInfo", "localID": [ - "d67w0LWpZGDIOKFRdClHxZ" + "3e6xe2CYhAnaDRXFjAvMW1" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 13 }, "propertyPath": [ - "_color" + "_contentSize" ], "value": { - "__type__": "cc.Color", - "r": 113, - "g": 211, - "b": 220, - "a": 255 + "__type__": "cc.Size", + "width": 230, + "height": 370 } }, { "__type__": "cc.TargetInfo", "localID": [ - "08nT29mQpCLKxN2SVjI3cu" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 56, - "g": 154, - "b": 201, - "a": 255 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "8dxUNBKXNN1ZD0UUu6Y+ek" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3fzhiI2P9Os7ruQJg+Awdq" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 28 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6a/8vYCBFl5hxt8lfklSI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3994XTlbxF7YxpLo9qDrmy" + "bdp/P0YJBDNIRtzvt1ZYlH" ] }, { @@ -475,9 +260,122 @@ "__id__": 15 }, "propertyPath": [ - "_active" + "_contentSize" ], - "value": true + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 17 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 21 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 23 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 25 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3awTuW1YtIkJ0MAhOjyZM8" + ] }, { "__type__": "cc.Node", @@ -486,28 +384,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 26 }, "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", "__expectedType__": "cc.Prefab" }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", + "fileId": "b4ICzk8RFDq6KzVMReui0b", "instance": { - "__id__": 36 + "__id__": 28 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "f101kaswJDXq6VOKS4gofh", + "fileId": "f5MPkjgDZJwIgO3vOaXjve", "prefabRootNode": { "__id__": 1 }, @@ -515,17 +413,29 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 29 }, { - "__id__": 39 + "__id__": 31 + }, + { + "__id__": 32 + }, + { + "__id__": 33 + }, + { + "__id__": 34 + }, + { + "__id__": 36 + }, + { + "__id__": 38 }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, @@ -543,12 +453,6 @@ }, { "__id__": 52 - }, - { - "__id__": 54 - }, - { - "__id__": 56 } ], "removedComponents": [] @@ -556,23 +460,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 30 }, "propertyPath": [ "_name" ], - "value": "red" + "value": "yellow" }, { "__type__": "cc.TargetInfo", "localID": [ - "ee9HwyGFhDTarF97iXfEHu" + "b4ICzk8RFDq6KzVMReui0b" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -587,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -603,7 +507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -618,23 +522,102 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 35 }, "propertyPath": [ - "_color" + "_contentSize" ], "value": { - "__type__": "cc.Color", - "r": 124, - "g": 25, - "b": 25, - "a": 255 + "__type__": "cc.Size", + "width": 230, + "height": 370 } }, { "__type__": "cc.TargetInfo", "localID": [ - "d67w0LWpZGDIOKFRdClHxZ" + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 37 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 39 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 41 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 43 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" ] }, { @@ -643,20 +626,19 @@ "__id__": 45 }, "propertyPath": [ - "_color" + "_lpos" ], "value": { - "__type__": "cc.Color", - "r": 194, - "g": 53, - "b": 66, - "a": 255 + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "08nT29mQpCLKxN2SVjI3cu" + "730isJJuJKuZ4TyYRIGiPl" ] }, { @@ -665,20 +647,18 @@ "__id__": 47 }, "propertyPath": [ - "_color" + "_contentSize" ], "value": { - "__type__": "cc.Color", - "r": 194, - "g": 53, - "b": 66, - "a": 255 + "__type__": "cc.Size", + "width": 210, + "height": 150 } }, { "__type__": "cc.TargetInfo", "localID": [ - "8dxUNBKXNN1ZD0UUu6Y+ek" + "e3U+s1uAdCgJorqCcyhk3a" ] }, { @@ -687,14 +667,19 @@ "__id__": 49 }, "propertyPath": [ - "_active" + "_lpos" ], - "value": true + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } }, { "__type__": "cc.TargetInfo", "localID": [ - "3fzhiI2P9Os7ruQJg+Awdq" + "3awTuW1YtIkJ0MAhOjyZM8" ] }, { @@ -703,14 +688,20 @@ "__id__": 51 }, "propertyPath": [ - "_active" + "_color" ], - "value": true + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 216, + "b": 42, + "a": 255 + } }, { "__type__": "cc.TargetInfo", "localID": [ - "75w8fK3CJCSbcfUF7Bzbl3" + "26DiJMkAFBWb1mvvZDUtMs" ] }, { @@ -719,42 +710,22 @@ "__id__": 53 }, "propertyPath": [ - "_active" + "_color" ], - "value": true + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 176, + "b": 51, + "a": 255 + } }, { "__type__": "cc.TargetInfo", "localID": [ - "a6a/8vYCBFl5hxt8lfklSI" + "22EIS7o1lA4Kwmkz0o8wWF" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 55 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3994XTlbxF7YxpLo9qDrmy" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -762,69 +733,78 @@ "__id__": 1 }, "_prefab": { - "__id__": 58 + "__id__": 55 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 57 + "__id__": 54 }, "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", "__expectedType__": "cc.Prefab" }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", + "fileId": "b4ICzk8RFDq6KzVMReui0b", "instance": { - "__id__": 59 + "__id__": 56 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "05jFDX5FhJuruUzmKX9L6a", + "fileId": "32N56AUUNHXI7pB1SQ9r0W", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 57 + }, + { + "__id__": 59 + }, { "__id__": 60 }, + { + "__id__": 61 + }, { "__id__": 62 }, - { - "__id__": 63 - }, { "__id__": 64 }, { - "__id__": 65 + "__id__": 66 }, { - "__id__": 67 + "__id__": 68 }, { - "__id__": 69 + "__id__": 70 }, { - "__id__": 71 + "__id__": 72 }, { - "__id__": 73 + "__id__": 74 }, { - "__id__": 75 + "__id__": 76 }, { - "__id__": 77 + "__id__": 78 }, { - "__id__": 79 + "__id__": 80 + }, + { + "__id__": 82 } ], "removedComponents": [] @@ -832,7 +812,369 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 58 + }, + "propertyPath": [ + "_name" + ], + "value": "blue" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b4ICzk8RFDq6KzVMReui0b" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 58 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 58 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 58 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 63 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 65 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 69 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 71 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 73 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 77 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3awTuW1YtIkJ0MAhOjyZM8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 79 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 43, + "g": 158, + "b": 255, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "26DiJMkAFBWb1mvvZDUtMs" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 81 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 77, + "g": 86, + "b": 223, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "22EIS7o1lA4Kwmkz0o8wWF" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 58 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 84 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 83 + }, + "asset": { + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", + "__expectedType__": "cc.Prefab" + }, + "fileId": "b4ICzk8RFDq6KzVMReui0b", + "instance": { + "__id__": 85 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "abnrOcHkxGCrtoBT7VPyc+", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 89 + }, + { + "__id__": 90 + }, + { + "__id__": 91 + }, + { + "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + }, + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + }, + { + "__id__": 111 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 }, "propertyPath": [ "_name" @@ -842,13 +1184,13 @@ { "__type__": "cc.TargetInfo", "localID": [ - "ee9HwyGFhDTarF97iXfEHu" + "b4ICzk8RFDq6KzVMReui0b" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 87 }, "propertyPath": [ "_lpos" @@ -863,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 87 }, "propertyPath": [ "_lrot" @@ -879,7 +1221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 87 }, "propertyPath": [ "_euler" @@ -894,142 +1236,219 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 92 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 94 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 96 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 98 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 102 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 104 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 106 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3awTuW1YtIkJ0MAhOjyZM8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 108 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 33, - "g": 112, - "b": 91, + "r": 34, + "g": 153, + "b": 101, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "d67w0LWpZGDIOKFRdClHxZ" + "26DiJMkAFBWb1mvvZDUtMs" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 110 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 87, - "g": 213, - "b": 116, + "r": 25, + "g": 107, + "b": 87, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "08nT29mQpCLKxN2SVjI3cu" + "22EIS7o1lA4Kwmkz0o8wWF" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 19, - "g": 165, - "b": 84, - "a": 255 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "8dxUNBKXNN1ZD0UUu6Y+ek" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 + "__id__": 87 }, "propertyPath": [ "_active" ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3fzhiI2P9Os7ruQJg+Awdq" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 76 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6a/8vYCBFl5hxt8lfklSI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 78 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3994XTlbxF7YxpLo9qDrmy" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": true + "value": false }, { "__type__": "cc.Node", @@ -1038,28 +1457,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 81 + "__id__": 113 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 80 + "__id__": 112 }, "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", "__expectedType__": "cc.Prefab" }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", + "fileId": "b4ICzk8RFDq6KzVMReui0b", "instance": { - "__id__": 82 + "__id__": 114 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "a6auQQZAlEFbbpTWbi1Icr", + "fileId": "939f9IZBFPVrdmW1BKhcz3", "prefabRootNode": { "__id__": 1 }, @@ -1067,40 +1486,49 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 83 + "__id__": 115 }, { - "__id__": 85 + "__id__": 117 }, { - "__id__": 86 + "__id__": 118 }, { - "__id__": 87 + "__id__": 119 }, { - "__id__": 88 + "__id__": 120 }, { - "__id__": 90 + "__id__": 122 }, { - "__id__": 92 + "__id__": 124 }, { - "__id__": 94 + "__id__": 126 }, { - "__id__": 96 + "__id__": 128 }, { - "__id__": 98 + "__id__": 130 }, { - "__id__": 100 + "__id__": 132 }, { - "__id__": 102 + "__id__": 134 + }, + { + "__id__": 136 + }, + { + "__id__": 138 + }, + { + "__id__": 140 } ], "removedComponents": [] @@ -1108,7 +1536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 116 }, "propertyPath": [ "_name" @@ -1118,13 +1546,13 @@ { "__type__": "cc.TargetInfo", "localID": [ - "ee9HwyGFhDTarF97iXfEHu" + "b4ICzk8RFDq6KzVMReui0b" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 116 }, "propertyPath": [ "_lpos" @@ -1139,7 +1567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 116 }, "propertyPath": [ "_lrot" @@ -1155,7 +1583,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 116 }, "propertyPath": [ "_euler" @@ -1170,142 +1598,219 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 121 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 123 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 125 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 127 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 129 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 131 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 133 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 135 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3awTuW1YtIkJ0MAhOjyZM8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 137 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 73, - "g": 19, - "b": 107, + "r": 169, + "g": 75, + "b": 255, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "d67w0LWpZGDIOKFRdClHxZ" + "26DiJMkAFBWb1mvvZDUtMs" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 139 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 203, - "g": 99, - "b": 250, + "r": 132, + "g": 0, + "b": 255, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "08nT29mQpCLKxN2SVjI3cu" + "22EIS7o1lA4Kwmkz0o8wWF" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 163, - "g": 56, - "b": 213, - "a": 255 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "8dxUNBKXNN1ZD0UUu6Y+ek" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 95 + "__id__": 116 }, "propertyPath": [ "_active" ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3fzhiI2P9Os7ruQJg+Awdq" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6a/8vYCBFl5hxt8lfklSI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 101 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3994XTlbxF7YxpLo9qDrmy" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 84 - }, - "propertyPath": [ - "_active" - ], - "value": true + "value": false }, { "__type__": "cc.Node", @@ -1314,28 +1819,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 104 + "__id__": 142 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 103 + "__id__": 141 }, "asset": { - "__uuid__": "56a982e0-00ae-4ea4-a412-b54666d0e78b", + "__uuid__": "49480ebf-d16b-4242-8983-f4ba12861caa", "__expectedType__": "cc.Prefab" }, - "fileId": "ee9HwyGFhDTarF97iXfEHu", + "fileId": "b4ICzk8RFDq6KzVMReui0b", "instance": { - "__id__": 105 + "__id__": 143 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "b53BmYygRAQ4gMcRBF/OUZ", + "fileId": "c3vxlELENFM6F/hxbn+32t", "prefabRootNode": { "__id__": 1 }, @@ -1343,40 +1848,49 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 106 + "__id__": 144 }, { - "__id__": 108 + "__id__": 146 }, { - "__id__": 109 + "__id__": 147 }, { - "__id__": 110 + "__id__": 148 }, { - "__id__": 111 + "__id__": 149 }, { - "__id__": 113 + "__id__": 151 }, { - "__id__": 115 + "__id__": 153 }, { - "__id__": 117 + "__id__": 155 }, { - "__id__": 119 + "__id__": 157 }, { - "__id__": 121 + "__id__": 159 }, { - "__id__": 123 + "__id__": 161 }, { - "__id__": 125 + "__id__": 163 + }, + { + "__id__": 165 + }, + { + "__id__": 167 + }, + { + "__id__": 169 } ], "removedComponents": [] @@ -1384,7 +1898,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 145 }, "propertyPath": [ "_name" @@ -1394,13 +1908,13 @@ { "__type__": "cc.TargetInfo", "localID": [ - "ee9HwyGFhDTarF97iXfEHu" + "b4ICzk8RFDq6KzVMReui0b" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 145 }, "propertyPath": [ "_lpos" @@ -1415,7 +1929,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 145 }, "propertyPath": [ "_lrot" @@ -1431,7 +1945,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 145 }, "propertyPath": [ "_euler" @@ -1446,142 +1960,219 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 112 + "__id__": 150 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 152 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 156 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 160 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 164 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3awTuW1YtIkJ0MAhOjyZM8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 166 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 209, + "g": 209, + "b": 209, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "d67w0LWpZGDIOKFRdClHxZ" + "26DiJMkAFBWb1mvvZDUtMs" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 114 + "__id__": 168 }, "propertyPath": [ "_color" ], "value": { "__type__": "cc.Color", - "r": 226, - "g": 226, - "b": 226, + "r": 147, + "g": 147, + "b": 147, "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "08nT29mQpCLKxN2SVjI3cu" + "22EIS7o1lA4Kwmkz0o8wWF" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 190, - "g": 190, - "b": 190, - "a": 255 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "8dxUNBKXNN1ZD0UUu6Y+ek" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 118 + "__id__": 145 }, "propertyPath": [ "_active" ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3fzhiI2P9Os7ruQJg+Awdq" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 120 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 122 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6a/8vYCBFl5hxt8lfklSI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 124 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3994XTlbxF7YxpLo9qDrmy" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 107 - }, - "propertyPath": [ - "_active" - ], - "value": true + "value": false }, { "__type__": "cc.UITransform", @@ -1593,12 +2184,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 60 + "width": 230, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1619,16 +2210,16 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 129 + "__id__": 173 }, "_alignFlags": 45, "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, + "_left": 245, + "_right": 245, + "_top": 455, + "_bottom": 455, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1656,22 +2247,23 @@ "__id__": 0 }, "fileId": "24RflxHORM1KH3RJbnrKDS", + "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 103 + "__id__": 141 }, { - "__id__": 80 + "__id__": 112 }, { - "__id__": 57 + "__id__": 83 }, { - "__id__": 34 + "__id__": 54 }, { - "__id__": 11 + "__id__": 26 }, { "__id__": 2 diff --git a/assets/resources/gui/auie/hpbg.prefab b/assets/resources/gui/auie/hpbg.prefab new file mode 100644 index 00000000..8f03cb29 --- /dev/null +++ b/assets/resources/gui/auie/hpbg.prefab @@ -0,0 +1,851 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "hpbg", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "hpbg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 10 + }, + { + "__id__": 18 + }, + { + "__id__": 26 + } + ], + "_active": true, + "_components": [ + { + "__id__": 34 + }, + { + "__id__": 36 + } + ], + "_prefab": { + "__id__": 38 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Popup02~09_Topber_White_Bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 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__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 1280 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bdp/P0YJBDNIRtzvt1ZYlH" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 229, + "g": 237, + "b": 242, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@b94ea", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6mrtQTPhBTr/oRv3n2y7H" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 54, + "_originalHeight": 61, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "45Io/Pye5PoZwcjgb5AzVU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8czX9Q7aNPqKQ/I18JMThq", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Popup02~09_Topber_White_BgTop", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + } + ], + "_prefab": { + "__id__": 17 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 561, + "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__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 712, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "be2QVw6n9LFYl0l8ppduaW" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 153, + "g": 22, + "b": 37, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@4a5a3", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "22EIS7o1lA4Kwmkz0o8wWF" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_alignFlags": 41, + "_target": null, + "_left": 4, + "_right": 4, + "_top": 4, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9elo28q4xGx5SRtvnP4h1I" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "325R/lW/ZKpKtAoLMy5t8a", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Popup02~09_Topber_White_BgTopLight", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + }, + { + "__id__": 23 + } + ], + "_prefab": { + "__id__": 25 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 624, + "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__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 712, + "height": 24 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2fo59AaaRMSKRNKjh+ye/L" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 45 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3d086", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "abeLWbs05Hjp2RTnFx8XHJ" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_alignFlags": 41, + "_target": null, + "_left": 4, + "_right": 4, + "_top": 4, + "_bottom": 173, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 50, + "_originalHeight": 24, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7363RL0R9ErIoyiH6P9e4n" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "730isJJuJKuZ4TyYRIGiPl", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Popup03_Gradient", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 27 + }, + { + "__id__": 29 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 33 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 561, + "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__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e3U+s1uAdCgJorqCcyhk3a" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 245, + "g": 51, + "b": 76, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7f910", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "26DiJMkAFBWb1mvvZDUtMs" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_alignFlags": 41, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 4, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 473, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "24rC2H/9RBE6PRIrKWk/eF" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3awTuW1YtIkJ0MAhOjyZM8", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 35 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 1280 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3e6xe2CYhAnaDRXFjAvMW1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 37 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d1teNkwJlBsLfuBqxWNv09" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b4ICzk8RFDq6KzVMReui0b", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/auie/hpbg.prefab.meta b/assets/resources/gui/auie/hpbg.prefab.meta new file mode 100644 index 00000000..cc95f827 --- /dev/null +++ b/assets/resources/gui/auie/hpbg.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "49480ebf-d16b-4242-8983-f4ba12861caa", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "hpbg" + } +} diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab index c5355c03..1c7fdb6f 100644 --- a/assets/resources/gui/element/cHero.prefab +++ b/assets/resources/gui/element/cHero.prefab @@ -22,41 +22,38 @@ "__id__": 2 }, { - "__id__": 21 + "__id__": 58 }, { - "__id__": 105 + "__id__": 78 }, { - "__id__": 125 + "__id__": 84 }, { - "__id__": 131 + "__id__": 208 }, { - "__id__": 255 + "__id__": 240 }, { - "__id__": 287 - }, - { - "__id__": 324 + "__id__": 280 } ], "_active": true, "_components": [ { - "__id__": 330 + "__id__": 286 }, { - "__id__": 332 + "__id__": 288 }, { - "__id__": 334 + "__id__": 290 } ], "_prefab": { - "__id__": 428 + "__id__": 384 }, "_lpos": { "__type__": "cc.Vec3", @@ -104,10 +101,10 @@ "__id__": 2 }, "asset": { - "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", + "__uuid__": "57e33de6-9b39-4744-90ac-987944a47da8", "__expectedType__": "cc.Prefab" }, - "fileId": "50T0YGiGBH7qZZFeATiEP+", + "fileId": "24RflxHORM1KH3RJbnrKDS", "instance": { "__id__": 4 }, @@ -115,7 +112,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ddJY1fUgJFHKBICUhWrsdE", + "fileId": "3d7xuiPtBIeY9T9wugE6s0", "prefabRootNode": { "__id__": 1 }, @@ -138,7 +135,10 @@ "__id__": 10 }, { - "__id__": 12 + "__id__": 11 + }, + { + "__id__": 13 }, { "__id__": 14 @@ -151,234 +151,19 @@ }, { "__id__": 20 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_name" - ], - "value": "popup" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "50T0YGiGBH7qZZFeATiEP+" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 11 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 320 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "50XxsJbrFCN4H9VEVO1jhI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 13 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 320 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "89vNfbOw5OYLiuCSle5Cni" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 15 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 460, - "height": 640 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3dNz0H16xGpJqDZ5588nMV" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 17 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 428, - "height": 608 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dbPtEc0lVC6b6/8Lozo2Vm" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 19 - }, - "propertyPath": [ - "_color" - ], - "value": { - "__type__": "cc.Color", - "r": 134, - "g": 106, - "b": 33, - "a": 255 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "fa5RaYmDVG06zPrC6FET3z" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 22 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 21 - }, - "asset": { - "__uuid__": "57e33de6-9b39-4744-90ac-987944a47da8", - "__expectedType__": "cc.Prefab" - }, - "fileId": "24RflxHORM1KH3RJbnrKDS", - "instance": { - "__id__": 23 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "3d7xuiPtBIeY9T9wugE6s0", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ + }, + { + "__id__": 22 + }, { "__id__": 24 }, { "__id__": 26 }, - { - "__id__": 27 - }, { "__id__": 28 }, - { - "__id__": 29 - }, { "__id__": 30 }, @@ -409,9 +194,15 @@ { "__id__": 48 }, + { + "__id__": 49 + }, { "__id__": 50 }, + { + "__id__": 51 + }, { "__id__": 52 }, @@ -420,78 +211,6 @@ }, { "__id__": 56 - }, - { - "__id__": 58 - }, - { - "__id__": 60 - }, - { - "__id__": 62 - }, - { - "__id__": 64 - }, - { - "__id__": 66 - }, - { - "__id__": 68 - }, - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 74 - }, - { - "__id__": 76 - }, - { - "__id__": 78 - }, - { - "__id__": 80 - }, - { - "__id__": 82 - }, - { - "__id__": 84 - }, - { - "__id__": 86 - }, - { - "__id__": 88 - }, - { - "__id__": 90 - }, - { - "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 } ], "removedComponents": [] @@ -499,7 +218,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 6 }, "propertyPath": [ "_name" @@ -515,7 +234,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 6 }, "propertyPath": [ "_lpos" @@ -530,7 +249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 6 }, "propertyPath": [ "_lrot" @@ -546,7 +265,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 6 }, "propertyPath": [ "_euler" @@ -561,13 +280,219 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 6 }, "propertyPath": [ "_active" ], "value": true }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 12 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2eJcm/MUhG+Yot4sacaUS0" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "3e6xe2CYhAnaDRXFjAvMW1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 17 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 230, + "height": 370 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "bdp/P0YJBDNIRtzvt1ZYlH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "be2QVw6n9LFYl0l8ppduaW" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 21 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "325R/lW/ZKpKtAoLMy5t8a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 23 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 222, + "height": 24 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "2fo59AaaRMSKRNKjh+ye/L" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 25 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 169, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "730isJJuJKuZ4TyYRIGiPl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 210, + "height": 150 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "e3U+s1uAdCgJorqCcyhk3a" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 29 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "abu85ezhxDCr4OpV3yEMwU", + "3awTuW1YtIkJ0MAhOjyZM8" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -578,14 +503,15 @@ ], "value": { "__type__": "cc.Size", - "width": 115, - "height": 185 + "width": 230, + "height": 370 } }, { "__type__": "cc.TargetInfo", "localID": [ - "2eJcm/MUhG+Yot4sacaUS0" + "f5MPkjgDZJwIgO3vOaXjve", + "3e6xe2CYhAnaDRXFjAvMW1" ] }, { @@ -598,15 +524,15 @@ ], "value": { "__type__": "cc.Size", - "width": 115, - "height": 185 + "width": 230, + "height": 370 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "afvZZKnn9Fb5obG6jVyKta" + "f5MPkjgDZJwIgO3vOaXjve", + "bdp/P0YJBDNIRtzvt1ZYlH" ] }, { @@ -619,15 +545,15 @@ ], "value": { "__type__": "cc.Size", - "width": 214, - "height": 354 + "width": 222, + "height": 150 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "16PS2L0JBEEoS7TAT1HRoZ" + "f5MPkjgDZJwIgO3vOaXjve", + "be2QVw6n9LFYl0l8ppduaW" ] }, { @@ -636,19 +562,20 @@ "__id__": 37 }, "propertyPath": [ - "_contentSize" + "_lpos" ], "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "59WtR+lBhBiIzfpFWU1cG8" + "f5MPkjgDZJwIgO3vOaXjve", + "325R/lW/ZKpKtAoLMy5t8a" ] }, { @@ -661,15 +588,15 @@ ], "value": { "__type__": "cc.Size", - "width": 230, - "height": 370 + "width": 222, + "height": 24 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "6fsOId08VB9bqPtzuiF8/t" + "f5MPkjgDZJwIgO3vOaXjve", + "2fo59AaaRMSKRNKjh+ye/L" ] }, { @@ -682,16 +609,16 @@ ], "value": { "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, + "x": 0, + "y": 169, "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "75w8fK3CJCSbcfUF7Bzbl3" + "f5MPkjgDZJwIgO3vOaXjve", + "730isJJuJKuZ4TyYRIGiPl" ] }, { @@ -704,15 +631,15 @@ ], "value": { "__type__": "cc.Size", - "width": 222, - "height": 44 + "width": 210, + "height": 150 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "1f2dXBc41DFp8cNetX1car" + "f5MPkjgDZJwIgO3vOaXjve", + "e3U+s1uAdCgJorqCcyhk3a" ] }, { @@ -721,19 +648,20 @@ "__id__": 45 }, "propertyPath": [ - "_contentSize" + "_lpos" ], "value": { - "__type__": "cc.Size", - "width": 115, - "height": 185 + "__type__": "cc.Vec3", + "x": 0, + "y": 106, + "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "afvZZKnn9Fb5obG6jVyKta" + "f5MPkjgDZJwIgO3vOaXjve", + "3awTuW1YtIkJ0MAhOjyZM8" ] }, { @@ -742,62 +670,55 @@ "__id__": 47 }, "propertyPath": [ - "_contentSize" + "_enabled" ], - "value": { - "__type__": "cc.Size", - "width": 214, - "height": 354 - } + "value": true }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "16PS2L0JBEEoS7TAT1HRoZ" + "25pGebs65M9Y7TMtr2s+A2" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 49 + "__id__": 47 }, "propertyPath": [ - "_contentSize" + "_left" ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "59WtR+lBhBiIzfpFWU1cG8" - ] + "value": 0 }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 47 }, "propertyPath": [ - "_contentSize" + "_right" ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 370 - } + "value": 0 }, { - "__type__": "cc.TargetInfo", - "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "6fsOId08VB9bqPtzuiF8/t" - ] + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 47 + }, + "propertyPath": [ + "_bottom" + ], + "value": 0 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 47 + }, + "propertyPath": [ + "_top" + ], + "value": 0 }, { "__type__": "CCPropertyOverrideInfo", @@ -805,20 +726,15 @@ "__id__": 53 }, "propertyPath": [ - "_lpos" + "_active" ], - "value": { - "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, - "z": 0 - } + "value": false }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "75w8fK3CJCSbcfUF7Bzbl3" + "abu85ezhxDCr4OpV3yEMwU", + "b4ICzk8RFDq6KzVMReui0b" ] }, { @@ -827,19 +743,15 @@ "__id__": 55 }, "propertyPath": [ - "_contentSize" + "_active" ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 44 - } + "value": false }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "1f2dXBc41DFp8cNetX1car" + "f5MPkjgDZJwIgO3vOaXjve", + "b4ICzk8RFDq6KzVMReui0b" ] }, { @@ -848,523 +760,17 @@ "__id__": 57 }, "propertyPath": [ - "_contentSize" + "_active" ], - "value": { - "__type__": "cc.Size", - "width": 115, - "height": 185 - } + "value": true }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "afvZZKnn9Fb5obG6jVyKta" + "c3vxlELENFM6F/hxbn+32t", + "b4ICzk8RFDq6KzVMReui0b" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 59 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 214, - "height": 354 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f101kaswJDXq6VOKS4gofh", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f101kaswJDXq6VOKS4gofh", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 63 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f101kaswJDXq6VOKS4gofh", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 65 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f101kaswJDXq6VOKS4gofh", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 67 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f101kaswJDXq6VOKS4gofh", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 69 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 115, - "height": 185 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 214, - "height": 354 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 73 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 75 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 77 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 79 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 81 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 115, - "height": 185 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 83 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 214, - "height": 354 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 85 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 87 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 89 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 91 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 93 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 115, - "height": 185 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 95 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 214, - "height": 354 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 97 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 362 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 99 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 230, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 101 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -49.25, - "y": 86.25, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 103 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 222, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 25 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 2, - "y": 2, - "z": 1 - } - }, { "__type__": "cc.Node", "_name": "name", @@ -1375,26 +781,26 @@ }, "_children": [ { - "__id__": 106 + "__id__": 59 }, { - "__id__": 112 + "__id__": 65 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 71 }, { - "__id__": 120 + "__id__": 73 }, { - "__id__": 122 + "__id__": 75 } ], "_prefab": { - "__id__": 124 + "__id__": 77 }, "_lpos": { "__type__": "cc.Vec3", @@ -1431,20 +837,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 60 }, { - "__id__": 109 + "__id__": 62 } ], "_prefab": { - "__id__": 111 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1481,11 +887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1509,11 +915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1590,20 +996,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 66 }, { - "__id__": 115 + "__id__": 68 } ], "_prefab": { - "__id__": 117 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1640,11 +1046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -1668,11 +1074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 112 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1749,11 +1155,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 72 }, "_contentSize": { "__type__": "cc.Size", @@ -1777,11 +1183,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 74 }, "_alignFlags": 1, "_target": null, @@ -1813,11 +1219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 76 }, "_resizeMode": 1, "_layoutType": 1, @@ -1867,17 +1273,17 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 126 + "__id__": 79 }, { - "__id__": 128 + "__id__": 81 } ], "_prefab": { - "__id__": 130 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -1914,11 +1320,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -1942,11 +1348,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2001,14 +1407,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 132 + "__id__": 85 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 131 + "__id__": 84 }, "asset": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -2016,7 +1422,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 133 + "__id__": 86 }, "targetOverrides": null }, @@ -2029,36 +1435,111 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 134 + "__id__": 87 } ], "propertyOverrides": [ { - "__id__": 138 + "__id__": 91 }, { - "__id__": 140 + "__id__": 93 }, { - "__id__": 142 + "__id__": 95 }, { - "__id__": 144 + "__id__": 97 }, { - "__id__": 146 + "__id__": 99 }, { - "__id__": 148 + "__id__": 101 }, { - "__id__": 150 + "__id__": 103 }, { - "__id__": 152 + "__id__": 105 }, { - "__id__": 154 + "__id__": 107 + }, + { + "__id__": 108 + }, + { + "__id__": 110 + }, + { + "__id__": 112 + }, + { + "__id__": 113 + }, + { + "__id__": 114 + }, + { + "__id__": 115 + }, + { + "__id__": 117 + }, + { + "__id__": 119 + }, + { + "__id__": 121 + }, + { + "__id__": 123 + }, + { + "__id__": 125 + }, + { + "__id__": 127 + }, + { + "__id__": 129 + }, + { + "__id__": 131 + }, + { + "__id__": 133 + }, + { + "__id__": 135 + }, + { + "__id__": 137 + }, + { + "__id__": 139 + }, + { + "__id__": 141 + }, + { + "__id__": 143 + }, + { + "__id__": 145 + }, + { + "__id__": 147 + }, + { + "__id__": 149 + }, + { + "__id__": 151 + }, + { + "__id__": 153 }, { "__id__": 155 @@ -2069,174 +1550,99 @@ { "__id__": 159 }, - { - "__id__": 160 - }, { "__id__": 161 }, { - "__id__": 162 + "__id__": 163 }, { - "__id__": 164 + "__id__": 165 }, { - "__id__": 166 + "__id__": 167 }, { - "__id__": 168 + "__id__": 169 }, { - "__id__": 170 + "__id__": 171 }, { - "__id__": 172 + "__id__": 173 }, { - "__id__": 174 + "__id__": 175 }, { - "__id__": 176 + "__id__": 177 }, { - "__id__": 178 + "__id__": 179 }, { - "__id__": 180 + "__id__": 181 }, { - "__id__": 182 + "__id__": 183 }, { - "__id__": 184 + "__id__": 185 }, { - "__id__": 186 + "__id__": 187 }, { - "__id__": 188 + "__id__": 189 }, { - "__id__": 190 + "__id__": 191 }, { - "__id__": 192 + "__id__": 193 }, { - "__id__": 194 + "__id__": 195 }, { - "__id__": 196 + "__id__": 197 }, { - "__id__": 198 + "__id__": 199 }, { "__id__": 200 }, + { + "__id__": 201 + }, { "__id__": 202 }, + { + "__id__": 203 + }, { "__id__": 204 }, { - "__id__": 206 - }, - { - "__id__": 208 - }, - { - "__id__": 210 - }, - { - "__id__": 212 - }, - { - "__id__": 214 - }, - { - "__id__": 216 - }, - { - "__id__": 218 - }, - { - "__id__": 220 - }, - { - "__id__": 222 - }, - { - "__id__": 224 - }, - { - "__id__": 226 - }, - { - "__id__": 228 - }, - { - "__id__": 230 - }, - { - "__id__": 232 - }, - { - "__id__": 234 - }, - { - "__id__": 236 - }, - { - "__id__": 238 - }, - { - "__id__": 240 - }, - { - "__id__": 242 - }, - { - "__id__": 244 - }, - { - "__id__": 246 - }, - { - "__id__": 247 - }, - { - "__id__": 248 - }, - { - "__id__": 249 - }, - { - "__id__": 250 - }, - { - "__id__": 251 - }, - { - "__id__": 252 + "__id__": 205 } ], "removedComponents": [ { - "__id__": 254 + "__id__": 207 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 135 + "__id__": 88 }, "components": [ { - "__id__": 136 + "__id__": 89 } ] }, @@ -2252,15 +1658,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 131 + "__id__": 84 } }, "node": { - "__id__": 131 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 90 }, "_alignFlags": 17, "_target": null, @@ -2289,7 +1695,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 92 }, "propertyPath": [ "_name" @@ -2305,7 +1711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 94 }, "propertyPath": [ "_lpos" @@ -2326,7 +1732,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 96 }, "propertyPath": [ "_lrot" @@ -2348,7 +1754,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 + "__id__": 98 }, "propertyPath": [ "_euler" @@ -2369,7 +1775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 100 }, "propertyPath": [ "_contentSize" @@ -2389,7 +1795,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 149 + "__id__": 102 }, "propertyPath": [ "_active" @@ -2405,7 +1811,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 151 + "__id__": 104 }, "propertyPath": [ "_contentSize" @@ -2425,7 +1831,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 153 + "__id__": 106 }, "propertyPath": [ "_active" @@ -2441,7 +1847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 153 + "__id__": 106 }, "propertyPath": [ "_lscale" @@ -2456,7 +1862,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 109 }, "propertyPath": [ "_lscale" @@ -2477,7 +1883,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 111 }, "propertyPath": [ "_spriteFrame" @@ -2496,7 +1902,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 111 }, "propertyPath": [ "_atlas" @@ -2509,7 +1915,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 111 }, "propertyPath": [ "_type" @@ -2519,7 +1925,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 111 }, "propertyPath": [ "_sizeMode" @@ -2529,7 +1935,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 163 + "__id__": 116 }, "propertyPath": [ "_contentSize" @@ -2549,7 +1955,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 165 + "__id__": 118 }, "propertyPath": [ "_color" @@ -2571,7 +1977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 167 + "__id__": 120 }, "propertyPath": [ "_active" @@ -2587,7 +1993,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 169 + "__id__": 122 }, "propertyPath": [ "_contentSize" @@ -2607,7 +2013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 171 + "__id__": 124 }, "propertyPath": [ "_contentSize" @@ -2628,7 +2034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 173 + "__id__": 126 }, "propertyPath": [ "_contentSize" @@ -2649,7 +2055,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 128 }, "propertyPath": [ "_contentSize" @@ -2670,7 +2076,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 177 + "__id__": 130 }, "propertyPath": [ "_contentSize" @@ -2691,7 +2097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 132 }, "propertyPath": [ "_lpos" @@ -2713,7 +2119,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 181 + "__id__": 134 }, "propertyPath": [ "_contentSize" @@ -2734,7 +2140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 136 }, "propertyPath": [ "_contentSize" @@ -2755,7 +2161,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 185 + "__id__": 138 }, "propertyPath": [ "_contentSize" @@ -2776,7 +2182,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 187 + "__id__": 140 }, "propertyPath": [ "_contentSize" @@ -2797,7 +2203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 142 }, "propertyPath": [ "_contentSize" @@ -2818,7 +2224,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 191 + "__id__": 144 }, "propertyPath": [ "_lpos" @@ -2840,7 +2246,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 193 + "__id__": 146 }, "propertyPath": [ "_contentSize" @@ -2861,7 +2267,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 195 + "__id__": 148 }, "propertyPath": [ "_contentSize" @@ -2882,7 +2288,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 197 + "__id__": 150 }, "propertyPath": [ "_contentSize" @@ -2903,7 +2309,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 199 + "__id__": 152 }, "propertyPath": [ "_contentSize" @@ -2924,7 +2330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 201 + "__id__": 154 }, "propertyPath": [ "_contentSize" @@ -2945,7 +2351,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 203 + "__id__": 156 }, "propertyPath": [ "_lpos" @@ -2967,7 +2373,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 205 + "__id__": 158 }, "propertyPath": [ "_contentSize" @@ -2988,7 +2394,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 207 + "__id__": 160 }, "propertyPath": [ "_contentSize" @@ -3009,7 +2415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 209 + "__id__": 162 }, "propertyPath": [ "_contentSize" @@ -3030,7 +2436,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 211 + "__id__": 164 }, "propertyPath": [ "_contentSize" @@ -3051,7 +2457,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 213 + "__id__": 166 }, "propertyPath": [ "_contentSize" @@ -3072,7 +2478,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 215 + "__id__": 168 }, "propertyPath": [ "_lpos" @@ -3094,7 +2500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 217 + "__id__": 170 }, "propertyPath": [ "_contentSize" @@ -3115,7 +2521,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 172 }, "propertyPath": [ "_contentSize" @@ -3136,7 +2542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 221 + "__id__": 174 }, "propertyPath": [ "_contentSize" @@ -3157,7 +2563,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 223 + "__id__": 176 }, "propertyPath": [ "_contentSize" @@ -3178,7 +2584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 178 }, "propertyPath": [ "_contentSize" @@ -3199,7 +2605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 227 + "__id__": 180 }, "propertyPath": [ "_lpos" @@ -3221,7 +2627,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 182 }, "propertyPath": [ "_contentSize" @@ -3242,7 +2648,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 184 }, "propertyPath": [ "_contentSize" @@ -3263,7 +2669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 233 + "__id__": 186 }, "propertyPath": [ "_contentSize" @@ -3284,7 +2690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 188 }, "propertyPath": [ "_contentSize" @@ -3305,7 +2711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 190 }, "propertyPath": [ "_contentSize" @@ -3326,7 +2732,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 192 }, "propertyPath": [ "_lpos" @@ -3348,7 +2754,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 194 }, "propertyPath": [ "_contentSize" @@ -3369,7 +2775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 243 + "__id__": 196 }, "propertyPath": [ "_enabled" @@ -3385,7 +2791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 245 + "__id__": 198 }, "propertyPath": [ "_enabled" @@ -3401,7 +2807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 245 + "__id__": 198 }, "propertyPath": [ "_left" @@ -3411,7 +2817,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 245 + "__id__": 198 }, "propertyPath": [ "_right" @@ -3421,7 +2827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 245 + "__id__": 198 }, "propertyPath": [ "_top" @@ -3431,7 +2837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 245 + "__id__": 198 }, "propertyPath": [ "_bottom" @@ -3441,7 +2847,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 109 }, "propertyPath": [ "_active" @@ -3451,7 +2857,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 109 }, "propertyPath": [ "_lpos" @@ -3466,7 +2872,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 253 + "__id__": 206 }, "propertyPath": [ "_active" @@ -3496,29 +2902,29 @@ }, "_children": [ { - "__id__": 256 + "__id__": 209 }, { - "__id__": 264 + "__id__": 217 }, { - "__id__": 272 + "__id__": 225 } ], "_active": false, "_components": [ { - "__id__": 280 + "__id__": 233 }, { - "__id__": 282 + "__id__": 235 }, { - "__id__": 284 + "__id__": 237 } ], "_prefab": { - "__id__": 286 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", @@ -3555,23 +2961,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 257 + "__id__": 210 }, { - "__id__": 259 + "__id__": 212 }, { - "__id__": 261 + "__id__": 214 } ], "_prefab": { - "__id__": 263 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -3608,11 +3014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -3636,11 +3042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3704,11 +3110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 215 }, "_alignFlags": 40, "_target": null, @@ -3753,23 +3159,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 218 }, { - "__id__": 267 + "__id__": 220 }, { - "__id__": 269 + "__id__": 222 } ], "_prefab": { - "__id__": 271 + "__id__": 224 }, "_lpos": { "__type__": "cc.Vec3", @@ -3806,11 +3212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -3834,11 +3240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3902,11 +3308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 223 }, "_alignFlags": 40, "_target": null, @@ -3951,23 +3357,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 273 + "__id__": 226 }, { - "__id__": 275 + "__id__": 228 }, { - "__id__": 277 + "__id__": 230 } ], "_prefab": { - "__id__": 279 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -4004,11 +3410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -4032,11 +3438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4100,11 +3506,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 231 }, "_alignFlags": 40, "_target": null, @@ -4149,11 +3555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", @@ -4177,11 +3583,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 236 }, "_alignFlags": 45, "_target": null, @@ -4213,11 +3619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 238 }, "_resizeMode": 1, "_layoutType": 2, @@ -4265,14 +3671,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 288 + "__id__": 241 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 287 + "__id__": 240 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -4280,7 +3686,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 289 + "__id__": 242 }, "targetOverrides": null }, @@ -4293,63 +3699,69 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 290 + "__id__": 243 } ], "propertyOverrides": [ { - "__id__": 294 + "__id__": 247 }, { - "__id__": 296 + "__id__": 249 }, { - "__id__": 297 + "__id__": 250 }, { - "__id__": 298 + "__id__": 251 }, { - "__id__": 299 + "__id__": 252 }, { - "__id__": 301 + "__id__": 254 }, { - "__id__": 303 + "__id__": 256 }, { - "__id__": 305 + "__id__": 258 }, { - "__id__": 307 + "__id__": 260 }, { - "__id__": 309 + "__id__": 262 }, { - "__id__": 311 + "__id__": 264 }, { - "__id__": 312 + "__id__": 265 }, { - "__id__": 314 + "__id__": 267 }, { - "__id__": 316 + "__id__": 269 }, { - "__id__": 318 + "__id__": 271 }, { - "__id__": 320 + "__id__": 273 }, { - "__id__": 321 + "__id__": 274 }, { - "__id__": 322 + "__id__": 275 + }, + { + "__id__": 277 + }, + { + "__id__": 279 } ], "removedComponents": [] @@ -4357,11 +3769,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 291 + "__id__": 244 }, "components": [ { - "__id__": 292 + "__id__": 245 } ] }, @@ -4377,22 +3789,22 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 287 + "__id__": 240 } }, "node": { - "__id__": 287 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 246 }, "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 13, + "_bottom": -68.87, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -4414,7 +3826,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 248 }, "propertyPath": [ "_name" @@ -4430,7 +3842,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 248 }, "propertyPath": [ "_lpos" @@ -4438,14 +3850,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -147, + "y": -218.87, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 248 }, "propertyPath": [ "_lrot" @@ -4461,7 +3873,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 295 + "__id__": 248 }, "propertyPath": [ "_euler" @@ -4476,15 +3888,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 300 + "__id__": 253 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 130, - "height": 50 + "width": 230, + "height": 70 } }, { @@ -4496,7 +3908,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 302 + "__id__": 255 }, "propertyPath": [ "_contentSize" @@ -4516,7 +3928,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 304 + "__id__": 257 }, "propertyPath": [ "_contentSize" @@ -4536,7 +3948,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 259 }, "propertyPath": [ "_lpos" @@ -4557,14 +3969,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 308 + "__id__": 261 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 130, + "width": 230, "height": 35.5 } }, @@ -4577,12 +3989,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 263 }, "propertyPath": [ "_top" ], - "value": 6.737500000000001 + "value": 16.7375 }, { "__type__": "cc.TargetInfo", @@ -4593,17 +4005,17 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 310 + "__id__": 263 }, "propertyPath": [ "_bottom" ], - "value": 7.762499999999999 + "value": 17.762500000000003 }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 313 + "__id__": 266 }, "propertyPath": [ "_active" @@ -4619,7 +4031,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 315 + "__id__": 268 }, "propertyPath": [ "_lpos" @@ -4640,7 +4052,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 317 + "__id__": 270 }, "propertyPath": [ "_color" @@ -4662,7 +4074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 319 + "__id__": 272 }, "propertyPath": [ "_color" @@ -4684,7 +4096,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 315 + "__id__": 268 }, "propertyPath": [ "_active" @@ -4694,7 +4106,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 313 + "__id__": 266 }, "propertyPath": [ "_lpos" @@ -4709,7 +4121,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 323 + "__id__": 276 }, "propertyPath": [ "_string" @@ -4722,6 +4134,36 @@ "cea0FpTiVBEprBOaYQFSav" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 278 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 383.33333333333337, + "height": 116.66666666666667 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f56shr5D9N2aJyQ8kZt9jR" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 248 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "RichText", @@ -4734,14 +4176,14 @@ "_active": true, "_components": [ { - "__id__": 325 + "__id__": 281 }, { - "__id__": 327 + "__id__": 283 } ], "_prefab": { - "__id__": 329 + "__id__": 285 }, "_lpos": { "__type__": "cc.Vec3", @@ -4778,11 +4220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", @@ -4806,11 +4248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 284 }, "_lineHeight": 18, "_string": "RichText", @@ -4861,7 +4303,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -4889,7 +4331,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 333 + "__id__": 289 }, "_alignFlags": 0, "_target": null, @@ -4925,37 +4367,35 @@ }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 291 }, "icon_node": { - "__id__": 336 + "__id__": 292 }, "bg_node": { - "__id__": 21 + "__id__": 2 }, "name_label": { - "__id__": 109 + "__id__": 62 }, "fied1": { - "__id__": 259 + "__id__": 212 }, "fied2": { - "__id__": 267 + "__id__": 220 }, "fied3": { - "__id__": 275 + "__id__": 228 }, "info_rich": { - "__id__": 327 + "__id__": 283 }, "level_label": { - "__id__": 115 - }, - "buy_node": { - "__id__": 287 + "__id__": 68 }, + "buy_node": null, "cost_label": { - "__id__": 378 + "__id__": 334 }, "_id": "" }, @@ -4969,23 +4409,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 293 }, "_children": [], "_active": true, "_components": [ { - "__id__": 371 + "__id__": 327 }, { - "__id__": 373 + "__id__": 329 }, { - "__id__": 375 + "__id__": 331 } ], "_prefab": { - "__id__": 377 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -5022,42 +4462,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 84 }, "_children": [ { - "__id__": 338 + "__id__": 294 }, { - "__id__": 336 + "__id__": 292 }, { - "__id__": 344 + "__id__": 300 }, { - "__id__": 350 + "__id__": 306 }, { - "__id__": 356 + "__id__": 312 } ], "_active": true, "_components": [ { - "__id__": 362 + "__id__": 318 }, { - "__id__": 364 + "__id__": 320 }, { - "__id__": 366 + "__id__": 322 }, { - "__id__": 368 + "__id__": 324 } ], "_prefab": { - "__id__": 370 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -5094,20 +4534,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 293 }, "_children": [], "_active": true, "_components": [ { - "__id__": 339 + "__id__": 295 }, { - "__id__": 341 + "__id__": 297 } ], "_prefab": { - "__id__": 343 + "__id__": 299 }, "_lpos": { "__type__": "cc.Vec3", @@ -5144,11 +4584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 296 }, "_contentSize": { "__type__": "cc.Size", @@ -5172,11 +4612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 338 + "__id__": 294 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 298 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5230,20 +4670,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 293 }, "_children": [], "_active": false, "_components": [ { - "__id__": 345 + "__id__": 301 }, { - "__id__": 347 + "__id__": 303 } ], "_prefab": { - "__id__": 349 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -5280,11 +4720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -5308,11 +4748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 344 + "__id__": 300 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 304 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5366,20 +4806,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 293 }, "_children": [], "_active": false, "_components": [ { - "__id__": 351 + "__id__": 307 }, { - "__id__": 353 + "__id__": 309 } ], "_prefab": { - "__id__": 355 + "__id__": 311 }, "_lpos": { "__type__": "cc.Vec3", @@ -5416,11 +4856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -5444,11 +4884,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5502,20 +4942,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 337 + "__id__": 293 }, "_children": [], "_active": false, "_components": [ { - "__id__": 357 + "__id__": 313 }, { - "__id__": 359 + "__id__": 315 } ], "_prefab": { - "__id__": 361 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -5552,11 +4992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 314 }, "_contentSize": { "__type__": "cc.Size", @@ -5580,11 +5020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 316 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5638,11 +5078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 319 }, "_contentSize": { "__type__": "cc.Size", @@ -5666,11 +5106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 293 }, "_enabled": false, "__prefab": { - "__id__": 365 + "__id__": 321 }, "_type": 0, "_inverted": false, @@ -5688,11 +5128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 323 }, "_alignFlags": 45, "_target": null, @@ -5724,11 +5164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 293 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 325 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5783,11 +5223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 328 }, "_contentSize": { "__type__": "cc.Size", @@ -5811,11 +5251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 374 + "__id__": 330 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5859,11 +5299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 292 }, "_enabled": false, "__prefab": { - "__id__": 376 + "__id__": 332 }, "_alignFlags": 45, "_target": null, @@ -5908,11 +5348,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 383 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5972,20 +5412,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 336 }, "_children": [], "_active": true, "_components": [ { - "__id__": 424 + "__id__": 380 }, { - "__id__": 378 + "__id__": 334 } ], "_prefab": { - "__id__": 426 + "__id__": 382 }, "_lpos": { "__type__": "cc.Vec3", @@ -6024,27 +5464,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 381 + "__id__": 337 }, "_children": [ { - "__id__": 413 + "__id__": 369 }, { - "__id__": 379 + "__id__": 335 } ], "_active": false, "_components": [ { - "__id__": 419 + "__id__": 375 }, { - "__id__": 421 + "__id__": 377 } ], "_prefab": { - "__id__": 423 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -6081,38 +5521,38 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 287 + "__id__": 240 }, "_children": [ { - "__id__": 382 + "__id__": 338 }, { - "__id__": 380 + "__id__": 336 }, { - "__id__": 388 + "__id__": 344 } ], "_active": true, "_components": [ { - "__id__": 406 + "__id__": 362 }, { - "__id__": 408 + "__id__": 364 }, { - "__id__": 410 + "__id__": 366 } ], "_prefab": { - "__id__": 412 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0.5124999999999993, + "y": 0.5125000000000028, "z": 0 }, "_lrot": { @@ -6146,20 +5586,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 381 + "__id__": 337 }, "_children": [], "_active": true, "_components": [ { - "__id__": 383 + "__id__": 339 }, { - "__id__": 385 + "__id__": 341 } ], "_prefab": { - "__id__": 387 + "__id__": 343 }, "_lpos": { "__type__": "cc.Vec3", @@ -6196,11 +5636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 338 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 340 }, "_contentSize": { "__type__": "cc.Size", @@ -6224,11 +5664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 338 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 342 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6307,27 +5747,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 381 + "__id__": 337 }, "_children": [ { - "__id__": 389 + "__id__": 345 }, { - "__id__": 395 + "__id__": 351 } ], "_active": false, "_components": [ { - "__id__": 401 + "__id__": 357 }, { - "__id__": 403 + "__id__": 359 } ], "_prefab": { - "__id__": 405 + "__id__": 361 }, "_lpos": { "__type__": "cc.Vec3", @@ -6364,20 +5804,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 344 }, "_children": [], "_active": true, "_components": [ { - "__id__": 390 + "__id__": 346 }, { - "__id__": 392 + "__id__": 348 } ], "_prefab": { - "__id__": 394 + "__id__": 350 }, "_lpos": { "__type__": "cc.Vec3", @@ -6414,11 +5854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -6442,11 +5882,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 349 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6503,20 +5943,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 388 + "__id__": 344 }, "_children": [], "_active": true, "_components": [ { - "__id__": 396 + "__id__": 352 }, { - "__id__": 398 + "__id__": 354 } ], "_prefab": { - "__id__": 400 + "__id__": 356 }, "_lpos": { "__type__": "cc.Vec3", @@ -6553,11 +5993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 353 }, "_contentSize": { "__type__": "cc.Size", @@ -6581,11 +6021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 395 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 355 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6662,11 +6102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 358 }, "_contentSize": { "__type__": "cc.Size", @@ -6690,11 +6130,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 388 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 360 }, "_resizeMode": 1, "_layoutType": 1, @@ -6741,15 +6181,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 363 }, "_contentSize": { "__type__": "cc.Size", - "width": 130, + "width": 230, "height": 35.5 }, "_anchorPoint": { @@ -6769,18 +6209,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 365 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 6.737500000000001, - "_bottom": 7.762499999999999, + "_top": 16.7375, + "_bottom": 17.762500000000003, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -6805,11 +6245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 337 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 367 }, "_resizeMode": 1, "_layoutType": 2, @@ -6856,20 +6296,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 380 + "__id__": 336 }, "_children": [], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 370 }, { - "__id__": 416 + "__id__": 372 } ], "_prefab": { - "__id__": 418 + "__id__": 374 }, "_lpos": { "__type__": "cc.Vec3", @@ -6906,11 +6346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 371 }, "_contentSize": { "__type__": "cc.Size", @@ -6934,11 +6374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6992,11 +6432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -7020,11 +6460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 336 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 378 }, "_resizeMode": 1, "_layoutType": 1, @@ -7071,11 +6511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 379 + "__id__": 335 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -7122,24 +6562,21 @@ "instance": null, "targetOverrides": [ { - "__id__": 429 + "__id__": 385 }, { - "__id__": 431 + "__id__": 387 }, { - "__id__": 433 + "__id__": 389 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 287 + "__id__": 240 }, { - "__id__": 131 - }, - { - "__id__": 21 + "__id__": 84 }, { "__id__": 2 @@ -7149,17 +6586,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 334 + "__id__": 290 }, "sourceInfo": null, "propertyPath": [ "icon_node" ], "target": { - "__id__": 131 + "__id__": 84 }, "targetInfo": { - "__id__": 430 + "__id__": 386 } }, { @@ -7171,17 +6608,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 334 + "__id__": 290 }, "sourceInfo": null, "propertyPath": [ "cost_label" ], "target": { - "__id__": 287 + "__id__": 240 }, "targetInfo": { - "__id__": 432 + "__id__": 388 } }, { @@ -7193,15 +6630,15 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 292 + "__id__": 245 }, "sourceInfo": null, "propertyPath": [], "target": { - "__id__": 287 + "__id__": 240 }, "targetInfo": { - "__id__": 434 + "__id__": 390 } }, { diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index de9c9ce4..4bf88d10 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -43,47 +43,47 @@ "__id__": 862 }, { - "__id__": 981 + "__id__": 942 }, { - "__id__": 1070 + "__id__": 1031 }, { - "__id__": 1157 + "__id__": 1118 }, { - "__id__": 1187 + "__id__": 1148 } ], "_active": true, "_components": [ { - "__id__": 1231 + "__id__": 1192 }, { - "__id__": 1233 + "__id__": 1194 }, { - "__id__": 1235 + "__id__": 1196 }, { - "__id__": 1237 + "__id__": 1198 }, { - "__id__": 1239 + "__id__": 1200 }, { - "__id__": 1241 + "__id__": 1202 }, { - "__id__": 1243 + "__id__": 1204 }, { - "__id__": 1245 + "__id__": 1206 } ], "_prefab": { - "__id__": 1247 + "__id__": 1208 }, "_lpos": { "__type__": "cc.Vec3", @@ -15686,32 +15686,29 @@ "__id__": 863 }, { - "__id__": 871 + "__id__": 881 }, { - "__id__": 920 - }, - { - "__id__": 928 + "__id__": 889 } ], "_active": true, "_components": [ { - "__id__": 972 + "__id__": 933 }, { - "__id__": 974 + "__id__": 935 }, { - "__id__": 976 + "__id__": 937 }, { - "__id__": 978 + "__id__": 939 } ], "_prefab": { - "__id__": 980 + "__id__": 941 }, "_lpos": { "__type__": "cc.Vec3", @@ -15744,32 +15741,86 @@ }, { "__type__": "cc.Node", - "_name": "bg_line", + "_name": "Title", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 862 }, - "_children": [], - "_active": false, - "_components": [ + "_children": [ { "__id__": 864 }, { - "__id__": 866 + "__id__": 870 + } + ], + "_active": true, + "_components": [ + { + "__id__": 876 }, { - "__id__": 868 + "__id__": 878 } ], "_prefab": { - "__id__": 870 + "__id__": 880 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 640, + "y": 606.898, + "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.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 863 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 865 + }, + { + "__id__": 867 + } + ], + "_prefab": { + "__id__": 869 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, "z": 0 }, "_lrot": { @@ -15801,16 +15852,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 864 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 866 }, "_contentSize": { "__type__": "cc.Size", - "width": 760, - "height": 1320 + "width": 188.72900390625, + "height": 54.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -15821,7 +15872,275 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "24AcnPu7xMh6CGUkFGFK7v" + "fileId": "f8odRIeXJH9q8DbcexIkaf" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 864 + }, + "_enabled": true, + "__prefab": { + "__id__": 868 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "招募第 个英雄", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 25, + "_fontSize": 25, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2f9+XNhXJHVqLlxvMxK6Zl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c3Ya7BLo1Bbp97Y2xOiQT/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 863 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 871 + }, + { + "__id__": 873 + } + ], + "_prefab": { + "__id__": 875 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.369, + "y": 5, + "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__": 870 + }, + "_enabled": true, + "__prefab": { + "__id__": 872 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 20.6845703125, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fahwvLe15KUYN1ChIqENpE" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 870 + }, + "_enabled": true, + "__prefab": { + "__id__": 874 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "1", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 30, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 189, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03PuZOpGNF9JLnfZU91PFi" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4an9BpzqRC559CBfhfOcN3", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 863 + }, + "_enabled": true, + "__prefab": { + "__id__": 877 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 400, + "height": 58 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "90Z+pLoGVIxIOmD7Kbho4q" }, { "__type__": "cc.Sprite", @@ -15833,7 +16152,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 867 + "__id__": 879 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15846,7 +16165,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7f50d", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@75aff", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -15866,43 +16185,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a4+T3rHzVEh7Z5x0U/bxxy" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 863 - }, - "_enabled": true, - "__prefab": { - "__id__": 869 - }, - "_alignFlags": 45, - "_target": null, - "_left": -20, - "_right": -20, - "_top": -20, - "_bottom": -20, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 250, - "_originalHeight": 63, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "15KznPkkRCPKV1CjW4EKSs" + "fileId": "f71sAF8aNDfaocM4gB8/vf" }, { "__type__": "cc.PrefabInfo", @@ -15912,612 +16195,11 @@ "asset": { "__id__": 0 }, - "fileId": "1024SB22hOdpr/R7wIzjTf", + "fileId": "386wLwcIhOZa6IRcBvS5sb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 862 - }, - "_prefab": { - "__id__": 872 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 871 - }, - "asset": { - "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", - "__expectedType__": "cc.Prefab" - }, - "fileId": "50T0YGiGBH7qZZFeATiEP+", - "instance": { - "__id__": 873 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "35xZULahFHnbb77CDWcwkw", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [ - { - "__id__": 874 - } - ], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 904 - }, - { - "__id__": 906 - }, - { - "__id__": 907 - }, - { - "__id__": 908 - }, - { - "__id__": 909 - }, - { - "__id__": 911 - }, - { - "__id__": 913 - }, - { - "__id__": 915 - }, - { - "__id__": 917 - }, - { - "__id__": 918 - } - ], - "removedComponents": [] - }, - { - "__type__": "cc.MountedChildrenInfo", - "targetInfo": { - "__id__": 875 - }, - "nodes": [ - { - "__id__": 876 - } - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "50T0YGiGBH7qZZFeATiEP+" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 871 - }, - "_prefab": { - "__id__": 877 - }, - "__editorExtras__": { - "mountedRoot": { - "__id__": 871 - } - } - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 876 - }, - "asset": { - "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", - "__expectedType__": "cc.Prefab" - }, - "fileId": "99dvuw5eJJzqP11ZqucD+r", - "instance": { - "__id__": 878 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "b8eDCLZRdDPLXHlPtnQGGX", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 879 - }, - { - "__id__": 881 - }, - { - "__id__": 882 - }, - { - "__id__": 883 - }, - { - "__id__": 884 - }, - { - "__id__": 886 - }, - { - "__id__": 888 - }, - { - "__id__": 889 - }, - { - "__id__": 891 - }, - { - "__id__": 893 - }, - { - "__id__": 895 - }, - { - "__id__": 896 - }, - { - "__id__": 898 - }, - { - "__id__": 899 - }, - { - "__id__": 900 - }, - { - "__id__": 902 - }, - { - "__id__": 903 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 880 - }, - "propertyPath": [ - "_name" - ], - "value": "pbgt" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "99dvuw5eJJzqP11ZqucD+r" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 880 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -225, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 880 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 880 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 885 - }, - "propertyPath": [ - "_top" - ], - "value": 338.471 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dechC9XwNBBqHd4blRjbaz" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 887 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7d6jdYqe1Awpw0A4D0ySEd" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 885 - }, - "propertyPath": [ - "_left" - ], - "value": 4 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 890 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 712, - "height": 150 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c39jb808hLF7vyG9o2MVCV" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 892 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 712, - "height": 150 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "14imXt2GlO7prNUkbDs9YB" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 894 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 712, - "height": 150 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "621J5eprROl7Tb48sTU8JN" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 885 - }, - "propertyPath": [ - "_right" - ], - "value": 4 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 897 - }, - "propertyPath": [ - "_alignFlags" - ], - "value": 45 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dd+4ix/45GXY9mByFSOlQD" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 897 - }, - "propertyPath": [ - "_top" - ], - "value": 0 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 897 - }, - "propertyPath": [ - "_bottom" - ], - "value": 0 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 901 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9bRWuIVMZDkYL8YwEiknSL" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 885 - }, - "propertyPath": [ - "_alignFlags" - ], - "value": 44 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 885 - }, - "propertyPath": [ - "_bottom" - ], - "value": 0 - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 905 - }, - "propertyPath": [ - "_name" - ], - "value": "popup" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "50T0YGiGBH7qZZFeATiEP+" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 905 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 300, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 905 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 905 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 910 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 720, - "height": 600 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "50XxsJbrFCN4H9VEVO1jhI" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 912 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 720, - "height": 600 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "89vNfbOw5OYLiuCSle5Cni" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 914 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 1440, - "height": 1200 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3dNz0H16xGpJqDZ5588nMV" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 916 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 1408, - "height": 868 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dbPtEc0lVC6b6/8Lozo2Vm" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 905 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 919 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "edv/0Agw9E+qY3h4DiEUF9" - ] - }, { "__type__": "cc.Node", "_name": "cbox", @@ -16530,17 +16212,17 @@ "_active": true, "_components": [ { - "__id__": 921 + "__id__": 882 }, { - "__id__": 923 + "__id__": 884 }, { - "__id__": 925 + "__id__": 886 } ], "_prefab": { - "__id__": 927 + "__id__": 888 }, "_lpos": { "__type__": "cc.Vec3", @@ -16577,11 +16259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 920 + "__id__": 881 }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 883 }, "_contentSize": { "__type__": "cc.Size", @@ -16605,11 +16287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 920 + "__id__": 881 }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 885 }, "_alignFlags": 18, "_target": null, @@ -16641,11 +16323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 920 + "__id__": 881 }, "_enabled": false, "__prefab": { - "__id__": 926 + "__id__": 887 }, "_resizeMode": 0, "_layoutType": 1, @@ -16696,29 +16378,29 @@ }, "_children": [ { - "__id__": 929 + "__id__": 890 }, { - "__id__": 939 + "__id__": 900 } ], "_active": true, "_components": [ { - "__id__": 963 + "__id__": 924 }, { - "__id__": 965 + "__id__": 926 }, { - "__id__": 967 + "__id__": 928 }, { - "__id__": 969 + "__id__": 930 } ], "_prefab": { - "__id__": 971 + "__id__": 932 }, "_lpos": { "__type__": "cc.Vec3", @@ -16753,17 +16435,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 928 + "__id__": 889 }, "_prefab": { - "__id__": 930 + "__id__": 891 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 929 + "__id__": 890 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16771,7 +16453,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 931 + "__id__": 892 }, "targetOverrides": null }, @@ -16785,31 +16467,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 932 + "__id__": 893 }, { - "__id__": 934 + "__id__": 895 }, { - "__id__": 935 + "__id__": 896 }, { - "__id__": 936 + "__id__": 897 } ], "removedComponents": [ { - "__id__": 937 + "__id__": 898 }, { - "__id__": 938 + "__id__": 899 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 933 + "__id__": 894 }, "propertyPath": [ "_name" @@ -16825,7 +16507,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 933 + "__id__": 894 }, "propertyPath": [ "_lpos" @@ -16840,7 +16522,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 933 + "__id__": 894 }, "propertyPath": [ "_lrot" @@ -16856,7 +16538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 933 + "__id__": 894 }, "propertyPath": [ "_euler" @@ -16884,17 +16566,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 928 + "__id__": 889 }, "_prefab": { - "__id__": 940 + "__id__": 901 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 939 + "__id__": 900 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16902,7 +16584,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 941 + "__id__": 902 }, "targetOverrides": null }, @@ -16916,55 +16598,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 942 + "__id__": 903 }, { - "__id__": 944 + "__id__": 905 }, { - "__id__": 945 + "__id__": 906 }, { - "__id__": 946 + "__id__": 907 }, { - "__id__": 947 + "__id__": 908 }, { - "__id__": 949 + "__id__": 910 }, { - "__id__": 951 + "__id__": 912 }, { - "__id__": 953 + "__id__": 914 }, { - "__id__": 955 + "__id__": 916 }, { - "__id__": 956 + "__id__": 917 }, { - "__id__": 958 + "__id__": 919 }, { - "__id__": 960 + "__id__": 921 } ], "removedComponents": [ { - "__id__": 961 + "__id__": 922 }, { - "__id__": 962 + "__id__": 923 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 904 }, "propertyPath": [ "_name" @@ -16980,7 +16662,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 904 }, "propertyPath": [ "_lpos" @@ -16995,7 +16677,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 904 }, "propertyPath": [ "_lrot" @@ -17011,7 +16693,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 904 }, "propertyPath": [ "_euler" @@ -17026,7 +16708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 948 + "__id__": 909 }, "propertyPath": [ "_active" @@ -17042,7 +16724,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 950 + "__id__": 911 }, "propertyPath": [ "_lpos" @@ -17063,7 +16745,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 952 + "__id__": 913 }, "propertyPath": [ "_contentSize" @@ -17083,7 +16765,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 954 + "__id__": 915 }, "propertyPath": [ "_top" @@ -17099,7 +16781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 954 + "__id__": 915 }, "propertyPath": [ "_bottom" @@ -17109,7 +16791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 957 + "__id__": 918 }, "propertyPath": [ "_string" @@ -17125,7 +16807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 959 + "__id__": 920 }, "propertyPath": [ "_contentSize" @@ -17145,7 +16827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 943 + "__id__": 904 }, "propertyPath": [ "_active" @@ -17170,11 +16852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 889 }, "_enabled": true, "__prefab": { - "__id__": 964 + "__id__": 925 }, "_contentSize": { "__type__": "cc.Size", @@ -17198,11 +16880,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 889 }, "_enabled": true, "__prefab": { - "__id__": 966 + "__id__": 927 }, "_alignFlags": 42, "_target": null, @@ -17234,11 +16916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 889 }, "_enabled": true, "__prefab": { - "__id__": 968 + "__id__": 929 }, "_resizeMode": 1, "_layoutType": 1, @@ -17272,11 +16954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 889 }, "_enabled": true, "__prefab": { - "__id__": 970 + "__id__": 931 }, "_alignFlags": 0, "_target": null, @@ -17325,7 +17007,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 934 }, "_contentSize": { "__type__": "cc.Size", @@ -17353,7 +17035,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 975 + "__id__": 936 }, "_alignFlags": 45, "_target": null, @@ -17389,7 +17071,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 977 + "__id__": 938 }, "_resizeMode": 1, "_layoutType": 1, @@ -17427,7 +17109,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 940 }, "_id": "" }, @@ -17458,35 +17140,35 @@ }, "_children": [ { - "__id__": 982 + "__id__": 943 }, { - "__id__": 990 + "__id__": 951 }, { - "__id__": 1039 + "__id__": 1000 }, { - "__id__": 1047 + "__id__": 1008 } ], "_active": false, "_components": [ { - "__id__": 1061 + "__id__": 1022 }, { - "__id__": 1063 + "__id__": 1024 }, { - "__id__": 1065 + "__id__": 1026 }, { - "__id__": 1067 + "__id__": 1028 } ], "_prefab": { - "__id__": 1069 + "__id__": 1030 }, "_lpos": { "__type__": "cc.Vec3", @@ -17523,23 +17205,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 981 + "__id__": 942 }, "_children": [], "_active": true, "_components": [ { - "__id__": 983 + "__id__": 944 }, { - "__id__": 985 + "__id__": 946 }, { - "__id__": 987 + "__id__": 948 } ], "_prefab": { - "__id__": 989 + "__id__": 950 }, "_lpos": { "__type__": "cc.Vec3", @@ -17576,11 +17258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 984 + "__id__": 945 }, "_contentSize": { "__type__": "cc.Size", @@ -17604,11 +17286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 986 + "__id__": 947 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17649,11 +17331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 982 + "__id__": 943 }, "_enabled": true, "__prefab": { - "__id__": 988 + "__id__": 949 }, "_alignFlags": 45, "_target": null, @@ -17696,17 +17378,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 981 + "__id__": 942 }, "_prefab": { - "__id__": 991 + "__id__": 952 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 990 + "__id__": 951 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -17714,7 +17396,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 992 + "__id__": 953 }, "targetOverrides": null }, @@ -17726,40 +17408,40 @@ }, "mountedChildren": [ { - "__id__": 993 + "__id__": 954 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1023 + "__id__": 984 }, { - "__id__": 1025 + "__id__": 986 }, { - "__id__": 1026 + "__id__": 987 }, { - "__id__": 1027 + "__id__": 988 }, { - "__id__": 1028 + "__id__": 989 }, { - "__id__": 1030 + "__id__": 991 }, { - "__id__": 1032 + "__id__": 993 }, { - "__id__": 1034 + "__id__": 995 }, { - "__id__": 1036 + "__id__": 997 }, { - "__id__": 1038 + "__id__": 999 } ], "removedComponents": [] @@ -17767,11 +17449,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 994 + "__id__": 955 }, "nodes": [ { - "__id__": 995 + "__id__": 956 } ] }, @@ -17785,21 +17467,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 990 + "__id__": 951 }, "_prefab": { - "__id__": 996 + "__id__": 957 }, "__editorExtras__": { "mountedRoot": { - "__id__": 990 + "__id__": 951 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 995 + "__id__": 956 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -17807,7 +17489,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 997 + "__id__": 958 }, "targetOverrides": null }, @@ -17821,55 +17503,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 998 + "__id__": 959 }, { - "__id__": 1000 + "__id__": 961 }, { - "__id__": 1001 + "__id__": 962 }, { - "__id__": 1002 + "__id__": 963 }, { - "__id__": 1003 + "__id__": 964 }, { - "__id__": 1005 + "__id__": 966 }, { - "__id__": 1007 + "__id__": 968 }, { - "__id__": 1008 + "__id__": 969 }, { - "__id__": 1010 + "__id__": 971 }, { - "__id__": 1012 + "__id__": 973 }, { - "__id__": 1014 + "__id__": 975 }, { - "__id__": 1015 + "__id__": 976 }, { - "__id__": 1017 + "__id__": 978 }, { - "__id__": 1018 + "__id__": 979 }, { - "__id__": 1019 + "__id__": 980 }, { - "__id__": 1021 + "__id__": 982 }, { - "__id__": 1022 + "__id__": 983 } ], "removedComponents": [] @@ -17877,7 +17559,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 960 }, "propertyPath": [ "_name" @@ -17893,7 +17575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 960 }, "propertyPath": [ "_lpos" @@ -17908,7 +17590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 960 }, "propertyPath": [ "_lrot" @@ -17924,7 +17606,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 999 + "__id__": 960 }, "propertyPath": [ "_euler" @@ -17939,7 +17621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 965 }, "propertyPath": [ "_top" @@ -17955,7 +17637,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1006 + "__id__": 967 }, "propertyPath": [ "_active" @@ -17971,7 +17653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 965 }, "propertyPath": [ "_left" @@ -17981,7 +17663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1009 + "__id__": 970 }, "propertyPath": [ "_contentSize" @@ -18001,7 +17683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1011 + "__id__": 972 }, "propertyPath": [ "_contentSize" @@ -18021,7 +17703,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1013 + "__id__": 974 }, "propertyPath": [ "_contentSize" @@ -18041,7 +17723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 965 }, "propertyPath": [ "_right" @@ -18051,7 +17733,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1016 + "__id__": 977 }, "propertyPath": [ "_alignFlags" @@ -18067,7 +17749,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1016 + "__id__": 977 }, "propertyPath": [ "_top" @@ -18077,7 +17759,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1016 + "__id__": 977 }, "propertyPath": [ "_bottom" @@ -18087,7 +17769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1020 + "__id__": 981 }, "propertyPath": [ "_lpos" @@ -18108,7 +17790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 965 }, "propertyPath": [ "_alignFlags" @@ -18118,7 +17800,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 965 }, "propertyPath": [ "_bottom" @@ -18128,7 +17810,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1024 + "__id__": 985 }, "propertyPath": [ "_name" @@ -18144,7 +17826,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1024 + "__id__": 985 }, "propertyPath": [ "_lpos" @@ -18159,7 +17841,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1024 + "__id__": 985 }, "propertyPath": [ "_lrot" @@ -18175,7 +17857,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1024 + "__id__": 985 }, "propertyPath": [ "_euler" @@ -18190,7 +17872,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1029 + "__id__": 990 }, "propertyPath": [ "_contentSize" @@ -18210,7 +17892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1031 + "__id__": 992 }, "propertyPath": [ "_contentSize" @@ -18230,7 +17912,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1033 + "__id__": 994 }, "propertyPath": [ "_contentSize" @@ -18250,7 +17932,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1035 + "__id__": 996 }, "propertyPath": [ "_contentSize" @@ -18270,7 +17952,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1037 + "__id__": 998 }, "propertyPath": [ "_active" @@ -18286,7 +17968,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1024 + "__id__": 985 }, "propertyPath": [ "_active" @@ -18299,23 +17981,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 981 + "__id__": 942 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1040 + "__id__": 1001 }, { - "__id__": 1042 + "__id__": 1003 }, { - "__id__": 1044 + "__id__": 1005 } ], "_prefab": { - "__id__": 1046 + "__id__": 1007 }, "_lpos": { "__type__": "cc.Vec3", @@ -18352,11 +18034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1000 }, "_enabled": true, "__prefab": { - "__id__": 1041 + "__id__": 1002 }, "_contentSize": { "__type__": "cc.Size", @@ -18380,11 +18062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1000 }, "_enabled": true, "__prefab": { - "__id__": 1043 + "__id__": 1004 }, "_alignFlags": 18, "_target": null, @@ -18416,11 +18098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1000 }, "_enabled": false, "__prefab": { - "__id__": 1045 + "__id__": 1006 }, "_resizeMode": 0, "_layoutType": 1, @@ -18465,17 +18147,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 981 + "__id__": 942 }, "_prefab": { - "__id__": 1048 + "__id__": 1009 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1047 + "__id__": 1008 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -18483,7 +18165,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1049 + "__id__": 1010 }, "targetOverrides": null }, @@ -18496,40 +18178,40 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1050 + "__id__": 1011 } ], "propertyOverrides": [ { - "__id__": 1054 + "__id__": 1015 }, { - "__id__": 1056 + "__id__": 1017 }, { - "__id__": 1057 + "__id__": 1018 }, { - "__id__": 1058 + "__id__": 1019 } ], "removedComponents": [ { - "__id__": 1059 + "__id__": 1020 }, { - "__id__": 1060 + "__id__": 1021 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1051 + "__id__": 1012 }, "components": [ { - "__id__": 1052 + "__id__": 1013 } ] }, @@ -18545,15 +18227,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1047 + "__id__": 1008 } }, "node": { - "__id__": 1047 + "__id__": 1008 }, "_enabled": true, "__prefab": { - "__id__": 1053 + "__id__": 1014 }, "_alignFlags": 2, "_target": null, @@ -18582,7 +18264,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1016 }, "propertyPath": [ "_name" @@ -18598,7 +18280,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1016 }, "propertyPath": [ "_lpos" @@ -18613,7 +18295,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1016 }, "propertyPath": [ "_lrot" @@ -18629,7 +18311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1055 + "__id__": 1016 }, "propertyPath": [ "_euler" @@ -18659,11 +18341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 1062 + "__id__": 1023 }, "_contentSize": { "__type__": "cc.Size", @@ -18687,11 +18369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 1064 + "__id__": 1025 }, "_alignFlags": 45, "_target": null, @@ -18723,11 +18405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 942 }, "_enabled": false, "__prefab": { - "__id__": 1066 + "__id__": 1027 }, "_resizeMode": 1, "_layoutType": 1, @@ -18761,11 +18443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 981 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 1068 + "__id__": 1029 }, "_id": "" }, @@ -18796,35 +18478,35 @@ }, "_children": [ { - "__id__": 1071 + "__id__": 1032 }, { - "__id__": 1079 + "__id__": 1040 }, { - "__id__": 1128 + "__id__": 1089 }, { - "__id__": 1136 + "__id__": 1097 } ], "_active": false, "_components": [ { - "__id__": 1148 + "__id__": 1109 }, { - "__id__": 1150 + "__id__": 1111 }, { - "__id__": 1152 + "__id__": 1113 }, { - "__id__": 1154 + "__id__": 1115 } ], "_prefab": { - "__id__": 1156 + "__id__": 1117 }, "_lpos": { "__type__": "cc.Vec3", @@ -18861,23 +18543,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1070 + "__id__": 1031 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1072 + "__id__": 1033 }, { - "__id__": 1074 + "__id__": 1035 }, { - "__id__": 1076 + "__id__": 1037 } ], "_prefab": { - "__id__": 1078 + "__id__": 1039 }, "_lpos": { "__type__": "cc.Vec3", @@ -18914,11 +18596,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1071 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1073 + "__id__": 1034 }, "_contentSize": { "__type__": "cc.Size", @@ -18942,11 +18624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1071 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1075 + "__id__": 1036 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18987,11 +18669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1071 + "__id__": 1032 }, "_enabled": true, "__prefab": { - "__id__": 1077 + "__id__": 1038 }, "_alignFlags": 45, "_target": null, @@ -19034,17 +18716,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1070 + "__id__": 1031 }, "_prefab": { - "__id__": 1080 + "__id__": 1041 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1079 + "__id__": 1040 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -19052,7 +18734,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 1081 + "__id__": 1042 }, "targetOverrides": null }, @@ -19064,40 +18746,40 @@ }, "mountedChildren": [ { - "__id__": 1082 + "__id__": 1043 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1112 + "__id__": 1073 }, { - "__id__": 1114 + "__id__": 1075 }, { - "__id__": 1115 + "__id__": 1076 }, { - "__id__": 1116 + "__id__": 1077 }, { - "__id__": 1117 + "__id__": 1078 }, { - "__id__": 1119 + "__id__": 1080 }, { - "__id__": 1121 + "__id__": 1082 }, { - "__id__": 1123 + "__id__": 1084 }, { - "__id__": 1125 + "__id__": 1086 }, { - "__id__": 1127 + "__id__": 1088 } ], "removedComponents": [] @@ -19105,11 +18787,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 1083 + "__id__": 1044 }, "nodes": [ { - "__id__": 1084 + "__id__": 1045 } ] }, @@ -19123,21 +18805,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1079 + "__id__": 1040 }, "_prefab": { - "__id__": 1085 + "__id__": 1046 }, "__editorExtras__": { "mountedRoot": { - "__id__": 1079 + "__id__": 1040 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1084 + "__id__": 1045 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -19145,7 +18827,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 1086 + "__id__": 1047 }, "targetOverrides": null }, @@ -19159,55 +18841,55 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1087 + "__id__": 1048 }, { - "__id__": 1089 + "__id__": 1050 }, { - "__id__": 1090 + "__id__": 1051 }, { - "__id__": 1091 + "__id__": 1052 }, { - "__id__": 1092 + "__id__": 1053 }, { - "__id__": 1094 + "__id__": 1055 }, { - "__id__": 1096 + "__id__": 1057 }, { - "__id__": 1097 + "__id__": 1058 }, { - "__id__": 1099 + "__id__": 1060 }, { - "__id__": 1101 + "__id__": 1062 }, { - "__id__": 1103 + "__id__": 1064 }, { - "__id__": 1104 + "__id__": 1065 }, { - "__id__": 1106 + "__id__": 1067 }, { - "__id__": 1107 + "__id__": 1068 }, { - "__id__": 1108 + "__id__": 1069 }, { - "__id__": 1110 + "__id__": 1071 }, { - "__id__": 1111 + "__id__": 1072 } ], "removedComponents": [] @@ -19215,7 +18897,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1088 + "__id__": 1049 }, "propertyPath": [ "_name" @@ -19231,7 +18913,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1088 + "__id__": 1049 }, "propertyPath": [ "_lpos" @@ -19246,7 +18928,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1088 + "__id__": 1049 }, "propertyPath": [ "_lrot" @@ -19262,7 +18944,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1088 + "__id__": 1049 }, "propertyPath": [ "_euler" @@ -19277,7 +18959,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1054 }, "propertyPath": [ "_top" @@ -19293,7 +18975,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1095 + "__id__": 1056 }, "propertyPath": [ "_active" @@ -19309,7 +18991,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1054 }, "propertyPath": [ "_left" @@ -19319,7 +19001,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1098 + "__id__": 1059 }, "propertyPath": [ "_contentSize" @@ -19339,7 +19021,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1100 + "__id__": 1061 }, "propertyPath": [ "_contentSize" @@ -19359,7 +19041,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1102 + "__id__": 1063 }, "propertyPath": [ "_contentSize" @@ -19379,7 +19061,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1054 }, "propertyPath": [ "_right" @@ -19389,7 +19071,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1105 + "__id__": 1066 }, "propertyPath": [ "_alignFlags" @@ -19405,7 +19087,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1105 + "__id__": 1066 }, "propertyPath": [ "_top" @@ -19415,7 +19097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1105 + "__id__": 1066 }, "propertyPath": [ "_bottom" @@ -19425,7 +19107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1109 + "__id__": 1070 }, "propertyPath": [ "_lpos" @@ -19446,7 +19128,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1054 }, "propertyPath": [ "_alignFlags" @@ -19456,7 +19138,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1054 }, "propertyPath": [ "_bottom" @@ -19466,7 +19148,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1074 }, "propertyPath": [ "_name" @@ -19482,7 +19164,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1074 }, "propertyPath": [ "_lpos" @@ -19497,7 +19179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1074 }, "propertyPath": [ "_lrot" @@ -19513,7 +19195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1074 }, "propertyPath": [ "_euler" @@ -19528,7 +19210,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1079 }, "propertyPath": [ "_contentSize" @@ -19548,7 +19230,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1120 + "__id__": 1081 }, "propertyPath": [ "_contentSize" @@ -19568,7 +19250,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1122 + "__id__": 1083 }, "propertyPath": [ "_contentSize" @@ -19588,7 +19270,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1124 + "__id__": 1085 }, "propertyPath": [ "_contentSize" @@ -19608,7 +19290,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1126 + "__id__": 1087 }, "propertyPath": [ "_active" @@ -19624,7 +19306,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1113 + "__id__": 1074 }, "propertyPath": [ "_active" @@ -19637,23 +19319,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1070 + "__id__": 1031 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1129 + "__id__": 1090 }, { - "__id__": 1131 + "__id__": 1092 }, { - "__id__": 1133 + "__id__": 1094 } ], "_prefab": { - "__id__": 1135 + "__id__": 1096 }, "_lpos": { "__type__": "cc.Vec3", @@ -19690,11 +19372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1128 + "__id__": 1089 }, "_enabled": true, "__prefab": { - "__id__": 1130 + "__id__": 1091 }, "_contentSize": { "__type__": "cc.Size", @@ -19718,11 +19400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1128 + "__id__": 1089 }, "_enabled": true, "__prefab": { - "__id__": 1132 + "__id__": 1093 }, "_alignFlags": 18, "_target": null, @@ -19754,11 +19436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1128 + "__id__": 1089 }, "_enabled": false, "__prefab": { - "__id__": 1134 + "__id__": 1095 }, "_resizeMode": 0, "_layoutType": 1, @@ -19803,17 +19485,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1070 + "__id__": 1031 }, "_prefab": { - "__id__": 1137 + "__id__": 1098 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1136 + "__id__": 1097 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -19821,7 +19503,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1138 + "__id__": 1099 }, "targetOverrides": null }, @@ -19834,21 +19516,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1139 + "__id__": 1100 } ], "propertyOverrides": [ { - "__id__": 1143 + "__id__": 1104 }, { - "__id__": 1145 + "__id__": 1106 }, { - "__id__": 1146 + "__id__": 1107 }, { - "__id__": 1147 + "__id__": 1108 } ], "removedComponents": [] @@ -19856,11 +19538,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1140 + "__id__": 1101 }, "components": [ { - "__id__": 1141 + "__id__": 1102 } ] }, @@ -19876,15 +19558,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1136 + "__id__": 1097 } }, "node": { - "__id__": 1136 + "__id__": 1097 }, "_enabled": true, "__prefab": { - "__id__": 1142 + "__id__": 1103 }, "_alignFlags": 2, "_target": null, @@ -19913,7 +19595,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1144 + "__id__": 1105 }, "propertyPath": [ "_name" @@ -19929,7 +19611,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1144 + "__id__": 1105 }, "propertyPath": [ "_lpos" @@ -19944,7 +19626,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1144 + "__id__": 1105 }, "propertyPath": [ "_lrot" @@ -19960,7 +19642,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1144 + "__id__": 1105 }, "propertyPath": [ "_euler" @@ -19978,11 +19660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1031 }, "_enabled": true, "__prefab": { - "__id__": 1149 + "__id__": 1110 }, "_contentSize": { "__type__": "cc.Size", @@ -20006,11 +19688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1031 }, "_enabled": true, "__prefab": { - "__id__": 1151 + "__id__": 1112 }, "_alignFlags": 45, "_target": null, @@ -20042,11 +19724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1031 }, "_enabled": false, "__prefab": { - "__id__": 1153 + "__id__": 1114 }, "_resizeMode": 1, "_layoutType": 1, @@ -20080,11 +19762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1031 }, "_enabled": true, "__prefab": { - "__id__": 1155 + "__id__": 1116 }, "_id": "" }, @@ -20115,26 +19797,26 @@ }, "_children": [ { - "__id__": 1158 + "__id__": 1119 }, { - "__id__": 1164 + "__id__": 1125 }, { - "__id__": 1172 + "__id__": 1133 } ], "_active": true, "_components": [ { - "__id__": 1182 + "__id__": 1143 }, { - "__id__": 1184 + "__id__": 1145 } ], "_prefab": { - "__id__": 1186 + "__id__": 1147 }, "_lpos": { "__type__": "cc.Vec3", @@ -20171,20 +19853,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1157 + "__id__": 1118 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1159 + "__id__": 1120 }, { - "__id__": 1161 + "__id__": 1122 } ], "_prefab": { - "__id__": 1163 + "__id__": 1124 }, "_lpos": { "__type__": "cc.Vec3", @@ -20221,11 +19903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1158 + "__id__": 1119 }, "_enabled": true, "__prefab": { - "__id__": 1160 + "__id__": 1121 }, "_contentSize": { "__type__": "cc.Size", @@ -20249,11 +19931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1158 + "__id__": 1119 }, "_enabled": true, "__prefab": { - "__id__": 1162 + "__id__": 1123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20307,23 +19989,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1157 + "__id__": 1118 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1165 + "__id__": 1126 }, { - "__id__": 1167 + "__id__": 1128 }, { - "__id__": 1169 + "__id__": 1130 } ], "_prefab": { - "__id__": 1171 + "__id__": 1132 }, "_lpos": { "__type__": "cc.Vec3", @@ -20360,11 +20042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1164 + "__id__": 1125 }, "_enabled": true, "__prefab": { - "__id__": 1166 + "__id__": 1127 }, "_contentSize": { "__type__": "cc.Size", @@ -20388,11 +20070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1164 + "__id__": 1125 }, "_enabled": true, "__prefab": { - "__id__": 1168 + "__id__": 1129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20436,11 +20118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1164 + "__id__": 1125 }, "_enabled": true, "__prefab": { - "__id__": 1170 + "__id__": 1131 }, "_alignFlags": 40, "_target": null, @@ -20485,26 +20167,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1157 + "__id__": 1118 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1173 + "__id__": 1134 }, { - "__id__": 1175 + "__id__": 1136 }, { - "__id__": 1177 + "__id__": 1138 }, { - "__id__": 1179 + "__id__": 1140 } ], "_prefab": { - "__id__": 1181 + "__id__": 1142 }, "_lpos": { "__type__": "cc.Vec3", @@ -20541,11 +20223,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1172 + "__id__": 1133 }, "_enabled": true, "__prefab": { - "__id__": 1174 + "__id__": 1135 }, "_contentSize": { "__type__": "cc.Size", @@ -20569,11 +20251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1172 + "__id__": 1133 }, "_enabled": true, "__prefab": { - "__id__": 1176 + "__id__": 1137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20637,11 +20319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1172 + "__id__": 1133 }, "_enabled": true, "__prefab": { - "__id__": 1178 + "__id__": 1139 }, "_params": [], "_dataID": "", @@ -20657,11 +20339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1172 + "__id__": 1133 }, "_enabled": true, "__prefab": { - "__id__": 1180 + "__id__": 1141 }, "_alignFlags": 45, "_target": null, @@ -20706,11 +20388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1157 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1183 + "__id__": 1144 }, "_contentSize": { "__type__": "cc.Size", @@ -20734,11 +20416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1157 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1185 + "__id__": 1146 }, "_alignFlags": 1, "_target": null, @@ -20787,26 +20469,26 @@ }, "_children": [ { - "__id__": 1188 + "__id__": 1149 }, { - "__id__": 1204 + "__id__": 1165 }, { - "__id__": 1214 + "__id__": 1175 } ], "_active": true, "_components": [ { - "__id__": 1226 + "__id__": 1187 }, { - "__id__": 1228 + "__id__": 1189 } ], "_prefab": { - "__id__": 1230 + "__id__": 1191 }, "_lpos": { "__type__": "cc.Vec3", @@ -20843,24 +20525,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1187 + "__id__": 1148 }, "_children": [ { - "__id__": 1189 + "__id__": 1150 }, { - "__id__": 1195 + "__id__": 1156 } ], "_active": true, "_components": [ { - "__id__": 1201 + "__id__": 1162 } ], "_prefab": { - "__id__": 1203 + "__id__": 1164 }, "_lpos": { "__type__": "cc.Vec3", @@ -20897,20 +20579,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1188 + "__id__": 1149 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1190 + "__id__": 1151 }, { - "__id__": 1192 + "__id__": 1153 } ], "_prefab": { - "__id__": 1194 + "__id__": 1155 }, "_lpos": { "__type__": "cc.Vec3", @@ -20947,11 +20629,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1189 + "__id__": 1150 }, "_enabled": true, "__prefab": { - "__id__": 1191 + "__id__": 1152 }, "_contentSize": { "__type__": "cc.Size", @@ -20975,11 +20657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1189 + "__id__": 1150 }, "_enabled": true, "__prefab": { - "__id__": 1193 + "__id__": 1154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21036,20 +20718,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1188 + "__id__": 1149 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1196 + "__id__": 1157 }, { - "__id__": 1198 + "__id__": 1159 } ], "_prefab": { - "__id__": 1200 + "__id__": 1161 }, "_lpos": { "__type__": "cc.Vec3", @@ -21086,11 +20768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1197 + "__id__": 1158 }, "_contentSize": { "__type__": "cc.Size", @@ -21114,11 +20796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1195 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1199 + "__id__": 1160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21195,11 +20877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1188 + "__id__": 1149 }, "_enabled": true, "__prefab": { - "__id__": 1202 + "__id__": 1163 }, "_contentSize": { "__type__": "cc.Size", @@ -21236,21 +20918,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1187 + "__id__": 1148 }, "_children": [ { - "__id__": 1205 + "__id__": 1166 } ], "_active": false, "_components": [ { - "__id__": 1211 + "__id__": 1172 } ], "_prefab": { - "__id__": 1213 + "__id__": 1174 }, "_lpos": { "__type__": "cc.Vec3", @@ -21287,20 +20969,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1204 + "__id__": 1165 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1206 + "__id__": 1167 }, { - "__id__": 1208 + "__id__": 1169 } ], "_prefab": { - "__id__": 1210 + "__id__": 1171 }, "_lpos": { "__type__": "cc.Vec3", @@ -21337,11 +21019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1205 + "__id__": 1166 }, "_enabled": true, "__prefab": { - "__id__": 1207 + "__id__": 1168 }, "_contentSize": { "__type__": "cc.Size", @@ -21365,11 +21047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1205 + "__id__": 1166 }, "_enabled": true, "__prefab": { - "__id__": 1209 + "__id__": 1170 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21446,11 +21128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1204 + "__id__": 1165 }, "_enabled": true, "__prefab": { - "__id__": 1212 + "__id__": 1173 }, "_contentSize": { "__type__": "cc.Size", @@ -21487,24 +21169,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1187 + "__id__": 1148 }, "_children": [ { - "__id__": 1215 + "__id__": 1176 } ], "_active": true, "_components": [ { - "__id__": 1221 + "__id__": 1182 }, { - "__id__": 1223 + "__id__": 1184 } ], "_prefab": { - "__id__": 1225 + "__id__": 1186 }, "_lpos": { "__type__": "cc.Vec3", @@ -21541,20 +21223,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1214 + "__id__": 1175 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1216 + "__id__": 1177 }, { - "__id__": 1218 + "__id__": 1179 } ], "_prefab": { - "__id__": 1220 + "__id__": 1181 }, "_lpos": { "__type__": "cc.Vec3", @@ -21591,11 +21273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1215 + "__id__": 1176 }, "_enabled": true, "__prefab": { - "__id__": 1217 + "__id__": 1178 }, "_contentSize": { "__type__": "cc.Size", @@ -21619,11 +21301,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1215 + "__id__": 1176 }, "_enabled": true, "__prefab": { - "__id__": 1219 + "__id__": 1180 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21680,11 +21362,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1214 + "__id__": 1175 }, "_enabled": true, "__prefab": { - "__id__": 1222 + "__id__": 1183 }, "_contentSize": { "__type__": "cc.Size", @@ -21708,11 +21390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1214 + "__id__": 1175 }, "_enabled": true, "__prefab": { - "__id__": 1224 + "__id__": 1185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21789,11 +21471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1187 + "__id__": 1148 }, "_enabled": true, "__prefab": { - "__id__": 1227 + "__id__": 1188 }, "_contentSize": { "__type__": "cc.Size", @@ -21817,11 +21499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1187 + "__id__": 1148 }, "_enabled": true, "__prefab": { - "__id__": 1229 + "__id__": 1190 }, "_alignFlags": 41, "_target": null, @@ -21870,7 +21552,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1232 + "__id__": 1193 }, "_contentSize": { "__type__": "cc.Size", @@ -21898,7 +21580,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1234 + "__id__": 1195 }, "_alignFlags": 21, "_target": null, @@ -21934,16 +21616,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 1236 + "__id__": 1197 }, "debugMode": false, "showMemoryPanel": true, "start_btn": null, "time_node": { - "__id__": 1187 + "__id__": 1148 }, "tooltip": { - "__id__": 1157 + "__id__": 1118 }, "_id": "" }, @@ -21961,20 +21643,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 1238 + "__id__": 1199 }, "cardPanNode": { "__id__": 862 }, "cards_node": { - "__id__": 920 + "__id__": 881 }, "cardPrefab": { "__uuid__": "f2f9a3e0-d0f5-46f4-84bd-dd54c2248470", "__expectedType__": "cc.Prefab" }, "closeCards": { - "__id__": 939 + "__id__": 900 }, "nock_node": null, "showHeros": { @@ -22009,10 +21691,10 @@ "__id__": 549 }, "skillPanNode": { - "__id__": 981 + "__id__": 942 }, "skillBoxNode": { - "__id__": 1039 + "__id__": 1000 }, "sCardPrefab": { "__uuid__": "78a5b2d1-a34b-4190-895d-7d0aa22037cc", @@ -22025,10 +21707,10 @@ "__id__": 637 }, "shopPanNode": { - "__id__": 1070 + "__id__": 1031 }, "shopBoxNode": { - "__id__": 1128 + "__id__": 1089 }, "itemPrefab": { "__uuid__": "abae16b3-c2a2-4971-95b1-fc121f769554", @@ -22038,16 +21720,16 @@ "__id__": 669 }, "skill_refresh": { - "__id__": 1047 + "__id__": 1008 }, "equip_refresh": { "__id__": 841 }, "shop_refresh": { - "__id__": 1136 + "__id__": 1097 }, "cards_refresh": { - "__id__": 929 + "__id__": 890 }, "coins_node": { "__id__": 46 @@ -22074,7 +21756,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1240 + "__id__": 1201 }, "_id": "" }, @@ -22092,7 +21774,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1242 + "__id__": 1203 }, "debugMode": false, "_id": "" @@ -22111,7 +21793,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1244 + "__id__": 1205 }, "skill_box": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -22133,7 +21815,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1246 + "__id__": 1207 }, "equip_box": { "__uuid__": "66d7902d-2a85-43d5-8cbb-671cc7dbb275", @@ -22160,48 +21842,42 @@ "instance": null, "targetOverrides": [ { - "__id__": 1248 + "__id__": 1209 }, { - "__id__": 1250 + "__id__": 1211 }, { - "__id__": 1252 + "__id__": 1213 }, { - "__id__": 1254 + "__id__": 1215 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1136 + "__id__": 1097 }, { - "__id__": 1079 + "__id__": 1040 }, { - "__id__": 1084 + "__id__": 1045 }, { - "__id__": 1047 + "__id__": 1008 }, { - "__id__": 990 + "__id__": 951 }, { - "__id__": 995 + "__id__": 956 }, { - "__id__": 939 + "__id__": 900 }, { - "__id__": 929 - }, - { - "__id__": 871 - }, - { - "__id__": 876 + "__id__": 890 }, { "__id__": 841 @@ -22262,7 +21938,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1237 + "__id__": 1198 }, "sourceInfo": null, "propertyPath": [ @@ -22272,7 +21948,7 @@ "__id__": 362 }, "targetInfo": { - "__id__": 1249 + "__id__": 1210 } }, { @@ -22284,7 +21960,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1237 + "__id__": 1198 }, "sourceInfo": null, "propertyPath": [ @@ -22294,7 +21970,7 @@ "__id__": 456 }, "targetInfo": { - "__id__": 1251 + "__id__": 1212 } }, { @@ -22306,7 +21982,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1237 + "__id__": 1198 }, "sourceInfo": null, "propertyPath": [ @@ -22316,7 +21992,7 @@ "__id__": 549 }, "targetInfo": { - "__id__": 1253 + "__id__": 1214 } }, { @@ -22328,7 +22004,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1237 + "__id__": 1198 }, "sourceInfo": null, "propertyPath": [ @@ -22338,7 +22014,7 @@ "__id__": 637 }, "targetInfo": { - "__id__": 1255 + "__id__": 1216 } }, { diff --git a/assets/resources/gui/ui3.plist b/assets/resources/gui/ui3.plist index 740bc96d..cdc50212 100644 --- a/assets/resources/gui/ui3.plist +++ b/assets/resources/gui/ui3.plist @@ -17,7 +17,7 @@ spriteSourceSize {64,66} textureRect - {{1426,649},{64,66}} + {{1732,955},{64,66}} textureRotated @@ -34,7 +34,7 @@ spriteSourceSize {64,66} textureRect - {{1920,726},{64,66}} + {{1433,1392},{64,66}} textureRotated @@ -51,7 +51,7 @@ spriteSourceSize {60,85} textureRect - {{1654,1140},{60,85}} + {{1615,1331},{60,85}} textureRotated @@ -68,7 +68,7 @@ spriteSourceSize {60,85} textureRect - {{1920,595},{60,85}} + {{1346,1392},{60,85}} textureRotated @@ -85,9 +85,9 @@ spriteSourceSize {46,76} textureRect - {{1872,669},{46,76}} + {{143,1541},{46,76}} textureRotated - + ArrowIconButton_02_Prev.png @@ -102,9 +102,9 @@ spriteSourceSize {46,76} textureRect - {{1872,747},{46,76}} + {{221,1541},{46,76}} textureRotated - + ArrowIconButton_03_Back.png @@ -119,7 +119,7 @@ spriteSourceSize {57,80} textureRect - {{1686,450},{57,80}} + {{1740,799},{57,80}} textureRotated @@ -136,9 +136,9 @@ spriteSourceSize {653,80} textureRect - {{1196,1},{623,62}} + {{1,879},{623,62}} textureRotated - + Artboard 42.png @@ -153,7 +153,7 @@ spriteSourceSize {145,82} textureRect - {{117,1304},{115,64}} + {{122,1304},{115,64}} textureRotated @@ -170,9 +170,9 @@ spriteSourceSize {152,76} textureRect - {{1173,1292},{124,64}} + {{966,676},{124,64}} textureRotated - + Artboard 62.png @@ -187,9 +187,9 @@ spriteSourceSize {112,117} textureRect - {{1299,1292},{106,113}} + {{805,1308},{106,113}} textureRotated - + Badge_Value_02.png @@ -204,7 +204,7 @@ spriteSourceSize {104,108} textureRect - {{1927,485},{104,108}} + {{1651,519},{104,108}} textureRotated @@ -221,92 +221,7 @@ spriteSourceSize {60,386} textureRect - {{157,879},{60,386}} - textureRotated - - - BubbleFrame01_Hexagon_Bg_Blue.png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {250,243} - spriteSourceSize - {250,243} - textureRect - {{320,731},{250,243}} - textureRotated - - - BubbleFrame01_Hexagon_Bg_Green.png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {250,243} - spriteSourceSize - {250,243} - textureRect - {{219,976},{250,243}} - textureRotated - - - BubbleFrame01_Hexagon_Bg_Yellow.png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {250,243} - spriteSourceSize - {250,243} - textureRect - {{1007,431},{250,243}} - textureRotated - - - BubbleFrame01_Hexagon_FocusBorder.png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {254,244} - spriteSourceSize - {254,244} - textureRect - {{1497,65},{254,244}} - textureRotated - - - BubbleFrame01_Hexagon_FocusGlow.png - - aliases - - anchor - {0.5,0.5} - spriteOffset - {0,0} - spriteSize - {306,298} - spriteSourceSize - {306,298} - textureRect - {{320,431},{306,298}} + {{162,879},{60,386}} textureRotated @@ -323,7 +238,7 @@ spriteSourceSize {38,35} textureRect - {{1836,1384},{38,35}} + {{383,1550},{38,35}} textureRotated @@ -340,7 +255,143 @@ spriteSourceSize {64,72} textureRect - {{1964,155},{64,72}} + {{1732,881},{64,72}} + textureRotated + + + Button01_l_Blue.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{579,1218},{80,142}} + textureRotated + + + Button01_l_Gray.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{661,1310},{80,142}} + textureRotated + + + Button01_l_Green.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{1089,588},{80,142}} + textureRotated + + + Button01_l_Pink.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{783,1020},{80,142}} + textureRotated + + + Button01_l_Purple.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{805,1164},{80,142}} + textureRotated + + + Button01_l_Sky.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{188,1278},{80,142}} + textureRotated + + + Button01_l_White_Bg.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{270,1347},{80,142}} + textureRotated + + + Button01_l_Yellow.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {80,142} + spriteSourceSize + {80,142} + textureRect + {{414,1362},{80,142}} textureRotated @@ -357,7 +408,7 @@ spriteSourceSize {40,48} textureRect - {{1010,1358},{40,48}} + {{1747,1234},{40,48}} textureRotated @@ -374,9 +425,9 @@ spriteSourceSize {40,48} textureRect - {{905,634},{40,48}} + {{1753,437},{40,48}} textureRotated - + Button_Convex_Rectangle_01_H58_Gray.png @@ -391,7 +442,7 @@ spriteSourceSize {50,58} textureRect - {{1986,657},{50,58}} + {{1747,1174},{50,58}} textureRotated @@ -408,7 +459,7 @@ spriteSourceSize {64,64} textureRect - {{1866,956},{64,64}} + {{797,1423},{64,64}} textureRotated @@ -425,7 +476,7 @@ spriteSourceSize {64,67} textureRect - {{1920,657},{64,67}} + {{1499,1391},{64,67}} textureRotated @@ -442,7 +493,7 @@ spriteSourceSize {40,40} textureRect - {{1204,1358},{40,40}} + {{1757,487},{40,40}} textureRotated @@ -459,7 +510,7 @@ spriteSourceSize {56,56} textureRect - {{1797,1200},{56,56}} + {{1286,1510},{56,56}} textureRotated @@ -476,7 +527,7 @@ spriteSourceSize {108,108} textureRect - {{1430,821},{108,108}} + {{1154,809},{108,108}} textureRotated @@ -493,7 +544,7 @@ spriteSourceSize {108,108} textureRect - {{1430,821},{108,108}} + {{1154,809},{108,108}} textureRotated @@ -510,7 +561,7 @@ spriteSourceSize {48,190} textureRect - {{1821,1},{48,190}} + {{621,662},{48,190}} textureRotated @@ -527,7 +578,7 @@ spriteSourceSize {56,63} textureRect - {{1196,366},{56,63}} + {{976,1470},{56,63}} textureRotated @@ -544,9 +595,9 @@ spriteSourceSize {48,189} textureRect - {{1259,593},{48,189}} + {{1039,435},{48,189}} textureRotated - + CardFrame_Rectangle_02_InnerBorder.png @@ -561,7 +612,7 @@ spriteSourceSize {48,52} textureRect - {{1986,717},{48,52}} + {{1565,1391},{48,52}} textureRotated @@ -578,7 +629,7 @@ spriteSourceSize {29,30} textureRect - {{1996,1274},{29,30}} + {{289,879},{29,30}} textureRotated @@ -595,7 +646,7 @@ spriteSourceSize {31,30} textureRect - {{1963,1274},{31,30}} + {{1568,1525},{31,30}} textureRotated @@ -612,7 +663,7 @@ spriteSourceSize {27,20} textureRect - {{157,1267},{27,20}} + {{865,1128},{27,20}} textureRotated @@ -629,9 +680,9 @@ spriteSourceSize {42,37} textureRect - {{1944,1123},{42,37}} + {{1760,47},{42,37}} textureRotated - + Effect_Light_01_128.png @@ -646,7 +697,7 @@ spriteSourceSize {128,128} textureRect - {{429,1403},{114,116}} + {{152,1422},{114,116}} textureRotated @@ -680,7 +731,7 @@ spriteSourceSize {38,42} textureRect - {{1836,1340},{38,42}} + {{1758,613},{38,42}} textureRotated @@ -697,7 +748,7 @@ spriteSourceSize {183,183} textureRect - {{572,736},{183,183}} + {{854,435},{183,183}} textureRotated @@ -714,7 +765,7 @@ spriteSourceSize {183,183} textureRect - {{757,736},{183,183}} + {{1575,60},{183,183}} textureRotated @@ -731,7 +782,7 @@ spriteSourceSize {299,299} textureRect - {{1196,65},{299,299}} + {{320,431},{299,299}} textureRotated @@ -748,7 +799,7 @@ spriteSourceSize {231,225} textureRect - {{1259,366},{231,225}} + {{621,435},{231,225}} textureRotated @@ -765,7 +816,7 @@ spriteSourceSize {60,62} textureRect - {{1922,864},{60,62}} + {{790,1489},{60,62}} textureRotated @@ -782,7 +833,7 @@ spriteSourceSize {133,133} textureRect - {{1818,223},{133,133}} + {{503,793},{133,133}} textureRotated @@ -799,9 +850,9 @@ spriteSourceSize {50,39} textureRect - {{1654,1360},{50,39}} + {{597,732},{50,39}} textureRotated - + ItemFrame00~03_Border.png @@ -816,9 +867,9 @@ spriteSourceSize {60,62} textureRect - {{1866,1022},{60,62}} + {{852,1489},{60,62}} textureRotated - + ItemFrame00~03_CornerDeco.png @@ -833,7 +884,7 @@ spriteSourceSize {110,110} textureRect - {{317,1407},{110,110}} + {{1357,1222},{110,110}} textureRotated @@ -850,7 +901,7 @@ spriteSourceSize {76,78} textureRect - {{1654,1280},{76,78}} + {{1227,1376},{76,78}} textureRotated @@ -867,7 +918,7 @@ spriteSourceSize {52,52} textureRect - {{1868,902},{52,52}} + {{926,1535},{52,52}} textureRotated @@ -884,7 +935,7 @@ spriteSourceSize {52,52} textureRect - {{1854,1084},{52,52}} + {{980,1535},{52,52}} textureRotated @@ -901,7 +952,7 @@ spriteSourceSize {48,48} textureRect - {{1855,1138},{48,48}} + {{1693,1281},{48,48}} textureRotated @@ -918,7 +969,7 @@ spriteSourceSize {40,40} textureRect - {{1830,1421},{40,40}} + {{1518,1460},{40,40}} textureRotated @@ -935,7 +986,7 @@ spriteSourceSize {128,128} textureRect - {{1316,703},{108,116}} + {{1643,401},{108,116}} textureRotated @@ -952,9 +1003,9 @@ spriteSourceSize {128,128} textureRect - {{309,1277},{128,104}} + {{400,1444},{128,104}} textureRotated - + ItemIcon_Card_1.png @@ -969,7 +1020,7 @@ spriteSourceSize {128,128} textureRect - {{471,1159},{120,118}} + {{1521,399},{120,118}} textureRotated @@ -986,9 +1037,9 @@ spriteSourceSize {128,128} textureRect - {{1198,706},{112,116}} + {{1612,775},{112,116}} textureRotated - + ItemIcon_Coin_Silver.png @@ -1003,9 +1054,9 @@ spriteSourceSize {128,128} textureRect - {{1382,1400},{112,116}} + {{1492,891},{112,116}} textureRotated - + ItemIcon_Compass.png @@ -1020,7 +1071,7 @@ spriteSourceSize {128,128} textureRect - {{1173,1170},{120,120}} + {{1032,670},{120,120}} textureRotated @@ -1037,7 +1088,7 @@ spriteSourceSize {128,128} textureRect - {{677,1413},{128,102}} + {{530,1460},{128,102}} textureRotated @@ -1054,9 +1105,9 @@ spriteSourceSize {128,128} textureRect - {{1304,821},{124,108}} + {{1643,275},{124,108}} textureRotated - + ItemIcon_Friend.png @@ -1071,9 +1122,9 @@ spriteSourceSize {128,128} textureRect - {{1540,821},{124,108}} + {{1235,568},{124,108}} textureRotated - + ItemIcon_GearWheel.png @@ -1088,7 +1139,7 @@ spriteSourceSize {128,128} textureRect - {{1411,1169},{116,120}} + {{1001,1128},{116,120}} textureRotated @@ -1105,7 +1156,7 @@ spriteSourceSize {128,128} textureRect - {{1068,706},{128,112}} + {{1361,450},{128,112}} textureRotated @@ -1122,7 +1173,7 @@ spriteSourceSize {128,128} textureRect - {{1540,1071},{108,112}} + {{1492,1005},{108,112}} textureRotated @@ -1139,7 +1190,7 @@ spriteSourceSize {128,128} textureRect - {{183,1277},{124,120}} + {{1235,446},{124,120}} textureRotated @@ -1156,9 +1207,9 @@ spriteSourceSize {128,128} textureRect - {{1295,1170},{114,120}} + {{1032,792},{114,120}} textureRotated - + ItemIcon_Gear_Sword.png @@ -1173,7 +1224,7 @@ spriteSourceSize {128,128} textureRect - {{1540,1291},{108,112}} + {{1606,1005},{108,112}} textureRotated @@ -1190,9 +1241,9 @@ spriteSourceSize {128,128} textureRect - {{1620,1401},{116,108}} + {{1239,1097},{116,108}} textureRotated - + ItemIcon_Gift_Yellow.png @@ -1207,7 +1258,7 @@ spriteSourceSize {128,128} textureRect - {{1636,586},{116,108}} + {{1239,1207},{116,108}} textureRotated @@ -1224,7 +1275,7 @@ spriteSourceSize {128,128} textureRect - {{1540,947},{122,110}} + {{1017,1250},{122,110}} textureRotated @@ -1241,7 +1292,7 @@ spriteSourceSize {128,128} textureRect - {{1650,696},{120,104}} + {{1264,796},{120,104}} textureRotated @@ -1258,9 +1309,9 @@ spriteSourceSize {128,128} textureRect - {{1650,818},{120,104}} + {{1370,892},{120,104}} textureRotated - + ItemIcon_Medal_Gold_1.png @@ -1275,9 +1326,9 @@ spriteSourceSize {128,128} textureRect - {{1094,1040},{128,110}} + {{270,1429},{128,110}} textureRotated - + ItemIcon_Medal_Gold_2.png @@ -1292,9 +1343,9 @@ spriteSourceSize {128,128} textureRect - {{1182,910},{128,110}} + {{660,1452},{128,110}} textureRotated - + ItemIcon_Medal_Silver_1.png @@ -1309,7 +1360,7 @@ spriteSourceSize {128,128} textureRect - {{547,1411},{128,104}} + {{1521,519},{128,104}} textureRotated @@ -1326,9 +1377,9 @@ spriteSourceSize {128,128} textureRect - {{1206,1040},{128,104}} + {{1361,564},{128,104}} textureRotated - + ItemIcon_Potion_Green.png @@ -1343,7 +1394,7 @@ spriteSourceSize {128,128} textureRect - {{415,1279},{120,122}} + {{1521,275},{120,122}} textureRotated @@ -1360,7 +1411,7 @@ spriteSourceSize {128,128} textureRect - {{942,794},{120,122}} + {{844,676},{120,122}} textureRotated @@ -1377,7 +1428,7 @@ spriteSourceSize {128,128} textureRect - {{1529,1181},{122,108}} + {{1138,919},{122,108}} textureRotated @@ -1394,9 +1445,9 @@ spriteSourceSize {128,128} textureRect - {{1745,462},{122,108}} + {{1129,1241},{122,108}} textureRotated - + ItemIcon_Scroll.png @@ -1411,9 +1462,9 @@ spriteSourceSize {128,128} textureRect - {{1754,572},{110,120}} + {{1610,893},{110,120}} textureRotated - + ItemIcon_Scroll_Feather.png @@ -1428,7 +1479,7 @@ spriteSourceSize {128,128} textureRect - {{1496,1401},{122,112}} + {{993,1014},{122,112}} textureRotated @@ -1445,9 +1496,9 @@ spriteSourceSize {128,128} textureRect - {{1422,931},{116,106}} + {{1262,919},{116,106}} textureRotated - + ItemIcon_Skill_Attack.png @@ -1462,7 +1513,7 @@ spriteSourceSize {128,128} textureRect - {{1756,816},{110,112}} + {{1357,1108},{110,112}} textureRotated @@ -1479,7 +1530,7 @@ spriteSourceSize {128,128} textureRect - {{942,676},{124,116}} + {{1214,678},{124,116}} textureRotated @@ -1496,7 +1547,7 @@ spriteSourceSize {128,128} textureRect - {{1068,910},{128,112}} + {{784,884},{128,112}} textureRotated @@ -1513,7 +1564,7 @@ spriteSourceSize {128,128} textureRect - {{1312,1039},{128,112}} + {{898,884},{128,112}} textureRotated @@ -1530,9 +1581,9 @@ spriteSourceSize {128,128} textureRect - {{1652,940},{108,114}} + {{1376,998},{108,114}} textureRotated - + ItemIcon_Skill_Health.png @@ -1547,7 +1598,7 @@ spriteSourceSize {128,128} textureRect - {{1414,1291},{124,104}} + {{1012,908},{124,104}} textureRotated @@ -1564,7 +1615,7 @@ spriteSourceSize {128,128} textureRect - {{1254,1400},{126,112}} + {{865,1014},{126,112}} textureRotated @@ -1581,7 +1632,7 @@ spriteSourceSize {128,128} textureRect - {{1426,1039},{126,112}} + {{887,1128},{126,112}} textureRotated @@ -1598,9 +1649,9 @@ spriteSourceSize {128,128} textureRect - {{1756,694},{114,120}} + {{1490,775},{114,120}} textureRotated - + ItemIcon_Star.png @@ -1615,9 +1666,9 @@ spriteSourceSize {128,128} textureRect - {{1010,1400},{120,118}} + {{1119,1119},{120,118}} textureRotated - + ItemIcon_Star_Disable.png @@ -1632,9 +1683,9 @@ spriteSourceSize {128,128} textureRect - {{1132,1400},{120,118}} + {{1370,770},{120,118}} textureRotated - + ItemIcon_Ticket_Gold.png @@ -1649,9 +1700,9 @@ spriteSourceSize {128,128} textureRect - {{1806,358},{128,102}} + {{913,1256},{128,102}} textureRotated - + ItemIcon_Timer_Gold.png @@ -1666,7 +1717,7 @@ spriteSourceSize {128,128} textureRect - {{1294,931},{106,126}} + {{1630,629},{106,126}} textureRotated @@ -1683,7 +1734,7 @@ spriteSourceSize {128,128} textureRect - {{866,1418},{128,98}} + {{1361,670},{128,98}} textureRotated @@ -1700,9 +1751,9 @@ spriteSourceSize {61,39} textureRect - {{1094,1170},{61,39}} + {{1305,1376},{61,39}} textureRotated - + Label_Flag_01_Single_Blue.png @@ -1717,7 +1768,7 @@ spriteSourceSize {52,75} textureRect - {{1866,592},{52,75}} + {{1740,1097},{52,75}} textureRotated @@ -1734,9 +1785,9 @@ spriteSourceSize {52,75} textureRect - {{1868,825},{52,75}} + {{1227,1456},{52,75}} textureRotated - + Label_Flag_01_Single_Red.png @@ -1751,9 +1802,9 @@ spriteSourceSize {52,75} textureRect - {{1984,794},{52,75}} + {{1615,1393},{52,75}} textureRotated - + Label_Flag_01_White_Bg.png @@ -1768,7 +1819,7 @@ spriteSourceSize {52,75} textureRect - {{1984,871},{52,75}} + {{1693,1204},{52,75}} textureRotated @@ -1785,7 +1836,7 @@ spriteSourceSize {48,29} textureRect - {{2007,595},{48,29}} + {{813,662},{48,29}} textureRotated @@ -1802,7 +1853,7 @@ spriteSourceSize {146,146} textureRect - {{1492,367},{142,144}} + {{1377,304},{142,144}} textureRotated @@ -1819,7 +1870,7 @@ spriteSourceSize {146,146} textureRect - {{739,1209},{144,142}} + {{638,876},{144,142}} textureRotated @@ -1836,7 +1887,7 @@ spriteSourceSize {146,146} textureRect - {{922,921},{144,142}} + {{637,1020},{144,142}} textureRotated @@ -1853,7 +1904,7 @@ spriteSourceSize {146,146} textureRect - {{1818,81},{144,140}} + {{1089,446},{144,140}} textureRotated @@ -1870,7 +1921,7 @@ spriteSourceSize {146,146} textureRect - {{885,1212},{142,144}} + {{493,928},{142,144}} textureRotated @@ -1887,7 +1938,7 @@ spriteSourceSize {146,146} textureRect - {{1492,513},{142,142}} + {{493,1074},{142,142}} textureRotated @@ -1904,7 +1955,7 @@ spriteSourceSize {146,146} textureRect - {{774,921},{146,142}} + {{289,915},{146,142}} textureRotated @@ -1921,7 +1972,7 @@ spriteSourceSize {146,146} textureRect - {{741,1065},{144,142}} + {{638,732},{144,142}} textureRotated @@ -1938,7 +1989,7 @@ spriteSourceSize {146,146} textureRect - {{593,1207},{144,142}} + {{287,1203},{144,142}} textureRotated @@ -1955,7 +2006,7 @@ spriteSourceSize {146,146} textureRect - {{593,1063},{142,146}} + {{289,1059},{142,146}} textureRotated @@ -1972,9 +2023,9 @@ spriteSourceSize {146,146} textureRect - {{950,1065},{142,144}} + {{433,1218},{142,144}} textureRotated - + Loading_Circle_9.png @@ -1989,7 +2040,7 @@ spriteSourceSize {146,146} textureRect - {{1029,1211},{142,144}} + {{661,1164},{142,144}} textureRotated @@ -2006,9 +2057,9 @@ spriteSourceSize {54,63} textureRect - {{395,1221},{54,63}} + {{1743,1281},{54,63}} textureRotated - + Popup01_Basic_White_Bg.png @@ -2023,7 +2074,7 @@ spriteSourceSize {54,61} textureRect - {{1741,1140},{54,61}} + {{1034,1526},{54,61}} textureRotated @@ -2040,9 +2091,9 @@ spriteSourceSize {50,24} textureRect - {{1922,928},{50,24}} + {{887,1256},{50,24}} textureRotated - + Popup02~09_Topber_White_Bg.png @@ -2057,7 +2108,7 @@ spriteSourceSize {54,61} textureRect - {{1741,1140},{54,61}} + {{1034,1526},{54,61}} textureRotated @@ -2074,7 +2125,7 @@ spriteSourceSize {48,26} textureRect - {{914,676},{48,26}} + {{1198,1485},{48,26}} textureRotated @@ -2091,7 +2142,24 @@ spriteSourceSize {50,24} textureRect - {{1922,928},{50,24}} + {{887,1256},{50,24}} + textureRotated + + + Popup03_Gradient.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {473,2} + spriteSourceSize + {473,2} + textureRect + {{621,431},{473,2}} textureRotated @@ -2108,7 +2176,7 @@ spriteSourceSize {54,106} textureRect - {{537,1279},{54,106}} + {{437,1091},{54,106}} textureRotated @@ -2125,9 +2193,9 @@ spriteSourceSize {54,174} textureRect - {{1497,311},{54,174}} + {{437,915},{54,174}} textureRotated - + Popup07_Topbar_Divided_Single_Sky.png @@ -2142,7 +2210,7 @@ spriteSourceSize {54,174} textureRect - {{219,1221},{54,174}} + {{854,620},{54,174}} textureRotated @@ -2159,7 +2227,7 @@ spriteSourceSize {59,275} textureRect - {{628,634},{59,275}} + {{320,732},{59,275}} textureRotated @@ -2193,7 +2261,7 @@ spriteSourceSize {56,58} textureRect - {{1735,1265},{56,58}} + {{1226,1510},{56,58}} textureRotated @@ -2210,9 +2278,9 @@ spriteSourceSize {56,58} textureRect - {{1732,1323},{56,58}} + {{1692,1393},{56,58}} textureRotated - + SkillFrame_01_Border_Green.png @@ -2227,7 +2295,7 @@ spriteSourceSize {56,58} textureRect - {{1730,1381},{56,58}} + {{1344,1454},{56,58}} textureRotated @@ -2244,7 +2312,7 @@ spriteSourceSize {56,58} textureRect - {{1730,1441},{56,58}} + {{1344,1514},{56,58}} textureRotated @@ -2261,9 +2329,9 @@ spriteSourceSize {56,58} textureRect - {{1762,1042},{56,58}} + {{1402,1460},{56,58}} textureRotated - + SkillFrame_01_Border_Yellow.png @@ -2278,7 +2346,7 @@ spriteSourceSize {56,58} textureRect - {{1797,1140},{56,58}} + {{1460,1460},{56,58}} textureRotated @@ -2295,9 +2363,9 @@ spriteSourceSize {140,83} textureRect - {{1953,223},{140,83}} + {{1,1504},{140,83}} textureRotated - + Slider_Border_Tapered_02_Fill_Blue.Png @@ -2312,9 +2380,9 @@ spriteSourceSize {150,28} textureRect - {{1259,643},{150,28}} + {{784,732},{150,28}} textureRotated - + Slider_Border_Tapered_02_Fill_Green.Png @@ -2329,9 +2397,9 @@ spriteSourceSize {150,28} textureRect - {{1656,367},{150,28}} + {{1575,245},{150,28}} textureRotated - + Slider_Border_Tapered_02_Fill_Orange.Png @@ -2346,9 +2414,9 @@ spriteSourceSize {150,28} textureRect - {{1821,51},{150,28}} + {{1491,450},{150,28}} textureRotated - + Slider_Border_Tapered_02_Fill_Red.Png @@ -2363,9 +2431,9 @@ spriteSourceSize {150,28} textureRect - {{1259,673},{150,28}} + {{814,732},{150,28}} textureRotated - + Slider_Border_Tapered_02_OffWhite.Png @@ -2380,7 +2448,7 @@ spriteSourceSize {150,28} textureRect - {{1068,676},{150,28}} + {{1491,745},{150,28}} textureRotated @@ -2397,9 +2465,9 @@ spriteSourceSize {105,57} textureRect - {{807,1413},{105,57}} + {{1239,1317},{105,57}} textureRotated - + Slider_Level_02_Bg.png @@ -2414,7 +2482,7 @@ spriteSourceSize {25,25} textureRect - {{1220,676},{25,25}} + {{1305,1439},{25,25}} textureRotated @@ -2431,9 +2499,9 @@ spriteSourceSize {23,24} textureRect - {{1068,1040},{23,24}} + {{863,1463},{23,24}} textureRotated - + Slider_Level_03_InnerBorder1.png @@ -2448,7 +2516,7 @@ spriteSourceSize {23,24} textureRect - {{2013,1},{23,24}} + {{888,1463},{23,24}} textureRotated @@ -2465,9 +2533,9 @@ spriteSourceSize {17,16} textureRect - {{302,879},{17,16}} + {{1720,1097},{17,16}} textureRotated - + Slider_Play_01_Fill_Green.png @@ -2482,7 +2550,7 @@ spriteSourceSize {4,18} textureRect - {{1254,1514},{4,18}} + {{784,1014},{4,18}} textureRotated @@ -2499,7 +2567,7 @@ spriteSourceSize {4,18} textureRect - {{1866,669},{4,18}} + {{1026,802},{4,18}} textureRotated @@ -2516,9 +2584,9 @@ spriteSourceSize {87,52} textureRect - {{1656,532},{87,52}} + {{1686,1115},{87,52}} textureRotated - + Slider_Play_02_Fill_Red.png @@ -2533,9 +2601,9 @@ spriteSourceSize {194,18} textureRect - {{1636,367},{194,18}} + {{621,712},{194,18}} textureRotated - + Swich_01_Bg_Off.png @@ -2550,7 +2618,7 @@ spriteSourceSize {102,82} textureRect - {{1,1436},{102,82}} + {{844,800},{102,82}} textureRotated @@ -2567,7 +2635,7 @@ spriteSourceSize {102,82} textureRect - {{1654,1056},{102,82}} + {{913,1386},{102,82}} textureRotated @@ -2584,9 +2652,9 @@ spriteSourceSize {81,85} textureRect - {{219,879},{81,85}} + {{65,1421},{81,85}} textureRotated - + Title_01_NoDeco_LightGray.Png @@ -2601,7 +2669,7 @@ spriteSourceSize {137,58} textureRect - {{593,1351},{137,58}} + {{658,1392},{137,58}} textureRotated @@ -2618,9 +2686,9 @@ spriteSourceSize {137,58} textureRect - {{732,1353},{137,58}} + {{1154,670},{137,58}} textureRotated - + Title_01_NoDeco_Red.Png @@ -2635,7 +2703,7 @@ spriteSourceSize {137,58} textureRect - {{871,1358},{137,58}} + {{1491,625},{137,58}} textureRotated @@ -2652,9 +2720,9 @@ spriteSourceSize {137,58} textureRect - {{1686,311},{137,58}} + {{1491,685},{137,58}} textureRotated - + Title_01_NoDeco_White.Png @@ -2669,9 +2737,9 @@ spriteSourceSize {137,58} textureRect - {{1746,317},{137,58}} + {{1237,1037},{137,58}} textureRotated - + Title_01_NoDeco_Yellow.Png @@ -2686,7 +2754,7 @@ spriteSourceSize {137,58} textureRect - {{1496,657},{137,58}} + {{1476,1331},{137,58}} textureRotated @@ -2703,7 +2771,7 @@ spriteSourceSize {377,201} textureRect - {{628,431},{377,201}} + {{1196,60},{377,201}} textureRotated @@ -2720,9 +2788,9 @@ spriteSourceSize {181,120} textureRect - {{471,976},{181,120}} + {{320,793},{181,120}} textureRotated - + Toggle_Check_01_Off.png @@ -2737,7 +2805,7 @@ spriteSourceSize {40,40} textureRect - {{1876,1346},{40,40}} + {{1444,1520},{40,40}} textureRotated @@ -2754,7 +2822,7 @@ spriteSourceSize {40,40} textureRect - {{1868,1464},{40,40}} + {{1526,1502},{40,40}} textureRotated @@ -2771,9 +2839,9 @@ spriteSourceSize {68,60} textureRect - {{1922,794},{68,60}} + {{1729,737},{68,60}} textureRotated - + Toggle_Check_02_On.png @@ -2788,9 +2856,9 @@ spriteSourceSize {80,76} textureRect - {{1653,1202},{80,76}} + {{948,802},{80,76}} textureRotated - + Toggle_Check_03_l_Off.png @@ -2805,7 +2873,7 @@ spriteSourceSize {60,60} textureRect - {{1735,1203},{60,60}} + {{914,1470},{60,60}} textureRotated @@ -2822,7 +2890,7 @@ spriteSourceSize {60,60} textureRect - {{1932,954},{60,60}} + {{1034,1464},{60,60}} textureRotated @@ -2839,7 +2907,7 @@ spriteSourceSize {44,44} textureRect - {{1855,1188},{44,44}} + {{1753,1},{44,44}} textureRotated @@ -2856,7 +2924,7 @@ spriteSourceSize {44,44} textureRect - {{1944,1077},{44,44}} + {{1753,275},{44,44}} textureRotated @@ -2873,7 +2941,7 @@ spriteSourceSize {72,72} textureRect - {{1964,81},{72,72}} + {{1720,1023},{72,72}} textureRotated @@ -2890,9 +2958,9 @@ spriteSourceSize {111,110} textureRect - {{205,1407},{111,110}} + {{1469,1115},{111,110}} textureRotated - + UI_Rewards_Medal_01_Bronze.png @@ -2907,7 +2975,7 @@ spriteSourceSize {128,128} textureRect - {{1426,717},{102,110}} + {{1469,1227},{102,110}} textureRotated @@ -2924,9 +2992,9 @@ spriteSourceSize {128,128} textureRect - {{1538,717},{102,110}} + {{1582,1115},{102,110}} textureRotated - + UI_Rewards_Medal_01_Silver.png @@ -2941,9 +3009,9 @@ spriteSourceSize {128,128} textureRect - {{1762,930},{102,110}} + {{1581,1227},{102,110}} textureRotated - + UI_Rewards_Trophy_01_Bronze.png @@ -2958,7 +3026,7 @@ spriteSourceSize {128,128} textureRect - {{1064,820},{118,88}} + {{1117,1029},{118,88}} textureRotated @@ -2975,7 +3043,7 @@ spriteSourceSize {128,128} textureRect - {{1184,820},{118,88}} + {{1017,1374},{118,88}} textureRotated @@ -2992,7 +3060,7 @@ spriteSourceSize {128,128} textureRect - {{1936,365},{118,88}} + {{1137,1365},{118,88}} textureRotated @@ -3009,9 +3077,9 @@ spriteSourceSize {555,57} textureRect - {{1,879},{555,57}} + {{1196,1},{555,57}} textureRotated - + bg_ar.png @@ -3026,7 +3094,7 @@ spriteSourceSize {96,98} textureRect - {{105,1421},{96,98}} + {{558,1362},{96,98}} textureRotated @@ -3043,7 +3111,7 @@ spriteSourceSize {250,63} textureRect - {{1753,65},{250,63}} + {{224,879},{250,63}} textureRotated @@ -3060,7 +3128,7 @@ spriteSourceSize {540,55} textureRect - {{60,879},{540,55}} + {{65,879},{540,55}} textureRotated @@ -3094,7 +3162,7 @@ spriteSourceSize {145,61} textureRect - {{887,1065},{145,61}} + {{224,1131},{145,61}} textureRotated @@ -3111,7 +3179,7 @@ spriteSourceSize {64,64} textureRect - {{1855,1234},{44,32}} + {{1753,403},{44,32}} textureRotated @@ -3128,7 +3196,7 @@ spriteSourceSize {64,64} textureRect - {{1885,1268},{36,36}} + {{423,1550},{36,36}} textureRotated @@ -3145,9 +3213,9 @@ spriteSourceSize {64,64} textureRect - {{1883,1306},{40,38}} + {{1486,1520},{40,38}} textureRotated - + function_icon_assassin.png @@ -3162,7 +3230,7 @@ spriteSourceSize {64,64} textureRect - {{1990,1078},{36,44}} + {{1643,737},{36,44}} textureRotated @@ -3179,7 +3247,7 @@ spriteSourceSize {64,64} textureRect - {{1990,1116},{38,38}} + {{1526,1544},{38,38}} textureRotated @@ -3196,7 +3264,7 @@ spriteSourceSize {64,64} textureRect - {{1797,1258},{42,34}} + {{838,1553},{42,34}} textureRotated @@ -3213,7 +3281,7 @@ spriteSourceSize {64,64} textureRect - {{1158,1358},{44,40}} + {{1753,321},{44,40}} textureRotated @@ -3230,9 +3298,9 @@ spriteSourceSize {64,64} textureRect - {{1108,1357},{48,38}} + {{1702,1331},{48,38}} textureRotated - + function_icon_buckler.png @@ -3247,7 +3315,7 @@ spriteSourceSize {64,64} textureRect - {{1905,1176},{36,36}} + {{461,1550},{36,36}} textureRotated @@ -3264,7 +3332,7 @@ spriteSourceSize {64,64} textureRect - {{1988,1156},{38,38}} + {{1565,1445},{38,38}} textureRotated @@ -3281,7 +3349,7 @@ spriteSourceSize {64,64} textureRect - {{1943,1194},{38,32}} + {{1685,1453},{38,32}} textureRotated @@ -3298,9 +3366,9 @@ spriteSourceSize {64,64} textureRect - {{1994,1038},{42,38}} + {{1758,657},{42,38}} textureRotated - + function_icon_dagger.png @@ -3315,7 +3383,7 @@ spriteSourceSize {64,64} textureRect - {{1901,1214},{38,38}} + {{1605,1447},{38,38}} textureRotated @@ -3332,7 +3400,7 @@ spriteSourceSize {64,64} textureRect - {{1758,1100},{48,38}} + {{863,1423},{48,38}} textureRotated @@ -3349,7 +3417,7 @@ spriteSourceSize {64,64} textureRect - {{1983,1196},{36,38}} + {{1689,737},{36,38}} textureRotated @@ -3366,9 +3434,9 @@ spriteSourceSize {64,64} textureRect - {{1999,1306},{36,34}} + {{1758,701},{36,34}} textureRotated - + function_icon_fire.png @@ -3383,9 +3451,9 @@ spriteSourceSize {64,64} textureRect - {{1944,1162},{30,42}} + {{1767,223},{30,42}} textureRotated - + function_icon_goal.png @@ -3400,7 +3468,7 @@ spriteSourceSize {64,64} textureRect - {{1941,1228},{38,38}} + {{1645,1447},{38,38}} textureRotated @@ -3417,7 +3485,7 @@ spriteSourceSize {64,64} textureRect - {{1792,1368},{42,34}} + {{882,1553},{42,34}} textureRotated @@ -3434,7 +3502,7 @@ spriteSourceSize {64,64} textureRect - {{1981,1234},{38,38}} + {{1602,1487},{38,38}} textureRotated @@ -3451,9 +3519,9 @@ spriteSourceSize {64,64} textureRect - {{955,634},{46,40}} + {{299,1541},{46,40}} textureRotated - + function_icon_heart.png @@ -3468,9 +3536,9 @@ spriteSourceSize {64,64} textureRect - {{1908,1084},{46,34}} + {{790,1553},{46,34}} textureRotated - + function_icon_helmet_1.png @@ -3485,7 +3553,7 @@ spriteSourceSize {64,64} textureRect - {{1876,1388},{34,40}} + {{1090,1550},{34,40}} textureRotated @@ -3502,7 +3570,7 @@ spriteSourceSize {64,64} textureRect - {{1795,1294},{32,42}} + {{1750,1432},{32,42}} textureRotated @@ -3519,9 +3587,9 @@ spriteSourceSize {64,64} textureRect - {{1994,948},{42,44}} + {{1030,626},{42,44}} textureRotated - + function_icon_leaf.png @@ -3536,7 +3604,7 @@ spriteSourceSize {64,64} textureRect - {{1925,1306},{38,38}} + {{1642,1487},{38,38}} textureRotated @@ -3553,9 +3621,9 @@ spriteSourceSize {64,64} textureRect - {{1841,1268},{42,34}} + {{1760,135},{42,34}} textureRotated - + function_icon_life_break.png @@ -3570,9 +3638,9 @@ spriteSourceSize {64,64} textureRect - {{1839,1304},{42,34}} + {{1760,179},{42,34}} textureRotated - + function_icon_magic.png @@ -3587,9 +3655,9 @@ spriteSourceSize {64,64} textureRect - {{1792,1328},{38,42}} + {{1096,1464},{38,42}} textureRotated - + function_icon_moneybag_dollar.png @@ -3604,9 +3672,9 @@ spriteSourceSize {64,64} textureRect - {{1923,1268},{36,38}} + {{1482,263},{36,38}} textureRotated - + function_icon_paw.png @@ -3621,9 +3689,9 @@ spriteSourceSize {64,64} textureRect - {{1872,1424},{38,40}} + {{1096,1508},{38,40}} textureRotated - + function_icon_potion_2.png @@ -3638,7 +3706,7 @@ spriteSourceSize {64,64} textureRect - {{1965,1306},{32,38}} + {{1568,1485},{32,38}} textureRotated @@ -3655,9 +3723,9 @@ spriteSourceSize {64,64} textureRect - {{1450,593},{54,40}} + {{1742,1346},{54,40}} textureRotated - + function_icon_preference_1.png @@ -3672,7 +3740,7 @@ spriteSourceSize {64,64} textureRect - {{1958,1386},{36,36}} + {{1726,1527},{36,36}} textureRotated @@ -3689,9 +3757,9 @@ spriteSourceSize {64,64} textureRect - {{1060,1358},{46,40}} + {{341,1541},{46,40}} textureRotated - + function_icon_setting_2.png @@ -3706,7 +3774,7 @@ spriteSourceSize {64,64} textureRect - {{1954,1426},{36,36}} + {{1136,1546},{36,36}} textureRotated @@ -3723,7 +3791,7 @@ spriteSourceSize {64,64} textureRect - {{1918,1346},{38,38}} + {{1682,1487},{38,38}} textureRotated @@ -3740,7 +3808,7 @@ spriteSourceSize {64,64} textureRect - {{1918,1386},{38,38}} + {{1606,1527},{38,38}} textureRotated @@ -3757,9 +3825,9 @@ spriteSourceSize {64,64} textureRect - {{1822,1042},{42,38}} + {{1304,1466},{42,38}} textureRotated - + function_icon_spiderweb.png @@ -3774,7 +3842,7 @@ spriteSourceSize {64,64} textureRect - {{1246,1358},{40,40}} + {{1757,529},{40,40}} textureRotated @@ -3791,7 +3859,7 @@ spriteSourceSize {64,64} textureRect - {{1908,1132},{34,42}} + {{1760,91},{34,42}} textureRotated @@ -3808,7 +3876,7 @@ spriteSourceSize {64,64} textureRect - {{1994,994},{42,42}} + {{1750,1388},{42,42}} textureRotated @@ -3825,7 +3893,7 @@ spriteSourceSize {64,64} textureRect - {{1914,1426},{38,38}} + {{1646,1527},{38,38}} textureRotated @@ -3842,7 +3910,7 @@ spriteSourceSize {64,64} textureRect - {{1788,1404},{40,40}} + {{1757,571},{40,40}} textureRotated @@ -3859,7 +3927,7 @@ spriteSourceSize {64,64} textureRect - {{1788,1446},{40,40}} + {{1402,1520},{40,40}} textureRotated @@ -3876,7 +3944,7 @@ spriteSourceSize {64,64} textureRect - {{1788,1488},{30,38}} + {{1566,1557},{30,38}} textureRotated @@ -3893,7 +3961,7 @@ spriteSourceSize {64,64} textureRect - {{1973,51},{28,38}} + {{1727,245},{28,38}} textureRotated @@ -3910,7 +3978,7 @@ spriteSourceSize {64,64} textureRect - {{1910,1466},{38,38}} + {{1686,1527},{38,38}} textureRotated @@ -3927,7 +3995,7 @@ spriteSourceSize {64,64} textureRect - {{1958,1346},{38,38}} + {{1722,1487},{38,38}} textureRotated @@ -3944,9 +4012,9 @@ spriteSourceSize {64,64} textureRect - {{1828,1488},{30,38}} + {{1762,1466},{30,38}} textureRotated - + function_icon_wizard.png @@ -3961,7 +4029,7 @@ spriteSourceSize {64,64} textureRect - {{1808,1100},{38,44}} + {{1753,363},{38,44}} textureRotated @@ -3978,9 +4046,9 @@ spriteSourceSize {128,56} textureRect - {{1869,462},{128,56}} + {{1346,1334},{128,56}} textureRotated - + prg.png @@ -3995,7 +4063,7 @@ spriteSourceSize {423,38} textureRect - {{117,879},{423,38}} + {{122,879},{423,38}} textureRotated @@ -4012,7 +4080,7 @@ spriteSourceSize {36,36} textureRect - {{1950,1466},{36,36}} + {{1174,1546},{36,36}} textureRotated @@ -4029,7 +4097,7 @@ spriteSourceSize {284,39} textureRect - {{628,695},{284,39}} + {{1196,263},{284,39}} textureRotated @@ -4046,7 +4114,7 @@ spriteSourceSize {179,140} textureRect - {{593,921},{179,140}} + {{1196,304},{179,140}} textureRotated @@ -4063,7 +4131,7 @@ spriteSourceSize {59,60} textureRect - {{1932,1016},{59,60}} + {{1136,1485},{59,60}} textureRotated @@ -4096,9 +4164,9 @@ realTextureFileName ui3.png size - {2037,1519} + {1798,1588} smartupdate - $TexturePacker:SmartUpdate:679172191dc140dcd6bf7b01aa1cbb44:982a1f2bdeeac62b622d657ffdabd1b2:e1bf24f6fd107d358e5ec626ea4dfc29$ + $TexturePacker:SmartUpdate:400ec284f2e2a6d9923bfca33352574f:34e5a3c3d89124917751052dfb057007:e1bf24f6fd107d358e5ec626ea4dfc29$ textureFileName ui3.png diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta index 963ae0f4..69309419 100644 --- a/assets/resources/gui/ui3.plist.meta +++ b/assets/resources/gui/ui3.plist.meta @@ -18,8 +18,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1950, - "trimY": 1466, + "trimX": 1174, + "trimY": 1546, "width": 36, "height": 36, "rawWidth": 36, @@ -64,8 +64,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 537, - "trimY": 1279, + "trimX": 437, + "trimY": 1091, "width": 54, "height": 106, "rawWidth": 54, @@ -110,8 +110,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 2007, - "trimY": 595, + "trimX": 813, + "trimY": 662, "width": 48, "height": 29, "rawWidth": 48, @@ -153,11 +153,11 @@ "name": "ItemIcon_Medal_Bronze_2", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1650, - "trimY": 818, + "trimX": 1370, + "trimY": 892, "width": 120, "height": 104, "rawWidth": 128, @@ -202,8 +202,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1963, - "trimY": 1274, + "trimX": 1568, + "trimY": 1525, "width": 31, "height": 30, "rawWidth": 31, @@ -248,8 +248,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1965, - "trimY": 1306, + "trimX": 1568, + "trimY": 1485, "width": 32, "height": 38, "rawWidth": 64, @@ -291,11 +291,11 @@ "name": "Popup01_Basic_Single", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 395, - "trimY": 1221, + "trimX": 1743, + "trimY": 1281, "width": 54, "height": 63, "rawWidth": 54, @@ -337,11 +337,11 @@ "name": "ItemIcon_Medal_Gold_2", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1182, - "trimY": 910, + "trimX": 660, + "trimY": 1452, "width": 128, "height": 110, "rawWidth": 128, @@ -386,8 +386,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1654, - "trimY": 1056, + "trimX": 913, + "trimY": 1386, "width": 102, "height": 82, "rawWidth": 102, @@ -432,8 +432,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1996, - "trimY": 1274, + "trimX": 289, + "trimY": 879, "width": 29, "height": 30, "rawWidth": 29, @@ -475,11 +475,11 @@ "name": "Slider_Border_Tapered_02_Fill_Blue", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1259, - "trimY": 643, + "trimX": 784, + "trimY": 732, "width": 150, "height": 28, "rawWidth": 150, @@ -524,8 +524,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1254, - "trimY": 1514, + "trimX": 784, + "trimY": 1014, "width": 4, "height": 18, "rawWidth": 4, @@ -570,8 +570,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1636, - "trimY": 586, + "trimX": 1239, + "trimY": 1207, "width": 116, "height": 108, "rawWidth": 128, @@ -616,8 +616,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1943, - "trimY": 1194, + "trimX": 1685, + "trimY": 1453, "width": 38, "height": 32, "rawWidth": 64, @@ -651,52 +651,6 @@ ], "subMetas": {} }, - "78245": { - "importer": "sprite-frame", - "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@78245", - "displayName": "", - "id": "78245", - "name": "BubbleFrame01_Hexagon_FocusGlow", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 320, - "trimY": 431, - "width": 306, - "height": 298, - "rawWidth": 306, - "rawHeight": 298, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", - "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "87274": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@87274", @@ -708,8 +662,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1958, - "trimY": 1386, + "trimX": 1726, + "trimY": 1527, "width": 36, "height": 36, "rawWidth": 64, @@ -754,8 +708,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2013, - "trimY": 1, + "trimX": 888, + "trimY": 1463, "width": 23, "height": 24, "rawWidth": 23, @@ -797,11 +751,11 @@ "name": "Swich_01_handle", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 219, - "trimY": 879, + "trimX": 65, + "trimY": 1421, "width": 81, "height": 85, "rawWidth": 81, @@ -846,8 +800,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 157, - "trimY": 1267, + "trimX": 865, + "trimY": 1128, "width": 27, "height": 20, "rawWidth": 27, @@ -889,11 +843,11 @@ "name": "ItemFrame00~03_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1866, - "trimY": 1022, + "trimX": 852, + "trimY": 1489, "width": 60, "height": 62, "rawWidth": 60, @@ -938,8 +892,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1650, - "trimY": 696, + "trimX": 1264, + "trimY": 796, "width": 120, "height": 104, "rawWidth": 128, @@ -984,7 +938,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 60, + "trimX": 65, "trimY": 879, "width": 540, "height": 55, @@ -1030,8 +984,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1426, - "trimY": 649, + "trimX": 1732, + "trimY": 955, "width": 64, "height": 66, "rawWidth": 64, @@ -1076,8 +1030,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1920, - "trimY": 726, + "trimX": 1433, + "trimY": 1392, "width": 64, "height": 66, "rawWidth": 64, @@ -1122,8 +1076,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1654, - "trimY": 1140, + "trimX": 1615, + "trimY": 1331, "width": 60, "height": 85, "rawWidth": 60, @@ -1168,8 +1122,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1920, - "trimY": 595, + "trimX": 1346, + "trimY": 1392, "width": 60, "height": 85, "rawWidth": 60, @@ -1211,11 +1165,11 @@ "name": "ArrowIconButton_02_Next", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1872, - "trimY": 669, + "trimX": 143, + "trimY": 1541, "width": 46, "height": 76, "rawWidth": 46, @@ -1257,11 +1211,11 @@ "name": "ArrowIconButton_02_Prev", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1872, - "trimY": 747, + "trimX": 221, + "trimY": 1541, "width": 46, "height": 76, "rawWidth": 46, @@ -1306,8 +1260,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1686, - "trimY": 450, + "trimX": 1740, + "trimY": 799, "width": 57, "height": 80, "rawWidth": 57, @@ -1349,11 +1303,11 @@ "name": "Artboard 40", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1196, - "trimY": 1, + "trimX": 1, + "trimY": 879, "width": 623, "height": 62, "rawWidth": 653, @@ -1398,7 +1352,7 @@ "rotated": true, "offsetX": 2, "offsetY": 0, - "trimX": 117, + "trimX": 122, "trimY": 1304, "width": 115, "height": 64, @@ -1441,11 +1395,11 @@ "name": "Artboard 45", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -7, "offsetY": 0, - "trimX": 1173, - "trimY": 1292, + "trimX": 966, + "trimY": 676, "width": 124, "height": 64, "rawWidth": 152, @@ -1487,11 +1441,11 @@ "name": "Artboard 62", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1299, - "trimY": 1292, + "trimX": 805, + "trimY": 1308, "width": 106, "height": 113, "rawWidth": 112, @@ -1536,8 +1490,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1927, - "trimY": 485, + "trimX": 1651, + "trimY": 519, "width": 104, "height": 108, "rawWidth": 104, @@ -1582,7 +1536,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 157, + "trimX": 162, "trimY": 879, "width": 60, "height": 386, @@ -1617,190 +1571,6 @@ ], "subMetas": {} }, - "62d7f": { - "importer": "sprite-frame", - "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f", - "displayName": "", - "id": "62d7f", - "name": "BubbleFrame01_Hexagon_Bg_Blue", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 320, - "trimY": 731, - "width": 250, - "height": 243, - "rawWidth": 250, - "rawHeight": 243, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", - "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "9bff3": { - "importer": "sprite-frame", - "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@9bff3", - "displayName": "", - "id": "9bff3", - "name": "BubbleFrame01_Hexagon_Bg_Green", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 219, - "trimY": 976, - "width": 250, - "height": 243, - "rawWidth": 250, - "rawHeight": 243, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", - "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "bd51c": { - "importer": "sprite-frame", - "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@bd51c", - "displayName": "", - "id": "bd51c", - "name": "BubbleFrame01_Hexagon_Bg_Yellow", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1007, - "trimY": 431, - "width": 250, - "height": 243, - "rawWidth": 250, - "rawHeight": 243, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", - "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "b1311": { - "importer": "sprite-frame", - "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@b1311", - "displayName": "", - "id": "b1311", - "name": "BubbleFrame01_Hexagon_FocusBorder", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1497, - "trimY": 65, - "width": 254, - "height": 244, - "rawWidth": 254, - "rawHeight": 244, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", - "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "4bcea": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@4bcea", @@ -1812,8 +1582,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1836, - "trimY": 1384, + "trimX": 383, + "trimY": 1550, "width": 38, "height": 35, "rawWidth": 38, @@ -1855,11 +1625,11 @@ "name": "BubbleFrame04_White_Bg", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1964, - "trimY": 155, + "trimX": 1732, + "trimY": 881, "width": 64, "height": 72, "rawWidth": 64, @@ -1893,6 +1663,374 @@ ], "subMetas": {} }, + "aecca": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@aecca", + "displayName": "", + "id": "aecca", + "name": "Button01_l_Blue", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 579, + "trimY": 1218, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c7a69": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@c7a69", + "displayName": "", + "id": "c7a69", + "name": "Button01_l_Gray", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 661, + "trimY": 1310, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b2a40": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@b2a40", + "displayName": "", + "id": "b2a40", + "name": "Button01_l_Green", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1089, + "trimY": 588, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "97eae": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@97eae", + "displayName": "", + "id": "97eae", + "name": "Button01_l_Pink", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 783, + "trimY": 1020, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e9ffc": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@e9ffc", + "displayName": "", + "id": "e9ffc", + "name": "Button01_l_Purple", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 805, + "trimY": 1164, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "518f0": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@518f0", + "displayName": "", + "id": "518f0", + "name": "Button01_l_Sky", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 188, + "trimY": 1278, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a16b0": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@a16b0", + "displayName": "", + "id": "a16b0", + "name": "Button01_l_White_Bg", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 270, + "trimY": 1347, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0e901": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@0e901", + "displayName": "", + "id": "0e901", + "name": "Button01_l_Yellow", + "userData": { + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 414, + "trimY": 1362, + "width": 80, + "height": 142, + "rawWidth": 80, + "rawHeight": 142, + "borderTop": 79, + "borderBottom": 63, + "borderLeft": 40, + "borderRight": 40, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "cd9c1": { "importer": "sprite-frame", "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@cd9c1", @@ -1904,8 +2042,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1010, - "trimY": 1358, + "trimX": 1747, + "trimY": 1234, "width": 40, "height": 48, "rawWidth": 40, @@ -1947,11 +2085,11 @@ "name": "Button_Convex_Rectangle_01_Green", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 905, - "trimY": 634, + "trimX": 1753, + "trimY": 437, "width": 40, "height": 48, "rawWidth": 40, @@ -1996,8 +2134,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1986, - "trimY": 657, + "trimX": 1747, + "trimY": 1174, "width": 50, "height": 58, "rawWidth": 50, @@ -2042,8 +2180,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1866, - "trimY": 956, + "trimX": 797, + "trimY": 1423, "width": 64, "height": 64, "rawWidth": 64, @@ -2088,8 +2226,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1920, - "trimY": 657, + "trimX": 1499, + "trimY": 1391, "width": 64, "height": 67, "rawWidth": 64, @@ -2134,8 +2272,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1204, - "trimY": 1358, + "trimX": 1757, + "trimY": 487, "width": 40, "height": 40, "rawWidth": 40, @@ -2180,8 +2318,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1797, - "trimY": 1200, + "trimX": 1286, + "trimY": 1510, "width": 56, "height": 56, "rawWidth": 56, @@ -2226,8 +2364,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1430, - "trimY": 821, + "trimX": 1154, + "trimY": 809, "width": 108, "height": 108, "rawWidth": 108, @@ -2272,8 +2410,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1430, - "trimY": 821, + "trimX": 1154, + "trimY": 809, "width": 108, "height": 108, "rawWidth": 108, @@ -2318,8 +2456,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1821, - "trimY": 1, + "trimX": 621, + "trimY": 662, "width": 48, "height": 190, "rawWidth": 48, @@ -2364,8 +2502,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1196, - "trimY": 366, + "trimX": 976, + "trimY": 1470, "width": 56, "height": 63, "rawWidth": 56, @@ -2407,11 +2545,11 @@ "name": "CardFrame_Rectangle_02_FrontGradient", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1259, - "trimY": 593, + "trimX": 1039, + "trimY": 435, "width": 48, "height": 189, "rawWidth": 48, @@ -2456,8 +2594,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1986, - "trimY": 717, + "trimX": 1565, + "trimY": 1391, "width": 48, "height": 52, "rawWidth": 48, @@ -2499,11 +2637,11 @@ "name": "Dropdown_01_Icon_Filter", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1944, - "trimY": 1123, + "trimX": 1760, + "trimY": 47, "width": 42, "height": 37, "rawWidth": 42, @@ -2548,8 +2686,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 429, - "trimY": 1403, + "trimX": 152, + "trimY": 1422, "width": 114, "height": 116, "rawWidth": 128, @@ -2640,8 +2778,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1836, - "trimY": 1340, + "trimX": 1758, + "trimY": 613, "width": 38, "height": 42, "rawWidth": 38, @@ -2686,8 +2824,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 572, - "trimY": 736, + "trimX": 854, + "trimY": 435, "width": 183, "height": 183, "rawWidth": 183, @@ -2732,8 +2870,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 757, - "trimY": 736, + "trimX": 1575, + "trimY": 60, "width": 183, "height": 183, "rawWidth": 183, @@ -2778,8 +2916,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1196, - "trimY": 65, + "trimX": 320, + "trimY": 431, "width": 299, "height": 299, "rawWidth": 299, @@ -2824,8 +2962,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1259, - "trimY": 366, + "trimX": 621, + "trimY": 435, "width": 231, "height": 225, "rawWidth": 231, @@ -2870,8 +3008,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1922, - "trimY": 864, + "trimX": 790, + "trimY": 1489, "width": 60, "height": 62, "rawWidth": 60, @@ -2916,8 +3054,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1818, - "trimY": 223, + "trimX": 503, + "trimY": 793, "width": 133, "height": 133, "rawWidth": 133, @@ -2959,11 +3097,11 @@ "name": "ItemFrame00~03_BgLight", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1654, - "trimY": 1360, + "trimX": 597, + "trimY": 732, "width": 50, "height": 39, "rawWidth": 50, @@ -3008,8 +3146,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 317, - "trimY": 1407, + "trimX": 1357, + "trimY": 1222, "width": 110, "height": 110, "rawWidth": 110, @@ -3054,8 +3192,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1654, - "trimY": 1280, + "trimX": 1227, + "trimY": 1376, "width": 76, "height": 78, "rawWidth": 76, @@ -3100,8 +3238,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1868, - "trimY": 902, + "trimX": 926, + "trimY": 1535, "width": 52, "height": 52, "rawWidth": 52, @@ -3146,8 +3284,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1854, - "trimY": 1084, + "trimX": 980, + "trimY": 1535, "width": 52, "height": 52, "rawWidth": 52, @@ -3192,8 +3330,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1855, - "trimY": 1138, + "trimX": 1693, + "trimY": 1281, "width": 48, "height": 48, "rawWidth": 48, @@ -3238,8 +3376,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1830, - "trimY": 1421, + "trimX": 1518, + "trimY": 1460, "width": 40, "height": 40, "rawWidth": 40, @@ -3284,8 +3422,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1316, - "trimY": 703, + "trimX": 1643, + "trimY": 401, "width": 108, "height": 116, "rawWidth": 128, @@ -3327,11 +3465,11 @@ "name": "ItemIcon_Battle", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 309, - "trimY": 1277, + "trimX": 400, + "trimY": 1444, "width": 128, "height": 104, "rawWidth": 128, @@ -3376,8 +3514,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 471, - "trimY": 1159, + "trimX": 1521, + "trimY": 399, "width": 120, "height": 118, "rawWidth": 128, @@ -3419,11 +3557,11 @@ "name": "ItemIcon_Coin_Gold", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1198, - "trimY": 706, + "trimX": 1612, + "trimY": 775, "width": 112, "height": 116, "rawWidth": 128, @@ -3465,11 +3603,11 @@ "name": "ItemIcon_Coin_Silver", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1382, - "trimY": 1400, + "trimX": 1492, + "trimY": 891, "width": 112, "height": 116, "rawWidth": 128, @@ -3514,8 +3652,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1173, - "trimY": 1170, + "trimX": 1032, + "trimY": 670, "width": 120, "height": 120, "rawWidth": 128, @@ -3560,8 +3698,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 677, - "trimY": 1413, + "trimX": 530, + "trimY": 1460, "width": 128, "height": 102, "rawWidth": 128, @@ -3603,11 +3741,11 @@ "name": "ItemIcon_Dungeon", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1304, - "trimY": 821, + "trimX": 1643, + "trimY": 275, "width": 124, "height": 108, "rawWidth": 128, @@ -3649,11 +3787,11 @@ "name": "ItemIcon_Friend", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1540, - "trimY": 821, + "trimX": 1235, + "trimY": 568, "width": 124, "height": 108, "rawWidth": 128, @@ -3698,8 +3836,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1411, - "trimY": 1169, + "trimX": 1001, + "trimY": 1128, "width": 116, "height": 120, "rawWidth": 128, @@ -3744,8 +3882,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1068, - "trimY": 706, + "trimX": 1361, + "trimY": 450, "width": 128, "height": 112, "rawWidth": 128, @@ -3790,8 +3928,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1540, - "trimY": 1071, + "trimX": 1492, + "trimY": 1005, "width": 108, "height": 112, "rawWidth": 128, @@ -3836,8 +3974,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 183, - "trimY": 1277, + "trimX": 1235, + "trimY": 446, "width": 124, "height": 120, "rawWidth": 128, @@ -3879,11 +4017,11 @@ "name": "ItemIcon_Gear_Helmet", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1295, - "trimY": 1170, + "trimX": 1032, + "trimY": 792, "width": 114, "height": 120, "rawWidth": 128, @@ -3928,8 +4066,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1540, - "trimY": 1291, + "trimX": 1606, + "trimY": 1005, "width": 108, "height": 112, "rawWidth": 128, @@ -3971,11 +4109,11 @@ "name": "ItemIcon_Gift_Purple", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1620, - "trimY": 1401, + "trimX": 1239, + "trimY": 1097, "width": 116, "height": 108, "rawWidth": 128, @@ -4020,8 +4158,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1540, - "trimY": 947, + "trimX": 1017, + "trimY": 1250, "width": 122, "height": 110, "rawWidth": 128, @@ -4063,11 +4201,11 @@ "name": "ItemIcon_Medal_Gold_1", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1094, - "trimY": 1040, + "trimX": 270, + "trimY": 1429, "width": 128, "height": 110, "rawWidth": 128, @@ -4112,8 +4250,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 547, - "trimY": 1411, + "trimX": 1521, + "trimY": 519, "width": 128, "height": 104, "rawWidth": 128, @@ -4155,11 +4293,11 @@ "name": "ItemIcon_Medal_Silver_2", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1206, - "trimY": 1040, + "trimX": 1361, + "trimY": 564, "width": 128, "height": 104, "rawWidth": 128, @@ -4204,8 +4342,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 415, - "trimY": 1279, + "trimX": 1521, + "trimY": 275, "width": 120, "height": 122, "rawWidth": 128, @@ -4250,8 +4388,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 942, - "trimY": 794, + "trimX": 844, + "trimY": 676, "width": 120, "height": 122, "rawWidth": 128, @@ -4296,8 +4434,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1529, - "trimY": 1181, + "trimX": 1138, + "trimY": 919, "width": 122, "height": 108, "rawWidth": 128, @@ -4339,11 +4477,11 @@ "name": "ItemIcon_Ranking_Gold", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1745, - "trimY": 462, + "trimX": 1129, + "trimY": 1241, "width": 122, "height": 108, "rawWidth": 128, @@ -4385,11 +4523,11 @@ "name": "ItemIcon_Scroll", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1754, - "trimY": 572, + "trimX": 1610, + "trimY": 893, "width": 110, "height": 120, "rawWidth": 128, @@ -4434,8 +4572,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1496, - "trimY": 1401, + "trimX": 993, + "trimY": 1014, "width": 122, "height": 112, "rawWidth": 128, @@ -4477,11 +4615,11 @@ "name": "ItemIcon_Shop", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1422, - "trimY": 931, + "trimX": 1262, + "trimY": 919, "width": 116, "height": 106, "rawWidth": 128, @@ -4526,8 +4664,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1756, - "trimY": 816, + "trimX": 1357, + "trimY": 1108, "width": 110, "height": 112, "rawWidth": 128, @@ -4572,8 +4710,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 942, - "trimY": 676, + "trimX": 1214, + "trimY": 678, "width": 124, "height": 116, "rawWidth": 128, @@ -4618,8 +4756,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1068, - "trimY": 910, + "trimX": 784, + "trimY": 884, "width": 128, "height": 112, "rawWidth": 128, @@ -4664,8 +4802,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1312, - "trimY": 1039, + "trimX": 898, + "trimY": 884, "width": 128, "height": 112, "rawWidth": 128, @@ -4707,11 +4845,11 @@ "name": "ItemIcon_Skill_Defense", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1652, - "trimY": 940, + "trimX": 1376, + "trimY": 998, "width": 108, "height": 114, "rawWidth": 128, @@ -4756,8 +4894,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1414, - "trimY": 1291, + "trimX": 1012, + "trimY": 908, "width": 124, "height": 104, "rawWidth": 128, @@ -4802,8 +4940,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1254, - "trimY": 1400, + "trimX": 865, + "trimY": 1014, "width": 126, "height": 112, "rawWidth": 128, @@ -4848,8 +4986,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1426, - "trimY": 1039, + "trimX": 887, + "trimY": 1128, "width": 126, "height": 112, "rawWidth": 128, @@ -4891,11 +5029,11 @@ "name": "ItemIcon_Spin", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1756, - "trimY": 694, + "trimX": 1490, + "trimY": 775, "width": 114, "height": 120, "rawWidth": 128, @@ -4937,11 +5075,11 @@ "name": "ItemIcon_Star", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1010, - "trimY": 1400, + "trimX": 1119, + "trimY": 1119, "width": 120, "height": 118, "rawWidth": 128, @@ -4983,11 +5121,11 @@ "name": "ItemIcon_Star_Disable", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1132, - "trimY": 1400, + "trimX": 1370, + "trimY": 770, "width": 120, "height": 118, "rawWidth": 128, @@ -5029,11 +5167,11 @@ "name": "ItemIcon_Ticket_Gold", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1806, - "trimY": 358, + "trimX": 913, + "trimY": 1256, "width": 128, "height": 102, "rawWidth": 128, @@ -5078,8 +5216,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1294, - "trimY": 931, + "trimX": 1630, + "trimY": 629, "width": 106, "height": 126, "rawWidth": 128, @@ -5124,8 +5262,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 866, - "trimY": 1418, + "trimX": 1361, + "trimY": 670, "width": 128, "height": 98, "rawWidth": 128, @@ -5167,11 +5305,11 @@ "name": "Label_Bubble", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1094, - "trimY": 1170, + "trimX": 1305, + "trimY": 1376, "width": 61, "height": 39, "rawWidth": 61, @@ -5216,8 +5354,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1866, - "trimY": 592, + "trimX": 1740, + "trimY": 1097, "width": 52, "height": 75, "rawWidth": 52, @@ -5259,11 +5397,11 @@ "name": "Label_Flag_01_Single_Purple", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1868, - "trimY": 825, + "trimX": 1227, + "trimY": 1456, "width": 52, "height": 75, "rawWidth": 52, @@ -5305,11 +5443,11 @@ "name": "Label_Flag_01_Single_Red", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1984, - "trimY": 794, + "trimX": 1615, + "trimY": 1393, "width": 52, "height": 75, "rawWidth": 52, @@ -5354,8 +5492,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1984, - "trimY": 871, + "trimX": 1693, + "trimY": 1204, "width": 52, "height": 75, "rawWidth": 52, @@ -5400,8 +5538,8 @@ "rotated": false, "offsetX": -2, "offsetY": 1, - "trimX": 1492, - "trimY": 367, + "trimX": 1377, + "trimY": 304, "width": 142, "height": 144, "rawWidth": 146, @@ -5446,8 +5584,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 739, - "trimY": 1209, + "trimX": 638, + "trimY": 876, "width": 144, "height": 142, "rawWidth": 146, @@ -5492,8 +5630,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 922, - "trimY": 921, + "trimX": 637, + "trimY": 1020, "width": 144, "height": 142, "rawWidth": 146, @@ -5538,8 +5676,8 @@ "rotated": false, "offsetX": -1, "offsetY": -1, - "trimX": 1818, - "trimY": 81, + "trimX": 1089, + "trimY": 446, "width": 144, "height": 140, "rawWidth": 146, @@ -5584,8 +5722,8 @@ "rotated": false, "offsetX": -2, "offsetY": 1, - "trimX": 885, - "trimY": 1212, + "trimX": 493, + "trimY": 928, "width": 142, "height": 144, "rawWidth": 146, @@ -5630,8 +5768,8 @@ "rotated": false, "offsetX": -2, "offsetY": 2, - "trimX": 1492, - "trimY": 513, + "trimX": 493, + "trimY": 1074, "width": 142, "height": 142, "rawWidth": 146, @@ -5676,8 +5814,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 774, - "trimY": 921, + "trimX": 289, + "trimY": 915, "width": 146, "height": 142, "rawWidth": 146, @@ -5722,8 +5860,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 741, - "trimY": 1065, + "trimX": 638, + "trimY": 732, "width": 144, "height": 142, "rawWidth": 146, @@ -5768,8 +5906,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 593, - "trimY": 1207, + "trimX": 287, + "trimY": 1203, "width": 144, "height": 142, "rawWidth": 146, @@ -5814,8 +5952,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 593, - "trimY": 1063, + "trimX": 289, + "trimY": 1059, "width": 142, "height": 146, "rawWidth": 146, @@ -5857,11 +5995,11 @@ "name": "Loading_Circle_8", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 950, - "trimY": 1065, + "trimX": 433, + "trimY": 1218, "width": 142, "height": 144, "rawWidth": 146, @@ -5906,8 +6044,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1029, - "trimY": 1211, + "trimX": 661, + "trimY": 1164, "width": 142, "height": 144, "rawWidth": 146, @@ -5952,8 +6090,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1741, - "trimY": 1140, + "trimX": 1034, + "trimY": 1526, "width": 54, "height": 61, "rawWidth": 54, @@ -5995,11 +6133,11 @@ "name": "Popup01_Basic_White_Light", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1922, - "trimY": 928, + "trimX": 887, + "trimY": 1256, "width": 50, "height": 24, "rawWidth": 50, @@ -6044,16 +6182,16 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1741, - "trimY": 1140, + "trimX": 1034, + "trimY": 1526, "width": 54, "height": 61, "rawWidth": 54, "rawHeight": 61, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 28, + "borderBottom": 33, + "borderLeft": 27, + "borderRight": 27, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -6090,16 +6228,16 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 914, - "trimY": 676, + "trimX": 1198, + "trimY": 1485, "width": 48, "height": 26, "rawWidth": 48, "rawHeight": 26, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 25, + "borderBottom": 1, + "borderLeft": 24, + "borderRight": 24, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -6133,17 +6271,63 @@ "name": "Popup02~09_Topber_White_BgTopLight", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1922, - "trimY": 928, + "trimX": 887, + "trimY": 1256, "width": 50, "height": 24, "rawWidth": 50, "rawHeight": 24, "borderTop": 0, "borderBottom": 0, + "borderLeft": 25, + "borderRight": 25, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a", + "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "7f910": { + "importer": "sprite-frame", + "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@7f910", + "displayName": "", + "id": "7f910", + "name": "Popup03_Gradient", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 621, + "trimY": 431, + "width": 473, + "height": 2, + "rawWidth": 473, + "rawHeight": 2, + "borderTop": 1, + "borderBottom": 1, "borderLeft": 0, "borderRight": 0, "packable": true, @@ -6179,11 +6363,11 @@ "name": "Popup07_Topbar_Divided_Single_Blue", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1497, - "trimY": 311, + "trimX": 437, + "trimY": 915, "width": 54, "height": 174, "rawWidth": 54, @@ -6228,8 +6412,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 219, - "trimY": 1221, + "trimX": 854, + "trimY": 620, "width": 54, "height": 174, "rawWidth": 54, @@ -6274,8 +6458,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 628, - "trimY": 634, + "trimX": 320, + "trimY": 732, "width": 59, "height": 275, "rawWidth": 59, @@ -6366,8 +6550,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1735, - "trimY": 1265, + "trimX": 1226, + "trimY": 1510, "width": 56, "height": 58, "rawWidth": 56, @@ -6409,11 +6593,11 @@ "name": "SkillFrame_01_Border_Blue", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1732, - "trimY": 1323, + "trimX": 1692, + "trimY": 1393, "width": 56, "height": 58, "rawWidth": 56, @@ -6458,8 +6642,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1730, - "trimY": 1381, + "trimX": 1344, + "trimY": 1454, "width": 56, "height": 58, "rawWidth": 56, @@ -6504,8 +6688,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1730, - "trimY": 1441, + "trimX": 1344, + "trimY": 1514, "width": 56, "height": 58, "rawWidth": 56, @@ -6547,11 +6731,11 @@ "name": "SkillFrame_01_Border_Red", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1762, - "trimY": 1042, + "trimX": 1402, + "trimY": 1460, "width": 56, "height": 58, "rawWidth": 56, @@ -6596,8 +6780,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1797, - "trimY": 1140, + "trimX": 1460, + "trimY": 1460, "width": 56, "height": 58, "rawWidth": 56, @@ -6639,11 +6823,11 @@ "name": "Slider_BorderDeco_Tapered_01_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1953, - "trimY": 223, + "trimX": 1, + "trimY": 1504, "width": 140, "height": 83, "rawWidth": 140, @@ -6685,11 +6869,11 @@ "name": "Slider_Border_Tapered_02_Fill_Green", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1656, - "trimY": 367, + "trimX": 1575, + "trimY": 245, "width": 150, "height": 28, "rawWidth": 150, @@ -6731,11 +6915,11 @@ "name": "Slider_Border_Tapered_02_Fill_Orange", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1821, - "trimY": 51, + "trimX": 1491, + "trimY": 450, "width": 150, "height": 28, "rawWidth": 150, @@ -6777,11 +6961,11 @@ "name": "Slider_Border_Tapered_02_Fill_Red", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1259, - "trimY": 673, + "trimX": 814, + "trimY": 732, "width": 150, "height": 28, "rawWidth": 150, @@ -6826,8 +7010,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1068, - "trimY": 676, + "trimX": 1491, + "trimY": 745, "width": 150, "height": 28, "rawWidth": 150, @@ -6869,11 +7053,11 @@ "name": "Slider_Handle_01_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 807, - "trimY": 1413, + "trimX": 1239, + "trimY": 1317, "width": 105, "height": 57, "rawWidth": 105, @@ -6918,8 +7102,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1220, - "trimY": 676, + "trimX": 1305, + "trimY": 1439, "width": 25, "height": 25, "rawWidth": 25, @@ -6961,11 +7145,11 @@ "name": "Slider_Level_03_InnerBorder", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1068, - "trimY": 1040, + "trimX": 863, + "trimY": 1463, "width": 23, "height": 24, "rawWidth": 23, @@ -7007,11 +7191,11 @@ "name": "Slider_Play_01_Border", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 302, - "trimY": 879, + "trimX": 1720, + "trimY": 1097, "width": 17, "height": 16, "rawWidth": 17, @@ -7056,8 +7240,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1866, - "trimY": 669, + "trimX": 1026, + "trimY": 802, "width": 4, "height": 18, "rawWidth": 4, @@ -7099,11 +7283,11 @@ "name": "Slider_Play_02_Border", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1656, - "trimY": 532, + "trimX": 1686, + "trimY": 1115, "width": 87, "height": 52, "rawWidth": 87, @@ -7145,11 +7329,11 @@ "name": "Slider_Play_02_Fill_Red", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1636, - "trimY": 367, + "trimX": 621, + "trimY": 712, "width": 194, "height": 18, "rawWidth": 194, @@ -7194,8 +7378,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1436, + "trimX": 844, + "trimY": 800, "width": 102, "height": 82, "rawWidth": 102, @@ -7240,8 +7424,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 593, - "trimY": 1351, + "trimX": 658, + "trimY": 1392, "width": 137, "height": 58, "rawWidth": 137, @@ -7283,11 +7467,11 @@ "name": "Title_01_NoDeco_LightGreen", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 732, - "trimY": 1353, + "trimX": 1154, + "trimY": 670, "width": 137, "height": 58, "rawWidth": 137, @@ -7332,8 +7516,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 871, - "trimY": 1358, + "trimX": 1491, + "trimY": 625, "width": 137, "height": 58, "rawWidth": 137, @@ -7375,11 +7559,11 @@ "name": "Title_01_NoDeco_Sky", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1686, - "trimY": 311, + "trimX": 1491, + "trimY": 685, "width": 137, "height": 58, "rawWidth": 137, @@ -7421,11 +7605,11 @@ "name": "Title_01_NoDeco_White", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1746, - "trimY": 317, + "trimX": 1237, + "trimY": 1037, "width": 137, "height": 58, "rawWidth": 137, @@ -7470,8 +7654,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1496, - "trimY": 657, + "trimX": 1476, + "trimY": 1331, "width": 137, "height": 58, "rawWidth": 137, @@ -7516,8 +7700,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 628, - "trimY": 431, + "trimX": 1196, + "trimY": 60, "width": 377, "height": 201, "rawWidth": 377, @@ -7559,11 +7743,11 @@ "name": "ToastMessage_Light2", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 471, - "trimY": 976, + "trimX": 320, + "trimY": 793, "width": 181, "height": 120, "rawWidth": 181, @@ -7608,8 +7792,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1876, - "trimY": 1346, + "trimX": 1444, + "trimY": 1520, "width": 40, "height": 40, "rawWidth": 40, @@ -7654,8 +7838,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1868, - "trimY": 1464, + "trimX": 1526, + "trimY": 1502, "width": 40, "height": 40, "rawWidth": 40, @@ -7697,11 +7881,11 @@ "name": "Toggle_Check_02_Off", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1922, - "trimY": 794, + "trimX": 1729, + "trimY": 737, "width": 68, "height": 60, "rawWidth": 68, @@ -7743,11 +7927,11 @@ "name": "Toggle_Check_02_On", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1653, - "trimY": 1202, + "trimX": 948, + "trimY": 802, "width": 80, "height": 76, "rawWidth": 80, @@ -7792,8 +7976,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1735, - "trimY": 1203, + "trimX": 914, + "trimY": 1470, "width": 60, "height": 60, "rawWidth": 60, @@ -7838,8 +8022,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1932, - "trimY": 954, + "trimX": 1034, + "trimY": 1464, "width": 60, "height": 60, "rawWidth": 60, @@ -7884,8 +8068,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1855, - "trimY": 1188, + "trimX": 1753, + "trimY": 1, "width": 44, "height": 44, "rawWidth": 44, @@ -7930,8 +8114,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1944, - "trimY": 1077, + "trimX": 1753, + "trimY": 275, "width": 44, "height": 44, "rawWidth": 44, @@ -7976,8 +8160,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1964, - "trimY": 81, + "trimX": 1720, + "trimY": 1023, "width": 72, "height": 72, "rawWidth": 72, @@ -8019,11 +8203,11 @@ "name": "Tutorial_Focus", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 205, - "trimY": 1407, + "trimX": 1469, + "trimY": 1115, "width": 111, "height": 110, "rawWidth": 111, @@ -8068,8 +8252,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1426, - "trimY": 717, + "trimX": 1469, + "trimY": 1227, "width": 102, "height": 110, "rawWidth": 128, @@ -8111,11 +8295,11 @@ "name": "UI_Rewards_Medal_01_Gold", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1538, - "trimY": 717, + "trimX": 1582, + "trimY": 1115, "width": 102, "height": 110, "rawWidth": 128, @@ -8157,11 +8341,11 @@ "name": "UI_Rewards_Medal_01_Silver", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1762, - "trimY": 930, + "trimX": 1581, + "trimY": 1227, "width": 102, "height": 110, "rawWidth": 128, @@ -8206,8 +8390,8 @@ "rotated": false, "offsetX": 0, "offsetY": -2, - "trimX": 1064, - "trimY": 820, + "trimX": 1117, + "trimY": 1029, "width": 118, "height": 88, "rawWidth": 128, @@ -8252,8 +8436,8 @@ "rotated": false, "offsetX": 0, "offsetY": -2, - "trimX": 1184, - "trimY": 820, + "trimX": 1017, + "trimY": 1374, "width": 118, "height": 88, "rawWidth": 128, @@ -8298,8 +8482,8 @@ "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 1936, - "trimY": 365, + "trimX": 1137, + "trimY": 1365, "width": 118, "height": 88, "rawWidth": 128, @@ -8341,11 +8525,11 @@ "name": "bg6", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 879, + "trimX": 1196, + "trimY": 1, "width": 555, "height": 57, "rawWidth": 555, @@ -8390,8 +8574,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 105, - "trimY": 1421, + "trimX": 558, + "trimY": 1362, "width": 96, "height": 98, "rawWidth": 96, @@ -8436,8 +8620,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1753, - "trimY": 65, + "trimX": 224, + "trimY": 879, "width": 250, "height": 63, "rawWidth": 250, @@ -8528,8 +8712,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 887, - "trimY": 1065, + "trimX": 224, + "trimY": 1131, "width": 145, "height": 61, "rawWidth": 145, @@ -8574,8 +8758,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1855, - "trimY": 1234, + "trimX": 1753, + "trimY": 403, "width": 44, "height": 32, "rawWidth": 64, @@ -8620,8 +8804,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1885, - "trimY": 1268, + "trimX": 423, + "trimY": 1550, "width": 36, "height": 36, "rawWidth": 64, @@ -8663,11 +8847,11 @@ "name": "function_icon_arrow", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1883, - "trimY": 1306, + "trimX": 1486, + "trimY": 1520, "width": 40, "height": 38, "rawWidth": 64, @@ -8712,8 +8896,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1990, - "trimY": 1078, + "trimX": 1643, + "trimY": 737, "width": 36, "height": 44, "rawWidth": 64, @@ -8758,8 +8942,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1990, - "trimY": 1116, + "trimX": 1526, + "trimY": 1544, "width": 38, "height": 38, "rawWidth": 64, @@ -8804,8 +8988,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1797, - "trimY": 1258, + "trimX": 838, + "trimY": 1553, "width": 42, "height": 34, "rawWidth": 64, @@ -8850,8 +9034,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1158, - "trimY": 1358, + "trimX": 1753, + "trimY": 321, "width": 44, "height": 40, "rawWidth": 64, @@ -8893,11 +9077,11 @@ "name": "function_icon_boot_fly", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1108, - "trimY": 1357, + "trimX": 1702, + "trimY": 1331, "width": 48, "height": 38, "rawWidth": 64, @@ -8942,8 +9126,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1905, - "trimY": 1176, + "trimX": 461, + "trimY": 1550, "width": 36, "height": 36, "rawWidth": 64, @@ -8988,8 +9172,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1988, - "trimY": 1156, + "trimX": 1565, + "trimY": 1445, "width": 38, "height": 38, "rawWidth": 64, @@ -9031,11 +9215,11 @@ "name": "function_icon_cyclone", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1994, - "trimY": 1038, + "trimX": 1758, + "trimY": 657, "width": 42, "height": 38, "rawWidth": 64, @@ -9080,8 +9264,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1901, - "trimY": 1214, + "trimX": 1605, + "trimY": 1447, "width": 38, "height": 38, "rawWidth": 64, @@ -9126,8 +9310,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1758, - "trimY": 1100, + "trimX": 863, + "trimY": 1423, "width": 48, "height": 38, "rawWidth": 64, @@ -9172,8 +9356,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1983, - "trimY": 1196, + "trimX": 1689, + "trimY": 737, "width": 36, "height": 38, "rawWidth": 64, @@ -9215,11 +9399,11 @@ "name": "function_icon_feather", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1999, - "trimY": 1306, + "trimX": 1758, + "trimY": 701, "width": 36, "height": 34, "rawWidth": 64, @@ -9261,11 +9445,11 @@ "name": "function_icon_fire", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1944, - "trimY": 1162, + "trimX": 1767, + "trimY": 223, "width": 30, "height": 42, "rawWidth": 64, @@ -9310,8 +9494,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1941, - "trimY": 1228, + "trimX": 1645, + "trimY": 1447, "width": 38, "height": 38, "rawWidth": 64, @@ -9356,8 +9540,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1792, - "trimY": 1368, + "trimX": 882, + "trimY": 1553, "width": 42, "height": 34, "rawWidth": 64, @@ -9402,8 +9586,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1981, - "trimY": 1234, + "trimX": 1602, + "trimY": 1487, "width": 38, "height": 38, "rawWidth": 64, @@ -9445,11 +9629,11 @@ "name": "function_icon_hat", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 955, - "trimY": 634, + "trimX": 299, + "trimY": 1541, "width": 46, "height": 40, "rawWidth": 64, @@ -9491,11 +9675,11 @@ "name": "function_icon_heart", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1908, - "trimY": 1084, + "trimX": 790, + "trimY": 1553, "width": 46, "height": 34, "rawWidth": 64, @@ -9540,8 +9724,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1876, - "trimY": 1388, + "trimX": 1090, + "trimY": 1550, "width": 34, "height": 40, "rawWidth": 64, @@ -9586,8 +9770,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1795, - "trimY": 1294, + "trimX": 1750, + "trimY": 1432, "width": 32, "height": 42, "rawWidth": 64, @@ -9629,11 +9813,11 @@ "name": "function_icon_knight", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1994, - "trimY": 948, + "trimX": 1030, + "trimY": 626, "width": 42, "height": 44, "rawWidth": 64, @@ -9678,8 +9862,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1925, - "trimY": 1306, + "trimX": 1642, + "trimY": 1487, "width": 38, "height": 38, "rawWidth": 64, @@ -9721,11 +9905,11 @@ "name": "function_icon_life", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1841, - "trimY": 1268, + "trimX": 1760, + "trimY": 135, "width": 42, "height": 34, "rawWidth": 64, @@ -9767,11 +9951,11 @@ "name": "function_icon_life_break", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1839, - "trimY": 1304, + "trimX": 1760, + "trimY": 179, "width": 42, "height": 34, "rawWidth": 64, @@ -9813,11 +9997,11 @@ "name": "function_icon_magic", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1792, - "trimY": 1328, + "trimX": 1096, + "trimY": 1464, "width": 38, "height": 42, "rawWidth": 64, @@ -9859,11 +10043,11 @@ "name": "function_icon_moneybag_dollar", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1923, - "trimY": 1268, + "trimX": 1482, + "trimY": 263, "width": 36, "height": 38, "rawWidth": 64, @@ -9905,11 +10089,11 @@ "name": "function_icon_paw", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1872, - "trimY": 1424, + "trimX": 1096, + "trimY": 1508, "width": 38, "height": 40, "rawWidth": 64, @@ -9951,11 +10135,11 @@ "name": "function_icon_powerup", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1450, - "trimY": 593, + "trimX": 1742, + "trimY": 1346, "width": 54, "height": 40, "rawWidth": 64, @@ -9997,11 +10181,11 @@ "name": "function_icon_revive_1", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1060, - "trimY": 1358, + "trimX": 341, + "trimY": 1541, "width": 46, "height": 40, "rawWidth": 64, @@ -10046,8 +10230,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1954, - "trimY": 1426, + "trimX": 1136, + "trimY": 1546, "width": 36, "height": 36, "rawWidth": 64, @@ -10092,8 +10276,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1918, - "trimY": 1346, + "trimX": 1682, + "trimY": 1487, "width": 38, "height": 38, "rawWidth": 64, @@ -10138,8 +10322,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1918, - "trimY": 1386, + "trimX": 1606, + "trimY": 1527, "width": 38, "height": 38, "rawWidth": 64, @@ -10181,11 +10365,11 @@ "name": "function_icon_skull", "userData": { "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1822, - "trimY": 1042, + "trimX": 1304, + "trimY": 1466, "width": 42, "height": 38, "rawWidth": 64, @@ -10230,8 +10414,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1246, - "trimY": 1358, + "trimX": 1757, + "trimY": 529, "width": 40, "height": 40, "rawWidth": 64, @@ -10276,8 +10460,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1908, - "trimY": 1132, + "trimX": 1760, + "trimY": 91, "width": 34, "height": 42, "rawWidth": 64, @@ -10322,8 +10506,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1994, - "trimY": 994, + "trimX": 1750, + "trimY": 1388, "width": 42, "height": 42, "rawWidth": 64, @@ -10368,8 +10552,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1914, - "trimY": 1426, + "trimX": 1646, + "trimY": 1527, "width": 38, "height": 38, "rawWidth": 64, @@ -10414,8 +10598,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1788, - "trimY": 1404, + "trimX": 1757, + "trimY": 571, "width": 40, "height": 40, "rawWidth": 64, @@ -10460,8 +10644,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1788, - "trimY": 1446, + "trimX": 1402, + "trimY": 1520, "width": 40, "height": 40, "rawWidth": 64, @@ -10506,8 +10690,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1788, - "trimY": 1488, + "trimX": 1566, + "trimY": 1557, "width": 30, "height": 38, "rawWidth": 64, @@ -10552,8 +10736,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1973, - "trimY": 51, + "trimX": 1727, + "trimY": 245, "width": 28, "height": 38, "rawWidth": 64, @@ -10598,8 +10782,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1910, - "trimY": 1466, + "trimX": 1686, + "trimY": 1527, "width": 38, "height": 38, "rawWidth": 64, @@ -10644,8 +10828,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1958, - "trimY": 1346, + "trimX": 1722, + "trimY": 1487, "width": 38, "height": 38, "rawWidth": 64, @@ -10687,11 +10871,11 @@ "name": "function_icon_water", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1828, - "trimY": 1488, + "trimX": 1762, + "trimY": 1466, "width": 30, "height": 38, "rawWidth": 64, @@ -10736,8 +10920,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1808, - "trimY": 1100, + "trimX": 1753, + "trimY": 363, "width": 38, "height": 44, "rawWidth": 64, @@ -10779,11 +10963,11 @@ "name": "play_character_target", "userData": { "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1869, - "trimY": 462, + "trimX": 1346, + "trimY": 1334, "width": 128, "height": 56, "rawWidth": 128, @@ -10828,7 +11012,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 117, + "trimX": 122, "trimY": 879, "width": 423, "height": 38, @@ -10874,8 +11058,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 628, - "trimY": 695, + "trimX": 1196, + "trimY": 263, "width": 284, "height": 39, "rawWidth": 284, @@ -10920,8 +11104,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 593, - "trimY": 921, + "trimX": 1196, + "trimY": 304, "width": 179, "height": 140, "rawWidth": 179, @@ -10966,8 +11150,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1932, - "trimY": 1016, + "trimX": 1136, + "trimY": 1485, "width": 59, "height": 60, "rawWidth": 59, diff --git a/assets/resources/gui/ui3.png b/assets/resources/gui/ui3.png index edd48645..bec62900 100644 Binary files a/assets/resources/gui/ui3.png and b/assets/resources/gui/ui3.png differ diff --git a/assets/script/game/common/config/heroSet.data.json b/assets/script/game/common/config/heroSet.data.json index 482e8802..62909b59 100644 --- a/assets/script/game/common/config/heroSet.data.json +++ b/assets/script/game/common/config/heroSet.data.json @@ -1,19 +1,31 @@ { - "schema_version": 1, - "generated_at": "2026-08-18T15:13:10.448Z", - "gen_hash": "9087e6b5836003d7db31792bbe6c8399808adaf5", - "section_headers": { - "1": " // ========== card_lv=1（5001-5005）基础单体/默认范围 ==========", - "2": " // ========== card_lv=2（5101-5105）数值强化 ==========", - "3": " // ========== card_lv=3（5201-5205）范围扩大 ==========", - "4": " // ========== card_lv=4（5301-5305）数值+范围 ==========", - "5": " // ========== card_lv=5（5401-5405）双技能（+revive/field） ==========" - }, + "schema_version": 2, + "generated_at": "2026-08-19T11:43:02.437Z", + "gen_hash": "46a818cb923f684b20f473c5c0beb2a3893b9f55", + "sections": [ + { + "title": " // ========== 几何王国复刻英雄（5001~5009，依据 英雄设计指引.md） ==========", + "uuids": [ + 5001, + 5002, + 5003, + 5004, + 5005, + 5006, + 5007, + 5008, + 5009 + ], + "list_comment": " // 几何王国复刻英雄（5001~5009）" + } + ], "monsters_prelude": [ + "", + "", " /*", " *=============怪物配置列表================", - " * 性能基准：1 级怪物与 1 级英雄（card_lv=1）单体性能持平 ——", - " * 近战怪镜像 5001（hp300/ap22/cd1.20），远程怪镜像 5004（hp160/ap28/cd1.20），", + " * 性能基准：1 级怪物与 1 级英雄单体性能持平 ——", + " * 近战怪基准 hp300/ap22/cd1.20，远程怪基准 hp160/ap28/cd1.20，", " * 重型/Boss 以更高 hp 换取更低 DPS，承担\"墙\"与\"压场\"定位。", " * 运行时最终属性 = 本表基础值 × RogueConfig.MON_HP_MUL / MON_AP_MUL", " * （Boss 额外 × BOSS_HP_BONUS_MUL），校准目标：整场战斗双方对砍 ≈ 30s。", @@ -26,1528 +38,16 @@ "heroes": [ { "uuid": 5001, - "name": "铁壁战士", - "path": "hk1", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Tank", - "hp_delta": 5, - "ap_delta": 2, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 1, - "grow_type": "Tank", - "role": "Tank", - "atked": [ - { - "s_uuid": 6301, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "ap": 2 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "ap": 3 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "ap": 4 - } - } - ] - } - ], - "comment": [ - " // 5001 铁壁战士 — atked 护盾（标杆，原5011）" - ] - }, - { - "uuid": 5002, - "name": "影袭刺客", - "path": "hc1", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Assassin", - "hp_delta": 20, - "ap_delta": 0, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6002, - "lv": 1, - "cd": "Fast", - "ccd": 0 - } - ], - "info": "", - "card_lv": 1, - "grow_type": "Assassin", - "role": "Assassin", - "atking": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "ap": 1 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "ap": 2 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "ap": 3 - } - } - ] - } - ], - "comment": [ - " // 5002 影袭刺客 — atking 自身攻击" - ] - }, - { - "uuid": 5003, - "name": "遗志将军", - "path": "hk2", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Warrior", - "hp_delta": 20, - "ap_delta": 0, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 1, - "grow_type": "Warrior", - "role": "Warrior", - "dead": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 3 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 7 - } - } - ] - } - ], - "comment": [ - " // 5003 遗志将军 — dead 全队攻击" - ] - }, - { - "uuid": 5004, - "name": "破晓先知", - "path": "hm1", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Mage", - "hp_delta": 3, - "ap_delta": 0, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7003 - } - }, - { - "uuid": 6101, - "lv": 1, - "cd": 8, - "ccd": 0, - "comment": [ - " // 大招：火焰喷射，独立 cd，按英雄等级分档成长（5级双发）" - ], - "overrides": { - "ap": 100 - }, - "lv_entries": [ - { - "lv": 3, - "overrides": { - "ap": 150 - }, - "s_lv": 2 - }, - { - "lv": 5, - "overrides": { - "ap": 200, - "num": 1 - }, - "s_lv": 3 - } - ] - } - ], - "info": "", - "card_lv": 1, - "grow_type": "Mage", - "role": "Mage", - "fstart": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 3 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 7 - } - } - ] - } - ], - "comment": [ - " // 5004 破晓先知 — fstart 全队攻击" - ] - }, - { - "uuid": 5005, - "name": "战歌法师", - "path": "hm2", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Support", - "hp_delta": 3, - "ap_delta": 0, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7006 - } - } - ], - "info": "", - "card_lv": 1, - "grow_type": "Mage", - "role": "Support", - "field": [ - { - "lv": 1, - "uuids": [ - { - "uuid": 7002, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ - { - "uuid": 7002, - "value": 0.2 - } - ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7002, - "value": 0.3 - } - ] - } - ], - "comment": [ - " // 5005 战歌法师 — field 攻击光环" - ] - }, - { - "uuid": 5101, - "name": "不死斗士", - "path": "hk3", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Tank", - "hp_delta": 300, - "ap_delta": 26, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Tank", - "role": "Tank", - "atked": [ - { - "s_uuid": 6302, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "ap": 200 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "ap": 250 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "ap": 300 - } - } - ] - } - ], - "comment": [ - " // 5101 不死斗士 — atked 回血（更高数值）" - ] - }, - { - "uuid": 5102, - "name": "致命杀手", - "path": "hc2", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Assassin", - "hp_delta": 320, - "ap_delta": 24, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6002, - "lv": 1, - "cd": "Fast", - "ccd": 0 - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Assassin", - "role": "Assassin", - "atking": [ - { - "s_uuid": 6403, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7012, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7012, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7012, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5102 致命杀手 — atking 暴击（更高数值）" - ] - }, - { - "uuid": 5103, - "name": "殉道勇士", - "path": "hk4", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Warrior", - "hp_delta": 320, - "ap_delta": 24, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Warrior", - "role": "Warrior", - "dead": [ - { - "s_uuid": 6301, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 3 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 4 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - } - ] - } - ], - "comment": [ - " // 5103 殉道勇士 — dead 全队护盾（更高数值）" - ] - }, - { - "uuid": 5104, - "name": "圣光祭司", - "path": "hm3", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Mage", - "hp_delta": 147, - "ap_delta": 32, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7003 - } - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Mage", - "role": "Mage", - "fstart": [ - { - "s_uuid": 6301, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 3 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 4 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - } - ] - } - ], - "comment": [ - " // 5104 圣光祭司 — fstart 全队护盾（更高数值）" - ] - }, - { - "uuid": 5105, - "name": "风怒先知", - "path": "hm1", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Support", - "hp_delta": 147, - "ap_delta": 32, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7006 - } - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Mage", - "role": "Support", - "field": [ - { - "lv": 1, - "uuids": [ - { - "uuid": 7006, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ - { - "uuid": 7006, - "value": 0.2 - } - ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7006, - "value": 0.3 - } - ] - } - ], - "comment": [ - " // 5105 风怒先知 — field 攻速光环" - ] - }, - { - "uuid": 5106, - "name": "破甲射手", - "path": "ha1", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Archer", - "hp_delta": 147, - "ap_delta": 32, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6006, - "lv": 1, - "cd": "Normal", - "ccd": 0 - } - ], - "info": "", - "card_lv": 2, - "grow_type": "Archer", - "role": "Archer", - "atking": [ - { - "s_uuid": 6512, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7022, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7022, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "timed_buff_id": 7022, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5106 破甲射手 — atking 自身穿透伤害（计时buff增强）" - ] - }, - { - "uuid": 5201, - "name": "怒血勇士", - "path": "hk5", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Tank", - "hp_delta": 600, - "ap_delta": 48, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 3, - "grow_type": "Tank", - "role": "Tank", - "atked": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 1 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 2 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 3 - } - } - ] - } - ], - "comment": [ - " // 5201 怒血勇士 — atked 全队攻击（范围扩大）" - ] - }, - { - "uuid": 5202, - "name": "援护射手", - "path": "ha1", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Archer", - "hp_delta": 290, - "ap_delta": 64, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6006, - "lv": 1, - "cd": "Normal", - "ccd": 0 - } - ], - "info": "", - "card_lv": 3, - "grow_type": "Archer", - "role": "Archer", - "atking": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "hit_count": 1, - "ap": 1 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "hit_count": 2, - "ap": 1 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "hit_count": 3, - "ap": 1 - } - } - ] - } - ], - "comment": [ - " // 5202 援护射手 — atking 队友攻击（范围扩大）" - ] - }, - { - "uuid": 5203, - "name": "传承卫士", - "path": "hk1", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Warrior", - "hp_delta": 620, - "ap_delta": 46, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 3, - "grow_type": "Warrior", - "role": "Warrior", - "dead": [ - { - "s_uuid": 6402, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 10 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 15 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 20 - } - } - ] - } - ], - "comment": [ - " // 5203 传承卫士 — dead 全队生命（范围扩大）" - ] - }, - { - "uuid": 5204, - "name": "晨光贤者", - "path": "hm2", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Mage", - "hp_delta": 290, - "ap_delta": 64, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7002 - } - } - ], - "info": "", - "card_lv": 3, - "grow_type": "Mage", - "role": "Mage", - "fstart": [ - { - "s_uuid": 6403, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5204 晨光贤者 — fstart 全队暴击（范围扩大）" - ] - }, - { - "uuid": 5205, - "name": "精准术士", - "path": "hm3", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Support", - "hp_delta": 290, - "ap_delta": 64, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7006 - } - } - ], - "info": "", - "card_lv": 3, - "grow_type": "Mage", - "role": "Support", - "field": [ - { - "lv": 1, - "uuids": [ - { - "uuid": 7004, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ - { - "uuid": 7004, - "value": 0.2 - } - ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7004, - "value": 0.3 - } - ] - } - ], - "comment": [ - " // 5205 精准术士 — field 暴击光环（范围扩大）" - ] - }, - { - "uuid": 5301, - "name": "复仇守护者", - "path": "hk2", - "fac": "HERO", - "lv": 1, - "type": "Melee", - "stats": { - "kind": "role_base", - "role": "Tank", - "hp_delta": 900, - "ap_delta": 70, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6004, - "lv": 1, - "cd": "Slow", - "ccd": 0 - } - ], - "info": "", - "card_lv": 4, - "grow_type": "Tank", - "role": "Tank", - "atked": [ - { - "s_uuid": 6403, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5301 复仇守护者 — atked 全队暴击（范围+数值）" - ] - }, - { - "uuid": 5302, - "name": "破灭游侠", - "path": "ha2", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Archer", - "hp_delta": 433, - "ap_delta": 96, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6006, - "lv": 1, - "cd": "Normal", - "ccd": 0 - } - ], - "info": "", - "card_lv": 4, - "grow_type": "Archer", - "role": "Archer", - "atking": [ - { - "s_uuid": 6404, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "hit_count": 2, - "timed_buff_id": 7020, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "hit_count": 3, - "timed_buff_id": 7020, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "hit_count": 4, - "timed_buff_id": 7020, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5302 破灭游侠 — atking 队友暴伤（范围+数值）" - ] - }, - { - "uuid": 5303, - "name": "亡语刺客", - "path": "hc3", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Assassin", - "hp_delta": 920, - "ap_delta": 68, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6002, - "lv": 1, - "cd": "Fast", - "ccd": 0 - } - ], - "info": "", - "card_lv": 4, - "grow_type": "Assassin", - "role": "Assassin", - "dead": [ - { - "s_uuid": 6403, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7012, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - }, - { - "s_uuid": 6404, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7020, - "buff_value": 5, - "buff_duration": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7020, - "buff_value": 7, - "buff_duration": 5 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "timed_buff_id": 7020, - "buff_value": 10, - "buff_duration": 6 - } - } - ] - } - ], - "comment": [ - " // 5303 亡语刺客 — dead 全队暴击+暴伤（双效果）" - ] - }, - { - "uuid": 5304, - "name": "战吼术士", - "path": "hm1", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Mage", - "hp_delta": 433, - "ap_delta": 96, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7005 - } - } - ], - "info": "", - "card_lv": 4, - "grow_type": "Mage", - "role": "Mage", - "fstart": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 8 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 12 - } - } - ] - }, - { - "s_uuid": 6402, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 10 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 15 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 20 - } - } - ] - } - ], - "comment": [ - " // 5304 战吼术士 — fstart 全队攻击+生命（双效果）" - ] - }, - { - "uuid": 5305, - "name": "领域贤者", - "path": "hm2", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Support", - "hp_delta": 433, - "ap_delta": 96, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7006 - } - } - ], - "info": "", - "card_lv": 4, - "grow_type": "Mage", - "role": "Support", - "field": [ - { - "lv": 1, - "uuids": [ - { - "uuid": 7005, - "value": 0.2 - }, - { - "uuid": 7006, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ - { - "uuid": 7005, - "value": 0.4 - }, - { - "uuid": 7006, - "value": 0.2 - } - ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7005, - "value": 0.6 - }, - { - "uuid": 7006, - "value": 0.3 - } - ] - } - ], - "comment": [ - " // 5305 领域贤者 — field 暴伤+攻速光环（双效果）" - ] - }, - { - "uuid": 5306, "name": "紫电魔女", "path": "hm1", "fac": "HERO", "lv": 1, - "card_lv": 4, "type": "Long", - "grow_type": "Mage", - "role": "Mage", "stats": { "kind": "role_base", "role": "Mage", - "hp_delta": 428, - "ap_delta": 106, + "hp_delta": -5, + "ap_delta": 10, "def_delta": 0 }, "skills": [ @@ -1565,58 +65,63 @@ "lv": 1, "cd": 8, "ccd": 0, + "comment": [ + " // 大招：群体闪电，独立 cd，按英雄等级分档成长" + ], "overrides": { "ap": 250, - "bck": 30 + "bck": 30, + "para": 40 }, "lv_entries": [ { "lv": 3, - "s_lv": 2, "overrides": { "ap": 250, - "bck": 60 - } + "bck": 60, + "para": 40 + }, + "s_lv": 2 }, { "lv": 5, - "s_lv": 3, "overrides": { "ap": 300, "bck": 90, - "timed_buff_id": 7005 - } + "timed_buff_id": 7005, + "para": 50 + }, + "s_lv": 3 }, { "lv": 7, - "s_lv": 4, "overrides": { "ap": 400, - "timed_buff_id": 7004 - } + "timed_buff_id": 7025, + "para": 70 + }, + "s_lv": 4 } ] } ], + "info": "", + "card_lv": 4, + "grow_type": "Mage", + "role": "Mage", + "trig_order": [ + "atking" + ], "atking": [ { "s_uuid": 6013, "entries": [ { "lv": 2, + "t_num": 3, "s_lv": 1, - "t_num": 3, "overrides": { - "timed_buff_id": 7004 - } - }, - { - "lv": 5, - "s_lv": 2, - "t_num": 3, - "overrides": { - "timed_buff_id": 7004, - "stun": 10 + "para": 100 } } ] @@ -1634,33 +139,32 @@ } ], "infos": [ - "解锁闪电术：造成攻击力100%的伤害", - "电击精通：普攻每3次附加击晕（≈33%概率）", + "解锁闪电术：造成攻击力100%的伤害，30%概率麻痹", + "解锁群体闪电：对敌人造成攻击力250%的伤害并击退30，40%概率麻痹", + "电击精通：普攻每3次必定麻痹目标", "群体闪电强化：击退提升至60", - "电荷积蓄：击晕触发更稳定", - "雷暴领域：群体闪电附带中毒，击退提升至90", - "雷霆万钧：大招伤害300%", - "女王尖啸：群体闪电命中全场击晕（暂未开放）", + "雷暴领域：群体闪电附带中毒，伤害300%且击退90，50%概率麻痹", "—", - "魔女威压：全队攻击光环+15%（暂未开放）" + "雷霆万钧：群体闪电伤害400%，命中附加麻痹（70%概率）", + "—", + "魔女威压：全队攻击光环+15%" ], - "info": "", "comment": [ - " // 5306 紫电魔女 — atking 击晕 + 大招 6111 群体闪电（击退/击晕）+ 攻击光环（几何王国·深渊女王复刻）" + " // 5001 紫电魔女 — atking 麻痹 + 大招 6111 群体闪电（击退/麻痹）+ 攻击光环（深渊女王复刻）" ] }, { - "uuid": 5401, - "name": "不灭战魂", - "path": "hk3", + "uuid": 5002, + "name": "刀刀暴击", + "path": "hk2", "fac": "HERO", "lv": 1, "type": "Melee", "stats": { "kind": "role_base", - "role": "Tank", - "hp_delta": 1200, - "ap_delta": 94, + "role": "Warrior", + "hp_delta": 0, + "ap_delta": 15, "def_delta": 0 }, "skills": [ @@ -1669,125 +173,64 @@ "lv": 1, "cd": "Slow", "ccd": 0 - } - ], - "info": "", - "card_lv": 5, - "grow_type": "Tank", - "role": "Tank", - "atked": [ + }, { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 5, - "s_lv": 1, - "overrides": { - "TGroup": "Self", - "ap": 2 - } - }, + "uuid": 6103, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：光闪，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 150 + }, + "lv_entries": [ { "lv": 3, - "t_num": 5, - "s_lv": 2, "overrides": { - "TGroup": "Self", - "ap": 3 - } + "ap": 150, + "timed_buff_id": 7007 + }, + "s_lv": 2 }, { "lv": 5, - "t_num": 4, - "s_lv": 3, "overrides": { - "TGroup": "Self", - "ap": 4 - } + "ap": 180, + "hit_count": 8, + "num": 1 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 360, + "bck": 50 + }, + "s_lv": 4 } ] } ], - "revive": [ - { - "lv": 1, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.5 - }, - { - "lv": 3, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.6 - }, - { - "lv": 5, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.7 - } - ], - "comment": [ - " // 5401 不灭战魂 — atked 攻击 + revive（双技能）" - ] - }, - { - "uuid": 5402, - "name": "战歌游侠", - "path": "ha3", - "fac": "HERO", - "lv": 1, - "type": "Mid", - "stats": { - "kind": "role_base", - "role": "Archer", - "hp_delta": 577, - "ap_delta": 128, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6006, - "lv": 1, - "cd": "Fast", - "ccd": 0 - } - ], "info": "", "card_lv": 5, - "grow_type": "Archer", - "role": "Archer", + "grow_type": "Warrior", + "role": "Warrior", + "trig_order": [ + "atking" + ], "atking": [ { - "s_uuid": 6401, + "s_uuid": 6004, "entries": [ { - "lv": 1, - "t_num": 5, + "lv": 2, + "t_num": 3, "s_lv": 1, "overrides": { - "TGroup": "Self", - "ap": 2 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Self", - "ap": 3 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Self", - "ap": 4 + "crt": 30 } } ] @@ -1795,40 +238,37 @@ ], "field": [ { - "lv": 1, + "lv": 9, "uuids": [ { - "uuid": 7006, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ + "uuid": 7004, + "value": 0.12 + }, { - "uuid": 7006, + "uuid": 7005, "value": 0.2 } ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7006, - "value": 0.3 - } - ] } ], + "infos": [ + "解锁攻击：造成攻击力100%的伤害", + "解锁光闪：对周围敌人造成攻击力150%的伤害", + "致命节奏：普攻每3次暴击强化（暴击+30）", + "刃之血：光闪附加出血", + "分身斩：光闪伤害180%，8命中并双发", + "—", + "剑刃风暴：光闪伤害360%并击退全体敌人50", + "—", + "剑圣之意：全队暴击光环+12%、暴伤光环+20%" + ], "comment": [ - " // 5402 战歌游侠 — atking 攻击 + field 攻速光环（双技能）" + " // 5002 刀刀暴击 — atking 暴击 + 大招 6103 光闪（出血/多段）+ 暴击/暴伤双光环（剑圣复刻）" ] }, { - "uuid": 5403, - "name": "凤凰祭司", + "uuid": 5003, + "name": "格挡反杀", "path": "hk4", "fac": "HERO", "lv": 1, @@ -1836,8 +276,652 @@ "stats": { "kind": "role_base", "role": "Warrior", - "hp_delta": 1220, - "ap_delta": 92, + "hp_delta": 10, + "ap_delta": 5, + "def_delta": 5 + }, + "skills": [ + { + "uuid": 6004, + "lv": 1, + "cd": "Slow", + "ccd": 0 + }, + { + "uuid": 6106, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：闪电斩，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 150, + "para": 40 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "ap": 150, + "timed_buff_id": 7006, + "para": 40 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "ap": 180, + "timed_buff_id": 7006, + "buff_value": -15, + "para": 50 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 200, + "hit_count": 6, + "bck": 40, + "para": 60 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 4, + "grow_type": "Warrior", + "role": "Warrior", + "trig_order": [ + "atked", + "fstart" + ], + "atked": [ + { + "s_uuid": 6301, + "entries": [ + { + "lv": 5, + "t_num": 4, + "s_lv": 1, + "overrides": { + "TGroup": "Self", + "ap": 2 + } + } + ] + } + ], + "fstart": [ + { + "s_uuid": 6101, + "entries": [ + { + "lv": 2, + "t_num": 1, + "s_lv": 1, + "overrides": { + "ap": 500 + } + } + ] + } + ], + "field": [ + { + "lv": 9, + "uuids": [ + { + "uuid": 7018, + "value": 1 + } + ] + } + ], + "infos": [ + "解锁攻击：造成攻击力100%的伤害", + "解锁闪电斩：对周围敌人造成攻击力150%的伤害，40%概率麻痹", + "三十六烦恼凤：入场释放高伤剑气（攻击力500%）", + "闪电斩强化：命中降低敌方攻击", + "罗生门：受击每4次获得2层护盾，闪电斩伤害180%且减攻强化（50%概率麻痹）", + "—", + "炼狱鬼斩：闪电斩伤害200%，6命中并击退40（60%概率麻痹）", + "—", + "攻击强化：攻击触发技能次数+1" + ], + "comment": [ + " // 5003 格挡反杀 — fstart 剑气 + atked 护盾 + 大招 6106 闪电斩（减攻）（剑豪复刻）" + ] + }, + { + "uuid": 5004, + "name": "冻住不谢", + "path": "hm2", + "fac": "HERO", + "lv": 1, + "type": "Long", + "stats": { + "kind": "role_base", + "role": "Mage", + "hp_delta": 0, + "ap_delta": 5, + "def_delta": 5 + }, + "skills": [ + { + "uuid": 6009, + "lv": 1, + "cd": "Slow", + "ccd": 0 + }, + { + "uuid": 6107, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：万剑朝宗，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 150 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "ap": 150, + "frz": 15 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "ap": 180, + "frz": 30, + "hit_count": 8 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 200, + "timed_buff_id": 7003 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 4, + "grow_type": "Mage", + "role": "Mage", + "trig_order": [ + "atking" + ], + "atking": [ + { + "s_uuid": 6009, + "entries": [ + { + "lv": 2, + "t_num": 3, + "s_lv": 1, + "overrides": { + "timed_buff_id": 7003 + } + } + ] + } + ], + "field": [ + { + "lv": 9, + "uuids": [ + { + "uuid": 7003, + "value": 0.1 + } + ] + } + ], + "infos": [ + "解锁蓝魔球：造成攻击力100%的伤害", + "解锁万剑朝宗：6段冰剑伤害150%", + "霜寒之触：普攻每3次附加冰冻（≈33%概率）", + "霜冻连锁：万剑朝宗15%概率冰冻", + "连环霜冻：万剑朝宗冰冻30%，8命中且伤害180%", + "—", + "绝对零度：万剑朝宗伤害200%且命中必冰冻", + "—", + "冰霜领域：全队击晕光环+10%" + ], + "comment": [ + " // 5004 冻住不谢 — atking 冰冻 + 大招 6107 万剑朝宗（冰冻链）+ 击晕光环（巫妖王复刻）" + ] + }, + { + "uuid": 5005, + "name": "叠甲骑士", + "path": "hk1", + "fac": "HERO", + "lv": 1, + "type": "Melee", + "stats": { + "kind": "role_base", + "role": "Tank", + "hp_delta": 20, + "ap_delta": 0, + "def_delta": 10 + }, + "skills": [ + { + "uuid": 6004, + "lv": 1, + "cd": "Slow", + "ccd": 0 + }, + { + "uuid": 6301, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招位辅助技能：护盾，按英雄等级分档成长（护盾层数）" + ], + "overrides": { + "TGroup": "Self", + "ap": 3 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "TGroup": "Self", + "ap": 5 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "TGroup": "Self", + "ap": 6 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "TGroup": "Self", + "ap": 8 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 5, + "grow_type": "Tank", + "role": "Tank", + "trig_order": [ + "atked", + "fstart", + "dead" + ], + "atked": [ + { + "s_uuid": 6004, + "entries": [ + { + "lv": 5, + "t_num": 4, + "s_lv": 1, + "overrides": { + "timed_buff_id": 7006 + } + } + ] + } + ], + "fstart": [ + { + "s_uuid": 6412, + "entries": [ + { + "lv": 2, + "t_num": 1, + "s_lv": 1, + "overrides": { + "TGroup": "Team", + "ap": 50 + } + } + ] + } + ], + "dead": [ + { + "s_uuid": 6302, + "entries": [ + { + "lv": 7, + "t_num": 1, + "s_lv": 1, + "overrides": { + "TGroup": "Ally", + "ap": 200 + } + } + ] + } + ], + "field": [ + { + "lv": 9, + "uuids": [ + { + "uuid": 7007, + "value": 0.15 + }, + { + "uuid": 7019, + "value": 1 + } + ] + } + ], + "block_comments": { + "revive": [ + " // 回光返照：濒死回血（6501.ap=50 即恢复50%生命，upr 为每级追加次数，非血量百分比）" + ] + }, + "revive": [ + { + "lv": 7, + "s_uuid": 6501, + "r_num": 1, + "upr": 0 + } + ], + "infos": [ + "解锁攻击与护盾：自身获得3层抵挡护盾", + "铁壁壁垒：入场全队防御+50", + "护盾强化：护盾层数提升至5", + "—", + "反击减攻：受击每4次附加减攻，护盾层数6", + "—", + "死亡缠绕+回光返照：死亡治疗最低血友军，濒死回血续命；护盾层数8", + "—", + "不朽甲胄：全队生命光环+15%、受击触发次数+1" + ], + "comment": [ + " // 5005 叠甲骑士 — 护盾大招 + fstart 防御 + dead 治疗 + revive 回光返照（黑暗骑士复刻）" + ] + }, + { + "uuid": 5006, + "name": "光明奶爸", + "path": "hh1", + "fac": "HERO", + "lv": 1, + "type": "Long", + "stats": { + "kind": "role_base", + "role": "Support", + "hp_delta": 15, + "ap_delta": 0, + "def_delta": 10 + }, + "skills": [ + { + "uuid": 6012, + "lv": 1, + "cd": "Normal", + "ccd": 0 + }, + { + "uuid": 6302, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：治疗，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "TGroup": "Team", + "ap": 300 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "TGroup": "Team", + "ap": 400 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "TGroup": "Team", + "ap": 450 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "TGroup": "Team", + "ap": 450, + "timed_buff_id": 7010 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 4, + "grow_type": "Support", + "role": "Support", + "trig_order": [ + "atking", + "fstart" + ], + "atking": [ + { + "s_uuid": 6302, + "entries": [ + { + "lv": 5, + "t_num": 3, + "s_lv": 1, + "overrides": { + "TGroup": "Self", + "ap": 100 + } + } + ] + } + ], + "fstart": [ + { + "s_uuid": 6412, + "entries": [ + { + "lv": 2, + "t_num": 1, + "s_lv": 1, + "overrides": { + "TGroup": "Team", + "ap": 30 + } + } + ] + } + ], + "field": [ + { + "lv": 9, + "uuids": [ + { + "uuid": 7007, + "value": 0.15 + } + ] + } + ], + "infos": [ + "解锁红药瓶：造成攻击力100%的伤害", + "解锁治疗：恢复全队生命（攻击力300%）", + "圣光庇佑：入场全队防御+30", + "治疗强化：治疗量提升至400%", + "圣洁之锤：攻击每3次自疗（攻击力100%），治疗量450%", + "—", + "生命灌注：治疗附带再生（持续回血）", + "—", + "光明领域：全队生命光环+15%" + ], + "comment": [ + " // 5006 光明奶爸 — 治疗大招 + atking 自疗 + fstart 防御 + 生命光环（光明骑士复刻）" + ] + }, + { + "uuid": 5007, + "name": "微醺战神", + "path": "hk3", + "fac": "HERO", + "lv": 1, + "type": "Melee", + "stats": { + "kind": "role_base", + "role": "Tank", + "hp_delta": 15, + "ap_delta": 5, + "def_delta": 10 + }, + "skills": [ + { + "uuid": 6004, + "lv": 1, + "cd": "Slow", + "ccd": 0 + }, + { + "uuid": 6104, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：气斩，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 150 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "ap": 150, + "timed_buff_id": 7002 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "ap": 180, + "bck": 60, + "timed_buff_id": 7002, + "buff_value": 20 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 220, + "bck": 80 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 3, + "grow_type": "Tank", + "role": "Tank", + "trig_order": [ + "atking" + ], + "atking": [ + { + "s_uuid": 6004, + "entries": [ + { + "lv": 2, + "t_num": 3, + "s_lv": 1, + "overrides": { + "bck": 40 + } + } + ] + } + ], + "block_comments": { + "ap_bonus": [ + " // card_lv 3：lv9 无光环，改为基础属性+50%" + ] + }, + "ap_bonus": [ + { + "lv": 9, + "value": 0.5 + } + ], + "hp_bonus": [ + { + "lv": 9, + "value": 0.5 + } + ], + "infos": [ + "解锁攻击：造成攻击力100%的伤害", + "解锁气斩：对周围敌人造成攻击力150%的伤害", + "雷霆一击：普攻每3次附加击退40", + "醉拳浸染：气斩附加易伤", + "酒劲上头：气斩伤害180%，击退60且易伤强化", + "—", + "醉里乾坤：气斩伤害220%，击退80", + "—", + "千杯不醉：基础攻击与生命+50%" + ], + "comment": [ + " // 5007 微醺战神 — atking 击退 + 大招 6104 气斩（易伤），lv9 属性补偿（酒仙复刻）" + ] + }, + { + "uuid": 5008, + "name": "眩晕暴击哥", + "path": "hk5", + "fac": "HERO", + "lv": 1, + "type": "Melee", + "stats": { + "kind": "role_base", + "role": "Warrior", + "hp_delta": 5, + "ap_delta": 20, "def_delta": 0 }, "skills": [ @@ -1846,277 +930,64 @@ "lv": 1, "cd": "Slow", "ccd": 0 + }, + { + "uuid": 6108, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：开山斧，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 300 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "ap": 300, + "stun": 20 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "ap": 350, + "stun": 35, + "hit_count": 8 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 400, + "timed_buff_id": 7004 + }, + "s_lv": 4 + } + ] } ], "info": "", "card_lv": 5, "grow_type": "Warrior", "role": "Warrior", - "dead": [ - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 8 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 12 - } - } - ] - }, - { - "s_uuid": 6301, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 6 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 7 - } - } - ] - } + "trig_order": [ + "atking" ], - "revive": [ - { - "lv": 1, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.5 - }, - { - "lv": 3, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.6 - }, - { - "lv": 5, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.7 - } - ], - "comment": [ - " // 5403 凤凰祭司 — dead 攻击+护盾 + revive（双技能）" - ] - }, - { - "uuid": 5404, - "name": "涅槃贤者", - "path": "hm3", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Mage", - "hp_delta": 577, - "ap_delta": 128, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6014, - "lv": 1, - "cd": "Slow", - "ccd": 0, - "overrides": { - "ap": 80, - "timed_buff_id": 7004 - } - } - ], - "info": "", - "card_lv": 5, - "grow_type": "Mage", - "role": "Mage", - "fstart": [ - { - "s_uuid": 6301, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 6 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 7 - } - } - ] - }, - { - "s_uuid": 6401, - "entries": [ - { - "lv": 1, - "t_num": 1, - "s_lv": 1, - "overrides": { - "TGroup": "Team", - "ap": 5 - } - }, - { - "lv": 3, - "t_num": 1, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 8 - } - }, - { - "lv": 5, - "t_num": 1, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 12 - } - } - ] - } - ], - "revive": [ - { - "lv": 1, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.5 - }, - { - "lv": 3, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.6 - }, - { - "lv": 5, - "s_uuid": 6501, - "r_num": 1, - "upr": 0.7 - } - ], - "comment": [ - " // 5404 涅槃贤者 — fstart 护盾+攻击 + revive（双技能）" - ] - }, - { - "uuid": 5405, - "name": "圣言诗人", - "path": "hh1", - "fac": "HERO", - "lv": 1, - "type": "Long", - "stats": { - "kind": "role_base", - "role": "Support", - "hp_delta": 577, - "ap_delta": 128, - "def_delta": 0 - }, - "skills": [ - { - "uuid": 6011, - "lv": 1, - "cd": "Normal", - "ccd": 0 - } - ], - "info": "", - "card_lv": 5, - "grow_type": "Support", - "role": "Support", "atking": [ { - "s_uuid": 6302, + "s_uuid": 6004, "entries": [ { - "lv": 1, - "t_num": 5, + "lv": 2, + "t_num": 3, "s_lv": 1, "overrides": { - "TGroup": "Team", - "ap": 200 - } - }, - { - "lv": 3, - "t_num": 5, - "s_lv": 2, - "overrides": { - "TGroup": "Team", - "ap": 250 - } - }, - { - "lv": 5, - "t_num": 4, - "s_lv": 3, - "overrides": { - "TGroup": "Team", - "ap": 300 + "crt": 25 } } ] @@ -2124,35 +995,162 @@ ], "field": [ { - "lv": 1, + "lv": 9, "uuids": [ { - "uuid": 7007, - "value": 0.1 - } - ] - }, - { - "lv": 3, - "uuids": [ - { - "uuid": 7007, - "value": 0.2 - } - ] - }, - { - "lv": 5, - "uuids": [ - { - "uuid": 7007, - "value": 0.3 + "uuid": 7005, + "value": 0.25 } ] } ], + "infos": [ + "解锁攻击：造成攻击力100%的伤害", + "解锁开山斧：劈向前方敌人造成攻击力300%的伤害", + "火眼金睛：普攻每3次暴击强化（暴击+25）", + "金箍棒影：开山斧20%概率击晕", + "大圣之怒：开山斧击晕35%，8命中且伤害350%", + "—", + "定海神针：开山斧伤害400%且命中必击晕", + "—", + "斗战胜意：全队暴伤光环+25%" + ], "comment": [ - " // 5405 圣言诗人 — atking 治疗 + field 生命光环（双技能）" + " // 5008 眩晕暴击哥 — atking 暴击 + 大招 6108 开山斧（击晕）+ 暴伤光环（齐天大圣复刻）" + ] + }, + { + "uuid": 5009, + "name": "铁壳斧弟", + "path": "hc1", + "fac": "HERO", + "lv": 1, + "type": "Melee", + "stats": { + "kind": "role_base", + "role": "Tank", + "hp_delta": 10, + "ap_delta": 5, + "def_delta": 15 + }, + "skills": [ + { + "uuid": 6004, + "lv": 1, + "cd": "Slow", + "ccd": 0 + }, + { + "uuid": 6104, + "lv": 1, + "cd": 8, + "ccd": 0, + "comment": [ + " // 大招：气斩，独立 cd，按英雄等级分档成长" + ], + "overrides": { + "ap": 150 + }, + "lv_entries": [ + { + "lv": 3, + "overrides": { + "ap": 180 + }, + "s_lv": 2 + }, + { + "lv": 5, + "overrides": { + "ap": 200 + }, + "s_lv": 3 + }, + { + "lv": 7, + "overrides": { + "ap": 220, + "bck": 40 + }, + "s_lv": 4 + } + ] + } + ], + "info": "", + "card_lv": 3, + "grow_type": "Tank", + "role": "Tank", + "trig_order": [ + "atking", + "atked" + ], + "atking": [ + { + "s_uuid": 6302, + "entries": [ + { + "lv": 5, + "t_num": 4, + "s_lv": 1, + "overrides": { + "TGroup": "Self", + "ap": 120 + } + } + ] + } + ], + "atked": [ + { + "s_uuid": 6513, + "entries": [ + { + "lv": 2, + "t_num": 2, + "s_lv": 1, + "overrides": { + "TGroup": "Self", + "timed_buff_id": 7023, + "buff_duration": 10 + } + } + ], + "comment": [ + " // 坚硬皮肤：借 6513 防御爆发底座注入 7023 防御强化（+50%，可无限叠层）" + ] + } + ], + "block_comments": { + "ap_bonus": [ + " // card_lv 3：lv9 无光环，改为基础属性+50%" + ] + }, + "ap_bonus": [ + { + "lv": 9, + "value": 0.5 + } + ], + "hp_bonus": [ + { + "lv": 9, + "value": 0.5 + } + ], + "infos": [ + "解锁攻击：造成攻击力100%的伤害", + "解锁气斩：对周围敌人造成攻击力150%的伤害", + "坚硬皮肤：受击每2次叠加防御强化（持续10秒，可叠层）", + "气斩强化：伤害180%", + "嗜血战斧：攻击每4次自疗（攻击力120%），气斩伤害200%", + "—", + "奋力一掷：气斩伤害220%并击退40", + "—", + "铁壳觉醒：基础攻击与生命+50%" + ], + "comment": [ + " // 5009 铁壳斧弟 — atked 叠防 + atking 自疗 + 大招 6104 气斩，lv9 属性补偿（斧小王复刻）" ] } ], diff --git a/assets/script/game/hero/MoveComp.ts b/assets/script/game/hero/MoveComp.ts index 81ef2418..053e6cc2 100644 --- a/assets/script/game/hero/MoveComp.ts +++ b/assets/script/game/hero/MoveComp.ts @@ -3,7 +3,8 @@ * @description 统一移动组件与系统（英雄 + 怪物） * * 核心规则： - * 1. 准备阶段：双方原地待命，不推进不索敌。 + * 1. 准备阶段：不推进不索敌；英雄按职业优先级（坦克→战士→刺客→射手→法师→辅助） + * 从最右迎敌位向左排队移动，防止同类型落点重叠；怪物原地待命。 * 2. 战斗阶段：双方向最近敌人推进，进入攻击范围（model.dis）后停止移动并攻击。 * 3. 场上无敌人：停止移动（战斗结束，由 MissionComp 进入结算）。 * 4. 击退/位移不会把单位推出屏幕：HERO 不越过 BoxSet.LETF_END，MON 不越过 BoxSet.RIGHT_END。 @@ -14,6 +15,7 @@ import { HeroViewComp } from "./HeroViewComp"; import { HeroAttrsComp } from "./HeroAttrsComp"; import { smc } from "../common/SingletonModuleComp"; import { BoxSet, FacSet } from "../common/config/GameSet"; +import { HRole } from "../common/config/heroSet"; import { Node } from "cc"; @ecs.register('MoveComp') @@ -50,6 +52,18 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate private readonly renderEntries: { node: Node; bossPriority: number; frontScore: number; spawnOrder: number; eid: number; laneScore: number }[] = []; private renderEntryCount = 0; + // ======================== 英雄编队排队 ======================== + + /** 编队锚点：最右迎敌位（与 MissionHeroComp.HERO_ROW_FRONT 的 x 对齐，避免循环依赖在此独立定义） */ + private static readonly QUEUE_ANCHOR_X = -200; + /** 编队槽位默认间隔（像素）；人数超出边界宽度时自动压缩间距 */ + private static readonly QUEUE_SPACING = 30; + /** 编队槽位重算节流间隔（秒）：召唤/死亡后最多延迟一次重算 */ + private readonly queueRebuildInterval = 0.1; + private lastQueueRebuildAt = 0; + /** 编队槽位缓存：按职业优先级排序后各英雄的目标 X */ + private readonly queueSlots: { eid: number; targetX: number }[] = []; + private getHeroViewMatcher(): ecs.IMatcher { if (!this.heroViewMatcher) { this.heroViewMatcher = ecs.allOf(HeroAttrsComp, HeroViewComp); @@ -104,11 +118,15 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate } } - /** 准备阶段：双方原地待命，不推进不索敌 */ + /** 准备阶段：不推进不索敌；英雄向编队槽位排队移动，怪物原地待命 */ if (!smc.mission.in_fight) { this.clearCombatTarget(model); model.is_atking = false; - if (view.status !== "atk") view.status_change("idle"); + if (model.fac === FacSet.HERO) { + this.processHeroQueue(e, model, move, view); + } else if (view.status !== "atk") { + view.status_change("idle"); + } return; } @@ -133,6 +151,90 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate model.enemy_in_cast_range = false; } + // ======================== 英雄编队排队（准备阶段） ======================== + + /** + * 英雄编队排队： + * 按 坦克→战士→刺客→射手→法师→辅助 的职业优先级（即 HRole 枚举值升序）， + * 从最右迎敌位（QUEUE_ANCHOR_X）向左依次排开，防止同类型英雄落点重叠。 + * + * @param entity 当前英雄实体 + * @param model 英雄属性（取 speed / role） + * @param move 移动组件（维护 direction） + * @param view 视图组件（驱动位移与动画状态） + */ + private processHeroQueue(entity: ecs.Entity, model: HeroAttrsComp, move: MoveComp, view: HeroViewComp): void { + const targetX = this.resolveHeroQueueTargetX(entity); + const selfX = view.node.position.x; + + /** 无槽位（未登记）或已到位：贴齐槽位并原地待命，恢复朝右迎敌 */ + if (targetX === null || Math.abs(targetX - selfX) <= 2) { + if (targetX !== null && Math.abs(selfX - targetX) > 0.01) { + view.node.setPosition(targetX, view.node.position.y, 0); + } + view.scale = 1; + if (view.status !== "atk") view.status_change("idle"); + return; + } + + /** 未到位：向槽位推进（与战斗推进同速），朝移动方向转身 */ + const dir = targetX > selfX ? 1 : -1; + move.direction = dir; + view.scale = dir; + const delta = (model.speed / 3) * this.dt * dir; + const newX = this.clampByFacBoundary(selfX + delta, model.fac); + if (Math.abs(newX - selfX) >= 0.01) { + view.node.setPosition(newX, view.node.position.y, 0); + view.status_change("move"); + } + } + + /** 查询当前英雄的编队槽位目标 X（无槽位返回 null） */ + private resolveHeroQueueTargetX(entity: ecs.Entity): number | null { + const now = Date.now() / 1000; + if (now - this.lastQueueRebuildAt >= this.queueRebuildInterval) { + this.lastQueueRebuildAt = now; + this.rebuildHeroQueueSlots(); + } + for (const slot of this.queueSlots) { + if (slot.eid === entity.eid) return slot.targetX; + } + return null; + } + + /** + * 重算编队槽位： + * 收集全部存活英雄，按 职业优先级 → 出生序 → eid 稳定排序后， + * 从 QUEUE_ANCHOR_X 向左按间隔分配；人数过多时压缩间距，保证不越过 LETF_END。 + */ + private rebuildHeroQueueSlots(): void { + const heroes: { eid: number; role: number; spawnOrder: number }[] = []; + ecs.query(this.getHeroViewMatcher()).forEach(e => { + const m = e.get(HeroAttrsComp); + if (!m || m.fac !== FacSet.HERO || m.is_dead) return; + const v = e.get(HeroViewComp); + if (!v?.node) return; + const move = e.get(MoveComp); + heroes.push({ eid: e.eid, role: m.role ?? HRole.Support, spawnOrder: move?.spawnOrder ?? 0 }); + }); + heroes.sort((a, b) => + (a.role - b.role) || + (a.spawnOrder - b.spawnOrder) || + (a.eid - b.eid) + ); + + const count = heroes.length; + const maxWidth = MoveSystem.QUEUE_ANCHOR_X - BoxSet.LETF_END; + const spacing = count > 1 + ? Math.min(MoveSystem.QUEUE_SPACING, maxWidth / (count - 1)) + : 0; + + this.queueSlots.length = 0; + for (let i = 0; i < count; i++) { + this.queueSlots.push({ eid: heroes[i].eid, targetX: MoveSystem.QUEUE_ANCHOR_X - i * spacing }); + } + } + private syncCombatTarget(model: HeroAttrsComp, selfView: HeroViewComp, enemyView: HeroViewComp): void { if (!enemyView || !enemyView.node || !enemyView.ent) { this.clearCombatTarget(model); diff --git a/assets/script/game/hero/SCastSystem.ts b/assets/script/game/hero/SCastSystem.ts index 5bcd1330..8324ced9 100644 --- a/assets/script/game/hero/SCastSystem.ts +++ b/assets/script/game/hero/SCastSystem.ts @@ -769,11 +769,9 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate } return null; } else { - // 怪物打英雄，英雄网格: - // 列1: 0,1,2 (X=-210) - // 列2: 3,4,5 (X=-300) - // 英雄只有2列，第2列中路是 index 4 - return MissionHeroComp.HERO_POSITIONS[4].clone(); + // 怪物打英雄：以英雄编队中排基准点为 AOE 目标 + // （英雄已改为按职业优先级从最右向左排队，中排 -260 即队伍中部） + return MissionHeroComp.HERO_ROW_MID.clone(); } } diff --git a/assets/script/game/map/CHeroComp.ts b/assets/script/game/map/CHeroComp.ts index 278713fd..9816e8fd 100644 --- a/assets/script/game/map/CHeroComp.ts +++ b/assets/script/game/map/CHeroComp.ts @@ -6,7 +6,7 @@ * 1. 渲染单个英雄卡的显示信息（名称、等级、描述、图标、费用）， * 展示方式与 SCardComp 一致（图集静态图标 + ★等级 + 描述词条）。 * 同时支持动态升级卡（SpecialUpgrade + target_hero_eid）按英雄卡样式渲染。 - * 2. 处理购买点击 → UseHeroCard 上限校验(guard) → 扣费 → 派发 CallHero 召唤英雄。 + * 2. 处理卡牌点击（点击卡牌任意区域即选取） → UseHeroCard 上限校验(guard) → 派发 CallHero 召唤英雄。 * 特殊卡（升级/刷新）则派发 UseSpecialCard。 * 3. 使用成功后派发 CardUsed 事件，通知 MissionCardComp 刷新英雄卡池。 * @@ -33,7 +33,7 @@ const { ccclass, property } = _decorator; * CHeroComp —— 英雄卡池单个英雄卡项 * * 由 MissionCardComp.cacheCardComps() 实例化。 - * 以图标 + 名称 + 描述词条 + 购买按钮的形式呈现。 + * 以图标 + 名称 + 描述词条 + 费用角标的形式呈现，点击卡牌任意区域即选取。 */ @ccclass('CHeroComp') @ecs.register('CHeroComp', false) @@ -72,7 +72,7 @@ export class CHeroComp extends CCComp { @property(Label) private level_label: Label = null; - /** 购买按钮节点 */ + /** 费用显示节点（原购买按钮，现仅展示费用，不再承担点击） */ @property({ type: Node }) private buy_node: Node = null; @@ -118,9 +118,10 @@ export class CHeroComp extends CCComp { fied3: !!this.fied3, buy_node: !!this.buy_node }); - this.buy_node?.on(NodeEventType.TOUCH_START, this.onBuyTouchStart, this); - this.buy_node?.on(NodeEventType.TOUCH_END, this.onBuyClick, this); - this.buy_node?.on(NodeEventType.TOUCH_CANCEL, this.onBuyTouchCancel, this); + // 点击整张卡牌选取英雄：监听挂载在卡牌根节点，命中区域由根节点 UITransformer 决定 + this.node.on(NodeEventType.TOUCH_START, this.onCardTouchStart, this); + this.node.on(NodeEventType.TOUCH_END, this.onCardClick, this); + this.node.on(NodeEventType.TOUCH_CANCEL, this.onCardTouchCancel, this); // 缓存透明度组件（用于淡入淡出动画） this.opacityComp = this.node.getComponent(UIOpacity) || this.node.addComponent(UIOpacity); @@ -134,10 +135,10 @@ export class CHeroComp extends CCComp { onDestroy() { super.onDestroy(); - if (this.buy_node && this.buy_node.isValid) { - this.buy_node.off(NodeEventType.TOUCH_START, this.onBuyTouchStart, this); - this.buy_node.off(NodeEventType.TOUCH_END, this.onBuyClick, this); - this.buy_node.off(NodeEventType.TOUCH_CANCEL, this.onBuyTouchCancel, this); + if (this.node && this.node.isValid) { + this.node.off(NodeEventType.TOUCH_START, this.onCardTouchStart, this); + this.node.off(NodeEventType.TOUCH_END, this.onCardClick, this); + this.node.off(NodeEventType.TOUCH_CANCEL, this.onCardTouchCancel, this); } } @@ -303,7 +304,7 @@ export class CHeroComp extends CCComp { this.updateHeroAnimation(this.icon_node, renderUuid, this.iconVisualToken); } - // 购买按钮费用显示 + // 费用显示（原购买按钮节点，现仅作费用角标） if (this.buy_node) { this.buy_node.active = true; const costLabel = this.cost_label @@ -372,7 +373,7 @@ export class CHeroComp extends CCComp { /** * 播放购买动画：卡牌放大（scale 1→1.1）+ 淡出，结束后隐藏节点。 - * 动画结束由 onBuyClick 的后续逻辑（CardUsed 刷新卡池）接管。 + * 动画结束由 onCardClick 的后续逻辑（CardUsed 刷新卡池）接管。 */ private playPurchaseAnim() { Tween.stopAllByTarget(this.node); @@ -413,44 +414,44 @@ export class CHeroComp extends CCComp { } } - // ======================== 按钮动画 ======================== + // ======================== 点击反馈动画 ======================== - /** 按钮正常缩放 */ - private readonly btnNormalScale: number = 1; - /** 按钮按下缩放 */ - private readonly btnPressScale: number = 0.92; - /** 按钮点击回弹峰值缩放 */ - private readonly btnClickScale: number = 1.08; + /** 卡牌正常缩放 */ + private readonly cardNormalScale: number = 1; + /** 卡牌按下缩放 */ + private readonly cardPressScale: number = 0.92; + /** 卡牌点击回弹峰值缩放 */ + private readonly cardClickScale: number = 1.08; - /** 购买按钮按下：缩小反馈 */ - private onBuyTouchStart() { - this.playBtnScaleTo(this.btnPressScale, 0.06); + /** 卡牌按下：缩小反馈 */ + private onCardTouchStart() { + this.playCardScaleTo(this.cardPressScale, 0.06); } - /** 购买按钮取消：恢复缩放 */ - private onBuyTouchCancel() { - this.playBtnScaleTo(this.btnNormalScale, 0.08); + /** 卡牌取消（滑出卡牌区域）：恢复缩放 */ + private onCardTouchCancel() { + this.playCardScaleTo(this.cardNormalScale, 0.08); } - /** 按钮缩放动画（通用） */ - private playBtnScaleTo(scale: number, duration: number) { - if (!this.buy_node || !this.buy_node.isValid) return; - Tween.stopAllByTarget(this.buy_node); - tween(this.buy_node) + /** 卡牌缩放动画（通用） */ + private playCardScaleTo(scale: number, duration: number) { + if (!this.node || !this.node.isValid) return; + Tween.stopAllByTarget(this.node); + tween(this.node) .to(duration, { scale: new Vec3(scale, scale, 1) }) .start(); } - /** 按钮点击回弹动画：先弹到峰值再回到正常 */ - private playBtnClickAnim(onComplete?: () => void) { - if (!this.buy_node || !this.buy_node.isValid) { + /** 卡牌点击回弹动画：先弹到峰值再回到正常 */ + private playCardClickAnim(onComplete?: () => void) { + if (!this.node || !this.node.isValid) { onComplete?.(); return; } - Tween.stopAllByTarget(this.buy_node); - tween(this.buy_node) - .to(0.05, { scale: new Vec3(this.btnClickScale, this.btnClickScale, 1) }) - .to(0.08, { scale: new Vec3(this.btnNormalScale, this.btnNormalScale, 1) }) + Tween.stopAllByTarget(this.node); + tween(this.node) + .to(0.05, { scale: new Vec3(this.cardClickScale, this.cardClickScale, 1) }) + .to(0.08, { scale: new Vec3(this.cardNormalScale, this.cardNormalScale, 1) }) .call(() => onComplete?.()) .start(); } @@ -561,20 +562,20 @@ export class CHeroComp extends CCComp { // ======================== 购买逻辑 ======================== /** - * 购买点击处理： - * 1. 播放按钮点击回弹动画。 + * 卡牌点击处理（点击卡牌任意区域即选取）： + * 1. 播放卡牌点击回弹动画。 * 2. 英雄卡先通过 UseHeroCard 事件做数量上限校验（guard 模式，可被取消）。 * 3. 按卡牌类型分发效果：英雄卡 → CallHero 召唤英雄；特殊卡 → UseSpecialCard。 * 4. 派发 CardUsed 通知 MissionCardComp 刷新英雄卡池。 - * 5. 标记已购买，隐藏购买按钮。 + * 5. 标记已购买，隐藏费用角标。 * * 注：购买不花费金币（免费获取），原扣费逻辑已移除。 */ - private onBuyClick() { + private onCardClick() { if (!this.cardData || this.isPurchased) return; - // 播放按钮点击回弹动画（视觉反馈，不阻塞后续逻辑） - this.playBtnClickAnim(); + // 播放卡牌点击回弹动画（视觉反馈，不阻塞后续逻辑） + this.playCardClickAnim(); oops.audio.playEffect("music/button"); diff --git a/assets/script/game/map/MissionHeroComp.ts b/assets/script/game/map/MissionHeroComp.ts index b06937d6..5a5dcec2 100644 --- a/assets/script/game/map/MissionHeroComp.ts +++ b/assets/script/game/map/MissionHeroComp.ts @@ -17,10 +17,11 @@ * revive 系技能为"濒死回血"（血量归零时消耗次数回血续命），不触发真死。 * * 出生点规则： - * 按攻击类型（HType）分三排：近战 → 前排（x=-200，最靠右迎敌）， + * 按攻击类型（HType）落排：近战 → 前排（x=-200，最靠右迎敌）， * 中距 → 中排（x=-260），远程 → 后排（x=-320，最靠左）。 - * 同一类型重复召唤时，从该类型基准点向两侧 ±SLOT_OFFSET 依次交替展开，避免落点重叠。 - * posIndex 取 heroGrid 全局空闲下标（0~9）用于网格登记/索敌，落点偏移与 posIndex、职业均解耦。 + * 同类型落点不再做 ± 偏移展开，落点重叠由 MoveSystem 的编队排队解决 + * （准备阶段按职业优先级 坦克→战士→刺客→射手→法师→辅助 从最右向左排开）。 + * posIndex 取 heroGrid 全局空闲下标（0~9）用于网格登记/索敌，与落点解耦。 * * 依赖： * - Hero（hero/Hero.ts）—— 英雄 ECS 实体类 @@ -39,7 +40,7 @@ import { HeroInfo, HType } from "../common/config/heroSet"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; import { FacSet, BoxSet } from "../common/config/GameSet"; -import { HeroViewComp } from "../hero/HeroViewComp"; +import { MoveComp } from "../hero/MoveComp"; const { ccclass } = _decorator; /** @@ -63,19 +64,9 @@ export class MissionHeroComp extends CCComp { public static readonly HERO_ROW_MID = v3(-260, BoxSet.GAME_LINE, 0) public static readonly HERO_ROW_BACK = v3(-320, BoxSet.GAME_LINE, 0) - /** - * 英雄登场占位点（兼容旧引用，等价于后/中/前三排基准点）： - * - index 0=后排、1=中排、2=前排。 - */ - public static readonly HERO_POSITIONS: Vec3[] = [ - MissionHeroComp.HERO_ROW_BACK, - MissionHeroComp.HERO_ROW_MID, - MissionHeroComp.HERO_ROW_FRONT, - ]; - /** * 攻击类型 → 出生排映射： - * 近战 → 前排，中距 → 中排，远程 → 后排。 + * 近战 → 前排，中距 → 中排（优先中间位），远程 → 后排。 */ private static readonly TYPE_ROW: Record = { [HType.Melee]: MissionHeroComp.HERO_ROW_FRONT, @@ -83,9 +74,6 @@ export class MissionHeroComp extends CCComp { [HType.Long]: MissionHeroComp.HERO_ROW_BACK, }; - /** 同类型重复召唤时的落点横向间隔（像素） */ - private static readonly SLOT_OFFSET = 30 - /** 英雄出生时的掉落高度（从空中落到地面的像素差） */ private static readonly HERO_DROP_HEIGHT = 260 @@ -103,6 +91,8 @@ export class MissionHeroComp extends CCComp { is_processing_queue: boolean = false /** 召唤请求队列：保证召唤按顺序串行执行 */ summon_queue: { uuid: number; hero_lv: number; card_lv: number }[] = [] + /** 英雄出生序计数器（编队排队/渲染排序的稳定决胜） */ + private heroSpawnOrder = 0 /** 预留英雄列表 */ heros: any = [] @@ -188,42 +178,26 @@ export class MissionHeroComp extends CCComp { /** * 为英雄分配出生槽位： - * 按攻击类型取三排基准点（近战前排、中距中排、远程后排）， - * 同类型第 1 个落基准点，之后按 ±SLOT_OFFSET 交替展开（0, +30, -30, +60, -60 …）。 + * 按攻击类型取三排基准点（近战前排、中距优先中排、远程后排），同类型不再做横向偏移展开； + * 落点重叠由 MoveSystem 的编队排队（按职业优先级从最右向左排开）负责分开。 * * 槽位编码：posIndex 直接取 heroGrid 的全局空闲下标（0~9），与落点无映射。 - * 落点偏移由「同攻击类型已占位英雄的 x 偏移」推展开序计算，与 posIndex、职业均解耦。 * * @param type 英雄攻击类型（HType，决定所属排） - * @param heroes 当前存活英雄列表（spawnHeroAt 在实体创建前快照，避免复用池残留实体干扰槽位判定） + * @param heroes 当前存活英雄列表（spawnHeroAt 在实体创建前快照，避免复用池残留实体干扰网格判定） * @returns { posIndex heroGrid 空闲下标（-1 表示满员未登记）, landingPos 落地点 } */ private pickSpawnSlotForHero(type: HType, heroes: Hero[]): { posIndex: number; landingPos: Vec3 } { const basePos = MissionHeroComp.TYPE_ROW[type] ?? MissionHeroComp.HERO_ROW_MID; - // 同攻击类型已占位的 x 偏移集合（依据落点 x 反推，与 posIndex 解耦） - const usedOffsets = new Set(); + // 已登记的网格下标集合（仅用于 posIndex 分配） const occupiedGrid = new Set(); for (const h of heroes) { const m = h.get(HeroAttrsComp)!; if (m.posIndex >= 0) occupiedGrid.add(m.posIndex); - if (m.type !== type) continue; - const view = h.get(HeroViewComp); - if (view?.node?.isValid) { - usedOffsets.add(Math.round(view.node.position.x - basePos.x)); - } } - // 展开序 n：0=居中，1=+30，2=-30，3=+60 …，找到第一个未被同类型占用的偏移 - // 上限取 heroGrid 容量，同类型超过该数量时复用基准点（不再向外展开） - let offsetX = 0; - for (let n = 0; n < smc.mission.heroGrid.length; n++) { - const step = Math.ceil(n / 2); - const dir = n % 2 === 1 ? 1 : -1; - const candidate = n === 0 ? 0 : dir * step * MissionHeroComp.SLOT_OFFSET; - if (!usedOffsets.has(candidate)) { offsetX = candidate; break; } - } - const landingPos = v3(basePos.x + offsetX, basePos.y, 0); + const landingPos = v3(basePos.x, basePos.y, 0); // posIndex 取 heroGrid 全局空闲下标，仅用于网格登记/索敌，与落点无映射 let posIndex = -1; @@ -235,8 +209,9 @@ export class MissionHeroComp extends CCComp { /** * 生成一个英雄： - * - 按攻击类型自动分配三排槽位并展开落点。 + * - 按攻击类型落排基准点（近战前排 / 中距中排 / 远程后排），不做横向偏移。 * - 计算出生点（空中）和落点（地面），播放掉落动画。 + * - 落地后由 MoveSystem 按职业优先级从最右向左排队分开。 * * @param uuid 英雄 UUID * @param hero_lv 英雄等级 @@ -259,6 +234,12 @@ export class MissionHeroComp extends CCComp { let spawnPos: Vec3 = v3(landingPos.x, landingPos.y + MissionHeroComp.HERO_DROP_HEIGHT, 0); hero.load(spawnPos, scale, uuid, landingPos.y, hero_lv, card_lv, finalPosIndex); + // 登记出生序，供编队排队/渲染排序做稳定决胜 + const move = hero.get(MoveComp); + if (move) { + move.spawnOrder = ++this.heroSpawnOrder; + } + // 召唤完成后，派发事件以更新英雄面板 const model = hero.get(HeroAttrsComp); if (model) {