diff --git a/Assets/Resources/Prefabs/Player/Player.prefab b/Assets/Resources/Prefabs/Player/Player.prefab index aba20e207..23c1dcbeb 100644 --- a/Assets/Resources/Prefabs/Player/Player.prefab +++ b/Assets/Resources/Prefabs/Player/Player.prefab @@ -171,7 +171,6 @@ GameObject: - component: {fileID: 4477616030203838514} - component: {fileID: 8101446342893690422} - component: {fileID: 2923025939212586282} - - component: {fileID: 6609347958324770316} - component: {fileID: 9164732011369635724} m_Layer: 14 m_Name: Player @@ -343,22 +342,6 @@ MonoBehaviour: _standingDownwardForceScale: 1 _camera: {fileID: 0} cameraParent: {fileID: 6835675132305341997} ---- !u!114 &6609347958324770316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8172838236951268422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 95ffc3d5f1c94a59aab905ba2d3e5de0, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.Fishing2.PlayerBinder - Root: {fileID: 8695154010886802211} - Eye: {fileID: 5745877877928638952} - FppLook: {fileID: 2969532427624891124} - IK: {fileID: 1593568502960682634} --- !u!114 &9164732011369635724 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Fishing/Fishing.cs b/Assets/Scripts/Fishing/Fishing.cs index e12ef4bba..0ff35846f 100644 --- a/Assets/Scripts/Fishing/Fishing.cs +++ b/Assets/Scripts/Fishing/Fishing.cs @@ -9,8 +9,7 @@ namespace NBF { public class Fishing { - private List _units; - private List _players = new List(); + public FPlayer Player { get; private set; } private static Fishing _instance; public static Fishing Instance @@ -49,59 +48,17 @@ namespace NBF public async FTask ChangeMap(int mapId, string roomCode, List units) { - _units = units; var sceneName = "Map1"; //加载场景== await SceneHelper.LoadScene(sceneName); - LoadAllUnit(); - - - // var oldMap = Game.Main.GetComponent(); - // await oldMap.UnLoadMap(); - // - // var map = Game.Main.AddComponent(); - // map.MapId = mapId; - // map.RoomCode = roomCode; - // map.SelfId = Game.SelfId; - // foreach (var mapUnitInfo in units) - // { - // map.CreateMapUnit(mapUnitInfo); - // } - // - // await map.LoadMap(); + CreateUnit(); } - /// - /// 加载所有unit单位 - /// - public void LoadAllUnit() - { - foreach (var unit in _units) - { - CreateUnit(unit); - } - // - // var cameraComponent = self.Scene.GetComponent(); - // if (cameraComponent != null) - // { - // cameraComponent.Mode = CameraShowMode.FPP; - // } - } - private void CreateUnit(MapUnitInfo unit) + private void CreateUnit() { var gameObject = PrefabsHelper.CreatePlayer(SceneSettings.Instance.Node); - var player = gameObject.GetComponent(); - player.InitData(unit); - _players.Add(player); - } - - /// - /// 卸载旧场景 - /// - public async FTask UnLoadMap() - { - await FTask.CompletedTask; + Player = gameObject.GetComponent(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/FPlayer.cs b/Assets/Scripts/Fishing/Player/FPlayer.cs index 6e769a50b..1d06d1f0d 100644 --- a/Assets/Scripts/Fishing/Player/FPlayer.cs +++ b/Assets/Scripts/Fishing/Player/FPlayer.cs @@ -5,15 +5,10 @@ namespace NBF { public class FPlayer : MonoBehaviour { - public MapUnitInfo Unit { get; private set; } public Transform Root; public Transform Eye; public Transform FppLook; public Transform IK; - - public void InitData(MapUnitInfo unit) - { - Unit = unit; - } + } } \ No newline at end of file