diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/3d66Mat-8735974-maps-4.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/3d66Mat-8735974-maps-4.jpg.meta
index 6e823c73..df92c6b7 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/3d66Mat-8735974-maps-4.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/3d66Mat-8735974-maps-4.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare1_2k_n_1.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare1_2k_n_1.jpg.meta
index a0c9080a..6d5aab0f 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare1_2k_n_1.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare1_2k_n_1.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare2_2k_n_1.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare2_2k_n_1.jpg.meta
index ff1182ec..02faa476 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare2_2k_n_1.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Plaster_Bare2_2k_n_1.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Road_RoadsWithLines_2k_n_1.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Road_RoadsWithLines_2k_n_1.jpg.meta
index 21d08642..54a1f565 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Road_RoadsWithLines_2k_n_1.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Road_RoadsWithLines_2k_n_1.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_GrimeyPlaster_2k_n_1.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_GrimeyPlaster_2k_n_1.jpg.meta
index bc02cd9a..deaa5813 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_GrimeyPlaster_2k_n_1.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_GrimeyPlaster_2k_n_1.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_PaintedWoodBaseboard_2k_n7_1_2.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_PaintedWoodBaseboard_2k_n7_1_2.png.meta
index bde0a681..4c0874c8 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_PaintedWoodBaseboard_2k_n7_1_2.png.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_PaintedWoodBaseboard_2k_n7_1_2.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_WallpaperFlourishes_2k_n_1.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_WallpaperFlourishes_2k_n_1.jpg.meta
index 3138252e..360a20d9 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_WallpaperFlourishes_2k_n_1.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/Wall_WallpaperFlourishes_2k_n_1.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/caochang_Normal.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/caochang_Normal.png.meta
index 346006e9..55a30aa2 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/caochang_Normal.png.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/caochang_Normal.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/cgaxis_pbr_13_wood_7_normal.jpg.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/cgaxis_pbr_13_wood_7_normal.jpg.meta
index 287c2499..ab128fed 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/cgaxis_pbr_13_wood_7_normal.jpg.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/cgaxis_pbr_13_wood_7_normal.jpg.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/chengse_n.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/chengse_n.png.meta
index 3786d8c7..7429cded 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/chengse_n.png.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/chengse_n.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx
similarity index 56%
rename from xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx
rename to xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx
index f6aa386e..9e53f161 100644
Binary files a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx and b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx differ
diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx.meta
similarity index 98%
rename from xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx.meta
rename to xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx.meta
index bf0638fc..980739e2 100644
--- a/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school03.fbx.meta
+++ b/xiaofang/Assets/Prefabs/HYLPrefabs/Map/school04.fbx.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eec919b17e074b747899fe01d7888a2c
+guid: 0c9b084f2070bda45b87da961d2eb0f6
 ModelImporter:
   serializedVersion: 21300
   internalIDToNameTable: []
diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs
index fb1526fa..226a0449 100644
--- a/xiaofang/Assets/ProtoBuf/test.cs
+++ b/xiaofang/Assets/ProtoBuf/test.cs
@@ -553,7 +553,7 @@ public class test : MonoBehaviour
                 }
                 if(npcData.Type == 2)//npcÒƶ¯
                 {
-                    Vector3 v = new Vector3(-float.Parse(npcData.X.ToString()), float.Parse(npcData.Y.ToString()), float.Parse(npcData.Z.ToString()));
+                    Vector3 v = new Vector3(float.Parse(npcData.X.ToString()), float.Parse(npcData.Y.ToString()), float.Parse(npcData.Z.ToString()));
                     foreach(RecuseNpc item in NPCController.instance.npcsList)
                     {
                         if(npcData.UserId == item.npcId)
diff --git a/xiaofang/Assets/Scenes/Tmap 1/NavMesh.asset b/xiaofang/Assets/Scenes/Tmap 1/NavMesh.asset
index 329624e9..eff4ff1a 100644
Binary files a/xiaofang/Assets/Scenes/Tmap 1/NavMesh.asset and b/xiaofang/Assets/Scenes/Tmap 1/NavMesh.asset differ
diff --git a/xiaofang/Assets/Script/npc/RecuseNpc.cs b/xiaofang/Assets/Script/npc/RecuseNpc.cs
index 55edc855..95bca509 100644
--- a/xiaofang/Assets/Script/npc/RecuseNpc.cs
+++ b/xiaofang/Assets/Script/npc/RecuseNpc.cs
@@ -27,7 +27,7 @@ public class RecuseNpc : MonoBehaviour
 
     private Animator anim;
 
-    public Npcstate nstate = Npcstate.dead;
+    public Npcstate nstate = Npcstate.idle;
 
     private bool movebool = false;
     public Transform target;