主持人跳转

2024-12-26 03:46:07 +08:00 · 2024-12-26 03:46:07 +08:00 · 965bc503d5
commit 965bc503d5
parent 0604831cf4
22 changed files with 4809 additions and 2765 deletions
--- a/xiaofang/Assets/ProtoBuf/ProtoBuffer.cs
+++ b/xiaofang/Assets/ProtoBuf/ProtoBuffer.cs
@ -14,7 +14,7 @@ using System.Net.NetworkInformation;
 using UnityEditor;
 #endif

-[InitializeOnLoad]
+
 public class EncryptionDongleClient : MonoBehaviour
 {
    public static string licenseID = "xiaofangid";
@ -64,9 +64,8 @@ public class EncryptionDongleClient : MonoBehaviour

    public static void ValidateLicense()
    {
-        EditorApplication.update += ValidateLicenseStep;
+        //EditorApplication.update += ValidateLicenseStep;
    }
-
    private static UnityWebRequest request;

    private static void ValidateLicenseStep()
@ -148,7 +147,7 @@ public class EncryptionDongleClient : MonoBehaviour
 #endif
        }

-        EditorApplication.update -= ValidateLicenseStep;
+        //EditorApplication.update -= ValidateLicenseStep;
    }
 }

--- a/xiaofang/Assets/Res/FreeAction/Image
+++ b/xiaofang/Assets/Res/FreeAction/Image
@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4724984853692208734
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7694232344173550021}
+  - component: {fileID: 866156516591807907}
+  - component: {fileID: 6258961426742153462}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7694232344173550021
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4724984853692208734}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.0014954, y: 59.561913}
+  m_SizeDelta: {x: 266.67, y: 63.1218}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &866156516591807907
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4724984853692208734}
+  m_CullTransparentMesh: 1
+--- !u!114 &6258961426742153462
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4724984853692208734}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
--- a/xiaofang/Assets/Res/FreeAction/Image
+++ b/xiaofang/Assets/Res/FreeAction/Image
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5d148a8a2c37a4f4abb53c21e61dfe85
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/xiaofang/Assets/Res/gsj/TopCamera.prefab
+++ b/xiaofang/Assets/Res/gsj/TopCamera.prefab
@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3192960458311219509
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3192960458311219510}
+  - component: {fileID: 3192960458311219528}
+  - component: {fileID: 3192960458311219511}
+  - component: {fileID: 3192960458311219529}
+  - component: {fileID: 3192960458311219530}
+  m_Layer: 0
+  m_Name: TopCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3192960458311219510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3192960458311219509}
+  m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 6, y: 60, z: -25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90}
+--- !u!20 &3192960458311219528
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3192960458311219509}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 68
+  orthographic: 1
+  orthographic size: 30
+  m_Depth: 1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!81 &3192960458311219511
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3192960458311219509}
+  m_Enabled: 1
+--- !u!114 &3192960458311219529
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3192960458311219509}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 898562fd62122f647a41732624825d58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startPosition: {x: 6, y: 60, z: -25}
+  maxPosX: 100
+  minPosX: -100
+  maxPosY: 50
+  minPosY: 10
+  maxPosZ: 100
+  minPosZ: -100
+  speed: 20
+--- !u!114 &3192960458311219530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3192960458311219509}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3e706e11617e1dd49aa3be7c2f0edfa6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mainBuilding: {fileID: 0}
+  birdEyeView: {fileID: 0}
+  characterViews: []
+  ishost: 1
+  voiceLength: 10
+  rotationRadius: 50
+  rotationHeight: 5
+  rotationSpeed: 36
--- a/xiaofang/Assets/Res/gsj/TopCamera.prefab.meta
+++ b/xiaofang/Assets/Res/gsj/TopCamera.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4c68a32011c397048bd2f3ffee80a796
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs
@ -37,7 +37,7 @@ public class Godvisual : MonoBehaviour

        elapsedTime = 0f;
        isSwitching = false;
-
+   
        // 确保摄像机初始位置在环绕轨道上
        //Vector3 startPosition = mainBuilding.position + new Vector3(rotationRadius, rotationHeight, 0);
        //transform.position = startPosition;
@ -50,7 +50,7 @@ public class Godvisual : MonoBehaviour
        transform.rotation = birdEyeView.rotation;
        isAtGodView = true;
        isRotating = false; // 停止旋转逻辑
-        transform.GetComponent<Camera>().orthographic = true;//Õý½»
+        //transform.GetComponent<Camera>().orthographic = true;//Õý½»
    }
    // Update is called once per frame
    void Update()
@ -75,11 +75,11 @@ public class Godvisual : MonoBehaviour
        
        if (isAtGodView)
        {
-            transform.GetComponent<Camera>().orthographic = true;
+            //transform.GetComponent<Camera>().orthographic = true;
        }
        else
        {
-            transform.GetComponent<Camera>().orthographic = false;
+            //transform.GetComponent<Camera>().orthographic = false;
        }
    }
    // 环绕主建筑
--- a/xiaofang/Assets/Res/gsj/scripts/Panel2.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Panel2.cs
@ -20,7 +20,9 @@ public class Panel2 : MonoBehaviour
    public List<Camera> playerCameras = new List<Camera>(); // 存储每个角色的摄像机
    private bool isGodView = true; // 是否为上帝视角
    public int currentCameraIndex = -1;
- 
+
+    public List<GameObject> target;//目标
+    
    // Start is called before the first frame update
    void Start()
    {
@ -40,6 +42,7 @@ public class Panel2 : MonoBehaviour
        nameImage = new List<GameObject>();
        foreach (Transform child in peopleposition.transform)
        {
+
            // 查找每个子物体中的"bg"子物体
            Transform bgTransform = child.Find("nameImage");
            if (bgTransform != null)
@ -47,20 +50,15 @@ public class Panel2 : MonoBehaviour
                nameImage.Add(bgTransform.gameObject);
            }
        }
-        // 获取所有标签为 "People" 的物体
-        GameObject[] players = GameObject.FindGameObjectsWithTag("People");
+        // 获取所有标签为 "Player" 的物体
+        GameObject[] players = GameObject.FindGameObjectsWithTag("Player");

        // 遍历每个 Player，找到子物体中的摄像机
        foreach (GameObject player in players)
-        {
-            // 在 Player 的子物体中查找摄像机组件
-            Camera camera = player.GetComponentInChildren<Camera>();
-            if (camera != null)
-            {
-                playerCameras.Add(camera);
-                camera.enabled = false; // 初始化时禁用所有摄像机
-            }
+        {          
+            target.Add(player.gameObject);
        }
+        SetOptionCount(target.Count);
            // 默认执行一次切换
            OnToggleValueChanged(toggle.isOn);

@ -68,25 +66,17 @@ public class Panel2 : MonoBehaviour
    // 切换到指定索引的摄像机
    public void SwitchToCamera(int index)
    {
-        var index2=index;
-        if (index < 0 || index >= playerCameras.Count)
-        {
-            Debug.LogWarning("无效的摄像机索引：" + index);
-            return;
-        }
-        // 关闭上帝视角摄像机
-        godView.enabled=false;
+        
        isGodView = false;
+        // 将摄像机设为 target[index] 的子物体
+        godView.transform.SetParent(target[index].transform);
+        // 重置摄像机的位置和旋转
+        godView.transform.localPosition = (Vector3.zero+new Vector3(0, 1.5f, -1));
+        godView.transform.localRotation = Quaternion.identity;
+  
+        // 让摄像机朝向父物体
+        godView.transform.LookAt(target[index].transform.position+ new Vector3(0, 1.5f,0));

-        // 禁用当前激活的摄像机（如果在角色视角）
-        if (currentCameraIndex >= 0)
-        {
-            playerCameras[index2].enabled=false;
-        }
-
-        // 激活指定索引的摄像机
-        currentCameraIndex = index;
-        playerCameras[currentCameraIndex].enabled=true;
    }
    // 用于外部传入参数来设置Dropdown选项数量的方法
    public void SetOptionCount(int count)
@ -121,8 +111,8 @@ public class Panel2 : MonoBehaviour
        //peopleposition.SetActive(false);
        int selectedIndex = dropdown.value;
        Debug.Log("进入角色" + (selectedIndex+1) + "视角");
-        
-        
+
+        //godView.GetComponent<Camera>().orthographic = false;
        SwitchToCamera(selectedIndex);//转入视角
        Game.uiManager.CloseUI("Panel1_2");
        Game.uiManager.ShowUI<Image>("Panel1_3");
--- a/xiaofang/Assets/Res/gsj/scripts/Panel3.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Panel3.cs
@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using static UnityEngine.GraphicsBuffer;

 public class Panel3 : MonoBehaviour
 {
@ -12,11 +13,12 @@ public class Panel3 : MonoBehaviour
    private int optionCount;  // 用于存储传入的确定Dropdown选项数量的参数
    private GameObject peopleposition;
    private Camera godView;
-    public List<Camera> playerCameras = new List<Camera>(); // 存储每个角色的摄像机
+    public List<GameObject> playertarget; // 存储每个角色
    private int currentCameraIndex = -1;
    private bool isGodView = false; // 是否当前为上帝视角
    private GameObject[] players;
-    
+    private Vector3 startposition = new Vector3(6, 60, -25);
+    private Vector3 startrotation = new Vector3(90, 0, -90);
    // Start is called before the first frame update
    void Start()
    {
@ -30,66 +32,52 @@ public class Panel3 : MonoBehaviour
        peopleposition = GameObject.Find("peopleposition").gameObject;
        peopleposition.SetActive(false);
        godView=GameObject.Find("TopCamera").GetComponent<Camera>();
-
+        //godView.GetComponent<Camera>().orthographic = false;

        // 获取所有标签为 "Player" 的物体
-        GameObject[] players = GameObject.FindGameObjectsWithTag("People");
+        GameObject[] players = GameObject.FindGameObjectsWithTag("Player");

        foreach (GameObject player in players)
        {
-            Camera camera = player.GetComponentInChildren<Camera>();
-            if (camera != null)
+            
+            if (player != null)
            {
-                playerCameras.Add(camera);
-                camera.enabled = true; // 初始化时禁用所有角色摄像机
+                playertarget.Add(player);
+                
            }
        }
+        SetOptionCount(playertarget.Count);
        currentCameraIndex = Panel2.instance.currentCameraIndex;
        dropdown.value= currentCameraIndex;
-        for(int i = 0; i < playerCameras.Count; i++)
-        {
-            if(i!=currentCameraIndex)
-            {
-                playerCameras[i].enabled = false;
-            }
-        }
+        
    }
    // 切换到指定索引的摄像机
    public void SwitchToCamera(int index)
    {
-        if (index < 0 || index >= playerCameras.Count)
+        if (index < 0 || index >= playertarget.Count)
        {
            Debug.LogWarning("无效的摄像机索引：" + index);
            return;
        }

-        // 禁用上帝视角摄像机
-        godView.enabled = false;
+        isGodView = false;
+        // 将摄像机设为 target[index] 的子物体
+        godView.transform.SetParent(playertarget[index].transform);
+        // 重置摄像机的位置和旋转
+        godView.transform.localPosition = Vector3.zero;
+        godView.transform.localRotation = Quaternion.identity;

-        // 禁用所有角色摄像机
-        foreach (var camera in playerCameras)
-        {
-            camera.enabled = false;
-        }
-
-        // 激活目标角色摄像机
-        currentCameraIndex = index;
-        playerCameras[index].enabled = true;
-        isGodView = false; // 标记为非上帝视角
+        // 让摄像机朝向父物体
+        godView.transform.LookAt(playertarget[index].transform);
    }
    // 切换到上帝视角
    public void SwitchToGodView()
    {
-        // 禁用所有角色摄像机
-        foreach (var camera in playerCameras)
-        {
-            camera.enabled=false;
-        }
-
-        // 激活上帝视角摄像机
-        godView.enabled = true;
+        godView.GetComponent<Camera>().orthographic = true;
        isGodView = true;
        currentCameraIndex = -1;
+        godView.transform.position = startposition;
+        godView.transform.eulerAngles=startrotation;
    }
    // 用于外部传入参数来设置Dropdown选项数量的方法
    public void SetOptionCount(int count)
@ -130,6 +118,6 @@ public class Panel3 : MonoBehaviour
        int selectedIndex = dropdown.value;
        Debug.Log("进入角色" + (selectedIndex+1) + "视角");
        SwitchToCamera(selectedIndex);
-      
+        //godView.GetComponent<Camera>().orthographic = false;
    }
 }
--- a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
@ -11,6 +11,7 @@ public class ReadRoom : MonoBehaviour
    public GameRoomListResponse gameRoomListResponse;
    private List<GameRoomListData> roomDataList;
    public JSONReader js;
+    public bool isenter=false;//主持人进入
    // Start is called before the first frame update
    void Start()
    {
@ -39,7 +40,8 @@ public class ReadRoom : MonoBehaviour
                    if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && ("2024/12/20" == room.ReserveDate))
                    {
                        Debug.Log("可以直接进入房间");
-                        SceneManager.LoadScene(2);
+                        SceneManager.LoadScene("Tmap 1");
+                        isenter = true;
                    }
                    //else
                    //{
--- a/xiaofang/Assets/Res/gsj/scripts/UIManager.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/UIManager.cs
@ -11,7 +11,7 @@ public class UIManager
    public void Init()
    {
        //找世界中的画布
-        canvasTf = GameObject.Find("Canvas").transform;
+        canvasTf = GameObject.Find("HostCanvas").transform;
        //初始化集合
        uiList = new List<GameObject>();
    }
--- a/xiaofang/Assets/Res/gsj/test111.cs
+++ b/xiaofang/Assets/Res/gsj/test111.cs
@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class test111 : MonoBehaviour
+{
+    // Start is called before the first frame update
+    public Canvas canvas1;
+    public Canvas canvas2;
+    public Camera camera1;
+
+    void Start()
+    {
+        canvas1.gameObject.SetActive(true);
+        canvas2.gameObject.SetActive(false);
+        camera1.gameObject.SetActive(true);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if(ReadRoom.instance.isenter)
+        {
+            canvas1.gameObject.SetActive(false);
+            canvas2.gameObject.SetActive(true);
+        }
+    }
+}
--- a/xiaofang/Assets/Res/gsj/test111.cs.meta
+++ b/xiaofang/Assets/Res/gsj/test111.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f92a039327af32e458e6ec0179b42486
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/xiaofang/Assets/Resources/gsjUI/Dropdown.prefab
+++ b/xiaofang/Assets/Resources/gsjUI/Dropdown.prefab
--- a/xiaofang/Assets/Resources/gsjUI/Dropdown.prefab.meta
+++ b/xiaofang/Assets/Resources/gsjUI/Dropdown.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d4afda4ab7bbb6c4b87cfb3b04dde7d4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/xiaofang/Assets/Resources/gsjUI/Panel1_2.prefab
+++ b/xiaofang/Assets/Resources/gsjUI/Panel1_2.prefab
--- a/xiaofang/Assets/Resources/gsjUI/Panel1_3.prefab
+++ b/xiaofang/Assets/Resources/gsjUI/Panel1_3.prefab
--- a/xiaofang/Assets/Resources/gsjUI/PoPhost01.prefab
+++ b/xiaofang/Assets/Resources/gsjUI/PoPhost01.prefab
--- a/xiaofang/Assets/Resources/gsjUI/PoPhost01.prefab.meta
+++ b/xiaofang/Assets/Resources/gsjUI/PoPhost01.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9dfd52624c43cc345af84310324c6e0d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/xiaofang/Assets/Scenes/Tmap
+++ b/xiaofang/Assets/Scenes/Tmap
@ -6203,7 +6203,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 27
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &159663861
 PrefabInstance:
@ -6510,6 +6510,37 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Id: 0
+--- !u!1 &185827987
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 185827988}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &185827988
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 185827987}
+  m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 6, y: 60, z: -25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 17
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &191232456
 MeshCollider:
  m_ObjectHideFlags: 0
@ -6896,52 +6927,6 @@ PrefabInstance:
      objectReference: {fileID: 7400000, guid: 7012e3de65d9c6745a7751b1ca0b63aa, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 6025bf38a7ada134281ba43ad08c154b, type: 3}
--- !u!1 &222376206
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 222376208}
-  - component: {fileID: 222376207}
-  m_Layer: 0
-  m_Name: BurstCollisionWorld
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &222376207
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 222376206}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cellSpans:
-    m_AlignBytes: 16
--- !u!4 &222376208
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 222376206}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 39
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &224425900
 MeshCollider:
  m_ObjectHideFlags: 0
@ -7717,7 +7702,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 42
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &295391225
 MeshCollider:
@ -8305,7 +8290,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &339719735
 MeshCollider:
@ -8801,7 +8786,7 @@ Transform:
  - {fileID: 272025130}
  - {fileID: 1600741273}
  m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &382802813
 BoxCollider:
@ -10569,7 +10554,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 31
+  m_RootOrder: 33
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &479940076
 MonoBehaviour:
@ -11201,7 +11186,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 41
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &526829806
 GameObject:
@ -11232,7 +11217,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &530412951
 GameObject:
@ -11963,7 +11948,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 26
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &583497863
 PrefabInstance:
@ -12942,7 +12927,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 30
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &673038100
 PrefabInstance:
@ -13224,7 +13209,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 37
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &702577176
 MonoBehaviour:
@ -13715,7 +13700,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
      propertyPath: m_RootOrder
-      value: 19
+      value: 21
      objectReference: {fileID: 0}
    - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
      propertyPath: m_LocalPosition.x
@ -14579,7 +14564,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 32
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &810501282
 MonoBehaviour:
@ -16625,6 +16610,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 984064306}
+  - component: {fileID: 984064307}
  m_Layer: 0
  m_Name: --------------------------------------
  m_TagString: Untagged
@ -16647,6 +16633,21 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &984064307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 984064305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f92a039327af32e458e6ec0179b42486, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  canvas1: {fileID: 1039624184}
+  canvas2: {fileID: 5640692783290307690}
+  camera1: {fileID: 4163391439018457569}
 --- !u!1001 &984914341
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -16812,7 +16813,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &996888830
 MonoBehaviour:
@ -17438,7 +17439,7 @@ RectTransform:
  - {fileID: 491544196}
  - {fileID: 1375880035}
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -21245,7 +21246,7 @@ Transform:
  - {fileID: 496425325}
  - {fileID: 1670656697}
  m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 38
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1298227765
 GameObject:
@ -23723,7 +23724,7 @@ Transform:
  - {fileID: 1882199187}
  - {fileID: 119116319}
  m_Father: {fileID: 0}
-  m_RootOrder: 32
+  m_RootOrder: 34
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1453694928
 MeshCollider:
@ -25086,7 +25087,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 31
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1474431325
 GameObject:
@ -25267,7 +25268,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 29
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1481704192
 PrefabInstance:
@ -26449,7 +26450,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 33
+  m_RootOrder: 35
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1526740603
 MonoBehaviour:
@ -28282,7 +28283,7 @@ Transform:
  - {fileID: 1043610486}
  - {fileID: 437592030}
  m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 40
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1670656696
 GameObject:
@ -29417,6 +29418,52 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 449820, guid: 22465bd31104fea4a96afaf25cda1a9b, type: 3}
  m_PrefabInstance: {fileID: 1740480344}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1740883376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1740883378}
+  - component: {fileID: 1740883377}
+  m_Layer: 0
+  m_Name: BurstCollisionWorld
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1740883377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1740883376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cellSpans:
+    m_AlignBytes: 16
+--- !u!4 &1740883378
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1740883376}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 43
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1741419394
 MeshCollider:
  m_ObjectHideFlags: 0
@ -31573,7 +31620,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1912789160
 PrefabInstance:
@ -33362,7 +33409,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 25
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &2069562217
 MeshCollider:
@ -39505,7 +39552,7 @@ Transform:
  m_Children:
  - {fileID: 2057924365034160257}
  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 39
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2057924365745864529
 MonoBehaviour:
@ -43385,7 +43432,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
      propertyPath: m_RootOrder
-      value: 21
+      value: 23
      objectReference: {fileID: 0}
    - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
      propertyPath: m_LocalPosition.x
@ -44777,6 +44824,132 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4163391439018457500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4163391439018457503}
+  - component: {fileID: 4163391439018457569}
+  - component: {fileID: 4163391439018457502}
+  - component: {fileID: 4163391439018457568}
+  - component: {fileID: 4163391439018457571}
+  m_Layer: 0
+  m_Name: TopCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &4163391439018457502
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163391439018457500}
+  m_Enabled: 1
+--- !u!4 &4163391439018457503
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163391439018457500}
+  m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
+  m_LocalPosition: {x: 6, y: 60, z: -25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 16
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90}
+--- !u!114 &4163391439018457568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163391439018457500}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 898562fd62122f647a41732624825d58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startPosition: {x: 6, y: 60, z: -25}
+  maxPosX: 100
+  minPosX: -100
+  maxPosY: 50
+  minPosY: 10
+  maxPosZ: 100
+  minPosZ: -100
+  speed: 20
+--- !u!20 &4163391439018457569
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163391439018457500}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 68
+  orthographic: 0
+  orthographic size: 30
+  m_Depth: 1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &4163391439018457571
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163391439018457500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3e706e11617e1dd49aa3be7c2f0edfa6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mainBuilding: {fileID: 88965377508065921}
+  birdEyeView: {fileID: 185827988}
+  characterViews: []
+  ishost: 1
+  voiceLength: 10
+  rotationRadius: 50
+  rotationHeight: 5
+  rotationSpeed: 36
 --- !u!4 &4174389542944889711
 Transform:
  m_ObjectHideFlags: 0
@ -47760,6 +47933,7 @@ MonoBehaviour:
  godView: {fileID: 0}
  playerCameras: []
  currentCameraIndex: -1
+  target: []
 --- !u!224 &5640692781825168937
 RectTransform:
  m_ObjectHideFlags: 0
@ -48202,7 +48376,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fbc917aafce31724bb0e03e0304b2a9a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  playerCameras: []
+  playertarget: []
 --- !u!224 &5640692781859853965
 RectTransform:
  m_ObjectHideFlags: 0
@ -59223,7 +59397,7 @@ RectTransform:
  - {fileID: 837023032066003696}
  - {fileID: 5640692782032870077}
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -59313,7 +59487,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!222 &5640692783309111107
 CanvasRenderer:
  m_ObjectHideFlags: 0
--- a/xiaofang/Assets/Scenes/Tmap
+++ b/xiaofang/Assets/Scenes/Tmap
@ -5005,90 +5005,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 499732, guid: 133b581e02aa7f24fa0f99c1b471e108, type: 3}
  m_PrefabInstance: {fileID: 144336198}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &156041995
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 156041996}
-  - component: {fileID: 156041998}
-  - component: {fileID: 156041997}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &156041996
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 156041995}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 173460377}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &156041997
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 156041995}
-  m_Enabled: 1
--- !u!20 &156041998
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 156041995}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &159404401
 GameObject:
  m_ObjectHideFlags: 0
@ -5286,7 +5202,7 @@ GameObject:
  - component: {fileID: 173460378}
  m_Layer: 0
  m_Name: Cube (2)
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -5302,8 +5218,7 @@ Transform:
  m_LocalPosition: {x: -14.219999, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 156041996}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -8522,7 +8437,7 @@ GameObject:
  - component: {fileID: 462335243}
  m_Layer: 0
  m_Name: Cube (5)
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -8538,8 +8453,7 @@ Transform:
  m_LocalPosition: {x: -12.33, y: 0, z: -22.41}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1529411706}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9644,90 +9558,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 493836, guid: f62be65dda07dd249ada6047c9a5c230, type: 3}
  m_PrefabInstance: {fileID: 583497863}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &589317464
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 589317465}
-  - component: {fileID: 589317467}
-  - component: {fileID: 589317466}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &589317465
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589317464}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1302876881}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &589317466
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589317464}
-  m_Enabled: 1
--- !u!20 &589317467
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589317464}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!64 &593082551
 MeshCollider:
  m_ObjectHideFlags: 0
@ -10121,7 +9951,7 @@ GameObject:
  - component: {fileID: 609008756}
  m_Layer: 0
  m_Name: Cube (1)
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -10137,8 +9967,7 @@ Transform:
  m_LocalPosition: {x: -6.11, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 738018576}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -10386,7 +10215,7 @@ Camera:
  near clip plane: 0.3
  far clip plane: 1000
  field of view: 68
-  orthographic: 1
+  orthographic: 0
  orthographic size: 30
  m_Depth: 1
  m_CullingMask:
@ -11098,90 +10927,6 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -5597002278806442958, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3}
--- !u!1 &707645831
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 707645832}
-  - component: {fileID: 707645834}
-  - component: {fileID: 707645833}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &707645832
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 707645831}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1062705660}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &707645833
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 707645831}
-  m_Enabled: 1
--- !u!20 &707645834
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 707645831}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1001 &708410697
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -11419,90 +11164,6 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 4803559095270227739, guid: 25528d3d2120cee47bccf93decd4fbdf, type: 3}
--- !u!1 &738018575
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 738018576}
-  - component: {fileID: 738018578}
-  - component: {fileID: 738018577}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &738018576
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 738018575}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 609008755}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &738018577
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 738018575}
-  m_Enabled: 1
--- !u!20 &738018578
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 738018575}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!64 &744564688
 MeshCollider:
  m_ObjectHideFlags: 0
@ -14779,7 +14440,7 @@ GameObject:
  - component: {fileID: 1062705661}
  m_Layer: 0
  m_Name: Cube (4)
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -14795,8 +14456,7 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 23.3}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 707645832}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -16618,90 +16278,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 497546, guid: e85a08e8a1f5a53489c6ef195cfb222a, type: 3}
  m_PrefabInstance: {fileID: 1153932766}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &1173927595
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1173927596}
-  - component: {fileID: 1173927598}
-  - component: {fileID: 1173927597}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1173927596
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1173927595}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2035199880}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &1173927597
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1173927595}
-  m_Enabled: 1
--- !u!20 &1173927598
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1173927595}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &1178242404 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 3598913238228433623, guid: 25528d3d2120cee47bccf93decd4fbdf, type: 3}
@ -22794,7 +22370,7 @@ GameObject:
  - component: {fileID: 1302876882}
  m_Layer: 0
  m_Name: Cube (3)
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -22810,8 +22386,7 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: -25.77}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 589317465}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -22926,52 +22501,6 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -4670371673946364318, guid: 00003e04dc9a2534eb207f108c7b0cd3, type: 3}
--- !u!1 &1323973125
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1323973127}
-  - component: {fileID: 1323973126}
-  m_Layer: 0
-  m_Name: BurstCollisionWorld
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1323973126
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1323973125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cellSpans:
-    m_AlignBytes: 16
--- !u!4 &1323973127
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1323973125}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 39
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1324073401
 GameObject:
  m_ObjectHideFlags: 0
@ -26778,90 +26307,6 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 0.18731062, y: 0.18804662, z: 0.486349}
  m_Center: {x: -0.0000009536743, y: 0.0000018291175, z: 0.0000000074505793}
--- !u!1 &1529411705
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1529411706}
-  - component: {fileID: 1529411708}
-  - component: {fileID: 1529411707}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1529411706
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1529411705}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 462335242}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &1529411707
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1529411705}
-  m_Enabled: 1
--- !u!20 &1529411708
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1529411705}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 55
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1001 &1542437476
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -26924,6 +26369,52 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 401048, guid: 6a749781e5f719745a7ea468af7bc0d7, type: 3}
  m_PrefabInstance: {fileID: 1542437476}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1546253917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1546253919}
+  - component: {fileID: 1546253918}
+  m_Layer: 0
+  m_Name: BurstCollisionWorld
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1546253918
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1546253917}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cellSpans:
+    m_AlignBytes: 16
+--- !u!4 &1546253919
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1546253917}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 39
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1546963728
 MeshCollider:
  m_ObjectHideFlags: 0
@ -32214,7 +31705,7 @@ GameObject:
  - component: {fileID: 2035199881}
  m_Layer: 0
  m_Name: Cube
-  m_TagString: People
+  m_TagString: Player
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -32230,8 +31721,7 @@ Transform:
  m_LocalPosition: {x: 7.16, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1173927596}
+  m_Children: []
  m_Father: {fileID: 984064306}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -44192,6 +43682,7 @@ MonoBehaviour:
  godView: {fileID: 0}
  playerCameras: []
  currentCameraIndex: -1
+  target: []
 --- !u!1 &4965162872718919295
 GameObject:
  m_ObjectHideFlags: 0
@ -45490,7 +44981,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fbc917aafce31724bb0e03e0304b2a9a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  playerCameras: []
+  playertarget: []
 --- !u!1 &4965162872818616027
 GameObject:
  m_ObjectHideFlags: 0
@ -57773,7 +57264,7 @@ GameObject:
  - component: {fileID: 4965162874469270578}
  - component: {fileID: 4965162874469270579}
  m_Layer: 5
-  m_Name: HostCanvas
+  m_Name: Canvas
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/xiaofang/Assets/Scenes/loginscene.unity
+++ b/xiaofang/Assets/Scenes/loginscene.unity
--- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
+++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
@ -16,13 +16,14 @@ public class LoginPanel : Base
    public InputField pwd;
    public InputField sjh;
    public InputField yzm;
-
+    public Image image;
    // Start is called before the first frame update
    void Start()
    {
        
        loginBtn.onClick.AddListener(OnClickLoginBtn);
        getYzmBtn.onClick.AddListener(OnClickGetYzmBtn);
+        image.gameObject.SetActive(false);
    }

    public void OnClickGetYzmBtn()
@ -49,7 +50,7 @@ public class LoginPanel : Base
            phonenumber = "",
            smsCode = ""
        };
-
+        image.gameObject.SetActive (true);
        // 发送请求
        Debug.Log("登陆入参"+ JsonUtility.ToJson(loginBody));
        string response = await web.SendRequest(web.URL + "/auth/login", "POST", JsonUtility.ToJson(loginBody));
@ -70,11 +71,14 @@ public class LoginPanel : Base
        {
            SceneManager.LoadScene(1);
        }
-        if(id.text == "13051628292" && pwd.text == "ZF16c788632")
+        else if(id.text == "13051628292" && pwd.text == "ZF16c788632")
        {
            ReadRoom.instance.head();
        }
-
+        else
+        {
+            SceneManager.LoadScene("Tmap 1");
+        }

        ////如果是玩家账号就跳转到加入房间界面
        //if (loginBody.userType == "Player")