diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 4511eb72..85cb607e 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -404,7 +404,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -200, "z": 0 }, "_lrot": { @@ -21904,8 +21904,6 @@ "__id__": 0 }, "fileId": "c4IqMKgXNExa5w4EAciRxE", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index a8d5866e..b9f1424d 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,23 +25,26 @@ "__id__": 12 }, { - "__id__": 316 + "__id__": 62 + }, + { + "__id__": 366 } ], "_active": true, "_components": [ { - "__id__": 366 + "__id__": 374 }, { - "__id__": 368 + "__id__": 376 }, { - "__id__": 370 + "__id__": 378 } ], "_prefab": { - "__id__": 372 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -273,7 +276,7 @@ }, { "__type__": "cc.Node", - "_name": "hbox", + "_name": "heros", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -282,33 +285,24 @@ "_children": [ { "__id__": 13 - }, - { - "__id__": 21 - }, - { - "__id__": 185 - }, - { - "__id__": 289 } ], "_active": true, "_components": [ { - "__id__": 311 + "__id__": 57 }, { - "__id__": 313 + "__id__": 59 } ], "_prefab": { - "__id__": 315 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 470, + "y": -165, "z": 0 }, "_lrot": { @@ -336,18 +330,138 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "ScrollView", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 12 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 14 }, + { + "__id__": 32 + } + ], + "_active": true, + "_components": [ + { + "__id__": 50 + }, + { + "__id__": 52 + }, + { + "__id__": 29 + }, + { + "__id__": 54 + } + ], + "_prefab": { + "__id__": 56 + }, + "_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": "scrollBar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 13 + }, + "_children": [ + { + "__id__": 15 + } + ], + "_active": false, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 23 + }, + { + "__id__": 25 + }, + { + "__id__": 27 + } + ], + "_prefab": { + "__id__": 49 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 350, + "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": "bar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 14 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 16 }, @@ -358,6 +472,374 @@ "_prefab": { "__id__": 20 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -11, + "y": -31.25, + "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__": 15 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10, + "height": 156.25 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cfd7a1czpCvIWjMm9RFUXu" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 15 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__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": "9anqV3IVlJqqPU4Pr30hyO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f0z51fubtI+71H3vIJgctW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 12, + "height": 850 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 1, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "66IVu6bJxH9YOFH2i4rUIJ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__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": "1cssjaUYhMs5ZZy47AZXYH" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_alignFlags": 37, + "_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": 0, + "_originalHeight": 250, + "_alignMode": 1, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "28eCqJGkJJJqvt5BpoH44c" + }, + { + "__type__": "cc.ScrollBar", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_scrollView": { + "__id__": 29 + }, + "_handle": { + "__id__": 18 + }, + "_direction": 1, + "_enableAutoHide": false, + "_autoHideTime": 1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7bUTfPeaRNZolUGAZFGtWl" + }, + { + "__type__": "cc.ScrollView", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "bounceDuration": 0.23, + "brake": 0.75, + "elastic": true, + "inertia": true, + "horizontal": false, + "vertical": true, + "cancelInnerEvents": true, + "scrollEvents": [], + "_content": { + "__id__": 31 + }, + "_horizontalScrollBar": null, + "_verticalScrollBar": { + "__id__": 27 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5+HlmE9pCOrNMyasvgc0R" + }, + { + "__type__": "cc.Node", + "_name": "content", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 32 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 42 + }, + { + "__id__": 44 + }, + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 475, + "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": "view", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 13 + }, + "_children": [ + { + "__id__": 31 + } + ], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, @@ -387,6 +869,279 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 950 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "11D9PhdCdD96NYQwjsbt8f" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "37zdnFdsJB767xk2gg2hmQ" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2QO+wVzdEbJsYzUK5WsUo" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_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": 240, + "_originalHeight": 250, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "16ufSExrdAipwajEl/MplJ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2bbCJ8FPpKRYeIbvci1QPL", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 1000 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "53hI4mY+1KmpvrxTjDw5E0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_alignFlags": 41, + "_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": 220, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1d9JEdE0ZChaccZ/N+Fllr" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_resizeMode": 0, + "_layoutType": 3, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 10, + "_paddingRight": 0, + "_paddingTop": 20, + "_paddingBottom": 0, + "_spacingX": 10, + "_spacingY": 10, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f4kaiZY89HppWQyEWivgvc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "22qZ0/oA5BVLmHcbyWy8tm", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "37Ue18QXNJa7KDLl/ByZ60", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -397,7 +1152,322 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 51 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 950 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "47dC3wi6xHSqtFwrwq68Qh" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": false, + "__prefab": { + "__id__": 53 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", + "__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": "03Vq2L0U5NaoXWLvTBTuUX" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_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": 240, + "_originalHeight": 250, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d1/SwXerNLrrgDZbjijE7C" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "42G39/erRDb4QFw0grcoPk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 58 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 700, + "height": 950 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0ce8Dm6ppLZITZh5mmyHVl" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_alignFlags": 45, + "_target": null, + "_left": 10, + "_right": 10, + "_top": 330, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 230, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ceApZIj9NJzoIwQynDoX/0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1cpbTr48FC2LoTu10xavOp", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "hbox", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 63 + }, + { + "__id__": 71 + }, + { + "__id__": 235 + }, + { + "__id__": 339 + } + ], + "_active": true, + "_components": [ + { + "__id__": 361 + }, + { + "__id__": 363 + } + ], + "_prefab": { + "__id__": 365 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 422.38700000000006, + "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": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 62 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 64 + }, + { + "__id__": 66 + }, + { + "__id__": 68 + } + ], + "_prefab": { + "__id__": 70 + }, + "_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__": 63 + }, + "_enabled": true, + "__prefab": { + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", @@ -421,11 +1491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -466,11 +1536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 69 }, "_alignFlags": 45, "_target": null, @@ -515,33 +1585,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 62 }, "_children": [ { - "__id__": 22 + "__id__": 72 }, { - "__id__": 115 + "__id__": 165 }, { - "__id__": 137 + "__id__": 187 }, { - "__id__": 145 + "__id__": 195 }, { - "__id__": 151 + "__id__": 201 } ], "_active": true, "_components": [ { - "__id__": 182 + "__id__": 232 } ], "_prefab": { - "__id__": 184 + "__id__": 234 }, "_lpos": { "__type__": "cc.Vec3", @@ -578,36 +1648,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 71 }, "_children": [ { - "__id__": 23 + "__id__": 73 }, { - "__id__": 51 + "__id__": 101 }, { - "__id__": 70 + "__id__": 120 }, { - "__id__": 89 + "__id__": 139 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 158 }, { - "__id__": 110 + "__id__": 160 }, { - "__id__": 112 + "__id__": 162 } ], "_prefab": { - "__id__": 114 + "__id__": 164 }, "_lpos": { "__type__": "cc.Vec3", @@ -642,17 +1712,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 72 }, "_prefab": { - "__id__": 24 + "__id__": 74 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 23 + "__id__": 73 }, "asset": { "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", @@ -660,7 +1730,7 @@ }, "fileId": "5ep7uhpAlKzpglXeTBjRv2", "instance": { - "__id__": 25 + "__id__": 75 }, "targetOverrides": null }, @@ -674,46 +1744,46 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 26 + "__id__": 76 }, { - "__id__": 28 + "__id__": 78 }, { - "__id__": 29 + "__id__": 79 }, { - "__id__": 30 + "__id__": 80 }, { - "__id__": 31 + "__id__": 81 }, { - "__id__": 33 + "__id__": 83 }, { - "__id__": 35 + "__id__": 85 }, { - "__id__": 37 + "__id__": 87 }, { - "__id__": 39 + "__id__": 89 }, { - "__id__": 41 + "__id__": 91 }, { - "__id__": 43 + "__id__": 93 }, { - "__id__": 45 + "__id__": 95 }, { - "__id__": 47 + "__id__": 97 }, { - "__id__": 49 + "__id__": 99 } ], "removedComponents": [] @@ -721,7 +1791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 77 }, "propertyPath": [ "_name" @@ -737,7 +1807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 77 }, "propertyPath": [ "_lpos" @@ -752,7 +1822,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 77 }, "propertyPath": [ "_lrot" @@ -768,7 +1838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 77 }, "propertyPath": [ "_euler" @@ -783,7 +1853,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 82 }, "propertyPath": [ "_contentSize" @@ -803,7 +1873,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 34 + "__id__": 84 }, "propertyPath": [ "_contentSize" @@ -823,7 +1893,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 86 }, "propertyPath": [ "_contentSize" @@ -843,7 +1913,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 88 }, "propertyPath": [ "_contentSize" @@ -863,7 +1933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 40 + "__id__": 90 }, "propertyPath": [ "_lpos" @@ -884,7 +1954,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 42 + "__id__": 92 }, "propertyPath": [ "_active" @@ -900,7 +1970,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 94 }, "propertyPath": [ "_contentSize" @@ -920,7 +1990,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 96 }, "propertyPath": [ "_contentSize" @@ -940,7 +2010,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 98 }, "propertyPath": [ "_contentSize" @@ -960,7 +2030,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 100 }, "propertyPath": [ "_lpos" @@ -982,17 +2052,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 72 }, "_prefab": { - "__id__": 52 + "__id__": 102 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 51 + "__id__": 101 }, "asset": { "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", @@ -1000,7 +2070,7 @@ }, "fileId": "5ep7uhpAlKzpglXeTBjRv2", "instance": { - "__id__": 53 + "__id__": 103 }, "targetOverrides": null }, @@ -1014,34 +2084,34 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 54 + "__id__": 104 }, { - "__id__": 56 + "__id__": 106 }, { - "__id__": 57 + "__id__": 107 }, { - "__id__": 58 + "__id__": 108 }, { - "__id__": 59 + "__id__": 109 }, { - "__id__": 61 + "__id__": 111 }, { - "__id__": 63 + "__id__": 113 }, { - "__id__": 65 + "__id__": 115 }, { - "__id__": 67 + "__id__": 117 }, { - "__id__": 69 + "__id__": 119 } ], "removedComponents": [] @@ -1049,7 +2119,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 105 }, "propertyPath": [ "_name" @@ -1065,7 +2135,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 105 }, "propertyPath": [ "_lpos" @@ -1080,7 +2150,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 105 }, "propertyPath": [ "_lrot" @@ -1096,7 +2166,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 105 }, "propertyPath": [ "_euler" @@ -1111,7 +2181,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 110 }, "propertyPath": [ "_contentSize" @@ -1131,7 +2201,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 112 }, "propertyPath": [ "_contentSize" @@ -1151,7 +2221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 114 }, "propertyPath": [ "_contentSize" @@ -1171,7 +2241,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 116 }, "propertyPath": [ "_contentSize" @@ -1191,7 +2261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 118 }, "propertyPath": [ "_lpos" @@ -1212,7 +2282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 105 }, "propertyPath": [ "_active" @@ -1223,17 +2293,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 72 }, "_prefab": { - "__id__": 71 + "__id__": 121 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 70 + "__id__": 120 }, "asset": { "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", @@ -1241,7 +2311,7 @@ }, "fileId": "5ep7uhpAlKzpglXeTBjRv2", "instance": { - "__id__": 72 + "__id__": 122 }, "targetOverrides": null }, @@ -1255,34 +2325,34 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 73 + "__id__": 123 }, { - "__id__": 75 + "__id__": 125 }, { - "__id__": 76 + "__id__": 126 }, { - "__id__": 77 + "__id__": 127 }, { - "__id__": 78 + "__id__": 128 }, { - "__id__": 80 + "__id__": 130 }, { - "__id__": 82 + "__id__": 132 }, { - "__id__": 84 + "__id__": 134 }, { - "__id__": 86 + "__id__": 136 }, { - "__id__": 88 + "__id__": 138 } ], "removedComponents": [] @@ -1290,7 +2360,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 124 }, "propertyPath": [ "_name" @@ -1306,7 +2376,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 124 }, "propertyPath": [ "_lpos" @@ -1321,7 +2391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 124 }, "propertyPath": [ "_lrot" @@ -1337,7 +2407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 124 }, "propertyPath": [ "_euler" @@ -1352,7 +2422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 79 + "__id__": 129 }, "propertyPath": [ "_contentSize" @@ -1372,7 +2442,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 81 + "__id__": 131 }, "propertyPath": [ "_contentSize" @@ -1392,7 +2462,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 133 }, "propertyPath": [ "_contentSize" @@ -1412,7 +2482,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 85 + "__id__": 135 }, "propertyPath": [ "_contentSize" @@ -1432,7 +2502,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 87 + "__id__": 137 }, "propertyPath": [ "_lpos" @@ -1453,7 +2523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 124 }, "propertyPath": [ "_active" @@ -1464,17 +2534,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 72 }, "_prefab": { - "__id__": 90 + "__id__": 140 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 89 + "__id__": 139 }, "asset": { "__uuid__": "d6ae7b2b-c431-4374-97e6-2506d9e8501f", @@ -1482,7 +2552,7 @@ }, "fileId": "5ep7uhpAlKzpglXeTBjRv2", "instance": { - "__id__": 91 + "__id__": 141 }, "targetOverrides": null }, @@ -1496,34 +2566,34 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 92 + "__id__": 142 }, { - "__id__": 94 + "__id__": 144 }, { - "__id__": 95 + "__id__": 145 }, { - "__id__": 96 + "__id__": 146 }, { - "__id__": 97 + "__id__": 147 }, { - "__id__": 99 + "__id__": 149 }, { - "__id__": 101 + "__id__": 151 }, { - "__id__": 103 + "__id__": 153 }, { - "__id__": 105 + "__id__": 155 }, { - "__id__": 107 + "__id__": 157 } ], "removedComponents": [] @@ -1531,7 +2601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 143 }, "propertyPath": [ "_name" @@ -1547,7 +2617,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 143 }, "propertyPath": [ "_lpos" @@ -1562,7 +2632,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 143 }, "propertyPath": [ "_lrot" @@ -1578,7 +2648,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 143 }, "propertyPath": [ "_euler" @@ -1593,7 +2663,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 148 }, "propertyPath": [ "_contentSize" @@ -1613,7 +2683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 150 }, "propertyPath": [ "_contentSize" @@ -1633,7 +2703,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 152 }, "propertyPath": [ "_contentSize" @@ -1653,7 +2723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 104 + "__id__": 154 }, "propertyPath": [ "_contentSize" @@ -1673,7 +2743,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 106 + "__id__": 156 }, "propertyPath": [ "_lpos" @@ -1694,7 +2764,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 143 }, "propertyPath": [ "_active" @@ -1707,11 +2777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -1735,11 +2805,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 72 }, "_enabled": false, "__prefab": { - "__id__": 111 + "__id__": 161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1783,11 +2853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 163 }, "_alignFlags": 45, "_target": null, @@ -1832,33 +2902,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 71 }, "_children": [ { - "__id__": 116 + "__id__": 166 }, { - "__id__": 122 + "__id__": 172 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 178 }, { - "__id__": 130 + "__id__": 180 }, { - "__id__": 132 + "__id__": 182 }, { - "__id__": 134 + "__id__": 184 } ], "_prefab": { - "__id__": 136 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -1895,20 +2965,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 115 + "__id__": 165 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 167 }, { - "__id__": 119 + "__id__": 169 } ], "_prefab": { - "__id__": 121 + "__id__": 171 }, "_lpos": { "__type__": "cc.Vec3", @@ -1945,11 +3015,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 168 }, "_contentSize": { "__type__": "cc.Size", @@ -1973,11 +3043,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 166 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 170 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2034,20 +3104,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 115 + "__id__": 165 }, "_children": [], "_active": false, "_components": [ { - "__id__": 123 + "__id__": 173 }, { - "__id__": 125 + "__id__": 175 } ], "_prefab": { - "__id__": 127 + "__id__": 177 }, "_lpos": { "__type__": "cc.Vec3", @@ -2084,11 +3154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 174 }, "_contentSize": { "__type__": "cc.Size", @@ -2112,11 +3182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 172 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 176 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2173,11 +3243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", @@ -2201,11 +3271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 181 }, "_type": 3, "_inverted": false, @@ -2223,11 +3293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 183 }, "_alignFlags": 41, "_target": null, @@ -2259,11 +3329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2320,23 +3390,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 71 }, "_children": [], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 188 }, { - "__id__": 140 + "__id__": 190 }, { - "__id__": 142 + "__id__": 192 } ], "_prefab": { - "__id__": 144 + "__id__": 194 }, "_lpos": { "__type__": "cc.Vec3", @@ -2373,11 +3443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -2401,11 +3471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2469,11 +3539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 193 }, "_alignFlags": 17, "_target": null, @@ -2518,20 +3588,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 71 }, "_children": [], "_active": true, "_components": [ { - "__id__": 146 + "__id__": 196 }, { - "__id__": 148 + "__id__": 198 } ], "_prefab": { - "__id__": 150 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -2568,11 +3638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -2596,11 +3666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2675,17 +3745,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 21 + "__id__": 71 }, "_prefab": { - "__id__": 152 + "__id__": 202 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 151 + "__id__": 201 }, "asset": { "__uuid__": "bf40528a-fcf8-44da-af2e-d6b113904f35", @@ -2693,7 +3763,7 @@ }, "fileId": "0exfRYL89I3Lnv8hzgx3e7", "instance": { - "__id__": 153 + "__id__": 203 }, "targetOverrides": null }, @@ -2707,61 +3777,61 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 154 + "__id__": 204 }, { - "__id__": 156 + "__id__": 206 }, { - "__id__": 157 + "__id__": 207 }, { - "__id__": 158 + "__id__": 208 }, { - "__id__": 159 + "__id__": 209 }, { - "__id__": 161 + "__id__": 211 }, { - "__id__": 163 + "__id__": 213 }, { - "__id__": 165 + "__id__": 215 }, { - "__id__": 167 + "__id__": 217 }, { - "__id__": 169 + "__id__": 219 }, { - "__id__": 171 + "__id__": 221 }, { - "__id__": 173 + "__id__": 223 }, { - "__id__": 174 + "__id__": 224 }, { - "__id__": 175 + "__id__": 225 }, { - "__id__": 176 + "__id__": 226 }, { - "__id__": 177 + "__id__": 227 }, { - "__id__": 178 + "__id__": 228 }, { - "__id__": 179 + "__id__": 229 }, { - "__id__": 180 + "__id__": 230 } ], "removedComponents": [] @@ -2769,7 +3839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 155 + "__id__": 205 }, "propertyPath": [ "_name" @@ -2785,7 +3855,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 155 + "__id__": 205 }, "propertyPath": [ "_lpos" @@ -2800,7 +3870,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 155 + "__id__": 205 }, "propertyPath": [ "_lrot" @@ -2816,7 +3886,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 155 + "__id__": 205 }, "propertyPath": [ "_euler" @@ -2831,7 +3901,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 210 }, "propertyPath": [ "_active" @@ -2847,7 +3917,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 212 }, "propertyPath": [ "_active" @@ -2863,7 +3933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 164 + "__id__": 214 }, "propertyPath": [ "_active" @@ -2879,7 +3949,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 216 }, "propertyPath": [ "_active" @@ -2895,7 +3965,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 168 + "__id__": 218 }, "propertyPath": [ "_active" @@ -2911,7 +3981,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 220 }, "propertyPath": [ "_active" @@ -2927,7 +3997,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 222 }, "propertyPath": [ "_top" @@ -2943,7 +4013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 220 }, "propertyPath": [ "_lpos" @@ -2958,7 +4028,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 168 + "__id__": 218 }, "propertyPath": [ "_lpos" @@ -2973,7 +4043,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 216 }, "propertyPath": [ "_lpos" @@ -2988,7 +4058,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 164 + "__id__": 214 }, "propertyPath": [ "_lpos" @@ -3003,7 +4073,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 212 }, "propertyPath": [ "_lpos" @@ -3018,7 +4088,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 210 }, "propertyPath": [ "_lpos" @@ -3033,7 +4103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 222 }, "propertyPath": [ "_left" @@ -3043,7 +4113,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 181 + "__id__": 231 }, "propertyPath": [ "_active" @@ -3062,11 +4132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -3103,33 +4173,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 62 }, "_children": [ { - "__id__": 186 + "__id__": 236 }, { - "__id__": 214 + "__id__": 264 }, { - "__id__": 248 + "__id__": 298 } ], "_active": true, "_components": [ { - "__id__": 282 + "__id__": 332 }, { - "__id__": 284 + "__id__": 334 }, { - "__id__": 286 + "__id__": 336 } ], "_prefab": { - "__id__": 288 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -3166,33 +4236,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 185 + "__id__": 235 }, "_children": [ { - "__id__": 187 + "__id__": 237 }, { - "__id__": 195 + "__id__": 245 }, { - "__id__": 201 + "__id__": 251 } ], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 257 }, { - "__id__": 209 + "__id__": 259 }, { - "__id__": 211 + "__id__": 261 } ], "_prefab": { - "__id__": 213 + "__id__": 263 }, "_lpos": { "__type__": "cc.Vec3", @@ -3229,23 +4299,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 238 }, { - "__id__": 190 + "__id__": 240 }, { - "__id__": 192 + "__id__": 242 } ], "_prefab": { - "__id__": 194 + "__id__": 244 }, "_lpos": { "__type__": "cc.Vec3", @@ -3282,11 +4352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -3310,11 +4380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3358,11 +4428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 187 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 243 }, "_alignFlags": 45, "_target": null, @@ -3407,20 +4477,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 196 + "__id__": 246 }, { - "__id__": 198 + "__id__": 248 } ], "_prefab": { - "__id__": 200 + "__id__": 250 }, "_lpos": { "__type__": "cc.Vec3", @@ -3457,11 +4527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 247 }, "_contentSize": { "__type__": "cc.Size", @@ -3485,11 +4555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 249 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3546,20 +4616,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 186 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 252 }, { - "__id__": 204 + "__id__": 254 } ], "_prefab": { - "__id__": 206 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -3596,11 +4666,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -3624,11 +4694,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3705,11 +4775,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", @@ -3733,11 +4803,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 236 }, "_enabled": false, "__prefab": { - "__id__": 210 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3778,11 +4848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 236 }, "_enabled": false, "__prefab": { - "__id__": 212 + "__id__": 262 }, "_alignFlags": 44, "_target": null, @@ -3827,36 +4897,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 185 + "__id__": 235 }, "_children": [ { - "__id__": 215 + "__id__": 265 }, { - "__id__": 223 + "__id__": 273 }, { - "__id__": 229 + "__id__": 279 }, { - "__id__": 235 + "__id__": 285 } ], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 291 }, { - "__id__": 243 + "__id__": 293 }, { - "__id__": 245 + "__id__": 295 } ], "_prefab": { - "__id__": 247 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -3893,23 +4963,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 266 }, { - "__id__": 218 + "__id__": 268 }, { - "__id__": 220 + "__id__": 270 } ], "_prefab": { - "__id__": 222 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -3946,11 +5016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -3974,11 +5044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4022,11 +5092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 271 }, "_alignFlags": 45, "_target": null, @@ -4071,20 +5141,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 274 }, { - "__id__": 226 + "__id__": 276 } ], "_prefab": { - "__id__": 228 + "__id__": 278 }, "_lpos": { "__type__": "cc.Vec3", @@ -4121,11 +5191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -4149,11 +5219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4210,20 +5280,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 280 }, { - "__id__": 232 + "__id__": 282 } ], "_prefab": { - "__id__": 234 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -4260,11 +5330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -4288,11 +5358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 279 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 283 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4369,20 +5439,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 264 }, "_children": [], "_active": false, "_components": [ { - "__id__": 236 + "__id__": 286 }, { - "__id__": 238 + "__id__": 288 } ], "_prefab": { - "__id__": 240 + "__id__": 290 }, "_lpos": { "__type__": "cc.Vec3", @@ -4419,11 +5489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 235 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 287 }, "_contentSize": { "__type__": "cc.Size", @@ -4447,11 +5517,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 235 + "__id__": 285 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 289 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4528,11 +5598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 292 }, "_contentSize": { "__type__": "cc.Size", @@ -4556,11 +5626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 264 }, "_enabled": false, "__prefab": { - "__id__": 244 + "__id__": 294 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4601,11 +5671,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 264 }, "_enabled": false, "__prefab": { - "__id__": 246 + "__id__": 296 }, "_alignFlags": 44, "_target": null, @@ -4650,36 +5720,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 185 + "__id__": 235 }, "_children": [ { - "__id__": 249 + "__id__": 299 }, { - "__id__": 257 + "__id__": 307 }, { - "__id__": 263 + "__id__": 313 }, { - "__id__": 269 + "__id__": 319 } ], "_active": true, "_components": [ { - "__id__": 275 + "__id__": 325 }, { - "__id__": 277 + "__id__": 327 }, { - "__id__": 279 + "__id__": 329 } ], "_prefab": { - "__id__": 281 + "__id__": 331 }, "_lpos": { "__type__": "cc.Vec3", @@ -4716,23 +5786,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 300 }, { - "__id__": 252 + "__id__": 302 }, { - "__id__": 254 + "__id__": 304 } ], "_prefab": { - "__id__": 256 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -4769,11 +5839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", @@ -4797,11 +5867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4845,11 +5915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 305 }, "_alignFlags": 45, "_target": null, @@ -4894,20 +5964,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 308 }, { - "__id__": 260 + "__id__": 310 } ], "_prefab": { - "__id__": 262 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -4944,11 +6014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -4972,11 +6042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 311 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5030,20 +6100,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 314 }, { - "__id__": 266 + "__id__": 316 } ], "_prefab": { - "__id__": 268 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", @@ -5080,11 +6150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -5108,11 +6178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5189,20 +6259,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 298 }, "_children": [], "_active": false, "_components": [ { - "__id__": 270 + "__id__": 320 }, { - "__id__": 272 + "__id__": 322 } ], "_prefab": { - "__id__": 274 + "__id__": 324 }, "_lpos": { "__type__": "cc.Vec3", @@ -5239,11 +6309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 321 }, "_contentSize": { "__type__": "cc.Size", @@ -5267,11 +6337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 323 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5348,11 +6418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -5376,11 +6446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 298 }, "_enabled": false, "__prefab": { - "__id__": 278 + "__id__": 328 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5421,11 +6491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 298 }, "_enabled": false, "__prefab": { - "__id__": 280 + "__id__": 330 }, "_alignFlags": 44, "_target": null, @@ -5470,11 +6540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 283 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -5498,11 +6568,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 335 }, "_alignFlags": 0, "_target": null, @@ -5534,11 +6604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 337 }, "_resizeMode": 1, "_layoutType": 3, @@ -5585,30 +6655,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 12 + "__id__": 62 }, "_children": [ { - "__id__": 290 + "__id__": 340 }, { - "__id__": 298 + "__id__": 348 } ], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 354 }, { - "__id__": 306 + "__id__": 356 }, { - "__id__": 308 + "__id__": 358 } ], "_prefab": { - "__id__": 310 + "__id__": 360 }, "_lpos": { "__type__": "cc.Vec3", @@ -5645,23 +6715,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 341 }, { - "__id__": 293 + "__id__": 343 }, { - "__id__": 295 + "__id__": 345 } ], "_prefab": { - "__id__": 297 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -5698,11 +6768,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -5726,11 +6796,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5774,11 +6844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 346 }, "_alignFlags": 45, "_target": null, @@ -5823,20 +6893,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 299 + "__id__": 349 }, { - "__id__": 301 + "__id__": 351 } ], "_prefab": { - "__id__": 303 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -5873,11 +6943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -5901,11 +6971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 352 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5982,11 +7052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 339 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -6010,11 +7080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 339 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 357 }, "_alignFlags": 0, "_target": null, @@ -6046,11 +7116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 339 }, "_enabled": false, "__prefab": { - "__id__": 309 + "__id__": 359 }, "_resizeMode": 1, "_layoutType": 3, @@ -6097,11 +7167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -6125,17 +7195,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 12 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 364 }, "_alignFlags": 41, "_target": null, "_left": 5, "_right": 5, - "_top": 50, + "_top": 97.61299999999994, "_bottom": 1028.909, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6170,206 +7240,32 @@ }, { "__type__": "cc.Node", - "_name": "heros", + "_name": "Reward", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 317 - } - ], - "_active": true, - "_components": [ - { - "__id__": 361 - }, - { - "__id__": 363 - } - ], - "_prefab": { - "__id__": 365 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -145, - "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": "ScrollView", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 316 - }, - "_children": [ - { - "__id__": 318 - }, - { - "__id__": 336 - } - ], - "_active": true, - "_components": [ - { - "__id__": 354 - }, - { - "__id__": 356 - }, - { - "__id__": 333 - }, - { - "__id__": 358 - } - ], - "_prefab": { - "__id__": 360 - }, - "_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": "scrollBar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 317 - }, - "_children": [ - { - "__id__": 319 - } - ], - "_active": false, - "_components": [ - { - "__id__": 325 - }, - { - "__id__": 327 - }, - { - "__id__": 329 - }, - { - "__id__": 331 - } - ], - "_prefab": { - "__id__": 353 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 350, - "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": "bar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 318 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 320 + "__id__": 367 }, { - "__id__": 322 + "__id__": 369 + }, + { + "__id__": 371 } ], "_prefab": { - "__id__": 324 + "__id__": 373 }, "_lpos": { "__type__": "cc.Vec3", - "x": -11, - "y": -31.25, + "x": 0, + "y": 656.792, "z": 0 }, "_lrot": { @@ -6381,8 +7277,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.9, + "y": 1.9, "z": 1 }, "_mobility": 0, @@ -6401,113 +7297,27 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 319 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 368 }, "_contentSize": { "__type__": "cc.Size", - "width": 10, - "height": 156.25 + "width": 540, + "height": 108 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cfd7a1czpCvIWjMm9RFUXu" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 319 - }, - "_enabled": true, - "__prefab": { - "__id__": 323 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", - "__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": "9anqV3IVlJqqPU4Pr30hyO" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f0z51fubtI+71H3vIJgctW", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 318 - }, - "_enabled": true, - "__prefab": { - "__id__": 326 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 12, - "height": 850 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "66IVu6bJxH9YOFH2i4rUIJ" + "fileId": "8bpOu8SWtJR49RzzihAqJW" }, { "__type__": "cc.Sprite", @@ -6515,11 +7325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 370 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6532,12 +7342,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3c27d", "__expectedType__": "cc.SpriteFrame" }, - "_type": 1, + "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -6552,7 +7362,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1cssjaUYhMs5ZZy47AZXYH" + "fileId": "27rrj0LDRJrrVCL1VS9+vw" }, { "__type__": "cc.Widget", @@ -6560,17 +7370,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 366 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 372 }, - "_alignFlags": 37, + "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": -119.39200000000005, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -6581,388 +7391,6 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 0, - "_originalHeight": 250, - "_alignMode": 1, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "28eCqJGkJJJqvt5BpoH44c" - }, - { - "__type__": "cc.ScrollBar", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 318 - }, - "_enabled": true, - "__prefab": { - "__id__": 332 - }, - "_scrollView": { - "__id__": 333 - }, - "_handle": { - "__id__": 322 - }, - "_direction": 1, - "_enableAutoHide": false, - "_autoHideTime": 1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "7bUTfPeaRNZolUGAZFGtWl" - }, - { - "__type__": "cc.ScrollView", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 317 - }, - "_enabled": true, - "__prefab": { - "__id__": 334 - }, - "bounceDuration": 0.23, - "brake": 0.75, - "elastic": true, - "inertia": true, - "horizontal": false, - "vertical": true, - "cancelInnerEvents": true, - "scrollEvents": [], - "_content": { - "__id__": 335 - }, - "_horizontalScrollBar": null, - "_verticalScrollBar": { - "__id__": 331 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a5+HlmE9pCOrNMyasvgc0R" - }, - { - "__type__": "cc.Node", - "_name": "content", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 336 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 346 - }, - { - "__id__": 348 - }, - { - "__id__": 350 - } - ], - "_prefab": { - "__id__": 352 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 495, - "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": "view", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 317 - }, - "_children": [ - { - "__id__": 335 - } - ], - "_active": true, - "_components": [ - { - "__id__": 337 - }, - { - "__id__": 339 - }, - { - "__id__": 341 - }, - { - "__id__": 343 - } - ], - "_prefab": { - "__id__": 345 - }, - "_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__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 338 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700, - "height": 990 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "11D9PhdCdD96NYQwjsbt8f" - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 340 - }, - "_type": 0, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "37zdnFdsJB767xk2gg2hmQ" - }, - { - "__type__": "cc.Graphics", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 342 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_lineWidth": 1, - "_strokeColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_lineJoin": 2, - "_lineCap": 0, - "_fillColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 0 - }, - "_miterLimit": 10, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e2QO+wVzdEbJsYzUK5WsUo" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 336 - }, - "_enabled": true, - "__prefab": { - "__id__": 344 - }, - "_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": 240, - "_originalHeight": 250, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "16ufSExrdAipwajEl/MplJ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2bbCJ8FPpKRYeIbvci1QPL", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 335 - }, - "_enabled": true, - "__prefab": { - "__id__": 347 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700, - "height": 1000 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 1 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "53hI4mY+1KmpvrxTjDw5E0" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 335 - }, - "_enabled": true, - "__prefab": { - "__id__": 349 - }, - "_alignFlags": 41, - "_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": 220, "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, @@ -6970,45 +7398,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1d9JEdE0ZChaccZ/N+Fllr" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 335 - }, - "_enabled": true, - "__prefab": { - "__id__": 351 - }, - "_resizeMode": 0, - "_layoutType": 3, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 10, - "_paddingRight": 0, - "_paddingTop": 20, - "_paddingBottom": 0, - "_spacingX": 10, - "_spacingY": 10, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f4kaiZY89HppWQyEWivgvc" + "fileId": "58XmINNyZO0Lrp55LulJ52" }, { "__type__": "cc.PrefabInfo", @@ -7018,219 +7408,7 @@ "asset": { "__id__": 0 }, - "fileId": "22qZ0/oA5BVLmHcbyWy8tm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "37Ue18QXNJa7KDLl/ByZ60", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 317 - }, - "_enabled": true, - "__prefab": { - "__id__": 355 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700, - "height": 990 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "47dC3wi6xHSqtFwrwq68Qh" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 317 - }, - "_enabled": false, - "__prefab": { - "__id__": 357 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", - "__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": "03Vq2L0U5NaoXWLvTBTuUX" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 317 - }, - "_enabled": true, - "__prefab": { - "__id__": 359 - }, - "_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": 240, - "_originalHeight": 250, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d1/SwXerNLrrgDZbjijE7C" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "42G39/erRDb4QFw0grcoPk", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 316 - }, - "_enabled": true, - "__prefab": { - "__id__": 362 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 700, - "height": 990 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0ce8Dm6ppLZITZh5mmyHVl" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 316 - }, - "_enabled": true, - "__prefab": { - "__id__": 364 - }, - "_alignFlags": 45, - "_target": null, - "_left": 10, - "_right": 10, - "_top": 290, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 230, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ceApZIj9NJzoIwQynDoX/0" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1cpbTr48FC2LoTu10xavOp", + "fileId": "a2cWQfV8VJXb6qeCkLMi+b", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -7245,7 +7423,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -7273,7 +7451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 377 }, "_alignFlags": 45, "_target": null, @@ -7309,31 +7487,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 379 }, "hero_icon": { - "__id__": 116 + "__id__": 166 }, "ap_node": { - "__id__": 214 + "__id__": 264 }, "hp_node": { - "__id__": 248 - }, - "cd_node": { - "__id__": 186 - }, - "BG_node": { - "__id__": 22 - }, - "info_node": { "__id__": 298 }, + "cd_node": { + "__id__": 236 + }, + "BG_node": { + "__id__": 72 + }, + "info_node": { + "__id__": 348 + }, "name_node": { - "__id__": 137 + "__id__": 187 }, "cards_node": { - "__id__": 335 + "__id__": 31 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -7360,19 +7538,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 151 + "__id__": 201 }, { - "__id__": 89 + "__id__": 139 }, { - "__id__": 70 + "__id__": 120 }, { - "__id__": 51 + "__id__": 101 }, { - "__id__": 23 + "__id__": 73 } ] } diff --git a/assets/resources/gui/element/hnode.prefab b/assets/resources/gui/element/hnode.prefab index b1b0aed2..4fc15ce8 100644 --- a/assets/resources/gui/element/hnode.prefab +++ b/assets/resources/gui/element/hnode.prefab @@ -70,7 +70,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -170, + "y": 390, "z": 0 }, "_lrot": { @@ -164,7 +164,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 700, - "height": 250 + "height": 310 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -774,7 +774,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -240, - "y": 0, + "y": 21.879, "z": 0 }, "_lrot": { @@ -6610,8 +6610,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 260.962, - "y": -78.959, + "x": 259.779, + "y": -113.255, "z": 0 }, "_lrot": { @@ -7012,8 +7012,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 120.608, - "y": -78.959, + "x": 119.425, + "y": -113.255, "z": 0 }, "_lrot": { @@ -7418,7 +7418,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 100, - "y": 81.742, + "y": 103.621, "z": 0 }, "_lrot": { @@ -9897,7 +9897,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 100, - "y": 0, + "y": 0.887, "z": 0 }, "_lrot": { @@ -9991,7 +9991,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 900, - "height": 210 + "height": 310 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10275,7 +10275,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 460, - "height": 100 + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10390,7 +10390,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 700, - "height": 240 + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10436,9 +10436,6 @@ "lv_node": { "__id__": 165 }, - "pool_lvnode": { - "__id__": 168 - }, "ap_node": { "__id__": 391 }, @@ -10466,11 +10463,11 @@ "__prefab": { "__id__": 493 }, - "_alignFlags": 44, + "_alignFlags": 41, "_target": null, "_left": 10, "_right": 10, - "_top": 0, + "_top": 100, "_bottom": 350, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -10481,7 +10478,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 110, - "_originalHeight": 0, + "_originalHeight": 240, "_alignMode": 2, "_lockFlags": 0, "_id": "" diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index 04816413..b7383659 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -14302,7 +14302,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 761.798, - "y": 969.971, + "y": 640, "z": 0 }, "_lrot": { @@ -14903,11 +14903,11 @@ "__prefab": { "__id__": 701 }, - "_alignFlags": 1, + "_alignFlags": 2, "_target": null, "_left": 0, "_right": 0, - "_top": 250.0290000000001, + "_top": 448.34799999999996, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index b79fea79..7b89e479 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -232,7 +232,7 @@ "_top": 0, "_bottom": 0, "_horizontalCenter": 0, - "_verticalCenter": 0, + "_verticalCenter": -200, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -276,7 +276,7 @@ "value": { "__type__": "cc.Vec3", "x": -185.574, - "y": 640, + "y": 440, "z": 0 } }, diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 5b32d78a..30522e7b 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -58,6 +58,7 @@ export interface CardConfig { base_pool_lv?: number // 技能卡扩展属性 + skill?: number // 关联的技能 UUID name?: string // 卡牌名称 info?: string // 卡牌描述信息 is_inst?: boolean // 是否即时起效 @@ -131,27 +132,27 @@ HeroList.forEach(uuid => { // 添加非英雄卡牌 (技能、功能卡) CardPoolList.push( // 技能卡牌 (以增益/辅助为主,因为在备战期没有敌人) - { uuid: 6304, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6304"), info: t("skill_info_6304"), is_inst: true, t_times: 1, t_inv: 0, keep_waves: 15 }, - { uuid: 6305, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6305"), info: t("skill_info_6305"), is_inst: true, t_times: 1, t_inv: 0, keep_waves: 15 }, + { uuid: 8304, skill: 6304, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6304"), info: t("skill_info_6304"), is_inst: true, t_times: 1, t_inv: 0, keep_waves: 15 }, + { uuid: 8305, skill: 6305, type: CardType.Skill, cost: 0, weight: 20, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6305"), info: t("skill_info_6305"), is_inst: true, t_times: 1, t_inv: 0, keep_waves: 15 }, // 自定义 overrides 示例卡牌 { - uuid: 6401, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, + uuid: 8401, skill: 6401, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: "超强攻击强化", info: "使场上英雄增加50点攻击力", is_inst: true, t_times: 1, t_inv: 0, keep_waves: 15, overrides: { ap: 50 } }, { - uuid: 6101, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, + uuid: 8101, skill: 6101, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: "持续天降火球", info: "战斗中每隔3秒释放一个火球,造成300%伤害,持续2波次", is_inst: false, t_times: 999, t_inv: 3, keep_waves: 2, overrides: { TGroup: TGroup.Enemy, ap: 300, hit_count: 2 } }, // 驻场技能示例卡牌 { - uuid: 6501, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, + uuid: 8501, skill: 6501, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: "全体攻击光环", info: "全体英雄攻击力增加20%,只要此卡在场就生效", is_inst: false, t_times: 999, t_inv: 0, keep_waves: -1, field: [7008] // 对应 FieldSkillSet[7008] HeroAtk +20% }, { - uuid: 6502, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, + uuid: 8502, skill: 6502, type: CardType.Skill, cost: 0, weight: 10, pool_lv: 1, wave: 1, kind: CKind.Skill, card_lv: 1, name: "全体生命光环", info: "全体英雄最大生命增加10%,只要此卡在场就生效", is_inst: false, t_times: 999, t_inv: 0, keep_waves: -1, field: [7016] // 对应 FieldSkillSet[7016] HeroHp +10% } diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts index ca488469..2d68c70c 100644 --- a/assets/script/game/common/config/GameSet.ts +++ b/assets/script/game/common/config/GameSet.ts @@ -13,7 +13,7 @@ export enum BoxSet { LETF_END = -360, RIGHT_END = 360, //游戏地平线 - GAME_LINE = 100, + GAME_LINE = -100, } export enum FacSet { diff --git a/assets/script/game/map/MissSkillsComp.ts b/assets/script/game/map/MissSkillsComp.ts index 5766d139..37c3161c 100644 --- a/assets/script/game/map/MissSkillsComp.ts +++ b/assets/script/game/map/MissSkillsComp.ts @@ -63,16 +63,16 @@ export class MissSkillsComp extends CCComp { * 第 2 行 y=320:x = -320, -240, -160, -80, 0 */ private slots: SkillBoxSlot[] = [ - { x: -320, y: 340, used: false, node: null }, - { x: -240, y: 340, used: false, node: null }, - { x: -160, y: 340, used: false, node: null }, - { x: -80, y: 340, used: false, node: null }, - { x: 0, y: 340, used: false, node: null }, - { x: -320, y: 420, used: false, node: null }, - { x: -240, y: 420, used: false, node: null }, - { x: -160, y: 420, used: false, node: null }, - { x: -80, y: 420, used: false, node: null }, - { x: 0, y: 420, used: false, node: null }, + { x: -320, y: 200, used: false, node: null }, + { x: -240, y: 200, used: false, node: null }, + { x: -160, y: 200, used: false, node: null }, + { x: -80, y: 200, used: false, node: null }, + { x: 0, y: 200, used: false, node: null }, + { x: -320, y: 300, used: false, node: null }, + { x: -240, y: 300, used: false, node: null }, + { x: -160, y: 300, used: false, node: null }, + { x: -80, y: 300, used: false, node: null }, + { x: 0, y: 300, used: false, node: null }, ]; /** 注册事件监听 */ diff --git a/assets/script/game/map/SCardComp.ts b/assets/script/game/map/SCardComp.ts index ca94dd6c..c4fbbd73 100644 --- a/assets/script/game/map/SCardComp.ts +++ b/assets/script/game/map/SCardComp.ts @@ -251,7 +251,8 @@ export class SCardComp extends CCComp { }); }); - const skill = SkillSet[this.card_uuid]; + const s_uuid = this.cardData.skill ?? this.card_uuid; + const skill = SkillSet[s_uuid]; const skillCard = CardPoolList.find(c => c.uuid === this.card_uuid); const card_lv = Math.max(1, Math.floor(this.cardData.card_lv ?? 1)); const spSuffix = card_lv >= 2 ? "★".repeat(card_lv - 1) : ""; @@ -271,7 +272,7 @@ export class SCardComp extends CCComp { if (iconNode) { iconNode.setScale(new Vec3(1, 1, 1)); this.clearIconAnimation(iconNode); - const iconId = skill?.icon || `${this.card_uuid}`; + const iconId = skill?.icon || `${s_uuid}`; this.updateIcon(iconNode, iconId); } } diff --git a/assets/script/game/map/SkillBoxComp.ts b/assets/script/game/map/SkillBoxComp.ts index 642ede63..bbadccc7 100644 --- a/assets/script/game/map/SkillBoxComp.ts +++ b/assets/script/game/map/SkillBoxComp.ts @@ -118,22 +118,24 @@ export class SkillBoxComp extends CCComp { * 2. 更新 UI 显示(图标 + 次数)。 * 3. 即时技能立即触发一次;若次数已满则延迟销毁。 * - * @param uuid 技能 UUID + * @param uuid 卡牌 UUID * @param card_lv 技能卡等级 */ init(uuid: number, card_lv: number) { - this.s_uuid = uuid; this.card_lv = card_lv; // 查询触发配置 const config = CardPoolList.find(c => c.uuid === uuid); if (config) { + this.s_uuid = config.skill ?? uuid; // 获取实际的技能 UUID this.is_instant = config.is_inst ?? true; this.trigger_times = config.t_times ?? 1; this.trigger_interval = config.t_inv ?? 0; this.keep_waves = config.keep_waves ?? 0; this.overrides = config.overrides; this.field = config.field || []; + } else { + this.s_uuid = uuid; } this.current_trigger_times = 0;