Skip to content

S
super-miner
Commit aecd327e authored by rockyl's avatar rockyl
Browse files
Options

Merge branch 'master' into component-lib

parents ba82ba8f 8bc28407
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
assets/scripts/game/GameStage.ts
View file @ aecd327e
...@@ -204,6 +204,7 @@ export default class GameStage extends ScillaComponent { ...@@ -204,6 +204,7 @@ export default class GameStage extends ScillaComponent {
if (this._orderStatus !== 0 && this._digFinishedCount === this._minerCount) { if (this._orderStatus !== 0 && this._digFinishedCount === this._minerCount) {
switch (this._orderStatus) { switch (this._orderStatus) {
case 2: case 2:
case 4:
this.onDigEnd(); this.onDigEnd();
break; break;
case 1: case 1:
......
manifest.json
View file @ aecd327e
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"entryScene": "main" "entryScene": "main"
}, },
"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010", "webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
"webServiceUrl": "http://localhost:3010" "webServiceUrl": ""
}, },
"dataCenterConfig": { "dataCenterConfig": {
"dataCenterRoot": [ "dataCenterRoot": [
......
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