iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

카메라 수정 대기

Browse Source
This commit is contained in:
NTG_Lenovo 2023-10-23 13:33:27 +09:00
parent 264d02b5b4
commit 0a472a3e3d
4 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BlueWater/Assets/01.Scenes/03.Stage_Test.unity
View File

@ -2044,12 +2044,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 302959425}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: 0}
m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
@ -2064,7 +2065,7 @@ MonoBehaviour:
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &302959429
@ -2400,6 +2401,7 @@ GameObject:
- component: {fileID: 334724476}
- component: {fileID: 334724475}
- component: {fileID: 334724473}
- component: {fileID: 334724480}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -2567,6 +2569,20 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &334724480
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 334724472}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 61ed6470f3bb917439bf4b213ebbed8a, type: 3}
m_Name:
m_EditorClassIdentifier:
_persistent: 0
inIslandCam: {fileID: 879331194}
--- !u!1 &335860775 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2718910014188824470, guid: 14871bcccb7cf4e1d81bb38ec7a3a4e0,
@ -3213,12 +3229,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 418278336}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: 0}
m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
@ -3233,7 +3250,7 @@ MonoBehaviour:
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &418278344
@ -6842,8 +6859,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_persistent: 0
shipPlayer: {fileID: 0}
boats: []
<PlayerAction>k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
type: 3}
<InIslandPlayerPrefab>k__BackingField: {fileID: 418278336}
@ -6856,6 +6871,7 @@ MonoBehaviour:
<IsTakeAim>k__BackingField: 0
<IsAssaultMode>k__BackingField: 0
<IsShipDeckMode>k__BackingField: 0
<IsConversation>k__BackingField: 0
<CurrentPlayerMode>k__BackingField: 0
--- !u!4 &971043561
Transform:
@ -9797,12 +9813,13 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1362034957}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: 0}
m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
@ -9817,7 +9834,7 @@ MonoBehaviour:
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &1362034961

23
BlueWater/Assets/02.Scripts/InIslandCamera.cs Normal file
View File

@ -0,0 +1,23 @@
using Cinemachine;
using Sirenix.OdinInspector;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class InIslandCamera : Singleton<InIslandCamera>
{
[Required("InIslandCamera를 넣어주세요.")]
[SerializeField] private CinemachineVirtualCamera inIslandCam;
/// <summary>
/// LookAt target and follow target
/// </summary>
/// <param name="obj"></param>
public void SetTarget(Transform obj)
{
inIslandCam.LookAt = obj;
inIslandCam.Follow = obj;
}
}
}

11
BlueWater/Assets/02.Scripts/InIslandCamera.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 61ed6470f3bb917439bf4b213ebbed8a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
BlueWater/Assets/02.Scripts/SpawnController.cs
View File

@ -90,8 +90,7 @@ namespace BlueWaterProject
inIslandPlayer.UseAgentMovement();
cinemachineVirtualCamera.Follow = islandPlayer.transform;
cinemachineVirtualCamera.LookAt = islandPlayer.transform;
InIslandCamera.Inst.SetTarget(islandPlayer.transform);
GameManager.Inst.InIslandPlayer = inIslandPlayer;
}