Commit ee47e99b authored by liujiangnan's avatar liujiangnan

feat

parent 2ec2904a
{"ver":"1.1.2","uuid":"c35bb2f6-f24a-4850-ae44-643f2fdc7541","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
\ No newline at end of file
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"_id": "57ea7c61-9b8b-498a-b024-c98ee9124beb" "_id": "790e76dc-ccbc-4f09-b8fa-2068364f6fc4"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1758,7 +1758,6 @@ ...@@ -1758,7 +1758,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "It's My Day", "_string": "It's My Day",
"_N$string": "It's My Day", "_N$string": "It's My Day",
"_fontSize": 36, "_fontSize": 36,
...@@ -2438,7 +2437,6 @@ ...@@ -2438,7 +2437,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "1", "_string": "1",
"_N$string": "1", "_N$string": "1",
"_fontSize": 20, "_fontSize": 20,
...@@ -3297,7 +3295,6 @@ ...@@ -3297,7 +3295,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "2", "_string": "2",
"_N$string": "2", "_N$string": "2",
"_fontSize": 20, "_fontSize": 20,
...@@ -4156,7 +4153,6 @@ ...@@ -4156,7 +4153,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "3", "_string": "3",
"_N$string": "3", "_N$string": "3",
"_fontSize": 20, "_fontSize": 20,
...@@ -5015,7 +5011,6 @@ ...@@ -5015,7 +5011,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "4", "_string": "4",
"_N$string": "4", "_N$string": "4",
"_fontSize": 20, "_fontSize": 20,
...@@ -5874,7 +5869,6 @@ ...@@ -5874,7 +5869,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "5", "_string": "5",
"_N$string": "5", "_N$string": "5",
"_fontSize": 20, "_fontSize": 20,
...@@ -6733,7 +6727,6 @@ ...@@ -6733,7 +6727,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "6", "_string": "6",
"_N$string": "6", "_N$string": "6",
"_fontSize": 20, "_fontSize": 20,
...@@ -7592,7 +7585,6 @@ ...@@ -7592,7 +7585,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "7", "_string": "7",
"_N$string": "7", "_N$string": "7",
"_fontSize": 20, "_fontSize": 20,
...@@ -8451,7 +8443,6 @@ ...@@ -8451,7 +8443,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "8", "_string": "8",
"_N$string": "8", "_N$string": "8",
"_fontSize": 20, "_fontSize": 20,
...@@ -9310,7 +9301,6 @@ ...@@ -9310,7 +9301,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "9", "_string": "9",
"_N$string": "9", "_N$string": "9",
"_fontSize": 20, "_fontSize": 20,
...@@ -10169,7 +10159,6 @@ ...@@ -10169,7 +10159,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "10", "_string": "10",
"_N$string": "10", "_N$string": "10",
"_fontSize": 20, "_fontSize": 20,
...@@ -11791,7 +11780,6 @@ ...@@ -11791,7 +11780,6 @@
"_materials": [], "_materials": [],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 40, "_fontSize": 40,
...@@ -12582,6 +12570,7 @@ ...@@ -12582,6 +12570,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "d6bBcX6GNJ9K0o1szmVe8f" "_id": "d6bBcX6GNJ9K0o1szmVe8f"
...@@ -12662,6 +12651,7 @@ ...@@ -12662,6 +12651,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "c03Fk49dFIpJle//sCSA/O" "_id": "c03Fk49dFIpJle//sCSA/O"
...@@ -12742,6 +12732,7 @@ ...@@ -12742,6 +12732,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "14OSAfnYpEdIMtUs7GX2H2" "_id": "14OSAfnYpEdIMtUs7GX2H2"
...@@ -12822,6 +12813,7 @@ ...@@ -12822,6 +12813,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "6bvueElNhGrbw7twqeWk+U" "_id": "6bvueElNhGrbw7twqeWk+U"
...@@ -12902,6 +12894,7 @@ ...@@ -12902,6 +12894,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "0fGybE6mBKhq7PA76Mexc+" "_id": "0fGybE6mBKhq7PA76Mexc+"
...@@ -12982,6 +12975,7 @@ ...@@ -12982,6 +12975,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "3ePvxHPkVCma80GO1wHbiG" "_id": "3ePvxHPkVCma80GO1wHbiG"
...@@ -13031,14 +13025,14 @@ ...@@ -13031,14 +13025,14 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "f4edeRi+NdAabqAkVYRwFjK", "__type__": "23e3d0tCgxFCJcd4W9umcRN",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 2 "__id__": 2
}, },
"_enabled": true, "_enabled": true,
"_id": "e687yyoRBIzZAOVRL8Sseh" "_id": "4cf14becd9ae4250ae19bd"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
......
{ {
"ver": "1.2.7", "ver": "1.2.9",
"uuid": "57ea7c61-9b8b-498a-b024-c98ee9124beb", "uuid": "790e76dc-ccbc-4f09-b8fa-2068364f6fc4",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"subMetas": {} "subMetas": {}
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html // - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
// Learn life-cycle callbacks: // Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html // - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import GameLogic from "./GameLogic" import GameLogic from "../script/GameLogic"
cc.Class({ cc.Class({
...@@ -82,8 +82,9 @@ cc.Class({ ...@@ -82,8 +82,9 @@ cc.Class({
}) })
}, },
onDestory() { onDestroy() {
cc.audioEngine.stopAll() cc.audioEngine.stopAll()
this.gameLogic.destroy();
}, },
getData(cb) { getData(cb) {
...@@ -91,10 +92,6 @@ cc.Class({ ...@@ -91,10 +92,6 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","dataArray":[]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/ebd0090da6d9e7a293d8b58f4e653841.mp3","birdDragonBones_1":{},"birdDragonBones_2":{},"birdDragonBones_audio":{},"dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/ebd0090da6d9e7a293d8b58f4e653841.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/a76cbdade5c43c73bd2b491a71b06fcb.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","dragonBones":{}},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","dragonBones":{}}]}}' const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/ebd0090da6d9e7a293d8b58f4e653841.mp3","birdDragonBones_1":{},"birdDragonBones_2":{},"birdDragonBones_audio":{},"dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/ebd0090da6d9e7a293d8b58f4e653841.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","dragonBones":{},"audio_url":"http://staging-teach.cdn.ireadabc.com/a76cbdade5c43c73bd2b491a71b06fcb.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","dragonBones":{}},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","dragonBones":{}}]}}'
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "f4ede462-f8d7-4069-ba80-915611c058ca", "uuid": "23e3dd2d-0a0c-4508-971d-e16f6e99c44d",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -762,18 +762,17 @@ export default class GameLogic { ...@@ -762,18 +762,17 @@ export default class GameLogic {
const downTime = Math.ceil((cc.winSize.height / 100) * 1000) / 1000 const downTime = Math.ceil((cc.winSize.height / 100) * 1000) / 1000
console.log(downTime) console.log(downTime)
let intervalID = setInterval(() => { this.intervalID = setInterval(() => {
let snow = getSnow( Math.ceil(Math.random()*4) ) let snow = getSnow( Math.ceil(Math.random()*4) )
// this.g_cartoon.tweenChange(snow, {y: -cc.winSize.height / 2}, downTime) // this.g_cartoon.tweenChange(snow, {y: -cc.winSize.height / 2}, downTime)
cc.tween(snow).to(downTime, {y: -cc.winSize.height / 2}).call(()=>snow.destroy()).start() cc.tween(snow).to(downTime, {y: -cc.winSize.height / 2}).call(()=>snow.destroy()).start()
}, 100); }, 100);
// setTimeout(() => {
// clearInterval(intervalID)
// }, time);
} }
destroy() {
clearInterval(this.intervalID);
}
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 277, "height": 277,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_star (1)": { "bg_star1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "5d105fb2-dc4f-4c57-bef5-66252429a234", "uuid": "5d105fb2-dc4f-4c57-bef5-66252429a234",
"rawTextureUuid": "2898a433-2aca-4a06-9c12-ccd722c7dbf6", "rawTextureUuid": "2898a433-2aca-4a06-9c12-ccd722c7dbf6",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 277, "height": 277,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_star (10)": { "bg_star10": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8d54788b-bc28-4a96-9a98-b9eaa66f9180", "uuid": "8d54788b-bc28-4a96-9a98-b9eaa66f9180",
"rawTextureUuid": "89372334-8aad-4621-99dc-f86c40680773", "rawTextureUuid": "89372334-8aad-4621-99dc-f86c40680773",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 277, "height": 277,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_star (11)": { "bg_star11": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "2813a94c-83c4-400a-ba60-1291d82a28dd", "uuid": "2813a94c-83c4-400a-ba60-1291d82a28dd",
"rawTextureUuid": "258dd5f3-f5fe-4422-a5c6-bd157c0c7428", "rawTextureUuid": "258dd5f3-f5fe-4422-a5c6-bd157c0c7428",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 277, "height": 277,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_star (12)": { "bg_star12": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e218f658-9bf7-46f4-b189-564c1b89dd90", "uuid": "e218f658-9bf7-46f4-b189-564c1b89dd90",
"rawTextureUuid": "fb135c42-7ec5-4010-91b9-bddde96c310e", "rawTextureUuid": "fb135c42-7ec5-4010-91b9-bddde96c310e",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment