Commit e9f4cef6 authored by huoshizhe's avatar huoshizhe

feat:

parent 85d3ee62
...@@ -53,6 +53,7 @@ export default class PS_001_Ctrl extends cc.Component { ...@@ -53,6 +53,7 @@ export default class PS_001_Ctrl extends cc.Component {
this.ShowNode = cc.instantiate(this.allScene[arg0]) this.ShowNode = cc.instantiate(this.allScene[arg0])
this.node.addChild(this.ShowNode) this.node.addChild(this.ShowNode)
this.ShowNode.getComponent('PS_001_scene' + (arg0 + 1)).init(this.carema, this) this.ShowNode.getComponent('PS_001_scene' + (arg0 + 1)).init(this.carema, this)
return;
} }
this.ShowNode = cc.instantiate(this.allScene[arg0]) this.ShowNode = cc.instantiate(this.allScene[arg0])
this.node.addChild(this.ShowNode) this.node.addChild(this.ShowNode)
......
...@@ -33,6 +33,8 @@ export default class PS_001_scene1 extends cc.Component { ...@@ -33,6 +33,8 @@ export default class PS_001_scene1 extends cc.Component {
this.initUI(); this.initUI();
if (PS_001_Ctrl.getIns().time == 0) { if (PS_001_Ctrl.getIns().time == 0) {
this.beforeStartFirstTime(); this.beforeStartFirstTime();
} else { } else {
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"_id": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3" "_id": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -275,13 +275,13 @@ ...@@ -275,13 +275,13 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "408a6f4ZfpM8Yzyg+IOGg/V", "__type__": "065068C42ZOHIrImTzlEWAt",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 2 "__id__": 2
}, },
"_enabled": true, "_enabled": true,
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "fbff0152ad7d4e41bd3d30"
} }
] ]
\ No newline at end of file
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "uuid": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"subMetas": {} "subMetas": {}
......
...@@ -44,14 +44,13 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -44,14 +44,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
]; ];
const step = this.data.step; const step = this.data.step;
cc.director.loadScene(`PS_001_scene1`, () => { if (step != 0) {
if (step == 0) {
return;
}
console.log('汪汪汪: ' + step);
PS_001_Ctrl.getIns().time = 1; PS_001_Ctrl.getIns().time = 1;
PS_001_Ctrl.getIns().goscene(conf[step].id); PS_001_Ctrl.getIns().goscene(conf[step].id);
}); return;
} else {
PS_001_Ctrl.getIns().toNext(0);
}
} }
playLocalAudio(audioName) { playLocalAudio(audioName) {
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "408a67f8-65fa-4cf1-8cf2-83e20e1a0fd5", "uuid": "06506f02-e366-4e1c-8ac8-993ce511602d",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -22,6 +22,7 @@ app.use('/dist', express.static('dist')); ...@@ -22,6 +22,7 @@ app.use('/dist', express.static('dist'));
app.use('/form', express.static('form')); app.use('/form', express.static('form'));
app.get('/', function (req, res) { app.get('/', function (req, res) {
res.header("Access-Control-Allow-Origin", "*");
res.send('Hello World'); res.send('Hello World');
}) })
......
...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) { ...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) {
} }
let creatorBasePath = 'CocosCreator'; let creatorBasePath = 'C:\\CocosDashboard_1.0.6\\resources\\.editors\\Creator\\2.4.5\\CocosCreator.exe';
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator"; creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator";
} }
......
This diff is collapsed.
{ {
"title": "play", "title": "play",
"packageName": "org.cocos2d.demo", "packageName": "org.cocos2d.demo",
"startScene": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "startScene": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb",
"excludeScenes": [], "excludeScenes": [],
"includeSDKBox": false, "includeSDKBox": false,
"orientation": { "orientation": {
......
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