Commit 4ad4bf7d authored by limingzhe's avatar limingzhe

fix: debug

parent d02f1c65
No preview for this file type
{
"ver": "1.1.2",
"uuid": "85158b98-997b-4f2c-8436-807482117f73",
"uuid": "68e76a24-404b-4287-9e6c-46dea48ec654",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.1.2",
"uuid": "0b029fa5-ad79-4759-8bdd-59093f0751a5",
"uuid": "81976ddc-8485-4a74-8495-efd3dea5240a",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "2.0.1",
"uuid": "7e7587d6-9ccd-41db-a520-28a5de0cb709",
"uuid": "4021fdad-6f92-4f2e-8fbf-5fda967fc069",
"downloadMode": 0,
"duration": 5.302857,
"duration": 1.724082,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "4f07dbcf-4a58-4d34-a598-a86b0b06712d",
"downloadMode": 0,
"duration": 29.962449,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "fdeea25b-e8c8-431d-b13d-380cf72f1612",
"uuid": "496317ae-94db-4e25-9b6f-eac2decdbf58",
"downloadMode": 0,
"duration": 0.679184,
"duration": 2.011429,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "447fb044-c392-4f45-af94-8aea24132366",
"uuid": "d2584e3d-ee16-4da1-a5a4-66b3ecd5bb2a",
"downloadMode": 0,
"duration": 15.836,
"duration": 4.032,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "02d54fb8-30de-4d77-a067-c35f5fabd044",
"uuid": "a197e707-5884-47e4-9492-133f2a0d595d",
"downloadMode": 0,
"duration": 0.600816,
"duration": 0.835918,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "7cc7c57b-a534-4543-9226-d558c66f734d",
"downloadMode": 0,
"duration": 2.716735,
"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",
"uuid": "f4c3f150-7fea-4c04-8bcc-9d78f6078348",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ 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",
"uuid": "b3057d86-109b-4c2e-a235-85745b61187f",
"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",
"uuid": "533643eb-1a35-482a-85f8-eedea6a8f3fa",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "2aa7591c-9925-4062-95ae-48451734d019",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 512,
"height": 256,
"platformSettings": {},
"subMetas": {
"fire_tex": {
"ver": "1.0.4",
"uuid": "eab56a33-8ad5-4187-83ad-3fb876239488",
"rawTextureUuid": "2aa7591c-9925-4062-95ae-48451734d019",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -2,
"offsetY": 63.5,
"trimX": 1,
"trimY": 1,
"width": 506,
"height": 127,
"rawWidth": 512,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{"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",
"uuid": "e80afd0b-559d-40da-a062-91ede3ed5957",
"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",
"uuid": "4a6f3cc8-664d-4d1c-9f95-e97ac8bcc081",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "0d6499d9-2535-4c28-ad18-b092958b7be7",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 256,
"height": 256,
"platformSettings": {},
"subMetas": {
"hand_tex": {
"ver": "1.0.4",
"uuid": "d4f63ff1-461f-4483-a7c8-63911d29eeb3",
"rawTextureUuid": "0d6499d9-2535-4c28-ad18-b092958b7be7",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -50,
"offsetY": 21.5,
"trimX": 1,
"trimY": 1,
"width": 154,
"height": 211,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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",
"uuid": "9d6b2a51-fbbc-496e-beab-c5884ff532a7",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 512,
"height": 512,
"platformSettings": {},
"subMetas": {
"right_tex": {
"ver": "1.0.4",
"uuid": "76e5ef30-cdcf-455d-ae57-420cc18007a0",
"rawTextureUuid": "9d6b2a51-fbbc-496e-beab-c5884ff532a7",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -6.5,
"offsetY": 106,
"trimX": 1,
"trimY": 1,
"width": 497,
"height": 298,
"rawWidth": 512,
"rawHeight": 512,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "a1661b36-f57f-41f3-b20a-96a13e29a23f",
"uuid": "0543a081-b5a8-4850-84bc-4a123344581c",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.1.0",
"uuid": "09dd4f94-cfa3-4056-a6bc-1004c35058c0",
"uuid": "e03c0bb7-d7c6-4b87-b6ea-3c5a36b33305",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "e3dbc67f-c047-44ce-8d01-cae00e20268e",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "2abf9c1d-93d1-4173-ba45-54863cb57739",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "65c98f08-d5b7-4e75-9f5c-929b5b155e44",
"uuid": "454b93f3-ddce-4b07-b575-d3b9802eef8a",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.2.9",
"uuid": "8498c9f5-c5a6-4111-8fa2-ec6c1df21146",
"uuid": "c503dac0-5a2c-4cbf-8665-65a056ce4c1e",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"subMetas": {}
......
This diff is collapsed.
{
"ver": "1.0.8",
"uuid": "117069fb-78e7-4d6e-b257-18407a5788d7",
"uuid": "733731fc-df8a-4d7d-a983-e71036489cb0",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.1.2",
"uuid": "72b9b4cc-3e4f-491f-9da1-783080b71e58",
"uuid": "d179653c-fbf3-45bd-9471-057ef22df6b0",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
export enum FISH_OUT {
RUNNING,
TOUCH,
......@@ -13,7 +14,6 @@ export class Fish {
this.isOut = 0;
this.isLeft = Math.random() < 0.5;
}
}
export class Option {
public type;
......@@ -22,14 +22,14 @@ export class Option {
public audioUrl;
public right: boolean;
public data;
public id: number;
public page: number;
public count: number;
public time: number;
public touchRight: boolean;
public parent;
public fish: any;
public pairKey;
constructor(data, id) {
this.id = id;
this.page = id;
this.type = data.type;
// this.count = 0;
this.txt = data.text;
......@@ -37,7 +37,7 @@ export class Option {
this.picUrl = data.image;
this.audioUrl = data.audio;
this.right = data.right;
this.fish = new Fish();
this.touchRight = false;
}
}
export class Item {
......@@ -45,30 +45,31 @@ export class Item {
public audio;
public duration;
public optionList;
public questImg;
public checkMore: boolean;
public rNum: number;
public lineArr;
public bgItem;
public hotZoneItemArr;
public pointsArr;
public text: string;
public isClick: boolean;
public type;
public image;
constructor(data, page) {
this.audio = data.audioUrl;
this.audio = data.audio;
this.text = data.text;
this.bgItem = data.bgItem;
this.hotZoneItemArr = data.hotZoneItemArr;
this.page = page;
this.type = data.type || "txt";
this.image = data.image || "";
this.optionList = data.options.map((o, idx) => {
return new Option(o, (idx + 1) * this.page);
return new Option(o, this.page);
})
this.optionList.sort(function () {
return (0.5 - Math.random());
});
this.optionList.push(new Option({ type: "jl", right: false, image: "", text: "" }, 456));
this.rNum = 0;
for (let i = 0; i < this.optionList.length; i++) {
if (this.optionList[i].right) this.rNum++;
}
this.checkMore = this.rNum > 1;
this.isClick = false;
}
}
class Role {
public score: number;
......@@ -144,24 +145,30 @@ export default class Game {
get len() {
return this.lists.length;
}
public singleGame: boolean;
public question: { text, audio };
public title: string;
public bgAudio: string;
public questionText: string;
public failCount;
public dispelCount;
public aniEnter;
public startAudio: string;
public time: number;
// public questionText: string;
public init(data) {
this.singleGame = !data.onlineFlg;
this.question = { text: data.questionText, audio: data.questionTextAudio };
// this.question = { text: data.questionText, audio: data.questionTextAudio };
this.title = data.title;
this.bgAudio = data.bgAudio || "";
this.questionText = data.questionText;
this.startAudio = data.startAudio || "";
// this.questionText = data.questionText;
this.start = false;
this.lists = [];
this.data = data.questions;
this.aniEnter = data.imgAni;
this.time = data.time
}
public start: boolean;
public page: number;
reset() {
this.failCount = 0;
this.dispelCount = 0;
this.player.reset();
this.robot.reset();
this.page = 1;
......@@ -173,6 +180,24 @@ export default class Game {
}
this.state = GAME_STATE.WAIT;
this.total = this.lists.length;
this.lists.sort(function () {
return (0.5 - Math.random());
});
}
public getCardInfo() {
let chips: Array<Option> = [];
this.lists.forEach((item) => {
item.optionList.forEach((op) => {
chips.push(op);
})
});
chips.sort(function () {
return (0.5 - Math.random());
});
return chips;
}
public getList() {
return this.lists;
}
// checkSuccess(arr: Option[]) {
// let data = this.getCurrentPage();
......
{
"ver": "1.0.8",
"uuid": "0cf58d83-d746-4f4f-804b-ddff83bd7dd7",
"uuid": "7ccdfe4f-2920-48c2-84f7-c0153da39890",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
......@@ -240,7 +240,7 @@ let pg = {
})
})
},
setNetImg(item, res, { w, h }) {
setNetImg(item, res, { w, h }, custom = true) {
return new Promise((resolve, reject) => {
if (!item) return pg.logger.w("图片更换失败,传入了错误的item");
let node = item.node ? item.node : item;
......@@ -261,7 +261,7 @@ let pg = {
node.net_url = res;
if (!cc.isValid(node)) return pg.logger.i("节点已销毁");
if (!node) return pg.logger.w("节点已销毁");
if (w && h) {
if (w && h && custom) {
let scaleX = w / nw;
let scaleY = h / nh;
let scale = scaleX <= scaleY ? scaleX : scaleY;
......@@ -520,14 +520,14 @@ let pg = {
audio: {
playAudioByUrl(audio_url, cb = null, loadCb = null) {
return new Promise((resolve, reject) => {
if (!audio_url) return resolve(cb && cb());
if (!audio_url) return resolve(null);
cc.assetManager.loadRemote(audio_url, (err, audioClip: any) => {
const audioId = cc.audioEngine.play(audioClip, false, 0.8);
cc.audioEngine.setFinishCallback(audioId, () => {
cb && cb();
resolve(audioId);
});
loadCb && loadCb(audioId);
resolve(audioId);
});
});
},
......@@ -588,6 +588,20 @@ let pg = {
},
delayCtrl(): TimeCtrl {
return new TimeCtrl();
},
async asyncDelay(time) {
return new Promise((resolve, reject) => {
try {
cc.tween(cc.find('Canvas'))
.delay(time)
.call(() => {
resolve(null);
})
.start();
} catch (e) {
reject(e);
}
})
}
},
hw: {
......
{
"ver": "1.0.8",
"uuid": "c909773e-9f45-4136-bfb5-df8f41d8414e",
"uuid": "0747213a-623e-4b47-ac1c-4972fd1d57ab",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.1.2",
"uuid": "81fa1e32-520d-4c2b-9863-2a6511d65483",
"uuid": "f22a0370-da43-41e2-b5d1-53d6d51951b9",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.0.8",
"uuid": "6b5f525e-0b03-432b-98de-a65c2a6e4d91",
"uuid": "8dd9c03b-6aab-41d1-91e9-10fdd2def73f",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
export const defaultData = {
"audioName": "",
"title": "单词跑酷",
"bgAudio": "",
"bgAudioName": "",
"imgAni": {
"ske": {},
"tex": {},
"png": {}
},
"questionTextAudio": "http://staging-teach.cdn.ireadabc.com/c3b69ad3d51385eac7d4195773ef59f7_l.mp3",
"questions": [{
"options": [{
"type": "img",
"image": "http://staging-teach.cdn.ireadabc.com/585fda9184600f61b47da622346a9cdd.png",
"audio": "",
"text": "",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "hell",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "two",
"time": "",
"right": false
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "one",
"text": "apple",
"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": "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"
// }
],
"type": "txt",
"audioUrl": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
"audioName": "",
"text": ""
}, {
"options": [{
"type": "img",
"image": "http://staging-teach.cdn.ireadabc.com/585fda9184600f61b47da622346a9cdd.png",
"image": "http://staging-teach.cdn.ireadabc.com/0a05dff8e07282a7c3b365292490da17.png",
"audio": "",
"text": "",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "hell",
"time": "",
"right": true
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "two",
"time": "",
"right": false
}
],
"type": "img",
"text": "fruit",
"questionAudio": "",
"contentMain": "",
"contentArr": [],
"image": "http://staging-teach.cdn.ireadabc.com/a190861baa166812cc6c35faef0cfdcf.png"
}, {
"options": [{
"type": "txt",
"image": "",
"audio": "",
"text": "one",
"text": "dog",
"time": "",
"right": false
}, {
"type": "txt",
"image": "",
"type": "img",
"image": "http://staging-teach.cdn.ireadabc.com/7ac42fd52f203b5a39c4261181e51ea9.png",
"audio": "",
"text": "seven",
"text": "",
"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",
"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"
"text": "animal",
"questionAudio": "",
"contentMain": "",
"contentArr": []
}, {
"options": [{
"type": "txt",
"image": "",
"audio": "",
"text": "time",
"text": "bot",
"time": "",
"right": true
"right": false
}, {
"type": "txt",
"image": "",
"audio": "",
"text": "why",
"text": "putput",
"time": "",
"right": false
}
],
"type": "txt",
"audioUrl": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3",
"audioName": "",
"text": ""
"text": "vegetable",
"questionAudio": "",
"contentMain": "",
"contentArr": []
}
],
"tipSwitch": 1,
"startAudio": "",
"audioName": "",
"time": 60,
"title": "sn04-分类",
"opleng": 6,
"word_count": "0",
"sentence_count": "0",
"zi_count": "0"
}
{
"ver": "1.0.8",
"uuid": "ed6863e3-7272-4c10-a487-28ccc5cc6de6",
"uuid": "86cd4fe1-e757-495c-9cf2-9a187e9e249e",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "4ec0a2fd-3363-4075-abc9-4b9ec031a90a",
"uuid": "08ad1952-295c-4551-ad6a-07fca7dd79b3",
"isPlugin": true,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "3511e2f9-47e0-4b0b-9760-dd07898b2dcd",
"uuid": "6afbfeeb-788a-40a1-8320-7360d6f3a6f6",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.1.2",
"uuid": "5efbf8af-ab41-4f16-9389-f1beea93b40f",
"uuid": "f82dbcd3-1bc5-4353-9f12-002bca34c6cc",
"isBundle": false,
"bundleName": "",
"priority": 1,
......
{
"ver": "1.1.2",
"uuid": "bdbc9541-a234-4dff-a977-4545720393d6",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{
"ver": "2.3.5",
"uuid": "7380444a-e3f8-48eb-bb48-fdd985ca1211",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 374,
"height": 102,
"platformSettings": {},
"subMetas": {
"bg_bottom4_sn16_parkour": {
"ver": "1.0.4",
"uuid": "5348d2f1-aff7-41ef-a240-aeeba6338f2f",
"rawTextureUuid": "7380444a-e3f8-48eb-bb48-fdd985ca1211",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 374,
"height": 102,
"rawWidth": 374,
"rawHeight": 102,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "55d9daa5-c3ff-4838-a80b-e1fa5017aed4",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 252,
"height": 252,
"platformSettings": {},
"subMetas": {
"bg_planet2_sn16_parkour": {
"ver": "1.0.4",
"uuid": "95f6684f-7bac-4c02-9c28-35cd06e7b869",
"rawTextureUuid": "55d9daa5-c3ff-4838-a80b-e1fa5017aed4",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 252,
"height": 252,
"rawWidth": 252,
"rawHeight": 252,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "6a8119ea-d95b-44a9-9326-dda630590988",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 1857,
"height": 1024,
"platformSettings": {},
"subMetas": {
"bg_star_sn16_parkour": {
"ver": "1.0.4",
"uuid": "26e5cea8-59ca-4991-8679-d29d2e0c41ea",
"rawTextureUuid": "6a8119ea-d95b-44a9-9326-dda630590988",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1857,
"height": 1024,
"rawWidth": 1857,
"rawHeight": 1024,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "bbc85dea-a1e7-4eb9-bbeb-dc4a0814c05b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 106,
"height": 106,
"platformSettings": {},
"subMetas": {
"bg_stone4_sn16_parkour": {
"ver": "1.0.4",
"uuid": "c2411268-7701-44e0-ac48-1a7f78bc3f77",
"rawTextureUuid": "bbc85dea-a1e7-4eb9-bbeb-dc4a0814c05b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 106,
"height": 106,
"rawWidth": 106,
"rawHeight": 106,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "adb6bac0-1e85-44b6-a896-f7ad8b33106e",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 138,
"height": 120,
"platformSettings": {},
"subMetas": {
"bg_stone5_sn16_parkour": {
"ver": "1.0.4",
"uuid": "3265f8a9-b062-4741-8f91-c0adc5cea7ce",
"rawTextureUuid": "adb6bac0-1e85-44b6-a896-f7ad8b33106e",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 138,
"height": 120,
"rawWidth": 138,
"rawHeight": 120,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "6e25abe5-5c28-4054-a350-7009c33e9fc1",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 408,
"height": 290,
"platformSettings": {},
"subMetas": {
"bg_bar_font_sn04_classify": {
"ver": "1.0.4",
"uuid": "7d40fc63-ea05-495b-8b12-7765453a792b",
"rawTextureUuid": "6e25abe5-5c28-4054-a350-7009c33e9fc1",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 408,
"height": 290,
"rawWidth": 408,
"rawHeight": 290,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "4f80ecc0-ce73-488b-aedb-55c39998c642",
"uuid": "5221020d-32e1-4d9e-a581-c1ce24770c86",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 86,
"height": 66,
"width": 408,
"height": 290,
"platformSettings": {},
"subMetas": {
"bg_stone3_sn16_parkour": {
"bg_bar_img": {
"ver": "1.0.4",
"uuid": "fc869921-9be0-4432-a111-9a2d95053ca4",
"rawTextureUuid": "4f80ecc0-ce73-488b-aedb-55c39998c642",
"uuid": "ef68c786-f2d4-4766-9ca2-2aa31d1968fa",
"rawTextureUuid": "5221020d-32e1-4d9e-a581-c1ce24770c86",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 86,
"height": 66,
"rawWidth": 86,
"rawHeight": 66,
"width": 408,
"height": 290,
"rawWidth": 408,
"rawHeight": 290,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "27a42f01-f3b3-4481-b3c3-c973a01f35d5",
"uuid": "c462cd1e-c3ef-4c31-8c9d-bce48f75cfbe",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 353,
"height": 147,
"width": 408,
"height": 290,
"platformSettings": {},
"subMetas": {
"bg_bottom2_sn16_parkour": {
"bg_bar_img_sn04_classify": {
"ver": "1.0.4",
"uuid": "b2678fe9-6cf8-45ac-848b-ca742bfbe3aa",
"rawTextureUuid": "27a42f01-f3b3-4481-b3c3-c973a01f35d5",
"uuid": "6cff8a5d-711a-4c05-835e-e77f03b5b6ee",
"rawTextureUuid": "c462cd1e-c3ef-4c31-8c9d-bce48f75cfbe",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 353,
"height": 147,
"rawWidth": 353,
"rawHeight": 147,
"width": 408,
"height": 290,
"rawWidth": 408,
"rawHeight": 290,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "c2bc9030-f4fc-49bb-b4d3-247c00ca93ea",
"uuid": "be26c53c-38a2-48a9-ada3-2af93249bf1d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 987,
"height": 131,
"width": 1920,
"height": 428,
"platformSettings": {},
"subMetas": {
"bg_bottom3_sn16_parkour": {
"bg_down_sn04_classify": {
"ver": "1.0.4",
"uuid": "c7703050-ef49-4610-97c0-e3a594bc548e",
"rawTextureUuid": "c2bc9030-f4fc-49bb-b4d3-247c00ca93ea",
"uuid": "4ebd4ab4-4ec0-48a6-90f7-23b6436810cc",
"rawTextureUuid": "be26c53c-38a2-48a9-ada3-2af93249bf1d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 987,
"height": 131,
"rawWidth": 987,
"rawHeight": 131,
"width": 1920,
"height": 428,
"rawWidth": 1920,
"rawHeight": 428,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "4e9b2555-3fe0-4b86-81e9-92342e95c9c1",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 343,
"height": 198,
"platformSettings": {},
"subMetas": {
"bg_fontice_melt_sn04_classify": {
"ver": "1.0.4",
"uuid": "397c212f-3235-4b65-a3ff-619c95044d3b",
"rawTextureUuid": "4e9b2555-3fe0-4b86-81e9-92342e95c9c1",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 343,
"height": 198,
"rawWidth": 343,
"rawHeight": 198,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "0caa4573-9da9-450a-948d-3b408ccd8cd5",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 357,
"height": 234,
"platformSettings": {},
"subMetas": {
"bg_ice_font_sn04_classify": {
"ver": "1.0.4",
"uuid": "96991d4c-03e5-4bfb-bb36-534a305764e3",
"rawTextureUuid": "0caa4573-9da9-450a-948d-3b408ccd8cd5",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 357,
"height": 234,
"rawWidth": 357,
"rawHeight": 234,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "609a79b6-2218-4aed-9a00-3697669709e5",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 357,
"height": 291,
"platformSettings": {},
"subMetas": {
"bg_ice_img_sn04_classify": {
"ver": "1.0.4",
"uuid": "c74b5f79-7411-4a97-b7c5-f1e7aa051994",
"rawTextureUuid": "609a79b6-2218-4aed-9a00-3697669709e5",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 357,
"height": 291,
"rawWidth": 357,
"rawHeight": 291,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "a5421dfc-3496-4aba-be28-8ee981d91d4a",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 344,
"height": 248,
"platformSettings": {},
"subMetas": {
"bg_ice_melt_sn04_classify": {
"ver": "1.0.4",
"uuid": "860590ee-96a0-45bb-aa36-05b049af1b21",
"rawTextureUuid": "a5421dfc-3496-4aba-be28-8ee981d91d4a",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 344,
"height": 248,
"rawWidth": 344,
"rawHeight": 248,
"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.
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