diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 37e095a..a216712 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 1465 + "__id__": 1477 } ], "_active": false, @@ -81,28 +81,28 @@ "__id__": 7 }, { - "__id__": 1310 + "__id__": 1322 }, { - "__id__": 1442 + "__id__": 1454 }, { - "__id__": 1455 + "__id__": 1467 } ], "_active": true, "_components": [ { - "__id__": 1461 + "__id__": 1473 }, { - "__id__": 1462 + "__id__": 1474 }, { - "__id__": 1463 + "__id__": 1475 }, { - "__id__": 1464 + "__id__": 1476 } ], "_prefab": null, @@ -359,20 +359,20 @@ { "__id__": 11 }, - { - "__id__": 1279 - }, { "__id__": 501 }, { "__id__": 291 }, + { + "__id__": 1279 + }, { "__id__": 207 }, { - "__id__": 1302 + "__id__": 1314 }, { "__id__": 177 @@ -381,7 +381,7 @@ "_active": true, "_components": [ { - "__id__": 1309 + "__id__": 1321 } ], "_prefab": null, @@ -5658,6 +5658,7 @@ "avatar": { "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" }, + "newModeSettlementSpeed": 2, "_id": "1e+NpmfM1ClafoWSY4VNW+" }, { @@ -61450,10 +61451,10 @@ "_active": false, "_components": [ { - "__id__": 1300 + "__id__": 1312 }, { - "__id__": 1301 + "__id__": 1313 } ], "_prefab": null, @@ -61656,13 +61657,25 @@ "__id__": 1287 }, { - "__id__": 1290 + "__id__": 1289 }, { "__id__": 1292 }, { - "__id__": 1298 + "__id__": 1294 + }, + { + "__id__": 1300 + }, + { + "__id__": 1302 + }, + { + "__id__": 1304 + }, + { + "__id__": 1310 } ], "_active": true, @@ -61717,7 +61730,7 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "New Sprite", "_objFlags": 0, "_parent": { "__id__": 1284 @@ -61740,8 +61753,102 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 991, - "height": 1462 + "width": 897, + "height": 1223 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 6, + -93.862, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "b5n5lhK0dLGItt6l7CvQmj" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1285 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "9d8027fd-589c-4679-aca0-76f76c6460f1" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "8fgHpB+mpILqP2dH9kqbCw" + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "_parent": { + "__id__": 1284 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1288 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1018, + "height": 1526 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -61782,7 +61889,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1285 + "__id__": 1287 }, "_enabled": true, "_materials": [ @@ -61820,10 +61927,10 @@ "_active": true, "_components": [ { - "__id__": 1288 + "__id__": 1290 }, { - "__id__": 1289 + "__id__": 1291 } ], "_prefab": null, @@ -61850,7 +61957,7 @@ "ctor": "Float64Array", "array": [ 0, - -72, + -229.01, 0, 0, 0, @@ -61879,7 +61986,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1287 + "__id__": 1289 }, "_enabled": true, "_materials": [ @@ -61911,7 +62018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1287 + "__id__": 1289 }, "_enabled": true, "_defaultClip": { @@ -61936,7 +62043,7 @@ "_active": true, "_components": [ { - "__id__": 1291 + "__id__": 1293 } ], "_prefab": null, @@ -61963,7 +62070,7 @@ "ctor": "Float64Array", "array": [ 0, - 100, + -57.01, 0, 0, 0, @@ -61992,7 +62099,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1290 + "__id__": 1292 }, "_enabled": true, "_materials": [ @@ -62026,16 +62133,16 @@ }, "_children": [ { - "__id__": 1293 + "__id__": 1295 } ], "_active": true, "_components": [ { - "__id__": 1295 + "__id__": 1297 }, { - "__id__": 1296 + "__id__": 1298 } ], "_prefab": null, @@ -62061,8 +62168,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - -438.406, + 80.712, + -748.487, 0, 0, 0, @@ -62091,13 +62198,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1292 + "__id__": 1294 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1294 + "__id__": 1296 } ], "_prefab": null, @@ -62111,8 +62218,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 235, - "height": 79 + "width": 542, + "height": 132 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -62153,7 +62260,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1293 + "__id__": 1295 }, "_enabled": true, "_materials": [ @@ -62185,7 +62292,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "_materials": [ @@ -62217,7 +62324,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1292 + "__id__": 1294 }, "_enabled": true, "_normalMaterial": null, @@ -62226,7 +62333,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1297 + "__id__": 1299 } ], "_N$interactable": true, @@ -62282,7 +62389,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1292 + "__id__": 1294 }, "_id": "2bhrCpcRxImqyWzBaIVVCd" }, @@ -62307,7 +62414,7 @@ "_active": true, "_components": [ { - "__id__": 1299 + "__id__": 1301 } ], "_prefab": null, @@ -62321,8 +62428,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 687, - "height": 149 + "width": 637, + "height": 137 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -62363,7 +62470,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1298 + "__id__": 1300 }, "_enabled": true, "_materials": [ @@ -62390,6 +62497,473 @@ "_atlas": null, "_id": "203UcOI6FKCrKMEV2mfGoF" }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1284 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1303 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 235, + "height": 213 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -313.195, + -717.819, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "52pFqYiDVNRr2iUZHDNqwM" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1302 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "2777abbc-e4a4-4fbc-b684-209c262f58fe" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "e8gqk7ShlF3L2D4B7w/uhF" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1284 + }, + "_children": [ + { + "__id__": 1305 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1307 + }, + { + "__id__": 1308 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 393, + "height": 123 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -941.468, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "caCxrAEYpILbCLhaIkdlVR" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1304 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1306 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 261, + "height": 64 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 7.498, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "6cynljnOpIBZxDAwh0o+/5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1305 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "dbdc0748-472f-4cb3-b8ae-c46437f02fcc" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "f2DNYkQVZEKqFOh5G2n2X5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1304 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4b385489-c31c-4609-82ae-ce400f6bda34" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "26Rziyki5B4aZflBrAx7ue" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1304 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1309 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1304 + }, + "_id": "6aDo+HLilPXZVU8YJVaTjW" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1279 + }, + "component": "", + "_componentId": "7fe14dRFQZKSKKAoEn4S7OU", + "handler": "returnBtn", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1284 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1311 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 800, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 374.901, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "517YoiPLlOIrJgfIUo1WGK" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1310 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ecccc889-da4b-40ce-842d-3a2796b875d4" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "03jJYK+uxNnriCcpL+sFua" + }, { "__type__": "cc.Widget", "_name": "", @@ -62438,16 +63012,16 @@ }, "_children": [ { - "__id__": 1303 + "__id__": 1315 }, { - "__id__": 1305 + "__id__": 1317 } ], "_active": false, "_components": [ { - "__id__": 1308 + "__id__": 1320 } ], "_prefab": null, @@ -62503,13 +63077,13 @@ "_name": "pass_rate_label", "_objFlags": 0, "_parent": { - "__id__": 1302 + "__id__": 1314 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1304 + "__id__": 1316 } ], "_prefab": null, @@ -62565,7 +63139,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1303 + "__id__": 1315 }, "_enabled": true, "_materials": [ @@ -62597,16 +63171,16 @@ "_name": "passRate", "_objFlags": 0, "_parent": { - "__id__": 1302 + "__id__": 1314 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1306 + "__id__": 1318 }, { - "__id__": 1307 + "__id__": 1319 } ], "_prefab": null, @@ -62662,7 +63236,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1305 + "__id__": 1317 }, "_enabled": true, "_materials": [ @@ -62695,7 +63269,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1305 + "__id__": 1317 }, "_enabled": true, "_color": { @@ -62713,7 +63287,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1302 + "__id__": 1314 }, "_enabled": false, "alignMode": 1, @@ -62771,28 +63345,28 @@ }, "_children": [ { - "__id__": 1311 + "__id__": 1323 }, { - "__id__": 1314 + "__id__": 1326 }, { - "__id__": 1363 + "__id__": 1375 }, { - "__id__": 1396 + "__id__": 1408 }, { - "__id__": 1431 + "__id__": 1443 }, { - "__id__": 1436 + "__id__": 1448 } ], "_active": false, "_components": [ { - "__id__": 1441 + "__id__": 1453 } ], "_prefab": null, @@ -62848,16 +63422,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1310 + "__id__": 1322 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1312 + "__id__": 1324 }, { - "__id__": 1313 + "__id__": 1325 } ], "_prefab": null, @@ -62913,7 +63487,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1311 + "__id__": 1323 }, "_enabled": true, "_materials": [ @@ -62945,7 +63519,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1311 + "__id__": 1323 }, "_enabled": true, "_id": "14MNfl+ahOhqeYjELowhPw" @@ -62955,41 +63529,41 @@ "_name": "pause", "_objFlags": 0, "_parent": { - "__id__": 1310 + "__id__": 1322 }, "_children": [ - { - "__id__": 1315 - }, - { - "__id__": 1317 - }, - { - "__id__": 1319 - }, - { - "__id__": 1323 - }, { "__id__": 1327 }, { - "__id__": 1334 + "__id__": 1329 }, { - "__id__": 1336 + "__id__": 1331 }, { - "__id__": 1340 + "__id__": 1335 }, { - "__id__": 1342 + "__id__": 1339 }, { - "__id__": 1349 + "__id__": 1346 }, { - "__id__": 1356 + "__id__": 1348 + }, + { + "__id__": 1352 + }, + { + "__id__": 1354 + }, + { + "__id__": 1361 + }, + { + "__id__": 1368 } ], "_active": true, @@ -63047,13 +63621,13 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1316 + "__id__": 1328 } ], "_prefab": null, @@ -63109,7 +63683,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1315 + "__id__": 1327 }, "_enabled": true, "_materials": [ @@ -63141,13 +63715,13 @@ "_name": "bg_2", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1318 + "__id__": 1330 } ], "_prefab": null, @@ -63203,7 +63777,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1317 + "__id__": 1329 }, "_enabled": true, "_materials": [ @@ -63237,16 +63811,16 @@ "_name": "exit", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1320 + "__id__": 1332 }, { - "__id__": 1321 + "__id__": 1333 } ], "_prefab": null, @@ -63302,7 +63876,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1319 + "__id__": 1331 }, "_enabled": true, "_materials": [ @@ -63336,7 +63910,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1319 + "__id__": 1331 }, "_enabled": true, "_normalMaterial": null, @@ -63345,7 +63919,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1322 + "__id__": 1334 } ], "_N$interactable": true, @@ -63401,14 +63975,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1319 + "__id__": 1331 }, "_id": "97kj3CvWxPG4M35kF1JIsf" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -63420,16 +63994,16 @@ "_name": "trya", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1324 + "__id__": 1336 }, { - "__id__": 1325 + "__id__": 1337 } ], "_prefab": null, @@ -63485,7 +64059,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1323 + "__id__": 1335 }, "_enabled": true, "_materials": [ @@ -63519,7 +64093,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1323 + "__id__": 1335 }, "_enabled": true, "_normalMaterial": null, @@ -63528,7 +64102,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1326 + "__id__": 1338 } ], "_N$interactable": true, @@ -63584,14 +64158,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1323 + "__id__": 1335 }, "_id": "60wEETFzRPtLLU2Qraip7E" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -63603,23 +64177,23 @@ "_name": "btn", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [ { - "__id__": 1328 + "__id__": 1340 } ], "_active": true, "_components": [ { - "__id__": 1330 + "__id__": 1342 }, { - "__id__": 1331 + "__id__": 1343 }, { - "__id__": 1333 + "__id__": 1345 } ], "_prefab": null, @@ -63675,13 +64249,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1327 + "__id__": 1339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1329 + "__id__": 1341 } ], "_prefab": null, @@ -63737,7 +64311,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1328 + "__id__": 1340 }, "_enabled": true, "_materials": [ @@ -63767,7 +64341,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1327 + "__id__": 1339 }, "_enabled": true, "_materials": [ @@ -63801,7 +64375,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1327 + "__id__": 1339 }, "_enabled": true, "_normalMaterial": null, @@ -63810,7 +64384,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1332 + "__id__": 1344 } ], "_N$interactable": true, @@ -63866,7 +64440,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1327 + "__id__": 1339 }, "_id": "24dgt8oDxESJcfVjgdLoZY" }, @@ -63885,7 +64459,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1327 + "__id__": 1339 }, "_enabled": true, "_id": "4bRL3qYrVAv5dRBgfVjrQC" @@ -63895,13 +64469,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1335 + "__id__": 1347 } ], "_prefab": null, @@ -63957,7 +64531,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1334 + "__id__": 1346 }, "_enabled": true, "_materials": [ @@ -63991,16 +64565,16 @@ "_name": "closeBtn", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1337 + "__id__": 1349 }, { - "__id__": 1338 + "__id__": 1350 } ], "_prefab": null, @@ -64056,7 +64630,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1336 + "__id__": 1348 }, "_enabled": true, "_materials": [ @@ -64090,7 +64664,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1336 + "__id__": 1348 }, "_enabled": true, "_normalMaterial": null, @@ -64099,7 +64673,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1339 + "__id__": 1351 } ], "_N$interactable": true, @@ -64155,7 +64729,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1336 + "__id__": 1348 }, "_id": "bc//MpLz5OY6QGyDZRN589" }, @@ -64174,13 +64748,13 @@ "_name": "yinxiao", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1341 + "__id__": 1353 } ], "_prefab": null, @@ -64236,7 +64810,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1340 + "__id__": 1352 }, "_enabled": true, "_materials": [ @@ -64270,20 +64844,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [ { - "__id__": 1343 + "__id__": 1355 }, { - "__id__": 1345 + "__id__": 1357 } ], "_active": true, "_components": [ { - "__id__": 1347 + "__id__": 1359 } ], "_prefab": null, @@ -64339,13 +64913,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 1342 + "__id__": 1354 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1344 + "__id__": 1356 } ], "_prefab": null, @@ -64401,7 +64975,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1343 + "__id__": 1355 }, "_enabled": true, "_materials": [ @@ -64435,13 +65009,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 1342 + "__id__": 1354 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1346 + "__id__": 1358 } ], "_prefab": null, @@ -64497,7 +65071,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1345 + "__id__": 1357 }, "_enabled": true, "_materials": [ @@ -64531,7 +65105,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1342 + "__id__": 1354 }, "_enabled": true, "_normalMaterial": null, @@ -64595,11 +65169,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 1346 + "__id__": 1358 }, "checkEvents": [ { - "__id__": 1348 + "__id__": 1360 } ], "_id": "4bv6Txm/tOTpDb9nfNgn+c" @@ -64607,7 +65181,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -64619,20 +65193,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [ { - "__id__": 1350 + "__id__": 1362 }, { - "__id__": 1352 + "__id__": 1364 } ], "_active": true, "_components": [ { - "__id__": 1354 + "__id__": 1366 } ], "_prefab": null, @@ -64688,13 +65262,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 1349 + "__id__": 1361 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1351 + "__id__": 1363 } ], "_prefab": null, @@ -64750,7 +65324,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1350 + "__id__": 1362 }, "_enabled": true, "_materials": [ @@ -64784,13 +65358,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 1349 + "__id__": 1361 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1353 + "__id__": 1365 } ], "_prefab": null, @@ -64846,7 +65420,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1352 + "__id__": 1364 }, "_enabled": true, "_materials": [ @@ -64880,7 +65454,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1349 + "__id__": 1361 }, "_enabled": true, "_normalMaterial": null, @@ -64944,11 +65518,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 1353 + "__id__": 1365 }, "checkEvents": [ { - "__id__": 1355 + "__id__": 1367 } ], "_id": "175VURfcRMZ4U0/08yWOOS" @@ -64956,7 +65530,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -64968,20 +65542,20 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1314 + "__id__": 1326 }, "_children": [ { - "__id__": 1357 + "__id__": 1369 }, { - "__id__": 1359 + "__id__": 1371 } ], "_active": true, "_components": [ { - "__id__": 1361 + "__id__": 1373 } ], "_prefab": null, @@ -65037,13 +65611,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 1356 + "__id__": 1368 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1358 + "__id__": 1370 } ], "_prefab": null, @@ -65099,7 +65673,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1357 + "__id__": 1369 }, "_enabled": true, "_materials": [ @@ -65133,13 +65707,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 1356 + "__id__": 1368 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1360 + "__id__": 1372 } ], "_prefab": null, @@ -65195,7 +65769,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1359 + "__id__": 1371 }, "_enabled": true, "_materials": [ @@ -65229,7 +65803,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1356 + "__id__": 1368 }, "_enabled": true, "_normalMaterial": null, @@ -65293,11 +65867,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 1360 + "__id__": 1372 }, "checkEvents": [ { - "__id__": 1362 + "__id__": 1374 } ], "_id": "268X0b2xRIKIqgyz4MaBdG" @@ -65305,7 +65879,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -65317,23 +65891,23 @@ "_name": "pauseTs", "_objFlags": 0, "_parent": { - "__id__": 1310 + "__id__": 1322 }, "_children": [ { - "__id__": 1364 + "__id__": 1376 }, { - "__id__": 1367 + "__id__": 1379 }, { - "__id__": 1372 + "__id__": 1384 } ], "_active": false, "_components": [ { - "__id__": 1395 + "__id__": 1407 } ], "_prefab": null, @@ -65389,16 +65963,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1363 + "__id__": 1375 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1365 + "__id__": 1377 }, { - "__id__": 1366 + "__id__": 1378 } ], "_prefab": null, @@ -65454,7 +66028,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1364 + "__id__": 1376 }, "_enabled": true, "_materials": [ @@ -65486,7 +66060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1364 + "__id__": 1376 }, "_enabled": true, "_id": "c8PKNIvwRO3rt0Tp1BxG0m" @@ -65496,17 +66070,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1363 + "__id__": 1375 }, "_children": [ { - "__id__": 1368 + "__id__": 1380 } ], "_active": true, "_components": [ { - "__id__": 1371 + "__id__": 1383 } ], "_prefab": null, @@ -65562,16 +66136,16 @@ "_name": "closet", "_objFlags": 0, "_parent": { - "__id__": 1367 + "__id__": 1379 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1369 + "__id__": 1381 }, { - "__id__": 1370 + "__id__": 1382 } ], "_prefab": null, @@ -65627,7 +66201,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1368 + "__id__": 1380 }, "_enabled": true, "_materials": [ @@ -65661,7 +66235,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1368 + "__id__": 1380 }, "_enabled": true, "_normalMaterial": null, @@ -65724,7 +66298,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1368 + "__id__": 1380 }, "_id": "84YaPQK8dO/q/lnhNJcwW2" }, @@ -65733,7 +66307,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1367 + "__id__": 1379 }, "_enabled": true, "_materials": [ @@ -65765,29 +66339,29 @@ "_name": "Health", "_objFlags": 0, "_parent": { - "__id__": 1363 + "__id__": 1375 }, "_children": [ - { - "__id__": 1373 - }, - { - "__id__": 1375 - }, - { - "__id__": 1377 - }, - { - "__id__": 1381 - }, { "__id__": 1385 }, + { + "__id__": 1387 + }, { "__id__": 1389 }, { "__id__": 1393 + }, + { + "__id__": 1397 + }, + { + "__id__": 1401 + }, + { + "__id__": 1405 } ], "_active": true, @@ -65845,13 +66419,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1372 + "__id__": 1384 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1374 + "__id__": 1386 } ], "_prefab": null, @@ -65907,7 +66481,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1373 + "__id__": 1385 }, "_enabled": true, "_materials": [ @@ -65941,13 +66515,13 @@ "_name": "boom_show", "_objFlags": 0, "_parent": { - "__id__": 1372 + "__id__": 1384 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1376 + "__id__": 1388 } ], "_prefab": null, @@ -66003,7 +66577,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1375 + "__id__": 1387 }, "_enabled": true, "_materials": [ @@ -66037,16 +66611,16 @@ "_name": "homeBtn", "_objFlags": 0, "_parent": { - "__id__": 1372 + "__id__": 1384 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1378 + "__id__": 1390 }, { - "__id__": 1379 + "__id__": 1391 } ], "_prefab": null, @@ -66102,7 +66676,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1377 + "__id__": 1389 }, "_enabled": true, "_materials": [ @@ -66129,553 +66703,6 @@ "_atlas": null, "_id": "f4ev3G9YBGm4FVoHQyg8XM" }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1377 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1380 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1377 - }, - "_id": "8cOgt0BzNKh6DAMeApvmL1" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1310 - }, - "component": "", - "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "cancelExit", - "customEventData": "" - }, - { - "__type__": "cc.Node", - "_name": "timeBtn", - "_objFlags": 0, - "_parent": { - "__id__": 1372 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1382 - }, - { - "__id__": 1383 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 636, - "height": 173 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -289.197, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "63G54aGY1JK4T0dwxlJD0c" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1381 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "5367e74b-6a23-4c55-bd67-38082e13559b" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" - }, - "_id": "99J5F38JNMx6cWthv6zXU6" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1381 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1384 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1381 - }, - "_id": "17JyD8igFDkqr7xwpdwqjn" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1310 - }, - "component": "", - "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "cancelExit", - "customEventData": "" - }, - { - "__type__": "cc.Node", - "_name": "return", - "_objFlags": 0, - "_parent": { - "__id__": 1372 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1386 - }, - { - "__id__": 1387 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 434, - "height": 144 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -479.505, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "b8HjN96IhLZYIuX3VDcqCD" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1385 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "5dba5718-a954-4b09-bf11-8eb5fd71cf60" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" - }, - "_id": "5bMM38TF9Ev6GCGfaVi+2s" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1385 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1388 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1385 - }, - "_id": "0bvYtuHVZF0qYnTSZnyojv" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 95 - }, - "component": "", - "_componentId": "2234assp7RIvpDgrnqljp2R", - "handler": "returnHome", - "customEventData": "false" - }, - { - "__type__": "cc.Node", - "_name": "queding", - "_objFlags": 0, - "_parent": { - "__id__": 1372 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 1390 - }, - { - "__id__": 1391 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 434, - "height": 144 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -479.505, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "34QsNqofJE8baIFvUtQbwr" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1389 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "2fcdd5c3-1633-4fc7-bd96-ada7c7f34102" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "17v1ghYaFAnZILYynJDLX2" - }, { "__type__": "cc.Button", "_name": "", @@ -66748,12 +66775,559 @@ "_N$target": { "__id__": 1389 }, + "_id": "8cOgt0BzNKh6DAMeApvmL1" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1322 + }, + "component": "", + "_componentId": "19d952d5kVBrLSzAIGeElFK", + "handler": "cancelExit", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "timeBtn", + "_objFlags": 0, + "_parent": { + "__id__": 1384 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1394 + }, + { + "__id__": 1395 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 636, + "height": 173 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -289.197, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "63G54aGY1JK4T0dwxlJD0c" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1393 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5367e74b-6a23-4c55-bd67-38082e13559b" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" + }, + "_id": "99J5F38JNMx6cWthv6zXU6" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1393 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1396 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1393 + }, + "_id": "17JyD8igFDkqr7xwpdwqjn" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1322 + }, + "component": "", + "_componentId": "19d952d5kVBrLSzAIGeElFK", + "handler": "cancelExit", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "return", + "_objFlags": 0, + "_parent": { + "__id__": 1384 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1398 + }, + { + "__id__": 1399 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 434, + "height": 144 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -479.505, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "b8HjN96IhLZYIuX3VDcqCD" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1397 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5dba5718-a954-4b09-bf11-8eb5fd71cf60" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" + }, + "_id": "5bMM38TF9Ev6GCGfaVi+2s" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1397 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1400 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1397 + }, + "_id": "0bvYtuHVZF0qYnTSZnyojv" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 95 + }, + "component": "", + "_componentId": "2234assp7RIvpDgrnqljp2R", + "handler": "returnHome", + "customEventData": "false" + }, + { + "__type__": "cc.Node", + "_name": "queding", + "_objFlags": 0, + "_parent": { + "__id__": 1384 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 1402 + }, + { + "__id__": 1403 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 434, + "height": 144 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -479.505, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "34QsNqofJE8baIFvUtQbwr" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1401 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "2fcdd5c3-1633-4fc7-bd96-ada7c7f34102" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "17v1ghYaFAnZILYynJDLX2" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1401 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1404 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1401 + }, "_id": "c3JfotjQ1BzoiA+3bn0sgx" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", @@ -66765,13 +67339,13 @@ "_name": "result_title4", "_objFlags": 0, "_parent": { - "__id__": 1372 + "__id__": 1384 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1394 + "__id__": 1406 } ], "_prefab": null, @@ -66827,7 +67401,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1393 + "__id__": 1405 }, "_enabled": true, "_materials": [ @@ -66861,7 +67435,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1363 + "__id__": 1375 }, "_enabled": true, "alignMode": 1, @@ -66888,23 +67462,23 @@ "_name": "pauseWin", "_objFlags": 0, "_parent": { - "__id__": 1310 + "__id__": 1322 }, "_children": [ { - "__id__": 1397 + "__id__": 1409 }, { - "__id__": 1400 + "__id__": 1412 }, { - "__id__": 1405 + "__id__": 1417 } ], "_active": false, "_components": [ { - "__id__": 1430 + "__id__": 1442 } ], "_prefab": null, @@ -66960,16 +67534,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1396 + "__id__": 1408 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1398 + "__id__": 1410 }, { - "__id__": 1399 + "__id__": 1411 } ], "_prefab": null, @@ -67025,7 +67599,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1397 + "__id__": 1409 }, "_enabled": true, "_materials": [ @@ -67057,7 +67631,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1397 + "__id__": 1409 }, "_enabled": true, "_id": "45eH+qRRRMcLjzKe6jsbtt" @@ -67067,17 +67641,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1396 + "__id__": 1408 }, "_children": [ { - "__id__": 1401 + "__id__": 1413 } ], "_active": true, "_components": [ { - "__id__": 1404 + "__id__": 1416 } ], "_prefab": null, @@ -67133,16 +67707,16 @@ "_name": "closet", "_objFlags": 0, "_parent": { - "__id__": 1400 + "__id__": 1412 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1402 + "__id__": 1414 }, { - "__id__": 1403 + "__id__": 1415 } ], "_prefab": null, @@ -67198,7 +67772,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1401 + "__id__": 1413 }, "_enabled": true, "_materials": [ @@ -67232,7 +67806,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1401 + "__id__": 1413 }, "_enabled": true, "_normalMaterial": null, @@ -67295,7 +67869,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1401 + "__id__": 1413 }, "_id": "c87ytPT75Fx5m6e3rY7e7z" }, @@ -67304,7 +67878,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1400 + "__id__": 1412 }, "_enabled": true, "_materials": [ @@ -67336,32 +67910,32 @@ "_name": "Health", "_objFlags": 0, "_parent": { - "__id__": 1396 + "__id__": 1408 }, "_children": [ { - "__id__": 1406 - }, - { - "__id__": 1408 - }, - { - "__id__": 1410 - }, - { - "__id__": 1412 - }, - { - "__id__": 1416 + "__id__": 1418 }, { "__id__": 1420 }, + { + "__id__": 1422 + }, { "__id__": 1424 }, { "__id__": 1428 + }, + { + "__id__": 1432 + }, + { + "__id__": 1436 + }, + { + "__id__": 1440 } ], "_active": true, @@ -67419,13 +67993,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1405 + "__id__": 1417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1407 + "__id__": 1419 } ], "_prefab": null, @@ -67481,7 +68055,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1406 + "__id__": 1418 }, "_enabled": true, "_materials": [ @@ -67515,13 +68089,13 @@ "_name": "hammer_action", "_objFlags": 0, "_parent": { - "__id__": 1405 + "__id__": 1417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1409 + "__id__": 1421 } ], "_prefab": null, @@ -67577,7 +68151,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1408 + "__id__": 1420 }, "_enabled": true, "_materials": [ @@ -67611,13 +68185,13 @@ "_name": "hammer_action", "_objFlags": 0, "_parent": { - "__id__": 1405 + "__id__": 1417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1411 + "__id__": 1423 } ], "_prefab": null, @@ -67673,7 +68247,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1410 + "__id__": 1422 }, "_enabled": true, "_materials": [ @@ -67707,16 +68281,16 @@ "_name": "homeBtn", "_objFlags": 0, "_parent": { - "__id__": 1405 + "__id__": 1417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1413 + "__id__": 1425 }, { - "__id__": 1414 + "__id__": 1426 } ], "_prefab": null, @@ -67772,7 +68346,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1412 + "__id__": 1424 }, "_enabled": true, "_materials": [ @@ -67799,553 +68373,6 @@ "_atlas": null, "_id": "471DuHlD9EtL+N8NN26F3q" }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1412 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1415 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1412 - }, - "_id": "746kVP++1JhJRiDVRyQrjy" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1310 - }, - "component": "", - "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "cancelExit", - "customEventData": "" - }, - { - "__type__": "cc.Node", - "_name": "timeBtn", - "_objFlags": 0, - "_parent": { - "__id__": 1405 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1417 - }, - { - "__id__": 1418 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 636, - "height": 173 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -289.197, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "3cZJ2QOGNNOZDc4hJbF8ml" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1416 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "5367e74b-6a23-4c55-bd67-38082e13559b" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" - }, - "_id": "0c3gNuPOJNl5a8UvGlL4bT" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1416 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1419 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1416 - }, - "_id": "10DM1I1QxAa4sRV7RQ/IeS" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1310 - }, - "component": "", - "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "cancelExit", - "customEventData": "" - }, - { - "__type__": "cc.Node", - "_name": "return", - "_objFlags": 0, - "_parent": { - "__id__": 1405 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1421 - }, - { - "__id__": 1422 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 434, - "height": 144 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -479.505, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "ceYYe/xPVBILy26AP5A/Um" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1420 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "5dba5718-a954-4b09-bf11-8eb5fd71cf60" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" - }, - "_id": "5akgaOU5NHFo/PHACXqv7f" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1420 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1423 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1420 - }, - "_id": "26CtxP87lANKz+I8NQrg6I" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1310 - }, - "component": "", - "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "returnHome", - "customEventData": "false" - }, - { - "__type__": "cc.Node", - "_name": "queding", - "_objFlags": 0, - "_parent": { - "__id__": 1405 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 1425 - }, - { - "__id__": 1426 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 434, - "height": 144 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -479.505, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "2dVFera7JFP5Dule4ARIqJ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1424 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "2fcdd5c3-1633-4fc7-bd96-ada7c7f34102" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "f9RUM2XwJICq9EVgqrlxQk" - }, { "__type__": "cc.Button", "_name": "", @@ -68418,30 +68445,33 @@ "_N$target": { "__id__": 1424 }, - "_id": "64zjcOdD1HpbjNNMsdwm1C" + "_id": "746kVP++1JhJRiDVRyQrjy" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 1310 + "__id__": 1322 }, "component": "", "_componentId": "19d952d5kVBrLSzAIGeElFK", - "handler": "clickRestart", - "customEventData": "hp" + "handler": "cancelExit", + "customEventData": "" }, { "__type__": "cc.Node", - "_name": "result_title4", + "_name": "timeBtn", "_objFlags": 0, "_parent": { - "__id__": 1405 + "__id__": 1417 }, "_children": [], "_active": true, "_components": [ { "__id__": 1429 + }, + { + "__id__": 1430 } ], "_prefab": null, @@ -68455,8 +68485,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 699, - "height": 139 + "width": 636, + "height": 173 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -68468,136 +68498,7 @@ "ctor": "Float64Array", "array": [ 0, - 541.599, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "22lEXmEMNBJLY3L0q5sA6H" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1428 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "12944dd9-6082-4ffb-955a-72fe020c4b69" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" - }, - "_id": "cdFVWueoxMRKH3dMfpCrww" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1396 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 45, - "_left": 0, - "_right": 0, - "_top": 39.26000000000004, - "_bottom": -39.26000000000004, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 1080, - "_originalHeight": 1920, - "_id": "73AcxN4iVLWadelL+ShqIS" - }, - { - "__type__": "cc.Node", - "_name": "share", - "_objFlags": 0, - "_parent": { - "__id__": 1310 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 1432 - }, - { - "__id__": 1433 - }, - { - "__id__": 1434 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 608, - "height": 122 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - -780, + -289.197, 0, 0, 0, @@ -68619,14 +68520,14 @@ "_is3DNode": false, "_groupIndex": 0, "groupIndex": 0, - "_id": "b7ky+hHi1MC7xa7s9UZjpO" + "_id": "3cZJ2QOGNNOZDc4hJbF8ml" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 1431 + "__id__": 1428 }, "_enabled": true, "_materials": [ @@ -68637,7 +68538,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "6b170755-619c-4323-9ec4-5ff07e004765" + "__uuid__": "5367e74b-6a23-4c55-bd67-38082e13559b" }, "_type": 0, "_sizeMode": 1, @@ -68650,42 +68551,200 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": null, - "_id": "77b8GrOldKoJoB8T4Srr7+" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1431 + "_atlas": { + "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 32, - "_left": 485.8, - "_right": -304, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "4bj20HkMtOVLODhBArim04" + "_id": "0c3gNuPOJNl5a8UvGlL4bT" }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 1431 + "__id__": 1428 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1431 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1428 + }, + "_id": "10DM1I1QxAa4sRV7RQ/IeS" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1322 + }, + "component": "", + "_componentId": "19d952d5kVBrLSzAIGeElFK", + "handler": "cancelExit", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "return", + "_objFlags": 0, + "_parent": { + "__id__": 1417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1433 + }, + { + "__id__": 1434 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 434, + "height": 144 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -479.505, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "ceYYe/xPVBILy26AP5A/Um" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1432 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "5dba5718-a954-4b09-bf11-8eb5fd71cf60" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" + }, + "_id": "5akgaOU5NHFo/PHACXqv7f" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1432 }, "_enabled": true, "_normalMaterial": null, @@ -68750,26 +68809,26 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1431 + "__id__": 1432 }, - "_id": "a0K19zgBNDpaq71mWiEama" + "_id": "26CtxP87lANKz+I8NQrg6I" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 2 + "__id__": 1322 }, "component": "", - "_componentId": "80998T1AYNNRZdRxsVvXR65", - "handler": "shareFriend", - "customEventData": "" + "_componentId": "19d952d5kVBrLSzAIGeElFK", + "handler": "returnHome", + "customEventData": "false" }, { "__type__": "cc.Node", - "_name": "commentBtn", + "_name": "queding", "_objFlags": 0, "_parent": { - "__id__": 1310 + "__id__": 1417 }, "_children": [], "_active": false, @@ -68779,9 +68838,6 @@ }, { "__id__": 1438 - }, - { - "__id__": 1439 } ], "_prefab": null, @@ -68795,8 +68851,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 175, - "height": 190 + "width": 434, + "height": 144 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -68807,8 +68863,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -411.899, - 590.758, + 0, + -479.505, 0, 0, 0, @@ -68830,7 +68886,7 @@ "_is3DNode": false, "_groupIndex": 0, "groupIndex": 0, - "_id": "e0x2X5vzlKXI0EDq/OYnO5" + "_id": "2dVFera7JFP5Dule4ARIqJ" }, { "__type__": "cc.Sprite", @@ -68848,7 +68904,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "1031d763-fae8-4612-9444-2d3aaa1cb813" + "__uuid__": "2fcdd5c3-1633-4fc7-bd96-ada7c7f34102" }, "_type": 0, "_sizeMode": 1, @@ -68862,34 +68918,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_atlas": null, - "_id": "00vKyYC1xMupKPq8/Vfblq" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1436 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 32, - "_left": 485.8, - "_right": 324.399, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "e8Ebx0aYNOdZ05A3KUHgdk" + "_id": "f9RUM2XwJICq9EVgqrlxQk" }, { "__type__": "cc.Button", @@ -68905,7 +68934,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1440 + "__id__": 1439 } ], "_N$interactable": true, @@ -68963,6 +68992,551 @@ "_N$target": { "__id__": 1436 }, + "_id": "64zjcOdD1HpbjNNMsdwm1C" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1322 + }, + "component": "", + "_componentId": "19d952d5kVBrLSzAIGeElFK", + "handler": "clickRestart", + "customEventData": "hp" + }, + { + "__type__": "cc.Node", + "_name": "result_title4", + "_objFlags": 0, + "_parent": { + "__id__": 1417 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1441 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 699, + "height": 139 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 541.599, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "22lEXmEMNBJLY3L0q5sA6H" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1440 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "12944dd9-6082-4ffb-955a-72fe020c4b69" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "47879de8-fd9a-46e0-ae2c-1fa8c475a196" + }, + "_id": "cdFVWueoxMRKH3dMfpCrww" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1408 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 39.26000000000004, + "_bottom": -39.26000000000004, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 1080, + "_originalHeight": 1920, + "_id": "73AcxN4iVLWadelL+ShqIS" + }, + { + "__type__": "cc.Node", + "_name": "share", + "_objFlags": 0, + "_parent": { + "__id__": 1322 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 1444 + }, + { + "__id__": 1445 + }, + { + "__id__": 1446 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 608, + "height": 122 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -780, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "b7ky+hHi1MC7xa7s9UZjpO" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1443 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "6b170755-619c-4323-9ec4-5ff07e004765" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "77b8GrOldKoJoB8T4Srr7+" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1443 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 32, + "_left": 485.8, + "_right": -304, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "4bj20HkMtOVLODhBArim04" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1443 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1447 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1443 + }, + "_id": "a0K19zgBNDpaq71mWiEama" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "80998T1AYNNRZdRxsVvXR65", + "handler": "shareFriend", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "commentBtn", + "_objFlags": 0, + "_parent": { + "__id__": 1322 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 1449 + }, + { + "__id__": 1450 + }, + { + "__id__": 1451 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 175, + "height": 190 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -411.899, + 590.758, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "e0x2X5vzlKXI0EDq/OYnO5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1448 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "1031d763-fae8-4612-9444-2d3aaa1cb813" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "00vKyYC1xMupKPq8/Vfblq" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1448 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 32, + "_left": 485.8, + "_right": 324.399, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "e8Ebx0aYNOdZ05A3KUHgdk" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1448 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1452 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1448 + }, "_id": "efstEZxepMZLiFUgsnJ5XH" }, { @@ -68978,23 +69552,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1310 + "__id__": 1322 }, "_enabled": true, "music": { - "__id__": 1342 + "__id__": 1354 }, "effect": { - "__id__": 1349 + "__id__": 1361 }, "vibrate": { - "__id__": 1356 + "__id__": 1368 }, "exit": { - "__id__": 1363 + "__id__": 1375 }, "win": { - "__id__": 1396 + "__id__": 1408 }, "_id": "ef3nVp8O9FlpWYPlCYo9pA" }, @@ -69007,23 +69581,23 @@ }, "_children": [ { - "__id__": 1443 + "__id__": 1455 }, { - "__id__": 1447 + "__id__": 1459 }, { - "__id__": 1450 + "__id__": 1462 } ], "_active": false, "_components": [ { - "__id__": 1453 + "__id__": 1465 } ], "_prefab": { - "__id__": 1454 + "__id__": 1466 }, "_opacity": 255, "_color": { @@ -69077,20 +69651,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1442 + "__id__": 1454 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1444 + "__id__": 1456 }, { - "__id__": 1445 + "__id__": 1457 } ], "_prefab": { - "__id__": 1446 + "__id__": 1458 }, "_opacity": 120, "_color": { @@ -69144,7 +69718,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1443 + "__id__": 1455 }, "_enabled": true, "_materials": [ @@ -69176,7 +69750,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1443 + "__id__": 1455 }, "_enabled": true, "_id": "fdcyqVHbdJ6qjXrnxAvDP2" @@ -69184,7 +69758,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1442 + "__id__": 1454 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -69197,17 +69771,17 @@ "_name": "load", "_objFlags": 0, "_parent": { - "__id__": 1442 + "__id__": 1454 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1448 + "__id__": 1460 } ], "_prefab": { - "__id__": 1449 + "__id__": 1461 }, "_opacity": 255, "_color": { @@ -69261,7 +69835,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1447 + "__id__": 1459 }, "_enabled": true, "_materials": [ @@ -69291,7 +69865,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1442 + "__id__": 1454 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -69304,17 +69878,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 1442 + "__id__": 1454 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1451 + "__id__": 1463 } ], "_prefab": { - "__id__": 1452 + "__id__": 1464 }, "_opacity": 255, "_color": { @@ -69368,7 +69942,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1450 + "__id__": 1462 }, "_enabled": true, "_materials": [ @@ -69399,7 +69973,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1442 + "__id__": 1454 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -69412,7 +69986,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1442 + "__id__": 1454 }, "_enabled": true, "alignMode": 1, @@ -69437,7 +70011,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1442 + "__id__": 1454 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -69454,16 +70028,16 @@ }, "_children": [ { - "__id__": 1456 + "__id__": 1468 } ], "_active": false, "_components": [ { - "__id__": 1459 + "__id__": 1471 }, { - "__id__": 1460 + "__id__": 1472 } ], "_prefab": null, @@ -69519,16 +70093,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1455 + "__id__": 1467 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1457 + "__id__": 1469 }, { - "__id__": 1458 + "__id__": 1470 } ], "_prefab": null, @@ -69584,7 +70158,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1456 + "__id__": 1468 }, "_enabled": true, "_materials": [ @@ -69616,7 +70190,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1456 + "__id__": 1468 }, "_enabled": true, "_id": "4fwjz1lnFLD45L1lqUY038" @@ -69626,7 +70200,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1455 + "__id__": 1467 }, "_enabled": true, "_materials": [ @@ -69668,7 +70242,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1455 + "__id__": 1467 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -69786,7 +70360,7 @@ "_active": true, "_components": [ { - "__id__": 1466 + "__id__": 1478 } ], "_prefab": null, @@ -69842,7 +70416,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1465 + "__id__": 1477 }, "_enabled": true, "_materials": [ diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 55f3192..71e7edf 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -483,7 +483,9 @@ export default class GameManager extends cc.Component { if (data.coinAmount == null || data.coinAmount == undefined) { data.coinAmount = 0; } + if (levelInfo.level > data.levelAmount) { + console.log("本地等级 大于服务器等级才走这里") cc.fx.GameConfig.GM_INFO.level = levelInfo.level; cc.fx.GameConfig.GM_INFO.coin = coinInfo.coin; @@ -541,7 +543,11 @@ export default class GameManager extends cc.Component { } this.load3 = true; this.load4 = true; - } else { + } + else { + const localLevel = levelInfo.level; + const serverLevelIsNewer = localLevel < data.levelAmount; + // 服务器关卡更高，说明当前设备缓存已落后，资源数据统一以服务器为准。 if (data.levelAmount == null || data.levelAmount == undefined) { data.levelAmount = cc.fx.GameConfig.GM_INFO.level; Utils.setUserLevel((data) => { @@ -552,12 +558,13 @@ export default class GameManager extends cc.Component { cc.fx.GameTool.setUserCoin((data) => { }); } + const timestamp = Date.now(); - let levelInfo = { "level": data.levelAmount, "timestamp": timestamp }; - cc.fx.StorageMessage.setStorage("level", levelInfo); - let coinInfo = { "coin": data.coinAmount, "timestamp": timestamp }; - cc.fx.StorageMessage.setStorage("coin", coinInfo); - if (data.forcedUpdate == true) { + let levelInfoTemp = { "level": data.levelAmount, "timestamp": timestamp }; + cc.fx.StorageMessage.setStorage("level", levelInfoTemp); + let coinInfoTemp = { "coin": data.coinAmount, "timestamp": timestamp }; + cc.fx.StorageMessage.setStorage("coin", coinInfoTemp); + if (serverLevelIsNewer || data.forcedUpdate == true) { let propInfo = { "freezeAmount": data.freezeAmount, "hammerAmount": data.hammerAmount, @@ -570,6 +577,9 @@ export default class GameManager extends cc.Component { cc.fx.GameConfig.GM_INFO.level = data.levelAmount; cc.fx.GameConfig.GM_INFO.coin = data.coinAmount; cc.fx.StorageMessage.setStorage("prop", propInfo); + if (serverLevelIsNewer) { + console.log("服务器关卡高于本地，金币和道具已使用服务器数据覆盖本地缓存", localLevel, data.levelAmount); + } // console.log("走的强制刷新", cc.fx.GameConfig.GM_INFO.hammerAmount) } else { diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index bbb4b19..d7a1cf0 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -109,6 +109,9 @@ export default class MapConroler extends cc.Component { @property(cc.SpriteAtlas) avatar: cc.SpriteAtlas = null; + @property({ tooltip: "点击 NewMode 确认后，胜利结算动画倍速（1 为原速）" }) + newModeSettlementSpeed: number = 1.15; + timeLabel: cc.Node = null; levelLabel: cc.Node = null; coin: cc.Node = null; @@ -116,6 +119,7 @@ export default class MapConroler extends cc.Component { touchIng: boolean = false;//是否在操作方块 new_mode: number = 0; new_item: number = 0; + autoNextAfterNewMode: boolean = false; mapWidth: number = 0; mapHeight: number = 0; wallNum: number = 0; @@ -3301,6 +3305,10 @@ export default class MapConroler extends cc.Component { } }); + // addLevel 会同步把已通关数加一，此时即可判断下一关是否有新功能。 + // 新功能介绍统一在当前关结算出现时展示，不再等玩家点击“下一关”或“首页”。 + this.check_NewMode(); + setTimeout(() => { this.node.parent.parent.getChildByName("Win").active = true; this.node.parent.parent.getChildByName("Lose").active = false; @@ -3308,20 +3316,12 @@ export default class MapConroler extends cc.Component { if (cc.fx.GameConfig.GM_INFO.level >= 21) { this.setPassProgress(); } - if (cc.fx.GameConfig.GM_INFO.addLevel >= 5) { - this.createRank(); - } - // else if (cc.fx.GameConfig.GM_INFO.addLevel < 5) { - // this.createCareer(); - // } - this.createCareer(); - this.Settlement(); - if (cc.fx.GameConfig.GM_INFO.level >= 17) { - this.node.parent.parent.getChildByName("Win").getChildByName("WinStreak").active = true; - this.openWinStreak(); - } - else { - this.node.parent.parent.getChildByName("Win").getChildByName("WinStreak").active = false; + if (this.new_mode == 3) { + // 新功能介绍出现期间只显示弹窗，胜利结算动画等玩家确认后再播放。 + this.gameOverNode.active = false; + this.openNewMode(0); + } else { + this.playWinSettlement(); } }, 660); // console.log("游戏成功"); @@ -3337,7 +3337,6 @@ export default class MapConroler extends cc.Component { } else { console.log("JiaZai 节点未找到"); } - this.check_NewMode(); } else { if (this.gameOver == true) { @@ -3361,6 +3360,67 @@ export default class MapConroler extends cc.Component { } } + // 播放胜利结算界面的完整内容。普通胜利直接调用，新功能弹窗则延后到确认时调用。 + playWinSettlement() { + if (cc.fx.GameConfig.GM_INFO.addLevel >= 5) { + this.createRank(); + } + this.createCareer(); + this.Settlement(); + if (cc.fx.GameConfig.GM_INFO.level >= 17) { + this.node.parent.parent.getChildByName("Win").getChildByName("WinStreak").active = true; + this.openWinStreak(); + } + else { + this.node.parent.parent.getChildByName("Win").getChildByName("WinStreak").active = false; + } + } + + // 只在 NewMode 的 clickBtn 自动过关流程中加速结算动画。 + settlementAnimationTime(duration: number) { + if (!this.autoNextAfterNewMode) { + return duration; + } + const speed = Number(this.newModeSettlementSpeed); + return duration / (speed > 0 ? speed : 1); + } + + settlementAnimationSpeed() { + if (!this.autoNextAfterNewMode) { + return 1; + } + const speed = Number(this.newModeSettlementSpeed); + return speed > 0 ? speed : 1; + } + + // 新功能介绍确认后播放结算动画，并在指定延迟后自动进入下一关。 + onNewModeConfirmed() { + const newModeNode = this.node.parent.parent.getChildByName("NewMode"); + newModeNode.off("new-mode-returned", this.onNewModeReturned, this); + this.autoNextAfterNewMode = true; + this.gameOverNode.active = true; + this.playWinSettlement(); + + const homeBtn = this.gameOverNode.getChildByName("homeBtn"); + const nextBtn = this.gameOverNode.getChildByName("nextBtn"); + homeBtn.active = false; + nextBtn.active = false; + + this.scheduleOnce(() => { + nextBtn.getComponent("btnControl").setTouch(true); + this.winLevel(); + }, 1.5); + } + + // 点击新功能弹窗的返回按钮后，恢复普通胜利结算流程，不自动进入下一关。 + onNewModeReturned() { + const newModeNode = this.node.parent.parent.getChildByName("NewMode"); + newModeNode.off("new-mode-confirmed", this.onNewModeConfirmed, this); + this.autoNextAfterNewMode = false; + this.gameOverNode.active = true; + this.playWinSettlement(); + } + //关闭最大关卡提示窗 winMaxLevelShowClose() { this.node.parent.parent.getChildByName("Win").getChildByName("specialTips").active = false; @@ -3467,12 +3527,6 @@ export default class MapConroler extends cc.Component { } else { // console.log("下一关"); - if (this.new_mode == 3) { - this.node.parent.parent.getChildByName("Win").active = false; - this.openNewMode(2); - cc.fx.GameConfig.LEVEL_INFO_init(false, 0, false); - return; - } if (this.new_item == 3) { if (cc.fx.GameConfig.GM_INFO.level + 1 == 8) { console.log("新手引导开启"); @@ -4113,11 +4167,6 @@ export default class MapConroler extends cc.Component { cc.fx.GameTool.setWinStreak("fail"); MapConroler._instance.trackFinishi("give_up", "customEventData"); } - if (this.new_mode == 3) { - this.node.parent.parent.getChildByName("Win").active = false; - this.openNewMode(1); - return; - } if (this.new_item == 3) { if (cc.fx.GameConfig.GM_INFO.level + 1 == 8) { cc.fx.GameConfig.GM_INFO.hammerFirst = true; @@ -4391,14 +4440,19 @@ export default class MapConroler extends cc.Component { }; // 开始分帧销毁方块 destroyBlocks(); - this.node.parent.parent.getChildByName("NewMode").active = true; - let pauseNode = this.node.parent.parent.getChildByName("NewMode").getChildByName("newmode"); + const newModeNode = this.node.parent.parent.getChildByName("NewMode"); + if (type == 0) { + newModeNode.once("new-mode-confirmed", this.onNewModeConfirmed, this); + newModeNode.once("new-mode-returned", this.onNewModeReturned, this); + } + newModeNode.active = true; + let pauseNode = newModeNode.getChildByName("newmode"); pauseNode.scale = 0.3; cc.tween(pauseNode) .to(0.2, { scale: 1.05 }, { easing: 'backOut' }) .to(0.15, { scale: 1.0 }, { easing: 'sineOut' }) .start(); - this.node.parent.parent.getChildByName("NewMode").getComponent("NewMode").setMode(type); + newModeNode.getComponent("NewMode").setMode(type); } //正在点击方块颜色，对应颜色门下降 @@ -5974,6 +6028,7 @@ export default class MapConroler extends cc.Component { // 展示连胜界面动画 openWinStreak() { + const t = (duration: number) => this.settlementAnimationTime(duration); let winStreak = this.node.parent.parent.getChildByName("Win").getChildByName("WinStreak"); winStreak.getChildByName("open").active = false; if (cc.fx.GameConfig.GM_INFO.winStreak > 0) { @@ -5990,14 +6045,14 @@ export default class MapConroler extends cc.Component { else { hammer[i].scaleX = hammer[i].scaleY = 0; cc.tween(hammer[i]) - .delay(0.2) - .to(0.2, { scaleX: 0.7, scaleY: 0.7 }) // 快速放大到0.7 - .to(0.1, { scaleX: 0.4, scaleY: 0.4 }) // 突然缩小制造弹性感 - .to(0.1, { scaleX: 0.6, scaleY: 0.6 }) // 再次弹起到0.6 - .to(0.1, { scaleX: 0.5, scaleY: 0.5 }) // 最终稳定到0.5 - .to(0.05, { scaleX: 0.55, scaleY: 0.45 }) // X轴抖动效果 - .to(0.05, { scaleX: 0.45, scaleY: 0.55 }) // Y轴抖动效果 - .to(0.1, { scaleX: 0.5, scaleY: 0.5 }) // 恢复最终比例 + .delay(t(0.2)) + .to(t(0.2), { scaleX: 0.7, scaleY: 0.7 }) // 快速放大到0.7 + .to(t(0.1), { scaleX: 0.4, scaleY: 0.4 }) // 突然缩小制造弹性感 + .to(t(0.1), { scaleX: 0.6, scaleY: 0.6 }) // 再次弹起到0.6 + .to(t(0.1), { scaleX: 0.5, scaleY: 0.5 }) // 最终稳定到0.5 + .to(t(0.05), { scaleX: 0.55, scaleY: 0.45 }) // X轴抖动效果 + .to(t(0.05), { scaleX: 0.45, scaleY: 0.55 }) // Y轴抖动效果 + .to(t(0.1), { scaleX: 0.5, scaleY: 0.5 }) // 恢复最终比例 .start(); } } @@ -6008,6 +6063,7 @@ export default class MapConroler extends cc.Component { //创建 入职界面 createCareer() { + const t = (duration: number) => this.settlementAnimationTime(duration); let max = false; if (cc.fx.GameConfig.GM_INFO.addLevel == 4) { let address = cc.fx.StorageMessage.getStorage("address"); @@ -6038,7 +6094,7 @@ export default class MapConroler extends cc.Component { NumberToImage.numberToImageNodes4(addLevel, 43, 15, "custom", Career.getChildByName("level"), true); if (addLevel == 1) { cc.tween(progress.children[4].getChildByName("win").getComponent(cc.Sprite)) - .to(0.5, { fillRange: 1 }) + .to(t(0.5), { fillRange: 1 }) .start(); } else if (addLevel > 1) { for (let i = 0; i < 4; i++) { @@ -6054,26 +6110,26 @@ export default class MapConroler extends cc.Component { else { progress.children[i].getChildByName("progress").width = 0; cc.tween(progress.children[i].getChildByName("progress")) - .delay(0.4) - .to(0.3, { width: 100 }) + .delay(t(0.4)) + .to(t(0.3), { width: 100 }) .start(); } if (i < 3) { progress.children[i + 4].getChildByName("win").getComponent(cc.Sprite).fillRange = 1; cc.tween(progress.children[i + 5].getChildByName("win").getComponent(cc.Sprite)) - .delay(0.7) - .to(0.5, { fillRange: 1 }) + .delay(t(0.7)) + .to(t(0.5), { fillRange: 1 }) .start(); } else { progress.children[i + 4].getChildByName("win").getComponent(cc.Sprite).fillRange = 1; cc.tween(Career.getChildByName("ruzhi")) - .delay(0.7) - .to(0.1, { rotation: 10 }) - .to(0.2, { rotation: -10 }) - .to(0.2, { rotation: 10 }) - .to(0.1, { rotation: 0 }) + .delay(t(0.7)) + .to(t(0.1), { rotation: 10 }) + .to(t(0.2), { rotation: -10 }) + .to(t(0.2), { rotation: 10 }) + .to(t(0.1), { rotation: 0 }) .start(); } @@ -6113,6 +6169,8 @@ export default class MapConroler extends cc.Component { //结算界面 Settlement() { + const t = (duration: number) => this.settlementAnimationTime(duration); + const speed = this.settlementAnimationSpeed(); cc.fx.AudioManager._instance.playEffect("win", null) //获取this.gameOverNode所有子节点的位置 let child = this.gameOverNode; @@ -6150,7 +6208,7 @@ export default class MapConroler extends cc.Component { title.active = true; //播放速度减慢一倍 const anim = title.getChildByName("cai").getComponent(cc.Animation); - anim.defaultClip.speed = 0.5; // 全局默认速度 + anim.defaultClip.speed = 0.5 * speed; anim.play(); // 开始播放 let iphone = cc.fx.GameConfig.GM_INFO.useravatarIcon.substring(0, 4); // console.log("头像_________", cc.fx.GameConfig.GM_INFO.useravatarIcon, cc.fx.GameConfig.GM_INFO.useravatar); @@ -6164,12 +6222,12 @@ export default class MapConroler extends cc.Component { // this.icon.getComponent(cc.Sprite).spriteFrame = icon; } }) - .to(0.12, { scale: 1.2 }, { easing: 'quadOut' }) - .to(0.08, { scale: 0.85 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.1 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) - .delay(0.1) - .to(0.4, { x: this.arr[0][0], y: this.arr[0][1], z: this.arr[0][2] }) + .to(t(0.12), { scale: 1.2 }, { easing: 'quadOut' }) + .to(t(0.08), { scale: 0.85 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.1 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) + .delay(t(0.1)) + .to(t(0.4), { x: this.arr[0][0], y: this.arr[0][1], z: this.arr[0][2] }) .call(() => { this.playButtonGroup(); }) @@ -6178,6 +6236,7 @@ export default class MapConroler extends cc.Component { // 播放按钮组动画 playButtonGroup() { + const t = (duration: number) => this.settlementAnimationTime(duration); let homeBtn = this.gameOverNode.getChildByName("homeBtn"); let nextBtn = this.gameOverNode.getChildByName("nextBtn"); let tiaodik = this.gameOverNode.getChildByName("tiaodik"); @@ -6188,45 +6247,49 @@ export default class MapConroler extends cc.Component { cc.tween(homeBtn) // .to(0, { position: cc.v3(0, -680, 0), scale: 0 }) .call(() => { - homeBtn.active = true; + if (!this.autoNextAfterNewMode) { + homeBtn.active = true; + } }) - .to(0.15, { scale: 1.25 }, { easing: 'backOut' }) - .to(0.08, { scale: 0.9 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.15 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) + .to(t(0.15), { scale: 1.25 }, { easing: 'backOut' }) + .to(t(0.08), { scale: 0.9 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.15 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) // .to(0.3 / 2, { position: cc.v3(this.arr[6][0], this.arr[6][1], this.arr[6][2]) }) .start(); cc.tween(nextBtn) - .delay(0.1) + .delay(t(0.1)) //.to(0, { position: cc.v3(0, -880, 0), scale: 0 }) .call(() => { if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) { - nextBtn.active = true; + if (!this.autoNextAfterNewMode) { + nextBtn.active = true; + } } else { cc.fx.GameConfig.GM_INFO.otherLevel = 0; cc.fx.GameConfig.GM_INFO.otherUid = ""; } }) - .to(0.15, { scale: 1.25 }, { easing: 'backOut' }) - .to(0.08, { scale: 0.9 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.15 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) + .to(t(0.15), { scale: 1.25 }, { easing: 'backOut' }) + .to(t(0.08), { scale: 0.9 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.15 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) // .to(0.3 / 2, { position: cc.v3(this.arr[5][0], this.arr[5][1], this.arr[5][2]) }) .start(); // tiaodik 动画（再延迟一点 cc.tween(tiaodik) - .delay(0.2) + .delay(t(0.2)) // .to(0, { position: cc.v3(0, -1080, 0), scale: 0 }) .call(() => { tiaodik.active = true; }) - .to(0.15, { scale: 1.25 }, { easing: 'backOut' }) - .to(0.08, { scale: 0.9 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.15 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) + .to(t(0.15), { scale: 1.25 }, { easing: 'backOut' }) + .to(t(0.08), { scale: 0.9 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.15 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) // .to(0.3 / 2, { position: cc.v3(this.arr[4][0], this.arr[4][1], this.arr[4][2]) }) .call(() => { this.playDecorationGroup(); @@ -6256,7 +6319,7 @@ export default class MapConroler extends cc.Component { } if (cc.fx.GameConfig.GM_INFO.addLevel == 5) { cc.tween(ruzhi) - .delay(1) + .delay(t(1)) .call(() => { ruzhi.active = true; if (iphone == "icon") { @@ -6269,22 +6332,22 @@ export default class MapConroler extends cc.Component { } cc.tween(ruzhi.getChildByName("bg")) - .to(0.3, { rotation: -5, scaleX: 1, scaleY: 1 }) + .to(t(0.3), { rotation: -5, scaleX: 1, scaleY: 1 }) .start(); cc.tween(ruzhi.getChildByName("caidai1")) - .delay(0.6) - .to(0.2, { scaleX: 1, scaleY: 1 }) + .delay(t(0.6)) + .to(t(0.2), { scaleX: 1, scaleY: 1 }) .start(); cc.tween(ruzhi.getChildByName("caidai2")) - .delay(0.6) - .to(0.2, { scaleX: 1, scaleY: 1 }) + .delay(t(0.6)) + .to(t(0.2), { scaleX: 1, scaleY: 1 }) .start(); cc.tween(ruzhi.getChildByName("yinzhang")) - .delay(0.5) + .delay(t(0.5)) .call(() => { ruzhi.getChildByName("yinzhang").active = true; }) - .to(0.2, { scaleX: 1, scaleY: 1 }) + .to(t(0.2), { scaleX: 1, scaleY: 1 }) .call(() => { ruzhi.getChildByName("line").active = true; ruzhi.getChildByName("line").runAction(cc.rotateTo(50, 1080).repeatForever()); @@ -6300,6 +6363,8 @@ export default class MapConroler extends cc.Component { // 播放装饰元素动画 playDecorationGroup() { + const t = (duration: number) => this.settlementAnimationTime(duration); + const speed = this.settlementAnimationSpeed(); let pian = this.gameOverNode.getChildByName("pian"); let guang = this.gameOverNode.getChildByName("guang"); let coins4 = this.gameOverNode.getChildByName("coins4"); @@ -6323,8 +6388,10 @@ export default class MapConroler extends cc.Component { .to(0, { scale: 2 }) .call(() => { caidai.active = true; - caidai.getComponent(sp.Skeleton).setAnimation(0, "animation", false); - caidai.getComponent(sp.Skeleton).setCompleteListener(() => { + const caidaiSkeleton = caidai.getComponent(sp.Skeleton); + caidaiSkeleton.timeScale = speed; + caidaiSkeleton.setAnimation(0, "animation", false); + caidaiSkeleton.setCompleteListener(() => { caidai.active = false; }); }) @@ -6332,12 +6399,12 @@ export default class MapConroler extends cc.Component { // pian 动画（稍微延迟 cc.tween(pian) - .delay(0.05) + .delay(t(0.05)) .to(0, { scale: 0 }) .call(() => { pian.active = true; }) - .to(0.3, { scale: 3.6 }) + .to(t(0.3), { scale: 3.6 }) .call(() => { pian.active = false; }) @@ -6345,43 +6412,43 @@ export default class MapConroler extends cc.Component { // guang 动画（再延迟一点） cc.tween(guang) - .delay(0.1) + .delay(t(0.1)) .to(0, { scale: 0 }) .call(() => { guang.active = true; }) - .to(0.3, { scale: 1 }) + .to(t(0.3), { scale: 1 }) .start(); // coins4 动画（最后播放） cc.tween(coins4) - .delay(0.15) + .delay(t(0.15)) .to(0, { scale: 0 }) .call(() => { coins4.active = true; }) - .to(0.2, { scale: 2.2 }, { easing: 'backOut' }) - .to(0.12, { scale: 1.8 }, { easing: 'quadIn' }) - .to(0.08, { scale: 2.1 }, { easing: 'quadOut' }) - .to(0.06, { scale: 2 }, { easing: 'quadIn' }) + .to(t(0.2), { scale: 2.2 }, { easing: 'backOut' }) + .to(t(0.12), { scale: 1.8 }, { easing: 'quadIn' }) + .to(t(0.08), { scale: 2.1 }, { easing: 'quadOut' }) + .to(t(0.06), { scale: 2 }, { easing: 'quadIn' }) .start(); // diguan 动画 cc.tween(diguan) - .delay(0.3) - .to(0.15, { scale: 1.15 }, { easing: 'backOut' }) - .to(0.08, { scale: 0.9 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.05 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) + .delay(t(0.3)) + .to(t(0.15), { scale: 1.15 }, { easing: 'backOut' }) + .to(t(0.08), { scale: 0.9 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.05 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) .start(); cc.tween(endlessNode) - .delay(0.3) - .to(0.15, { scale: 1.15 }, { easing: 'backOut' }) - .to(0.08, { scale: 0.9 }, { easing: 'quadIn' }) - .to(0.06, { scale: 1.05 }, { easing: 'quadOut' }) - .to(0.04, { scale: 1 }, { easing: 'quadIn' }) + .delay(t(0.3)) + .to(t(0.15), { scale: 1.15 }, { easing: 'backOut' }) + .to(t(0.08), { scale: 0.9 }, { easing: 'quadIn' }) + .to(t(0.06), { scale: 1.05 }, { easing: 'quadOut' }) + .to(t(0.04), { scale: 1 }, { easing: 'quadIn' }) .start(); } diff --git a/assets/Script/NewMode.ts b/assets/Script/NewMode.ts index 2ce263a..7765cb7 100644 --- a/assets/Script/NewMode.ts +++ b/assets/Script/NewMode.ts @@ -32,14 +32,14 @@ export default class NewClass extends cc.Component { this.propName = cc.fx.GameConfig.NEW_LEVEL[i].name; const path = 'Window_Prop/' + this.propName; if (i == 6 || (i < 11 && i > 7)) - this.node.getChildByName("newmode").getChildByName("icon").y = 155 + this.node.getChildByName("newmode").getChildByName("icon").y = 155 - 230 else - this.node.getChildByName("newmode").getChildByName("icon").y = 100 + this.node.getChildByName("newmode").getChildByName("icon").y = 100 - 230 if (i > 10) - this.node.getChildByName("newmode").getChildByName("light").y = 140 + this.node.getChildByName("newmode").getChildByName("light").y = 140 - 230 else - this.node.getChildByName("newmode").getChildByName("light").y = -72 + this.node.getChildByName("newmode").getChildByName("light").y = -72 - 230 cc.resources.load(path, cc.SpriteFrame, (err, spriteFrame: cc.SpriteFrame) => { @@ -56,6 +56,10 @@ export default class NewClass extends cc.Component { setMode(mode: number) { this.btnStatic = mode; + // mode 0 表示从结算界面自动弹出，关闭后仍停留在结算界面。 + if (mode == 0) { + return; + } let name = "GameScene"; if (mode == 1) { name = "HomeScene"; @@ -67,7 +71,11 @@ export default class NewClass extends cc.Component { clickBtn() { cc.fx.AudioManager._instance.playEffect("anniu_Big", null); - if (this.btnStatic == 1) { + if (this.btnStatic == 0) { + this.node.active = false; + this.node.emit("new-mode-confirmed"); + } + else if (this.btnStatic == 1) { cc.fx.GameTool.getUserAvatar(() => { }) cc.director.loadScene("HomeScene"); @@ -77,5 +85,11 @@ export default class NewClass extends cc.Component { } } + returnBtn() { + cc.fx.AudioManager._instance.playEffect("anniu_Big", null); + this.node.active = false; + this.node.emit("new-mode-returned"); + } + // update (dt) {} } diff --git a/assets/Script/monthlyCard.ts b/assets/Script/monthlyCard.ts index 8a462d6..2bcee30 100644 --- a/assets/Script/monthlyCard.ts +++ b/assets/Script/monthlyCard.ts @@ -170,7 +170,6 @@ export default class NewClass extends cc.Component { // let rewardData = [ // { type: "coin", count: 6000 }, // ] - } }, outTradeNo) // update (dt) {} @@ -491,7 +490,7 @@ export default class NewClass extends cc.Component { this.iosPrice = price; this.iosProductId = productId; this.iosCount = 1; - console.log("准备跳客服回话:"); + console.log("准备跳客服回话:", iosPayInfo); console.log(this.iosProductId); Utils.GoKEFu(iosPayInfo, (res) => { if (res == "success") { diff --git a/assets/resources/Window_Prop/ban.png b/assets/resources/Window_Prop/ban.png index 72aa1d7..8f584ea 100644 Binary files a/assets/resources/Window_Prop/ban.png and b/assets/resources/Window_Prop/ban.png differ diff --git a/assets/resources/Window_Prop/ban.png.meta b/assets/resources/Window_Prop/ban.png.meta index ed7b331..25c9c76 100644 --- a/assets/resources/Window_Prop/ban.png.meta +++ b/assets/resources/Window_Prop/ban.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 991, - "height": 1463, + "width": 1018, + "height": 1526, "platformSettings": {}, "subMetas": { "ban": { @@ -21,13 +21,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": -0.5, + "offsetY": 0, "trimX": 0, - "trimY": 1, - "width": 991, - "height": 1462, - "rawWidth": 991, - "rawHeight": 1463, + "trimY": 0, + "width": 1018, + "height": 1526, + "rawWidth": 1018, + "rawHeight": 1526, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/Window_Prop/daoju5 (1).png b/assets/resources/Window_Prop/daoju5 (1).png deleted file mode 100644 index 62f5143..0000000 Binary files a/assets/resources/Window_Prop/daoju5 (1).png and /dev/null differ diff --git a/assets/resources/Window_Prop/diban.jpg b/assets/resources/Window_Prop/diban.jpg new file mode 100644 index 0000000..b1ae5c9 Binary files /dev/null and b/assets/resources/Window_Prop/diban.jpg differ diff --git a/assets/resources/Window_Prop/daoju5 (1).png.meta b/assets/resources/Window_Prop/diban.jpg.meta similarity index 57% rename from assets/resources/Window_Prop/daoju5 (1).png.meta rename to assets/resources/Window_Prop/diban.jpg.meta index 7ded2fb..5c6345b 100644 --- a/assets/resources/Window_Prop/daoju5 (1).png.meta +++ b/assets/resources/Window_Prop/diban.jpg.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "1a59640c-49b4-4e4c-b1ad-3fece900bc6b", + "uuid": "a4e80994-425a-401c-a0cc-8f18c6362acb", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -8,26 +8,26 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 733, - "height": 690, + "width": 892, + "height": 1223, "platformSettings": {}, "subMetas": { - "daoju5 (1)": { + "diban": { "ver": "1.0.6", - "uuid": "a7f944d1-2a78-444b-875a-d7b9ae1fef6a", + "uuid": "9d8027fd-589c-4679-aca0-76f76c6460f1", "importer": "sprite-frame", - "rawTextureUuid": "1a59640c-49b4-4e4c-b1ad-3fece900bc6b", + "rawTextureUuid": "a4e80994-425a-401c-a0cc-8f18c6362acb", "trimType": "auto", "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 1.5, - "trimX": 19, - "trimY": 21, - "width": 695, - "height": 645, - "rawWidth": 733, - "rawHeight": 690, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 892, + "height": 1223, + "rawWidth": 892, + "rawHeight": 1223, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/Window_Prop/jujue.png b/assets/resources/Window_Prop/jujue.png new file mode 100644 index 0000000..07c37b3 Binary files /dev/null and b/assets/resources/Window_Prop/jujue.png differ diff --git a/assets/resources/Window_Prop/jujue.png.meta b/assets/resources/Window_Prop/jujue.png.meta new file mode 100644 index 0000000..c035682 --- /dev/null +++ b/assets/resources/Window_Prop/jujue.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "4ddb4a19-f42b-4d8c-ad22-2982ab5ce2f5", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 261, + "height": 64, + "platformSettings": {}, + "subMetas": { + "jujue": { + "ver": "1.0.6", + "uuid": "dbdc0748-472f-4cb3-b8ae-c46437f02fcc", + "importer": "sprite-frame", + "rawTextureUuid": "4ddb4a19-f42b-4d8c-ad22-2982ab5ce2f5", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 261, + "height": 64, + "rawWidth": 261, + "rawHeight": 64, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/jujueBtn.png b/assets/resources/Window_Prop/jujueBtn.png new file mode 100644 index 0000000..b12528a Binary files /dev/null and b/assets/resources/Window_Prop/jujueBtn.png differ diff --git a/assets/resources/Window_Prop/jujueBtn.png.meta b/assets/resources/Window_Prop/jujueBtn.png.meta new file mode 100644 index 0000000..92d21b6 --- /dev/null +++ b/assets/resources/Window_Prop/jujueBtn.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "4392b41d-a9b2-4e35-a2c4-54e6c899acbf", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 393, + "height": 123, + "platformSettings": {}, + "subMetas": { + "jujueBtn": { + "ver": "1.0.6", + "uuid": "4b385489-c31c-4609-82ae-ce400f6bda34", + "importer": "sprite-frame", + "rawTextureUuid": "4392b41d-a9b2-4e35-a2c4-54e6c899acbf", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 393, + "height": 123, + "rawWidth": 393, + "rawHeight": 123, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/newIcon.png b/assets/resources/Window_Prop/newIcon.png new file mode 100644 index 0000000..83916f2 Binary files /dev/null and b/assets/resources/Window_Prop/newIcon.png differ diff --git a/assets/resources/Window_Prop/newIcon.png.meta b/assets/resources/Window_Prop/newIcon.png.meta new file mode 100644 index 0000000..aa57620 --- /dev/null +++ b/assets/resources/Window_Prop/newIcon.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "bd776300-e4ea-4a5b-8d2c-56782dbd7665", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 235, + "height": 213, + "platformSettings": {}, + "subMetas": { + "newIcon": { + "ver": "1.0.6", + "uuid": "2777abbc-e4a4-4fbc-b684-209c262f58fe", + "importer": "sprite-frame", + "rawTextureUuid": "bd776300-e4ea-4a5b-8d2c-56782dbd7665", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 235, + "height": 213, + "rawWidth": 235, + "rawHeight": 213, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Window_Prop/next.png b/assets/resources/Window_Prop/next.png index 92257ca..60c9ab1 100644 Binary files a/assets/resources/Window_Prop/next.png and b/assets/resources/Window_Prop/next.png differ diff --git a/assets/resources/Window_Prop/next.png.meta b/assets/resources/Window_Prop/next.png.meta index a17b721..4bb6bfa 100644 --- a/assets/resources/Window_Prop/next.png.meta +++ b/assets/resources/Window_Prop/next.png.meta @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 235, - "height": 79, - "rawWidth": 235, - "rawHeight": 79, + "width": 542, + "height": 132, + "rawWidth": 542, + "rawHeight": 132, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/Window_Prop/title.png b/assets/resources/Window_Prop/title.png index c18e023..8692ae0 100644 Binary files a/assets/resources/Window_Prop/title.png and b/assets/resources/Window_Prop/title.png differ diff --git a/assets/resources/Window_Prop/title.png.meta b/assets/resources/Window_Prop/title.png.meta index 292b293..4adf403 100644 --- a/assets/resources/Window_Prop/title.png.meta +++ b/assets/resources/Window_Prop/title.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 687, - "height": 149, + "width": 637, + "height": 137, "platformSettings": {}, "subMetas": { "title": { @@ -20,14 +20,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": -0.5, + "offsetX": 0, + "offsetY": 0, "trimX": 0, - "trimY": 1, - "width": 686, - "height": 148, - "rawWidth": 687, - "rawHeight": 149, + "trimY": 0, + "width": 637, + "height": 137, + "rawWidth": 637, + "rawHeight": 137, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/Window_Prop/xinLog.png b/assets/resources/Window_Prop/xinLog.png new file mode 100644 index 0000000..c6a9d5d Binary files /dev/null and b/assets/resources/Window_Prop/xinLog.png differ diff --git a/assets/resources/Window_Prop/xinLog.png.meta b/assets/resources/Window_Prop/xinLog.png.meta new file mode 100644 index 0000000..525cb50 --- /dev/null +++ b/assets/resources/Window_Prop/xinLog.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "0b5e08fa-0747-47ff-ac17-5b512de7cc77", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 800, + "height": 150, + "platformSettings": {}, + "subMetas": { + "xinLog": { + "ver": "1.0.6", + "uuid": "ecccc889-da4b-40ce-842d-3a2796b875d4", + "importer": "sprite-frame", + "rawTextureUuid": "0b5e08fa-0747-47ff-ac17-5b512de7cc77", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 800, + "height": 150, + "rawWidth": 800, + "rawHeight": 150, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index 80d34cd..92bbeb1 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -878,7 +878,7 @@ export default class NewClass extends cc.Component { this.iosPrice = price; this.iosProductId = productId; this.iosCount = 1; - console.log("准备跳客服回话:"); + console.log("准备跳客服回话:", iosPayInfo); console.log(this.iosProductId); Utils.GoKEFu(iosPayInfo, (res) => { if (res == "success") { diff --git a/settings/project.json b/settings/project.json index 718126a..c90c490 100644 --- a/settings/project.json +++ b/settings/project.json @@ -1,5 +1,5 @@ { - "last-module-event-record-time": 1782785050691, + "last-module-event-record-time": 1783394460369, "group-list": [ "default", "Map"