Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

xiaofang/Assets/Scenes/Tmap 1.unity

@@ -6797,6 +6797,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 702577175}
+  - component: {fileID: 702577176}
   m_Layer: 0
   m_Name: NpcSpawnPos
   m_TagString: Untagged
@@ -6819,6 +6820,20 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &702577176
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 702577174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1a829b8d12d88e14487451b9c601ab85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  npcsList: []
+  npc: {fileID: 0}
 --- !u!1 &702643057
 GameObject:
   m_ObjectHideFlags: 0
@@ -21346,8 +21361,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   token: 
   wEBScriptListener: {fileID: 1526740603}
-  npc: {fileID: 9144465012532105757, guid: 4bc999dc543a61148a0ba3bb1dd45a4d, type: 3}
-  trans: {fileID: 702577175}
 --- !u!4 &1526740602
 Transform:
   m_ObjectHideFlags: 0