|
|
@@ -45,6 +45,7 @@ export default class Guide extends cc.Component {
|
|
|
this.node.destroy();
|
|
|
return;
|
|
|
}
|
|
|
+ this.reset();
|
|
|
this.guides = gData.guideData.getGuidesByID(gData.guideData.crtID);
|
|
|
this.crtStep = -1;
|
|
|
this.nextStep();
|
|
|
@@ -124,7 +125,7 @@ export default class Guide extends cc.Component {
|
|
|
this.node_display.height = this.node.height;
|
|
|
//动画
|
|
|
cc.tween(this.node_display)
|
|
|
- .to(0.1, { x: x, y: y, width: w, height: h }, {
|
|
|
+ .to(0.2, { x: x, y: y, width: w, height: h }, {
|
|
|
onUpdate: () => {
|
|
|
this.node_bg.x = -this.node_display.x;
|
|
|
this.node_bg.y = -this.node_display.y;
|
|
|
@@ -140,13 +141,13 @@ export default class Guide extends cc.Component {
|
|
|
//动画
|
|
|
let radius = this.crtGuide.display_type;
|
|
|
cc.tween(this.node_display)
|
|
|
- .to(0.1, { width: radius, height: radius })
|
|
|
+ .to(0.2, { width: radius, height: radius })
|
|
|
.start();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//对话框位置
|
|
|
- ////全屏对齐
|
|
|
+ //全屏对齐
|
|
|
if (this.crtGuide.dialog_pos != null && this.crtGuide.dialog_pos.length > 0) {
|
|
|
let arr = this.crtGuide.dialog_pos.split(":");
|
|
|
let wedgit = this.node_dialog.getComponent(cc.Widget);
|
|
|
@@ -156,6 +157,10 @@ export default class Guide extends cc.Component {
|
|
|
}
|
|
|
else {//显示区域偏移
|
|
|
let arr = this.crtGuide.dialog_pos1.split(",");
|
|
|
+ let wedgit = this.node_dialog.getComponent(cc.Widget);
|
|
|
+ for (let i = 0; i < this.widgets.length; i++) {
|
|
|
+ wedgit[this.widgets[i]] = null;
|
|
|
+ }
|
|
|
this.node_dialog.x = x + parseInt(arr[0]);
|
|
|
this.node_dialog.y = y + parseInt(arr[1]);
|
|
|
}
|
zouyong