diff --git a/client/beimi/assets/scene/dating/login.fire b/client/beimi/assets/scene/dating/login.fire index f390da2..ac2a34a 100644 --- a/client/beimi/assets/scene/dating/login.fire +++ b/client/beimi/assets/scene/dating/login.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 17 + "__id__": 16 } ], "_tag": -1, @@ -66,10 +66,10 @@ "_active": true, "_components": [ { - "__id__": 20 + "__id__": 19 }, { - "__id__": 41 + "__id__": 40 } ], "_prefab": null, @@ -121,7 +121,7 @@ "__id__": 4 }, { - "__id__": 10 + "__id__": 9 } ], "_tag": -1, @@ -181,9 +181,6 @@ "_components": [ { "__id__": 8 - }, - { - "__id__": 9 } ], "_prefab": null, @@ -349,15 +346,6 @@ "_dstBlendFactor": 771, "_atlas": null }, - { - "__type__": "14bfe1GqB5C77bPnI+ETJt7", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 4 - }, - "_enabled": true - }, { "__type__": "cc.Node", "_name": "menu_bottm", @@ -367,14 +355,14 @@ }, "_children": [ { - "__id__": 11 + "__id__": 10 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 40 + "__id__": 39 } ], "_prefab": null, @@ -419,29 +407,29 @@ "_name": "menu", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 9 }, "_children": [ { - "__id__": 12 + "__id__": 11 }, { - "__id__": 22 + "__id__": 21 }, { - "__id__": 25 + "__id__": 24 }, { - "__id__": 28 + "__id__": 27 }, { - "__id__": 31 + "__id__": 30 }, { - "__id__": 34 + "__id__": 33 }, { - "__id__": 37 + "__id__": 36 } ], "_tag": -1, @@ -489,17 +477,17 @@ "_name": "setting", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 13 + "__id__": 12 }, { - "__id__": 14 + "__id__": 13 } ], "_prefab": null, @@ -544,7 +532,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "_spriteFrame": { @@ -570,7 +558,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "transition": 3, @@ -598,7 +586,7 @@ }, "clickEvents": [ { - "__id__": 15 + "__id__": 14 } ], "_N$interactable": true, @@ -624,13 +612,13 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 12 + "__id__": 11 } }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 16 + "__id__": 15 }, "component": "dialog", "handler": "onClick", @@ -641,14 +629,14 @@ "_name": "dialog", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 21 + "__id__": 20 } ], "_prefab": null, @@ -697,10 +685,10 @@ }, "_children": [ { - "__id__": 18 + "__id__": 17 }, { - "__id__": 16 + "__id__": 15 } ], "_tag": -1, @@ -748,14 +736,14 @@ "_name": "dialogPrefab", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 19 + "__id__": 18 } ], "_prefab": null, @@ -800,7 +788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "root": { @@ -810,7 +798,7 @@ "__uuid__": "fc609d55-9908-4bbe-ab60-f53f3a411653" }, "canvas": { - "__id__": 20 + "__id__": 19 } }, { @@ -834,7 +822,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 16 + "__id__": 15 }, "_enabled": true }, @@ -843,17 +831,17 @@ "_name": "message", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 23 + "__id__": 22 }, { - "__id__": 24 + "__id__": 23 } ], "_prefab": null, @@ -898,7 +886,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "_spriteFrame": { @@ -924,7 +912,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "transition": 3, @@ -974,7 +962,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 22 + "__id__": 21 } }, { @@ -982,17 +970,17 @@ "_name": "share", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 26 + "__id__": 25 }, { - "__id__": 27 + "__id__": 26 } ], "_prefab": null, @@ -1037,7 +1025,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "_spriteFrame": { @@ -1063,7 +1051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "transition": 3, @@ -1113,7 +1101,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 25 + "__id__": 24 } }, { @@ -1121,17 +1109,17 @@ "_name": "playway", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 29 + "__id__": 28 }, { - "__id__": 30 + "__id__": 29 } ], "_prefab": null, @@ -1176,7 +1164,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "_spriteFrame": { @@ -1202,7 +1190,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "transition": 3, @@ -1252,7 +1240,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 28 + "__id__": 27 } }, { @@ -1260,17 +1248,17 @@ "_name": "feedback", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 32 + "__id__": 31 }, { - "__id__": 33 + "__id__": 32 } ], "_prefab": null, @@ -1315,7 +1303,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "_spriteFrame": { @@ -1341,7 +1329,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "transition": 3, @@ -1391,7 +1379,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 31 + "__id__": 30 } }, { @@ -1399,17 +1387,17 @@ "_name": "record", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 35 + "__id__": 34 }, { - "__id__": 36 + "__id__": 35 } ], "_prefab": null, @@ -1454,7 +1442,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "_spriteFrame": { @@ -1480,7 +1468,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "transition": 3, @@ -1530,7 +1518,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 34 + "__id__": 33 } }, { @@ -1538,17 +1526,17 @@ "_name": "shop", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 38 + "__id__": 37 }, { - "__id__": 39 + "__id__": 38 } ], "_prefab": null, @@ -1593,7 +1581,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "_spriteFrame": { @@ -1619,7 +1607,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "transition": 3, @@ -1669,7 +1657,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 37 + "__id__": 36 } }, { @@ -1677,7 +1665,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 10 + "__id__": 9 }, "_enabled": true, "_spriteFrame": { diff --git a/client/beimi/library/imports/9f/9ffef9bb-4c0f-40bb-b096-cd5b6c6281d8.json b/client/beimi/library/imports/9f/9ffef9bb-4c0f-40bb-b096-cd5b6c6281d8.json index 6fa564d..2695569 100644 --- a/client/beimi/library/imports/9f/9ffef9bb-4c0f-40bb-b096-cd5b6c6281d8.json +++ b/client/beimi/library/imports/9f/9ffef9bb-4c0f-40bb-b096-cd5b6c6281d8.json @@ -18,7 +18,7 @@ "__id__": 2 }, { - "__id__": 17 + "__id__": 16 } ], "_tag": -1, @@ -67,10 +67,10 @@ "_active": true, "_components": [ { - "__id__": 20 + "__id__": 19 }, { - "__id__": 41 + "__id__": 40 } ], "_prefab": null, @@ -122,7 +122,7 @@ "__id__": 4 }, { - "__id__": 10 + "__id__": 9 } ], "_tag": -1, @@ -182,9 +182,6 @@ "_components": [ { "__id__": 8 - }, - { - "__id__": 9 } ], "_prefab": null, @@ -350,15 +347,6 @@ "_dstBlendFactor": 771, "_atlas": null }, - { - "__type__": "14bfe1GqB5C77bPnI+ETJt7", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 4 - }, - "_enabled": true - }, { "__type__": "cc.Node", "_name": "menu_bottm", @@ -368,14 +356,14 @@ }, "_children": [ { - "__id__": 11 + "__id__": 10 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 40 + "__id__": 39 } ], "_prefab": null, @@ -420,29 +408,29 @@ "_name": "menu", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 9 }, "_children": [ { - "__id__": 12 + "__id__": 11 }, { - "__id__": 22 + "__id__": 21 }, { - "__id__": 25 + "__id__": 24 }, { - "__id__": 28 + "__id__": 27 }, { - "__id__": 31 + "__id__": 30 }, { - "__id__": 34 + "__id__": 33 }, { - "__id__": 37 + "__id__": 36 } ], "_tag": -1, @@ -490,17 +478,17 @@ "_name": "setting", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 13 + "__id__": 12 }, { - "__id__": 14 + "__id__": 13 } ], "_prefab": null, @@ -545,7 +533,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "_spriteFrame": { @@ -571,7 +559,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "transition": 3, @@ -599,7 +587,7 @@ }, "clickEvents": [ { - "__id__": 15 + "__id__": 14 } ], "_N$interactable": true, @@ -625,13 +613,13 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 12 + "__id__": 11 } }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 16 + "__id__": 15 }, "component": "dialog", "handler": "onClick", @@ -642,14 +630,14 @@ "_name": "dialog", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 21 + "__id__": 20 } ], "_prefab": null, @@ -698,10 +686,10 @@ }, "_children": [ { - "__id__": 18 + "__id__": 17 }, { - "__id__": 16 + "__id__": 15 } ], "_tag": -1, @@ -749,14 +737,14 @@ "_name": "dialogPrefab", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 19 + "__id__": 18 } ], "_prefab": null, @@ -801,7 +789,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "root": { @@ -811,7 +799,7 @@ "__uuid__": "fc609d55-9908-4bbe-ab60-f53f3a411653" }, "canvas": { - "__id__": 20 + "__id__": 19 } }, { @@ -835,7 +823,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 16 + "__id__": 15 }, "_enabled": true }, @@ -844,17 +832,17 @@ "_name": "message", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 23 + "__id__": 22 }, { - "__id__": 24 + "__id__": 23 } ], "_prefab": null, @@ -899,7 +887,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "_spriteFrame": { @@ -925,7 +913,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "transition": 3, @@ -975,7 +963,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 22 + "__id__": 21 } }, { @@ -983,17 +971,17 @@ "_name": "share", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 26 + "__id__": 25 }, { - "__id__": 27 + "__id__": 26 } ], "_prefab": null, @@ -1038,7 +1026,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "_spriteFrame": { @@ -1064,7 +1052,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "transition": 3, @@ -1114,7 +1102,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 25 + "__id__": 24 } }, { @@ -1122,17 +1110,17 @@ "_name": "playway", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 29 + "__id__": 28 }, { - "__id__": 30 + "__id__": 29 } ], "_prefab": null, @@ -1177,7 +1165,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "_spriteFrame": { @@ -1203,7 +1191,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "transition": 3, @@ -1253,7 +1241,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 28 + "__id__": 27 } }, { @@ -1261,17 +1249,17 @@ "_name": "feedback", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 32 + "__id__": 31 }, { - "__id__": 33 + "__id__": 32 } ], "_prefab": null, @@ -1316,7 +1304,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "_spriteFrame": { @@ -1342,7 +1330,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "transition": 3, @@ -1392,7 +1380,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 31 + "__id__": 30 } }, { @@ -1400,17 +1388,17 @@ "_name": "record", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 35 + "__id__": 34 }, { - "__id__": 36 + "__id__": 35 } ], "_prefab": null, @@ -1455,7 +1443,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "_spriteFrame": { @@ -1481,7 +1469,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "transition": 3, @@ -1531,7 +1519,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 34 + "__id__": 33 } }, { @@ -1539,17 +1527,17 @@ "_name": "shop", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 38 + "__id__": 37 }, { - "__id__": 39 + "__id__": 38 } ], "_prefab": null, @@ -1594,7 +1582,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "_spriteFrame": { @@ -1620,7 +1608,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "transition": 3, @@ -1670,7 +1658,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 37 + "__id__": 36 } }, { @@ -1678,7 +1666,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 10 + "__id__": 9 }, "_enabled": true, "_spriteFrame": { diff --git a/client/beimi/library/uuid-to-mtime.json b/client/beimi/library/uuid-to-mtime.json index bf4af80..ad8a2c8 100644 --- a/client/beimi/library/uuid-to-mtime.json +++ b/client/beimi/library/uuid-to-mtime.json @@ -435,8 +435,8 @@ "relativePath": "scene\\dating" }, "9ffef9bb-4c0f-40bb-b096-cd5b6c6281d8": { - "asset": 1501925966661, - "meta": 1501925966692, + "asset": 1501941694506, + "meta": 1501941694549, "relativePath": "scene\\dating\\login.fire" }, "c3362f07-3cd8-4e58-8025-6ae3c744fd20": { diff --git a/client/beimi/local/assets.json b/client/beimi/local/assets.json index 251caa7..dcb88e5 100644 --- a/client/beimi/local/assets.json +++ b/client/beimi/local/assets.json @@ -9,7 +9,7 @@ "id": "7280c7fe-0a27-4246-8efe-f2f40d898ff5" }, { - "folded": false, + "folded": true, "id": "4bd396a2-fbc3-4567-8d91-51bcb9640147" }, { @@ -24,6 +24,10 @@ "folded": true, "id": "dbf15e77-1a2d-4923-9221-6eddcca87330" }, + { + "folded": false, + "id": "dbc93d82-0631-4ef3-910a-3cdd666a1bee" + }, { "folded": true, "id": "965d338b-f04c-4731-8c98-d311a2da8e5c" @@ -49,40 +53,24 @@ "id": "fc231bfc-8225-42c5-b578-27ffdd6d536e" }, { - "folded": true, + "folded": false, "id": "a5b8f86b-a680-4e8b-b174-cdb247612301" }, - { - "folded": false, - "id": "d28e5d2a-3a00-45a8-a720-afbd2735a5cb" - }, - { - "folded": false, - "id": "97f509bc-f385-4b4e-a504-3612898cc5fc" - }, { "folded": true, "id": "f28216da-3fe9-4d2a-9014-e4a1532a473a" }, { - "folded": true, - "id": "53c0f099-6ca1-4577-83bc-7189b6a88c2f" - }, - { - "folded": true, - "id": "7d376c4e-e72c-49a3-8bd6-73536eaabfce" - }, - { - "folded": true, - "id": "8b107943-f925-469f-a62d-686c1175d380" + "folded": false, + "id": "97f509bc-f385-4b4e-a504-3612898cc5fc" }, { "folded": false, - "id": "dbc93d82-0631-4ef3-910a-3cdd666a1bee" + "id": "d28e5d2a-3a00-45a8-a720-afbd2735a5cb" }, { "folded": true, - "id": "bac701a5-52f7-4130-8dda-fe79416878aa" + "id": "19857ff4-872c-4b2c-a9d1-41255113f2ae" }, { "folded": true, @@ -90,7 +78,19 @@ }, { "folded": true, - "id": "3b173f9b-2b59-423f-84d8-3dab2a02c44a" + "id": "8b107943-f925-469f-a62d-686c1175d380" + }, + { + "folded": true, + "id": "5bab29da-5833-4b6b-b300-82d89d5d4a53" + }, + { + "folded": true, + "id": "7d376c4e-e72c-49a3-8bd6-73536eaabfce" + }, + { + "folded": true, + "id": "53c0f099-6ca1-4577-83bc-7189b6a88c2f" }, { "folded": true, @@ -102,11 +102,19 @@ }, { "folded": true, - "id": "5bab29da-5833-4b6b-b300-82d89d5d4a53" + "id": "3b173f9b-2b59-423f-84d8-3dab2a02c44a" }, { "folded": true, - "id": "19857ff4-872c-4b2c-a9d1-41255113f2ae" + "id": "bac701a5-52f7-4130-8dda-fe79416878aa" + }, + { + "folded": false, + "id": "19ba101d-e713-4326-8f16-971ad9e102db" + }, + { + "folded": false, + "id": "b492ad5f-c227-4885-9d1c-244033ae4b05" } ] } \ No newline at end of file diff --git a/client/beimi/local/hierarchy.json b/client/beimi/local/hierarchy.json index 8ee2cb4..0f2cc23 100644 --- a/client/beimi/local/hierarchy.json +++ b/client/beimi/local/hierarchy.json @@ -4,38 +4,6 @@ "folded": true, "id": "10334qFkzRJcpgLEwFJhKJP" }, - { - "folded": false, - "id": "12aeaJVV3FFc4J+ADxMOvzK" - }, - { - "folded": true, - "id": "8b920Tvrb5O4arWstrs5QO9" - }, - { - "folded": false, - "id": "88bd7bzmwpDOb7c0XQN+7lj" - }, - { - "folded": true, - "id": "a7610yyImBJ36e9Z29uacuy" - }, - { - "folded": true, - "id": "15358oAdRhKLaJDnJSV+KCg" - }, - { - "folded": true, - "id": "1db83Mga8RFgqAX1yMPOt1P" - }, - { - "folded": true, - "id": "717f6BCMvJFT7itjm7p7P2C" - }, - { - "folded": true, - "id": "f30aaj50iJIBIxHzz4QfH8b" - }, { "folded": true, "id": "26485xNjPNF7YcP4xkDrWlb" @@ -43,6 +11,18 @@ { "folded": true, "id": "eba33qsO1RKsIF3SnkZi9tv" + }, + { + "folded": false, + "id": "12aeaJVV3FFc4J+ADxMOvzK" + }, + { + "folded": false, + "id": "88bd7bzmwpDOb7c0XQN+7lj" + }, + { + "folded": true, + "id": "96b5cHVtJdJMLKB/sP1CmEp" } ] } \ No newline at end of file diff --git a/client/beimi/local/layout.windows.json b/client/beimi/local/layout.windows.json index a19ddab..68286c8 100644 --- a/client/beimi/local/layout.windows.json +++ b/client/beimi/local/layout.windows.json @@ -99,19 +99,6 @@ "node-library", "timeline" ] - }, - "window-1501924810678": { - "main": false, - "url": "packages://code-editor/panel/index.html", - "windowType": "simple", - "x": 542, - "y": 143, - "width": 782, - "height": 608, - "layout": null, - "panels": [ - "code-editor" - ] } }, "panels": { diff --git a/client/beimi/local/logs/project.log b/client/beimi/local/logs/project.log index 8683415..3a376b5 100644 --- a/client/beimi/local/logs/project.log +++ b/client/beimi/local/logs/project.log @@ -138,3 +138,4 @@ Node path: "Canvas/button" 2017-08-05T09:40:46.943Z - normal: Compiled project javascript file successfully 2017-08-05T09:44:08.765Z - normal: Compiled project javascript file successfully 2017-08-05T09:51:20.065Z - normal: Compiled project javascript file successfully +2017-08-05T14:01:35.117Z - info: shutdown preview server diff --git a/client/beimi/temp/BackupAssets/assets/scene/dating/login.fire b/client/beimi/temp/BackupAssets/assets/scene/dating/login.fire index f390da2..ac2a34a 100644 --- a/client/beimi/temp/BackupAssets/assets/scene/dating/login.fire +++ b/client/beimi/temp/BackupAssets/assets/scene/dating/login.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 17 + "__id__": 16 } ], "_tag": -1, @@ -66,10 +66,10 @@ "_active": true, "_components": [ { - "__id__": 20 + "__id__": 19 }, { - "__id__": 41 + "__id__": 40 } ], "_prefab": null, @@ -121,7 +121,7 @@ "__id__": 4 }, { - "__id__": 10 + "__id__": 9 } ], "_tag": -1, @@ -181,9 +181,6 @@ "_components": [ { "__id__": 8 - }, - { - "__id__": 9 } ], "_prefab": null, @@ -349,15 +346,6 @@ "_dstBlendFactor": 771, "_atlas": null }, - { - "__type__": "14bfe1GqB5C77bPnI+ETJt7", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 4 - }, - "_enabled": true - }, { "__type__": "cc.Node", "_name": "menu_bottm", @@ -367,14 +355,14 @@ }, "_children": [ { - "__id__": 11 + "__id__": 10 } ], "_tag": -1, "_active": true, "_components": [ { - "__id__": 40 + "__id__": 39 } ], "_prefab": null, @@ -419,29 +407,29 @@ "_name": "menu", "_objFlags": 0, "_parent": { - "__id__": 10 + "__id__": 9 }, "_children": [ { - "__id__": 12 + "__id__": 11 }, { - "__id__": 22 + "__id__": 21 }, { - "__id__": 25 + "__id__": 24 }, { - "__id__": 28 + "__id__": 27 }, { - "__id__": 31 + "__id__": 30 }, { - "__id__": 34 + "__id__": 33 }, { - "__id__": 37 + "__id__": 36 } ], "_tag": -1, @@ -489,17 +477,17 @@ "_name": "setting", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 13 + "__id__": 12 }, { - "__id__": 14 + "__id__": 13 } ], "_prefab": null, @@ -544,7 +532,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "_spriteFrame": { @@ -570,7 +558,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 12 + "__id__": 11 }, "_enabled": true, "transition": 3, @@ -598,7 +586,7 @@ }, "clickEvents": [ { - "__id__": 15 + "__id__": 14 } ], "_N$interactable": true, @@ -624,13 +612,13 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 12 + "__id__": 11 } }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 16 + "__id__": 15 }, "component": "dialog", "handler": "onClick", @@ -641,14 +629,14 @@ "_name": "dialog", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 21 + "__id__": 20 } ], "_prefab": null, @@ -697,10 +685,10 @@ }, "_children": [ { - "__id__": 18 + "__id__": 17 }, { - "__id__": 16 + "__id__": 15 } ], "_tag": -1, @@ -748,14 +736,14 @@ "_name": "dialogPrefab", "_objFlags": 0, "_parent": { - "__id__": 17 + "__id__": 16 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 19 + "__id__": 18 } ], "_prefab": null, @@ -800,7 +788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 18 + "__id__": 17 }, "_enabled": true, "root": { @@ -810,7 +798,7 @@ "__uuid__": "fc609d55-9908-4bbe-ab60-f53f3a411653" }, "canvas": { - "__id__": 20 + "__id__": 19 } }, { @@ -834,7 +822,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 16 + "__id__": 15 }, "_enabled": true }, @@ -843,17 +831,17 @@ "_name": "message", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 23 + "__id__": 22 }, { - "__id__": 24 + "__id__": 23 } ], "_prefab": null, @@ -898,7 +886,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "_spriteFrame": { @@ -924,7 +912,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 21 }, "_enabled": true, "transition": 3, @@ -974,7 +962,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 22 + "__id__": 21 } }, { @@ -982,17 +970,17 @@ "_name": "share", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 26 + "__id__": 25 }, { - "__id__": 27 + "__id__": 26 } ], "_prefab": null, @@ -1037,7 +1025,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "_spriteFrame": { @@ -1063,7 +1051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 24 }, "_enabled": true, "transition": 3, @@ -1113,7 +1101,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 25 + "__id__": 24 } }, { @@ -1121,17 +1109,17 @@ "_name": "playway", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 29 + "__id__": 28 }, { - "__id__": 30 + "__id__": 29 } ], "_prefab": null, @@ -1176,7 +1164,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "_spriteFrame": { @@ -1202,7 +1190,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 27 }, "_enabled": true, "transition": 3, @@ -1252,7 +1240,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 28 + "__id__": 27 } }, { @@ -1260,17 +1248,17 @@ "_name": "feedback", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 32 + "__id__": 31 }, { - "__id__": 33 + "__id__": 32 } ], "_prefab": null, @@ -1315,7 +1303,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "_spriteFrame": { @@ -1341,7 +1329,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "transition": 3, @@ -1391,7 +1379,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 31 + "__id__": 30 } }, { @@ -1399,17 +1387,17 @@ "_name": "record", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 35 + "__id__": 34 }, { - "__id__": 36 + "__id__": 35 } ], "_prefab": null, @@ -1454,7 +1442,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "_spriteFrame": { @@ -1480,7 +1468,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 34 + "__id__": 33 }, "_enabled": true, "transition": 3, @@ -1530,7 +1518,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 34 + "__id__": 33 } }, { @@ -1538,17 +1526,17 @@ "_name": "shop", "_objFlags": 0, "_parent": { - "__id__": 11 + "__id__": 10 }, "_children": [], "_tag": -1, "_active": true, "_components": [ { - "__id__": 38 + "__id__": 37 }, { - "__id__": 39 + "__id__": 38 } ], "_prefab": null, @@ -1593,7 +1581,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "_spriteFrame": { @@ -1619,7 +1607,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 36 }, "_enabled": true, "transition": 3, @@ -1669,7 +1657,7 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 37 + "__id__": 36 } }, { @@ -1677,7 +1665,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 10 + "__id__": 9 }, "_enabled": true, "_spriteFrame": {