diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/NPC/Vang Variant.prefab b/xiaofang/Assets/Prefabs/HYLPrefabs/NPC/Vang Variant.prefab
index 395a0c89..8e7a464e 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/NPC/Vang Variant.prefab	
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/NPC/Vang Variant.prefab	
@@ -1545,7 +1545,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   npcId: 
   recusebtn: {fileID: 0}
-  nstate: 1
+  nstate: 0
   target: {fileID: 0}
   currentTarget: {x: 0, y: 0, z: 0}
   targetPoints: []
diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs
index 048318bc..7e1a7ce4 100644
--- a/xiaofang/Assets/ProtoBuf/test.cs
+++ b/xiaofang/Assets/ProtoBuf/test.cs
@@ -638,13 +638,13 @@ public class test : MonoBehaviour
 
                 break;
 
-            //进入房间
+            //进入房间  
             case "hall.JoinRoom":
                 JoinRoomResponse joinRoomResponse = ProtoBufffer.DeSerialize<JoinRoomResponse>(bytes);
                 byte[] joinByte = joinRoomResponse.Data.ToByteArray();
                 PlayerJoinResponse playerJoinResponse = ProtoBufffer.DeSerialize<PlayerJoinResponse>(joinByte);
                 Debug.Log("玩家：" + playerJoinResponse.UserName + "加入房间:" + playerJoinResponse.RoomId.ToString());
-                GameObject.Find("Player").transform.position = new Vector3((float)playerJoinResponse.X, (float)playerJoinResponse.Y, (float)playerJoinResponse.Z);
+                GameObject.Find("player").transform.position = new Vector3((float)playerJoinResponse.X, (float)playerJoinResponse.Y, (float)playerJoinResponse.Z);
                 Debug.Log("玩家位置");
 
                 break;
diff --git a/xiaofang/Assets/Res/gsj/test111.cs b/xiaofang/Assets/Res/gsj/test111.cs
index 8081c1b7..7b645dd5 100644
--- a/xiaofang/Assets/Res/gsj/test111.cs
+++ b/xiaofang/Assets/Res/gsj/test111.cs
@@ -11,15 +11,7 @@ public class test111 : MonoBehaviour
 
     void Start()
     {
-        canvas1.gameObject.SetActive(true);
-        canvas2.gameObject.SetActive(false);
-        camera1.gameObject.SetActive(false);
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        if(ReadRoom.instance.isenter)
+        if (ReadRoom.instance.isenter)
         {
             Debug.Log(ReadRoom.instance.isenter);
             canvas1.gameObject.SetActive(false);
@@ -28,12 +20,16 @@ public class test111 : MonoBehaviour
         }
         else
         {
-            if (!ReadRoom.instance.iszongzhihui)
-            {
-                canvas1.gameObject.SetActive(true);
-            }
-            canvas2.gameObject.SetActive(false);
-            camera1.gameObject.SetActive(false);
+
+            canvas1.gameObject.SetActive(false);
+            canvas2.gameObject.SetActive(true);
+            camera1.gameObject.SetActive(true);
         }
     }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
 }
diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity
index 27b811f4..8303275d 100644
--- a/xiaofang/Assets/Scenes/Tmap 1.unity	
+++ b/xiaofang/Assets/Scenes/Tmap 1.unity	
@@ -14283,7 +14283,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1a829b8d12d88e14487451b9c601ab85, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  npc: {fileID: 0}
+  npc: {fileID: 9144465012532105757, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3}
   npcposition: []
 --- !u!1 &702643057
 GameObject:
@@ -26953,8 +26953,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44720823678ca7c42a08f4409ab025ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverIP: ws://222.212.40.39
-  serverPort: 13497
+  serverIP: ws://192.168.3.110
+  serverPort: 8445
   type: 
 --- !u!1 &1528375180 stripped
 GameObject:
@@ -31364,7 +31364,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 44
+  m_RootOrder: 43
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1845569623
 PrefabInstance:
@@ -34068,6 +34068,10 @@ PrefabInstance:
       propertyPath: jsonReader
       value: 
       objectReference: {fileID: 1039624186}
+    - target: {fileID: 2043937647, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1516369156415528768, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_Color.a
       value: 0
@@ -34162,7 +34166,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6852673806710748770, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
diff --git a/xiaofang/Assets/Scenes/loginscene.unity b/xiaofang/Assets/Scenes/loginscene.unity
index 5595c779..cc5f7c7d 100644
--- a/xiaofang/Assets/Scenes/loginscene.unity
+++ b/xiaofang/Assets/Scenes/loginscene.unity
@@ -4892,8 +4892,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44720823678ca7c42a08f4409ab025ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverIP: ws://222.212.40.39
-  serverPort: 13497
+  serverIP: ws://192.168.3.110
+  serverPort: 8445
   type: 
 --- !u!114 &7695717545649794846
 MonoBehaviour:
diff --git a/xiaofang/Assets/Script/hylScripts/NPCController.cs b/xiaofang/Assets/Script/hylScripts/NPCController.cs
index 6e7fc450..e5332101 100644
--- a/xiaofang/Assets/Script/hylScripts/NPCController.cs
+++ b/xiaofang/Assets/Script/hylScripts/NPCController.cs
@@ -23,6 +23,7 @@ public class NPCController : MonoBehaviour
     }
     public void INITNPCMOVE(Vector3 pos)
     {
+        Debug.Log("11111111");
         foreach (var npcDict in npcsList)
         {
             foreach (var kvp in npcDict)
diff --git a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
index 32943ac5..00b9bc34 100644
--- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
+++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
@@ -42,10 +42,10 @@ public class LoginPanel : Base
         // 创建登录请求的 body
         auth_login loginBody = new auth_login
         {
-            grantType = "password",
+            grantType = "password", 
             clientId = "e5cd7e4891bf95d1d19206ce24a7b32e",
             userType = "company_user",
-            username = "13051628292",//"ZF16c788632",13699802230,13051628292
+            username = "13699802230",//"ZF16c788632",13699802230,13051628292
             password = "YYL5371!"
         };
         image.gameObject.SetActive (true);