From e1b83dde560ffc095ede97137adf10ee4e47d56c Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Thu, 11 Sep 2025 19:30:31 +0800 Subject: [PATCH] update --- assets/Scenes/LoginScene.scene | 338 ++++++++++++-- assets/Scenes/PreloadScene.scene | 442 ++++++++++++++---- assets/bundles/Chat18x/GirlDetailPanel.prefab | 4 +- .../Chat18x}/rotate.anim | 0 .../Chat18x}/rotate.anim.meta | 0 settings/v2/packages/engine.json | 3 +- 6 files changed, 639 insertions(+), 148 deletions(-) rename assets/{resources => bundles/Chat18x}/rotate.anim (100%) rename assets/{resources => bundles/Chat18x}/rotate.anim.meta (100%) diff --git a/assets/Scenes/LoginScene.scene b/assets/Scenes/LoginScene.scene index 86a52ee4..d06f9749 100644 --- a/assets/Scenes/LoginScene.scene +++ b/assets/Scenes/LoginScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 33 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 34 + "__id__": 41 }, "_id": "dab4ae00-c26e-4176-9c7e-709d8899e525" }, @@ -77,13 +77,13 @@ "_active": true, "_components": [ { - "__id__": 30 + "__id__": 37 }, { - "__id__": 31 + "__id__": 38 }, { - "__id__": 32 + "__id__": 39 } ], "_prefab": null, @@ -223,22 +223,25 @@ "__id__": 10 }, { - "__id__": 13 + "__id__": 17 }, { - "__id__": 16 + "__id__": 20 + }, + { + "__id__": 23 } ], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 34 }, { - "__id__": 28 + "__id__": 35 }, { - "__id__": 29 + "__id__": 36 } ], "_prefab": null, @@ -395,6 +398,247 @@ "__prefab": null, "_id": "16QQQ23ZJLVbI+9+hB2cMF" }, + { + "__type__": "cc.Node", + "_name": "Mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 5 + }, + "_children": [ + { + "__id__": 11 + } + ], + "_active": true, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 15 + }, + { + "__id__": 16 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 299.3589999999999, + "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": "58mse+Y9lDrYCz9zPuYKSV" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 13 + } + ], + "_prefab": null, + "_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": "f9ehAc85JLyoAN5lnyKQnP" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "b3R9215/1IHZnSXoQtxlE3" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "037ad634-397e-4d22-bd90-063654461da8@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": "d7cT9cQshDgoC106tak0by" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "e2iOn/sthCuZdG0QSjp15K" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "eeAqeg+9lLCKsQrmP2Y9it" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "4cef8664-eeed-4be5-b33b-1bb74a6019cb@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": "5eCK0BnplJHoY+Sx9iSM98" + }, { "__type__": "cc.Node", "_name": "Icon_BG", @@ -407,10 +651,10 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 18 }, { - "__id__": 12 + "__id__": 19 } ], "_prefab": null, @@ -449,7 +693,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -471,7 +715,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -516,10 +760,10 @@ "_active": true, "_components": [ { - "__id__": 14 + "__id__": 21 }, { - "__id__": 15 + "__id__": 22 } ], "_prefab": null, @@ -558,7 +802,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 20 }, "_enabled": true, "__prefab": null, @@ -580,7 +824,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 20 }, "_enabled": true, "__prefab": null, @@ -646,16 +890,16 @@ }, "_children": [ { - "__id__": 17 + "__id__": 24 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 32 }, { - "__id__": 26 + "__id__": 33 } ], "_prefab": null, @@ -694,26 +938,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 23 }, "_children": [ { - "__id__": 18 + "__id__": 25 } ], "_active": true, "_components": [ { - "__id__": 21 + "__id__": 28 }, { - "__id__": 22 + "__id__": 29 }, { - "__id__": 23 + "__id__": 30 }, { - "__id__": 24 + "__id__": 31 } ], "_prefab": null, @@ -752,16 +996,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 26 }, { - "__id__": 20 + "__id__": 27 } ], "_prefab": null, @@ -800,7 +1044,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 25 }, "_enabled": true, "__prefab": null, @@ -822,7 +1066,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 25 }, "_enabled": true, "__prefab": null, @@ -884,7 +1128,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -906,7 +1150,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -945,7 +1189,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -975,7 +1219,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -1017,7 +1261,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 17 + "__id__": 24 }, "_id": "c9KDag5vBLKazTx4FSrM2p" }, @@ -1027,7 +1271,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -1049,7 +1293,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -1217,28 +1461,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 35 + "__id__": 42 }, "shadows": { - "__id__": 36 + "__id__": 43 }, "_skybox": { - "__id__": 37 + "__id__": 44 }, "fog": { - "__id__": 38 + "__id__": 45 }, "octree": { - "__id__": 39 + "__id__": 46 }, "skin": { - "__id__": 40 + "__id__": 47 }, "lightProbeInfo": { - "__id__": 41 + "__id__": 48 }, "postSettings": { - "__id__": 42 + "__id__": 49 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/Scenes/PreloadScene.scene b/assets/Scenes/PreloadScene.scene index cbc735d0..57f2b8a9 100644 --- a/assets/Scenes/PreloadScene.scene +++ b/assets/Scenes/PreloadScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 60 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 61 + "__id__": 68 }, "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" }, @@ -77,13 +77,13 @@ "_active": true, "_components": [ { - "__id__": 57 + "__id__": 64 }, { - "__id__": 58 + "__id__": 65 }, { - "__id__": 59 + "__id__": 66 } ], "_prefab": null, @@ -223,25 +223,28 @@ "__id__": 10 }, { - "__id__": 13 + "__id__": 17 }, { - "__id__": 16 + "__id__": 20 }, { "__id__": 23 + }, + { + "__id__": 30 } ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 61 }, { - "__id__": 55 + "__id__": 62 }, { - "__id__": 56 + "__id__": 63 } ], "_prefab": null, @@ -398,6 +401,247 @@ "__prefab": null, "_id": "16QQQ23ZJLVbI+9+hB2cMF" }, + { + "__type__": "cc.Node", + "_name": "Mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 5 + }, + "_children": [ + { + "__id__": 11 + } + ], + "_active": true, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 15 + }, + { + "__id__": 16 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 299.3589999999999, + "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": "1dl1E0dN1JgZt9AVuURcS1" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 13 + } + ], + "_prefab": null, + "_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": "a7SGu3HnVGM4lsoW0DsAcK" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "e0n1lZL9FHnqbhMpjIKBUU" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "037ad634-397e-4d22-bd90-063654461da8@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": "adNbDlGY1OKr/qRzrdtbwd" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 300 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "b3/GGiZaxCC75fRLDuCLph" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "59XRmPl/1NubfCJSIGhzua" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "4cef8664-eeed-4be5-b33b-1bb74a6019cb@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": "f1uT7qS7ZM5bjAtq3RkN7/" + }, { "__type__": "cc.Node", "_name": "Icon_BG", @@ -410,10 +654,10 @@ "_active": true, "_components": [ { - "__id__": 11 + "__id__": 18 }, { - "__id__": 12 + "__id__": 19 } ], "_prefab": null, @@ -452,7 +696,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -474,7 +718,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -519,10 +763,10 @@ "_active": true, "_components": [ { - "__id__": 14 + "__id__": 21 }, { - "__id__": 15 + "__id__": 22 } ], "_prefab": null, @@ -561,7 +805,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 20 }, "_enabled": true, "__prefab": null, @@ -583,7 +827,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 20 }, "_enabled": true, "__prefab": null, @@ -649,19 +893,19 @@ }, "_children": [ { - "__id__": 17 + "__id__": 24 } ], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 27 }, { - "__id__": 21 + "__id__": 28 }, { - "__id__": 22 + "__id__": 29 } ], "_prefab": null, @@ -700,16 +944,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 23 }, "_children": [], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 25 }, { - "__id__": 19 + "__id__": 26 } ], "_prefab": null, @@ -748,7 +992,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -770,7 +1014,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -809,7 +1053,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -831,7 +1075,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -870,7 +1114,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -904,31 +1148,31 @@ }, "_children": [ { - "__id__": 24 + "__id__": 31 }, { - "__id__": 32 + "__id__": 39 }, { - "__id__": 36 + "__id__": 43 }, { - "__id__": 40 + "__id__": 47 }, { - "__id__": 44 + "__id__": 51 }, { - "__id__": 48 + "__id__": 55 } ], "_active": false, "_components": [ { - "__id__": 52 + "__id__": 59 }, { - "__id__": 53 + "__id__": 60 } ], "_prefab": null, @@ -967,26 +1211,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [ { - "__id__": 25 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 35 }, { - "__id__": 29 + "__id__": 36 }, { - "__id__": 30 + "__id__": 37 }, { - "__id__": 31 + "__id__": 38 } ], "_prefab": null, @@ -1025,16 +1269,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 31 }, "_children": [], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 33 }, { - "__id__": 27 + "__id__": 34 } ], "_prefab": null, @@ -1073,7 +1317,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -1095,7 +1339,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -1157,7 +1401,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1179,7 +1423,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1218,7 +1462,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1248,7 +1492,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1290,7 +1534,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 24 + "__id__": 31 }, "_id": "c9KDag5vBLKazTx4FSrM2p" }, @@ -1300,19 +1544,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 33 + "__id__": 40 }, { - "__id__": 34 + "__id__": 41 }, { - "__id__": 35 + "__id__": 42 } ], "_prefab": null, @@ -1351,7 +1595,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -1373,7 +1617,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -1412,7 +1656,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -1442,19 +1686,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 37 + "__id__": 44 }, { - "__id__": 38 + "__id__": 45 }, { - "__id__": 39 + "__id__": 46 } ], "_prefab": null, @@ -1493,7 +1737,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -1515,7 +1759,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -1577,7 +1821,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -1607,19 +1851,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 41 + "__id__": 48 }, { - "__id__": 42 + "__id__": 49 }, { - "__id__": 43 + "__id__": 50 } ], "_prefab": null, @@ -1658,7 +1902,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -1680,7 +1924,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -1742,7 +1986,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 47 }, "_enabled": true, "__prefab": null, @@ -1772,19 +2016,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 45 + "__id__": 52 }, { - "__id__": 46 + "__id__": 53 }, { - "__id__": 47 + "__id__": 54 } ], "_prefab": null, @@ -1823,7 +2067,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1845,7 +2089,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1907,7 +2151,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 51 }, "_enabled": true, "__prefab": null, @@ -1937,19 +2181,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 23 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 49 + "__id__": 56 }, { - "__id__": 50 + "__id__": 57 }, { - "__id__": 51 + "__id__": 58 } ], "_prefab": null, @@ -1988,7 +2232,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -2010,7 +2254,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -2072,7 +2316,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -2102,7 +2346,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -2124,7 +2368,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 23 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -2291,28 +2535,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 62 + "__id__": 69 }, "shadows": { - "__id__": 63 + "__id__": 70 }, "_skybox": { - "__id__": 64 + "__id__": 71 }, "fog": { - "__id__": 65 + "__id__": 72 }, "octree": { - "__id__": 66 + "__id__": 73 }, "skin": { - "__id__": 67 + "__id__": 74 }, "lightProbeInfo": { - "__id__": 68 + "__id__": 75 }, "postSettings": { - "__id__": 69 + "__id__": 76 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 6cc65d7f..49996dd0 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -1024,7 +1024,7 @@ "_originalWidth": 850, "_originalHeight": 700, "_alignMode": 2, - "_lockFlags": 37, + "_lockFlags": 45, "_id": "" }, { @@ -8955,6 +8955,8 @@ "__id__": 0 }, "fileId": "47GAgASDxMgr95ufaUc9Za", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/rotate.anim b/assets/bundles/Chat18x/rotate.anim similarity index 100% rename from assets/resources/rotate.anim rename to assets/bundles/Chat18x/rotate.anim diff --git a/assets/resources/rotate.anim.meta b/assets/bundles/Chat18x/rotate.anim.meta similarity index 100% rename from assets/resources/rotate.anim.meta rename to assets/bundles/Chat18x/rotate.anim.meta diff --git a/settings/v2/packages/engine.json b/settings/v2/packages/engine.json index 0d147676..da1e3232 100644 --- a/settings/v2/packages/engine.json +++ b/settings/v2/packages/engine.json @@ -15,7 +15,7 @@ "_value": false }, "animation": { - "_value": false + "_value": true }, "skeletal-animation": { "_value": false @@ -143,6 +143,7 @@ }, "includeModules": [ "2d", + "animation", "audio", "base", "custom-pipeline",