Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
shihongyi 2020-07-17 15:58:10 +08:00
commit ca8db6ccce
2 changed files with 4 additions and 2 deletions

View File

@ -47,7 +47,7 @@ local monsterArea = {
y_pos = {min = 10, max = 15},
},
[5002] = {
x_pos = {min = 8, max = 30},
x_pos = {min = 9, max = 28},
y_pos = {min = 8, max = 16},
},
[5003] = {

View File

@ -68,7 +68,9 @@ public class GameStart : MonoBehaviour
DestroyImmediate(gameObj2);
if (bundle != null) bundle.Unload(true);
bundle = null;
StartCoroutine(playMovice());
App.Instance.Initialize();
UpdateManager.Instance.StartUp();
//StartCoroutine(playMovice());
});
});
}