diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index c580ead8..7ebd4ee0 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 514 + "__id__": 502 }, { - "__id__": 516 + "__id__": 504 }, { - "__id__": 518 + "__id__": 506 } ], "_prefab": { - "__id__": 520 + "__id__": 508 }, "_lpos": { "__type__": "cc.Vec3", @@ -197,17 +197,17 @@ "_active": true, "_components": [ { - "__id__": 507 + "__id__": 495 }, { - "__id__": 509 + "__id__": 497 }, { - "__id__": 511 + "__id__": 499 } ], "_prefab": { - "__id__": 513 + "__id__": 501 }, "_lpos": { "__type__": "cc.Vec3", @@ -258,22 +258,16 @@ }, { "__id__": 486 - }, - { - "__id__": 492 - }, - { - "__id__": 498 } ], "_active": true, "_components": [ { - "__id__": 504 + "__id__": 492 } ], "_prefab": { - "__id__": 506 + "__id__": 494 }, "_lpos": { "__type__": "cc.Vec3", @@ -10896,8 +10890,6 @@ "__id__": 0 }, "fileId": "6dFdGsgPxD8oVoba7hVEO3", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -11095,7 +11087,7 @@ }, { "__type__": "cc.Node", - "_name": "EntityLayer1", + "_name": "EntityLayer", "_objFlags": 512, "__editorExtras__": {}, "_parent": { @@ -11169,7 +11161,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f4UHtJSdBGoJN5JNrTo0Cc" + "fileId": "f91Y4OCX1NFKfSWOAvmdSa" }, { "__type__": "6639ayo4DFKZYCU2OBZzyb+", @@ -11187,7 +11179,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9cpgNjFL5L1Ig8YQrAcaO8" + "fileId": "6fzmfjcbNPK6tOzQOKJfRV" }, { "__type__": "cc.PrefabInfo", @@ -11197,14 +11189,14 @@ "asset": { "__id__": 0 }, - "fileId": "99wEvV2I5Pv6rwpPNwdrxE", + "fileId": "77ZGG4JjxGiol1pDVFrjGQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "EntityLayer", + "_name": "SkillLayer", "_objFlags": 512, "__editorExtras__": {}, "_parent": { @@ -11269,224 +11261,6 @@ "width": 100, "height": 100 }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f91Y4OCX1NFKfSWOAvmdSa" - }, - { - "__type__": "6639ayo4DFKZYCU2OBZzyb+", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 486 - }, - "_enabled": true, - "__prefab": { - "__id__": 490 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6fzmfjcbNPK6tOzQOKJfRV" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "77ZGG4JjxGiol1pDVFrjGQ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "EntityLayer2", - "_objFlags": 512, - "__editorExtras__": {}, - "_parent": { - "__id__": 7 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 493 - }, - { - "__id__": 495 - } - ], - "_prefab": { - "__id__": 497 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 492 - }, - "_enabled": true, - "__prefab": { - "__id__": 494 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fcl9eWhS9K6ZtX9Z626PPp" - }, - { - "__type__": "6639ayo4DFKZYCU2OBZzyb+", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 492 - }, - "_enabled": true, - "__prefab": { - "__id__": 496 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a2VlMB5DNOr4wbzGgH2lXk" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4fP7G4KUBB+56gZWSQoIpq", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "SkillLayer", - "_objFlags": 512, - "__editorExtras__": {}, - "_parent": { - "__id__": 7 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 499 - }, - { - "__id__": 501 - } - ], - "_prefab": { - "__id__": 503 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 498 - }, - "_enabled": true, - "__prefab": { - "__id__": 500 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, @@ -11504,11 +11278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 498 + "__id__": 486 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 490 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -11543,7 +11317,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 493 }, "_contentSize": { "__type__": "cc.Size", @@ -11570,8 +11344,6 @@ "__id__": 0 }, "fileId": "68Q5vEQWBINrggngtTZ7wh", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -11584,7 +11356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 508 + "__id__": 496 }, "_contentSize": { "__type__": "cc.Size", @@ -11612,7 +11384,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 510 + "__id__": 498 }, "camera": { "__id__": 3 @@ -11627,16 +11399,10 @@ "__id__": 476 }, "entityLayer": { - "__id__": 489 - }, - "entityLayer1": { "__id__": 483 }, - "entityLayer2": { - "__id__": 495 - }, "SkillLayer": { - "__id__": 501 + "__id__": 489 }, "isFollowPlayer": true, "_id": "" @@ -11655,7 +11421,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 500 }, "_id": "" }, @@ -11686,7 +11452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 503 }, "_contentSize": { "__type__": "cc.Size", @@ -11714,7 +11480,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 517 + "__id__": 505 }, "_cameraComponent": { "__id__": 3 @@ -11736,7 +11502,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 519 + "__id__": 507 }, "_alignFlags": 45, "_target": null, diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index bf6adb46..1668fb92 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -1819,10 +1819,10 @@ "height": 114, "rawWidth": 70, "rawHeight": 114, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 63, + "borderBottom": 45, + "borderLeft": 30, + "borderRight": 27, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1911,8 +1911,8 @@ "height": 114, "rawWidth": 70, "rawHeight": 114, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 63, + "borderBottom": 45, "borderLeft": 31, "borderRight": 32, "packable": true, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 67ebdcea..cc9695c7 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -40,51 +40,48 @@ "__id__": 388 }, { - "__id__": 436 + "__id__": 443 }, { - "__id__": 480 + "__id__": 451 }, { - "__id__": 640 + "__id__": 465 }, { - "__id__": 660 + "__id__": 603 }, { - "__id__": 666 + "__id__": 690 }, { - "__id__": 674 + "__id__": 777 }, { - "__id__": 688 + "__id__": 1230 }, { - "__id__": 826 - }, - { - "__id__": 913 + "__id__": 1236 } ], "_active": true, "_components": [ { - "__id__": 1000 + "__id__": 1242 }, { - "__id__": 1002 + "__id__": 1244 }, { - "__id__": 1004 + "__id__": 1246 } ], "_prefab": { - "__id__": 1006 + "__id__": 1248 }, "_lpos": { "__type__": "cc.Vec3", - "x": -360, + "x": 0, "y": -640, "z": 0 }, @@ -9099,37 +9096,40 @@ "__id__": 389 }, { - "__id__": 397 + "__id__": 395 }, { - "__id__": 405 + "__id__": 404 }, { - "__id__": 413 + "__id__": 412 }, { - "__id__": 421 + "__id__": 420 + }, + { + "__id__": 428 } ], "_active": true, "_components": [ { - "__id__": 429 + "__id__": 436 }, { - "__id__": 431 + "__id__": 438 }, { - "__id__": 433 + "__id__": 440 } ], "_prefab": { - "__id__": 435 + "__id__": 442 }, "_lpos": { "__type__": "cc.Vec3", - "x": 360, - "y": 47.9, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -9157,7 +9157,7 @@ }, { "__type__": "cc.Node", - "_name": "ItemIcon_Battle", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -9171,18 +9171,15 @@ }, { "__id__": 392 - }, - { - "__id__": 394 } ], "_prefab": { - "__id__": 396 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -10, "z": 0 }, "_lrot": { @@ -9222,19 +9219,19 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 100 + "width": 720, + "height": 125 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5y1uVE0lEgbQ3taTnGP2a" + "fileId": "61FIv0CHhK9qMUDN6qiAXd" }, { "__type__": "cc.Sprite", @@ -9259,12 +9256,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ceee5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c348", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -9279,63 +9276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a0CY0kp81LQpUUJYteQvdz" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 389 - }, - "_enabled": true, - "__prefab": { - "__id__": 395 - }, - "clickEvents": [], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 0.8, - "_target": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "67ZAzcHM1H76u0+sL0fAjU" + "fileId": "ffoyJH9yVMVKzsF0fIzIIe" }, { "__type__": "cc.PrefabInfo", @@ -9345,14 +9286,14 @@ "asset": { "__id__": 0 }, - "fileId": "91klhW/1dMJYp6XjPvZ1cG", + "fileId": "9eP87lP9BNwb4ThhkZxc2F", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "ItemIcon_Bag_Brown", + "_name": "ItemIcon_Battle", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -9361,23 +9302,23 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 396 + }, { "__id__": 398 }, { "__id__": 400 - }, - { - "__id__": 402 } ], "_prefab": { - "__id__": 404 + "__id__": 403 }, "_lpos": { "__type__": "cc.Vec3", - "x": -142.768, - "y": 0, + "x": 0, + "y": 10, "z": 0 }, "_lrot": { @@ -9409,21 +9350,232 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { + "__id__": 395 + }, + "_enabled": true, + "__prefab": { "__id__": 397 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 106, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5y1uVE0lEgbQ3taTnGP2a" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 395 + }, "_enabled": true, "__prefab": { "__id__": 399 }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ceee5", + "__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": "a0CY0kp81LQpUUJYteQvdz" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 395 + }, + "_enabled": true, + "__prefab": { + "__id__": 401 + }, + "clickEvents": [ + { + "__id__": 402 + } + ], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 0.8, + "_target": { + "__id__": 395 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "67ZAzcHM1H76u0+sL0fAjU" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "ee99bEQ89lEtavAHQsY2sba", + "handler": "mission_change", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "91klhW/1dMJYp6XjPvZ1cG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemIcon_Bag_Brown", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 388 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 405 + }, + { + "__id__": 407 + }, + { + "__id__": 409 + } + ], + "_prefab": { + "__id__": 411 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -142.768, + "y": 10, + "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__": 404 + }, + "_enabled": true, + "__prefab": { + "__id__": 406 + }, "_contentSize": { "__type__": "cc.Size", - "width": 110, - "height": 104 + "width": 106, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -9437,11 +9589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 404 }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 408 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9459,7 +9611,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -9482,11 +9634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 397 + "__id__": 404 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 410 }, "clickEvents": [], "_interactable": true, @@ -9525,7 +9677,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.8, - "_target": null, + "_target": { + "__id__": 404 + }, "_id": "" }, { @@ -9557,22 +9711,22 @@ "_active": true, "_components": [ { - "__id__": 406 + "__id__": 413 }, { - "__id__": 408 + "__id__": 415 }, { - "__id__": 410 + "__id__": 417 } ], "_prefab": { - "__id__": 412 + "__id__": 419 }, "_lpos": { "__type__": "cc.Vec3", "x": 148.224, - "y": 0, + "y": 10, "z": 0 }, "_lrot": { @@ -9604,21 +9758,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 414 }, "_contentSize": { "__type__": "cc.Size", - "width": 116, - "height": 106 + "width": 106, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -9632,11 +9786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 416 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9654,7 +9808,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -9677,11 +9831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 412 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 418 }, "clickEvents": [], "_interactable": true, @@ -9720,7 +9874,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.8, - "_target": null, + "_target": { + "__id__": 412 + }, "_id": "" }, { @@ -9752,22 +9908,22 @@ "_active": true, "_components": [ { - "__id__": 414 + "__id__": 421 }, { - "__id__": 416 + "__id__": 423 }, { - "__id__": 418 + "__id__": 425 } ], "_prefab": { - "__id__": 420 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", "x": -268.119, - "y": 0, + "y": 10, "z": 0 }, "_lrot": { @@ -9799,21 +9955,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", - "width": 96, + "width": 106, "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -9827,11 +9983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 424 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9872,11 +10028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 413 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 426 }, "clickEvents": [], "_interactable": true, @@ -9915,7 +10071,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.8, - "_target": null, + "_target": { + "__id__": 420 + }, "_id": "" }, { @@ -9947,22 +10105,22 @@ "_active": true, "_components": [ { - "__id__": 422 + "__id__": 429 }, { - "__id__": 424 + "__id__": 431 }, { - "__id__": 426 + "__id__": 433 } ], "_prefab": { - "__id__": 428 + "__id__": 435 }, "_lpos": { "__type__": "cc.Vec3", "x": 283.37, - "y": 0, + "y": 10, "z": 0 }, "_lrot": { @@ -9994,21 +10152,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 430 }, "_contentSize": { "__type__": "cc.Size", - "width": 110, - "height": 124 + "width": 106, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -10022,11 +10180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 425 + "__id__": 432 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10044,7 +10202,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -10067,11 +10225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 428 }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 434 }, "clickEvents": [], "_interactable": true, @@ -10110,7 +10268,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 0.8, - "_target": null, + "_target": { + "__id__": 428 + }, "_id": "" }, { @@ -10140,17 +10300,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 437 }, "_contentSize": { "__type__": "cc.Size", - "width": 730, - "height": 100 + "width": 720, + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -10168,7 +10328,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10180,10 +10340,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c348", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -10213,14 +10370,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 434 + "__id__": 441 }, - "_alignFlags": 4, + "_alignFlags": 20, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": -2.1000000000000014, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -10254,5351 +10411,19 @@ }, { "__type__": "cc.Node", - "_name": "m_info", - "_objFlags": 512, - "__editorExtras__": {}, + "_objFlags": 0, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 437 - } - ], - "_active": true, - "_components": [ - { - "__id__": 475 - }, - { - "__id__": 477 - } - ], "_prefab": { - "__id__": 479 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 313.983, - "y": 221.588, - "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": "coin", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 436 - }, - "_children": [ - { - "__id__": 438 - }, - { - "__id__": 444 - }, - { - "__id__": 454 - }, - { - "__id__": 464 - } - ], - "_active": true, - "_components": [ - { - "__id__": 470 - }, - { - "__id__": 472 - } - ], - "_prefab": { - "__id__": 474 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 1.2246467991473532e-16, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 1.4033418597069752e-14, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "line_bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 437 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 439 - }, - { - "__id__": 441 - } - ], - "_prefab": { - "__id__": 443 - }, - "_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__": 438 - }, - "_enabled": true, - "__prefab": { - "__id__": 440 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 120, - "height": 50 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b2bqelMv1EEqy5sJ3drtRa" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 438 - }, - "_enabled": true, - "__prefab": { - "__id__": 442 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", - "__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": "2dVta7D7VOBZBj58PJWtvT" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1cwLYNFM5BbZY9U4pXcA+q", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "coin", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 437 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 445 - }, - { - "__id__": 447 - }, - { - "__id__": 449 - }, - { - "__id__": 451 - } - ], - "_prefab": { - "__id__": 453 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 74.51, - "y": 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": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "lab_progress", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { "__id__": 444 }, - "_enabled": true, - "__prefab": { - "__id__": 446 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 52.0537109375, - "height": 39.8 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "86zRK4Q91JN5z8Hx5Dg1Um" - }, - { - "__type__": "cc.Label", - "_name": "lab_progress