테스트맵 넓게 수정, 보스전 카메라 만드는 중...

This commit is contained in:
Ino 2025-05-22 10:17:57 +09:00
parent 85fc1a0c37
commit bc40472043
11 changed files with 85 additions and 3747 deletions

View File

@ -75,7 +75,7 @@ Camera:
m_Depth: 5 m_Depth: 5
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 287 m_Bits: 95
m_RenderingPath: -1 m_RenderingPath: -1
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0 m_TargetDisplay: 0
@ -165,6 +165,17 @@ MonoBehaviour:
m_Bits: 1 m_Bits: 1
cameraHeight: 78 cameraHeight: 78
cameraPan: 0 cameraPan: 0
arr_cCamData:
- minDistance: 1.5
maxDistance: 1.6
DistanceUp: 1
cameraHeight: 78
- minDistance: 0
maxDistance: 0
DistanceUp: 0
cameraHeight: 0
CamStatus2_x: 4
CamStatus2_up: 1.4
shakeCurve: shakeCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:

File diff suppressed because it is too large Load Diff

View File

@ -649,11 +649,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2723162309461623694, guid: 1fb5fd58cbcc4714eaf59008cbda15a1,
type: 3}
propertyPath: m_CullingMask.m_Bits
value: 95
objectReference: {fileID: 0}
- target: {fileID: 5448332676958061915, guid: 1fb5fd58cbcc4714eaf59008cbda15a1, - target: {fileID: 5448332676958061915, guid: 1fb5fd58cbcc4714eaf59008cbda15a1,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3dd0f8b3bae55e74e965a208f590c0a5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -123,7 +123,7 @@ NavMeshSettings:
preserveTilesOutsideBounds: 0 preserveTilesOutsideBounds: 0
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: d9e409927a7771f41add0f60cd412708, type: 2} m_NavMeshData: {fileID: 23800000, guid: 2691a3fa20557814898f3bbb6a3b26bd, type: 2}
--- !u!1 &723760618 --- !u!1 &723760618
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2691a3fa20557814898f3bbb6a3b26bd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -8,6 +8,6 @@ public class RealCameraRot : MonoBehaviour, IDragHandler
public void OnDrag(PointerEventData eventData) public void OnDrag(PointerEventData eventData)
{ {
if (!InGameInfo.Ins.IsGameMode(eGameMode.Lobby) && !DSUtil.CheckNull(MyValue.m_RealCamera)) if (!InGameInfo.Ins.IsGameMode(eGameMode.Lobby) && !DSUtil.CheckNull(MyValue.m_RealCamera))
MyValue.m_RealCamera.rotateAround += eventData.delta.x * RotSpeed; MyValue.m_RealCamera.Add_Rot(eventData.delta.x * RotSpeed);
} }
} }

View File

@ -69,6 +69,6 @@ public class MainToFarm : MonoBehaviourSingletonTemplate<MainToFarm>
MyValue.MyPC.Set_AutoBraking(false); MyValue.MyPC.Set_AutoBraking(false);
MyValue.MyPC.Play_Idle(); MyValue.MyPC.Play_Idle();
MyValue.MyPC.Set_Warp(new Vector3(110f, 0f, 40.5f)); MyValue.MyPC.Set_Warp(new Vector3(110f, 0f, 40.5f));
MyValue.m_RealCamera.rotateAround = 225f; MyValue.m_RealCamera.Set_Rot(225f);
} }
} }

View File

@ -10,7 +10,7 @@ public class TestMapUIMgr : MonoBehaviourSingletonTemplate<TestMapUIMgr>
public GameObject[] gos_other; // 0 펫 체크 public GameObject[] gos_other; // 0 펫 체크
List<MobActor> list_MobActor = new List<MobActor>(); List<MobActor> list_MobActor = new List<MobActor>();
Vector3 MobPos = new Vector3(15, 0, 20); Vector3 MobPos = new Vector3(45, 0, 45);
bool ShowPet = true; bool ShowPet = true;
private void Start() { Set_TestBtns(false); } private void Start() { Set_TestBtns(false); }

View File

@ -1,5 +1,16 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Random = UnityEngine.Random;
[Serializable]
public class cCamData
{
public float minDistance = 1.5f;
public float maxDistance = 1.6f;
public float DistanceUp = 1f;
public float cameraHeight = 78f;
}
public class RealCamera : MyCoroutine public class RealCamera : MyCoroutine
{ {
@ -34,9 +45,8 @@ public class RealCamera : MyCoroutine
Vector3 camPosition; Vector3 camPosition;
Vector3 camMask; Vector3 camMask;
float OriminDistance, OrimaxDistance, OriDistanceUp, OricameraHeight;
private float HorizontalAxis, VerticalAxis; private float HorizontalAxis, VerticalAxis;
int CamStatus = 1; // 0 초기, 1 평소, 2 followtarget 오른쪽뷰, 3 followtarget 탑뷰(고정) int CamStatus = 1; // 0 초기, 1 평소, 2 followtarget 오른쪽뷰, 3 followtarget 탑뷰(고정), 4 보스전
float DragEndTime; float DragEndTime;
GameObject godummy, gowitch; GameObject godummy, gowitch;
List<Transform> list_tfCamactionTarget = new List<Transform>(); List<Transform> list_tfCamactionTarget = new List<Transform>();
@ -46,14 +56,10 @@ public class RealCamera : MyCoroutine
Actor m_followTarget; Actor m_followTarget;
private void Awake() public cCamData[] arr_cCamData; // 0 일반, 1 보스
{
OriminDistance = minDistance;
OrimaxDistance = maxDistance;
OriDistanceUp = DistanceUp;
OricameraHeight = cameraHeight;
}
public void Add_Rot(float rot) { rotateAround += rot; }
public void Set_Rot(float rot) { rotateAround = rot; }
public bool IsEnter() { return CamStatus == 0; } public bool IsEnter() { return CamStatus == 0; }
public void Set_Target(Transform _target) public void Set_Target(Transform _target)
{ {
@ -71,31 +77,26 @@ public class RealCamera : MyCoroutine
CamStatus = 0; CamStatus = 0;
rotateAround = _camrot; rotateAround = _camrot;
Set_DistanceUp(false); Set_DistanceUp(false);
VerticalAxis = maxDistance = OrimaxDistance; VerticalAxis = maxDistance = arr_cCamData[0].maxDistance;
} }
public void Set_DistanceUp(bool vertical) public void Set_DistanceUp(bool vertical)
{ {
DistanceUp = vertical ? 0f : OriDistanceUp; DistanceUp = vertical ? 0f : arr_cCamData[0].DistanceUp;
} }
public void Set_InsideBuilding(bool _active) public void Set_InsideBuilding(bool _active)
{ {
if (_active) if (_active)
{ {
OriminDistance = minDistance;
OrimaxDistance = maxDistance;
OriDistanceUp = DistanceUp;
OricameraHeight = cameraHeight;
maxDistance = minDistance = 2f; maxDistance = minDistance = 2f;
DistanceUp = 1.5f; DistanceUp = 1.5f;
cameraHeight = 25f; cameraHeight = 25f;
} }
else else
{ {
minDistance = OriminDistance; minDistance = arr_cCamData[0].minDistance;
VerticalAxis = maxDistance = OrimaxDistance; VerticalAxis = maxDistance = arr_cCamData[0].maxDistance;
Set_DistanceUp(false); Set_DistanceUp(false);
cameraHeight = OricameraHeight; cameraHeight = arr_cCamData[0].cameraHeight;
} }
} }
public void Set_FollowTarget(Actor target) public void Set_FollowTarget(Actor target)