From c766cfb0958f7fc0bd5e841fbc903761596a19eb Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 27 Jan 2025 13:24:29 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EB=8B=A4=20?= =?UTF-8?q?=EC=9E=A1=EC=9C=BC=EB=A9=B4=20=EC=8B=9C=EA=B0=84=20=EB=A9=88?= =?UTF-8?q?=EC=B6=94=EA=B3=A0=20=ED=8F=AC=ED=83=88=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EA=B3=A0,=20=EC=B9=B4=EB=A9=94=EB=9D=BC=EA=B0=80=20=ED=8F=AC?= =?UTF-8?q?=ED=83=88=EC=AA=BD=EC=9C=BC=EB=A1=9C=20=EB=B3=B4=EA=B2=8C=20?= =?UTF-8?q?=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Ino_nerdnavis.txt | 1 - Assets/Res_Addr/Map/Map_Maze.prefab | 32 +++++++++++++++++++ Assets/Script/Character/MyActor.cs | 2 ++ Assets/Script/Info/InGameInfo.cs | 1 + .../UI/Ingame/Dungeon/Ingame_DungeonBase.cs | 17 ++++++++-- .../Script/UI/Ingame/Dungeon/Ingame_Maze.cs | 1 - .../UI/Ingame/Dungeon/Ingame_Maze_Portal.cs | 15 +++++++++ .../Ingame/Dungeon/Ingame_Maze_Portal.cs.meta | 11 +++++++ Assets/Script/Util/RealCamera.cs | 6 ++-- 9 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs create mode 100644 Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs.meta diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index d99f55724..cebae35f5 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -55,5 +55,4 @@ messageinfo 엄청 느린 버그 - 결과 화면 (보상 지급) - 랭킹 (플레이팹 v2 연결) - 포탈 타면 레벨 하나 증가시키고 다음 맵 시작 - - 몬스터 다 잡으면 시간 멈추고 포탈 나오게 - 몬스터 스탯 설정 : (lv - 1) * 0.5 diff --git a/Assets/Res_Addr/Map/Map_Maze.prefab b/Assets/Res_Addr/Map/Map_Maze.prefab index b41dead38..9d928c49d 100644 --- a/Assets/Res_Addr/Map/Map_Maze.prefab +++ b/Assets/Res_Addr/Map/Map_Maze.prefab @@ -1776,6 +1776,10 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3446096749708635939, guid: e10251cfb7e5af44b973195a3af55e94, + type: 3} + insertIndex: 1 + addedObject: {fileID: 3200701469145082899} - targetCorrespondingSourceObject: {fileID: 3446096749708635939, guid: e10251cfb7e5af44b973195a3af55e94, type: 3} insertIndex: -1 @@ -1787,6 +1791,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 843735582378244202} m_PrefabAsset: {fileID: 0} +--- !u!114 &3200701469145082899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2623192537447389001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04f12942ea32ecb4aa37f9a682253d38, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!65 &1157343157093801123 BoxCollider: m_ObjectHideFlags: 0 @@ -5106,6 +5122,10 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3446096749708635939, guid: e10251cfb7e5af44b973195a3af55e94, + type: 3} + insertIndex: 1 + addedObject: {fileID: 5077114236984108514} - targetCorrespondingSourceObject: {fileID: 3446096749708635939, guid: e10251cfb7e5af44b973195a3af55e94, type: 3} insertIndex: -1 @@ -5117,6 +5137,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5302210320255987716} m_PrefabAsset: {fileID: 0} +--- !u!114 &5077114236984108514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7370073230142758695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04f12942ea32ecb4aa37f9a682253d38, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!65 &5625780588183658180 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/MyActor.cs b/Assets/Script/Character/MyActor.cs index cd842af25..a1b18bc0f 100644 --- a/Assets/Script/Character/MyActor.cs +++ b/Assets/Script/Character/MyActor.cs @@ -82,6 +82,8 @@ public class MyActor : Actor } } } + else + Play_Idle(); } protected virtual void Update_Move() { diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index 4cebcd3ef..294e7ad7d 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -460,6 +460,7 @@ public partial class InGameInfo : MyCoroutine m_GameMode = eGameMode.Lobby; Init_IngameData(); NewGameUI.Ins.SetUI_byGameMode(m_GameMode); + MyValue.MyChoiceMapData.n_PortalIndex = 0; Load_Map(-1); } public void Return_To_ChapterLobby() diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs index c1869353c..35de83e2c 100644 --- a/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_DungeonBase.cs @@ -3,14 +3,27 @@ using UnityEngine; public class Ingame_DungeonBase : MonoBehaviour { - protected ObscuredInt MaxMobCount, MobCount; + protected ObscuredInt _MaxMobCount; + protected int MaxMobCount + { + get { return _MaxMobCount; } + set { _MaxMobCount = value; _MaxMobCount.RandomizeCryptoKey(); } + } + + protected ObscuredInt _MobCount; + protected int MobCount + { + get { return _MobCount; } + set { _MobCount = value; _MobCount.RandomizeCryptoKey(); } + } + public virtual void Set_DungeonInfo(int maxMobCount) { gameObject.SetActive(true); + MobCount = 0; MaxMobCount = maxMobCount; - MaxMobCount.RandomizeCryptoKey(); DungeonInfo.Ins.m_MaxDieMobCount = MaxMobCount; DungeonInfo.Ins.act_MobDieCount = Add_MobCount; diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs index c4d8fad1b..7186e0c9d 100644 --- a/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze.cs @@ -13,7 +13,6 @@ public class Ingame_Maze : Ingame_DungeonBase public override void Add_MobCount(int mobid) { ++MobCount; - MobCount.RandomizeCryptoKey(); texts[0].text = (MaxMobCount - MobCount).ToString(); } } \ No newline at end of file diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs new file mode 100644 index 000000000..f69176979 --- /dev/null +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +public class Ingame_Maze_Portal : MonoBehaviour +{ + private void OnEnable() + { + MyValue.m_RealCamera.Set_TargetShow(transform); + } + private void OnTriggerEnter(Collider other) { ProcessCollider(other); } + private void OnCollisionEnter(Collision collision) { ProcessCollider(collision.collider); } + private void ProcessCollider(Collider other) + { + Debug.Log(other); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs.meta b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs.meta new file mode 100644 index 000000000..dd9cba4f5 --- /dev/null +++ b/Assets/Script/UI/Ingame/Dungeon/Ingame_Maze_Portal.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04f12942ea32ecb4aa37f9a682253d38 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Util/RealCamera.cs b/Assets/Script/Util/RealCamera.cs index 4cf3fe544..b4fce6582 100644 --- a/Assets/Script/Util/RealCamera.cs +++ b/Assets/Script/Util/RealCamera.cs @@ -88,7 +88,7 @@ public class RealCamera : MyCoroutine public void Add_CamActionTarget(Transform _target) { list_tfCamactionTarget.Add(_target); } public void Set_TargetShow(Transform _target) { - if (CamStatus != 0 && target != null) + if (CamStatus != 0 && !DSUtil.CheckNull(target)) { // 매개변수 타겟을 보게 카메라 회전 if (godummy == null) godummy = new GameObject("CamDummy"); @@ -108,7 +108,7 @@ public class RealCamera : MyCoroutine { if (DragEndTime <= 0f) { - if (gowitch == null) gowitch = new GameObject("witchDummy"); + if (DSUtil.CheckNull(gowitch)) gowitch = new GameObject("witchDummy"); gowitch.transform.position = MyValue.MyPC.Get_position() + MyValue.MyPC.transform.forward; Set_TargetShow(gowitch.transform); } @@ -127,7 +127,7 @@ public class RealCamera : MyCoroutine if (DSUtil.CheckNull(target)) return; // 캐릭터의 이동 방향 계산 - Vector3 direction = target.position - previousPosition; + //Vector3 direction = target.position - previousPosition; //// 이동 방향이 존재할 때 캐릭터가 보는 방향으로 카메라 회전 //if (direction.sqrMagnitude > 0.01f)