From 56eb1d5f34ab98261b7b7091f0fffc18cda5d2a0 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 10:52:30 +0900 Subject: [PATCH 1/7] =?UTF-8?q?closed=20#38=20=EB=95=85=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EA=BA=BC=EC=A7=80=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + HpSlider 크기 축소 + Enemy HpSlider 밝은 빨간색으로 변경 + 카메라 축소 --- .../Assets/01.Scenes/03.Stage_Test.unity | 12 ++++----- .../02.Scripts/Character/Crewmate/Crewmate.cs | 26 ++++++++++++++++--- .../02.Scripts/Character/Enemy/Enemy.cs | 24 ++++++++++++++--- .../Character/Player/Type/InIslandPlayer.cs | 26 ++++++++++++++++--- .../05.Prefabs/HpSliders/EnemyHpSlider.prefab | 10 +++---- .../HpSliders/PlayerHpSlider.prefab | 4 +-- 6 files changed, 78 insertions(+), 24 deletions(-) diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index 75eb8f307..e5c504282 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -2529,8 +2529,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334724472} serializedVersion: 2 - m_LocalRotation: {x: 0.5257311, y: -0.0000000149568, z: 0.000000009243812, w: 0.85065085} - m_LocalPosition: {x: 30.91, y: 22.217937, z: -37.73} + m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724} + m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5933,14 +5933,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 879331193} serializedVersion: 2 - m_LocalRotation: {x: 0.5257311, y: -0.0000000149568, z: 0.000000009243812, w: 0.85065085} - m_LocalPosition: {x: 30.91, y: 22.217937, z: -37.73} + m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724} + m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1467753325} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 63.41, y: 0, z: 0} --- !u!1 &886612057 GameObject: m_ObjectHideFlags: 0 @@ -10490,7 +10490,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 20, z: -10} + m_FollowOffset: {x: 0, y: 25, z: -10} m_XDamping: 0 m_YDamping: 0 m_ZDamping: 0 diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index 877653804..d65290f07 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -180,10 +180,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } if (CurrentHp <= 0) return; @@ -309,7 +327,7 @@ namespace BlueWaterProject } else { - rb.velocity = Vector3.zero; + rb.isKinematic = true; } Agent.enabled = false; diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index bbb3c4b2f..ab7ffbd8e 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -261,10 +261,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index a6a94161d..81420a6a9 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -216,10 +216,28 @@ namespace BlueWaterProject protected override void Update() { - if (useHpSlider) + switch (useHpSlider) { - var localOffset = unitRoot.TransformPoint(hpSliderOffset); - hpSlider.transform.position = localOffset; + case true when CurrentHp > 0 && CurrentHp < MaxHp: + { + if (!hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(true); + } + + var localOffset = unitRoot.TransformPoint(hpSliderOffset); + hpSlider.transform.position = localOffset; + break; + } + case true when CurrentHp <= 0 || CurrentHp >= MaxHp: + { + if (hpSlider.gameObject.activeSelf) + { + hpSlider.gameObject.SetActive(false); + } + + break; + } } if (CurrentHp <= 0) return; @@ -347,7 +365,7 @@ namespace BlueWaterProject } else { - Rb.velocity = Vector3.zero; + Rb.isKinematic = true; } Agent.enabled = false; diff --git a/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab b/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab index 915967202..bfa458837 100644 --- a/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab +++ b/BlueWater/Assets/05.Prefabs/HpSliders/EnemyHpSlider.prefab @@ -61,12 +61,12 @@ PrefabInstance: - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.x - value: 0.002 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.y - value: 0.01 + value: 0.005 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} @@ -146,17 +146,17 @@ PrefabInstance: - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.b - value: 0.20392157 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.g - value: 0.17254902 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1525762082425720460, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_Color.r - value: 0.5647059 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1525762082425720563, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} diff --git a/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab b/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab index da1f0b071..e424712fa 100644 --- a/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab +++ b/BlueWater/Assets/05.Prefabs/HpSliders/PlayerHpSlider.prefab @@ -61,12 +61,12 @@ PrefabInstance: - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.x - value: 0.002 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} propertyPath: m_LocalScale.y - value: 0.01 + value: 0.005 objectReference: {fileID: 0} - target: {fileID: 1525762081838968275, guid: bb4f1e43ee7824c8e8009facee710768, type: 3} From 3c2e8d68bdb3354ab805294c069f0a638b5f0270 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 11:48:27 +0900 Subject: [PATCH 2/7] =?UTF-8?q?closed=20#39=20=EC=98=A4=EB=B8=8C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=ED=98=95=EC=8B=9D=EC=9D=98=20=EC=9B=90=EA=B1=B0?= =?UTF-8?q?=EB=A6=AC=20=EA=B3=B5=EA=B2=A9(ObjectWeapon)=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 파티클, 오브젝트 형식의 공격에서 autoDestory추가 ㄴ 자동으로 autoDestoryTime이 지난 후 파괴 + TenTen(원거리 무기) Dagger 추가 --- .../Assets/01.Scenes/03.Stage_Test.unity | 49 ++++- .../Character/Crewmate/Type/TenTen.cs | 47 +++++ .../Enemy/Type/FieldMinion/Type/MagicOrk.cs | 4 +- BlueWater/Assets/02.Scripts/ObjectPoolData.cs | 10 + .../Assets/02.Scripts/Weapon/ObjectWeapon.cs | 70 +++++++ .../02.Scripts/Weapon/ObjectWeapon.cs.meta | 11 ++ .../02.Scripts/Weapon/ParticleWeapon.cs | 22 +++ .../Assets/05.Prefabs/Weapon/Dagger.prefab | 186 ++++++++++++++++++ .../05.Prefabs/Weapon/Dagger.prefab.meta | 7 + .../OrkFireball/FireBallSoftBlueOBJ.prefab | 1 + 10 files changed, 403 insertions(+), 4 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs create mode 100644 BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs.meta create mode 100644 BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab create mode 100644 BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab.meta diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index e5c504282..5dbc15032 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -1160,6 +1160,37 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2135365439} m_PrefabAsset: {fileID: 0} +--- !u!1 &214533789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 214533790} + m_Layer: 0 + m_Name: ShootLocation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &214533790 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 214533789} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0.186, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1523920201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &231861242 PrefabInstance: m_ObjectHideFlags: 0 @@ -3155,7 +3186,7 @@ MonoBehaviour: isDrawViewRange: 1 isDrawDefenseRange: 1 isDrawTargetRange: 1 - k__BackingField: 250 + k__BackingField: 50 k__BackingField: 0 k__BackingField: 5 k__BackingField: 10 @@ -9618,7 +9649,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 9033924121474021245, guid: f231da17ce5b9c84f91bf8ed73c2868e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 214533790} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7216996033527228451, guid: f231da17ce5b9c84f91bf8ed73c2868e, type: 3} @@ -9751,6 +9786,10 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 0 + projectileObj: {fileID: 6365080210048648475, guid: d101d38de657e0b42aa2aea84f8590c7, + type: 3} + shootLocation: {fileID: 214533790} + speed: 500 --- !u!114 &1362034960 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10896,6 +10935,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} +--- !u!4 &1523920201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9033924121474021245, guid: f231da17ce5b9c84f91bf8ed73c2868e, + type: 3} + m_PrefabInstance: {fileID: 1362034954} + m_PrefabAsset: {fileID: 0} --- !u!1 &1533915118 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2718910014188824470, guid: 14871bcccb7cf4e1d81bb38ec7a3a4e0, diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs index ddaf1a4fb..c02210963 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using Sirenix.OdinInspector; using UnityEngine; // ReSharper disable once CheckNamespace @@ -8,6 +9,50 @@ namespace BlueWaterProject [Serializable] public class TenTen : Crewmate { + #region Properties and variables + + [Title("Weapon")] + [Required] + [SerializeField] private GameObject projectileObj; + [Required] + [SerializeField] private Transform shootLocation; + [SerializeField] private float speed = 500f; + + private Transform objectPoolLocation; + + #endregion + + #region Unity built-in methods + + protected override void Start() + { + base.Start(); + + var objectPoolData = FindAnyObjectByType(); + objectPoolLocation = objectPoolData.transform.Find("Objects/Daggers"); + } + + #endregion + + #region Interface + + // IAnimatorBridge + public override void AttackTiming() + { + if (!Target) return; + + var myCenterPos = MyCollider.bounds.center; + + var weapon = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent(); + weapon.transform.LookAt(Target.bounds.center); + weapon.SetPower(Atk); + weapon.GetComponent().AddForce(weapon.transform.forward * speed); + } + + #endregion + + #region Custom methods + protected override IEnumerator NormalAttackCoroutine() { usedNormalAttackCoroutine = true; @@ -29,5 +74,7 @@ namespace BlueWaterProject yield return waitAtkCooldown; usedNormalAttackCoroutine = false; } + + #endregion } } diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs index 23b7d9aa6..7170e4ec9 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs @@ -1,9 +1,7 @@ using System; using System.Collections; -using EpicToonFX; using Sirenix.OdinInspector; using UnityEngine; -using UnityEngine.Pool; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -14,7 +12,9 @@ namespace BlueWaterProject #region Properties and variables [Title("Weapon")] + [Required] [SerializeField] private GameObject projectileObj; + [Required] [SerializeField] private Transform shootLocation; [SerializeField] private float speed = 500f; diff --git a/BlueWater/Assets/02.Scripts/ObjectPoolData.cs b/BlueWater/Assets/02.Scripts/ObjectPoolData.cs index d27fcea6e..bf13b5c36 100644 --- a/BlueWater/Assets/02.Scripts/ObjectPoolData.cs +++ b/BlueWater/Assets/02.Scripts/ObjectPoolData.cs @@ -14,13 +14,23 @@ namespace BlueWaterProject [Button("기본 설정")] private void CreateDefaultSetting() { + // Objects var objects = transform.Find("Objects"); if (!objects) { objects = new GameObject("Objects").transform; objects.transform.parent = transform; } + + var daggers = transform.Find("Daggers"); + if (!daggers) + { + daggers = new GameObject("Daggers").transform; + daggers.transform.parent = objects; + } + + // Particles var particles = transform.Find("Particles"); if (!particles) { diff --git a/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs b/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs new file mode 100644 index 000000000..957e6bdbf --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs @@ -0,0 +1,70 @@ +using System.Collections; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public class ObjectWeapon : MonoBehaviour + { + [SerializeField] private LayerMask targetLayer; + [SerializeField] private float power; + [SerializeField] private float autoDestroyTime = 3f; + + private Rigidbody rb; + private SphereCollider sphereCollider; + private WaitForSeconds waitForSeconds; + + private void Awake() + { + rb = GetComponent(); + sphereCollider = GetComponent(); + waitForSeconds = new WaitForSeconds(autoDestroyTime); + } + + private void OnDestroy() + { + StopAllCoroutines(); + } + + private void Start() + { + StartCoroutine(nameof(AutoDestroy)); + } + + private void FixedUpdate() + { + // if (rb.velocity.magnitude != 0) + // { + // transform.rotation = Quaternion.LookRotation(rb.velocity); // Sets rotation to look at direction of movement + // } + + var direction = rb.velocity; // Gets the direction of the projectile, used for collision detection + if (rb.useGravity) + direction += Physics.gravity * Time.deltaTime; // Accounts for gravity if enabled + direction = direction.normalized; + + var detectionDistance = rb.velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame + + if (Physics.SphereCast(transform.position, sphereCollider.radius, direction, out var hit, detectionDistance, targetLayer)) // Checks if collision will happen + { + transform.position = hit.point + (hit.normal); // Move projectile to point of collision + + Destroy(gameObject); // Removes the projectile + + hit.transform.GetComponent()?.TakeDamage(power); + } + } + + private IEnumerator AutoDestroy() + { + yield return waitForSeconds; + + if (gameObject != null) + { + Destroy(gameObject); + } + } + + public void SetPower(float value) => power = value; + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs.meta b/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs.meta new file mode 100644 index 000000000..5efca1907 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Weapon/ObjectWeapon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ce67f7a5af7e8364182e3563a56ad079 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs b/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs index 64dd134f3..c190153d1 100644 --- a/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs +++ b/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs @@ -1,3 +1,5 @@ +using System; +using System.Collections; using UnityEngine; // ReSharper disable once CheckNamespace @@ -15,18 +17,28 @@ namespace BlueWaterProject [SerializeField] private LayerMask targetLayer; [SerializeField] private float power; + [SerializeField] private float autoDestroyTime = 5f; private Rigidbody rb; private SphereCollider sphereCollider; + private WaitForSeconds waitForSeconds; private void Awake() { rb = GetComponent(); sphereCollider = GetComponent(); + waitForSeconds = new WaitForSeconds(autoDestroyTime); + } + + private void OnDestroy() + { + StopAllCoroutines(); } private void Start() { + StartCoroutine(nameof(AutoDestroy)); + projectileParticle = Instantiate(projectileParticle, transform.position, transform.rotation, transform) as GameObject; projectileParticle.transform.parent = transform; if (muzzleParticle) @@ -83,6 +95,16 @@ namespace BlueWaterProject } } + private IEnumerator AutoDestroy() + { + yield return waitForSeconds; + + if (gameObject != null) + { + Destroy(gameObject); + } + } + public void SetPower(float value) => power = value; } } \ No newline at end of file diff --git a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab new file mode 100644 index 000000000..e1b49f9ad --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab @@ -0,0 +1,186 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4974917693782220124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4687260148761221251} + - component: {fileID: 2067129615080396003} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4687260148761221251 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4974917693782220124} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2677528810302803348} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!212 &2067129615080396003 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4974917693782220124} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 522cef2ef8d6a4da395354c0f0e34690, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1875, y: 0.46875} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6365080210048648475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2677528810302803348} + - component: {fileID: 1253731450221583048} + - component: {fileID: 1659185759454902698} + - component: {fileID: 5784756153569027963} + m_Layer: 0 + m_Name: Dagger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2677528810302803348 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365080210048648475} + serializedVersion: 2 + 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: 1 + m_Children: + - {fileID: 4687260148761221251} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1253731450221583048 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365080210048648475} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.3 + m_Center: {x: 0.02, y: 0, z: 0.25} +--- !u!54 &1659185759454902698 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365080210048648475} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &5784756153569027963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6365080210048648475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce67f7a5af7e8364182e3563a56ad079, type: 3} + m_Name: + m_EditorClassIdentifier: + targetLayer: + serializedVersion: 2 + m_Bits: 8192 + power: 0 + autoDestroyTime: 3 diff --git a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab.meta b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab.meta new file mode 100644 index 000000000..b09675097 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d101d38de657e0b42aa2aea84f8590c7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab b/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab index bf1a6e17d..8bc472006 100644 --- a/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab +++ b/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab @@ -106,3 +106,4 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1536 power: 0 + autoDestroyTime: 3 From 264d02b5b4a17960c493b23d1f05de3cd36aa483 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 12:15:54 +0900 Subject: [PATCH 3/7] =?UTF-8?q?Physics=20Crewmate=20<->=20Crewmate=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pewriter Sound - Package.unitypackage.meta | 7 -- .../PlayMaker - Integration.unitypackage.meta | 7 -- ... Scripting - Integration.unitypackage.meta | 7 -- .../ProjectSettings/DynamicsManager.asset | 2 +- .../com.unity.probuilder/Settings.json | 70 ------------------- 5 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta deleted file mode 100644 index 4801b3793..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 560a88da2bbc70140bed167f0ba7fe37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta deleted file mode 100644 index 77d64a86c..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fb01be13d6e88ca488dda82150319bfc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta deleted file mode 100644 index 05e590027..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 117dcc671050f5247bd8743b91ecaab7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 11df0c6fb..9d0ea37d4 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008022000000000000000000008222000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008062000000000000000000008222000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 diff --git a/BlueWater/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/BlueWater/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 986875fcc..3b364c44b 100644 --- a/BlueWater/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/BlueWater/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -35,76 +35,6 @@ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "experimental.enabled", "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.toolbarIconGUI", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.showEditorNotifications", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.showSceneInfo", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.stripProBuilderScriptsOnBuild", - "value": "{\"m_Value\":true}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "editor.autoRecalculateCollisions", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "mesh.meshColliderIsConvex", - "value": "{\"m_Value\":false}" - }, - { - "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "mesh.newShapesSnapToGrid", - "value": "{\"m_Value\":true}" - }, - { - "type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "lightmapping.defaultLightmapUnwrapParameters", - "value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}" - }, - { - "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "uv.uvEditorGridSnapIncrement", - "value": "{\"m_Value\":0.125}" - }, - { - "type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.userMaterial", - "value": "{\"m_Value\":{\"instanceID\":0}}" - }, - { - "type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.defaultStaticEditorFlags", - "value": "{\"m_Value\":0}" - }, - { - "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.newShapePivotLocation", - "value": "{\"m_Value\":1}" - }, - { - "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.shadowCastingMode", - "value": "{\"m_Value\":1}" - }, - { - "type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "mesh.newShapeColliderType", - "value": "{\"m_Value\":2}" } ] } From 0a472a3e3dea0f1aa714c5bfa8e580eae2324899 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 13:33:27 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=B9=B4=EB=A9=94=EB=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=8C=80=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/01.Scenes/03.Stage_Test.unity | 39 +++++++++++++------ BlueWater/Assets/02.Scripts/InIslandCamera.cs | 23 +++++++++++ .../Assets/02.Scripts/InIslandCamera.cs.meta | 11 ++++++ .../Assets/02.Scripts/SpawnController.cs | 3 +- 4 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/InIslandCamera.cs create mode 100644 BlueWater/Assets/02.Scripts/InIslandCamera.cs.meta diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index 5dbc15032..1794b5c0c 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -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: [] k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, type: 3} k__BackingField: {fileID: 418278336} @@ -6856,6 +6871,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + k__BackingField: 0 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 diff --git a/BlueWater/Assets/02.Scripts/InIslandCamera.cs b/BlueWater/Assets/02.Scripts/InIslandCamera.cs new file mode 100644 index 000000000..a21c088fc --- /dev/null +++ b/BlueWater/Assets/02.Scripts/InIslandCamera.cs @@ -0,0 +1,23 @@ +using Cinemachine; +using Sirenix.OdinInspector; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public class InIslandCamera : Singleton + { + [Required("InIslandCamera를 넣어주세요.")] + [SerializeField] private CinemachineVirtualCamera inIslandCam; + + /// + /// LookAt target and follow target + /// + /// + public void SetTarget(Transform obj) + { + inIslandCam.LookAt = obj; + inIslandCam.Follow = obj; + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/InIslandCamera.cs.meta b/BlueWater/Assets/02.Scripts/InIslandCamera.cs.meta new file mode 100644 index 000000000..137ac4da9 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/InIslandCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61ed6470f3bb917439bf4b213ebbed8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/SpawnController.cs b/BlueWater/Assets/02.Scripts/SpawnController.cs index 710bb5686..f5423d5ff 100644 --- a/BlueWater/Assets/02.Scripts/SpawnController.cs +++ b/BlueWater/Assets/02.Scripts/SpawnController.cs @@ -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; } From 6a21c607bb6bace6cb65df6298f01bb995b50513 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 15:11:28 +0900 Subject: [PATCH 5/7] =?UTF-8?q?closed=20#41=20=EC=84=AC=20=EC=95=88?= =?UTF-8?q?=EC=97=90=EC=84=9C=EC=9D=98=20Player,=20Crewmate=20=EC=A1=B0?= =?UTF-8?q?=EC=9E=91=20=EB=B0=A9=EC=8B=9D=20=EC=84=A0=ED=83=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 게임 시작 전에 GameManager에서 IslandPlayerMode로 조작 방식 선택 + IInIslandPlayer 인터페이스 추가 + 텐텐 무기(Dagger) 회전값 변경 + 원거리 무기 생성 위치 변경 + 섬 전용 카메라 InIslandCamera(싱글톤) 추가 + player, crewmate 스폰 방식 수정 + 파티클 OnDrawGizmoSelected 추가 --- .../Assets/01.Scenes/03.Stage_Test.unity | 2 + .../02.Scripts/Character/Crewmate/Crewmate.cs | 119 ++++++++++++++---- .../Character/Crewmate/Type/TenTen.cs | 4 +- .../Enemy/Type/FieldMinion/Type/MagicOrk.cs | 4 +- .../Character/Player/Type/InIslandPlayer.cs | 40 ++++-- BlueWater/Assets/02.Scripts/GameManager.cs | 51 ++++++-- .../02.Scripts/Interface/IInIslandPlayer.cs | 13 ++ .../Interface/IInIslandPlayer.cs.meta | 11 ++ .../Assets/02.Scripts/SpawnController.cs | 25 ++-- .../Assets/02.Scripts/Utility/GlobalValue.cs | 7 ++ .../02.Scripts/Weapon/ParticleWeapon.cs | 15 ++- .../Assets/05.Prefabs/Weapon/Dagger.prefab | 4 +- .../OrkFireball/FireBallSoftBlueOBJ.prefab | 2 +- ...ommonAssemblyDefinitions.unitypackage.meta | 7 -- ...ss Navigator Pro Support.unitypackage.meta | 7 -- .../Corgi Support.unitypackage.meta | 7 -- ...Devion Inventory Support.unitypackage.meta | 7 -- .../Dialogue System Support.unitypackage.meta | 7 -- .../Easy Save Support.unitypackage.meta | 7 -- .../Emerald AI Support.unitypackage.meta | 7 -- ...avigation System Support.unitypackage.meta | 7 -- .../Invector Support.unitypackage.meta | 7 -- ...Inventory Engine Support.unitypackage.meta | 7 -- .../Inventory Pro Support.unitypackage.meta | 7 -- .../PlayMaker Support.unitypackage.meta | 7 -- .../RPG Builder Support.unitypackage.meta | 7 -- .../Rewired Support.unitypackage.meta | 7 -- ...tical Shooter AI Support.unitypackage.meta | 7 -- .../TopDown Engine Support.unitypackage.meta | 7 -- ...ystemAssemblyDefinitions.unitypackage.meta | 7 -- ...-RPG Starter Kit Support.unitypackage.meta | 7 -- ...dventure Creator Support.unitypackage.meta | 7 -- ...cy Localization Importer.unitypackage.meta | 7 -- ...ehavior Designer Support.unitypackage.meta | 7 -- .../Bolt Support.unitypackage.meta | 7 -- .../Cinema Director Support.unitypackage.meta | 7 -- .../Cinemachine Support.unitypackage.meta | 7 -- .../Core GameKit Support.unitypackage.meta | 7 -- .../Corgi Support.unitypackage.meta | 7 -- ...i Holo Interface Support.unitypackage.meta | 7 -- .../Deftly Support.unitypackage.meta | 7 -- ...Devion Inventory Support.unitypackage.meta | 7 -- .../DoozyUI Support.unitypackage.meta | 7 -- .../Easy Save Support.unitypackage.meta | 7 -- .../Emerald AI Support.unitypackage.meta | 7 -- .../FMOD Support.unitypackage.meta | 7 -- .../FaceFX Support.unitypackage.meta | 7 -- .../Feel Support.unitypackage.meta | 7 -- .../GameFlow Support.unitypackage.meta | 7 -- .../I2 Localization Support.unitypackage.meta | 7 -- .../ICode Support.unitypackage.meta | 7 -- .../Ink Support.unitypackage.meta | 7 -- .../Invector Support.unitypackage.meta | 7 -- ...Inventory Engine Support.unitypackage.meta | 7 -- .../Inventory Pro Support.unitypackage.meta | 7 -- .../JLC Importer.unitypackage.meta | 7 -- .../KGFMapSystem Support.unitypackage.meta | 7 -- .../LipSync Support.unitypackage.meta | 7 -- ...ivelyChatBubbles Support.unitypackage.meta | 7 -- ...lization Package Support.unitypackage.meta | 7 -- .../Look Animator Support.unitypackage.meta | 7 -- .../Makinom Support.unitypackage.meta | 7 -- .../Master Audio Support.unitypackage.meta | 7 -- ...otion Controller Support.unitypackage.meta | 7 -- .../NGUI HUD Text Support.unitypackage.meta | 7 -- .../NGUI Support.unitypackage.meta | 7 -- .../NWT Support.unitypackage.meta | 7 -- .../ORK Framework Support.unitypackage.meta | 7 -- .../PlayMaker Support.unitypackage.meta | 7 -- .../PostProcessing Support.unitypackage.meta | 7 -- .../RPG Builder Support.unitypackage.meta | 7 -- .../RPG Kit Support.unitypackage.meta | 7 -- .../RTVoice Support.unitypackage.meta | 7 -- ...istic FPS Prefab Support.unitypackage.meta | 7 -- .../Rewired Support.unitypackage.meta | 7 -- .../Rog Support.unitypackage.meta | 7 -- .../SALSA Support.unitypackage.meta | 7 -- .../SLATE Support.unitypackage.meta | 7 -- ...cognition System Support.unitypackage.meta | 7 -- .../Spine Support.unitypackage.meta | 7 -- .../SuperTextMesh Support.unitypackage.meta | 7 -- .../TK2D Support.unitypackage.meta | 7 -- .../TalkIt Support.unitypackage.meta | 7 -- .../Text Animator Support.unitypackage.meta | 7 -- .../TopDown Engine Support.unitypackage.meta | 7 -- .../Topdown Kit Support.unitypackage.meta | 7 -- .../UniStorm Support.unitypackage.meta | 7 -- ...Visual Scripting Support.unitypackage.meta | 7 -- .../Wwise Support.unitypackage.meta | 7 -- ...mportAssemblyDefinitions.unitypackage.meta | 7 -- .../plyGame Support.unitypackage.meta | 7 -- ...MORPG Remastered Support.unitypackage.meta | 7 -- .../uMMORPG Support.unitypackage.meta | 7 -- .../uRPG Support.unitypackage.meta | 7 -- .../uSequencer Support.unitypackage.meta | 7 -- .../uSurvival Support.unitypackage.meta | 7 -- 96 files changed, 229 insertions(+), 649 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs create mode 100644 BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index 1794b5c0c..ec577e17e 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -6859,12 +6859,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 + k__BackingField: 1 k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, type: 3} k__BackingField: {fileID: 418278336} k__BackingField: - {fileID: 1362034959} - {fileID: 302959427} + currentInIslandPlayer: {fileID: 0} slowSpeed: 0.1 k__BackingField: 0 k__BackingField: 0 diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index d65290f07..928f062ab 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -11,7 +11,7 @@ using UnityEngine.UI; namespace BlueWaterProject { [RequireComponent(typeof(PlayerInput))] - public abstract class Crewmate : BaseCharacter, IDamageable, IAnimatorBridge, IAiView, INormalAttack + public abstract class Crewmate : BaseCharacter, IDamageable, IAnimatorBridge, IAiView, INormalAttack, IInIslandPlayer { #region Properties and variables @@ -93,11 +93,14 @@ namespace BlueWaterProject [SerializeField] protected bool isAttacking; // 일반 변수 + protected Vector2 movementInput; protected bool usedNormalAttackCoroutine; protected WaitForSeconds waitAtkCooldown; // 컴포넌트 - protected Rigidbody rb; + public GameObject GameObject => gameObject; + public Transform Transform => transform; + public Rigidbody Rb { get; set; } public Collider MyCollider { get; set; } public NavMeshAgent Agent { get; set; } private BehaviorTree bt; @@ -129,7 +132,7 @@ namespace BlueWaterProject { base.Awake(); - rb = GetComponent(); + Rb = GetComponent(); MyCollider = GetComponent(); Agent = GetComponent(); bt = GetComponent(); @@ -206,39 +209,77 @@ namespace BlueWaterProject if (CurrentHp <= 0) return; - if (GameManager.Inst.InIslandPlayer && GameManager.Inst.InIslandPlayer.UseRigidbody) + if (GameManager.Inst.CurrentInIslandPlayer.GameObject == gameObject) { - if (!UseRigidbody) + // 움직이는 경우 + if (movementInput.x != 0 || movementInput.y != 0) { - UseRigidbodyMovement(); + // Rigidbody 사용 + if (!UseRigidbody) + { + UseRigidbodyMovement(); + } + + if (!beAttacked) + { + myAnimator.SetFloat(RunStateHash, 0.5f); + } } - - if (!beAttacked) + // 멈춰있는 경우 + else { - myAnimator.SetFloat(RunStateHash, 0.5f); + // NavMeshAgent 사용 + if (UseRigidbody) + { + UseAgentMovement(); + } + + if (Agent.velocity.x != 0 || Agent.velocity.z != 0) + { + myAnimator.SetFloat(RunStateHash, 0.5f); + } + else if (!beAttacked) + { + myAnimator.SetFloat(RunStateHash, 0f); + } } } - else if (GameManager.Inst.InIslandPlayer && !GameManager.Inst.InIslandPlayer.UseRigidbody) + else { - if (UseRigidbody) + if (GameManager.Inst.CurrentInIslandPlayer.GameObject && GameManager.Inst.CurrentInIslandPlayer.UseRigidbody) { - UseAgentMovement(); - } + if (!UseRigidbody) + { + UseRigidbodyMovement(); + } - if (Agent.velocity.x != 0 || Agent.velocity.z != 0) - { - myAnimator.SetFloat(RunStateHash, 0.5f); + if (!beAttacked) + { + myAnimator.SetFloat(RunStateHash, 0.5f); + } } - else if (!beAttacked) + else if (GameManager.Inst.CurrentInIslandPlayer.GameObject && !GameManager.Inst.CurrentInIslandPlayer.UseRigidbody) { - myAnimator.SetFloat(RunStateHash, 0f); + if (UseRigidbody) + { + UseAgentMovement(); + } + + if (Agent.velocity.x != 0 || Agent.velocity.z != 0) + { + myAnimator.SetFloat(RunStateHash, 0.5f); + } + else if (!beAttacked) + { + myAnimator.SetFloat(RunStateHash, 0f); + } } } var localScale = transform.localScale; if (UseRigidbody) { - localScale.x = rb.velocity.x switch + localScale.x = Rb.velocity.x switch { > 0 => Mathf.Abs(localScale.x), < 0 => -Mathf.Abs(localScale.x), @@ -283,9 +324,20 @@ namespace BlueWaterProject // var movement = GameManager.Inst.InIslandPlayer.Rb.velocity * (MoveSpd / GameManager.Inst.InIslandPlayer.MoveSpd); // rb.velocity = new Vector3(movement.x, 0, movement.z); - var predictedPos = GameManager.Inst.InIslandPlayer.Rb.position + GameManager.Inst.InIslandPlayer.Rb.velocity; - var moveDir = (predictedPos - transform.position).normalized; - rb.velocity = new Vector3(moveDir.x, 0, moveDir.z) * MoveSpd; + if (GameManager.Inst.CurrentInIslandPlayer.GameObject == gameObject) + { + var localMovement = new Vector3(movementInput.x, 0, movementInput.y); + var worldDirection = transform.TransformDirection(localMovement); + + var movement = worldDirection * MoveSpd; + Rb.velocity = new Vector3(movement.x, 0, movement.z); + } + else + { + var predictedPos = GameManager.Inst.CurrentInIslandPlayer.Rb.position + GameManager.Inst.CurrentInIslandPlayer.Rb.velocity; + var moveDir = (predictedPos - transform.position).normalized; + Rb.velocity = new Vector3(moveDir.x, 0, moveDir.z) * MoveSpd; + } } } @@ -327,7 +379,7 @@ namespace BlueWaterProject } else { - rb.isKinematic = true; + Rb.isKinematic = true; } Agent.enabled = false; @@ -431,6 +483,21 @@ namespace BlueWaterProject public void StopNormalAttackCoroutine() => StopCoroutine(nameof(NormalAttackCoroutine)); public bool GetUsedNormalAttackCoroutine() => usedNormalAttackCoroutine; + #endregion + + #region Player input system + + public void OnMove(InputValue value) + { + if (CurrentHp <= 0) + { + Rb.velocity = Vector3.zero; + return; + } + + movementInput = value.Get(); + } + #endregion #region Custom methods @@ -438,19 +505,19 @@ namespace BlueWaterProject private void UseRigidbodyMovement() { UseRigidbody = true; - rb.isKinematic = false; + Rb.isKinematic = false; Agent.enabled = false; } private void UseAgentMovement() { UseRigidbody = false; - rb.isKinematic = true; + Rb.isKinematic = true; Agent.enabled = true; if (Target) return; - MoveTarget(GameManager.Inst.InIslandPlayer.transform.position, MoveSpd, GlobalValue.MAXIMUM_STOP_DISTANCE); + MoveTarget(GameManager.Inst.CurrentInIslandPlayer.Transform.position, MoveSpd, GlobalValue.MAXIMUM_STOP_DISTANCE); } private IEnumerator BeAttacked() diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs index c02210963..099e6c88b 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs @@ -14,8 +14,6 @@ namespace BlueWaterProject [Title("Weapon")] [Required] [SerializeField] private GameObject projectileObj; - [Required] - [SerializeField] private Transform shootLocation; [SerializeField] private float speed = 500f; private Transform objectPoolLocation; @@ -43,7 +41,7 @@ namespace BlueWaterProject var myCenterPos = MyCollider.bounds.center; - var weapon = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent(); + var weapon = Instantiate(projectileObj, MyCollider.bounds.center, Quaternion.identity, objectPoolLocation).GetComponent(); weapon.transform.LookAt(Target.bounds.center); weapon.SetPower(Atk); weapon.GetComponent().AddForce(weapon.transform.forward * speed); diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs index 7170e4ec9..a84fe8040 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs @@ -14,8 +14,6 @@ namespace BlueWaterProject [Title("Weapon")] [Required] [SerializeField] private GameObject projectileObj; - [Required] - [SerializeField] private Transform shootLocation; [SerializeField] private float speed = 500f; //private IObjectPool weaponParticlePool; @@ -57,7 +55,7 @@ namespace BlueWaterProject var targetDir = (Target.bounds.center - myCenterPos).normalized; // targetLookRotation = Quaternion.LookRotation(targetDir); - var particleWeapon = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent(); + var particleWeapon = Instantiate(projectileObj, MyCollider.bounds.center, Quaternion.identity, objectPoolLocation).GetComponent(); particleWeapon.transform.LookAt(Target.bounds.center); particleWeapon.SetPower(Atk); particleWeapon.GetComponent().AddForce(particleWeapon.transform.forward * speed); diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index 81420a6a9..e30614c14 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -1,6 +1,5 @@ using System; using System.Collections; -using System.Collections.Generic; using BehaviorDesigner.Runtime; using Sirenix.OdinInspector; using UnityEngine; @@ -11,7 +10,7 @@ using UnityEngine.UI; // ReSharper disable once CheckNamespace namespace BlueWaterProject { - public class InIslandPlayer : Player, IAnimatorBridge, IAiView, INormalAttack + public class InIslandPlayer : Player, IAnimatorBridge, IAiView, INormalAttack, IInIslandPlayer { #region Properties and variables @@ -88,17 +87,15 @@ namespace BlueWaterProject [SerializeField] private bool beAttacked; [DisableIf("@true")] [SerializeField] private bool isAttacking; - - // Crewmate Data - [field: Title("Crewmate Data")] - [field: SerializeField] public List CrewmateList { get; set; } // 일반 변수 private bool usedNormalAttackCoroutine; private WaitForSeconds waitAtkCooldown; // 컴포넌트 - public Rigidbody Rb { get; private set; } + public GameObject GameObject => gameObject; + public Transform Transform => transform; + public Rigidbody Rb { get; set; } public Collider MyCollider { get; set; } public NavMeshAgent Agent { get; set; } private BehaviorTree bt; @@ -368,9 +365,32 @@ namespace BlueWaterProject Rb.isKinematic = true; } Agent.enabled = false; + + switch (GameManager.Inst.IslandPlayerMode) + { + case GlobalValue.InIslandPlayerMode.NONE: + print("IslandPlayerMode == none error."); + break; + case GlobalValue.InIslandPlayerMode.ONLY_PLAYER: + // 게임 종료 + break; + case GlobalValue.InIslandPlayerMode.CREWMATE: + foreach (var crewmate in GameManager.Inst.CurrentCrewmateList) + { + if (crewmate == null || !crewmate.gameObject.activeSelf || crewmate.CurrentHp <= 0) continue; + + GameManager.Inst.SetCurrentInIslandPlayer(crewmate); + return; + } + + // 게임 종료 + break; + default: + throw new ArgumentOutOfRangeException(); + } - Destroy(hpSlider.gameObject, 2f); - Destroy(gameObject, 2f); + //Destroy(hpSlider.gameObject, 2f); + //Destroy(gameObject, 2f); } // IAnimatorBridge @@ -477,7 +497,7 @@ namespace BlueWaterProject public void UseAgentMovement() { DefensePos = transform.position; - foreach (var crewmate in CrewmateList) + foreach (var crewmate in GameManager.Inst.CurrentCrewmateList) { crewmate.DefensePos = DefensePos; } diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index b12229531..72b29eefb 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/BlueWater/Assets/02.Scripts/GameManager.cs @@ -1,10 +1,7 @@ using System.Collections.Generic; -using BlueWaterProject; using Sirenix.OdinInspector; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.Serialization; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -12,22 +9,29 @@ namespace BlueWaterProject [DefaultExecutionOrder(-1)] public class GameManager : Singleton { - [field: Title("Player")] - public ShipPlayer ShipPlayer { get; private set; } - [field: Required("BlueWater Player Input Action을 넣어주세요.")] - [field: SerializeField] public InputActionAsset PlayerAction { get; private set; } - public InShipPlayer InShipPlayer { get; private set; } - public InIslandPlayer InIslandPlayer { get; set; } + // 섬 안의 플레이어 모드 선택 + [field: Title("InIsland Data")] + [field: SerializeField] public GlobalValue.InIslandPlayerMode IslandPlayerMode { get; private set; } [field: Required("Viking Prefab을 넣어주세요.")] - [field: SerializeField] public GameObject InIslandPlayerPrefab { get; set; } - [field: SerializeField] public List CrewmatePrefabList { get; set; } + [field: SerializeField] public GameObject InIslandPlayerPrefab { get; private set; } + [field: SerializeField] public List CrewmatePrefabList { get; private set; } + [field: SerializeField] public List CurrentCrewmateList { get; set; } + public IInIslandPlayer CurrentInIslandPlayer { get; set; } + + // Player + [field: Title("Player")] + [field: SerializeField] public ShipPlayer ShipPlayer { get; private set; } + [field: SerializeField] public InShipPlayer InShipPlayer { get; private set; } + // Game Data + [Title("Game Data")] [Range(0f, 1f)] [SerializeField] private float slowSpeed = 0.1f; private const string IN_ISLAND_PLAYER_NAME = "InIslandPlayer"; - [Title("Game State")] + // Game State + [field: Title("Game State")] [field: SerializeField] public bool IsInShipMode { get; set; } [field: SerializeField] public bool IsDredgeMode { get; set; } [field: SerializeField] public bool IsTakeAim { get; set; } @@ -63,6 +67,29 @@ namespace BlueWaterProject Time.fixedDeltaTime = 0.02f; } + public void SetCurrentInIslandPlayer(IInIslandPlayer inIslandPlayer) + { + PlayerInput currentPlayerInput; + + if (CurrentInIslandPlayer != null) + { + currentPlayerInput = CurrentInIslandPlayer.Transform.GetComponent(); + if (currentPlayerInput != null) + { + currentPlayerInput.enabled = false; + } + } + + CurrentInIslandPlayer = inIslandPlayer; + InIslandCamera.Inst.SetTarget(inIslandPlayer.Transform); + + currentPlayerInput = CurrentInIslandPlayer.Transform.GetComponent(); + if (currentPlayerInput != null) + { + currentPlayerInput.enabled = true; + } + } + #region Player Mode State switch public void SwitchDredgeMode(bool isOn) diff --git a/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs new file mode 100644 index 000000000..896e4b7b9 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public interface IInIslandPlayer + { + GameObject GameObject { get; } + Transform Transform { get; } + Rigidbody Rb { get; set; } + bool UseRigidbody { get; set; } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs.meta new file mode 100644 index 000000000..b37aaaa6b --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IInIslandPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ae9d1b8ef931b44d83cf4bd5b4ff7f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/SpawnController.cs b/BlueWater/Assets/02.Scripts/SpawnController.cs index f5423d5ff..a545db1f8 100644 --- a/BlueWater/Assets/02.Scripts/SpawnController.cs +++ b/BlueWater/Assets/02.Scripts/SpawnController.cs @@ -24,7 +24,8 @@ namespace BlueWaterProject private GameObject spawnPositionObj; private CinemachineVirtualCamera cinemachineVirtualCamera; - + + private Transform spawnLocation; private string CrewmateIndexInfoMessage => $"0 ~ {GameManager.Inst.CrewmatePrefabList.Count - 1} 숫자를 입력해주세요."; private const string PLAYER_NAME = "Player"; @@ -46,6 +47,12 @@ namespace BlueWaterProject print("Virtual Camera 오브젝트를 찾을 수 없습니다."); return; } + + spawnLocation = GameObject.Find("Characters")?.transform; + if (spawnLocation == null) + { + spawnLocation = new GameObject("Characters").transform; + } var currentSceneName = SceneManager.GetActiveScene().name; if (currentSceneName != "02.Main") @@ -56,7 +63,7 @@ namespace BlueWaterProject private void SpawnInIslandPlayer(Vector3 spawnPos, Quaternion spawnRotation) { - var islandPlayer = Instantiate(GameManager.Inst.InIslandPlayerPrefab, spawnPos, spawnRotation); + var islandPlayer = Instantiate(GameManager.Inst.InIslandPlayerPrefab, spawnPos, spawnRotation, spawnLocation); islandPlayer.name = IN_ISLAND_PLAYER_NAME; islandPlayer.gameObject.SetActive(true); @@ -65,7 +72,6 @@ namespace BlueWaterProject { playerInput = islandPlayer.transform.AddComponent(); } - playerInput.actions = GameManager.Inst.PlayerAction; var desiredActionMap = playerInput.actions.FindActionMap(PLAYER_NAME); if (desiredActionMap == null) @@ -80,7 +86,8 @@ namespace BlueWaterProject { GameManager.Inst.ShipPlayer.GetComponent().enabled = false; } - playerInput.SwitchCurrentActionMap(PLAYER_NAME); + + playerInput.enabled = true; var inIslandPlayer = islandPlayer.GetComponent(); if (inIslandPlayer == null) @@ -92,14 +99,14 @@ namespace BlueWaterProject InIslandCamera.Inst.SetTarget(islandPlayer.transform); - GameManager.Inst.InIslandPlayer = inIslandPlayer; + GameManager.Inst.SetCurrentInIslandPlayer(inIslandPlayer); } [DisableIf("@crewmateIndex >= GameManager.Inst.CrewmatePrefabList.Count || crewmateIndex < 0")] [Button("Crewmate 추가")] private void AddCrewmate() { - if (!GameManager.Inst.InIslandPlayer) return; + if (!GameManager.Inst.CurrentInIslandPlayer.GameObject) return; if (crewmateIndex >= GameManager.Inst.CrewmatePrefabList.Count || crewmateIndex < 0) { @@ -110,7 +117,7 @@ namespace BlueWaterProject for (var i = 0; i < 50; i++) { var randomDirection = new Vector3(Random.Range(-1f, 1f), 0, Random.Range(-1f, 1f)).normalized; - var spawnPos = GameManager.Inst.InIslandPlayer.transform.position + (randomDirection * instantiationDistance); + var spawnPos = GameManager.Inst.CurrentInIslandPlayer.Transform.position + (randomDirection * instantiationDistance); Array.Clear(colliders, 0, MAX_COLLIDER); var size = Physics.OverlapSphereNonAlloc(spawnPos, checkRadius, colliders, checkLayer); @@ -118,10 +125,10 @@ namespace BlueWaterProject if (size != 0) continue; var crewmate = Instantiate(GameManager.Inst.CrewmatePrefabList[crewmateIndex], spawnPos, - GameManager.Inst.CrewmatePrefabList[crewmateIndex].transform.rotation); + GameManager.Inst.CrewmatePrefabList[crewmateIndex].transform.rotation, spawnLocation); crewmate.gameObject.SetActive(true); - GameManager.Inst.InIslandPlayer.CrewmateList.Add(crewmate); + GameManager.Inst.CurrentCrewmateList.Add(crewmate); return; } diff --git a/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs b/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs index b637906fe..bda9668f0 100644 --- a/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs +++ b/BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs @@ -47,5 +47,12 @@ namespace BlueWaterProject TAKE_AIM, IN_SHIP } + + public enum InIslandPlayerMode + { + NONE = -1, + ONLY_PLAYER, + CREWMATE + } } } diff --git a/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs b/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs index c190153d1..27108d225 100644 --- a/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs +++ b/BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs @@ -18,10 +18,21 @@ namespace BlueWaterProject [SerializeField] private LayerMask targetLayer; [SerializeField] private float power; [SerializeField] private float autoDestroyTime = 5f; + private float detectionDistance; private Rigidbody rb; private SphereCollider sphereCollider; private WaitForSeconds waitForSeconds; + + private void OnDrawGizmosSelected() + { + var radius = sphereCollider ? sphereCollider.radius : colliderRadius; + var direction = rb ? rb.velocity.normalized : transform.forward; + + Gizmos.color = Color.red; + Gizmos.DrawWireSphere(transform.position, radius); // Draws the start sphere + Gizmos.DrawLine(transform.position, transform.position + direction * detectionDistance); // Draws the path of the SphereCast + } private void Awake() { @@ -66,8 +77,8 @@ namespace BlueWaterProject direction += Physics.gravity * Time.deltaTime; // Accounts for gravity if enabled direction = direction.normalized; - var detectionDistance = rb.velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame - + detectionDistance = rb.velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame + if (Physics.SphereCast(transform.position, radius, direction, out var hit, detectionDistance, targetLayer)) // Checks if collision will happen { transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision diff --git a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab index e1b49f9ad..b8b99f49d 100644 --- a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab +++ b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4974917693782220124} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0.6532815, y: 0.27059805, z: -0.27059805, w: 0.6532815} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2677528810302803348} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: -45} --- !u!212 &2067129615080396003 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab b/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab index 8bc472006..2220ab1b4 100644 --- a/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab +++ b/BlueWater/Assets/05.Prefabs/Weapon/OrkFireball/FireBallSoftBlueOBJ.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 128572} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.313633, y: 5.892903, z: -13.319157} + m_LocalPosition: {x: 8.638, y: 5.892903, z: -13.319157} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index e0511c7a7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4d9b575363cdb56408d92f7d7f0e5216 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta deleted file mode 100644 index f5aa0671a..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 171c5051d845c4545a6679cdcb9e8290 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta deleted file mode 100644 index c69333695..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e381f1e638a8aec4dbd9a7be673b56e2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta deleted file mode 100644 index 732786965..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 01db744855bbae74481522d48fd63008 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta deleted file mode 100644 index df78745df..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e5f625ae60b99fe4ab78d44cfb58ce5a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta deleted file mode 100644 index 2cb925d8d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b606e558541a7b14593ea370c1a31da1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta deleted file mode 100644 index a7f1c72c4..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c13a7e89fcc1f5544b4debda9d682854 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta deleted file mode 100644 index 2eee81088..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9d6eeb26838ae2140a98c7b012c07610 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta deleted file mode 100644 index e6aed81e8..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 46615cbdbe482664aaf8d3fe2af274c8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta deleted file mode 100644 index 114b57f38..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 92b78aa6c7b02924c907a69383e7722f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta deleted file mode 100644 index e3e83c440..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 169dbd692ce7b8a4083e3e77421ce8d0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta deleted file mode 100644 index a4685751c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a785472f49cbc0419f4e80050360f8a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta deleted file mode 100644 index fbd8fb4f7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: acc7135a62c70bb40bfd196dcc0dbf58 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta deleted file mode 100644 index f70412ace..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 43b92591c923d1543bc95a9b89918a6c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta deleted file mode 100644 index 483b1b4ee..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c1d290c89eb9a146a0c3fc3c5d97639 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta deleted file mode 100644 index ab6547345..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 79d6a8f7106f5a949afdf0f9fce6e5c9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index 779ce70d7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5db5e6540b70aa44a8b8f0be7cbc03a4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta deleted file mode 100644 index d7e98901c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b81586c5bf3938042babe319ccb6b693 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta deleted file mode 100644 index e77cf7050..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 29400b82342c15b44bebd36e5f253c7a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta deleted file mode 100644 index fa28f522d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e3dca3dc2724503479b532ec6f801f2f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta deleted file mode 100644 index 7edcebbc6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5a3da110bff34d54eb93d1c3c7755741 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta deleted file mode 100644 index 8a0a24231..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 590bfaf71ac68024e96342bd38a2e799 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta deleted file mode 100644 index c0d6f8b51..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 89c6283ed4a7a914db4ed32d9fe4be1b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta deleted file mode 100644 index 3058450f9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2133c1709cbeab043b2c0d4a09f8c560 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta deleted file mode 100644 index 43bbdb349..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 61a9883a71fe42f4cb3a2538927c5b54 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta deleted file mode 100644 index 142c11269..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 107656dc7c8decd4b98ddacdb4c63d9c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta deleted file mode 100644 index 90e706ffe..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 69578b34b0b99fd408db1f26e709204b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta deleted file mode 100644 index f84ff6cae..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 890975c726da4f447a9fdbb24e0ac5a6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta deleted file mode 100644 index 61ed6b0ff..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1977e46ddf171054ba06e70c3a17b562 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta deleted file mode 100644 index a1d105521..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d04dae1efd4c20f42801fa99bfb48c71 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta deleted file mode 100644 index c7f0244c3..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f48e38a1694a4a94ba7bfa99b5bb8da7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta deleted file mode 100644 index 6fcb0ff62..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a760ee77bdfe6fc4fbfeb4e74d81e9ee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta deleted file mode 100644 index 6e8698d0c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7ac1fca502db8634ca8a220957ce0efe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta deleted file mode 100644 index e3d258ed1..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 03276c81a3b7e1f4f8b9a2c42d29ccb5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta deleted file mode 100644 index 23f5f93d3..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c2fe1e05f53ce540a7e6629e37e62ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta deleted file mode 100644 index 0106a1a8b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 41dc081f41d06ad4cb3a976e3bc784ff -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta deleted file mode 100644 index 003412ed2..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7224afe475473f5479a4be84354c0ffe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta deleted file mode 100644 index 5b2af6965..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6566ea9453ea9a54c8adda4ce157bfe5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta deleted file mode 100644 index 3abdc52eb..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8a6eaa4e4e356664da332e906c4116ca -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta deleted file mode 100644 index 8ef2b7160..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d78d339535406c443be8ab962fe3faed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta deleted file mode 100644 index fb47a3b13..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6556a12f622b9f84a87c93e43a05c57a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta deleted file mode 100644 index 7d71c3032..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7adde0d8ab9d11c4f8958df473963096 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta deleted file mode 100644 index 1ffa302e6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2e0d514b37da90b43aca77d71d4ea274 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta deleted file mode 100644 index 3338c5cab..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f73b81d6a28009a4d8a6cfa24e4f6670 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta deleted file mode 100644 index 404d7df03..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 14eb0de10b56d7d48aa47c34c085763a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta deleted file mode 100644 index 5fc7b1dd0..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bab8f8e2fd66cc94eb0381c12da4f8a1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta deleted file mode 100644 index 7c9911a59..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 853d51cc63a44614b8aa108c20970d53 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta deleted file mode 100644 index e738a83c6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0acaab50ea80e2740907f9fb8e96d5cb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta deleted file mode 100644 index 7b8a0965e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 00d3be9741969ee4abb41a0d36893d12 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta deleted file mode 100644 index b5500005c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a84c2fae02ab66e4bb10f4b632b4e59f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta deleted file mode 100644 index cb39d0c46..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ff46b33770bc0e04da5553db516b2791 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta deleted file mode 100644 index 1178f5136..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d4762985b08cf424d8a389bd106e9c41 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta deleted file mode 100644 index db86fe4fa..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 82f4200e470c7a2459f54ef829fd130b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta deleted file mode 100644 index 875d48c5f..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8f7926653749bc042b66acaf162cb653 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta deleted file mode 100644 index 322dacae5..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d8244e47333fea34cabbe75f30b489cd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta deleted file mode 100644 index bd5783f2c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a60eb26401f5d2e40a3f8ad3a0cdd2ae -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta deleted file mode 100644 index d72afa945..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d20f46daec1cff04b8767c37cbc64dfd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta deleted file mode 100644 index 74a4995e0..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1e0bc8e64ca5a204ab01fcb065ad3ea4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta deleted file mode 100644 index 53088a15e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0439b345dc19afc4e9e38a45964c21d2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta deleted file mode 100644 index 4cbcf2da1..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2f034bb78093baf41a5b14693eefb6ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta deleted file mode 100644 index 7333ab59c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 37a76039173f99b4fac971349e64b845 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta deleted file mode 100644 index 0b16186df..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 12f5d0647e98dad4cba5773dbfe617ee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta deleted file mode 100644 index 8c7dd3ad8..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cfa06a72ad668b64e84eb67a6653c27a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta deleted file mode 100644 index c61dba0db..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5f372c15f48325e4da788631806fbd37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta deleted file mode 100644 index 95b095986..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d48ea718ba1476a4baa5cd9e66f6ed78 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta deleted file mode 100644 index 0e841d4ce..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 21b40e7d71233864788700238fab175d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta deleted file mode 100644 index 91b6a3344..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 44688b79fc3aa6a44b5c47a92a453722 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta deleted file mode 100644 index e419dfc71..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c6b5601000159b44594b95b58dc95e5e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta deleted file mode 100644 index d9d990aa2..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1f67bb1f7a0ccac4bacceb5680482ca2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta deleted file mode 100644 index e9931906d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d418d21b145ca9e4289690cca70d800d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta deleted file mode 100644 index 0f17c6184..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ba01c8813d9d8e645a60034600445394 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta deleted file mode 100644 index b9a67ae55..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 373fa280b9df46f45901d7ac3fea3beb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta deleted file mode 100644 index d773fb0a6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d0b0bdbd9366c9e4fba085f618ca54ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta deleted file mode 100644 index ecff8931e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c59e446cf466a424daed6859d731bc80 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta deleted file mode 100644 index 0c2561c1b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 494657561b44a1c489255e7049d56ad7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta deleted file mode 100644 index 434ea16b9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0bfa1827c30ff98418b3b36047505a15 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index cb4892c99..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d3504844ffe57564caa188ff0f30bae8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta deleted file mode 100644 index b29068aeb..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 40756660825b35747929372b595fa82f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta deleted file mode 100644 index 1a071722c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c3c34eebf26184b4fb5b0a9dfd25567f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta deleted file mode 100644 index db5cf560a..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 185ff7b46f2f79a4287cdf5efb411fbb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta deleted file mode 100644 index 8db8698b9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 89146e181822a34479674ffc071163df -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta deleted file mode 100644 index 99afc5437..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 630bf89a42bf760458299c96a71e7f04 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta deleted file mode 100644 index 1f755345b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8302722bd792b384e898fed750f555a9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From e5e0f03e3d0eea1adcd9179235b999be77178390 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 16:19:40 +0900 Subject: [PATCH 6/7] =?UTF-8?q?Physics=20=EC=88=98=EC=A0=95=20crewmate=20=20Enemy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Restart 추가 중 + uiCanvas -> worldSpaceCanvas 수정 + OverlayCanvas 추가 --- .../Assets/01.Scenes/03.Stage_Test.unity | 269 +++++++++++++++++- .../02.Scripts/Character/Crewmate/Crewmate.cs | 10 +- .../02.Scripts/Character/Enemy/Enemy.cs | 10 +- .../Character/Player/Type/InIslandPlayer.cs | 10 +- .../Assets/02.Scripts/Ui/RestartPopupUi.cs | 17 ++ .../02.Scripts/Ui/RestartPopupUi.cs.meta | 11 + .../ProjectSettings/DynamicsManager.asset | 2 +- 7 files changed, 307 insertions(+), 22 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs create mode 100644 BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index ec577e17e..15d58f663 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -2920,6 +2920,87 @@ Transform: - {fileID: 302959423} m_Father: {fileID: 971043561} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &393497260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 393497261} + - component: {fileID: 393497263} + - component: {fileID: 393497262} + m_Layer: 5 + m_Name: RestartPopUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &393497261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + 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: + - {fileID: 1236881601} + m_Father: {fileID: 1063731841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &393497262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6e074aea35c9d74cbebeef6f096b12d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &393497263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &417739631 GameObject: m_ObjectHideFlags: 0 @@ -3221,7 +3302,6 @@ MonoBehaviour: k__BackingField: 0 beAttacked: 0 isAttacking: 0 - k__BackingField: [] --- !u!114 &418278343 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6860,13 +6940,13 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: 1 - k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, - type: 3} k__BackingField: {fileID: 418278336} k__BackingField: - {fileID: 1362034959} - {fileID: 302959427} - currentInIslandPlayer: {fileID: 0} + k__BackingField: [] + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} slowSpeed: 0.1 k__BackingField: 0 k__BackingField: 0 @@ -7418,6 +7498,108 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1054195006} m_PrefabAsset: {fileID: 0} +--- !u!1 &1063731837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1063731841} + - component: {fileID: 1063731840} + - component: {fileID: 1063731839} + - component: {fileID: 1063731838} + m_Layer: 5 + m_Name: OverlayCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1063731838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2238015 +--- !u!114 &1063731839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1063731840 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 334724478} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: -1197429611 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1063731841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 393497261} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1068410569 GameObject: m_ObjectHideFlags: 0 @@ -7594,7 +7776,7 @@ GameObject: - component: {fileID: 1104839424} - component: {fileID: 1104839423} m_Layer: 5 - m_Name: UiCanvas + m_Name: WorldSpaceCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8217,6 +8399,81 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &1236881600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1236881601} + - component: {fileID: 1236881603} + - component: {fileID: 1236881602} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1236881601 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + 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: 393497261} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1236881602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + 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: 0, g: 0, b: 0, a: 0.5882353} + 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 +--- !u!222 &1236881603 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + m_CullTransparentMesh: 1 --- !u!1001 &1241095002 PrefabInstance: m_ObjectHideFlags: 0 @@ -9806,7 +10063,6 @@ MonoBehaviour: m_Bits: 0 projectileObj: {fileID: 6365080210048648475, guid: d101d38de657e0b42aa2aea84f8590c7, type: 3} - shootLocation: {fileID: 214533790} speed: 500 --- !u!114 &1362034960 MonoBehaviour: @@ -23756,6 +24012,7 @@ SceneRoots: - {fileID: 879331195} - {fileID: 269653247} - {fileID: 1104839426} + - {fileID: 1063731841} - {fileID: 971043561} - {fileID: 1068410571} - {fileID: 1805195289} diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index 928f062ab..fb96dc7d7 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -106,7 +106,7 @@ namespace BlueWaterProject private BehaviorTree bt; private Transform unitRoot; protected Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash protected static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -151,16 +151,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index ab7ffbd8e..4e71e646d 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -106,7 +106,7 @@ namespace BlueWaterProject protected BehaviorTree bt; private Transform unitRoot; protected Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash protected static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -228,16 +228,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index e30614c14..f397450d8 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -101,7 +101,7 @@ namespace BlueWaterProject private BehaviorTree bt; private Transform unitRoot; private Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash private static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -178,16 +178,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs new file mode 100644 index 000000000..4bd655a5f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs @@ -0,0 +1,17 @@ +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.SceneManagement; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public class RestartPopupUi : MonoBehaviour + { + private void OnInteraction(InputValue value) + { + var currentSceneIndex = SceneManager.GetActiveScene().buildIndex; + + SceneManager.LoadScene(currentSceneIndex); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta new file mode 100644 index 000000000..d629be695 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6e074aea35c9d74cbebeef6f096b12d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 9d0ea37d4..a79ee00fd 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008062000000000000000000008222000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008262000000000000000000008262000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 From 3a364e953a5ef7ee30bc2f1036de66b7f5c8149b Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Tue, 24 Oct 2023 11:22:07 +0900 Subject: [PATCH 7/7] =?UTF-8?q?closed=20#40=20=EC=A3=BD=EC=97=88=EC=9D=84?= =?UTF-8?q?=20=EB=95=8C,=20E=ED=82=A4=EB=A1=9C=20=EC=9E=AC=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EB=B2=84=ED=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 텐텐 무기(Dagger) 회전값 수정 --- .../02.Scripts/Character/Crewmate/Crewmate.cs | 22 ++++++++++++++----- .../Character/Player/Type/InIslandPlayer.cs | 15 ++++++------- .../Assets/05.Prefabs/Weapon/Dagger.prefab | 4 ++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index fb96dc7d7..ad4b89be6 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -382,6 +382,22 @@ namespace BlueWaterProject Rb.isKinematic = true; } Agent.enabled = false; + + if (GameManager.Inst.CurrentInIslandPlayer == (IInIslandPlayer)this) + { + foreach (var crewmate in GameManager.Inst.CurrentCrewmateList) + { + if (crewmate == null || !crewmate.gameObject.activeSelf || crewmate.CurrentHp <= 0) continue; + + GameManager.Inst.SetCurrentInIslandPlayer(crewmate); + return; + } + + // 게임 종료 + var overlayCanvas = GameObject.Find("OverlayCanvas"); + overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true); + return; + } Destroy(hpSlider.gameObject, 2f); Destroy(gameObject, 2f); @@ -489,11 +505,7 @@ namespace BlueWaterProject public void OnMove(InputValue value) { - if (CurrentHp <= 0) - { - Rb.velocity = Vector3.zero; - return; - } + if (CurrentHp <= 0) return; movementInput = value.Get(); } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index f397450d8..5fa8c9d4d 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -366,6 +366,8 @@ namespace BlueWaterProject } Agent.enabled = false; + var overlayCanvas = GameObject.Find("OverlayCanvas"); + switch (GameManager.Inst.IslandPlayerMode) { case GlobalValue.InIslandPlayerMode.NONE: @@ -373,7 +375,8 @@ namespace BlueWaterProject break; case GlobalValue.InIslandPlayerMode.ONLY_PLAYER: // 게임 종료 - break; + overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true); + return; case GlobalValue.InIslandPlayerMode.CREWMATE: foreach (var crewmate in GameManager.Inst.CurrentCrewmateList) { @@ -382,9 +385,9 @@ namespace BlueWaterProject GameManager.Inst.SetCurrentInIslandPlayer(crewmate); return; } - // 게임 종료 - break; + overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true); + return; default: throw new ArgumentOutOfRangeException(); } @@ -452,11 +455,7 @@ namespace BlueWaterProject public override void OnMove(InputValue value) { - if (CurrentHp <= 0) - { - Rb.velocity = Vector3.zero; - return; - } + if (CurrentHp <= 0) return; base.OnMove(value); } diff --git a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab index b8b99f49d..1bf7ac355 100644 --- a/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab +++ b/BlueWater/Assets/05.Prefabs/Weapon/Dagger.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4974917693782220124} serializedVersion: 2 - m_LocalRotation: {x: 0.6532815, y: 0.27059805, z: -0.27059805, w: 0.6532815} + m_LocalRotation: {x: 0.86602545, y: 0, z: 0, w: 0.49999994} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2677528810302803348} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: -45} + m_LocalEulerAnglesHint: {x: 120, y: 0, z: 0} --- !u!212 &2067129615080396003 SpriteRenderer: m_ObjectHideFlags: 0