Commit 63db3aff authored by Tt's avatar Tt

xiugaimingcheng

parent dd07eea8
import macro from '../script/A_Macro_dg18_tianci' import macro from '../script/A_Macro_dg29_museum'
import { asyncDelay, onHomeworkFinish } from "../script/util_dg18_tianci"; import { asyncDelay, onHomeworkFinish } from "../script/util_dg29_museum";
import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_dg18_tianci"; import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_dg29_museum";
import pg, { TimeCtrl } from "./pg_dg18_tianci"; import pg, { TimeCtrl } from "./pg_dg29_museum";
import dg_xiaodi from "./dg18_tianci_xiaodi"; import dg_xiaodi from "./dg29_museum_xiaodi";
let win: any = window; let win: any = window;
let courseware = win.courseware; let courseware = win.courseware;
...@@ -629,3 +629,4 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -629,3 +629,4 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
import pg from "./pg_dg18_tianci"; import pg from "./pg_dg29_museum";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
...@@ -147,3 +147,4 @@ export default class dg_xiaodi extends cc.Component { ...@@ -147,3 +147,4 @@ export default class dg_xiaodi extends cc.Component {
...@@ -697,3 +697,4 @@ export default pg; ...@@ -697,3 +697,4 @@ export default pg;
...@@ -27,3 +27,4 @@ export default class NewClass extends cc.Component { ...@@ -27,3 +27,4 @@ export default class NewClass extends cc.Component {
// update (dt) {} // update (dt) {}
} }
import { defaultData } from "../script/defaultData_dg18_tianci"; import { defaultData } from "../script/defaultData_dg29_museum";
export class MyCocosSceneComponent extends cc.Component { export class MyCocosSceneComponent extends cc.Component {
...@@ -184,3 +184,4 @@ export class MyCocosSceneComponent extends cc.Component { ...@@ -184,3 +184,4 @@ export class MyCocosSceneComponent extends cc.Component {
...@@ -34,3 +34,4 @@ export const defaultData = ...@@ -34,3 +34,4 @@ export const defaultData =
}], }],
"questionText": "", "audioName": "" "questionText": "", "audioName": ""
} }
...@@ -481,3 +481,4 @@ export function showTips(tips) { ...@@ -481,3 +481,4 @@ export function showTips(tips) {
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 232, "height": 232,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery001_dg18_tianci": { "img_battery001_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "347c35f8-7fca-4262-a03a-c03b70997884", "uuid": "347c35f8-7fca-4262-a03a-c03b70997884",
"rawTextureUuid": "952557a3-e565-4494-bef6-e720983f14cb", "rawTextureUuid": "952557a3-e565-4494-bef6-e720983f14cb",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery1_dg18_tianci": { "img_battery1_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c3ff7a71-a8d6-4a48-80d9-926c949d18b6", "uuid": "c3ff7a71-a8d6-4a48-80d9-926c949d18b6",
"rawTextureUuid": "11c0424d-2ff7-4f10-a315-4cba1e194c2f", "rawTextureUuid": "11c0424d-2ff7-4f10-a315-4cba1e194c2f",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery2_dg18_tianci": { "img_battery2_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d9b6fcf1-5d4c-4d01-99e5-bc40468c1008", "uuid": "d9b6fcf1-5d4c-4d01-99e5-bc40468c1008",
"rawTextureUuid": "505cb8a9-7d75-4f12-a988-46e5249f9216", "rawTextureUuid": "505cb8a9-7d75-4f12-a988-46e5249f9216",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery3_dg18_tianci": { "img_battery3_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e4aacec2-9290-4e97-9804-ce17090c69fe", "uuid": "e4aacec2-9290-4e97-9804-ce17090c69fe",
"rawTextureUuid": "ea8f995c-6318-4aeb-8a34-c92b60bdfa44", "rawTextureUuid": "ea8f995c-6318-4aeb-8a34-c92b60bdfa44",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery4_dg18_tianci": { "img_battery4_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "6f5011f7-a0ae-4899-843b-f64f920fb528", "uuid": "6f5011f7-a0ae-4899-843b-f64f920fb528",
"rawTextureUuid": "7fc8d111-dec7-41ca-81d6-2aeaaf5ed1c6", "rawTextureUuid": "7fc8d111-dec7-41ca-81d6-2aeaaf5ed1c6",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery5_dg18_tianci": { "img_battery5_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "1037f84a-4788-4011-a067-9034dc7bbb2f", "uuid": "1037f84a-4788-4011-a067-9034dc7bbb2f",
"rawTextureUuid": "ec4859f7-e191-4b99-9adb-051178ffe674", "rawTextureUuid": "ec4859f7-e191-4b99-9adb-051178ffe674",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 140, "height": 140,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_battery6_dg18_tianci": { "img_battery6_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d07aabdb-0171-4f0e-b866-86a11a2ee5f8", "uuid": "d07aabdb-0171-4f0e-b866-86a11a2ee5f8",
"rawTextureUuid": "a9013586-78af-4a1f-832b-117233b1fbb9", "rawTextureUuid": "a9013586-78af-4a1f-832b-117233b1fbb9",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 864, "height": 864,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_dengdai_dg18_tianci": { "img_dengdai_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "06247721-0ed1-4509-a34b-93426b0bf8c1", "uuid": "06247721-0ed1-4509-a34b-93426b0bf8c1",
"rawTextureUuid": "f293eca2-c98b-4b26-9bb5-0a7bfef85169", "rawTextureUuid": "f293eca2-c98b-4b26-9bb5-0a7bfef85169",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 90, "height": 90,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_dengpao_dg18_tianci": { "img_dengpao_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4c7a3f70-89e3-4fd5-9c14-5bde561f3e22", "uuid": "4c7a3f70-89e3-4fd5-9c14-5bde561f3e22",
"rawTextureUuid": "c86222a9-295b-4d1d-9039-d5e39c5f64a2", "rawTextureUuid": "c86222a9-295b-4d1d-9039-d5e39c5f64a2",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 791, "height": 791,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_door_left_dg18_tianci": { "img_door_left_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c62fba81-5257-46e2-aa59-611c9306fdb2", "uuid": "c62fba81-5257-46e2-aa59-611c9306fdb2",
"rawTextureUuid": "65a5d744-0ad4-4cd8-a26c-ec6dc6d348ef", "rawTextureUuid": "65a5d744-0ad4-4cd8-a26c-ec6dc6d348ef",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 791, "height": 791,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_door_right_dg18_tianci": { "img_door_right_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "cc04aa5b-a500-42a7-b7b5-44ea261d28f3", "uuid": "cc04aa5b-a500-42a7-b7b5-44ea261d28f3",
"rawTextureUuid": "4a1cd86e-c267-47ab-a5c9-5c9e20ca1fe4", "rawTextureUuid": "4a1cd86e-c267-47ab-a5c9-5c9e20ca1fe4",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 86, "height": 86,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_fang_dg18_tianci": { "img_fang_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "30e556a8-612e-4607-85fa-125a699eb061", "uuid": "30e556a8-612e-4607-85fa-125a699eb061",
"rawTextureUuid": "01f96fe2-1734-45f8-a5fb-32552937978c", "rawTextureUuid": "01f96fe2-1734-45f8-a5fb-32552937978c",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 890, "height": 890,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_kuang_dg18_tianci": { "img_kuang_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9d789e52-91da-4c54-9491-b47c0c1610cd", "uuid": "9d789e52-91da-4c54-9491-b47c0c1610cd",
"rawTextureUuid": "1d71dbe3-4de0-4213-8d0d-faf9d4aab305", "rawTextureUuid": "1d71dbe3-4de0-4213-8d0d-faf9d4aab305",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 85, "height": 85,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_left_1_dg18_tianci": { "img_left_1_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c1fb5b00-2ab9-4030-8997-05093d0f2e63", "uuid": "c1fb5b00-2ab9-4030-8997-05093d0f2e63",
"rawTextureUuid": "0eaa6b16-6b6f-4e62-b318-dcf5a8cc1474", "rawTextureUuid": "0eaa6b16-6b6f-4e62-b318-dcf5a8cc1474",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 85, "height": 85,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_left_2_dg18_tianci": { "img_left_2_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ca3a2516-74a9-44dc-bc29-ff784b6857cb", "uuid": "ca3a2516-74a9-44dc-bc29-ff784b6857cb",
"rawTextureUuid": "154f4d57-6420-4e7f-8bab-00e6d0f2b48d", "rawTextureUuid": "154f4d57-6420-4e7f-8bab-00e6d0f2b48d",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 71, "height": 71,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_left_3_dg18_tianci": { "img_left_3_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8c793838-4f7c-4f0a-8585-20ee2ef63d67", "uuid": "8c793838-4f7c-4f0a-8585-20ee2ef63d67",
"rawTextureUuid": "07670700-7d8d-4d49-a7d7-57f2209562cf", "rawTextureUuid": "07670700-7d8d-4d49-a7d7-57f2209562cf",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 85, "height": 85,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_right_1_dg18_tianci": { "img_right_1_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c034fa5a-5b31-48d5-a3b3-cf6be0875e2c", "uuid": "c034fa5a-5b31-48d5-a3b3-cf6be0875e2c",
"rawTextureUuid": "7c6ceeb4-7a27-4f5a-9620-967fd1b5d60a", "rawTextureUuid": "7c6ceeb4-7a27-4f5a-9620-967fd1b5d60a",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 85, "height": 85,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_right_2_dg18_tianci": { "img_right_2_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0c989628-e6e7-4200-9a3c-324f5bf29663", "uuid": "0c989628-e6e7-4200-9a3c-324f5bf29663",
"rawTextureUuid": "6980e6d8-5625-4be0-abaf-aab6ffede26b", "rawTextureUuid": "6980e6d8-5625-4be0-abaf-aab6ffede26b",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 87, "height": 87,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_right_3_dg18_tianci": { "img_right_3_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "dc608f1f-035a-43bc-ada1-09beb14aea34", "uuid": "dc608f1f-035a-43bc-ada1-09beb14aea34",
"rawTextureUuid": "deb9b523-2945-4f97-8334-20256939b068", "rawTextureUuid": "deb9b523-2945-4f97-8334-20256939b068",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 30, "height": 30,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_star_dg18_tianci": { "img_star_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "47c12acd-a1dc-43e3-b24f-b2d23790eeb9", "uuid": "47c12acd-a1dc-43e3-b24f-b2d23790eeb9",
"rawTextureUuid": "d5a77d44-6e2f-4e1d-bfca-c9e6c3c11699", "rawTextureUuid": "d5a77d44-6e2f-4e1d-bfca-c9e6c3c11699",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 956, "height": 956,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_zhedang_dg18_tianci": { "img_zhedang_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d863616d-aebf-4c74-803b-71d2dbe5ba82", "uuid": "d863616d-aebf-4c74-803b-71d2dbe5ba82",
"rawTextureUuid": "02723796-84a2-4fd5-833a-9ee67c131951", "rawTextureUuid": "02723796-84a2-4fd5-833a-9ee67c131951",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 157, "height": 157,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_flood": { "bg_flood_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d90efbf0-fa29-4a66-b643-3018b6f744ea", "uuid": "d90efbf0-fa29-4a66-b643-3018b6f744ea",
"rawTextureUuid": "ef6dfcb6-a5ed-4d82-af18-626df20e5494", "rawTextureUuid": "ef6dfcb6-a5ed-4d82-af18-626df20e5494",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 166, "height": 166,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_go": { "btn_go_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "17272ac1-76a9-4cbf-afee-05bba288020a", "uuid": "17272ac1-76a9-4cbf-afee-05bba288020a",
"rawTextureUuid": "08b5219a-11e0-442e-81eb-34215e5f8dd9", "rawTextureUuid": "08b5219a-11e0-442e-81eb-34215e5f8dd9",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 131, "height": 131,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_return": { "btn_return_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "34c04927-f89c-43bc-9379-695061093679", "uuid": "34c04927-f89c-43bc-9379-695061093679",
"rawTextureUuid": "36f4f596-f5f2-49be-ae33-7e6e5cfbee15", "rawTextureUuid": "36f4f596-f5f2-49be-ae33-7e6e5cfbee15",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 56, "height": 56,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_slider": { "btn_slider_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "57aefa76-3665-4e87-aa3f-7d249116fc82", "uuid": "57aefa76-3665-4e87-aa3f-7d249116fc82",
"rawTextureUuid": "549582e9-ad11-4f6f-9998-abbddaf788a6", "rawTextureUuid": "549582e9-ad11-4f6f-9998-abbddaf788a6",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 69, "height": 69,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"icon_play": { "icon_play_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "bea0f980-acb2-4976-99b8-1279f167f703", "uuid": "bea0f980-acb2-4976-99b8-1279f167f703",
"rawTextureUuid": "f2c543a2-59f8-4a59-9233-d72bd565230a", "rawTextureUuid": "f2c543a2-59f8-4a59-9233-d72bd565230a",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 158, "height": 158,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"icon_restar": { "icon_restar_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "01221e7a-2735-4689-b4cc-7ef2fef5b533", "uuid": "01221e7a-2735-4689-b4cc-7ef2fef5b533",
"rawTextureUuid": "15dd96b3-4de7-4e80-b137-4aaa428403f0", "rawTextureUuid": "15dd96b3-4de7-4e80-b137-4aaa428403f0",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 68, "height": 68,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"icon_stop": { "icon_stop_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e623838a-b18e-44ec-9afb-664e4bae0b72", "uuid": "e623838a-b18e-44ec-9afb-664e4bae0b72",
"rawTextureUuid": "f2635f57-8ade-4f76-8800-ce4e3789004b", "rawTextureUuid": "f2635f57-8ade-4f76-8800-ce4e3789004b",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 158, "height": 158,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"icon_vioce": { "icon_vioce_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b3bc5756-e154-4507-9714-45cf77779e85", "uuid": "b3bc5756-e154-4507-9714-45cf77779e85",
"rawTextureUuid": "e8708dae-9bf1-4260-8fab-55750c174506", "rawTextureUuid": "e8708dae-9bf1-4260-8fab-55750c174506",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 12, "height": 12,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_blue": { "img_blue_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "396d0691-0897-468c-b8fb-ca6b6b803145", "uuid": "396d0691-0897-468c-b8fb-ca6b6b803145",
"rawTextureUuid": "4ddba3ec-91b6-4a3e-bcd7-cd584ccaf6e5", "rawTextureUuid": "4ddba3ec-91b6-4a3e-bcd7-cd584ccaf6e5",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 68, "height": 68,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"img_deng": { "img_deng_dg29_museum": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b0f47749-d6d8-4603-aaa7-616d23e86647", "uuid": "b0f47749-d6d8-4603-aaa7-616d23e86647",
"rawTextureUuid": "664cb809-8d1f-43e6-bae0-61af47a4f0e3", "rawTextureUuid": "664cb809-8d1f-43e6-bae0-61af47a4f0e3",
......
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