Merge branch 'master' of http://git.dashgame.com/fenix/battlearray_client

.gitignore

@@ -12,3 +12,4 @@ obj
 ProjectSettings
 Temp
 /Keys/qjh.kdb.lock
+/Designs

Assets/Resources/Prefabs/UI/EquipPanel.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: da9af5ab665c79a4ab09557de243cb46
+folderAsset: yes
+timeCreated: 1491877011
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Prefabs/UI/EquipPanel/EquipPanel.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d908f4a4491b5047941c4a52a9fffd9
+timeCreated: 1491877015
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ScreenShot.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2ed75af07e5638b499eb79c10bb951e6
+folderAsset: yes
+timeCreated: 1491815181
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Config.cs

@@ -15,8 +15,8 @@ public class Config
 	//server port for china is empty string, for international is intl
 	public const string USER_PORT_CHINA = "";
 	public const string USER_PORT_INTERNATIONAL = "intl";
-//	public static string USER_PORT = USER_PORT_INTERNATIONAL;
-	public static string USER_PORT = USER_PORT_CHINA;
+	public static string USER_PORT = USER_PORT_INTERNATIONAL;
+//	public static string USER_PORT = USER_PORT_CHINA;
 
 
 //	public static bool USE_LOCAL_SERVER = true;
@@ -35,12 +35,13 @@ public class Config
 //	public static string URL_ADDRESS = "http://47.90.201.47/";
 	
 	public static int SERVER_PORT = 9933;
-	public static string ZONE = "BattleArray_1_2_5";
+	public static string ZONE = "BattleArray_1_2_6";
 	public static string LOBBY_ROOM_NAME = "Lobby";
 	public static string CLAN_ROOM_PREFIX = "Clan";
 
-	public static string VERSION = "1.2.5";
-	public static string VERSION_LABEL = "1_2_5";
+	public static string VERSION = "1.2.6";
+	public static string VERSION_LABEL = "1_2_6";
+	public static string VERSION_CODE = "10206";
 
 
 	public static int MAX_USER_NAME_LENGTH = 20;

Assets/Scripts/Net/Http/User/UserRequest.cs

@@ -7,6 +7,23 @@ public class UserRequest : HttpRequest
 
 	public const string CTRL_INDEX = "index";
 
+
+	public static UserRequest Login(int id, string device, string from, string port)
+	{
+		URLRequestData data = new URLRequestData(true);
+		data.Add("id", id);
+		data.Add("device", device);
+		data.Add("from", from);
+		data.Add ("port", port);
+
+		UserRequest request = new UserRequest ();
+		request.m = MODULE;
+		request.c = CTRL_INDEX;
+		request.a = "login";
+		request.Send (data);
+		return request;
+	}
+
 	public static UserRequest Info(int id)
 	{
 		URLRequestData data = new URLRequestData (true);

Assets/Scripts/Net/NetworkManager.cs

@@ -73,18 +73,11 @@ public class NetworkManager
 
 		ChatManager.GetInstance ().Clear ();
 
-		URLRequestData data = new URLRequestData(true);
-		data.Add("id", id);
-		data.Add("device", device);
-		data.Add("from", "ios");
-		data.Add ("port", Config.USER_PORT);
-
-		URLRequest.CreateURLRequest (GetURL (URL.Login), data, (JsonData json) => {
 
-			int resCode = (int)json["c"];
-			if(resCode == 0)
+		UserRequest.Login (id, device, "ios", Config.USER_PORT).ResultEvent.AddListener((bool success, JsonData data) => {
+			if(success)
 			{
-				JsonData info = json["d"];
+				JsonData info = data;
 				UserData userData = Session.GetInstance().myUserData;
 				userData.id = JsonUtil.ToInt(info["i"]);
 				if(info["n"] != null)
@@ -121,6 +114,9 @@ public class NetworkManager
 
 				ChatMsg.InitDateTime(info["ts"].ToString());
 
+				Config.SERVER_ADDRESS = info["sfs_ip"].ToString();
+				Config.SERVER_PORT = JsonUtil.ToInt(info["sfs_port"]);
+
 				if(callBack != null)
 					callBack();
 			}
@@ -128,8 +124,7 @@ public class NetworkManager
 			{
 				AlertPanel alertPanel = AlertPanel.Show(null, Language.GetStr("MenuPage", "internetFailed"), 4, OnLoginAlertClose);
 			}
-
-		}, URLRequest.Method.POST);
+		});
 	}