From 1e52b9f759ecebe8455d738b3f7c7d660d42cfd5 Mon Sep 17 00:00:00 2001 From: King Wang Date: Tue, 7 Dec 2021 01:26:28 +0800 Subject: [PATCH] Widget --- .../assets/scenes/GameScene/GameScene.scene | 716 +++++++++++++----- .../settings/v2/packages/project.json | 7 +- 2 files changed, 538 insertions(+), 185 deletions(-) diff --git a/examples/cocos-creator-multiplayer/frontend/assets/scenes/GameScene/GameScene.scene b/examples/cocos-creator-multiplayer/frontend/assets/scenes/GameScene/GameScene.scene index 6a96be9..c9d1c0d 100644 --- a/examples/cocos-creator-multiplayer/frontend/assets/scenes/GameScene/GameScene.scene +++ b/examples/cocos-creator-multiplayer/frontend/assets/scenes/GameScene/GameScene.scene @@ -18,29 +18,29 @@ "__id__": 2 }, { - "__id__": 6 + "__id__": 31 }, { "__id__": 5 }, { - "__id__": 16 + "__id__": 41 }, { - "__id__": 17 + "__id__": 42 }, { - "__id__": 50 + "__id__": 45 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 53 + "__id__": 79 }, "autoReleaseAssets": false, "_globals": { - "__id__": 56 + "__id__": 82 }, "_id": "0d3889f6-dc9c-424e-b8cd-6fa78d63af15" }, @@ -154,7 +154,11 @@ "_parent": { "__id__": 1 }, - "_children": [], + "_children": [ + { + "__id__": 6 + } + ], "_active": true, "_components": [], "_prefab": null, @@ -190,7 +194,7 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1 + "__id__": 5 }, "_prefab": { "__id__": 7 @@ -202,17 +206,25 @@ "__id__": 6 }, "asset": { - "__uuid__": "3777d1a7-cafe-44be-9efd-ae46b6457e2c@fc11b", + "__uuid__": "809957ef-4f3f-4527-87cc-cb3223f7500a", "__expectedType__": "cc.Prefab" }, - "fileId": "2cyg9D4KRTnaWvFuyUcwrn", + "fileId": "087WztcUlE+rBZWXq8jy1C", "instance": { "__id__": 8 - } + }, + "targetOverrides": [ + { + "__id__": 14 + }, + { + "__id__": 29 + } + ] }, { "__type__": "cc.PrefabInstance", - "fileId": "0aP//OBbtBM7WKwKJf+Wup", + "fileId": "83jtp9v6VOiaaFY7+VyRuQ", "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ @@ -227,9 +239,6 @@ }, { "__id__": 13 - }, - { - "__id__": 14 } ], "removedComponents": [] @@ -242,12 +251,12 @@ "propertyPath": [ "_name" ], - "value": "newMap01" + "value": "Player" }, { "__type__": "cc.TargetInfo", "localID": [ - "2cyg9D4KRTnaWvFuyUcwrn" + "087WztcUlE+rBZWXq8jy1C" ] }, { @@ -296,10 +305,327 @@ "z": 0 } }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "ani" + ], + "target": { + "__id__": 15 + }, + "targetInfo": { + "__id__": 28 + } + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 6 + }, + "_prefab": { + "__id__": 16 + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 15 + }, + "asset": { + "__uuid__": "e8fe9966-5f03-4cc0-ad69-01d536be6c21@665d9", + "__expectedType__": "cc.Prefab" + }, + "fileId": "0ci76LBW5T0pcTlJAggzPr", + "instance": { + "__id__": 17 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "4dEd1Qo6RLgaIfCNHLepAL", + "prefabRootNode": { + "__id__": 6 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 21 + }, + { + "__id__": 22 + }, + { + "__id__": 23 + }, + { + "__id__": 25 + }, + { + "__id__": 26 + } + ], + "removedComponents": [] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_name" + ], + "value": "javelin01" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0ci76LBW5T0pcTlJAggzPr" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 1, + "z": 0, + "w": 6.123233995736766e-17 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 19 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 180, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 24 + }, + "propertyPath": [ + "_materials", + "0" + ], + "value": { + "__uuid__": "196eebe8-170f-4ba9-a767-9f6d664c6e04", + "__expectedType__": "cc.Material" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "69OA7jJHlTl7JAQ/mCNrhv" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 24 + }, + "propertyPath": [ + "_skinningRoot" + ], + "value": { "__id__": 15 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_useBakedAnimation" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "61qK2CThVWNItyFdAnh23r" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "61qK2CThVWNItyFdAnh23r" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "mesh" + ], + "target": { + "__id__": 15 + }, + "targetInfo": { + "__id__": 30 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "69OA7jJHlTl7JAQ/mCNrhv" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 32 + } + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 31 + }, + "asset": { + "__uuid__": "3777d1a7-cafe-44be-9efd-ae46b6457e2c@fc11b", + "__expectedType__": "cc.Prefab" + }, + "fileId": "2cyg9D4KRTnaWvFuyUcwrn", + "instance": { + "__id__": 33 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "0aP//OBbtBM7WKwKJf+Wup", + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 34 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 38 + }, + { + "__id__": 39 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 35 + }, + "propertyPath": [ + "_name" + ], + "value": "newMap01" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2cyg9D4KRTnaWvFuyUcwrn" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 35 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 35 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 35 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 40 }, "propertyPath": [ "_materials", @@ -355,6 +681,93 @@ }, "_id": "46+eJFPoNAd75C26ynMBuo" }, + { + "__type__": "cc.Node", + "_name": "attackPosIndicator", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 43 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0.1, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": -0.7071067811865475, + "y": 0, + "z": 0, + "w": 0.7071067811865476 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 4.7, + "y": 4.7, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": -90, + "y": 0, + "z": 0 + }, + "_id": "fdFAHYRNVNIr2aN7wVD+Nn" + }, + { + "__type__": "cc.MeshRenderer", + "_name": "Quad", + "_objFlags": 0, + "node": { + "__id__": 42 + }, + "_enabled": true, + "__prefab": null, + "_materials": [ + { + "__uuid__": "5bd9794b-bfe1-46e1-b390-6060f1f08992", + "__expectedType__": "cc.Material" + } + ], + "_visFlags": 0, + "lightmapSettings": { + "__id__": 44 + }, + "_mesh": { + "__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@fc873", + "__expectedType__": "cc.Mesh" + }, + "_shadowCastingMode": 0, + "_shadowReceivingMode": 1, + "_enableMorph": true, + "_id": "6fuuF9XfNLL4/uFd0cFyL+" + }, + { + "__type__": "cc.ModelLightmapSettings", + "texture": null, + "uvParam": { + "__type__": "cc.Vec4", + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "_bakeable": false, + "_castShadow": false, + "_receiveShadow": false, + "_recieveShadow": false, + "_lightmapSize": 64 + }, { "__type__": "cc.Node", "_name": "Canvas", @@ -363,29 +776,29 @@ "__id__": 1 }, "_children": [ - { - "__id__": 18 - }, - { - "__id__": 20 - }, - { - "__id__": 37 - } - ], - "_active": true, - "_components": [ { "__id__": 46 }, - { - "__id__": 47 - }, { "__id__": 48 }, { - "__id__": 49 + "__id__": 65 + } + ], + "_active": true, + "_components": [ + { + "__id__": 75 + }, + { + "__id__": 76 + }, + { + "__id__": 77 + }, + { + "__id__": 78 } ], "_prefab": null, @@ -422,13 +835,13 @@ "_name": "Camera", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 47 } ], "_prefab": null, @@ -465,7 +878,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 18 + "__id__": 46 }, "_enabled": true, "__prefab": null, @@ -505,16 +918,16 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 45 }, "_prefab": { - "__id__": 21 + "__id__": 49 } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 20 + "__id__": 48 }, "asset": { "__uuid__": "0363f7f8-204e-410e-ade0-03adca6ea835", @@ -522,7 +935,7 @@ }, "fileId": "25fHuwytBN2qk6dH5oVJvO", "instance": { - "__id__": 22 + "__id__": 50 } }, { @@ -532,31 +945,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 23 + "__id__": 51 }, { - "__id__": 25 + "__id__": 53 }, { - "__id__": 26 + "__id__": 54 }, { - "__id__": 27 + "__id__": 55 }, { - "__id__": 28 + "__id__": 56 }, { - "__id__": 30 + "__id__": 58 }, { - "__id__": 31 + "__id__": 59 }, { - "__id__": 33 + "__id__": 61 }, { - "__id__": 35 + "__id__": 63 } ], "removedComponents": [] @@ -564,7 +977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 52 }, "propertyPath": [ "_name" @@ -580,7 +993,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -595,7 +1008,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 52 }, "propertyPath": [ "_lrot" @@ -611,7 +1024,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 52 }, "propertyPath": [ "_euler" @@ -626,7 +1039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 29 + "__id__": 57 }, "propertyPath": [ "_contentSize" @@ -646,7 +1059,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 52 }, "propertyPath": [ "_layer" @@ -656,7 +1069,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 32 + "__id__": 60 }, "propertyPath": [ "_layer" @@ -672,7 +1085,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 34 + "__id__": 62 }, "propertyPath": [ "_layer" @@ -688,7 +1101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 64 }, "propertyPath": [ "_layer" @@ -706,26 +1119,29 @@ "_name": "btnAttack", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 45 }, "_children": [ { - "__id__": 38 + "__id__": 66 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 69 }, { - "__id__": 42 + "__id__": 70 }, { - "__id__": 43 + "__id__": 71 }, { - "__id__": 45 + "__id__": 73 + }, + { + "__id__": 74 } ], "_prefab": null, @@ -762,16 +1178,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 37 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 67 }, { - "__id__": 40 + "__id__": 68 } ], "_prefab": null, @@ -808,7 +1224,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 38 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -829,7 +1245,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 38 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -867,7 +1283,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -888,7 +1304,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -927,13 +1343,13 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 65 }, "_enabled": true, "__prefab": null, "clickEvents": [ { - "__id__": 44 + "__id__": 72 } ], "_interactable": true, @@ -985,14 +1401,14 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 37 + "__id__": 65 }, "_id": "96d2z2/TpJ558pTlUMNNUO" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 17 + "__id__": 45 }, "component": "", "_componentId": "d4728cOzxlKHLMu5Xg48U8U", @@ -1004,19 +1420,48 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 65 }, "_enabled": true, "__prefab": null, "_opacity": 255, "_id": "49xySc2HlNZ7kO4VRCiutC" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 65 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 36, + "_target": null, + "_left": 0, + "_right": 50.716999999999985, + "_top": 0, + "_bottom": 128.774, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "92oeFWeCtM7Lrkn50YVO1M" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1037,12 +1482,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 45 }, "_enabled": true, "__prefab": null, "_cameraComponent": { - "__id__": 19 + "__id__": 47 }, "_alignCanvasWithScreen": true, "_id": "ebX9QTnS1AlKH1eI+/bdJk" @@ -1052,7 +1497,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1081,7 +1526,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1098,129 +1543,42 @@ "__id__": 5 }, "arrows": { - "__id__": 16 + "__id__": 41 }, "camera": { "__id__": 4 }, "btnAttack": { - "__id__": 37 + "__id__": 65 }, "attackPosIndicator": { - "__id__": 50 + "__id__": 42 }, "_id": "86PJf2PFRK5LGUONuKqmzS" }, - { - "__type__": "cc.Node", - "_name": "attackPosIndicator", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 51 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0.1, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": -0.7071067811865475, - "y": 0, - "z": 0, - "w": 0.7071067811865476 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 4.7, - "y": 4.7, - "z": 1 - }, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": -90, - "y": 0, - "z": 0 - }, - "_id": "fdFAHYRNVNIr2aN7wVD+Nn" - }, - { - "__type__": "cc.MeshRenderer", - "_name": "Quad", - "_objFlags": 0, - "node": { - "__id__": 50 - }, - "_enabled": true, - "__prefab": null, - "_materials": [ - { - "__uuid__": "5bd9794b-bfe1-46e1-b390-6060f1f08992", - "__expectedType__": "cc.Material" - } - ], - "_visFlags": 0, - "lightmapSettings": { - "__id__": 52 - }, - "_mesh": { - "__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@fc873", - "__expectedType__": "cc.Mesh" - }, - "_shadowCastingMode": 0, - "_shadowReceivingMode": 1, - "_enableMorph": true, - "_id": "6fuuF9XfNLL4/uFd0cFyL+" - }, - { - "__type__": "cc.ModelLightmapSettings", - "texture": null, - "uvParam": { - "__type__": "cc.Vec4", - "x": 0, - "y": 0, - "z": 0, - "w": 0 - }, - "_bakeable": false, - "_castShadow": false, - "_receiveShadow": false, - "_recieveShadow": false, - "_lightmapSize": 64 - }, { "__type__": "cc.PrefabInfo", "fileId": "", "targetOverrides": [ { - "__id__": 54 + "__id__": 80 } ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 49 + "__id__": 78 }, "sourceInfo": null, "propertyPath": [ "joyStick" ], "target": { - "__id__": 20 + "__id__": 48 }, "targetInfo": { - "__id__": 55 + "__id__": 81 } }, { @@ -1232,16 +1590,16 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 57 + "__id__": 83 }, "shadows": { - "__id__": 58 + "__id__": 84 }, "_skybox": { - "__id__": 59 + "__id__": 85 }, "fog": { - "__id__": 60 + "__id__": 86 } }, { diff --git a/examples/cocos-creator-multiplayer/frontend/settings/v2/packages/project.json b/examples/cocos-creator-multiplayer/frontend/settings/v2/packages/project.json index e3be56d..3f1d800 100644 --- a/examples/cocos-creator-multiplayer/frontend/settings/v2/packages/project.json +++ b/examples/cocos-creator-multiplayer/frontend/settings/v2/packages/project.json @@ -1,11 +1,6 @@ { "__version__": "1.0.1", - "layer": [ - { - "name": "canvas_19", - "value": 524288 - } - ], + "layer": [], "general": { "designResolution": { "width": 750,