diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index e8d54e0..776385b 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 296 + "__id__": 297 } ], "_active": false, @@ -84,17 +84,14 @@ "__id__": 258 }, { - "__id__": 261 + "__id__": 262 }, { - "__id__": 286 + "__id__": 287 } ], "_active": true, "_components": [ - { - "__id__": 292 - }, { "__id__": 293 }, @@ -103,6 +100,9 @@ }, { "__id__": 295 + }, + { + "__id__": 296 } ], "_prefab": null, @@ -12374,6 +12374,9 @@ }, { "__id__": 260 + }, + { + "__id__": 261 } ], "_prefab": null, @@ -12471,6 +12474,16 @@ "_originalHeight": 0, "_id": "394oVlZVVDDp4PRHaKfK2n" }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 258 + }, + "_enabled": true, + "_id": "d9e8Y//+dGO5Tm2vNoQbwO" + }, { "__type__": "cc.Node", "_name": "Loading", @@ -12480,31 +12493,31 @@ }, "_children": [ { - "__id__": 262 + "__id__": 263 }, { - "__id__": 265 + "__id__": 266 }, { - "__id__": 267 + "__id__": 268 }, { - "__id__": 271 + "__id__": 272 }, { - "__id__": 275 + "__id__": 276 }, { - "__id__": 279 + "__id__": 280 }, { - "__id__": 283 + "__id__": 284 } ], "_active": false, "_components": [ { - "__id__": 285 + "__id__": 286 } ], "_prefab": null, @@ -12560,16 +12573,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 264 }, { - "__id__": 264 + "__id__": 265 } ], "_prefab": null, @@ -12625,7 +12638,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 262 + "__id__": 263 }, "_enabled": true, "_materials": [ @@ -12657,7 +12670,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 262 + "__id__": 263 }, "_enabled": true, "_id": "0fS5t0zP5AdI0CPkmzwBv/" @@ -12667,13 +12680,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [], "_active": true, "_components": [ { - "__id__": 266 + "__id__": 267 } ], "_prefab": null, @@ -12729,7 +12742,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 265 + "__id__": 266 }, "_enabled": true, "_materials": [ @@ -12762,17 +12775,17 @@ "_name": "block1", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [ { - "__id__": 268 + "__id__": 269 } ], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 271 } ], "_prefab": null, @@ -12828,13 +12841,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 267 + "__id__": 268 }, "_children": [], "_active": true, "_components": [ { - "__id__": 269 + "__id__": 270 } ], "_prefab": null, @@ -12890,7 +12903,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 268 + "__id__": 269 }, "_enabled": true, "_materials": [ @@ -12922,7 +12935,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 267 + "__id__": 268 }, "_enabled": true, "_materials": [ @@ -12954,17 +12967,17 @@ "_name": "block2", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [ { - "__id__": 272 + "__id__": 273 } ], "_active": true, "_components": [ { - "__id__": 274 + "__id__": 275 } ], "_prefab": null, @@ -13020,13 +13033,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 271 + "__id__": 272 }, "_children": [], "_active": true, "_components": [ { - "__id__": 273 + "__id__": 274 } ], "_prefab": null, @@ -13082,7 +13095,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 272 + "__id__": 273 }, "_enabled": true, "_materials": [ @@ -13114,7 +13127,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 271 + "__id__": 272 }, "_enabled": true, "_materials": [ @@ -13146,17 +13159,17 @@ "_name": "block3", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [ { - "__id__": 276 + "__id__": 277 } ], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 279 } ], "_prefab": null, @@ -13212,13 +13225,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 275 + "__id__": 276 }, "_children": [], "_active": true, "_components": [ { - "__id__": 277 + "__id__": 278 } ], "_prefab": null, @@ -13274,7 +13287,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 276 + "__id__": 277 }, "_enabled": true, "_materials": [ @@ -13306,7 +13319,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 275 + "__id__": 276 }, "_enabled": true, "_materials": [ @@ -13338,17 +13351,17 @@ "_name": "block4", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [ { - "__id__": 280 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 282 + "__id__": 283 } ], "_prefab": null, @@ -13404,13 +13417,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 279 + "__id__": 280 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 282 } ], "_prefab": null, @@ -13466,7 +13479,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 280 + "__id__": 281 }, "_enabled": true, "_materials": [ @@ -13498,7 +13511,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 279 + "__id__": 280 }, "_enabled": true, "_materials": [ @@ -13530,13 +13543,13 @@ "_name": "cat", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 262 }, "_children": [], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 285 } ], "_prefab": null, @@ -13592,7 +13605,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 283 + "__id__": 284 }, "_enabled": true, "_materials": [ @@ -13624,7 +13637,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 261 + "__id__": 262 }, "_enabled": true, "alignMode": 1, @@ -13655,16 +13668,16 @@ }, "_children": [ { - "__id__": 287 + "__id__": 288 } ], "_active": false, "_components": [ { - "__id__": 290 + "__id__": 291 }, { - "__id__": 291 + "__id__": 292 } ], "_prefab": null, @@ -13720,16 +13733,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 286 + "__id__": 287 }, "_children": [], "_active": true, "_components": [ { - "__id__": 288 + "__id__": 289 }, { - "__id__": 289 + "__id__": 290 } ], "_prefab": null, @@ -13785,7 +13798,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 287 + "__id__": 288 }, "_enabled": true, "_materials": [ @@ -13817,7 +13830,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 287 + "__id__": 288 }, "_enabled": true, "_id": "4fwjz1lnFLD45L1lqUY038" @@ -13827,7 +13840,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 286 + "__id__": 287 }, "_enabled": true, "_materials": [ @@ -13869,7 +13882,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 286 + "__id__": 287 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -13982,7 +13995,7 @@ "_active": true, "_components": [ { - "__id__": 297 + "__id__": 298 } ], "_prefab": null, @@ -14038,7 +14051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 296 + "__id__": 297 }, "_enabled": true, "_materials": [ diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index e5cf63e..3cbf1a7 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -718,7 +718,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: "1.0.56", //版本号 + version: "1.0.57", //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/assets/custom/Json/level1961.json.meta b/assets/custom/Json/level1961.json.meta new file mode 100644 index 0000000..714ee01 --- /dev/null +++ b/assets/custom/Json/level1961.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "c3ca056e-1b6d-41f1-9ffc-e7dbbd12fc46", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1962.json.meta b/assets/custom/Json/level1962.json.meta new file mode 100644 index 0000000..25069f0 --- /dev/null +++ b/assets/custom/Json/level1962.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "74bc88c3-2eb6-4a6f-bea1-d8a36db82b41", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1963.json.meta b/assets/custom/Json/level1963.json.meta new file mode 100644 index 0000000..9068cfa --- /dev/null +++ b/assets/custom/Json/level1963.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "7b9aefc8-0d23-4484-babb-bac56ced560e", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1964.json.meta b/assets/custom/Json/level1964.json.meta new file mode 100644 index 0000000..c7c052e --- /dev/null +++ b/assets/custom/Json/level1964.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "01ec268d-c0ec-4bb8-9c5f-5901ab294b5e", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1965.json.meta b/assets/custom/Json/level1965.json.meta new file mode 100644 index 0000000..e77b1f7 --- /dev/null +++ b/assets/custom/Json/level1965.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "eeaab56c-3071-4e10-bcd2-d702b23817c8", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1966.json.meta b/assets/custom/Json/level1966.json.meta new file mode 100644 index 0000000..581a011 --- /dev/null +++ b/assets/custom/Json/level1966.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "285e6a02-fcc7-4af9-82e7-6e52a17e65dd", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1967.json.meta b/assets/custom/Json/level1967.json.meta new file mode 100644 index 0000000..33c8406 --- /dev/null +++ b/assets/custom/Json/level1967.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "c01640a5-e776-4f3d-ac7b-724ba8c5754b", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1968.json.meta b/assets/custom/Json/level1968.json.meta new file mode 100644 index 0000000..98cdb93 --- /dev/null +++ b/assets/custom/Json/level1968.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "cc98a15c-0d79-46cf-b8b2-f809077dfcf8", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1969.json.meta b/assets/custom/Json/level1969.json.meta new file mode 100644 index 0000000..0abbd80 --- /dev/null +++ b/assets/custom/Json/level1969.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "3092c706-2d28-4061-8fcb-8685be9c1379", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1970.json.meta b/assets/custom/Json/level1970.json.meta new file mode 100644 index 0000000..16a8129 --- /dev/null +++ b/assets/custom/Json/level1970.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "6a215797-7f2b-4ec6-822e-7e3b0b0950c0", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1971.json.meta b/assets/custom/Json/level1971.json.meta new file mode 100644 index 0000000..b8d5c32 --- /dev/null +++ b/assets/custom/Json/level1971.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "1d5d4d36-3a34-4b9f-b9cd-0bb3a2d052b4", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1972.json.meta b/assets/custom/Json/level1972.json.meta new file mode 100644 index 0000000..6a054c1 --- /dev/null +++ b/assets/custom/Json/level1972.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "688873fd-6b9e-4f50-9621-73d26438ee8a", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1973.json.meta b/assets/custom/Json/level1973.json.meta new file mode 100644 index 0000000..29d1959 --- /dev/null +++ b/assets/custom/Json/level1973.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "2146025b-7f3c-49a5-bb07-346c0f414ee0", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1974.json.meta b/assets/custom/Json/level1974.json.meta new file mode 100644 index 0000000..4d72fc1 --- /dev/null +++ b/assets/custom/Json/level1974.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "fc7bdf04-09bd-40d0-aeb4-bd238bb39adb", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1975.json.meta b/assets/custom/Json/level1975.json.meta new file mode 100644 index 0000000..5ccbf33 --- /dev/null +++ b/assets/custom/Json/level1975.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "8990ded1-74f0-4d50-a15a-8025c2c546f6", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1976.json.meta b/assets/custom/Json/level1976.json.meta new file mode 100644 index 0000000..650907a --- /dev/null +++ b/assets/custom/Json/level1976.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "137da031-1afb-49e4-a1cd-c3c586b74bd7", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1977.json.meta b/assets/custom/Json/level1977.json.meta new file mode 100644 index 0000000..623e7ae --- /dev/null +++ b/assets/custom/Json/level1977.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "d96295ae-8edb-4bd2-a53f-b97b3f6623bf", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1978.json.meta b/assets/custom/Json/level1978.json.meta new file mode 100644 index 0000000..12e0837 --- /dev/null +++ b/assets/custom/Json/level1978.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "10d46073-7b38-48ea-8c48-3320a8cacdd2", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1979.json.meta b/assets/custom/Json/level1979.json.meta new file mode 100644 index 0000000..ce20871 --- /dev/null +++ b/assets/custom/Json/level1979.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "6ee1c02f-8d25-49d2-b3b2-97830dcc6d44", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/custom/Json/level1980.json.meta b/assets/custom/Json/level1980.json.meta new file mode 100644 index 0000000..404672b --- /dev/null +++ b/assets/custom/Json/level1980.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "bb97933e-bf82-47c6-a4a5-53be528d6004", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/Json/NEW_LEVEL.json b/assets/resources/Json/NEW_LEVEL.json index b4382d1..f82b71f 100644 --- a/assets/resources/Json/NEW_LEVEL.json +++ b/assets/resources/Json/NEW_LEVEL.json @@ -166,7 +166,7 @@ "tips": "藤蔓障碍第一次出现" }, { - "level": 1923, + "level": 1943, "name": "daoju33", "tips": "门生方块第一次出现" }