hh

h
DavidSheh · Oct 30, 2016 · 904f5f2 · 904f5f2
1 parent 0ebbbe1
commit 904f5f2
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 7 deletions.
diff --git a/client/Assets/CSharpScripts/GameGMTools.cs b/client/Assets/CSharpScripts/GameGMTools.cs
@@ -56,6 +56,13 @@ public void OnGUI ()
             return;
 		GUI.BeginGroup (new Rect (Screen.width - 185, 55, 180, 25));
 		GUILayout.BeginHorizontal ();
+        int[] indexs = new int[]{ 0, 1, 2 };
+        foreach (var i in indexs)
+        {
+            if(GUILayout.Button(string.Format("{0}",i))){
+                UAppliaction.S.SetServer(i);
+            }
+        }
         level = GUILayout.TextField (level,GUILayout.Width(100));
         if (GUILayout.Button("GM", GUILayout.Width(60)))
         {

diff --git a/client/Assets/CSharpScripts/UAppliaction.cs b/client/Assets/CSharpScripts/UAppliaction.cs
@@ -76,12 +76,18 @@ public List<T> Deserialize<T>() where T : ExcelConfig.JSONConfigBase
 
     public void GetServer()
     {
-        var serverInfo = ResourcesManager.Singleton.LoadText("ServerInfo.json");
-        var data = JsonReader.Read(serverInfo);
-        Debug.Log(serverInfo);
         #if !UNITY_EDITOR
         index =0;
         #endif
+        SetServer(index); 
+    }
+
+    public void SetServer(int index)
+    {
+        var serverInfo = ResourcesManager.Singleton.LoadText("ServerInfo.json");
+        var data = JsonReader.Read(serverInfo);
+        Debug.Log(serverInfo);
+
         var server = data["Servers"].GetAt(index);
         ServerHost = server["Host"].AsString();
         ServerPort = server["Port"].AsInt();

diff --git a/client/Assets/Gizmos.meta b/client/Assets/Gizmos.meta
diff --git a/client/Assets/StreamingAssets.meta b/client/Assets/StreamingAssets.meta
diff --git a/client/ProjectSettings/ProjectSettings.asset b/client/ProjectSettings/ProjectSettings.asset
diff --git a/client/ProjectSettings/ProjectVersion.txt b/client/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 5.4.2f2
+m_EditorVersion: 5.4.1f1
 m_StandardAssetsVersion: 0
diff --git a/client/client.userprefs b/client/client.userprefs
@@ -1,14 +1,16 @@
 <Properties StartupItem="Assembly-CSharp.csproj" RefactoringSettings.EnableRefactorings="True">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/CSharpScripts/Components/AstarGridBase.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/CSharpScripts/GameGMTools.cs">
     <Files>
-      <File FileName="Assets/CSharpScripts/GameGates/NotifyPlayer.cs" Line="190" Column="37" />
+      <File FileName="Assets/CSharpScripts/XmlParser.cs" Line="40" Column="30" />
+      <File FileName="Assets/CSharpScripts/GameGates/NotifyPlayer.cs" Line="1" Column="1" />
       <File FileName="Assets/CSharpScripts/EditorGate.cs" Line="1" Column="1" />
       <File FileName="Assets/CSharpScripts/EditorStarter.cs" Line="1" Column="1" />
       <File FileName="Assets/Editor/LayoutEditorWindow.cs" Line="1" Column="1" />
       <File FileName="Assets/CSharpScripts/UGate.cs" Line="1" Column="1" />
       <File FileName="Assets/CSharpScripts/GameGates/LoginGate.cs" Line="1" Column="1" />
-      <File FileName="Assets/CSharpScripts/Components/AstarGridBase.cs" Line="113" Column="16" />
+      <File FileName="Assets/CSharpScripts/GameViews/UPerceptionView.cs" Line="47" Column="11" />
+      <File FileName="Assets/CSharpScripts/GameGMTools.cs" Line="63" Column="45" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>