Commit 862564d0 authored by wildfirecode's avatar wildfirecode

1

parent 693f1945
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"bindingDataTestObj": [ "bindingDataTestObj": [
{ {
"key": "data.message", "key": "data.message",
"value": "积分不足 多赚点再来吧" "value": "积分不足 多赚点再来吧积分不足 多赚点再来吧积分不足 多赚点再来吧"
} }
] ]
}, },
......
import Panel from "./Panel"; import Panel from "./Panel";
import SceneCtrl from "../ctrls/sceneCtrl"; import SceneCtrl from "../ctrls/sceneCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import StartScene from "../../../src/startScene/StartScene";
export default class Alert extends Panel { export default class Alert extends Panel {
start(data) { start(data) {
super.start(data); super.start(data);
...@@ -19,6 +20,7 @@ export default class Alert extends Panel { ...@@ -19,6 +20,7 @@ export default class Alert extends Panel {
hidePanel() { hidePanel() {
super.hidePanel(); super.hidePanel();
SceneCtrl.instance.change(ModuleTypes.START_SCENE); if (!(SceneCtrl.instance.currentScene instanceof StartScene))
SceneCtrl.instance.change(ModuleTypes.START_SCENE);
} }
} }
\ No newline at end of file
...@@ -69,4 +69,8 @@ export default class SceneCtrl { ...@@ -69,4 +69,8 @@ export default class SceneCtrl {
this._sceneClassMap = this._sceneClassMap || {}; this._sceneClassMap = this._sceneClassMap || {};
this._sceneClassMap[name] = config.cls; this._sceneClassMap[name] = config.cls;
} }
get currentScene(){
return this._currentScene
}
} }
\ No newline at end of file
...@@ -1481,7 +1481,7 @@ export class NetManager extends ABNetManager { ...@@ -1481,7 +1481,7 @@ export class NetManager extends ABNetManager {
if (!net.hideMsg) { if (!net.hideMsg) {
GDispatcher.dispatchEvent(ABNetManager.ERROR, net); GDispatcher.dispatchEvent(ABNetManager.ERROR, net);
this.onNotSuccess && this.onNotSuccess('网络异常,请稍后再试。'); this.onNotSuccess && this.onNotSuccess('网络异常\n请稍后再试');
} }
} }
// tslint:disable-next-line:max-file-line-count // tslint:disable-next-line:max-file-line-count
......
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label touchEnabled="false" text="{data.message}" y="264.26" size="34" width="355.03" anchorOffsetY="0" height="88.58" textAlign="center" textColor="0x8a3306" anchorOffsetX="0" horizontalCenter="-0.5"/> <e:Label touchEnabled="false" text="{data.message}" y="264.26" size="34" width="558.03" anchorOffsetY="0" height="88.58" textAlign="center" textColor="0x8a3306" anchorOffsetX="0" horizontalCenter="-11" lineSpacing="10"/>
</e:Skin> </e:Skin>
\ No newline at end of file
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