up

firends · Jun 21, 2014 · 2882e2b · 2882e2b
1 parent 208d093
commit 2882e2b
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 3 deletions.
diff --git a/Assets/Plugins/kbengine/core/KBEngine.cs b/Assets/Plugins/kbengine/core/KBEngine.cs
diff --git a/Assets/Scenes/login.unity b/Assets/Scenes/login.unity
diff --git a/Assets/Scenes/login.unity.meta b/Assets/Scenes/login.unity.meta
diff --git a/Assets/Scenes/selavatars.unity b/Assets/Scenes/selavatars.unity
diff --git a/Assets/Scenes/start.unity b/Assets/Scenes/start.unity
diff --git a/Assets/Scenes/start.unity.meta b/Assets/Scenes/start.unity.meta
diff --git a/Assets/Scenes/world.unity b/Assets/Scenes/world.unity
diff --git a/Assets/Scripts/UI.cs b/Assets/Scripts/UI.cs
@@ -29,15 +29,24 @@ public class UI : MonoBehaviour {
 
 	private bool showReliveGUI = false;
 
+	void Awake() 
+	 {
+		DontDestroyOnLoad(transform.gameObject);
+	 }
+
 	// Use this for initialization
 	void Start () {
 		installEvents();
+		Application.LoadLevel("login");
 	}
 
 	void installEvents()
 	{
 		CancelInvoke("installEvents");
-
+
+		// common
+		KBEngine.Event.registerOut("onKicked", this, "onKicked");
+
 		// login
 		KBEngine.Event.registerOut("onCreateAccountResult", this, "onCreateAccountResult");
 		KBEngine.Event.registerOut("onLoginFailed", this, "onLoginFailed");
@@ -121,6 +130,7 @@ void onSelAvatarUI()
 					account.selectAvatarGame(selAvatarDBID);
 
 				Application.LoadLevel("world");
+				ui_state = 2;
 			}
         }
 
@@ -331,7 +341,14 @@ public void onLoginSuccessfully(UInt64 rndUUID, Int32 eid, Account accountEntity
 
 		Application.LoadLevel("selavatars");
 	}
-
+
+	public void onKicked(UInt16 failedcode)
+	{
+		err("kick, disconnect!, reason=" + KBEngineApp.app.serverErr(failedcode));
+		Application.LoadLevel("login");
+		ui_state = 0;
+	}
+
 	public void Loginapp_importClientMessages()
 	{
 		info("Loginapp_importClientMessages ...");

diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/guidmapper b/Library/guidmapper
diff --git a/Library/metadata/2b/2b2ff6108917da042ac83e9c114a30c6 b/Library/metadata/2b/2b2ff6108917da042ac83e9c114a30c6
diff --git a/Library/metadata/7c/7c6ffeca05ab703418584311523a29ce b/Library/metadata/7c/7c6ffeca05ab703418584311523a29ce
diff --git a/Library/metadata/7e/7e64f65c921cadc4a8726550a06cd4a1 b/Library/metadata/7e/7e64f65c921cadc4a8726550a06cd4a1
diff --git a/Library/metadata/95/955690c9d3d289a43818f18004ba5455 b/Library/metadata/95/955690c9d3d289a43818f18004ba5455
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset