diff --git a/assets/Scripts/Main/Config/CommonConfig.ts b/assets/Scripts/Main/Config/CommonConfig.ts index d4e731b8..9837dfb0 100644 --- a/assets/Scripts/Main/Config/CommonConfig.ts +++ b/assets/Scripts/Main/Config/CommonConfig.ts @@ -41,8 +41,9 @@ export namespace CommonConfig { Layer_ui2 = 2, Layer_dialog = 3, Layer_tips = 4, - Layer_top = 5, - Layer_navigationbar = 6, + + Layer_navigationbar = 5, + Layer_top = 6, } } diff --git a/assets/Scripts/Main/Manager/ViewManager.ts b/assets/Scripts/Main/Manager/ViewManager.ts index 53bc77c5..7c03663e 100644 --- a/assets/Scripts/Main/Manager/ViewManager.ts +++ b/assets/Scripts/Main/Manager/ViewManager.ts @@ -227,7 +227,7 @@ export class ViewManager extends Component { i_openData, callBack, i_prefab, - "tips" + "top" ); } else { logger.log("打开界面:", i_prefab); diff --git a/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab b/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab index 0d77916c..6eca37c1 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab @@ -920,7 +920,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 81.5, + "y": 23.375999999999976, "z": 0 }, "_lrot": { @@ -1013,8 +1013,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 865, - "height": 1116 + "width": 865.0920000000001, + "height": 616.6315682281061 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1041,8 +1041,8 @@ }, "_alignFlags": 42, "_target": null, - "_left": 0, - "_right": 0, + "_left": -0.023000000000045873, + "_right": -0.022999999999946397, "_top": 508, "_bottom": 508, "_horizontalCenter": 0, @@ -1085,7 +1085,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -1132,8 +1135,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 865, - "height": 1116 + "width": 865.046, + "height": 616.631568 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1162,7 +1165,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": 307.808216, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3275,7 +3278,7 @@ "__id__": 34 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 138 @@ -3295,8 +3298,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 342.19899999999996, - "y": 551.768, + "x": 372.25199999999995, + "y": 268.53600000000006, "z": 0 }, "_lrot": { @@ -3358,7 +3361,7 @@ "node": { "__id__": 137 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 141 }, @@ -3367,9 +3370,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, + "r": 214, + "g": 214, + "b": 214, "a": 255 }, "_spriteFrame": { @@ -3408,7 +3411,7 @@ "__id__": 143 }, "clickEvents": [], - "_interactable": false, + "_interactable": true, "_transition": 1, "_normalColor": { "__type__": "cc.Color", @@ -3480,8 +3483,8 @@ "_alignFlags": 33, "_target": null, "_left": 0, - "_right": 62.301000000000045, - "_top": 59.73199999999997, + "_right": 32.24800000000005, + "_top": 342.96399999999994, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, diff --git a/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta b/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta index 026a11c6..6a6b280f 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta +++ b/assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "afacd1df-6501-429b-9ea5-78e88900e6fa", + "uuid": "b74d98b5-cded-438b-aa35-efecb6e3d293", "files": [ ".json" ], diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index 76b57f80..73c9b578 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -920,7 +920,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 81.5, + "y": 23.375999999999976, "z": 0 }, "_lrot": { @@ -1013,8 +1013,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 865, - "height": 1116 + "width": 865.0920000000001, + "height": 616.6315682281061 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1041,8 +1041,8 @@ }, "_alignFlags": 42, "_target": null, - "_left": 0, - "_right": 0, + "_left": -0.023000000000045873, + "_right": -0.022999999999946397, "_top": 508, "_bottom": 508, "_horizontalCenter": 0, @@ -1085,7 +1085,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -1132,8 +1135,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 865, - "height": 1116 + "width": 865.046, + "height": 616.631568 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1162,7 +1165,7 @@ "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": 307.808216, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3295,8 +3298,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 342.19899999999996, - "y": 551.768, + "x": 372.25199999999995, + "y": 268.53600000000006, "z": 0 }, "_lrot": { @@ -3480,8 +3483,8 @@ "_alignFlags": 33, "_target": null, "_left": 0, - "_right": 62.301000000000045, - "_top": 59.73199999999997, + "_right": 32.24800000000005, + "_top": 342.96399999999994, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, diff --git a/assets/bundles/Chat18x/Web3PopPanel.prefab b/assets/bundles/Chat18x/Web3PopPanel.prefab index 6fe5db3b..801f0361 100644 --- a/assets/bundles/Chat18x/Web3PopPanel.prefab +++ b/assets/bundles/Chat18x/Web3PopPanel.prefab @@ -22,41 +22,44 @@ "__id__": 2 }, { - "__id__": 32 + "__id__": 12 }, { - "__id__": 48 + "__id__": 42 }, { - "__id__": 80 + "__id__": 58 }, { - "__id__": 86 + "__id__": 90 }, { - "__id__": 92 + "__id__": 96 }, { - "__id__": 212 + "__id__": 102 }, { - "__id__": 248 + "__id__": 222 + }, + { + "__id__": 258 } ], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 280 }, { - "__id__": 272 + "__id__": 282 }, { - "__id__": 274 + "__id__": 284 } ], "_prefab": { - "__id__": 276 + "__id__": 286 }, "_lpos": { "__type__": "cc.Vec3", @@ -89,141 +92,30 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "blocker", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 }, - "_children": [ - { - "__id__": 3 - }, - { - "__id__": 19 - } - ], - "_active": true, - "_components": [ - { - "__id__": 27 - }, - { - "__id__": 29 - } - ], - "_prefab": { - "__id__": 31 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 68.57999999999993, - "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": "closeBtn", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 4 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 - } - ], - "_prefab": { - "__id__": 18 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 345.44100000000003, - "y": 482.249, - "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": "Sprite", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, "_children": [], "_active": true, "_components": [ + { + "__id__": 3 + }, { "__id__": 5 }, { "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 9 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", @@ -260,12 +152,319 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { "__id__": 4 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1295, + "height": 3176 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2d1j9yCcJBpIH8I/cQhUYm" + }, + { + "__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": 24, + "g": 15, + "b": 32, + "a": 153 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__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": "efrLDMXt5Po5pcKAmmlKdU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": -107.5, + "_right": -107.5, + "_top": -530.5, + "_bottom": -530.5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 36, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcWBn24YdAdbeYWYOrE29p" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dbgQSg3oRGyqiSUdqZKI6R" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5bOsntanNN04zQ99TLBi3G", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 13 + }, + { + "__id__": 29 + } + ], + "_active": true, + "_components": [ + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 68.57999999999993, + "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": "closeBtn", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 12 + }, + "_children": [ + { + "__id__": 14 + } + ], + "_active": true, + "_components": [ + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + }, + { + "__id__": 26 + } + ], + "_prefab": { + "__id__": 28 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 345.44100000000003, + "y": 482.249, + "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": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 13 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, "_contentSize": { "__type__": "cc.Size", "width": 56, @@ -288,11 +487,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 4 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 18 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -346,11 +545,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -374,11 +573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 13 }, "_enabled": false, "__prefab": { - "__id__": 13 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -419,11 +618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 25 }, "clickEvents": [], "_interactable": true, @@ -475,7 +674,7 @@ "_duration": 0.1, "_zoomScale": 0.9, "_target": { - "__id__": 3 + "__id__": 13 }, "_id": "" }, @@ -489,11 +688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 13 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 27 }, "_alignFlags": 33, "_target": null, @@ -538,23 +737,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 2 + "__id__": 12 }, "_children": [], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 30 }, { - "__id__": 22 + "__id__": 32 }, { - "__id__": 24 + "__id__": 34 } ], "_prefab": { - "__id__": 26 + "__id__": 36 }, "_lpos": { "__type__": "cc.Vec3", @@ -591,11 +790,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 31 }, "_contentSize": { "__type__": "cc.Size", @@ -619,11 +818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 33 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -690,11 +889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 29 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 35 }, "languageKey": "web3panel.title", "defaultText": "", @@ -724,11 +923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -752,11 +951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -814,23 +1013,23 @@ }, "_children": [ { - "__id__": 33 + "__id__": 43 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 51 }, { - "__id__": 43 + "__id__": 53 }, { - "__id__": 45 + "__id__": 55 } ], "_prefab": { - "__id__": 47 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -867,23 +1066,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 32 + "__id__": 42 }, "_children": [], "_active": false, "_components": [ { - "__id__": 34 + "__id__": 44 }, { - "__id__": 36 + "__id__": 46 }, { - "__id__": 38 + "__id__": 48 } ], "_prefab": { - "__id__": 40 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -920,11 +1119,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -948,11 +1147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -993,11 +1192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 49 }, "_alignFlags": 9, "_target": null, @@ -1042,11 +1241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1070,11 +1269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1138,11 +1337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 56 }, "languageKey": "web3panel.warning", "defaultText": "", @@ -1176,23 +1375,23 @@ }, "_children": [ { - "__id__": 49 + "__id__": 59 }, { - "__id__": 61 + "__id__": 71 }, { - "__id__": 69 + "__id__": 79 } ], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 87 } ], "_prefab": { - "__id__": 79 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1229,24 +1428,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 48 + "__id__": 58 }, "_children": [ { - "__id__": 50 + "__id__": 60 } ], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 66 }, { - "__id__": 58 + "__id__": 68 } ], "_prefab": { - "__id__": 60 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1283,20 +1482,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 49 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 61 }, { - "__id__": 53 + "__id__": 63 } ], "_prefab": { - "__id__": 55 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1333,11 +1532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1361,11 +1560,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 50 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1419,11 +1618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -1447,11 +1646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 59 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1505,23 +1704,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 48 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 72 }, { - "__id__": 64 + "__id__": 74 }, { - "__id__": 66 + "__id__": 76 } ], "_prefab": { - "__id__": 68 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -1558,11 +1757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1586,11 +1785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 75 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1657,11 +1856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 71 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 77 }, "languageKey": "web3panel.amount", "defaultText": "", @@ -1691,23 +1890,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 48 + "__id__": 58 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 80 }, { - "__id__": 72 + "__id__": 82 }, { - "__id__": 74 + "__id__": 84 } ], "_prefab": { - "__id__": 76 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -1744,11 +1943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", @@ -1772,11 +1971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 83 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1840,11 +2039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 85 }, "_alignFlags": 0, "_target": null, @@ -1889,11 +2088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -1936,14 +2135,14 @@ "_active": true, "_components": [ { - "__id__": 81 + "__id__": 91 }, { - "__id__": 83 + "__id__": 93 } ], "_prefab": { - "__id__": 85 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -1980,11 +2179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2008,11 +2207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2069,14 +2268,14 @@ "_active": true, "_components": [ { - "__id__": 87 + "__id__": 97 }, { - "__id__": 89 + "__id__": 99 } ], "_prefab": { - "__id__": 91 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -2113,11 +2312,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -2141,11 +2340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2226,26 +2425,26 @@ }, "_children": [ { - "__id__": 93 + "__id__": 103 }, { - "__id__": 101 + "__id__": 111 }, { - "__id__": 115 + "__id__": 125 }, { - "__id__": 127 + "__id__": 137 } ], "_active": true, "_components": [ { - "__id__": 209 + "__id__": 219 } ], "_prefab": { - "__id__": 211 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -2282,23 +2481,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 102 }, "_children": [], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 104 }, { - "__id__": 96 + "__id__": 106 }, { - "__id__": 98 + "__id__": 108 } ], "_prefab": { - "__id__": 100 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -2335,11 +2534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 103 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -2363,11 +2562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 103 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 107 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2434,11 +2633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 103 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 109 }, "languageKey": "web3panel.network", "defaultText": "", @@ -2468,27 +2667,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 102 }, "_children": [ { - "__id__": 102 + "__id__": 112 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 118 }, { - "__id__": 110 + "__id__": 120 }, { - "__id__": 112 + "__id__": 122 } ], "_prefab": { - "__id__": 114 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -2525,20 +2724,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 101 + "__id__": 111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 113 }, { - "__id__": 105 + "__id__": 115 } ], "_prefab": { - "__id__": 107 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -2575,11 +2774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -2603,11 +2802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2661,11 +2860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2689,11 +2888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2734,11 +2933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 123 }, "clickEvents": [], "_interactable": true, @@ -2803,24 +3002,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 102 }, "_children": [ { - "__id__": 116 + "__id__": 126 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 132 }, { - "__id__": 124 + "__id__": 134 } ], "_prefab": { - "__id__": 126 + "__id__": 136 }, "_lpos": { "__type__": "cc.Vec3", @@ -2857,20 +3056,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 115 + "__id__": 125 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 127 }, { - "__id__": 119 + "__id__": 129 } ], "_prefab": { - "__id__": 121 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2907,11 +3106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -2935,11 +3134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 116 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 130 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3016,11 +3215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -3044,11 +3243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3102,36 +3301,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 102 }, "_children": [ { - "__id__": 128 + "__id__": 138 }, { - "__id__": 146 + "__id__": 156 }, { - "__id__": 164 + "__id__": 174 }, { - "__id__": 182 + "__id__": 192 } ], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 212 }, { - "__id__": 204 + "__id__": 214 }, { - "__id__": 206 + "__id__": 216 } ], "_prefab": { - "__id__": 208 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -3168,27 +3367,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 137 }, "_children": [ { - "__id__": 129 + "__id__": 139 }, { - "__id__": 135 + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 151 }, { - "__id__": 143 + "__id__": 153 } ], "_prefab": { - "__id__": 145 + "__id__": 155 }, "_lpos": { "__type__": "cc.Vec3", @@ -3225,20 +3424,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 128 + "__id__": 138 }, "_children": [], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 140 }, { - "__id__": 132 + "__id__": 142 } ], "_prefab": { - "__id__": 134 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -3275,11 +3474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 141 }, "_contentSize": { "__type__": "cc.Size", @@ -3303,11 +3502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 139 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 143 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3361,20 +3560,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 128 + "__id__": 138 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 146 }, { - "__id__": 138 + "__id__": 148 } ], "_prefab": { - "__id__": 140 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -3411,11 +3610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3439,11 +3638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3520,11 +3719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -3548,11 +3747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 128 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 154 }, "clickEvents": [], "_interactable": true, @@ -3617,27 +3816,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 137 }, "_children": [ { - "__id__": 147 + "__id__": 157 }, { - "__id__": 153 + "__id__": 163 } ], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 169 }, { - "__id__": 161 + "__id__": 171 } ], "_prefab": { - "__id__": 163 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", @@ -3674,20 +3873,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 146 + "__id__": 156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 148 + "__id__": 158 }, { - "__id__": 150 + "__id__": 160 } ], "_prefab": { - "__id__": 152 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3724,11 +3923,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -3752,11 +3951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3810,20 +4009,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 146 + "__id__": 156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 154 + "__id__": 164 }, { - "__id__": 156 + "__id__": 166 } ], "_prefab": { - "__id__": 158 + "__id__": 168 }, "_lpos": { "__type__": "cc.Vec3", @@ -3860,11 +4059,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -3888,11 +4087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3969,11 +4168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 146 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -3997,11 +4196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 146 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 172 }, "clickEvents": [], "_interactable": true, @@ -4066,27 +4265,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 137 }, "_children": [ { - "__id__": 165 + "__id__": 175 }, { - "__id__": 171 + "__id__": 181 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 187 }, { - "__id__": 179 + "__id__": 189 } ], "_prefab": { - "__id__": 181 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -4123,20 +4322,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 174 }, "_children": [], "_active": true, "_components": [ { - "__id__": 166 + "__id__": 176 }, { - "__id__": 168 + "__id__": 178 } ], "_prefab": { - "__id__": 170 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -4173,11 +4372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -4201,11 +4400,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4259,20 +4458,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 164 + "__id__": 174 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 182 }, { - "__id__": 174 + "__id__": 184 } ], "_prefab": { - "__id__": 176 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4309,11 +4508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4337,11 +4536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4418,11 +4617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4446,11 +4645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 190 }, "clickEvents": [], "_interactable": true, @@ -4515,30 +4714,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 127 + "__id__": 137 }, "_children": [ { - "__id__": 183 - }, - { - "__id__": 189 - } - ], - "_active": true, - "_components": [ - { - "__id__": 195 - }, - { - "__id__": 197 + "__id__": 193 }, { "__id__": 199 } ], + "_active": true, + "_components": [ + { + "__id__": 205 + }, + { + "__id__": 207 + }, + { + "__id__": 209 + } + ], "_prefab": { - "__id__": 201 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -4575,20 +4774,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 192 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 194 }, { - "__id__": 186 + "__id__": 196 } ], "_prefab": { - "__id__": 188 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -4625,11 +4824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4653,11 +4852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4711,20 +4910,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 192 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 200 }, { - "__id__": 192 + "__id__": 202 } ], "_prefab": { - "__id__": 194 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -4761,11 +4960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 199 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 201 }, "_contentSize": { "__type__": "cc.Size", @@ -4789,11 +4988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 199 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 203 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4870,11 +5069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 206 }, "_contentSize": { "__type__": "cc.Size", @@ -4898,11 +5097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4940,11 +5139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 210 }, "clickEvents": [], "_interactable": true, @@ -5009,11 +5208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5037,11 +5236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5082,11 +5281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 137 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 217 }, "_resizeMode": 0, "_layoutType": 2, @@ -5133,11 +5332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -5178,23 +5377,23 @@ }, "_children": [ { - "__id__": 213 + "__id__": 223 }, { - "__id__": 221 + "__id__": 231 }, { - "__id__": 229 + "__id__": 239 } ], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 255 } ], "_prefab": { - "__id__": 247 + "__id__": 257 }, "_lpos": { "__type__": "cc.Vec3", @@ -5231,23 +5430,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 212 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 224 }, { - "__id__": 216 + "__id__": 226 }, { - "__id__": 218 + "__id__": 228 } ], "_prefab": { - "__id__": 220 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -5284,11 +5483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -5312,11 +5511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5383,11 +5582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 229 }, "languageKey": "", "defaultText": "", @@ -5417,23 +5616,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 212 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 222 + "__id__": 232 }, { - "__id__": 224 + "__id__": 234 }, { - "__id__": 226 + "__id__": 236 } ], "_prefab": { - "__id__": 228 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -5470,11 +5669,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -5498,11 +5697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 235 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5566,11 +5765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 237 }, "_alignFlags": 0, "_target": null, @@ -5615,27 +5814,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 212 + "__id__": 222 }, "_children": [ { - "__id__": 230 + "__id__": 240 } ], "_active": true, "_components": [ { - "__id__": 238 + "__id__": 248 }, { - "__id__": 240 + "__id__": 250 }, { - "__id__": 242 + "__id__": 252 } ], "_prefab": { - "__id__": 244 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -5672,23 +5871,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 229 + "__id__": 239 }, "_children": [], "_active": true, "_components": [ { - "__id__": 231 + "__id__": 241 }, { - "__id__": 233 + "__id__": 243 }, { - "__id__": 235 + "__id__": 245 } ], "_prefab": { - "__id__": 237 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -5725,11 +5924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 242 }, "_contentSize": { "__type__": "cc.Size", @@ -5753,11 +5952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 244 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5821,11 +6020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 246 }, "languageKey": "web3panel.copy", "defaultText": "", @@ -5855,11 +6054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 249 }, "_contentSize": { "__type__": "cc.Size", @@ -5883,11 +6082,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 251 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5928,11 +6127,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 229 + "__id__": 239 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 253 }, "clickEvents": [], "_interactable": true, @@ -5984,7 +6183,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 229 + "__id__": 239 }, "_id": "" }, @@ -6011,11 +6210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 212 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 256 }, "_contentSize": { "__type__": "cc.Size", @@ -6056,23 +6255,23 @@ }, "_children": [ { - "__id__": 249 - }, - { - "__id__": 257 - } - ], - "_active": true, - "_components": [ - { - "__id__": 265 + "__id__": 259 }, { "__id__": 267 } ], + "_active": true, + "_components": [ + { + "__id__": 275 + }, + { + "__id__": 277 + } + ], "_prefab": { - "__id__": 269 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -6109,23 +6308,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 258 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 260 }, { - "__id__": 252 + "__id__": 262 }, { - "__id__": 254 + "__id__": 264 } ], "_prefab": { - "__id__": 256 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -6162,11 +6361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -6190,11 +6389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6235,11 +6434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 265 }, "_alignFlags": 9, "_target": null, @@ -6284,23 +6483,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 258 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 268 }, { - "__id__": 260 + "__id__": 270 }, { - "__id__": 262 + "__id__": 272 } ], "_prefab": { - "__id__": 264 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -6337,11 +6536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -6365,11 +6564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 271 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6433,11 +6632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 267 }, "_enabled": false, "__prefab": { - "__id__": 263 + "__id__": 273 }, "_alignFlags": 8, "_target": null, @@ -6482,11 +6681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -6510,11 +6709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 258 }, "_enabled": false, "__prefab": { - "__id__": 268 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6595,7 +6794,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -6623,7 +6822,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 283 }, "_alignFlags": 45, "_target": null, @@ -6659,7 +6858,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 285 }, "m_rootNode": null, "_id": "" diff --git a/assets/resources/test/10001_avatar.png b/assets/resources/test/10001_avatar.png index 4e2936df..5a4b30fc 100644 Binary files a/assets/resources/test/10001_avatar.png and b/assets/resources/test/10001_avatar.png differ diff --git a/assets/resources/test/10001_avatar.png.meta b/assets/resources/test/10001_avatar.png.meta index dccd450a..9bfcb752 100644 --- a/assets/resources/test/10001_avatar.png.meta +++ b/assets/resources/test/10001_avatar.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 442, - "height": 442, - "rawWidth": 442, - "rawHeight": 442, + "width": 491, + "height": 350, + "rawWidth": 491, + "rawHeight": 350, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -221, - -221, + -245.5, + -175, 0, - 221, - -221, + 245.5, + -175, 0, - -221, - 221, + -245.5, + 175, 0, - 221, - 221, + 245.5, + 175, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 442, - 442, - 442, + 350, + 491, + 350, 0, 0, - 442, + 491, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -221, - -221, + -245.5, + -175, 0 ], "maxPos": [ - 221, - 221, + 245.5, + 175, 0 ] }, @@ -127,7 +127,7 @@ }, "userData": { "type": "sprite-frame", - "hasAlpha": false, + "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, "redirect": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@6c48a" }