From 8379dfd51cdaf1e22e9c28df72e2e7511f6315b7 Mon Sep 17 00:00:00 2001 From: panw Date: Tue, 10 Mar 2026 17:00:24 +0800 Subject: [PATCH] ui --- assets/resources/gui/anim/loading.anim | 133 ++ assets/resources/gui/anim/loading.anim.meta | 13 + assets/resources/gui/aui.plist.meta | 48 +- assets/resources/gui/base.meta | 9 + .../{element/icon.prefab => base/card.prefab} | 1411 +++++++++-------- .../tip.prefab.meta => base/card.prefab.meta} | 4 +- .../gui/element/guide_hand.prefab.meta | 13 - assets/resources/gui/element/icon.prefab.meta | 13 - assets/resources/gui/element/loading.prefab | 507 ------ ...{guide_hand.prefab => loading_page.prefab} | 594 ++++--- ...g.prefab.meta => loading_page.prefab.meta} | 2 +- assets/resources/gui/element/tip.prefab | 340 ---- assets/resources/gui/raui.plist.meta | 42 +- 13 files changed, 1301 insertions(+), 1828 deletions(-) create mode 100644 assets/resources/gui/anim/loading.anim create mode 100644 assets/resources/gui/anim/loading.anim.meta create mode 100644 assets/resources/gui/base.meta rename assets/resources/gui/{element/icon.prefab => base/card.prefab} (75%) rename assets/resources/gui/{element/tip.prefab.meta => base/card.prefab.meta} (63%) delete mode 100644 assets/resources/gui/element/guide_hand.prefab.meta delete mode 100644 assets/resources/gui/element/icon.prefab.meta delete mode 100644 assets/resources/gui/element/loading.prefab rename assets/resources/gui/element/{guide_hand.prefab => loading_page.prefab} (68%) rename assets/resources/gui/element/{loading.prefab.meta => loading_page.prefab.meta} (84%) delete mode 100644 assets/resources/gui/element/tip.prefab diff --git a/assets/resources/gui/anim/loading.anim b/assets/resources/gui/anim/loading.anim new file mode 100644 index 00000000..735b31a6 --- /dev/null +++ b/assets/resources/gui/anim/loading.anim @@ -0,0 +1,133 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "loading", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.5, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 6 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 4 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 5 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.041666666666666664, + 0.08333333333333333, + 0.125, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667, + 0.4583333333333333 + ], + "_values": [ + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@23c37", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@45a69", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@bd1b2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@caa4e", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@8c243", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@0205e", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d9301", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@bc63c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@c8d54", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d25cb", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@c412b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@c48c0", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/gui/anim/loading.anim.meta b/assets/resources/gui/anim/loading.anim.meta new file mode 100644 index 00000000..c301ff30 --- /dev/null +++ b/assets/resources/gui/anim/loading.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "3dbae613-a5ce-4d9c-b296-787a2cc3b9cb", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "loading" + } +} diff --git a/assets/resources/gui/aui.plist.meta b/assets/resources/gui/aui.plist.meta index 352d34f1..ec7e6493 100644 --- a/assets/resources/gui/aui.plist.meta +++ b/assets/resources/gui/aui.plist.meta @@ -24,10 +24,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -116,10 +116,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -438,10 +438,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -484,10 +484,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -530,10 +530,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -576,10 +576,10 @@ "height": 202, "rawWidth": 181, "rawHeight": 202, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 50, + "borderBottom": 50, + "borderLeft": 50, + "borderRight": 50, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/base.meta b/assets/resources/gui/base.meta new file mode 100644 index 00000000..c087386b --- /dev/null +++ b/assets/resources/gui/base.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "6cb56f1e-4cac-4d6f-8e4d-eff83084dae0", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/gui/element/icon.prefab b/assets/resources/gui/base/card.prefab similarity index 75% rename from assets/resources/gui/element/icon.prefab rename to assets/resources/gui/base/card.prefab index 9133027a..e3400fbb 100644 --- a/assets/resources/gui/element/icon.prefab +++ b/assets/resources/gui/base/card.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "icon", + "_name": "card", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,35 +13,23 @@ }, { "__type__": "cc.Node", - "_name": "icon", + "_name": "card", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, "_children": [ { "__id__": 2 - }, - { - "__id__": 10 - }, - { - "__id__": 28 - }, - { - "__id__": 36 - }, - { - "__id__": 44 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 56 } ], "_prefab": { - "__id__": 54 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -58,8 +46,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -74,27 +62,96 @@ }, { "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_Bg", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [], - "_active": false, - "_components": [ + "_children": [ { "__id__": 3 }, { - "__id__": 5 + "__id__": 11 }, { - "__id__": 7 + "__id__": 19 + }, + { + "__id__": 27 + }, + { + "__id__": 35 + }, + { + "__id__": 43 + } + ], + "_active": true, + "_components": [ + { + "__id__": 51 + }, + { + "__id__": 53 } ], "_prefab": { - "__id__": 9 + "__id__": 55 + }, + "_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": "base", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -131,16 +188,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 5 }, "_contentSize": { "__type__": "cc.Size", - "width": 120, - "height": 120 + "width": 181, + "height": 202 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -151,7 +208,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5eM6KPzudLZKvjZQrK0NM2" + "fileId": "14irIK3RRDSqgviHu9DRy9" }, { "__type__": "cc.Sprite", @@ -159,24 +216,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 7 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 183, - "g": 183, - "b": 183, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@85dcd", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@1935d", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -191,15 +248,12 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f9ogyJW/dEYqeUj14GikM+" + "fileId": "79zaw6q+NHs4fotvPKAzQ6" }, { "__type__": "cc.Widget", @@ -207,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 9 }, "_alignFlags": 45, "_target": null, @@ -227,15 +281,15 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 52, - "_originalHeight": 52, + "_originalWidth": 181, + "_originalHeight": 202, "_alignMode": 2, "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7eAyq7qYlE069L2dtOHyk3" + "fileId": "d64qukG1pJYIpVR6bh0mgK" }, { "__type__": "cc.PrefabInfo", @@ -245,81 +299,21 @@ "asset": { "__id__": 0 }, - "fileId": "7ewOxTVExKIY63YJW2TBo6", + "fileId": "3fTu8PgXdKMpeJ+koTdZ1g", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "mask", + "_name": "green", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 11 - } - ], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - }, - { - "__id__": 25 - } - ], - "_prefab": { - "__id__": 27 - }, - "_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": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 10 + "__id__": 2 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 12 @@ -377,8 +371,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 115, - "height": 115 + "width": 181, + "height": 202 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -389,7 +383,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fbhX26wU5OrIPM48wALLcO" + "fileId": "a75/rVH5tKgoarZ+Z9SeKu" }, { "__type__": "cc.Sprite", @@ -414,12 +408,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "031877cb-0f3d-4e92-bc5d-e492a0d95a08@a59f6", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@020fe", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -429,15 +423,12 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "031877cb-0f3d-4e92-bc5d-e492a0d95a08", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65fhINxQtEaJME7yDPjkSr" + "fileId": "1d57NsCMVMpKFQcM/FQQcY" }, { "__type__": "cc.Widget", @@ -465,15 +456,15 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, + "_originalWidth": 181, + "_originalHeight": 202, "_alignMode": 2, "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2/5oUjZVKZY+m10mnd26V" + "fileId": "dfIG8raqpDdYagcBRrPZan" }, { "__type__": "cc.PrefabInfo", @@ -483,359 +474,34 @@ "asset": { "__id__": 0 }, - "fileId": "610K+cmb5GVK1NLQhD7532", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 115 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "39BTShaYtH3L086pg8R7He" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 22 - }, - "_alignFlags": 45, - "_target": null, - "_left": 2.5, - "_right": 2.5, - "_top": 2.5, - "_bottom": 2.5, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 40, - "_originalHeight": 40, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d8NI/LJNhL0IInV3hZTxJ6" - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 24 - }, - "_type": 3, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9bUDVpVLhIwqLw6FtkR07Z" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 10 - }, - "_enabled": true, - "__prefab": { - "__id__": 26 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@85dcd", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9aElqOpplKap/opqqS+5ay" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "e8oDB6MdZNzYYz6hcHnb5F", + "fileId": "9eFCp7pwpF2KxDNUoGycpx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_InnerBorder1", + "_name": "blue", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 29 - }, - { - "__id__": 31 - }, - { - "__id__": 33 - } - ], - "_prefab": { - "__id__": 35 - }, - "_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__": 28 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 116, - "height": 116 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1828Q758JHBL+FAffUf/BP" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 28 - }, - "_enabled": true, - "__prefab": { - "__id__": 32 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4cbOQj0m9PFYp9y/CnGsRb" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 28 - }, - "_enabled": true, - "__prefab": { - "__id__": 34 - }, - "_alignFlags": 45, - "_target": null, - "_left": 2, - "_right": 2, - "_top": 2, - "_bottom": 2, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 48, - "_originalHeight": 48, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d5QrGZMDJH37teWtZbEUJ4" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "cbJXPyX3lOu7Smyp90RBel", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_InnerBorder2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 + "__id__": 2 }, "_children": [], "_active": false, "_components": [ { - "__id__": 37 + "__id__": 20 }, { - "__id__": 39 + "__id__": 22 }, { - "__id__": 41 + "__id__": 24 } ], "_prefab": { - "__id__": 43 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -872,16 +538,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", - "width": 108, - "height": 108 + "width": 181, + "height": 202 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -892,7 +558,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4bkRXmvVxHYL15R0GBAM01" + "fileId": "062pt0m/ZBr6Y4EsQYlSi5" }, { "__type__": "cc.Sprite", @@ -900,29 +566,29 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 69, - "g": 29, - "b": 27, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@98592", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -932,15 +598,12 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6f3McqjHFDU684hWmU9H6+" + "fileId": "15ZeAqj4NKJpr/y5EnKAuH" }, { "__type__": "cc.Widget", @@ -948,189 +611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 42 - }, - "_alignFlags": 45, - "_target": null, - "_left": 6, - "_right": 6, - "_top": 6, - "_bottom": 6, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 40, - "_originalHeight": 40, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1cf3NAiT1DpqZKtVKHOl+M" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a0LuFsy8tAq5G4LPBqz+Ob", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_Border", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 45 - }, - { - "__id__": 47 - }, - { - "__id__": 49 - } - ], - "_prefab": { - "__id__": 51 - }, - "_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__": 44 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 120, - "height": 120 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "5eDfMLI8xP6YWRZoTQMPqY" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 44 - }, - "_enabled": true, - "__prefab": { - "__id__": 48 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 28, - "g": 23, - "b": 50, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "59XDiqQaxCT6Jp80aO02QM" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 44 - }, - "_enabled": true, - "__prefab": { - "__id__": 50 + "__id__": 25 }, "_alignFlags": 45, "_target": null, @@ -1146,15 +631,15 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 52, - "_originalHeight": 52, + "_originalWidth": 181, + "_originalHeight": 202, "_alignMode": 2, "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "515r/6TstO+KbmG6bxLEND" + "fileId": "4276lqIENEDbVYznbmfFSr" }, { "__type__": "cc.PrefabInfo", @@ -1164,7 +649,609 @@ "asset": { "__id__": 0 }, - "fileId": "04N5m+3s9DKKfGksBuSn9t", + "fileId": "8fJc+wH+xCjad4IqLKNO4l", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "zhise", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_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__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 181, + "height": 202 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dUj9wYTxI/rB9mh7Vnwl6" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@494de", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d9r2M4QE1B6bzvvsNAD+rD" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_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": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "83kZ+GuspEi7PbXphIM4hp" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "acwD4C1sBPuoPE5QceWfkP", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 36 + }, + { + "__id__": 38 + }, + { + "__id__": 40 + } + ], + "_prefab": { + "__id__": 42 + }, + "_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__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 37 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 181, + "height": 202 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "21FOsefVFIlomW5PLk50HV" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@68572", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "57uv/NJtFL5bJq5VQse9Fq" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 41 + }, + "_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": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "685rhh2EVGg7nepz/X1zEs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "88rsBYX1BGBbNaXlIYCUnK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "red", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 44 + }, + { + "__id__": 46 + }, + { + "__id__": 48 + } + ], + "_prefab": { + "__id__": 50 + }, + "_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__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 181, + "height": 202 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c3kh7d46JO/qJovtDqqjo6" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@37e0c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "55YaXb+rJKQoKWuhJ03jm3" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 43 + }, + "_enabled": true, + "__prefab": { + "__id__": 49 + }, + "_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": 181, + "_originalHeight": 202, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1zgbS2lNHyKTtp5M6Usif" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "dfJRrqYBVDEIVah0GKdxYj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 181, + "height": 202 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "26n+WBtxJJXZD7a+tO1kv7" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d8DCk1e+5NdIvZNVcKcgmM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3eDD5AanxBoZv/8wyMiJ+M", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1179,12 +1266,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", - "width": 120, - "height": 120 + "width": 181, + "height": 202 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1195,7 +1282,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1ND4uWvRDUYtOD3Iy9Esx" + "fileId": "b6/HPesdpG8ZsWB4vg6xf2" }, { "__type__": "cc.PrefabInfo", @@ -1205,7 +1292,7 @@ "asset": { "__id__": 0 }, - "fileId": "5cFA6x+0ZJmLmO17YsUzPZ", + "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": null, "targetOverrides": null } diff --git a/assets/resources/gui/element/tip.prefab.meta b/assets/resources/gui/base/card.prefab.meta similarity index 63% rename from assets/resources/gui/element/tip.prefab.meta rename to assets/resources/gui/base/card.prefab.meta index 08d29e70..a2a72510 100644 --- a/assets/resources/gui/element/tip.prefab.meta +++ b/assets/resources/gui/base/card.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "427187e5-0310-47d0-a5a1-a71397f17545", + "uuid": "8aaff904-8c27-4173-9716-7161893b336e", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "tip" + "syncNodeName": "card" } } diff --git a/assets/resources/gui/element/guide_hand.prefab.meta b/assets/resources/gui/element/guide_hand.prefab.meta deleted file mode 100644 index ad8e1f57..00000000 --- a/assets/resources/gui/element/guide_hand.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "1c7a67cd-0d50-4b26-ae0f-8bbe3ec1a3a3", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "guide_hand" - } -} diff --git a/assets/resources/gui/element/icon.prefab.meta b/assets/resources/gui/element/icon.prefab.meta deleted file mode 100644 index f1d5248a..00000000 --- a/assets/resources/gui/element/icon.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "daf8b2aa-eb82-4ca7-8ec8-4465602e2b02", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "icon" - } -} diff --git a/assets/resources/gui/element/loading.prefab b/assets/resources/gui/element/loading.prefab deleted file mode 100644 index 86cf532b..00000000 --- a/assets/resources/gui/element/loading.prefab +++ /dev/null @@ -1,507 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "loading", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "loading", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 10 - } - ], - "_active": true, - "_components": [ - { - "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 26 - } - ], - "_prefab": { - "__id__": 28 - }, - "_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": "bg1", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -650, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 740, - "height": 1300 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9d1lAxVeZJsI6hfgmn16l0" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@8b868", - "__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": { - "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b1XGKSWqlF/Yf7yyv3neih" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 20, - "_originalHeight": 20, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3djIeuqDpPZbBlEA+Wmqzv" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "bblW/bQxdMP5lraMnWpYVC", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 11 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 10 - }, - "asset": { - "__uuid__": "9cc71d8c-192a-4234-8204-352f42b95c65", - "__expectedType__": "cc.Prefab" - }, - "fileId": "a0daVw8DRLi6ToMaTA0VS2", - "instance": { - "__id__": 12 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "7eQv5ppk1Hpr0USxE6y7Ww", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 13 - }, - { - "__id__": 15 - }, - { - "__id__": 16 - }, - { - "__id__": 17 - }, - { - "__id__": 18 - }, - { - "__id__": 20 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 14 - }, - "propertyPath": [ - "_name" - ], - "value": "netinstable" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a0daVw8DRLi6ToMaTA0VS2" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 14 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 14 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 14 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 19 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 740, - "height": 1300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "77N2cid5pKDpXplRH/AWEU" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 21 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 740, - "height": 1300 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "fbb9ezFuVDaKU7Tqqncexy" - ] - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 740, - "height": 1300 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "5f/wlde7xDGqRmc4TaTJHZ" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_alignFlags": 45, - "_target": null, - "_left": -10, - "_right": -10, - "_top": -10, - "_bottom": -10, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cenzbCwmZE56xRaac3dhPZ" - }, - { - "__type__": "cc.BlockInputEvents", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 27 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "91NOQbZ0pEZpdUsC/eNF62" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": [ - { - "__id__": 10 - } - ] - } -] \ No newline at end of file diff --git a/assets/resources/gui/element/guide_hand.prefab b/assets/resources/gui/element/loading_page.prefab similarity index 68% rename from assets/resources/gui/element/guide_hand.prefab rename to assets/resources/gui/element/loading_page.prefab index e3832b26..387c2ab0 100644 --- a/assets/resources/gui/element/guide_hand.prefab +++ b/assets/resources/gui/element/loading_page.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "guide_hand", + "_name": "loading_page", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,23 +13,32 @@ }, { "__type__": "cc.Node", - "_name": "guide_hand", + "_name": "loading_page", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, "_children": [ { "__id__": 2 + }, + { + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 22 + }, + { + "__id__": 24 + }, + { + "__id__": 26 } ], "_prefab": { - "__id__": 22 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", @@ -62,123 +71,18 @@ }, { "__type__": "cc.Node", - "_name": "Tutorial_Hand", + "_name": "bg1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 3 - } - ], - "_active": true, - "_components": [ - { - "__id__": 13 - }, - { - "__id__": 15 - }, - { - "__id__": 17 - } - ], - "_prefab": { - "__id__": 19 - }, - "_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": "Node", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 4 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - } - ], - "_prefab": { - "__id__": 12 - }, - "_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": "Tutorial_Hand", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, "_children": [], "_active": true, "_components": [ + { + "__id__": 3 + }, { "__id__": 5 }, @@ -189,6 +93,235 @@ "_prefab": { "__id__": 9 }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -650, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 740, + "height": 1300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9d1lAxVeZJsI6hfgmn16l0" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 134 + }, + "_spriteFrame": { + "__uuid__": "fbfc0bb3-1ab9-4b38-8173-112c0ac3e4eb@1a9f3", + "__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": { + "__uuid__": "fbfc0bb3-1ab9-4b38-8173-112c0ac3e4eb", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b1XGKSWqlF/Yf7yyv3neih" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 20, + "_originalHeight": 20, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3djIeuqDpPZbBlEA+Wmqzv" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bblW/bQxdMP5lraMnWpYVC", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "loading", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 11 + } + ], + "_active": true, + "_components": [ + { + "__id__": 19 + } + ], + "_prefab": { + "__id__": 21 + }, + "_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": "Loading_01_1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, @@ -224,16 +357,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 4 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", - "width": 82, - "height": 90 + "width": 142, + "height": 144 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -244,7 +377,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f7LAwbuhlD/7QxqfBwELww" + "fileId": "d7ffD6DSZBCJmjKz5gDTPF" }, { "__type__": "cc.Sprite", @@ -252,11 +385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 4 + "__id__": 11 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 15 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -269,12 +402,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@0444b", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@23c37", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -292,7 +425,36 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9evflFdCpFG4u0ahbeDFIs" + "fileId": "4b5NE4ClhF34xc9N2z8wnb" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "3dbae613-a5ce-4d9c-b296-787a2cc3b9cb", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "3dbae613-a5ce-4d9c-b296-787a2cc3b9cb", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "40x/DfkBhEpaFktlwOg1d/" }, { "__type__": "cc.PrefabInfo", @@ -302,7 +464,7 @@ "asset": { "__id__": 0 }, - "fileId": "77FUXyx7BG1aZIuyvMT0Ov", + "fileId": "eew8EyMrlMoZZ/o4Tdr7xw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -313,11 +475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 20 }, "_contentSize": { "__type__": "cc.Size", @@ -333,7 +495,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e1kqvHxShNHqik3KVijDmw" + "fileId": "a3WY23Gy5KfpenDjUKVW3Y" }, { "__type__": "cc.PrefabInfo", @@ -343,119 +505,7 @@ "asset": { "__id__": 0 }, - "fileId": "a2GJ8EsdFF8YciqOlDT99O", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 82, - "height": 90 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1KB9dIDFAxbmLQg99swxi" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "75BNcZLuNN16FmtGUp8YIl" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "cc054dac-20b0-428b-bbb1-02776f6774ee", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "cc054dac-20b0-428b-bbb1-02776f6774ee", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f82R0f+7pPqrE0vPPEKFOZ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0658nQXq9N0oQ+gWV86dic", + "fileId": "903UoUuz1Cm5wQ8WfWFN7l", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -470,12 +520,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", - "width": 180, - "height": 100 + "width": 740, + "height": 1300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -486,7 +536,61 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2dOsoG349BmaSplRClOk+M" + "fileId": "5f/wlde7xDGqRmc4TaTJHZ" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_alignFlags": 45, + "_target": null, + "_left": -10, + "_right": -10, + "_top": -10, + "_bottom": -10, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cenzbCwmZE56xRaac3dhPZ" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "91NOQbZ0pEZpdUsC/eNF62" }, { "__type__": "cc.PrefabInfo", @@ -496,7 +600,7 @@ "asset": { "__id__": 0 }, - "fileId": "4fJlP7AItEGL6+yc5TgOyj", + "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": null, "targetOverrides": null } diff --git a/assets/resources/gui/element/loading.prefab.meta b/assets/resources/gui/element/loading_page.prefab.meta similarity index 84% rename from assets/resources/gui/element/loading.prefab.meta rename to assets/resources/gui/element/loading_page.prefab.meta index e8a3c7c3..73fd2e7d 100644 --- a/assets/resources/gui/element/loading.prefab.meta +++ b/assets/resources/gui/element/loading_page.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "loading" + "syncNodeName": "loading_page" } } diff --git a/assets/resources/gui/element/tip.prefab b/assets/resources/gui/element/tip.prefab deleted file mode 100644 index f29f626c..00000000 --- a/assets/resources/gui/element/tip.prefab +++ /dev/null @@ -1,340 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "tip", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "tip", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - } - ], - "_prefab": { - "__id__": 14 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -360, - "y": 700, - "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.Node", - "_name": "tip_label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 360, - "y": 100, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 620, - "height": 48.1 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1aSIaqAV1MEp8ApxTDY/eA" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "伟大的勇者,欢迎来到 『像素大陆』", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, - "_fontFamily": "Arial", - "_lineHeight": 35, - "_overflow": 3, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 1, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bfG4t/2QdEK7+2XVJTDwYr" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_alignFlags": 42, - "_target": null, - "_left": 50, - "_right": 50, - "_top": 106.3, - "_bottom": 39.3, - "_horizontalCenter": 100, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 420, - "_originalHeight": 54.4, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "73m5GoISlKD5yVNtnnfbIp" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "79YIQDtXNBi4+Fe9c3EQNE", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 720, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ccHQEtJuZAcaCckGq+JhVV" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_alignFlags": 40, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 380, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "504Z4v5h5KYJa+ZDZKTfRk" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "20nBFDj4RJF52sWGsX/uRA", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/gui/raui.plist.meta b/assets/resources/gui/raui.plist.meta index e1049b41..9d6f6de2 100644 --- a/assets/resources/gui/raui.plist.meta +++ b/assets/resources/gui/raui.plist.meta @@ -438,10 +438,10 @@ "height": 40, "rawWidth": 40, "rawHeight": 40, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 20, + "borderBottom": 20, + "borderLeft": 20, + "borderRight": 20, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -990,10 +990,10 @@ "height": 53, "rawWidth": 96, "rawHeight": 53, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 25, + "borderBottom": 25, + "borderLeft": 40, + "borderRight": 40, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1036,7 +1036,7 @@ "height": 44, "rawWidth": 18, "rawHeight": 44, - "borderTop": 0, + "borderTop": 44, "borderBottom": 0, "borderLeft": 0, "borderRight": 0, @@ -1082,10 +1082,10 @@ "height": 43, "rawWidth": 76, "rawHeight": 43, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 20, + "borderBottom": 20, + "borderLeft": 30, + "borderRight": 30, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1128,10 +1128,10 @@ "height": 57, "rawWidth": 90, "rawHeight": 57, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 25, + "borderBottom": 25, + "borderLeft": 40, + "borderRight": 40, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1174,10 +1174,10 @@ "height": 45, "rawWidth": 88, "rawHeight": 45, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 20, + "borderBottom": 20, + "borderLeft": 40, + "borderRight": 40, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5,