Commit abfb1de0 authored by limingzhe's avatar limingzhe

fix: debug

parent adaf5f82
No preview for this file type
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "dc093928-4a71-4fe9-bbe2-e85e54e2404e", "uuid": "85158b98-997b-4f2c-8436-807482117f73",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "b5ae3c33-8510-4eb5-ab10-3f1545d7d087", "uuid": "0b029fa5-ad79-4759-8bdd-59093f0751a5",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "939c8f68-8162-402f-ade2-8e72a2d363f6", "uuid": "447fb044-c392-4f45-af94-8aea24132366",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.130612, "duration": 15.836,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "16fe2581-81a8-43d6-81b7-1678bcdcc381", "uuid": "02d54fb8-30de-4d77-a067-c35f5fabd044",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.496327, "duration": 0.600816,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "3092124b-8023-4487-99e4-8cb545256e45", "uuid": "7e7587d6-9ccd-41db-a520-28a5de0cb709",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.410612, "duration": 5.302857,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "996abacb-b041-4aa4-a238-23ac3c0858f8", "uuid": "fdeea25b-e8c8-431d-b13d-380cf72f1612",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.619592, "duration": 0.679184,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "b005fd49-02d2-47ec-8ee4-22c5bce94ca3",
"downloadMode": 0,
"duration": 1.515102,
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "06f5009f-64ab-45b5-bbe3-81f55d2b6325", "uuid": "f4c3f150-7fea-4c04-8bcc-9d78f6078348",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
This diff is collapsed.
{"name":"cannon","imagePath":"cannon_tex.png","SubTexture":[{"name":"炮管正面/底座","x":1,"height":107,"y":325,"width":184},{"name":"炮管正面/小管正","x":305,"height":136,"y":250,"width":102},{"name":"炮管正面/大管正","x":157,"height":120,"y":1,"width":146},{"name":"炮管正面/管口正","x":1,"height":160,"y":1,"width":154},{"name":"炮管正面/小管左","x":287,"height":125,"y":123,"width":126},{"name":"炮管正面/大管左","x":150,"height":139,"y":163,"width":135},{"name":"炮管正面/管口左","x":1,"height":160,"y":163,"width":147},{"name":"炮管正面/炮弹","x":187,"height":104,"y":304,"width":103},{"name":"炮管正面/线","x":150,"height":13,"y":304,"width":21},{"name":"炮管正面/fire","x":187,"height":79,"y":410,"width":30}],"height":512,"width":512}
\ No newline at end of file
{"name":"fire","isGlobal":0,"version":"5.5","armature":[{"name":"Armature","animation":[{"name":"newAnimation","frame":[],"duration":20,"slot":[{"name":"后焰","colorFrame":[],"displayFrame":[]},{"name":"火焰","colorFrame":[],"displayFrame":[]},{"name":"黄圆2","colorFrame":[],"displayFrame":[]},{"name":"黄圆","colorFrame":[],"displayFrame":[]},{"name":"圆","colorFrame":[],"displayFrame":[]},{"name":"线","colorFrame":[],"displayFrame":[]}],"bone":[{"name":"root","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"线","scaleFrame":[{"duration":10,"tweenEasing":0},{"x":1.4,"duration":10,"tweenEasing":0,"y":0.77},{"duration":0}],"translateFrame":[],"rotateFrame":[]},{"name":"火焰","scaleFrame":[{"duration":10,"tweenEasing":0},{"x":1.11,"duration":10,"tweenEasing":0},{"duration":0}],"translateFrame":[{"duration":20}],"rotateFrame":[{"duration":2,"tweenEasing":0},{"rotate":1.123,"duration":2,"tweenEasing":0},{"duration":2,"tweenEasing":0},{"rotate":1.123,"duration":2,"tweenEasing":0},{"duration":2,"tweenEasing":0},{"rotate":1.123,"duration":2,"tweenEasing":0},{"duration":2,"tweenEasing":0},{"rotate":1.123,"duration":2,"tweenEasing":0},{"duration":2,"tweenEasing":0},{"rotate":1.123,"duration":2,"tweenEasing":0},{"duration":0}]},{"name":"黄圆2","scaleFrame":[],"translateFrame":[{"duration":10},{"x":-63.4778,"duration":10,"y":9.155}],"rotateFrame":[]},{"name":"黄圆","scaleFrame":[],"translateFrame":[{"duration":10},{"x":-14.3647,"duration":10,"y":-17.7283}],"rotateFrame":[]},{"name":"后焰","scaleFrame":[{"duration":10,"tweenEasing":0},{"x":1.21,"duration":10,"tweenEasing":0},{"duration":0}],"translateFrame":[],"rotateFrame":[]}],"playTimes":0,"ffd":[],"ik":[]}],"slot":[{"name":"后焰","color":{},"parent":"后焰"},{"name":"火焰","color":{},"z":1,"parent":"火焰"},{"name":"黄圆2","color":{},"z":2,"parent":"黄圆2"},{"name":"黄圆","color":{},"z":3,"parent":"黄圆"},{"name":"圆","color":{},"z":4,"parent":"root"},{"name":"线","color":{},"z":5,"parent":"线"}],"bone":[{"name":"root","transform":{}},{"name":"线","transform":{"x":-120,"y":-131,"skX":180,"skY":180},"length":34,"parent":"root"},{"name":"火焰","transform":{"x":-81.5,"y":-20.5,"skX":-179.2655,"skY":-179.2655},"length":39,"parent":"root"},{"name":"黄圆2","transform":{"x":-89,"y":-57},"parent":"root"},{"name":"黄圆","transform":{"x":-125,"y":-1},"parent":"root"},{"name":"后焰","transform":{"x":-13.4412,"y":4.6727,"skX":3.3777,"skY":3.3777},"length":76,"parent":"火焰"}],"aabb":{"x":-260,"height":180.00000000000003,"y":-138,"width":273},"skin":[{"name":"","slot":[{"name":"圆","display":[{"name":"飞船/圆","transform":{"x":-92.5,"y":-130.5,"skX":-0.0832,"skY":-0.0832},"type":"image","path":"飞船/圆"}]},{"name":"黄圆","display":[{"name":"飞船/黄圆","transform":{"x":0.5,"y":-0.5,"skX":-0.0832,"skY":-0.0832},"type":"image","path":"飞船/黄圆"}]},{"name":"黄圆2","display":[{"name":"飞船/黄圆2","transform":{"x":0.5,"y":0.5,"skX":-0.0832,"skY":-0.0832},"type":"image","path":"飞船/黄圆2"}]},{"name":"火焰","display":[{"name":"飞船/火焰","transform":{"x":38.6058,"y":8.0058,"skX":179.1822,"skY":179.1822},"type":"image","path":"飞船/火焰"}]},{"name":"后焰","display":[{"name":"飞船/后焰","transform":{"x":55.1061,"y":-7.4709,"skX":175.8045,"skY":175.8045},"type":"image","path":"飞船/后焰"}]},{"name":"线","display":[{"name":"飞船/线","transform":{"x":52.5,"skX":179.9168,"skY":179.9168},"type":"image","path":"飞船/线"}]}]}],"frameRate":24,"defaultActions":[{"gotoAndPlay":"newAnimation"}],"type":"Armature","ik":[]}],"frameRate":24}
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "3a803da4-6637-4bf4-9aa3-9c387c0d54e0", "uuid": "b3057d86-109b-4c2e-a235-85745b61187f",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{"name":"fire","SubTexture":[{"name":"飞船/后焰","x":1,"height":127,"y":1,"width":273},{"name":"飞船/火焰","x":276,"height":76,"y":1,"width":78},{"name":"飞船/黄圆2","x":498,"height":9,"y":1,"width":9},{"name":"飞船/黄圆","x":498,"height":7,"y":12,"width":7},{"name":"飞船/圆","x":481,"height":15,"y":1,"width":15},{"name":"飞船/线","x":356,"height":6,"y":1,"width":123}],"imagePath":"fire_tex.png","height":256,"width":512}
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "e0f45382-4164-4c42-8041-0c6a53f3bdcc", "uuid": "533643eb-1a35-482a-85f8-eedea6a8f3fa",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "cddfb415-113d-4f62-a5ce-f7de44b0488f", "uuid": "2aa7591c-9925-4062-95ae-48451734d019",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 2048, "width": 512,
"height": 2048, "height": 256,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"smoke_tex": { "fire_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "78a09bd1-fb60-4a07-819b-62c06dd1eb1c", "uuid": "eab56a33-8ad5-4187-83ad-3fb876239488",
"rawTextureUuid": "cddfb415-113d-4f62-a5ce-f7de44b0488f", "rawTextureUuid": "2aa7591c-9925-4062-95ae-48451734d019",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -2,
"offsetY": 21, "offsetY": 63.5,
"trimX": 1, "trimX": 1,
"trimY": 1, "trimY": 1,
"width": 2046, "width": 506,
"height": 2004, "height": 127,
"rawWidth": 2048, "rawWidth": 512,
"rawHeight": 2048, "rawHeight": 256,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{"name":"hand","isGlobal":0,"version":"5.5","armature":[{"name":"Armature","animation":[{"name":"newAnimation","frame":[],"duration":24,"slot":[{"name":"圈2","colorFrame":[{"color":{"aM":5},"duration":10,"tweenEasing":0},{"color":{"aM":42},"duration":14,"tweenEasing":0},{"color":{"aM":5},"duration":0}],"displayFrame":[]},{"name":"圈1","colorFrame":[{"color":{"aM":20},"duration":10,"tweenEasing":0},{"color":{"aM":67},"duration":14,"tweenEasing":0},{"color":{"aM":20},"duration":0}],"displayFrame":[]},{"name":"手","colorFrame":[],"displayFrame":[]}],"bone":[{"name":"root","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"手1","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"bone","scaleFrame":[],"translateFrame":[],"rotateFrame":[{"duration":10,"tweenEasing":0},{"rotate":-17.6867,"duration":14,"curve":[0.5,0,1,1]},{"duration":0}]},{"name":"手","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"圈1","scaleFrame":[{"x":0.7,"duration":10,"tweenEasing":0,"y":0.7},{"duration":14}],"translateFrame":[],"rotateFrame":[]},{"name":"圈2","scaleFrame":[{"x":0.6,"duration":20,"tweenEasing":0,"y":0.6},{"x":1.2,"duration":4,"y":1.2}],"translateFrame":[],"rotateFrame":[]}],"playTimes":0,"ffd":[],"ik":[]}],"slot":[{"name":"圈2","color":{},"parent":"圈2"},{"name":"圈1","color":{},"z":1,"parent":"圈1"},{"name":"手","color":{},"z":2,"parent":"bone"}],"bone":[{"name":"root","transform":{}},{"name":"手1","transform":{"x":35.55,"y":32.6,"skX":-148.7082,"skY":-148.7082},"length":37,"parent":"root"},{"name":"圈2","transform":{"x":-28.5645,"y":-27.281,"skX":108.4349,"skY":108.4349},"length":1,"parent":"root"},{"name":"圈1","transform":{"x":-28.5,"y":-27},"parent":"root"},{"name":"bone","transform":{"x":54.6204,"y":5.2923,"skX":29.6652,"skY":29.6652},"length":34,"parent":"手1"},{"name":"手","transform":{"x":-30.2479,"y":3.6918,"skX":56.0738,"skY":56.0738},"length":32,"parent":"手1"}],"aabb":{"x":-74.99999999999896,"height":137.02849640581374,"y":-73.49999999999991,"width":147.63349699360094},"skin":[{"name":"","slot":[{"name":"圈2","display":[{"name":"手/圈2","transform":{"x":0.2461,"y":-0.15,"skX":-108.6774,"skY":-108.6774},"type":"image","path":"手/圈2"}]},{"name":"圈1","display":[{"name":"手/圈1","transform":{"skX":-0.2425,"skY":-0.2425},"type":"image","path":"手/圈1"}]},{"name":"手","display":[{"width":114,"userEdges":[],"transform":{"x":-26.611,"y":15.393,"skX":118.8006,"skY":118.8006},"vertices":[-57,-58,57,-58,-57,58,57,58,-4.76,-21.47,-16.27,-58,-57,-20.2,-44.63,7.31,-10.44,44.51,57,8.33],"bonePose":[5,-0.04596364018645993,-0.9989431133857472,0.9989431133857472,-0.04596364018645993,63.31539917687949,45.15585412222554,1,-0.8545335615464725,-0.5193961803774658,0.5193961803774658,-0.8545335615464725,35.55,32.6,4,-0.48546672075089964,-0.8742551475646954,0.8742551475646954,-0.48546672075089964,-8.376162734842005,-0.29206045047740403],"type":"mesh","triangles":[8,2,3,5,4,1,8,3,9,4,8,9,1,4,9,5,6,4,6,7,4,7,8,4,0,6,5,7,2,8,6,2,7],"name":"手/手","uvs":[0,0,1,0,0,1,1,1,0.45825,0.31491,0.35729,0,0,0.32586,0.1085,0.56303,0.40843,0.88367,1,0.57183],"height":116,"edges":[3,2,0,5,5,1,2,6,6,0,1,9,9,3],"weights":[3,5,0.024386669153679635,4,0.9102552648675118,1,0.06535806597880847,3,5,0.93,1,0.04,4,0.03,3,5,0.20788854717393426,1,0.4273697753255674,4,0.36474167750049824,3,5,0.87,1,0.11,4,0.02,3,5,0.35000000000000003,1,0.34,4,0.31,3,5,0.08988429187450295,4,0.7161025756124043,1,0.19401313251309277,3,5,0.04371329816266336,4,0.7446890630700564,1,0.21159763876728022,3,5,0.05645971418052874,4,0.5090502808498537,1,0.43449000496961754,3,5,0.62,1,0.29,4,0.09,2,5,0.91,1,0.09],"slotPose":[0.9999910464482966,-0.004231669086503187,0.004231669086503187,0.9999910464482966,18.000000000000234,15.500000000000261],"path":"手/手"}]}]}],"frameRate":24,"defaultActions":[{"gotoAndPlay":"newAnimation"}],"type":"Armature","ik":[]}],"frameRate":24}
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "8ba499eb-4d0c-404c-a591-4ed881427b19", "uuid": "e80afd0b-559d-40da-a062-91ede3ed5957",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{"name":"hand","SubTexture":[{"name":"手/圈2","x":1,"height":93,"y":119,"width":93},{"name":"手/圈1","x":96,"height":59,"y":119,"width":59},{"name":"手/手","x":1,"height":116,"y":1,"width":114}],"imagePath":"hand_tex.png","height":256,"width":256}
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "63227af1-1ddd-448d-a3f4-21ce49deb0d8", "uuid": "4a6f3cc8-664d-4d1c-9f95-e97ac8bcc081",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f19559b1-601f-471f-84a3-c0f1c2b3f8c9", "uuid": "0d6499d9-2535-4c28-ad18-b092958b7be7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -8,24 +8,24 @@ ...@@ -8,24 +8,24 @@
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 256, "width": 256,
"height": 512, "height": 256,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"speak_tex": { "hand_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "39454c3e-e37d-4f5c-858f-0cc2dbb0fe2b", "uuid": "d4f63ff1-461f-4483-a7c8-63911d29eeb3",
"rawTextureUuid": "f19559b1-601f-471f-84a3-c0f1c2b3f8c9", "rawTextureUuid": "0d6499d9-2535-4c28-ad18-b092958b7be7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -3, "offsetX": -50,
"offsetY": 74, "offsetY": 21.5,
"trimX": 1, "trimX": 1,
"trimY": 1, "trimY": 1,
"width": 248, "width": 154,
"height": 362, "height": 211,
"rawWidth": 256, "rawWidth": 256,
"rawHeight": 512, "rawHeight": 256,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
This diff is collapsed.
{
"ver": "1.0.1",
"uuid": "db29a81d-7f06-44af-8a63-a4cbb6ae51d1",
"subMetas": {}
}
\ No newline at end of file
{"name":"right","imagePath":"right_tex.png","height":512,"SubTexture":[{"name":"正确/圆圈","x":1,"height":273,"y":1,"width":273},{"name":"正确/光线1","x":426,"height":148,"y":151,"width":10},{"name":"正确/光线2","x":276,"height":10,"y":52,"width":148},{"name":"正确/光线3","x":276,"height":10,"y":64,"width":148},{"name":"正确/光线4","x":426,"height":148,"y":1,"width":10},{"name":"正确/圆","x":380,"height":29,"y":1,"width":29},{"name":"正确/圆2","x":438,"height":29,"y":1,"width":29},{"name":"正确/圆3","x":438,"height":29,"y":32,"width":29},{"name":"正确/圆4","x":469,"height":29,"y":1,"width":29},{"name":"正确/星2","x":276,"height":49,"y":1,"width":50},{"name":"正确/星1","x":328,"height":49,"y":1,"width":50}],"width":512}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "87ba90ff-79ef-4cbc-8d12-87c6117d2d20",
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "6eb40df6-4a83-44fb-99cb-018afedc2988", "uuid": "9d6b2a51-fbbc-496e-beab-c5884ff532a7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -11,19 +11,19 @@ ...@@ -11,19 +11,19 @@
"height": 512, "height": 512,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"cannon_tex": { "right_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e7169094-7220-494c-ba5b-2ac33821c72a", "uuid": "76e5ef30-cdcf-455d-ae57-420cc18007a0",
"rawTextureUuid": "6eb40df6-4a83-44fb-99cb-018afedc2988", "rawTextureUuid": "9d6b2a51-fbbc-496e-beab-c5884ff532a7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -49, "offsetX": -6.5,
"offsetY": 11, "offsetY": 106,
"trimX": 1, "trimX": 1,
"trimY": 1, "trimY": 1,
"width": 412, "width": 497,
"height": 488, "height": 298,
"rawWidth": 512, "rawWidth": 512,
"rawHeight": 512, "rawHeight": 512,
"borderTop": 0, "borderTop": 0,
......
{"name":"smoke","version":"5.5","frameRate":24,"isGlobal":0,"armature":[{"name":"Sprite","animation":[{"name":"Sprite","ik":[],"ffd":[],"frame":[],"duration":61,"slot":[{"name":"sheetSlot","displayFrame":[{"duration":1},{"duration":1,"value":1},{"duration":1,"value":2},{"duration":1,"value":3},{"duration":1,"value":4},{"duration":1,"value":5},{"duration":1,"value":6},{"duration":1,"value":7},{"duration":1,"value":8},{"duration":1,"value":9},{"duration":1,"value":10},{"duration":1,"value":11},{"duration":1,"value":12},{"duration":1,"value":13},{"duration":1,"value":14},{"duration":1,"value":15},{"duration":1,"value":16},{"duration":1,"value":17},{"duration":1,"value":18},{"duration":1,"value":19},{"duration":1,"value":20},{"duration":1,"value":21},{"duration":1,"value":22},{"duration":1,"value":23},{"duration":1,"value":24},{"duration":1,"value":25},{"duration":1,"value":26},{"duration":1,"value":27},{"duration":1,"value":28},{"duration":1,"value":29},{"duration":1,"value":30},{"duration":1,"value":31},{"duration":1,"value":32},{"duration":1,"value":33},{"duration":1,"value":34},{"duration":1,"value":35},{"duration":1,"value":36},{"duration":1,"value":37},{"duration":1,"value":38},{"duration":1,"value":39},{"duration":1,"value":40},{"duration":1,"value":41},{"duration":1,"value":42},{"duration":1,"value":43},{"duration":1,"value":44},{"duration":1,"value":45},{"duration":1,"value":46},{"duration":1,"value":47},{"duration":1,"value":48},{"duration":1,"value":49},{"duration":1,"value":50},{"duration":1,"value":51},{"duration":1,"value":52},{"duration":1,"value":53},{"duration":1,"value":54},{"duration":1,"value":55},{"duration":1,"value":56},{"duration":1,"value":57},{"duration":1,"value":58},{"duration":1,"value":59},{"duration":1,"value":60}],"colorFrame":[]}],"bone":[],"playTimes":0}],"defaultActions":[{"gotoAndPlay":"Sprite"}],"bone":[{"name":"root","transform":{}}],"skin":[{"name":"","slot":[{"name":"sheetSlot","display":[{"name":"1","transform":{},"type":"image","path":"1"},{"name":"2","transform":{},"type":"image","path":"2"},{"name":"3","transform":{},"type":"image","path":"3"},{"name":"4","transform":{},"type":"image","path":"4"},{"name":"5","transform":{},"type":"image","path":"5"},{"name":"6","transform":{},"type":"image","path":"6"},{"name":"7","transform":{},"type":"image","path":"7"},{"name":"8","transform":{},"type":"image","path":"8"},{"name":"9","transform":{},"type":"image","path":"9"},{"name":"10","transform":{},"type":"image","path":"10"},{"name":"11","transform":{},"type":"image","path":"11"},{"name":"12","transform":{},"type":"image","path":"12"},{"name":"13","transform":{},"type":"image","path":"13"},{"name":"14","transform":{},"type":"image","path":"14"},{"name":"15","transform":{},"type":"image","path":"15"},{"name":"16","transform":{},"type":"image","path":"16"},{"name":"17","transform":{},"type":"image","path":"17"},{"name":"18","transform":{},"type":"image","path":"18"},{"name":"19","transform":{},"type":"image","path":"19"},{"name":"20","transform":{},"type":"image","path":"20"},{"name":"21","transform":{},"type":"image","path":"21"},{"name":"22","transform":{},"type":"image","path":"22"},{"name":"23","transform":{},"type":"image","path":"23"},{"name":"24","transform":{},"type":"image","path":"24"},{"name":"25","transform":{},"type":"image","path":"25"},{"name":"26","transform":{},"type":"image","path":"26"},{"name":"27","transform":{},"type":"image","path":"27"},{"name":"28","transform":{},"type":"image","path":"28"},{"name":"29","transform":{},"type":"image","path":"29"},{"name":"30","transform":{},"type":"image","path":"30"},{"name":"31","transform":{},"type":"image","path":"31"},{"name":"32","transform":{},"type":"image","path":"32"},{"name":"33","transform":{},"type":"image","path":"33"},{"name":"34","transform":{},"type":"image","path":"34"},{"name":"35","transform":{},"type":"image","path":"35"},{"name":"36","transform":{},"type":"image","path":"36"},{"name":"37","transform":{},"type":"image","path":"37"},{"name":"38","transform":{},"type":"image","path":"38"},{"name":"39","transform":{},"type":"image","path":"39"},{"name":"40","transform":{},"type":"image","path":"40"},{"name":"41","transform":{},"type":"image","path":"41"},{"name":"42","transform":{},"type":"image","path":"42"},{"name":"43","transform":{},"type":"image","path":"43"},{"name":"44","transform":{},"type":"image","path":"44"},{"name":"45","transform":{},"type":"image","path":"45"},{"name":"46","transform":{},"type":"image","path":"46"},{"name":"47","transform":{},"type":"image","path":"47"},{"name":"48","transform":{},"type":"image","path":"48"},{"name":"49","transform":{},"type":"image","path":"49"},{"name":"50","transform":{},"type":"image","path":"50"},{"name":"51","transform":{},"type":"image","path":"51"},{"name":"52","transform":{},"type":"image","path":"52"},{"name":"53","transform":{},"type":"image","path":"53"},{"name":"54","transform":{},"type":"image","path":"54"},{"name":"55","transform":{},"type":"image","path":"55"},{"name":"56","transform":{},"type":"image","path":"56"},{"name":"57","transform":{},"type":"image","path":"57"},{"name":"58","transform":{},"type":"image","path":"58"},{"name":"59","transform":{},"type":"image","path":"59"},{"name":"61","transform":{},"type":"image","path":"61"},{"name":"62","transform":{},"type":"image","path":"62"}]}]}],"ik":[],"frameRate":24,"slot":[{"name":"sheetSlot","color":{},"parent":"root","displayIndex":4}],"type":"Sheet","aabb":{"x":-133.5,"height":275,"y":-137.5,"width":267}}]}
\ No newline at end of file
{"name":"smoke","imagePath":"smoke_tex.png","SubTexture":[{"name":"15","x":237,"height":236,"frameWidth":267,"y":1240,"frameY":-19,"frameHeight":275,"frameX":-16,"width":235},{"name":"10","x":1574,"height":235,"frameWidth":267,"y":505,"frameY":-20,"frameHeight":275,"frameX":-17,"width":234},{"name":"7","x":1510,"height":233,"frameWidth":267,"y":755,"frameY":-21,"frameHeight":275,"frameX":-17,"width":233},{"name":"55","x":474,"height":192,"frameWidth":267,"y":1473,"frameY":-41,"frameHeight":275,"frameX":-31,"width":206},{"name":"62","x":1845,"height":153,"frameWidth":267,"y":1,"frameY":-61,"frameHeight":275,"frameX":-54,"width":159},{"name":"2","x":1513,"height":227,"frameWidth":267,"y":1222,"frameY":-24,"frameHeight":275,"frameX":-20,"width":227},{"name":"18","x":1038,"height":240,"frameWidth":267,"y":748,"frameY":-17,"frameHeight":275,"frameX":-16,"width":235},{"name":"46","x":1280,"height":224,"frameWidth":267,"y":1447,"frameY":-25,"frameHeight":275,"frameX":-22,"width":223},{"name":"22","x":1328,"height":235,"frameWidth":267,"y":518,"frameY":-20,"frameHeight":275,"frameX":-12,"width":244},{"name":"14","x":1,"height":236,"frameWidth":267,"y":1269,"frameY":-19,"frameHeight":275,"frameX":-17,"width":234},{"name":"27","x":1065,"height":247,"frameWidth":267,"y":250,"frameY":-14,"frameHeight":275,"frameX":-3,"width":261},{"name":"44","x":1810,"height":228,"frameWidth":267,"y":741,"frameY":-23,"frameHeight":275,"frameX":-15,"width":237},{"name":"54","x":682,"height":192,"frameWidth":267,"y":1645,"frameY":-41,"frameHeight":275,"frameX":-31,"width":205},{"name":"11","x":759,"height":236,"frameWidth":267,"y":994,"frameY":-19,"frameHeight":275,"frameX":-16,"width":235},{"name":"24","x":237,"height":239,"frameWidth":267,"y":759,"frameY":-18,"frameHeight":275,"frameX":-8,"width":252},{"name":"30","x":1,"height":251,"frameWidth":267,"y":1,"frameY":-12,"frameHeight":275,"frameX":0,"width":267},{"name":"6","x":1810,"height":232,"frameWidth":267,"y":971,"frameY":-21,"frameHeight":275,"frameX":-18,"width":232},{"name":"45","x":1742,"height":225,"frameWidth":267,"y":1437,"frameY":-25,"frameHeight":275,"frameX":-20,"width":228},{"name":"29","x":538,"height":250,"frameWidth":267,"y":1,"frameY":-12,"frameHeight":275,"frameX":-1,"width":265},{"name":"43","x":1328,"height":238,"frameWidth":267,"y":278,"frameY":-18,"frameHeight":275,"frameX":-13,"width":242},{"name":"21","x":1038,"height":234,"frameWidth":267,"y":990,"frameY":-20,"frameHeight":275,"frameX":-14,"width":240},{"name":"49","x":996,"height":214,"frameWidth":267,"y":1226,"frameY":-30,"frameHeight":275,"frameX":-24,"width":219},{"name":"51","x":728,"height":210,"frameWidth":267,"y":1232,"frameY":-32,"frameHeight":275,"frameX":-26,"width":216},{"name":"28","x":1581,"height":248,"frameWidth":267,"y":1,"frameY":-13,"frameHeight":275,"frameX":-3,"width":262},{"name":"47","x":1280,"height":221,"frameWidth":267,"y":1224,"frameY":-27,"frameHeight":275,"frameX":-20,"width":227},{"name":"9","x":1810,"height":234,"frameWidth":267,"y":505,"frameY":-20,"frameHeight":275,"frameX":-17,"width":234},{"name":"53","x":1839,"height":196,"frameWidth":267,"y":251,"frameY":-39,"frameHeight":275,"frameX":-30,"width":208},{"name":"19","x":1,"height":271,"frameWidth":267,"y":756,"frameY":-2,"frameHeight":275,"frameX":-17,"width":234},{"name":"57","x":1,"height":187,"frameWidth":267,"y":1667,"frameY":-44,"frameHeight":275,"frameX":-31,"width":205},{"name":"16","x":759,"height":238,"frameWidth":267,"y":754,"frameY":-18,"frameHeight":275,"frameX":-16,"width":235},{"name":"17","x":1,"height":238,"frameWidth":267,"y":1029,"frameY":-18,"frameHeight":275,"frameX":-17,"width":234},{"name":"36","x":805,"height":250,"frameWidth":267,"y":250,"frameY":-12,"frameHeight":275,"frameX":-5,"width":258},{"name":"37","x":1581,"height":252,"frameWidth":267,"y":251,"frameY":-11,"frameHeight":275,"frameX":-6,"width":256},{"name":"56","x":237,"height":190,"frameWidth":267,"y":1478,"frameY":-42,"frameHeight":275,"frameX":-30,"width":207},{"name":"38","x":1,"height":252,"frameWidth":267,"y":502,"frameY":-11,"frameHeight":275,"frameX":-7,"width":253},{"name":"5","x":1280,"height":232,"frameWidth":267,"y":990,"frameY":-21,"frameHeight":275,"frameX":-18,"width":231},{"name":"23","x":237,"height":238,"frameWidth":267,"y":1000,"frameY":-18,"frameHeight":275,"frameX":-9,"width":249},{"name":"52","x":728,"height":199,"frameWidth":267,"y":1444,"frameY":-38,"frameHeight":275,"frameX":-26,"width":215},{"name":"8","x":1275,"height":233,"frameWidth":267,"y":755,"frameY":-21,"frameHeight":275,"frameX":-17,"width":233},{"name":"35","x":270,"height":249,"frameWidth":267,"y":253,"frameY":-13,"frameHeight":275,"frameX":-5,"width":258},{"name":"41","x":784,"height":250,"frameWidth":267,"y":502,"frameY":-12,"frameHeight":275,"frameX":-8,"width":252},{"name":"3","x":1746,"height":230,"frameWidth":267,"y":1205,"frameY":-22,"frameHeight":275,"frameX":-19,"width":229},{"name":"12","x":491,"height":236,"frameWidth":267,"y":997,"frameY":-19,"frameHeight":275,"frameX":-16,"width":235},{"name":"4","x":1513,"height":230,"frameWidth":267,"y":990,"frameY":-22,"frameHeight":275,"frameX":-18,"width":231},{"name":"1","x":1505,"height":222,"frameWidth":267,"y":1451,"frameY":-26,"frameHeight":275,"frameX":-23,"width":222},{"name":"61","x":1,"height":155,"frameWidth":267,"y":1507,"frameY":-60,"frameHeight":275,"frameX":-38,"width":192},{"name":"34","x":1065,"height":247,"frameWidth":267,"y":499,"frameY":-14,"frameHeight":275,"frameX":-3,"width":261},{"name":"42","x":509,"height":244,"frameWidth":267,"y":751,"frameY":-15,"frameHeight":275,"frameX":-10,"width":248},{"name":"33","x":1074,"height":247,"frameWidth":267,"y":1,"frameY":-14,"frameHeight":275,"frameX":-1,"width":265},{"name":"32","x":805,"height":247,"frameWidth":267,"y":1,"frameY":-14,"frameHeight":275,"frameX":0,"width":267},{"name":"39","x":256,"height":253,"frameWidth":267,"y":504,"frameY":-11,"frameHeight":275,"frameX":-8,"width":251},{"name":"50","x":996,"height":214,"frameWidth":267,"y":1442,"frameY":-30,"frameHeight":275,"frameX":-26,"width":215},{"name":"58","x":446,"height":170,"frameWidth":267,"y":1667,"frameY":-52,"frameHeight":275,"frameX":-32,"width":203},{"name":"59","x":446,"height":166,"frameWidth":267,"y":1839,"frameY":-54,"frameHeight":275,"frameX":-36,"width":196},{"name":"20","x":1341,"height":275,"frameWidth":267,"y":1,"frameY":0,"frameHeight":275,"frameX":-15,"width":238},{"name":"26","x":1,"height":239,"frameWidth":267,"y":254,"frameY":-18,"frameHeight":275,"frameX":-5,"width":258},{"name":"25","x":509,"height":241,"frameWidth":267,"y":508,"frameY":-17,"frameHeight":275,"frameX":-6,"width":255},{"name":"13","x":491,"height":236,"frameWidth":267,"y":1235,"frameY":-19,"frameHeight":275,"frameX":-16,"width":235},{"name":"31","x":270,"height":250,"frameWidth":267,"y":1,"frameY":-12,"frameHeight":275,"frameX":-1,"width":266},{"name":"40","x":530,"height":253,"frameWidth":267,"y":253,"frameY":-11,"frameHeight":275,"frameX":-8,"width":252},{"name":"48","x":1729,"height":220,"frameWidth":267,"y":1673,"frameY":-27,"frameHeight":275,"frameX":-25,"width":218}],"height":2048,"width":2048}
\ No newline at end of file
This diff is collapsed.
{"name":"speak","version":"5.5","armature":[{"name":"Armature","slot":[{"name":"椭圆_11","color":{},"parent":"big"},{"name":"椭圆_11_拷贝","color":{},"z":1,"parent":"small"},{"name":"组_1","color":{},"z":2,"parent":"root"}],"defaultActions":[{"gotoAndPlay":"newAnimation"}],"aabb":{"x":-101.5312185134179,"height":204,"y":-101.03171071912247,"width":205},"skin":[{"name":"","slot":[{"name":"组_1","display":[{"name":"提示/组_1","transform":{"x":1.0034,"y":-5.0077},"type":"image","path":"提示/组_1"}]},{"name":"椭圆_11","display":[{"name":"提示/椭圆_11","transform":{"x":1.4845,"skY":-90,"y":-0.9839,"skX":-90},"type":"image","path":"提示/椭圆_11"}]},{"name":"椭圆_11_拷贝","display":[{"name":"提示/椭圆_11_拷贝","transform":{"x":-0.0038,"skY":-179.9215,"y":5.8107,"skX":-179.9215},"type":"image","path":"提示/椭圆_11_拷贝"}]}]}],"animation":[{"name":"newAnimation","frame":[],"bone":[{"name":"root","rotateFrame":[],"translateFrame":[],"scaleFrame":[]},{"name":"big","rotateFrame":[],"translateFrame":[],"scaleFrame":[{"tweenEasing":0,"duration":18},{"x":1.5,"y":1.5,"duration":0}]},{"name":"small","rotateFrame":[],"translateFrame":[],"scaleFrame":[{"tweenEasing":0,"duration":18},{"x":1.4,"y":1.4,"duration":0}]}],"playTimes":0,"ffd":[],"ik":[],"slot":[{"name":"椭圆_11","displayFrame":[],"colorFrame":[{"duration":18,"tweenEasing":0},{"duration":0,"color":{"aM":0}}]},{"name":"椭圆_11_拷贝","displayFrame":[],"colorFrame":[{"duration":18,"tweenEasing":0},{"duration":0,"color":{"aM":12}}]},{"name":"组_1","displayFrame":[],"colorFrame":[]}],"duration":18}],"bone":[{"name":"root","transform":{"x":0.4842,"skY":-0.0188,"y":0.4842,"skX":-0.0188}},{"name":"big","transform":{"x":-0.5,"skY":89.9812,"y":-1,"skX":89.9812},"parent":"root"},{"name":"small","transform":{"x":1.9369,"skY":179.9812,"y":0.0006,"skX":179.9812},"parent":"root"}],"frameRate":24,"type":"Armature","ik":[]}],"frameRate":24,"isGlobal":0}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "0fda1df4-b566-4f56-934d-351ba3eee1fc",
"subMetas": {}
}
\ No newline at end of file
{"name":"speak","imagePath":"speak_tex.png","SubTexture":[{"name":"提示/椭圆_11","x":1,"height":204,"y":1,"width":205},{"name":"提示/椭圆_11_拷贝","x":1,"height":156,"y":207,"width":156},{"name":"提示/组_1","x":159,"height":130,"y":207,"width":90}],"height":512,"width":256}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "695e3272-d0e3-484c-8b6a-d987276b10d1",
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "f90c883d-07d9-4d9a-9726-f4331880a931", "uuid": "a1661b36-f57f-41f3-b20a-96a13e29a23f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{
"ver": "1.1.0",
"uuid": "dac38290-0ce8-446f-8ea0-c454bdba7a3f",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "ab449f20-54ff-4a06-8967-b99b328fe6a4",
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "31a71b99-fde8-47c9-a4c6-54af01968663", "uuid": "09dd4f94-cfa3-4056-a6bc-1004c35058c0",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "f5d0a070-678a-4ec1-ac67-1d1813f13c72", "uuid": "e3dbc67f-c047-44ce-8d01-cae00e20268e",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "f8d29213-71e0-4222-ba8d-2cdd97725a6f",
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "fe3b0844-4004-4617-aaf9-a27a585bb683", "uuid": "2abf9c1d-93d1-4173-ba45-54863cb57739",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "c9602f27-41ef-4d2f-8b90-dade09911e40", "uuid": "65c98f08-d5b7-4e75-9f5c-929b5b155e44",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{
"ver": "1.1.2",
"uuid": "7f5618f6-1434-45e4-b2f3-0feeeaca9536",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "0b576364-1997-4410-83dd-1e0b235ce950",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "5ffa891d-2f9c-4559-b92c-c96d0ecc3a9a",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
// Learn TypeScript:
// - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
// Learn Attribute:
// - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
// Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import Game, { GAME_STATE } from "../tool/Game_temp_mz_cocos";
import pg from "../tool/pg_temp_mz_cocos";
pg.event.clear();
const { ccclass, property } = cc._decorator;
@ccclass
export default class NewClass extends cc.Component {
// private btn_laba: cc.Node;
// private countDown: number = 999;
onLoad() {
this.initView();
// this.initEvent();
}
private initEvent() {
pg.event.on("game_start", () => {
this.gameStart();
});
// pg.event.on("game_set_game_time", (count) => {
// this.countDown = count;
// });
// this.btn_laba.on(cc.Node.EventType.TOUCH_END, this.playLaba, this);
}
private gameStart() {
// this.countDown = Game.getIns().getCurrentPage().duration;
// this.playLaba();
}
private initView() {
// this.btn_laba = cc.find("btn_laba", this.node);
}
// private intervalId;
// private playLaba() {
// let btn_kaba2 = this.btn_laba.getChildByName("btn_laba2");
// let btn_kaba3 = this.btn_laba.getChildByName("btn_laba3");
// btn_kaba2.active = true;
// btn_kaba3.active = true;
// let count = 0;
// if (this.intervalId) clearInterval(this.intervalId);
// let stop = false;
// this.intervalId = setInterval(() => {
// count++;
// btn_kaba2.active = count % 3 == 1;
// btn_kaba3.active = count % 3 == 2;
// if (stop && count % 3 == 2) clearInterval(this.intervalId);
// }, 150)
// pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().audio).then(() => { stop = true; })
// }
// private lastCount: number;
update(dt) {
if (Game.getIns().title) {
cc.find("bg_title/title", this.node).getComponent(cc.Label).string = Game.getIns().title;
}
// if (Game.getIns().state == GAME_STATE.OVER) return;
// if (Game.getIns().state == GAME_STATE.WAIT) return;
// if (this.countDown <= 0) {
// Game.getIns().state = GAME_STATE.OVER;
// pg.event.emit("game_time_over");
// return;
// }
// this.countDown = this.countDown - dt;
// if (this.countDown < 6) {
// let count = Math.floor(this.countDown);
// if (count != this.lastCount) {
// this.lastCount = count;
// if (this.lastCount == 1) {
// pg.audio.playLocalAudio(cc.find("bg_cd_red/audio_cd1", this.node))
// } else if (this.lastCount > 1) {
// pg.audio.playLocalAudio(cc.find("bg_cd_red/audio_cd", this.node))
// }
// }
// cc.find("bg_cd_red", this.node).active = true;
// cc.find("bg_cd_red/label_cd", this.node).getComponent(cc.Label).string = "" + parseInt("" + this.countDown);
// } else {
// cc.find("bg_cd_red", this.node).active = false;
// cc.find("bg_cd/label_cd", this.node).getComponent(cc.Label).string = "" + parseInt("" + this.countDown);
// }
}
}
{
"ver": "1.0.8",
"uuid": "ad3ed1de-2724-45dd-ae75-c241df08a1a1",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "723bc44a-cb11-4b47-a176-d4962157411f", "uuid": "8498c9f5-c5a6-4111-8fa2-ec6c1df21146",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
This diff is collapsed.
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "4323954c-d8cf-4e1b-accc-569d28993e6b", "uuid": "117069fb-78e7-4d6e-b257-18407a5788d7",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "392612d5-7863-45c6-9340-89ccb605e152", "uuid": "72b9b4cc-3e4f-491f-9da1-783080b71e58",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
import { count } from _firepower_fort"console";
export enum FISH_OUT { export enum FISH_OUT {
RUNNING, RUNNING,
TOUCH, TOUCH,
...@@ -28,17 +26,17 @@ export class Option { ...@@ -28,17 +26,17 @@ export class Option {
public count: number; public count: number;
public time: number; public time: number;
public touchRight: boolean; public touchRight: boolean;
public fish: Fish; public parent;
constructor(data) { public fish: any;
// this.id = id; constructor(data, id) {
this.data = data; this.id = id;
this.type = data.type; this.type = data.type;
// this.count = 0;
this.txt = data.text; this.txt = data.text;
this.time = data.time; // this.time = data.duration;
this.picUrl = data.image; this.picUrl = data.image;
this.audioUrl = data.audio; this.audioUrl = data.audio;
this.right = data.right; this.right = data.right;
this.touchRight = false;
this.fish = new Fish(); this.fish = new Fish();
} }
} }
...@@ -47,26 +45,30 @@ export class Item { ...@@ -47,26 +45,30 @@ export class Item {
public audio; public audio;
public duration; public duration;
public optionList; public optionList;
public questImg;
public checkMore: boolean; public checkMore: boolean;
public rNum: number;
public lineArr;
constructor(data, page) { constructor(data, page) {
this.audio = data.questionAudio; this.audio = data.audioUrl;
this.duration = data.duration;
let id = 0; this.page = page;
this.optionList = data.options.map(o => { this.optionList = data.options.map((o, idx) => {
return new Option(o); return new Option(o, (idx + 1) * this.page);
}) })
this.optionList.sort(function () { this.optionList.sort(function () {
return (0.5 - Math.random()); return (0.5 - Math.random());
}); });
let rNum = 0; this.optionList.push(new Option({ type: "jl", right: false, image: "", text: "" }, 456));
this.rNum = 0;
for (let i = 0; i < this.optionList.length; i++) { for (let i = 0; i < this.optionList.length; i++) {
if (this.optionList[i].right) rNum++; if (this.optionList[i].right) this.rNum++;
} }
this.checkMore = rNum > 1; this.checkMore = this.rNum > 1;
this.page = page;
} }
} }
class Role { class Role {
public score: number; public score: number;
...@@ -130,6 +132,7 @@ export default class Game { ...@@ -130,6 +132,7 @@ export default class Game {
public player: Player; public player: Player;
public robot: Robot; public robot: Robot;
public state: GAME_STATE; public state: GAME_STATE;
public total: number;
constructor() { constructor() {
this.start = false; this.start = false;
...@@ -144,8 +147,8 @@ export default class Game { ...@@ -144,8 +147,8 @@ export default class Game {
public singleGame: boolean; public singleGame: boolean;
public question: { text, audio }; public question: { text, audio };
public title: string; public title: string;
public questionText: string;
public bgAudio: string; public bgAudio: string;
public questionText: string;
public init(data) { public init(data) {
this.singleGame = !data.onlineFlg; this.singleGame = !data.onlineFlg;
this.question = { text: data.questionText, audio: data.questionTextAudio }; this.question = { text: data.questionText, audio: data.questionTextAudio };
...@@ -169,23 +172,24 @@ export default class Game { ...@@ -169,23 +172,24 @@ export default class Game {
this.lists.push(new Item(data, i + 1)); this.lists.push(new Item(data, i + 1));
} }
this.state = GAME_STATE.WAIT; this.state = GAME_STATE.WAIT;
} this.total = this.lists.length;
checkSuccess(arr: Option[]) { }
let data = this.getCurrentPage(); // checkSuccess(arr: Option[]) {
let options = data.optionList.concat(); // let data = this.getCurrentPage();
options.sort((A, B) => A.id - B.id) // let options = data.optionList.concat();
for (let i = 0; i < options.length; i++) { // options.sort((A, B) => A.id - B.id)
if (arr[i] && arr[i].id != options[i].id) { // for (let i = 0; i < options.length; i++) {
return false; // if (arr[i] && arr[i].id != options[i].id) {
} // return false;
} // }
return true; // }
} // return true;
// }
getDataByPage(page): Item { // getDataByPage(page): Item {
return this.lists.filter(li => li.page == page)[0] // return this.lists.filter(li => li.page == page)[0]
} // }
getCurrentPage(): Item { getCurrentPage(): Item {
let page = this.page; let page = this.page;
return this.lists.filter(li => li.page == page)[0] return this.lists.filter(li => li.page == page)[0]
...@@ -200,14 +204,12 @@ export default class Game { ...@@ -200,14 +204,12 @@ export default class Game {
this.page += 1; this.page += 1;
} }
get getTotla() { get getTotla() {
// let count = 0; return this.lists.length;
// this.data.forEach(item => { // this.total = 0;
// item.options.forEach((op) => { // this.lists.forEach((item) => {
// if (op.right) count++; // this.total += item.rNum;
// }) // })
// }); // return this.total;
// return count;
return this.data.length;
} }
get isOver() { get isOver() {
return this.page > this.lists.length; return this.page > this.lists.length;
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "39f86c1f-d863-499a-b486-d58c191cd202", "uuid": "0cf58d83-d746-4f4f-804b-ddff83bd7dd7",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -265,8 +265,8 @@ let pg = { ...@@ -265,8 +265,8 @@ let pg = {
let scaleX = w / nw; let scaleX = w / nw;
let scaleY = h / nh; let scaleY = h / nh;
let scale = scaleX <= scaleY ? scaleX : scaleY; let scale = scaleX <= scaleY ? scaleX : scaleY;
node.width = w;// nw * scale; node.width = nw * scale;
node.height = h;//nh * scale; node.height = nh * scale;
} }
node.active = true; node.active = true;
resolve({ w: nw, h: nh }); resolve({ w: nw, h: nh });
...@@ -520,11 +520,24 @@ let pg = { ...@@ -520,11 +520,24 @@ let pg = {
audio: { audio: {
playAudioByUrl(audio_url, cb = null, loadCb = null) { playAudioByUrl(audio_url, cb = null, loadCb = null) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!audio_url) return resolve(null); if (!audio_url) return resolve(cb && cb());
cc.assetManager.loadRemote(audio_url, (err, audioClip: any) => { cc.assetManager.loadRemote(audio_url, (err, audioClip: any) => {
const audioId = cc.audioEngine.play(audioClip, false, 0.8); const audioId = cc.audioEngine.play(audioClip, false, 0.8);
cc.audioEngine.setFinishCallback(audioId, () => { cc.audioEngine.setFinishCallback(audioId, () => {
cb && cb(audioId); cb && cb();
});
loadCb && loadCb(audioId);
resolve(audioId);
});
});
},
playBgAudioByUrl(audio_url, cb = null, loadCb = null) {
return new Promise((resolve, reject) => {
if (!audio_url) return resolve(null);
cc.assetManager.loadRemote(audio_url, (err, audioClip: any) => {
const audioId = cc.audioEngine.playMusic(audioClip, true);
cc.audioEngine.setFinishCallback(audioId, () => {
cb && cb();
}); });
loadCb && loadCb(audioId); loadCb && loadCb(audioId);
resolve(audioId); resolve(audioId);
...@@ -532,7 +545,7 @@ let pg = { ...@@ -532,7 +545,7 @@ let pg = {
}); });
}, },
stopAudio(audioId) { stopAudio(audioId) {
if (audioId < 0) return; if (!audioId) return;
cc.audioEngine.stopEffect(audioId); cc.audioEngine.stopEffect(audioId);
}, },
playAudio(audioClip, cb = null) { playAudio(audioClip, cb = null) {
...@@ -562,20 +575,7 @@ let pg = { ...@@ -562,20 +575,7 @@ let pg = {
resolve(audioClip); resolve(audioClip);
}); });
}); });
}, }
playBgAudioByUrl(audio_url, cb = null, loadCb = null) {
return new Promise((resolve, reject) => {
if (!audio_url) return resolve(null);
cc.assetManager.loadRemote(audio_url, (err, audioClip: any) => {
const audioId = cc.audioEngine.playMusic(audioClip, true);
cc.audioEngine.setFinishCallback(audioId, () => {
cb && cb();
});
loadCb && loadCb(audioId);
resolve(audioId);
});
});
},
}, },
time: { time: {
...@@ -598,7 +598,14 @@ let pg = { ...@@ -598,7 +598,14 @@ let pg = {
const id = cc.audioEngine.playEffect(audio.clip, loop); const id = cc.audioEngine.playEffect(audio.clip, loop);
resolve(id); resolve(id);
}) })
} },
records: [],
addRecord(data) {
pg.hw.records.push(data)
},
getRecord() {
return pg.hw.records.concat();
},
}, },
event: Emitter.getInstance() event: Emitter.getInstance()
}; };
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "536a2c2c-522f-4009-8b9a-1a3107ae2b36", "uuid": "c909773e-9f45-4136-bfb5-df8f41d8414e",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "4354a58f-302e-49cd-bee3-113e2a3b7b2d", "uuid": "81fa1e32-520d-4c2b-9863-2a6511d65483",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "374f4b9c-1454-4e33-b8ab-1bfb3434585c", "uuid": "6b5f525e-0b03-432b-98de-a65c2a6e4d91",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
export const defaultData = { export const defaultData = {
"title": "热气球大战", "audioName": "",
"questionText": "可恶的小偷将魔法卡牌藏在热气球里,准备偷走!快击落热气球,夺回魔法卡牌。游戏开始,请点击弹弓,发射小球,击落热气球,魔法卡牌就会掉落下来。请仔细观察魔法卡牌,并大声说出魔法咒语。魔法咒语正确,你将获得该张魔法卡牌。游戏结束后,根据获得的魔法卡牌数量,你将获得相应的能量石奖励!开始挑战吧!", "title": "单词跑酷",
"questionTextAudio": "https://staging-teach.cdn.ireadabc.com/3152e0ea17b07406a002b2c05028b0cc.mp3", "bgAudio": "",
"bgAudio": "https://staging-teach.cdn.ireadabc.com/ed84c18cc5f696ceaaf488ff98c228fe_l.mp3", "bgAudioName": "",
"questions": [ "questions": [{
{ "options": [{
"questionAudio": "https://teach.cdn.ireadabc.com/73dae647c4099fe65bc28f568e351e96.mp3",
"options": [
{
"type": "img", "type": "img",
"image": "https://staging-teach.cdn.ireadabc.com/1832bc553f77f876e0bba64062bd6b38.jpg", "image": "http://staging-teach.cdn.ireadabc.com/585fda9184600f61b47da622346a9cdd.png",
"audio": "https://staging-teach.cdn.ireadabc.com/7c18e0838dcf0707f885842ed09e1579.mp3", "audio": "",
"text": "Please apple", "text": "",
"right": false "time": "",
}, "right": true
{ }, {
"type": "img",
"image": "https://staging-teach.cdn.ireadabc.com/52e8f2868ab7ea8b584bf6beb6b9672d.png",
"audio": "https://staging-teach.cdn.ireadabc.com/6b3846cee6afa2ae450234aeec835beb.mp3",
"text": "Please take some Bag",
"right": false
},
{
"type": "txt", "type": "txt",
"image": "https://staging-teach.cdn.ireadabc.com/8c6fef67a0095c2564e8df4b536fc540.png", "image": "",
"audio": "https://staging-teach.cdn.ireadabc.com/b44fa51172b19b555fda30717c773027.mp3", "audio": "",
"text": "take cat", "text": "hell",
"time": "",
"right": true "right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "two",
"time": "",
"right": false
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "one",
"time": "",
"right": false
}, },
// { // {
// "type": "txt", // "type": "txt",
// "image": "", // "image": "",
// "audio": "https://staging-teach.cdn.ireadabc.com/7c18e0838dcf0707f885842ed09e1579.mp3", // "audio": "",
// "text": "Please take some cookies", // "text": "seven",
// "time": "",
// "right": false // "right": false
// }, {
// "type": "txt",
// "image": "",
// "audio": "",
// "text": "kill",
// "time": "",
// "right": true
// }, {
// "type": "txt",
// "image": "",
// "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
// "text": "ameameameameame",
// "time": "",
// "right": true,
// "audioName": "right.mp3"
// }, {
// "type": "img",
// "image": "http://staging-teach.cdn.ireadabc.com/237e6cf60d500061c5c7ec69c5110414.png",
// "audio": "http://staging-teach.cdn.ireadabc.com/7f1fba5bc7fa3ac27737730bcd2d86e0_l.mp3",
// "text": "",
// "time": "",
// "right": true,
// "audioName": "again.mp3"
// }, {
// "type": "txt",
// "image": "",
// "audio": "",
// "text": "five",
// "time": "",
// "right": false
// }, {
// "type": "txt",
// "image": "",
// "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
// "text": "right",
// "time": "",
// "right": true,
// "audioName": "right.mp3"
// } // }
] ],
},
{
"questionAudio": "https://teach.cdn.ireadabc.com/73dae647c4099fe65bc28f568e351e96.mp3",
"options": [
{
"type": "txt", "type": "txt",
"image": "", "audioUrl": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
"audio": "https://staging-teach.cdn.ireadabc.com/d948ef84a50e6ac36bc31110f9062878.mp3", "audioName": "",
"text": "umbrella", "text": ""
}, {
"options": [{
"type": "img",
"image": "http://staging-teach.cdn.ireadabc.com/585fda9184600f61b47da622346a9cdd.png",
"audio": "",
"text": "",
"time": "",
"right": true "right": true
}, }, {
{
"type": "txt", "type": "txt",
"image": "", "image": "",
"audio": "https://staging-teach.cdn.ireadabc.com/8d6a8d7764011afb0ef537d5a44d1d10.mp3", "audio": "",
"text": "key", "text": "hell",
"time": "",
"right": true "right": true
}, }, {
{
"type": "txt", "type": "txt",
"image": "", "image": "",
"audio": "https://staging-teach.cdn.ireadabc.com/6b3846cee6afa2ae450234aeec835beb.mp3", "audio": "",
"text": "bag", "text": "two",
"time": "",
"right": false "right": false
}, }, {
{ "type": "txt",
"image": "",
"audio": "",
"text": "one",
"time": "",
"right": false
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "seven",
"time": "",
"right": false
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "kill",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
"text": "ame",
"time": "",
"right": true,
"audioName": "right.mp3"
}, {
"type": "img", "type": "img",
"image": "https://staging-teach.cdn.ireadabc.com/7b315ba7227294d63933cd659d5372fb.png", "image": "http://staging-teach.cdn.ireadabc.com/237e6cf60d500061c5c7ec69c5110414.png",
"audio": "https://staging-teach.cdn.ireadabc.com/a6a5c388c636bc6d063946e91b4bd21a.mp3", "audio": "http://staging-teach.cdn.ireadabc.com/7f1fba5bc7fa3ac27737730bcd2d86e0_l.mp3",
"text": "egg", "text": "",
"time": "",
"right": true,
"audioName": "again.mp3"
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "time",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "why",
"time": "",
"right": false "right": false
} }
] ],
"type": "txt",
"audioUrl": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
"audioName": "",
"text": ""
} }
] ],
"word_count": "0",
"sentence_count": "0",
"zi_count": "0"
} }
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "2ca279b3-fc7b-428d-85c4-eaa4fce76368", "uuid": "ed6863e3-7272-4c10-a487-28ccc5cc6de6",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "1671a640-fe6d-43ad-8467-1254a15f5b67", "uuid": "4ec0a2fd-3363-4075-abc9-4b9ec031a90a",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "b38a2c93-d490-479d-8278-51026d13020d", "uuid": "3511e2f9-47e0-4b0b-9760-dd07898b2dcd",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "f3f2f760-0201-49ce-b7bb-b0f835cedcb3", "uuid": "5efbf8af-ab41-4f16-9389-f1beea93b40f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{
"ver": "1.1.2",
"uuid": "2ffc17e5-3ed0-4813-ac38-a9c6819acc7f",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "316927cb-f4f6-47aa-9b0c-3dde222e9735",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 219,
"height": 243,
"platformSettings": {},
"subMetas": {
"bg_cannonfront_firepower_fort": {
"ver": "1.0.4",
"uuid": "ed255505-bd8a-46bd-b5db-58766adfa502",
"rawTextureUuid": "316927cb-f4f6-47aa-9b0c-3dde222e9735",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": 0,
"trimX": 18,
"trimY": 0,
"width": 184,
"height": 243,
"rawWidth": 219,
"rawHeight": 243,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "412ec62f-c4dc-4600-a6ad-f78b580d90fe",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 219,
"height": 243,
"platformSettings": {},
"subMetas": {
"bg_cannonleft_firepower_fort": {
"ver": "1.0.4",
"uuid": "4845501e-631f-4923-8119-521e4a0e9a19",
"rawTextureUuid": "412ec62f-c4dc-4600-a6ad-f78b580d90fe",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -8.5,
"offsetY": -5.5,
"trimX": 0,
"trimY": 11,
"width": 202,
"height": 232,
"rawWidth": 219,
"rawHeight": 243,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "963cc926-14a9-454a-9b57-da697c08151d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 219,
"height": 243,
"platformSettings": {},
"subMetas": {
"bg_cannonright_firepower_fort": {
"ver": "1.0.4",
"uuid": "754846ce-196b-48b9-9c9d-0252c1ca81e1",
"rawTextureUuid": "963cc926-14a9-454a-9b57-da697c08151d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 9,
"offsetY": -5.5,
"trimX": 18,
"trimY": 11,
"width": 201,
"height": 232,
"rawWidth": 219,
"rawHeight": 243,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "8aa357b8-35fa-424a-8882-1e7b4c2d4fee",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 260,
"height": 330,
"platformSettings": {},
"subMetas": {
"bg_pic_firepower_fort": {
"ver": "1.0.4",
"uuid": "3720fcdc-776d-4e12-bf80-94078906704a",
"rawTextureUuid": "8aa357b8-35fa-424a-8882-1e7b4c2d4fee",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -5,
"offsetY": 0,
"trimX": 3,
"trimY": 0,
"width": 244,
"height": 330,
"rawWidth": 260,
"rawHeight": 330,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "5bf835f7-e9c9-4e30-892f-b74dbf973cff",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 260,
"height": 330,
"platformSettings": {},
"subMetas": {
"bg_picright_firepower_fort": {
"ver": "1.0.4",
"uuid": "78714de0-4076-4950-bb2c-035d3d1dd6a8",
"rawTextureUuid": "5bf835f7-e9c9-4e30-892f-b74dbf973cff",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -42,
"trimX": 0,
"trimY": 84,
"width": 260,
"height": 246,
"rawWidth": 260,
"rawHeight": 330,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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