diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 4f503f3c8..f19f81013 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -11006,7 +11006,7 @@ MonoBehaviour: k__BackingField: {fileID: 36953787} k__BackingField: {fileID: 1011270532} k__BackingField: {fileID: 1213070730} - k__BackingField: DailyBgm1 + k__BackingField: DailyBgm2 --- !u!4 &1597727070 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Character/Enemy/Boss/BossSkillController.cs b/Assets/02.Scripts/Character/Enemy/Boss/BossSkillController.cs index 78405029f..c82d28345 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/BossSkillController.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/BossSkillController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Enemies.Bosses @@ -67,6 +68,7 @@ namespace BlueWater.Enemies.Bosses /// 사용하기 전에 CanSkill() 함수를 통해서 사용이 가능한 스킬인지 먼저 체크해야 합니다. /// /// + [Button("스킬 사용")] public void ActivateSkill(string skillName) { if (!_instantiateSkillDictionary.TryGetValue(skillName, out var skill)) diff --git a/Assets/02.Scripts/ProjectileController.cs b/Assets/02.Scripts/ProjectileController.cs index 48e7b62f3..aee263766 100644 --- a/Assets/02.Scripts/ProjectileController.cs +++ b/Assets/02.Scripts/ProjectileController.cs @@ -52,6 +52,7 @@ namespace BlueWater private float _detectionDistance; private Collider[] _hitColliders; + private bool _isHitCheckRealtime; public Action OnHitAction; @@ -103,17 +104,14 @@ namespace BlueWater //var direction = _rigidbody.linearVelocity.normalized; _detectionDistance = _rigidbody.linearVelocity.magnitude * Time.deltaTime; + + if (!_isHitCheckRealtime) return; + var hitCount = Physics.OverlapSphereNonAlloc(transform.position, SphereRadius, _hitColliders, _targetLayer, QueryTriggerInteraction.Collide); if (hitCount == 0) return; // transform.position = raycastHit.point + raycastHit.normal * _collideOffset; var hitCollider = _hitColliders[0]; - if (hitCollider.gameObject.layer == LayerMask.NameToLayer("Props") - && !hitCollider.CompareTag("DamageableProps")) - { - return; - } - var trailParticles = GetComponentsInChildren(); foreach (var element in trailParticles) { @@ -140,10 +138,46 @@ namespace BlueWater Destroy(gameObject); } - public void Initialize(int attackDamage, LayerMask targetLayer, Action onHitAction = null) + public void DoAttack() + { + _hitColliders = new Collider[8]; + var hitCount = Physics.OverlapSphereNonAlloc(transform.position, SphereRadius, _hitColliders, _targetLayer, QueryTriggerInteraction.Collide); + + // transform.position = raycastHit.point + raycastHit.normal * _collideOffset; + var trailParticles = GetComponentsInChildren(); + foreach (var element in trailParticles) + { + if (!element.gameObject.name.Contains("Trail")) continue; + + element.transform.SetParent(null); + Destroy(element.gameObject, 2f); + } + + for (var i = 0; i < hitCount; i++) + { + // TODO : HitBox가 레이어로 설정되어있으도, 부모 객체 Player를 계속 가져오는 버그가 있음 + var iDamageable = _hitColliders[i].GetComponentInParent(); + if (iDamageable == null || !iDamageable.CanDamage()) continue; + + iDamageable.TakeDamage(_attackDamage); + OnHitAction?.Invoke(); + } + + var impactParticle = Instantiate(ImpactParticle, transform.position, Quaternion.identity); + + Destroy(_projectilePrefab, 3f); + if (impactParticle) + { + Destroy(impactParticle, 3.5f); + } + Destroy(gameObject); + } + + public void Initialize(int attackDamage, LayerMask targetLayer, bool isHitCheckRealtime = true, Action onHitAction = null) { _attackDamage = attackDamage; _targetLayer = targetLayer; + _isHitCheckRealtime = isHitCheckRealtime; OnHitAction = onHitAction; } diff --git a/Assets/02.Scripts/Prop/GateOfSpike.cs b/Assets/02.Scripts/Prop/GateOfSpike.cs index 6ee667c75..b6a5312cb 100644 --- a/Assets/02.Scripts/Prop/GateOfSpike.cs +++ b/Assets/02.Scripts/Prop/GateOfSpike.cs @@ -80,9 +80,11 @@ namespace BlueWater yield return null; } + _projectileObject.transform.position = _destination; _indicator.material.SetFloat(_fillHash, 1f); HideIndicator(); + _projectileObject.DoAttack(); Destroy(gameObject, 3.5f); } diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset index f42f08f72..9118dbd92 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/BullChargeData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 k__BackingField: 25 k__BackingField: 3 k__BackingField: 10 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/HammerSlamData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/HammerSlamData.asset index 9e1b25d9f..999bb30b8 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/HammerSlamData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/HammerSlamData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 k__BackingField: 3 k__BackingField: 5 k__BackingField: 0.05 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/MeteorSwingData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/MeteorSwingData.asset index d35a8cb20..ae757761f 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/MeteorSwingData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/MeteorSwingData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 k__BackingField: 180 k__BackingField: {fileID: 194276104676398060, guid: b72f1dbff188be247a8253665b2c1b26, type: 3} k__BackingField: 5 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SeismicThrustData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SeismicThrustData.asset index 519c4412f..a90c06f01 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SeismicThrustData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SeismicThrustData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 k__BackingField: 3 k__BackingField: {fileID: 4571145888420713692, guid: 783e2b88976de334696bcd02854292ba, type: 3} k__BackingField: 10 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SkyFallSmashData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SkyFallSmashData.asset index 68648cdc2..810d828a7 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SkyFallSmashData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/Rhinoceros/SkyFallSmashData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 k__BackingField: 0.1 k__BackingField: 30 k__BackingField: 2 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/GateOfSpikesData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/GateOfSpikesData.asset index 68ce1523d..e4d089c56 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/GateOfSpikesData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/GateOfSpikesData.asset @@ -22,9 +22,9 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2496 + m_Bits: 67776 k__BackingField: {fileID: 9002322086633083442, guid: 90f6fd643c61df44a908c9d621fd7827, type: 3} - k__BackingField: 10 + k__BackingField: 15 k__BackingField: 1 k__BackingField: serializedVersion: 2 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MiniSingleRollData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MiniSingleRollData.asset index 0bd4d1079..dae5114f7 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MiniSingleRollData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MiniSingleRollData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2432 + m_Bits: 67712 k__BackingField: serializedVersion: 2 m_Bits: 128 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MultiThrowSpikesData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MultiThrowSpikesData.asset index b3ffef86e..8e42a91fa 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MultiThrowSpikesData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/MultiThrowSpikesData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2432 + m_Bits: 67712 k__BackingField: {fileID: 194276104676398060, guid: 74d380cc223e6a5419f3aa88df2d767c, type: 3} k__BackingField: 4 k__BackingField: 0.5 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SingleRollData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SingleRollData.asset index 72348749b..5683684bb 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SingleRollData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SingleRollData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2432 + m_Bits: 67712 k__BackingField: serializedVersion: 2 m_Bits: 128 diff --git a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SpikeBarrageData.asset b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SpikeBarrageData.asset index 53e1a15da..a811d128e 100644 --- a/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SpikeBarrageData.asset +++ b/Assets/02.Scripts/ScriptableObject/Skill/Enemy/Boss/SandMole/SpikeBarrageData.asset @@ -22,7 +22,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: serializedVersion: 2 - m_Bits: 2432 + m_Bits: 67712 k__BackingField: 1 k__BackingField: 1 k__BackingField: {fileID: 194276104676398060, guid: 74d380cc223e6a5419f3aa88df2d767c, type: 3} diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs index 7b0d3934c..da4387e92 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/GateOfSpikes.cs @@ -82,7 +82,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills _spikes.Add(randomPosition); var spike = Instantiate(_gateOfSpikesData.SpikePrefab, spikeSpawnPosition, Quaternion.identity, _particleInstantiateLocation).GetComponent(); - spike.GetComponentInChildren().Initialize(_gateOfSpikesData.Damage, _gateOfSpikesData.TargetLayer); + spike.GetComponentInChildren().Initialize(_gateOfSpikesData.Damage, _gateOfSpikesData.TargetLayer, false); spike.Initialize(randomPosition); } diff --git a/Assets/04.Materials/TransparentLit.mat b/Assets/04.Materials/TransparentLit.mat index 61abb0745..f51d2fad7 100644 --- a/Assets/04.Materials/TransparentLit.mat +++ b/Assets/04.Materials/TransparentLit.mat @@ -38,7 +38,6 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly - - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab index 5f18c640d..0d90d7f46 100644 --- a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab @@ -554,7 +554,7 @@ MonoBehaviour: k__BackingField: 2 k__BackingField: serializedVersion: 2 - m_Bits: 4352 + m_Bits: 69632 k__BackingField: serializedVersion: 2 m_Bits: 32832 @@ -576,6 +576,7 @@ MonoBehaviour: k__BackingField: 4 k__BackingField: 0 k__BackingField: 0.5 + k__BackingField: 0 --- !u!114 &3677775080446906429 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Particles/Enemies/Bosses/Rhinoceros/MeteorParticle.prefab b/Assets/05.Prefabs/Particles/Enemies/Bosses/Rhinoceros/MeteorParticle.prefab index d1655206d..4e48dcc5b 100644 --- a/Assets/05.Prefabs/Particles/Enemies/Bosses/Rhinoceros/MeteorParticle.prefab +++ b/Assets/05.Prefabs/Particles/Enemies/Bosses/Rhinoceros/MeteorParticle.prefab @@ -100,10 +100,10 @@ MonoBehaviour: _muzzleParticle: {fileID: 0} k__BackingField: {fileID: 151374, guid: 349d61d7e99fa484bb25bbffddabd8bc, type: 3} _colliderRadius: 0.5 - _collideOffset: 0 _attackDamage: 1 _targetLayer: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 _useAutoDestroy: 1 _autoDestroyTime: 10 + _awakeSfxName: diff --git a/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/GateOfSpikeParticle.prefab b/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/GateOfSpikeParticle.prefab index bdc937bf0..2de83b6e0 100644 --- a/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/GateOfSpikeParticle.prefab +++ b/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/GateOfSpikeParticle.prefab @@ -57,8 +57,8 @@ Rigidbody: m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 1 + m_IsKinematic: 1 + m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 --- !u!135 &8035217722497169373 @@ -103,6 +103,7 @@ MonoBehaviour: _attackDamage: 1 _targetLayer: serializedVersion: 2 - m_Bits: 2496 + m_Bits: 2240 _useAutoDestroy: 1 _autoDestroyTime: 10 + _awakeSfxName: diff --git a/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/SpikeParticle.prefab b/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/SpikeParticle.prefab index 6ab4096b7..6c0033a36 100644 --- a/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/SpikeParticle.prefab +++ b/Assets/05.Prefabs/Particles/Enemies/Bosses/SandMole/SpikeParticle.prefab @@ -103,7 +103,7 @@ MonoBehaviour: _attackDamage: 1 _targetLayer: serializedVersion: 2 - m_Bits: 2432 + m_Bits: 2176 _useAutoDestroy: 1 _autoDestroyTime: 10 _awakeSfxName: ThrowSpike diff --git a/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab b/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab index 3d7614a66..1b2f49ec6 100644 --- a/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab +++ b/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7986070582027999988} - component: {fileID: 2892108968249248585} - component: {fileID: 1772409705626034443} - m_Layer: 8 + m_Layer: 16 m_Name: BaseDamageableProps m_TagString: DamageableProps m_Icon: {fileID: 0} @@ -92,7 +92,7 @@ GameObject: m_Component: - component: {fileID: 7438534416270888028} - component: {fileID: 3580758810857167321} - m_Layer: 8 + m_Layer: 0 m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab b/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab index 54138fe2a..70769eb5d 100644 --- a/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab +++ b/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6229300703101880482} - component: {fileID: 5119753316800573436} - m_Layer: 8 + m_Layer: 0 m_Name: Shadow m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: m_Component: - component: {fileID: 1426941151981288099} - component: {fileID: 6370181286260610806} - m_Layer: 8 + m_Layer: 0 m_Name: Indicator m_TagString: Untagged m_Icon: {fileID: 0} @@ -179,6 +179,10 @@ PrefabInstance: propertyPath: m_Name value: Rockfall objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} propertyPath: m_LocalScale.x value: 2 @@ -207,6 +211,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7835622629792856689, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7835622629792856689, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} propertyPath: m_IsActive value: 1 @@ -305,7 +313,7 @@ MonoBehaviour: _isUsingIndicator: 1 _targetLayer: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 67584 _groundLayer: serializedVersion: 2 m_Bits: 64 diff --git a/Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab b/Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab index de9d349e6..56be83858 100644 --- a/Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab +++ b/Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab @@ -60,10 +60,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2752040085647730666, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3210918493867778633, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3} propertyPath: m_Name value: SummerGrass01 objectReference: {fileID: 0} + - target: {fileID: 3210918493867778633, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} - target: {fileID: 3210918493867778633, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3} propertyPath: m_TagString value: DamageableProps diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.0.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.0.unitypackage.meta new file mode 100644 index 000000000..3bb253ddf --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59c5c73275d5dc24e86b15fa0c096fc6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.1.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.1.unitypackage.meta new file mode 100644 index 000000000..b2625727d --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aedd64c71808f2744a5d7548cc71ab31 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.2.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.2.unitypackage.meta new file mode 100644 index 000000000..61504de3b --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.2.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a421a1d40bb6873448fb56216aceb0db +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.3.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.3.unitypackage.meta new file mode 100644 index 000000000..419b185ff --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.3.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0ea7b4db6a72ab478fb5882f6701d4e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.4.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.4.unitypackage.meta new file mode 100644 index 000000000..9213168c1 --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.4.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8687348a7454d414395b305a8d3ee5b9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.5.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.5.unitypackage.meta new file mode 100644 index 000000000..91bed18c2 --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.5.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aabe8f32671273c4bbd2b89451c457eb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.6.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.6.unitypackage.meta new file mode 100644 index 000000000..36120b8ee --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.6.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b049f0ecf916d24db335df912c531d7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.unitypackage.meta b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.unitypackage.meta new file mode 100644 index 000000000..0847df380 --- /dev/null +++ b/Assets/AnimateUIMaterials-main/Releases/Animate UI Materials 1.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5de603c9aab95b04d8ebb1b492b94898 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta b/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta new file mode 100644 index 000000000..a9c2e2131 --- /dev/null +++ b/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d7c4217783978e4abe6496ac71eee94 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Icons - Picto Total Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta b/Assets/Icons - Picto Total Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta new file mode 100644 index 000000000..3fa73e15e --- /dev/null +++ b/Assets/Icons - Picto Total Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 687baaea481bf4234b879dce13527276 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta b/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta new file mode 100644 index 000000000..614e98f98 --- /dev/null +++ b/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 617b3f1032a08c14ebfedfa340767cdf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 000000000..1eadf09a3 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 000000000..f073d2ab4 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 000000000..130722af7 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 000000000..f9b8ed82b --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 000000000..aa9b82a14 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 410a8ae13e6a3724ebf4f639e26ffa26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/HotReload_BuildInfo.json.meta b/Assets/StreamingAssets/HotReload_BuildInfo.json.meta new file mode 100644 index 000000000..e104ed23a --- /dev/null +++ b/Assets/StreamingAssets/HotReload_BuildInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27a762b0337996843b33a98c4c1f03b8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta b/Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta new file mode 100644 index 000000000..52b74fd8e --- /dev/null +++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f1b9c7f4731e2d44af6b3606190070b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta b/Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta new file mode 100644 index 000000000..f263fd333 --- /dev/null +++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c226d4e6697573345932a7bf39dd615a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta b/Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta new file mode 100644 index 000000000..384510c7b --- /dev/null +++ b/Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3643c0d76ec153646b1203880bfb64ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 8c0e6a014..176c6a276 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 - m_LayerCollisionMatrix: ff3f000001000000010000000100000001000000010000000167000001670000c1670000c1010000c10100000100000001000000c1210000c00100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000067010000670100c0670100c0010100c00101000000000000000000c0210100c001010000000000c0670100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3b1c1db95..c288b6a01 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.2.3.0 + bundleVersion: 0.2.3.1 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} metroInputSource: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 0d3c43527..71675a3fc 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -24,7 +24,7 @@ TagManager: - Item - Npc - ClickGround - - + - DamageableProps - - -