Commit 7078c149 authored by ”Tt_mac“'s avatar ”Tt_mac“

数据上传

parent 24561fe4
......@@ -5,7 +5,7 @@
// Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import movement from "./movements";
import movement from "./movements_ns20_jsqj";
const { ccclass, property } = cc._decorator;
interface Point {
......@@ -65,3 +65,4 @@ export default class NewClass extends cc.Component {
}
// update (dt) {}
}
......@@ -81,4 +81,4 @@ class Movement {
}
}
let movement = new Movement();
export default movement;
\ No newline at end of file
export default movement;
import { asyncDelay, onHomeworkFinish } from "../script/util";
import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent";
import pg from "./tool/pg";
import Game from "./tool/GameNS16"
import { asyncDelay, onHomeworkFinish } from "../script/util_ns20_jsqj";
import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_ns20_jsqj";
import pg from "./tool/pg_ns20_jsqj";
import Game from "./tool/GameNS16_ns20_jsqj"
import {
showFireworks,
} from '../script/utils';
} from '../script/utils_ns20_jsqj';
const { ccclass, property } = cc._decorator;
......@@ -445,3 +445,4 @@ export default class NewClass extends MyCocosSceneComponent {
})
}
}
import pg from "./tool/pg";
import pg from "./tool/pg_ns20_jsqj";
const { ccclass, property } = cc._decorator;
@ccclass
......@@ -66,3 +66,4 @@ export default class NewClass extends cc.Component {
// update (dt) {}
}
......@@ -5,7 +5,7 @@
// Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import pg from "./tool/pg";
import pg from "./tool/pg_ns20_jsqj";
const { ccclass, property } = cc._decorator;
......@@ -240,3 +240,4 @@ export default class SpeakRecord extends cc.Component {
// update (dt) {}
}
import map from "./map";
import map from "./map_ns20_jsqj";
export class Item {
public audio;
public img;
......@@ -125,4 +125,4 @@ export default class Game {
// 针对map进行一次加工
return this.map;
}
}
\ No newline at end of file
}
......@@ -74,4 +74,4 @@ export default [
// { "id": "18", "yellow_x": "-550", "yellow_y": "-280", "blue_x": "-550", "blue_y": "-125", "type": "1", "value": "door" },
// { "id": "19", "yellow_x": "-775", "yellow_y": "-280", "blue_x": "-600", "blue_y": "-125", "type": "1", "value": "blackboard" }, { "id": "20", "yellow_x": "-775", "yellow_y": "-55", "blue_x": "-600", "blue_y": "-55", "type": "1", "value": "window" }, { "id": "21", "yellow_x": "-775", "yellow_y": "80", "blue_x": "-600", "blue_y": "80", "type": "4", "value": "5" }, { "id": "22", "yellow_x": "-775", "yellow_y": "220", "blue_x": "-600", "blue_y": "220", "type": "2", "value": "3" }, { "id": "23", "yellow_x": "-775", "yellow_y": "365", "blue_x": "-600", "blue_y": "365", "type": "1", "value": "door" }, { "id": "24", "yellow_x": "-775", "yellow_y": "550", "blue_x": "-600", "blue_y": "420", "type": "2", "value": "5" }, { "id": "25", "yellow_x": "-550", "yellow_y": "550", "blue_x": "-550", "blue_y": "420", "type": "1", "value": "window" }, { "id": "26", "yellow_x": "-410", "yellow_y": "550", "blue_x": "-410", "blue_y": "420", "type": "4", "value": "5" }, { "id": "27", "yellow_x": "-270", "yellow_y": "550", "blue_x": "-270", "blue_y": "420", "type": "2", "value": "2" }, { "id": "28", "yellow_x": "-130", "yellow_y": "550", "blue_x": "-130", "blue_y": "420", "type": "1", "value": "door" }, { "id": "29", "yellow_x": "10", "yellow_y": "550", "blue_x": "10", "blue_y": "420", "type": "1", "value": "blackboard" }, { "id": "30", "yellow_x": "150", "yellow_y": "550", "blue_x": "150", "blue_y": "420", "type": "3", "value": "1" }, { "id": "31", "yellow_x": "290", "yellow_y": "550", "blue_x": "290", "blue_y": "420", "type": "1", "value": "window" }, { "id": "32", "yellow_x": "430", "yellow_y": "550", "blue_x": "430", "blue_y": "420", "type": "2", "value": "1" }, { "id": "33", "yellow_x": "570", "yellow_y": "550", "blue_x": "570", "blue_y": "420", "type": "4", "value": "5" }, { "id": "34", "yellow_x": "790", "yellow_y": "550", "blue_x": "630", "blue_y": "420", "type": "1", "value": "blackboard" }, { "id": "35", "yellow_x": "790", "yellow_y": "360", "blue_x": "630", "blue_y": "360", "type": "1", "value": "door" }, { "id": "36", "yellow_x": "790", "yellow_y": "215", "blue_x": "630", "blue_y": "215", "type": "2", "value": "3" }, { "id": "37", "yellow_x": "790", "yellow_y": "70", "blue_x": "630", "blue_y": "70", "type": "5", "value": "43" }, { "id": "38", "yellow_x": "790", "yellow_y": "-75", "blue_x": "630", "blue_y": "-75", "type": "3", "value": "1" }, { "id": "39", "yellow_x": "790", "yellow_y": "-220", "blue_x": "630", "blue_y": "-220", "type": "1", "value": "window" }, { "id": "40", "yellow_x": "790", "yellow_y": "-365", "blue_x": "630", "blue_y": "-365", "type": "2", "value": "1" }, { "id": "41", "yellow_x": "790", "yellow_y": "-550", "blue_x": "630", "blue_y": "-405", "type": "1", "value": "blackboard" }, { "id": "42", "yellow_x": "570", "yellow_y": "-550", "blue_x": "570", "blue_y": "-405", "type": "1", "value": "window" }, { "id": "43", "yellow_x": "430", "yellow_y": "-550", "blue_x": "430", "blue_y": "-405", "type": "2", "value": "2" }, { "id": "44", "yellow_x": "290", "yellow_y": "-550", "blue_x": "290", "blue_y": "-405", "type": "1", "value": "door" }, { "id": "45", "yellow_x": "150", "yellow_y": "-550", "blue_x": "150", "blue_y": "-405", "type": "4", "value": "5" }, { "id": "46", "yellow_x": "10", "yellow_y": "-550", "blue_x": "10", "blue_y": "-405", "type": "1", "value": "blackboard" }, { "id": "47", "yellow_x": "-130", "yellow_y": "-550", "blue_x": "-130", "blue_y": "-405", "type": "1", "value": "window" }, { "id": "48", "yellow_x": "-270", "yellow_y": "-550", "blue_x": "-270", "blue_y": "-405", "type": "1", "value": "door" }, { "id": "49", "yellow_x": "-410", "yellow_y": "-550", "blue_x": "-410", "blue_y": "-405", "type": "2", "value": "2" }, { "id": "50", "yellow_x": "-550", "yellow_y": "-550", "blue_x": "-550", "blue_y": "-405", "type": "1", "value": "blackboard" },
// { "id": "51", "yellow_x": "-690", "yellow_y": "-490", "blue_x": "-690", "blue_y": "-490", "type": "100", "value": "0" }
// ]
\ No newline at end of file
// ]
......@@ -575,4 +575,4 @@ let pg = {
}
}
};
export default pg;
\ No newline at end of file
export default pg;
......@@ -5,7 +5,7 @@
// Learn life-cycle callbacks:
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
import pg from "./tool/pg";
import pg from "./tool/pg_ns20_jsqj";
const { ccclass, property } = cc._decorator;
......@@ -95,3 +95,4 @@ export default class NewClass extends cc.Component {
}
}
}
import { defaultData } from "../script/defaultData";
import { defaultData } from "../script/defaultData_ns20_jsqj";
export class MyCocosSceneComponent extends cc.Component {
......@@ -174,4 +174,4 @@ export class MyCocosSceneComponent extends cc.Component {
});
}
}
}
\ No newline at end of file
}
......@@ -15,4 +15,4 @@ export const defaultData = {
"image": "http://staging-teach.cdn.ireadabc.com/fecbb8471427a38d68486ae1bbc6c25c.png", "audio": "http://staging-teach.cdn.ireadabc.com/227c25a67e1398026bd6185bf9a6e87c_l.mp3", "audioName": "", "text": "robot", "time": "15", "tip": ""
}],
"bgAudio": "http://staging-teach.cdn.ireadabc.com/0913981cdeb2c6bc785de1054e80a500_l.mp3", "audioBgName": "", "audioName": "急速前进"
}
\ No newline at end of file
}
import { log } from "console";
export function getPosByAngle(angle, len) {
......@@ -191,72 +190,72 @@ export async function asyncDelay(time) {
})
}
export async function asyncLoadDragonBoneAnime(node, { skeJsonData: { url: skeJsonDataUrl }, texJsonData: { url: texJsonDataUrl }, texPngData: { url: texPngDataUrl } }) {
if (!texPngDataUrl || !texJsonDataUrl || !texPngDataUrl
|| texPngDataUrl == '' || texJsonDataUrl == '' || texPngDataUrl == '') {
return;
}
return new Promise((resolve, reject) => {
if (node.animaNode) {
node.animaNode.removeFromParent();
}
const animaNode = new cc.Node();
animaNode.name = 'animaNode';
animaNode.parent = node;
animaNode.active = true;
node.animaNode = animaNode;
const dragonDisplay = animaNode.addComponent(dragonBones.ArmatureDisplay);
const loadTexture = new Promise((resolve, reject) => {
cc.assetManager.loadRemote(texPngDataUrl, (error, texture) => {
if (error) {
reject(error);
}
resolve(texture);
});
});
const loadTexJsonData = new Promise((resolve, reject) => {
cc.assetManager.loadAny({ url: texJsonDataUrl }, (error, atlasJson) => {
if (error) {
reject(error);
}
resolve(atlasJson);
});
});
const loadSkeJsonData = new Promise((resolve, reject) => {
cc.assetManager.loadAny({ url: skeJsonDataUrl }, (error, dragonBonesJson) => {
if (error) {
reject(error);
}
resolve(dragonBonesJson);
});
});
Promise.all([loadTexture, loadTexJsonData, loadSkeJsonData]).then(([texture, atlasJson, dragonBonesJson]) => {
const atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = JSON.stringify(atlasJson);
atlas.texture = texture;
const asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = JSON.stringify(dragonBonesJson);
dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset;
let armatureNames = dragonBonesJson.armature.map(data => data.name);
if (armatureNames.length > 0) {
dragonDisplay.armatureName = armatureNames[0];
}
resolve(animaNode);
});
});
}
// export async function asyncLoadDragonBoneAnime(node, { skeJsonData: { url: skeJsonDataUrl }, texJsonData: { url: texJsonDataUrl }, texPngData: { url: texPngDataUrl } }) {
// if (!texPngDataUrl || !texJsonDataUrl || !texPngDataUrl
// || texPngDataUrl == '' || texJsonDataUrl == '' || texPngDataUrl == '') {
// return;
// }
// return new Promise((resolve, reject) => {
// if (node.animaNode) {
// node.animaNode.removeFromParent();
// }
// const animaNode = new cc.Node();
// animaNode.name = 'animaNode';
// animaNode.parent = node;
// animaNode.active = true;
// node.animaNode = animaNode;
// const dragonDisplay = animaNode.addComponent(dragonBones.ArmatureDisplay);
// const loadTexture = new Promise((resolve, reject) => {
// cc.assetManager.loadRemote(texPngDataUrl, (error, texture) => {
// if (error) {
// reject(error);
// }
// resolve(texture);
// });
// });
// const loadTexJsonData = new Promise((resolve, reject) => {
// cc.assetManager.loadAny({ url: texJsonDataUrl }, (error, atlasJson) => {
// if (error) {
// reject(error);
// }
// resolve(atlasJson);
// });
// });
// const loadSkeJsonData = new Promise((resolve, reject) => {
// cc.assetManager.loadAny({ url: skeJsonDataUrl }, (error, dragonBonesJson) => {
// if (error) {
// reject(error);
// }
// resolve(dragonBonesJson);
// });
// });
// Promise.all([loadTexture, loadTexJsonData, loadSkeJsonData]).then(([texture, atlasJson, dragonBonesJson]) => {
// const atlas: any = new dragonBones.DragonBonesAtlasAsset();
// atlas.atlasJson = JSON.stringify(atlasJson);
// atlas.texture = texture;
// const asset = new dragonBones.DragonBonesAsset();
// asset.dragonBonesJson = JSON.stringify(dragonBonesJson);
// dragonDisplay.dragonAtlasAsset = atlas;
// dragonDisplay.dragonAsset = asset;
// let armatureNames = dragonBonesJson.armature.map(data => data.name);
// if (armatureNames.length > 0) {
// dragonDisplay.armatureName = armatureNames[0];
// }
// resolve(animaNode);
// });
// });
// }
export class FireworkSettings {
baseNode; // 父节点
......@@ -426,4 +425,4 @@ export function onHomeworkFinish(data) {
} else {
console.log('onHomeworkFinish');
}
}
\ No newline at end of file
}
......@@ -11,7 +11,7 @@
"height": 750,
"platformSettings": {},
"subMetas": {
"bg_bg": {
"bg_bg_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "976960db-8ac1-41c2-9050-602f6d791e48",
"rawTextureUuid": "8eaf41ce-c520-4978-9834-076f20f33646",
......
......@@ -11,7 +11,7 @@
"height": 222,
"platformSettings": {},
"subMetas": {
"bg_comeon": {
"bg_comeon_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "72241610-59a2-4499-a509-dfa3f818f2ce",
"rawTextureUuid": "9796cebd-86fc-429e-bfff-691d300f63bd",
......
......@@ -11,7 +11,7 @@
"height": 419,
"platformSettings": {},
"subMetas": {
"bg_di": {
"bg_di_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "40526b87-4a37-4a4b-abc8-722773ddb799",
"rawTextureUuid": "4574b1cb-d366-4a11-9f6e-a4746d03c715",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice1": {
"bg_dice1_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "19da5c20-7e1f-42fb-8edb-898b7371262f",
"rawTextureUuid": "089991e2-2988-47bb-b19b-a9d55aa3238c",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice2": {
"bg_dice2_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "ffca7c76-c97f-432a-81d2-469a7a93b538",
"rawTextureUuid": "198f1af1-4c97-44cb-be66-2125c1befda5",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice3": {
"bg_dice3_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "07b2bd9f-b54e-42a5-83d8-04af1f4ebd05",
"rawTextureUuid": "dffa3ad6-498e-47ab-a26a-637602de0cb1",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice4": {
"bg_dice4_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "da8e0460-6364-4726-8780-04f18035c161",
"rawTextureUuid": "71a3bb87-ab83-401c-b66c-62cf6bbfb156",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice5": {
"bg_dice5_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "8b7e7021-b368-4800-b96c-ec8258abbc9d",
"rawTextureUuid": "26725ce3-2944-4b84-947a-a6bcf5d9f8cf",
......
......@@ -11,7 +11,7 @@
"height": 274,
"platformSettings": {},
"subMetas": {
"bg_dice6": {
"bg_dice6_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "fa4fb3d5-cb81-4fe1-8b6f-abd13f4176ff",
"rawTextureUuid": "7dc894f6-7957-4a33-9c3a-19a4cb1ec7c3",
......
......@@ -11,7 +11,7 @@
"height": 134,
"platformSettings": {},
"subMetas": {
"bg_dice-bg": {
"bg_dice_bg_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "3a2ea461-1506-4faf-a852-08c87aac2891",
"rawTextureUuid": "a24228a4-5f1a-4939-bcf3-6ed7a22ac702",
......
......@@ -11,7 +11,7 @@
"height": 332,
"platformSettings": {},
"subMetas": {
"bg_goodjob": {
"bg_goodjob_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "cdcc23e2-2871-4058-9cc0-c4214b80ebcd",
"rawTextureUuid": "e3cc9c70-7b1c-4ba2-b6ff-9034f4c785fb",
......
......@@ -11,7 +11,7 @@
"height": 691,
"platformSettings": {},
"subMetas": {
"bg_light-big": {
"bg_light_big_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "feeff13e-b8ce-4a99-aa2b-8641d75f010b",
"rawTextureUuid": "d574d21f-aef7-4cae-8bab-e783e7949878",
......
......@@ -11,7 +11,7 @@
"height": 315,
"platformSettings": {},
"subMetas": {
"bg_light-small": {
"bg_light_small_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "438dc353-627d-4f18-8a5c-131e8366357e",
"rawTextureUuid": "ab1cb579-1a94-45d6-a403-6406f5ce059a",
......
......@@ -11,7 +11,7 @@
"height": 333,
"platformSettings": {},
"subMetas": {
"bg_lose": {
"bg_lose_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "615c6080-6d29-49cb-8604-18c096288d0b",
"rawTextureUuid": "513e3122-5a37-4002-a76a-55eeeeb4378b",
......
......@@ -11,7 +11,7 @@
"height": 702,
"platformSettings": {},
"subMetas": {
"bg_map": {
"bg_map_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "a24ec5cf-6862-4cb7-adfd-e1077cf939ae",
"rawTextureUuid": "f9165c7c-8da4-4091-93ad-7a36a9226516",
......
......@@ -11,7 +11,7 @@
"height": 157,
"platformSettings": {},
"subMetas": {
"bg_sky": {
"bg_sky_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "cc4ad706-5af9-447a-85b4-22753d304bf5",
"rawTextureUuid": "22c4e26d-5d9e-47c4-952c-11fc4b43c792",
......
......@@ -11,7 +11,7 @@
"height": 390,
"platformSettings": {},
"subMetas": {
"bg_tip": {
"bg_tip_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "d75fbd23-9dcb-4c3f-8b16-d2558c5accc5",
"rawTextureUuid": "8a142917-9b2f-452d-93d7-61cfc0b8db98",
......
......@@ -11,7 +11,7 @@
"height": 287,
"platformSettings": {},
"subMetas": {
"bg_tryagain": {
"bg_tryagain_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "3a265934-0558-4845-909a-a7c0558dc098",
"rawTextureUuid": "8624a6de-7a80-42e3-ad98-715901d5d93c",
......
......@@ -11,7 +11,7 @@
"height": 441,
"platformSettings": {},
"subMetas": {
"bg_vs": {
"bg_vs_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "15931dc2-2400-4794-9b4b-629eb9087922",
"rawTextureUuid": "e004b7f1-de80-4fa6-9a3d-9d70c3f0e573",
......
......@@ -11,7 +11,7 @@
"height": 488,
"platformSettings": {},
"subMetas": {
"bg_win": {
"bg_win_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "677e271f-5c8c-407a-b434-6c13aa1ab8d0",
"rawTextureUuid": "aa105812-67ac-454a-bdbc-6fe1574c5999",
......
......@@ -11,7 +11,7 @@
"height": 88,
"platformSettings": {},
"subMetas": {
"btn_audio-clock": {
"btn_audio_clock_ns20_jsqj": {
"ver": "1.0.4",
"uuid": "9122355e-5464-4c2b-b880-0b6a6eb117ef",
"rawTextureUuid": "dd640686-0e5b-435c-adad-5e4af1b0f783",
......
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