Commit a4d22fe8 authored by 范雪寒's avatar 范雪寒

Merge branch 'master' of http://vcs.ireadabc.com/template/PS_001

parents 0a6d569f b5bcc8b3
This diff is collapsed.
......@@ -41,7 +41,7 @@ export default class PS_001_Ctrl extends cc.Component {
PS_001_handManager.getIns().init(this.head)
PS_001_Ctrl.ins = this
window['PS_001_handManager']=this
this.toNext(0)
// this.toNext(0)
}
toNext(arg0: number) {
......@@ -49,11 +49,12 @@ export default class PS_001_Ctrl extends cc.Component {
arg0 = 0
this.time++
}
if (this.time == 2) {
this.ShowNode = cc.instantiate(this.allScene[arg0])
this.node.addChild(this.ShowNode)
this.ShowNode.getComponent('PS_001_scene' + (arg0 + 1)).init(this.carema, this)
}
// if (this.time == 2) {
// this.ShowNode = cc.instantiate(this.allScene[arg0])
// this.node.addChild(this.ShowNode)
// this.ShowNode.getComponent('PS_001_scene' + (arg0 + 1)).init(this.carema, this)
// return;
// }
this.ShowNode = cc.instantiate(this.allScene[arg0])
this.node.addChild(this.ShowNode)
this.ShowNode.getComponent('PS_001_scene' + (arg0 + 1)).init(this.carema, this)
......@@ -118,6 +119,13 @@ export default class PS_001_Ctrl extends cc.Component {
await asyncDelay(0.001);
this.ShowNode.getComponent(PS_001_scene8).go24(this.carema, this)
}else if(id == 21226){
this.ShowNode = cc.instantiate(this.allScene[7])
this.node.addChild(this.ShowNode)
await asyncDelay(0.001);
this.ShowNode.getComponent(PS_001_scene8).go33(this.carema, this)
} else {
PS_001_Ctrl.getIns().time = 2;
this.ShowNode = cc.instantiate(this.allScene[7])
this.node.addChild(this.ShowNode)
await asyncDelay(0.001);
......
......@@ -70,7 +70,7 @@ export default class PS_001_scene4 extends cc.Component {
sound: cc.AudioClip[]= []
go18(cameraNode:cc.Node,parent:PS_001_Ctrl){
cc.audioEngine.playMusic(this.sound[0],false)
// cc.audioEngine.playMusic(this.sound[0],false)
PS_001_dialogueManager.getIns().start(4,18)
PS_001_handManager.getIns().start(4, this,18)
this.camera=cameraNode
......
......@@ -120,10 +120,10 @@ export default class PS_001_scene8 extends cc.Component {
} else if (PS_001_Ctrl.getIns().time == 1) {
this.onFinishLast();
} else {
const bg = cc.find('Canvas/Main Camera/bg');
bg.active = true;
bg.zIndex = 1;
cc.tween(bg).to(1, { opacity: 255 }).start();
const mask = cc.find('Canvas/mask');
mask.active = true;
mask.zIndex = 1;
cc.tween(mask).to(1, { opacity: 100 }).start();
const wellDown = cc.find('Canvas/wellDown');
wellDown.zIndex = 1;
wellDown.active = true;
......
......@@ -58,7 +58,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"autoReleaseAssets": true,
"_id": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3"
"_id": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb"
},
{
"__type__": "cc.Node",
......@@ -275,13 +275,13 @@
"_id": "29zXboiXFBKoIV4PQ2liTe"
},
{
"__type__": "408a6f4ZfpM8Yzyg+IOGg/V",
"__type__": "065068C42ZOHIrImTzlEWAt",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 2
},
"_enabled": true,
"_id": "eaTVUpqahPfZeO9+sUI7RP"
"_id": "fbff0152ad7d4e41bd3d30"
}
]
\ No newline at end of file
{
"ver": "1.2.9",
"uuid": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3",
"uuid": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb",
"asyncLoadAssets": false,
"autoReleaseAssets": true,
"subMetas": {}
......
......@@ -41,16 +41,17 @@ export default class SceneComponent extends MyCocosSceneComponent {
{ id: 21220, scene: 7 },
{ id: 21219, scene: 8 },
{ id: 21226, scene: 8 },
{ id: 99999, scene: 8 },
];
const step = this.data.step;
cc.director.loadScene(`PS_001_scene1`, () => {
if (step == 0) {
return;
}
console.log('汪汪汪: ' + step);
if (step != 0) {
PS_001_Ctrl.getIns().time = 1;
PS_001_Ctrl.getIns().goscene(conf[step].id);
} else {
PS_001_Ctrl.getIns().toNext(0);
}
});
}
......
{
"ver": "1.0.8",
"uuid": "408a67f8-65fa-4cf1-8cf2-83e20e1a0fd5",
"uuid": "06506f02-e366-4e1c-8ac8-993ce511602d",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
......@@ -22,6 +22,7 @@ app.use('/dist', express.static('dist'));
app.use('/form', express.static('form'));
app.get('/', function (req, res) {
res.header("Access-Control-Allow-Origin", "*");
res.send('Hello World');
})
......
......@@ -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') {
creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator";
}
......
This diff is collapsed.
{
"title": "play",
"packageName": "org.cocos2d.demo",
"startScene": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3",
"startScene": "ac67118e-8afd-4a49-b7d4-2c69cbe8eabb",
"excludeScenes": [],
"includeSDKBox": false,
"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