diff --git a/assets/Scenes/test.scene b/assets/Scenes/test.scene index f132427f..ad49b2c3 100644 --- a/assets/Scenes/test.scene +++ b/assets/Scenes/test.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 159 + "__id__": 166 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 160 + "__id__": 173 }, "_id": "11f821b7-0408-4ecd-a1e3-b380e01cf759" }, @@ -74,22 +74,22 @@ "__id__": 5 }, { - "__id__": 16 + "__id__": 101 }, { - "__id__": 106 + "__id__": 154 } ], "_active": true, "_components": [ { - "__id__": 156 + "__id__": 163 }, { - "__id__": 157 + "__id__": 164 }, { - "__id__": 158 + "__id__": 165 } ], "_prefab": null, @@ -213,149 +213,6 @@ "_trackingType": 0, "_id": "63WIch3o5BEYRlXzTT0oWc" }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 2 - }, - "_prefab": { - "__id__": 6 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 5 - }, - "asset": { - "__uuid__": "4879d105-bcc4-4865-909e-3557b8a5e094", - "__expectedType__": "cc.Prefab" - }, - "fileId": "9acrf4umFDJZb/7fu6tsb6", - "instance": { - "__id__": 7 - }, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "43kS6ky/dIkpYfG2Pe2UJH", - "prefabRootNode": null, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 11 - }, - { - "__id__": 12 - }, - { - "__id__": 13 - }, - { - "__id__": 15 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 9 - }, - "propertyPath": [ - "_name" - ], - "value": "ChatPanel" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9acrf4umFDJZb/7fu6tsb6" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 9 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 9 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 9 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 14 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "1a1OWUX6tASandsui8dekD" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 9 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.Node", "_name": "GirlListPanel", @@ -366,19 +223,19 @@ }, "_children": [ { - "__id__": 17 + "__id__": 6 } ], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 98 }, { - "__id__": 104 + "__id__": 99 }, { - "__id__": 105 + "__id__": 100 } ], "_prefab": null, @@ -417,26 +274,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 5 }, "_children": [ { - "__id__": 18 + "__id__": 7 }, { - "__id__": 39 + "__id__": 28 } ], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 95 }, { - "__id__": 101 + "__id__": 96 }, { - "__id__": 102 + "__id__": 97 } ], "_prefab": null, @@ -475,32 +332,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 6 }, "_children": [ { - "__id__": 19 + "__id__": 8 }, { - "__id__": 24 + "__id__": 13 }, { - "__id__": 28 + "__id__": 17 }, { - "__id__": 32 + "__id__": 21 } ], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 25 }, { - "__id__": 37 + "__id__": 26 }, { - "__id__": 38 + "__id__": 27 } ], "_prefab": null, @@ -539,22 +396,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 7 }, "_children": [], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 9 }, { - "__id__": 21 + "__id__": 10 }, { - "__id__": 22 + "__id__": 11 }, { - "__id__": 23 + "__id__": 12 } ], "_prefab": null, @@ -593,7 +450,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 8 }, "_enabled": true, "__prefab": null, @@ -615,7 +472,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 8 }, "_enabled": true, "__prefab": null, @@ -654,7 +511,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 8 }, "_enabled": true, "__prefab": null, @@ -696,7 +553,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 19 + "__id__": 8 }, "_id": "90J7LBWZBD6ppMDoxDe0Ei" }, @@ -706,7 +563,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 8 }, "_enabled": true, "__prefab": null, @@ -736,19 +593,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 7 }, "_children": [], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 14 }, { - "__id__": 26 + "__id__": 15 }, { - "__id__": 27 + "__id__": 16 } ], "_prefab": null, @@ -787,7 +644,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -809,7 +666,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -871,7 +728,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 13 }, "_enabled": true, "__prefab": null, @@ -901,19 +758,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 7 }, "_children": [], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 18 }, { - "__id__": 30 + "__id__": 19 }, { - "__id__": 31 + "__id__": 20 } ], "_prefab": null, @@ -952,7 +809,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -974,7 +831,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -1004,7 +861,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 17 }, "_enabled": true, "__prefab": null, @@ -1066,19 +923,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 7 }, "_children": [], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 22 }, { - "__id__": 34 + "__id__": 23 }, { - "__id__": 35 + "__id__": 24 } ], "_prefab": null, @@ -1117,7 +974,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 21 }, "_enabled": true, "__prefab": null, @@ -1139,7 +996,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 21 }, "_enabled": true, "__prefab": null, @@ -1169,7 +1026,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 32 + "__id__": 21 }, "_enabled": true, "__prefab": null, @@ -1208,7 +1065,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 7 }, "_enabled": true, "__prefab": null, @@ -1230,7 +1087,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 7 }, "_enabled": true, "__prefab": null, @@ -1269,7 +1126,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 7 }, "_enabled": true, "__prefab": null, @@ -1299,26 +1156,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 17 + "__id__": 6 }, "_children": [ { - "__id__": 40 + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 91 }, { - "__id__": 97 + "__id__": 92 }, { - "__id__": 98 + "__id__": 93 }, { - "__id__": 99 + "__id__": 94 } ], "_prefab": null, @@ -1357,26 +1214,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 28 }, "_children": [ { - "__id__": 41 + "__id__": 30 } ], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 87 }, { - "__id__": 93 + "__id__": 88 }, { - "__id__": 94 + "__id__": 89 }, { - "__id__": 95 + "__id__": 90 } ], "_prefab": null, @@ -1415,26 +1272,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 29 }, "_children": [ { - "__id__": 42 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 83 }, { - "__id__": 89 + "__id__": 84 }, { - "__id__": 90 + "__id__": 85 }, { - "__id__": 91 + "__id__": 86 } ], "_prefab": null, @@ -1473,20 +1330,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 30 }, "_children": [ { - "__id__": 43 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 81 }, { - "__id__": 87 + "__id__": 82 } ], "_prefab": null, @@ -1525,32 +1382,38 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 42 + "__id__": 31 }, "_children": [ { - "__id__": 44 + "__id__": 33 }, { - "__id__": 53 + "__id__": 36 }, { - "__id__": 65 + "__id__": 45 + }, + { + "__id__": 48 + }, + { + "__id__": 60 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 77 }, { - "__id__": 83 + "__id__": 78 }, { - "__id__": 84 + "__id__": 79 }, { - "__id__": 85 + "__id__": 80 } ], "_prefab": null, @@ -1583,32 +1446,141 @@ }, "_id": "deNhdn/ntH+bh4f/cTEtXS" }, + { + "__type__": "cc.Node", + "_name": "deco", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 32 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 34 + }, + { + "__id__": 35 + } + ], + "_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": "22J4MXQwxGLJxEJ5R1kMMb" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1170, + "height": 298.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "97m0ISaDhLYJez3SI5s3Ff" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6@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": "10zdZMlMJP3olS66sJmeuO" + }, { "__type__": "cc.Node", "_name": "avatar", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 43 + "__id__": 32 }, "_children": [ { - "__id__": 45 + "__id__": 37 } ], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 41 }, { - "__id__": 50 + "__id__": 42 }, { - "__id__": 51 + "__id__": 43 }, { - "__id__": 52 + "__id__": 44 } ], "_prefab": null, @@ -1647,19 +1619,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 36 }, "_children": [], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 38 }, { - "__id__": 47 + "__id__": 39 }, { - "__id__": 48 + "__id__": 40 } ], "_prefab": null, @@ -1698,7 +1670,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 37 }, "_enabled": true, "__prefab": null, @@ -1720,7 +1692,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 37 }, "_enabled": true, "__prefab": null, @@ -1735,7 +1707,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "69516f3e-e3aa-439f-8cd3-d51b6cba230d@f9941", + "__uuid__": "b33e3b8b-7653-4b7d-a17a-8da09866653a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1759,7 +1731,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 45 + "__id__": 37 }, "_enabled": true, "__prefab": null, @@ -1789,7 +1761,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 36 }, "_enabled": true, "__prefab": null, @@ -1811,7 +1783,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 36 }, "_enabled": true, "__prefab": null, @@ -1827,7 +1799,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 36 }, "_enabled": true, "__prefab": null, @@ -1866,7 +1838,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 44 + "__id__": 36 }, "_enabled": true, "__prefab": null, @@ -1890,32 +1862,141 @@ "_lockFlags": 36, "_id": "a3ec4KxyRNmZ4OBcI2uPv0" }, + { + "__type__": "cc.Node", + "_name": "avatar_cover", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 32 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 46 + }, + { + "__id__": 47 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 420, + "y": -2.2737367544323206e-13, + "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": "e6JmncKhlPnr/Os5S85Ted" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 45 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 220 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "c9UK18QIZG8orja1pDNsKo" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 45 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@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": "47/0feI7FFJ4QrBSIJn9x7" + }, { "__type__": "cc.Node", "_name": "Desc", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 43 + "__id__": 32 }, "_children": [ { - "__id__": 54 + "__id__": 49 }, { - "__id__": 58 + "__id__": 53 } ], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 57 }, { - "__id__": 63 + "__id__": 58 }, { - "__id__": 64 + "__id__": 59 } ], "_prefab": null, @@ -1954,26 +2035,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 53 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 50 }, { - "__id__": 56 + "__id__": 51 }, { - "__id__": 57 + "__id__": 52 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -144.8046875, - "y": 70.72699999999986, + "x": -304.4046875, + "y": 11.898999999999887, "z": 0 }, "_lrot": { @@ -2005,13 +2086,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 49 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 229.609375, + "width": 548.809375, "height": 74.718 }, "_anchorPoint": { @@ -2027,7 +2108,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -2041,14 +2122,14 @@ "b": 103, "a": 255 }, - "_string": "Name", - "_horizontalAlign": 1, + "_string": "Anaya Kapoor", + "_horizontalAlign": 2, "_verticalAlign": 1, - "_actualFontSize": 80, - "_fontSize": 80, + "_actualFontSize": 60, + "_fontSize": 60, "_fontFamily": "NotoSans-Regular", "_lineHeight": 59.3, - "_overflow": 0, + "_overflow": 1, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -2089,7 +2170,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -2119,19 +2200,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 53 + "__id__": 48 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 59 + "__id__": 54 }, { - "__id__": 60 + "__id__": 55 }, { - "__id__": 61 + "__id__": 56 } ], "_prefab": null, @@ -2170,7 +2251,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 53 }, "_enabled": true, "__prefab": null, @@ -2192,7 +2273,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 53 }, "_enabled": true, "__prefab": null, @@ -2254,7 +2335,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 53 }, "_enabled": true, "__prefab": null, @@ -2284,7 +2365,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -2306,7 +2387,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -2345,7 +2426,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -2375,26 +2456,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 43 + "__id__": 32 }, "_children": [ { - "__id__": 66 + "__id__": 61 }, { - "__id__": 70 + "__id__": 65 } ], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 74 }, { - "__id__": 80 + "__id__": 75 }, { - "__id__": 81 + "__id__": 76 } ], "_prefab": null, @@ -2433,19 +2514,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 60 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 62 }, { - "__id__": 68 + "__id__": 63 }, { - "__id__": 69 + "__id__": 64 } ], "_prefab": null, @@ -2484,7 +2565,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -2506,7 +2587,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -2568,7 +2649,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -2598,26 +2679,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 65 + "__id__": 60 }, "_children": [ { - "__id__": 71 + "__id__": 66 } ], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 69 }, { - "__id__": 75 + "__id__": 70 }, { - "__id__": 76 + "__id__": 71 }, { - "__id__": 78 + "__id__": 73 } ], "_prefab": null, @@ -2656,16 +2737,16 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 70 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 67 }, { - "__id__": 73 + "__id__": 68 } ], "_prefab": null, @@ -2704,7 +2785,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -2726,7 +2807,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -2788,7 +2869,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2810,7 +2891,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2849,13 +2930,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 65 }, "_enabled": true, "__prefab": null, "clickEvents": [ { - "__id__": 77 + "__id__": 72 } ], "_interactable": true, @@ -2907,14 +2988,14 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 70 + "__id__": 65 }, "_id": "cbnv8I7CpD5r1V+VQ76RJH" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 43 + "__id__": 32 }, "component": "", "_componentId": "72a61ik8OxKNahn4Fg81Lkx", @@ -2927,7 +3008,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -2957,7 +3038,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2979,7 +3060,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -3018,7 +3099,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -3048,7 +3129,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -3070,7 +3151,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -3109,7 +3190,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -3139,24 +3220,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 32 }, "_enabled": true, "__prefab": null, "avatar": { - "__id__": 47 + "__id__": 39 }, "girlName": { - "__id__": 56 + "__id__": 51 }, "desc": { - "__id__": 60 + "__id__": 55 }, "price": { - "__id__": 68 + "__id__": 63 }, "chatBtn": { - "__id__": 70 + "__id__": 65 }, "_id": "48EyOQcYpGkJTBGhBhA+e9" }, @@ -3166,7 +3247,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -3188,7 +3269,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 42 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -3220,7 +3301,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -3242,7 +3323,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -3258,7 +3339,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -3298,7 +3379,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 41 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -3328,7 +3409,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -3350,7 +3431,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -3389,7 +3470,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -3402,7 +3483,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 42 + "__id__": 31 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -3414,7 +3495,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 29 }, "_enabled": true, "__prefab": null, @@ -3444,7 +3525,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -3466,7 +3547,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -3496,7 +3577,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -3512,7 +3593,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -3552,7 +3633,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 6 }, "_enabled": true, "__prefab": null, @@ -3574,7 +3655,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 6 }, "_enabled": true, "__prefab": null, @@ -3613,7 +3694,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 6 }, "_enabled": true, "__prefab": null, @@ -3643,7 +3724,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 5 }, "_enabled": true, "__prefab": null, @@ -3665,7 +3746,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 5 }, "_enabled": true, "__prefab": null, @@ -3695,7 +3776,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 5 }, "_enabled": true, "__prefab": null, @@ -3711,19 +3792,19 @@ }, "_children": [ { - "__id__": 107 + "__id__": 102 } ], "_active": false, "_components": [ + { + "__id__": 151 + }, + { + "__id__": 152 + }, { "__id__": 153 - }, - { - "__id__": 154 - }, - { - "__id__": 155 } ], "_prefab": null, @@ -3762,29 +3843,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 106 + "__id__": 101 }, "_children": [ { - "__id__": 108 + "__id__": 103 }, { - "__id__": 121 + "__id__": 116 }, { - "__id__": 143 + "__id__": 141 } ], "_active": true, "_components": [ + { + "__id__": 148 + }, + { + "__id__": 149 + }, { "__id__": 150 - }, - { - "__id__": 151 - }, - { - "__id__": 152 } ], "_prefab": null, @@ -3823,26 +3904,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 102 }, "_children": [ { - "__id__": 109 + "__id__": 104 }, { - "__id__": 114 + "__id__": 109 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 113 }, { - "__id__": 119 + "__id__": 114 }, { - "__id__": 120 + "__id__": 115 } ], "_prefab": null, @@ -3881,22 +3962,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 108 + "__id__": 103 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 105 }, { - "__id__": 111 + "__id__": 106 }, { - "__id__": 112 + "__id__": 107 }, { - "__id__": 113 + "__id__": 108 } ], "_prefab": null, @@ -3935,7 +4016,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": null, @@ -3957,7 +4038,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": null, @@ -3996,7 +4077,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": null, @@ -4038,7 +4119,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 109 + "__id__": 104 }, "_id": "a0KcINzCdH66tpFQc1BpH9" }, @@ -4048,7 +4129,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": null, @@ -4078,19 +4159,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 108 + "__id__": 103 }, "_children": [], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 110 }, { - "__id__": 116 + "__id__": 111 }, { - "__id__": 117 + "__id__": 112 } ], "_prefab": null, @@ -4129,7 +4210,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 109 }, "_enabled": true, "__prefab": null, @@ -4151,7 +4232,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 109 }, "_enabled": true, "__prefab": null, @@ -4213,7 +4294,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 109 }, "_enabled": true, "__prefab": null, @@ -4243,7 +4324,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 103 }, "_enabled": true, "__prefab": null, @@ -4265,7 +4346,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 103 }, "_enabled": true, "__prefab": null, @@ -4304,7 +4385,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 103 }, "_enabled": true, "__prefab": null, @@ -4334,26 +4415,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 102 }, "_children": [ { - "__id__": 122 + "__id__": 117 }, { - "__id__": 131 + "__id__": 126 + }, + { + "__id__": 129 } ], "_active": true, "_components": [ + { + "__id__": 138 + }, + { + "__id__": 139 + }, { "__id__": 140 - }, - { - "__id__": 141 - }, - { - "__id__": 142 } ], "_prefab": null, @@ -4392,26 +4476,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 116 }, "_children": [ { - "__id__": 123 + "__id__": 118 } ], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 122 }, { - "__id__": 128 + "__id__": 123 }, { - "__id__": 129 + "__id__": 124 }, { - "__id__": 130 + "__id__": 125 } ], "_prefab": null, @@ -4450,19 +4534,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 122 + "__id__": 117 }, "_children": [], "_active": true, "_components": [ { - "__id__": 124 + "__id__": 119 }, { - "__id__": 125 + "__id__": 120 }, { - "__id__": 126 + "__id__": 121 } ], "_prefab": null, @@ -4501,7 +4585,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 118 }, "_enabled": true, "__prefab": null, @@ -4523,7 +4607,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 118 }, "_enabled": true, "__prefab": null, @@ -4538,7 +4622,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "69516f3e-e3aa-439f-8cd3-d51b6cba230d@f9941", + "__uuid__": "b33e3b8b-7653-4b7d-a17a-8da09866653a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -4562,7 +4646,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 123 + "__id__": 118 }, "_enabled": true, "__prefab": null, @@ -4592,7 +4676,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 117 }, "_enabled": true, "__prefab": null, @@ -4614,7 +4698,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 117 }, "_enabled": true, "__prefab": null, @@ -4630,7 +4714,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 117 }, "_enabled": true, "__prefab": null, @@ -4669,7 +4753,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 117 }, "_enabled": true, "__prefab": null, @@ -4693,32 +4777,141 @@ "_lockFlags": 36, "_id": "bfqCp4XnNP6LCRURi68IEM" }, + { + "__type__": "cc.Node", + "_name": "avatar_cover", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 116 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 127 + }, + { + "__id__": 128 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 73.65, + "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": "07b8fW2YNCzb9Q8ysqPD0Y" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 600, + "height": 600 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "65jW7/s71Bror27CRCKcqK" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 152, + "g": 81, + "b": 158, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@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": "a7uWkJscJGcL10dPK7JAv6" + }, { "__type__": "cc.Node", "_name": "Button", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 121 + "__id__": 116 }, "_children": [ { - "__id__": 132 + "__id__": 130 } ], "_active": true, "_components": [ + { + "__id__": 133 + }, + { + "__id__": 134 + }, { "__id__": 135 }, - { - "__id__": 136 - }, { "__id__": 137 - }, - { - "__id__": 139 } ], "_prefab": null, @@ -4757,16 +4950,16 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 131 + "__id__": 129 }, "_children": [], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 131 }, { - "__id__": 134 + "__id__": 132 } ], "_prefab": null, @@ -4805,7 +4998,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 130 }, "_enabled": true, "__prefab": null, @@ -4827,7 +5020,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 130 }, "_enabled": true, "__prefab": null, @@ -4889,7 +5082,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 129 }, "_enabled": true, "__prefab": null, @@ -4911,7 +5104,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 129 }, "_enabled": true, "__prefab": null, @@ -4950,13 +5143,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 129 }, "_enabled": true, "__prefab": null, "clickEvents": [ { - "__id__": 138 + "__id__": 136 } ], "_interactable": true, @@ -5008,14 +5201,14 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 131 + "__id__": 129 }, "_id": "28Bw7ysC9JIqKbEwDrkRpa" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 106 + "__id__": 101 }, "component": "", "_componentId": "ded86y9IjxGe4c/OorDAiKp", @@ -5028,7 +5221,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 129 }, "_enabled": true, "__prefab": null, @@ -5058,7 +5251,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 116 }, "_enabled": true, "__prefab": null, @@ -5080,7 +5273,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 116 }, "_enabled": true, "__prefab": null, @@ -5119,7 +5312,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 116 }, "_enabled": true, "__prefab": null, @@ -5149,23 +5342,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 107 + "__id__": 102 }, "_children": [ { - "__id__": 144 + "__id__": 142 } ], "_active": true, "_components": [ + { + "__id__": 145 + }, + { + "__id__": 146 + }, { "__id__": 147 - }, - { - "__id__": 148 - }, - { - "__id__": 149 } ], "_prefab": null, @@ -5204,23 +5397,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 141 }, "_children": [], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 143 }, { - "__id__": 146 + "__id__": 144 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 293.288, + "y": 12.423000000000002, "z": 0 }, "_lrot": { @@ -5252,14 +5445,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 142 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", "width": 1100, - "height": 579.676 + "height": 1300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5274,7 +5467,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 142 }, "_enabled": true, "__prefab": null, @@ -5290,12 +5483,12 @@ }, "_string": "是个小坏蛋呢...让我想想...\n有个女孩第一次去男朋友家过夜，男朋友妈妈特意给她准备了粉色睡衣。第二天早上，妈妈问：\"昨晚睡得好吗？\"女孩红着脸说：\"就是...就是睡衣有点紧...\"妈妈很惊讶：\"不会啊，那是我女儿的睡衣，她可比你胖多了...\"\n(慵懒地靠在丝绒沙发上，手指绕着发尾打转) 哦？有多想呢...是想到睡不着觉的那种想，还是...（突然倾身向前，红唇微启）想到身体发烫的那种想", "_horizontalAlign": 1, - "_verticalAlign": 1, + "_verticalAlign": 0, "_actualFontSize": 50, "_fontSize": 50, "_fontFamily": "NotoSans-Regular", "_lineHeight": 62.6, - "_overflow": 3, + "_overflow": 1, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -5336,7 +5529,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 141 }, "_enabled": true, "__prefab": null, @@ -5358,7 +5551,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 141 }, "_enabled": true, "__prefab": null, @@ -5397,7 +5590,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 141 }, "_enabled": true, "__prefab": null, @@ -5427,7 +5620,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -5449,7 +5642,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -5488,7 +5681,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -5518,7 +5711,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5540,7 +5733,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5570,21 +5763,145 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 101 }, "_enabled": true, "__prefab": null, "avatar": { - "__id__": 125 + "__id__": 120 }, "girlName": { - "__id__": 116 + "__id__": 111 }, "desc": { - "__id__": 146 + "__id__": 144 }, "_id": "04EWyt8xVFZ6jD+dB8FpFf" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 2 + }, + "_prefab": { + "__id__": 155 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 154 + }, + "asset": { + "__uuid__": "4879d105-bcc4-4865-909e-3557b8a5e094", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9acrf4umFDJZb/7fu6tsb6", + "instance": { + "__id__": 156 + }, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "43kS6ky/dIkpYfG2Pe2UJH", + "prefabRootNode": null, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 157 + }, + { + "__id__": 159 + }, + { + "__id__": 160 + }, + { + "__id__": 161 + }, + { + "__id__": 162 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_name" + ], + "value": "ChatPanel" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9acrf4umFDJZb/7fu6tsb6" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.UITransform", "_name": "", @@ -5659,38 +5976,105 @@ "asset": null, "fileId": "11f821b7-0408-4ecd-a1e3-b380e01cf759", "instance": null, - "targetOverrides": null, + "targetOverrides": [ + { + "__id__": 167 + }, + { + "__id__": 170 + } + ], "nestedPrefabInstanceRoots": [ { - "__id__": 5 + "__id__": 154 } ] }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 154 + }, + "sourceInfo": { + "__id__": 168 + }, + "propertyPath": [ + "editBox" + ], + "target": { + "__id__": 154 + }, + "targetInfo": { + "__id__": 169 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3cWpHYOmlPY5WVgEBLTBYd" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d3XHAhKMNELL/f5f9Wagpe" + ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 154 + }, + "sourceInfo": { + "__id__": 171 + }, + "propertyPath": [ + "girlName" + ], + "target": { + "__id__": 154 + }, + "targetInfo": { + "__id__": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3cWpHYOmlPY5WVgEBLTBYd" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c6nQJSFqZHWLnuq+1UIrzi" + ] + }, { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 161 + "__id__": 174 }, "shadows": { - "__id__": 162 + "__id__": 175 }, "_skybox": { - "__id__": 163 + "__id__": 176 }, "fog": { - "__id__": 164 + "__id__": 177 }, "octree": { - "__id__": 165 + "__id__": 178 }, "skin": { - "__id__": 166 + "__id__": 179 }, "lightProbeInfo": { - "__id__": 167 + "__id__": 180 }, "postSettings": { - "__id__": 168 + "__id__": 181 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/Scripts/test/ChatPanel.ts b/assets/Scripts/test/ChatPanel.ts index 560137fc..db777095 100644 --- a/assets/Scripts/test/ChatPanel.ts +++ b/assets/Scripts/test/ChatPanel.ts @@ -1,6 +1,7 @@ -import { _decorator, Component, EditBox, Node } from "cc"; +import { _decorator, Component, EditBox, Node,Label } from "cc"; import { DemoManager } from "./DemoManager"; import { ChatGPTService } from "./ChatGPTService"; +import {characters} from "db://assets/Scripts/test/cfg/characters"; const { ccclass, property } = _decorator; @ccclass("ChatPanel") @@ -10,6 +11,16 @@ export class ChatPanel extends Component { @property(EditBox) editBox: EditBox = null; + @property(Label) + girlName: Label = null; + + id:number + refresh(id:number) { + this.id = id; + const data = characters[id-1]; + this.girlName.string = data.name; + } + protected onEnable(): void { if (!this.manager) this.manager = DemoManager.getInstance(); } diff --git a/assets/Scripts/test/DemoManager.ts b/assets/Scripts/test/DemoManager.ts index db136a79..30d74f39 100644 --- a/assets/Scripts/test/DemoManager.ts +++ b/assets/Scripts/test/DemoManager.ts @@ -1,6 +1,9 @@ import { find } from "cc"; import { ChatContentsLayout } from "./ChatContentsLayout"; import { DemoData } from "./DemoData"; +import {GirlDetailPanel} from "db://assets/Scripts/test/GirlDetailPanel"; +import {ChatPanel} from "db://assets/Scripts/test/ChatPanel"; +import {GirlListPanel} from "db://assets/Scripts/test/girlListPanel/GirlListPanel"; export class DemoManager { private static _instance: DemoManager; @@ -18,15 +21,31 @@ export class DemoManager { demoData: DemoData; public layoutout: ChatContentsLayout; + public detailPanel:GirlDetailPanel; + public chatPanel:ChatPanel; + public girlListPanel:GirlListPanel; EnterChat(id: number) { - find("Canvas/ChatPanel").active = true; - find("Canvas/GirlDetailPanel").active = false; + if(this.chatPanel==null) + { + this.chatPanel = find("Canvas/ChatPanel").getComponent(ChatPanel); + } + this.chatPanel.node.active = true; + this.detailPanel.node.active = false; } EnterDetail(id: number) { - find("Canvas/GirlListPanel").active = false; - find("Canvas/GirlDetailPanel").active = true; + if(this.girlListPanel==null) + { + this.girlListPanel =find("Canvas/GirlListPanel").getComponent(GirlListPanel); + } + this.girlListPanel.node.active = false; + if(this.detailPanel==null) + { + this.detailPanel = find("Canvas/GirlDetailPanel").getComponent(GirlDetailPanel); + } + this.detailPanel.refresh(id); + this.detailPanel.node.active = true; } public updateDialog(isPlayer: boolean, str: string) { diff --git a/assets/Scripts/test/GirlDetailPanel.ts b/assets/Scripts/test/GirlDetailPanel.ts index 1b47d096..b26b8dbc 100644 --- a/assets/Scripts/test/GirlDetailPanel.ts +++ b/assets/Scripts/test/GirlDetailPanel.ts @@ -1,5 +1,6 @@ import { _decorator, Component, Label, Node, Sprite } from "cc"; import { DemoManager } from "./DemoManager"; +import {Character, characters} from "db://assets/Scripts/test/cfg/characters"; const { ccclass, property } = _decorator; @ccclass("GirlDetailPanel") @@ -14,8 +15,13 @@ export class GirlDetailPanel extends Component { @property(Node) chatBtn: Node; id = 0; - start() { - this.id = 1; + + refresh(index:number) + { + const data = characters[index-1]; + this.girlName.string = data.name; + this.desc.string = data.description; + this.id = data.id; } OnClickChatBtn() { DemoManager.getInstance().EnterChat(this.id); diff --git a/assets/Scripts/test/cfg.meta b/assets/Scripts/test/cfg.meta new file mode 100644 index 00000000..bb87b104 --- /dev/null +++ b/assets/Scripts/test/cfg.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "ad76166f-8498-40ba-95df-e36d36090bb9", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/test/cfg/characters.ts b/assets/Scripts/test/cfg/characters.ts new file mode 100644 index 00000000..90311c9c --- /dev/null +++ b/assets/Scripts/test/cfg/characters.ts @@ -0,0 +1,25 @@ +export interface Character { + id: number; + name: string; + age: number; + description: string; +} + + +export const characters: Character[] = [ + { + id: 1, + name: "Anaya Kapoor", + age:24, + description: "🌸 Hi, I'm Anaya Kapoor, a 24-year-old dreamer from Mumbai. I blend tradition with trend — from vibrant saris to sleek streetwear, fashion is how I express my story.\n" + + "\n" + + "As a lifestyle influencer with over 1 million followers, I celebrate beauty in all its forms — skin, spirit, and self-love.\n" + + "\n" + + "I grew up watching Bollywood classics and dancing to every beat — now, I create my own rhythms with my camera, my words, and my smile.\n" + + "\n" + + "Coffee lover ☕ | Dancer 💃 | Proud Desi ✨\n" + + "\n" + + "Be your own kind of beautiful." + }, +] + diff --git a/assets/Scripts/test/cfg/characters.ts.meta b/assets/Scripts/test/cfg/characters.ts.meta new file mode 100644 index 00000000..66a4b8a1 --- /dev/null +++ b/assets/Scripts/test/cfg/characters.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "5a025fba-6622-4b6d-9706-b09123b7c2ce", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/test/girlListPanel/GirlListItem.ts b/assets/Scripts/test/girlListPanel/GirlListItem.ts index 09b4d07e..ab1b55ff 100644 --- a/assets/Scripts/test/girlListPanel/GirlListItem.ts +++ b/assets/Scripts/test/girlListPanel/GirlListItem.ts @@ -8,6 +8,7 @@ import { Sprite, } from "cc"; import { DemoManager } from "../DemoManager"; +import { Character, characters } from "db://assets/Scripts/test/cfg/characters"; const { ccclass, property } = _decorator; @ccclass("GirlListItem") @@ -24,19 +25,17 @@ export class GirlListItem extends Component { chatBtn: Node; id: number = -1; - start() { - // this.avatar = this.node - // .getChildByName("avatar/Avatar") - // .getComponent(Sprite); - // this.girlName = this.node.getChildByName("Desc/Name").getComponent(Label); - // this.desc = this.node.getChildByName("Desc/desc").getComponent(Label); - // this.price = this.node.getChildByName("purchase/price").getComponent(Label); - // this.chatBtn = this.node.getChildByName("purchase/Button"); - this.id = 1; + protected onEnable(): void { + this.refreshData(1); } - refreshData() {} + refreshData(index: number) { + const data = characters[index - 1]; + this.id = data.id; + this.girlName.string = data.name; + //this.avatar.spriteFrame = + } onClickDetail() { DemoManager.getInstance().EnterDetail(this.id); diff --git a/assets/Scripts/test/girlListPanel/GirlListPanel.ts b/assets/Scripts/test/girlListPanel/GirlListPanel.ts index 43097025..5e9706c2 100644 --- a/assets/Scripts/test/girlListPanel/GirlListPanel.ts +++ b/assets/Scripts/test/girlListPanel/GirlListPanel.ts @@ -1,14 +1,17 @@ -import { _decorator, Component, Node } from 'cc'; -const { ccclass, property } = _decorator; - -@ccclass('GirlListPanel') -export class GirlListPanel extends Component { - start() { - - } - - update(deltaTime: number) { - - } -} - +import { _decorator, Component, Node } from 'cc'; +import {characters} from "db://assets/Scripts/test/cfg/characters"; +const { ccclass, property } = _decorator; + +@ccclass('GirlListPanel') +export class GirlListPanel extends Component { + onEnable() + { + const cfg = characters; + for (let i = 0; i < cfg.length; i++) { + const c = cfg[i]; + + } + } +} + + diff --git a/assets/cfg/en.xlsx b/assets/cfg/en.xlsx index 2c1d4ac3..d602e145 100644 Binary files a/assets/cfg/en.xlsx and b/assets/cfg/en.xlsx differ diff --git a/assets/cfg/~$en.xlsx b/assets/cfg/~$en.xlsx new file mode 100644 index 00000000..1e0c8b3a Binary files /dev/null and b/assets/cfg/~$en.xlsx differ diff --git a/assets/cfg/~$en.xlsx.meta b/assets/cfg/~$en.xlsx.meta new file mode 100644 index 00000000..61e64a30 --- /dev/null +++ b/assets/cfg/~$en.xlsx.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "77a7f2c7-b92c-4bd7-888d-5dfe9b470b3c", + "files": [ + ".json", + ".xlsx" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/chat/avatar.meta b/assets/resources/chat/avatar.meta new file mode 100644 index 00000000..19fda790 --- /dev/null +++ b/assets/resources/chat/avatar.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a861708d-2bb1-403e-9c83-9f30dac2db1d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/chat/avatar/1.png b/assets/resources/chat/avatar/1.png new file mode 100644 index 00000000..b0a4d2dd Binary files /dev/null and b/assets/resources/chat/avatar/1.png differ diff --git a/assets/resources/chat/avatar/1.png.meta b/assets/resources/chat/avatar/1.png.meta new file mode 100644 index 00000000..f04a034c --- /dev/null +++ b/assets/resources/chat/avatar/1.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "b33e3b8b-7653-4b7d-a17a-8da09866653a", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "b33e3b8b-7653-4b7d-a17a-8da09866653a@6c48a", + "displayName": "1", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "b33e3b8b-7653-4b7d-a17a-8da09866653a", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "b33e3b8b-7653-4b7d-a17a-8da09866653a@f9941", + "displayName": "1", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 218, + "height": 218, + "rawWidth": 218, + "rawHeight": 218, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -109, + -109, + 0, + 109, + -109, + 0, + -109, + 109, + 0, + 109, + 109, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 218, + 218, + 218, + 0, + 0, + 218, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -109, + -109, + 0 + ], + "maxPos": [ + 109, + 109, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b33e3b8b-7653-4b7d-a17a-8da09866653a@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": false, + "fixAlphaTransparencyArtifacts": false, + "redirect": "b33e3b8b-7653-4b7d-a17a-8da09866653a@6c48a" + } +} diff --git a/assets/resources/chat/avatar_mask_cover.png b/assets/resources/chat/avatar_mask_cover.png new file mode 100644 index 00000000..cd8bd1b1 Binary files /dev/null and b/assets/resources/chat/avatar_mask_cover.png differ diff --git a/assets/resources/chat/avatar_mask_cover.png.meta b/assets/resources/chat/avatar_mask_cover.png.meta new file mode 100644 index 00000000..3f6fd9d8 --- /dev/null +++ b/assets/resources/chat/avatar_mask_cover.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@6c48a", + "displayName": "avatar_mask_cover", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@f9941", + "displayName": "avatar_mask_cover", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 120, + "height": 120, + "rawWidth": 120, + "rawHeight": 120, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -60, + -60, + 0, + 60, + -60, + 0, + -60, + 60, + 0, + 60, + 60, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 120, + 120, + 120, + 0, + 0, + 120, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -60, + -60, + 0 + ], + "maxPos": [ + 60, + 60, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@6c48a" + } +} diff --git a/assets/resources/chat/listitem_edge.png b/assets/resources/chat/listitem_edge.png new file mode 100644 index 00000000..593c0121 Binary files /dev/null and b/assets/resources/chat/listitem_edge.png differ diff --git a/assets/resources/chat/listitem_edge.png.meta b/assets/resources/chat/listitem_edge.png.meta new file mode 100644 index 00000000..ddcf8a4b --- /dev/null +++ b/assets/resources/chat/listitem_edge.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6@6c48a", + "displayName": "listitem_edge", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6@f9941", + "displayName": "listitem_edge", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 9, + "height": 222, + "rawWidth": 9, + "rawHeight": 222, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 3, + "borderRight": 2, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -4.5, + -111, + 0, + 4.5, + -111, + 0, + -4.5, + 111, + 0, + 4.5, + 111, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 222, + 9, + 222, + 0, + 0, + 9, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -4.5, + -111, + 0 + ], + "maxPos": [ + 4.5, + 111, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "0b9ea17a-dae1-42ae-b32f-1571d1658fa6@6c48a" + } +} diff --git a/assets/resources/chat_pf/ChatPanel.prefab b/assets/resources/chat_pf/ChatPanel.prefab index ae16f91f..2185b69a 100644 --- a/assets/resources/chat_pf/ChatPanel.prefab +++ b/assets/resources/chat_pf/ChatPanel.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 55 + "__id__": 69 }, { - "__id__": 105 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 208 }, { - "__id__": 196 + "__id__": 210 }, { - "__id__": 198 + "__id__": 212 } ], "_prefab": { - "__id__": 200 + "__id__": 214 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,26 +85,29 @@ "__id__": 3 }, { - "__id__": 47 + "__id__": 53 }, { - "__id__": 141 + "__id__": 61 + }, + { + "__id__": 155 } ], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 201 }, { - "__id__": 189 + "__id__": 203 }, { - "__id__": 191 + "__id__": 205 } ], "_prefab": { - "__id__": 193 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -152,22 +155,25 @@ }, { "__id__": 22 + }, + { + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 40 + "__id__": 46 }, { - "__id__": 42 + "__id__": 48 }, { - "__id__": 44 + "__id__": 50 } ], "_prefab": { - "__id__": 46 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -796,7 +802,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "69516f3e-e3aa-439f-8cd3-d51b6cba230d@f9941", + "__uuid__": "b33e3b8b-7653-4b7d-a17a-8da09866653a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1011,6 +1017,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "avatar_cover", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 3 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 41 + }, + { + "__id__": 43 + } + ], + "_prefab": { + "__id__": 45 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 465, + "y": -80, + "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__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 235, + "height": 235 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d64wMS2whFr5V2O8PACoOK" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 44 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 130, + "g": 54, + "b": 136, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "dd3dfa16-2f99-4b08-bd4c-b1b7d2577bc6@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": "fd/bdtYbpKhYKXRCS34nFO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bfSWNeNClPV7y6vofKsuzM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1021,7 +1163,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1049,7 +1191,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1094,7 +1236,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 51 }, "_alignFlags": 41, "_target": null, @@ -1133,6 +1275,164 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "VideoPlayer", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 54 + }, + { + "__id__": 56 + }, + { + "__id__": 58 + } + ], + "_prefab": { + "__id__": 60 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -50, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "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__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 55 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 480, + "height": 864 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "06AW5IoiBF15/pRelP/Kh/" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 57 + }, + "_alignFlags": 45, + "_target": null, + "_left": 345, + "_right": 345, + "_top": 300, + "_bottom": 200, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 5, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5bpVPE/MBEUpa8eWafKgo7" + }, + { + "__type__": "cc.VideoPlayer", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 59 + }, + "_resourceType": 1, + "_remoteURL": "", + "_clip": null, + "_playOnAwake": true, + "_volume": 1, + "_mute": false, + "_playbackRate": 1, + "_loop": false, + "_fullScreenOnAwake": false, + "_stayOnBottom": false, + "_keepAspectRatio": true, + "videoPlayerEvent": [], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62NZivFbdEWpIi403cOTcm" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e0+UZ0YUxD9qmXT8U6ZlBE", + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "BubbleBox", @@ -1145,23 +1445,23 @@ "_active": true, "_components": [ { - "__id__": 48 + "__id__": 62 }, { - "__id__": 50 + "__id__": 64 }, { - "__id__": 52 + "__id__": 66 }, { - "__id__": 136 + "__id__": 150 }, { - "__id__": 138 + "__id__": 152 } ], "_prefab": { - "__id__": 140 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", @@ -1198,11 +1498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1226,11 +1526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 65 }, "_alignFlags": 45, "_target": null, @@ -1262,17 +1562,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 67 }, "lBubble": { - "__id__": 54 + "__id__": 68 }, "rBubble": { - "__id__": 104 + "__id__": 118 }, "_id": "" }, @@ -1286,20 +1586,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 117 }, "bg": { - "__id__": 65 + "__id__": 79 }, "content": { - "__id__": 75 + "__id__": 89 }, "contentT": { - "__id__": 73 + "__id__": 87 }, "_id": "" }, @@ -1313,32 +1613,32 @@ }, "_children": [ { - "__id__": 56 + "__id__": 70 }, { - "__id__": 64 + "__id__": 78 }, { - "__id__": 72 + "__id__": 86 }, { - "__id__": 80 + "__id__": 94 } ], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 112 }, { - "__id__": 54 + "__id__": 68 }, { - "__id__": 100 + "__id__": 114 } ], "_prefab": { - "__id__": 102 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1375,23 +1675,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 55 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 71 }, { - "__id__": 59 + "__id__": 73 }, { - "__id__": 61 + "__id__": 75 } ], "_prefab": { - "__id__": 63 + "__id__": 77 }, "_lpos": { "__type__": "cc.Vec3", @@ -1428,11 +1728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 72 }, "_contentSize": { "__type__": "cc.Size", @@ -1456,11 +1756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 74 }, "_alignFlags": 12, "_target": null, @@ -1492,11 +1792,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 70 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 76 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1550,23 +1850,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 55 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 79 }, { - "__id__": 67 + "__id__": 81 }, { - "__id__": 69 + "__id__": 83 } ], "_prefab": { - "__id__": 71 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", @@ -1603,11 +1903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -1631,11 +1931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 82 }, "_alignFlags": 12, "_target": null, @@ -1667,11 +1967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 84 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1725,23 +2025,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 55 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 87 }, { - "__id__": 75 + "__id__": 89 }, { - "__id__": 77 + "__id__": 91 } ], "_prefab": { - "__id__": 79 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -1778,11 +2078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -1806,11 +2106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1874,11 +2174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 92 }, "_alignFlags": 12, "_target": null, @@ -1923,30 +2223,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 55 + "__id__": 69 }, "_children": [ - { - "__id__": 81 - } - ], - "_active": true, - "_components": [ - { - "__id__": 89 - }, - { - "__id__": 91 - }, - { - "__id__": 93 - }, { "__id__": 95 } ], + "_active": false, + "_components": [ + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + } + ], "_prefab": { - "__id__": 97 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1983,23 +2283,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 94 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 96 }, { - "__id__": 84 + "__id__": 98 }, { - "__id__": 86 + "__id__": 100 } ], "_prefab": { - "__id__": 88 + "__id__": 102 }, "_lpos": { "__type__": "cc.Vec3", @@ -2036,11 +2336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -2064,11 +2364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 99 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2109,11 +2409,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 95 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 101 }, "_alignFlags": 12, "_target": null, @@ -2158,11 +2458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -2186,11 +2486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 106 }, "_alignFlags": 12, "_target": null, @@ -2222,11 +2522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 108 }, "_type": 3, "_inverted": false, @@ -2244,11 +2544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2302,11 +2602,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2330,11 +2630,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 115 }, "_alignFlags": 8, "_target": null, @@ -2383,20 +2683,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 149 }, "bg": { - "__id__": 115 + "__id__": 129 }, "content": { - "__id__": 125 + "__id__": 139 }, "contentT": { - "__id__": 123 + "__id__": 137 }, "_id": "" }, @@ -2410,29 +2710,29 @@ }, "_children": [ { - "__id__": 106 + "__id__": 120 }, { - "__id__": 114 + "__id__": 128 }, { - "__id__": 122 + "__id__": 136 } ], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 144 }, { - "__id__": 104 + "__id__": 118 }, { - "__id__": 132 + "__id__": 146 } ], "_prefab": { - "__id__": 134 + "__id__": 148 }, "_lpos": { "__type__": "cc.Vec3", @@ -2469,23 +2769,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 121 }, { - "__id__": 109 + "__id__": 123 }, { - "__id__": 111 + "__id__": 125 } ], "_prefab": { - "__id__": 113 + "__id__": 127 }, "_lpos": { "__type__": "cc.Vec3", @@ -2522,11 +2822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -2550,11 +2850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 124 }, "_alignFlags": 36, "_target": null, @@ -2586,11 +2886,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 120 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 126 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2644,23 +2944,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 129 }, { - "__id__": 117 + "__id__": 131 }, { - "__id__": 119 + "__id__": 133 } ], "_prefab": { - "__id__": 121 + "__id__": 135 }, "_lpos": { "__type__": "cc.Vec3", @@ -2697,11 +2997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -2725,11 +3025,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 132 }, "_alignFlags": 36, "_target": null, @@ -2761,11 +3061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 134 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2819,23 +3119,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 105 + "__id__": 119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 137 }, { - "__id__": 125 + "__id__": 139 }, { - "__id__": 127 + "__id__": 141 } ], "_prefab": { - "__id__": 129 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", @@ -2872,11 +3172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 138 }, "_contentSize": { "__type__": "cc.Size", @@ -2900,11 +3200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 140 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2968,11 +3268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 136 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 142 }, "_alignFlags": 36, "_target": null, @@ -3017,11 +3317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -3045,11 +3345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 105 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 147 }, "_alignFlags": 32, "_target": null, @@ -3098,11 +3398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 151 }, "_type": 0, "_inverted": false, @@ -3120,11 +3420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 153 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3183,26 +3483,26 @@ }, "_children": [ { - "__id__": 142 + "__id__": 156 }, { - "__id__": 165 + "__id__": 179 } ], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 194 }, { - "__id__": 182 + "__id__": 196 }, { - "__id__": 184 + "__id__": 198 } ], "_prefab": { - "__id__": 186 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -3239,33 +3539,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 141 + "__id__": 155 }, "_children": [ { - "__id__": 143 + "__id__": 157 }, { - "__id__": 149 + "__id__": 163 } ], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 169 }, { - "__id__": 157 + "__id__": 171 }, { - "__id__": 159 + "__id__": 173 }, { - "__id__": 162 + "__id__": 176 } ], "_prefab": { - "__id__": 164 + "__id__": 178 }, "_lpos": { "__type__": "cc.Vec3", @@ -3302,20 +3602,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 156 }, "_children": [], "_active": false, "_components": [ { - "__id__": 144 + "__id__": 158 }, { - "__id__": 146 + "__id__": 160 } ], "_prefab": { - "__id__": 148 + "__id__": 162 }, "_lpos": { "__type__": "cc.Vec3", @@ -3352,11 +3652,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 159 }, "_contentSize": { "__type__": "cc.Size", @@ -3380,11 +3680,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3461,20 +3761,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 142 + "__id__": 156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 164 }, { - "__id__": 152 + "__id__": 166 } ], "_prefab": { - "__id__": 154 + "__id__": 168 }, "_lpos": { "__type__": "cc.Vec3", @@ -3511,11 +3811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 165 }, "_contentSize": { "__type__": "cc.Size", @@ -3539,11 +3839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 149 + "__id__": 163 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3620,11 +3920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -3648,11 +3948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3693,25 +3993,25 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 174 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [ { - "__id__": 161 + "__id__": 175 } ], "_textLabel": { - "__id__": 146 + "__id__": 160 }, "_placeholderLabel": { - "__id__": 152 + "__id__": 166 }, "_returnType": 0, "_string": "", @@ -3745,11 +4045,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 142 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 177 }, "_alignFlags": 44, "_target": null, @@ -3794,27 +4094,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 141 + "__id__": 155 }, "_children": [ { - "__id__": 166 + "__id__": 180 } ], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 186 }, { - "__id__": 174 + "__id__": 188 }, { - "__id__": 176 + "__id__": 190 } ], "_prefab": { - "__id__": 179 + "__id__": 193 }, "_lpos": { "__type__": "cc.Vec3", @@ -3851,20 +4151,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 179 }, "_children": [], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 181 }, { - "__id__": 169 + "__id__": 183 } ], "_prefab": { - "__id__": 171 + "__id__": 185 }, "_lpos": { "__type__": "cc.Vec3", @@ -3901,11 +4201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 182 }, "_contentSize": { "__type__": "cc.Size", @@ -3929,11 +4229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 180 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 184 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4010,11 +4310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 187 }, "_contentSize": { "__type__": "cc.Size", @@ -4038,11 +4338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 189 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4083,15 +4383,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 191 }, "clickEvents": [ { - "__id__": 178 + "__id__": 192 } ], "_interactable": true, @@ -4143,7 +4443,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 165 + "__id__": 179 }, "_id": "" }, @@ -4180,11 +4480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4208,11 +4508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4253,11 +4553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 199 }, "_alignFlags": 44, "_target": null, @@ -4306,7 +4606,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 202 }, "_contentSize": { "__type__": "cc.Size", @@ -4334,7 +4634,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 204 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4379,7 +4679,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 206 }, "_alignFlags": 45, "_target": null, @@ -4428,7 +4728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -4456,7 +4756,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 211 }, "_alignFlags": 45, "_target": null, @@ -4492,11 +4792,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 213 }, "editBox": { - "__id__": 159 + "__id__": 173 }, + "girlName": null, "_id": "" }, { @@ -4512,6 +4813,7 @@ "__id__": 0 }, "fileId": "9acrf4umFDJZb/7fu6tsb6", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/video.meta b/assets/resources/video.meta new file mode 100644 index 00000000..0f9f0b30 --- /dev/null +++ b/assets/resources/video.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "adee00a4-d095-48c3-b84d-97a0504a7b3e", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/video/1.meta b/assets/resources/video/1.meta new file mode 100644 index 00000000..df2ac6a8 --- /dev/null +++ b/assets/resources/video/1.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a4a8cb8c-a44e-4498-b500-8bde612e8d74", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/video/1/1.mp4 b/assets/resources/video/1/1.mp4 new file mode 100644 index 00000000..7e2dc2d1 Binary files /dev/null and b/assets/resources/video/1/1.mp4 differ diff --git a/assets/resources/video/1/1.mp4.meta b/assets/resources/video/1/1.mp4.meta new file mode 100644 index 00000000..2a7646eb --- /dev/null +++ b/assets/resources/video/1/1.mp4.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "video-clip", + "imported": true, + "uuid": "06ba55f7-af6a-4597-ab64-20e5534a6410", + "files": [ + ".json", + ".mp4" + ], + "subMetas": {}, + "userData": {} +} diff --git a/localization-editor/translate-data/index.yaml b/localization-editor/translate-data/index.yaml index 320a7a3c..15381331 100644 --- a/localization-editor/translate-data/index.yaml +++ b/localization-editor/translate-data/index.yaml @@ -7,6 +7,16 @@ items: isVariant: false associations: [] _variants: [] + character1Name: + key: character1Name + value: "" + type: 2 + isVariant: false + associations: + - sceneUuid: 11f821b7-0408-4ecd-a1e3-b380e01cf759 + nodeUuid: 01fPiGkxpJdYruegVxj88I + reference: 11f821b7-0408-4ecd-a1e3-b380e01cf759 + _variants: [] languageConfig: bcp47Tag: index translateFinished: 0 diff --git a/settings/v2/packages/localization-editor.json b/settings/v2/packages/localization-editor.json index 1a59149f..3228d3e0 100644 --- a/settings/v2/packages/localization-editor.json +++ b/settings/v2/packages/localization-editor.json @@ -2,7 +2,7 @@ "__version__": "1.0.1", "L10nEnable": true, "ProjectConfig": { - "localLanguage": "zh-Hant-TW", + "localLanguage": "en", "scanOptions": [ { "dirs": [