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

수정사항 내용 참고

Browse Source 
+ 타이탄 슬라임 젬스톤 드랍 추가 (관련 excel, json, so 추가)
+ 아이템 프리팹 각도 수정
+ GroundFog Queue 2999
+ FlashAndShadowSeeThroughLit Queue 3001
+ SandMole 가시 던지기 애니메이션 변경
+ SandMole 맵에 부서지는 오브젝트 Spike 배치
This commit is contained in:
Nam Tae Gun 2024-06-29 00:35:10 +09:00
parent ed44b6f168
commit 2c1c80660c
30 changed files with 1722 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Assets/01.Scenes/02.Combat.unity
View File

@ -1289,7 +1289,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 65495
m_Bits: 131031
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -2214,6 +2214,63 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 305420765}
m_CullTransparentMesh: 0
--- !u!1001 &345789251
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2252586209868520252, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_Name
value: ItemManager
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9c7980309400054090fd241ac425802, type: 3}
--- !u!1 &349901980
GameObject:
m_ObjectHideFlags: 0
@ -7147,7 +7204,8 @@ PrefabInstance:
value:
objectReference: {fileID: 370354195}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 3768980608318584728, guid: 39e32b91cc570794e9e843b39f89e400, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 39e32b91cc570794e9e843b39f89e400, type: 3}
@ -18841,63 +18899,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &4401038241568057119
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2252586209868520252, guid: e9c7980309400054090fd241ac425802, type: 3}
propertyPath: m_Name
value: ItemManager
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9c7980309400054090fd241ac425802, type: 3}
--- !u!1 &4401505251626188150
GameObject:
m_ObjectHideFlags: 0
@ -23754,8 +23755,8 @@ SceneRoots:
- {fileID: 7155618029629697249}
- {fileID: 6180071462390754576}
- {fileID: 7398549143365133110}
- {fileID: 4401038241568057119}
- {fileID: 7461294560137099736}
- {fileID: 345789251}
- {fileID: 1597727070}
- {fileID: 1461902905}
- {fileID: 549059392}

5
Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs
View File

@ -36,7 +36,10 @@ namespace BlueWater.Enemies.Bosses.SandMole
Spin,
SpinReady,
SpinReady2,
Stun
Stun,
ShootingStart,
ShootingIdle,
ShootingEnd
}
public class SandMole : SpineBoss

1
Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs
View File

@ -1,6 +1,5 @@
using BlueWater.Items;
using BlueWater.Maps;
using BlueWater.Uis;
using Sirenix.OdinInspector;
using UnityEngine;

32
Assets/02.Scripts/Item/ItemManager.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Sirenix.OdinInspector;
using UnityEngine;
@ -16,6 +17,15 @@ namespace BlueWater.Items
[SerializeField, Required]
private ItemDropTableSo _itemDropTableSo;
private Dictionary<int, ItemDropTable> _itemDropTableDictionary;
[Title("드롭 아이템 설정")]
[SerializeField]
private float _randomDropRadius = 3f;
[SerializeField]
private float _minSeparationDistance = 1.5f;
private const int MaxAttempts = 1000;
protected override void OnAwake()
{
@ -45,23 +55,37 @@ namespace BlueWater.Items
if (itemDropTable == null) return;
var droppedItemList = itemDropTable.GetDroppedItemList();
var droppedPositions = new List<Vector3>();
foreach (var element in droppedItemList)
{
var newDropPositionX = Random.Range(dropPosition.x - 1f, dropPosition.x + 1f);
var newDropPositionZ = Random.Range(dropPosition.z - 1f, dropPosition.z + 1f);
var newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ);
Vector3 newDropPosition;
var attempts = 0;
do
{
attempts++;
var newDropPositionX = Random.Range(dropPosition.x - _randomDropRadius, dropPosition.x + _randomDropRadius);
var newDropPositionZ = Random.Range(dropPosition.z - _randomDropRadius, dropPosition.z + _randomDropRadius);
newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ);
} while (!IsDropPositionAvailable(newDropPosition, droppedPositions) && attempts < MaxAttempts);
droppedPositions.Add(newDropPosition);
var itemPrefab = _itemDictionary[element.Idx].ItemPrefab;
if (!itemPrefab)
{
itemPrefab = _defaultItemPrefab;
}
var instantiateItem = Instantiate(itemPrefab, newDropPosition, Quaternion.identity);
var instantiateItem = Instantiate(itemPrefab, newDropPosition, itemPrefab.transform.rotation);
instantiateItem.Initialize(element);
instantiateItem.AddForce(Vector3.up * 20f, ForceMode.Impulse);
}
}
private bool IsDropPositionAvailable(Vector3 position, List<Vector3> positions)
{
return positions.Any(pos => Vector3.Distance(position, pos) > _minSeparationDistance);
}
public ItemData GetItemDataByIdx(int idx)
{
if (_itemDictionary.TryGetValue(idx, out var itemData)) return itemData;

9
Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset
View File

@ -418,3 +418,12 @@ MonoBehaviour:
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3}
<ItemPrefab>k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3}
- <Idx>k__BackingField: 60001
<Name>k__BackingField: "\uC82C\uC2A4\uD1A4"
<Category>k__BackingField: 6
<Type>k__BackingField: 0
<Price>k__BackingField: 1000
<Weight>k__BackingField: 100
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3}
<ItemPrefab>k__BackingField: {fileID: 0}

6
Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset
View File

@ -29,6 +29,10 @@ MonoBehaviour:
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 60001
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 2
<Name>k__BackingField: "\uCF54\uBFD4\uC18C"
@ -63,7 +67,7 @@ MonoBehaviour:
<QuantityMax>k__BackingField: 1
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 4
<Name>k__BackingField: "\uC720\uB839 \uC220\uD1B5"
<Name>k__BackingField: "\uC220\uD1B5 \uC720\uB839"
<DropItems>k__BackingField:
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100

24
Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs
View File

@ -36,22 +36,14 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
{
EnableSkill = false;
_spineController.SetSkin(SandMoleSkin.Idle.ToString());
var spinReady2Track = _spineController.PlayAnimation(SandMoleAnimation.SpinReady2.ToString(), false);
if (spinReady2Track == null)
var shootingStartTrack = _spineController.PlayAnimation(SandMoleAnimation.ShootingStart.ToString(), false);
if (shootingStartTrack == null)
{
EndSkill(0, actions[0]);
yield break;
}
yield return new WaitUntil(() => spinReady2Track.IsComplete);
_spineController.SetSkin(SandMoleSkin.Spin.ToString());
var spinTrack = _spineController.PlayAnimation(SandMoleAnimation.Spin.ToString(), true);
if (spinTrack == null || !SkillUser)
{
EndSkill(0, actions[0]);
yield break;
}
yield return new WaitUntil(() => shootingStartTrack.IsComplete);
IsUsingSkill = true;
var startPosition = SkillUser.transform.position;
@ -64,6 +56,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
yield break;
}
_spineController.PlayAnimation(SandMoleAnimation.ShootingIdle.ToString(), false);
var targetCenterPosition = _targetCollider.bounds.center;
startPosition.y = targetCenterPosition.y;
var targetVector = targetCenterPosition - startPosition;
@ -77,6 +70,15 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
yield return waitForSeconds;
}
var shootingEndTrack = _spineController.PlayAnimation(SandMoleAnimation.ShootingEnd.ToString(), true);
if (shootingEndTrack == null || !SkillUser)
{
EndSkill(0, actions[0]);
yield break;
}
yield return new WaitUntil(() => shootingEndTrack.IsComplete);
EndSkill(SkillData.Cooldown, actions[0]);
}

6
Assets/03.Images/Characters/Enemies/Bosses/TitanSlime/GemstoneGreen.png.meta
View File

@ -46,8 +46,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5, y: 0.02}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
@ -127,7 +127,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

4
Assets/04.Materials/FlashAndShadowSeeThroughLit.mat
View File

@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3001
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
@ -110,7 +110,7 @@ Material:
- _Opacity: 0.7
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _QueueOffset: 1
- _ReceiveShadows: 1
- _Size: 0
- _Smoothness: 0.8

4
Assets/04.Materials/Maps/GroundFog.mat
View File

@ -20,7 +20,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
m_CustomRenderQueue: 2999
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
@ -121,7 +121,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _QueueOffset: -1
- _ReceiveShadows: 1
- _SampleGI: 0
- _Smoothness: 0.5

4
Assets/04.Materials/OpaqueUnlit.mat
View File

@ -29,7 +29,7 @@ Material:
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
@ -106,7 +106,7 @@ Material:
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1

1
Assets/04.Materials/TransparentLit.mat
View File

@ -40,7 +40,6 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

4
Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab
View File

@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 1016303419742354216}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259}
m_LocalPosition: {x: 0, y: 0.22, z: 0}
m_LocalPosition: {x: -0.035, y: 0.12, z: -0}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

8
Assets/05.Prefabs/Items/Item.prefab
View File

@ -60,7 +60,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 5
m_TargetDisplay: 0
--- !u!114 &3466664881830510074
MonoBehaviour:
@ -127,13 +127,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513751791682743921}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3930562537327335166}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!212 &7437393363680573610
SpriteRenderer:
m_ObjectHideFlags: 0
@ -177,7 +177,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

1945
Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab
View File

File diff suppressed because it is too large Load Diff

4
Assets/05.Prefabs/Particles/LeafParticle.prefab
View File

@ -1460,8 +1460,8 @@ ParticleSystem:
startFrame:
serializedVersion: 2
minMaxState: 3
scalar: 0.75
minScalar: 0
scalar: 0.9999
minScalar: 0.5
maxCurve:
serializedVersion: 2
m_Curve:

100
Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 1772409705626034443}
m_Layer: 16
m_Name: BaseDamageableProps
m_TagString: DamageableProps
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -56,8 +56,8 @@ Rigidbody:
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
@ -82,6 +82,93 @@ SphereCollider:
serializedVersion: 3
m_Radius: 0.5
m_Center: {x: 0, y: 0.5, z: 0}
--- !u!1 &6089626013294030450
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7989795650755209638}
- component: {fileID: 5075219968660412138}
m_Layer: 16
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7989795650755209638
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6089626013294030450}
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: 0
m_Children: []
m_Father: {fileID: 7438534416270888028}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5075219968660412138
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6089626013294030450}
m_Enabled: 1
m_CastShadows: 3
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_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: ee61efd036130b847b41f878f20ddf33, type: 2}
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: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7835622629792856689
GameObject:
m_ObjectHideFlags: 0
@ -92,7 +179,7 @@ GameObject:
m_Component:
- component: {fileID: 7438534416270888028}
- component: {fileID: 3580758810857167321}
m_Layer: 0
m_Layer: 16
m_Name: VisualLook
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -111,7 +198,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 7989795650755209638}
m_Father: {fileID: 7986070582027999988}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3580758810857167321
@ -137,7 +225,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2}
- {fileID: 2100000, guid: 33fe0716974723b4db51774fcb38b8c7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

111
Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab
View File

@ -1,92 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2120541508449996527
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6229300703101880482}
- component: {fileID: 5119753316800573436}
m_Layer: 0
m_Name: Shadow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6229300703101880482
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2120541508449996527}
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: 0
m_Children: []
m_Father: {fileID: 6241053207180088262}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!212 &5119753316800573436
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2120541508449996527}
m_Enabled: 1
m_CastShadows: 3
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2}
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: 5
m_Sprite: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8995215974275723360
GameObject:
m_ObjectHideFlags: 0
@ -155,14 +68,6 @@ PrefabInstance:
propertyPath: m_ExcludeLayers.m_Bits
value: 1024
objectReference: {fileID: 0}
- target: {fileID: 2892108968249248585, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_UseGravity
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2892108968249248585, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_Sprite
value:
@ -183,6 +88,14 @@ PrefabInstance:
propertyPath: m_Layer
value: 16
objectReference: {fileID: 0}
- target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3}
- target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.x
value: 2
@ -277,9 +190,6 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
insertIndex: -1
addedObject: {fileID: 1426941151981288099}
- targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
insertIndex: -1
addedObject: {fileID: 6229300703101880482}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
insertIndex: -1
@ -328,11 +238,6 @@ SphereCollider:
m_CorrespondingSourceObject: {fileID: 1772409705626034443, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
m_PrefabInstance: {fileID: 3577643095578124186}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6241053207180088262 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
m_PrefabInstance: {fileID: 3577643095578124186}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6709217980892358123 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}

136
Assets/05.Prefabs/Props/DamageableProps/Spike.prefab Normal file
View File

@ -0,0 +1,136 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4964334121554974978
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3}
- target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_Name
value: Spike
objectReference: {fileID: 0}
- target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3}
- target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalPosition.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9396927
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.x
value: 0.3420201
objectReference: {fileID: 0}
- target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalScale.z
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
insertIndex: -1
addedObject: {fileID: 2012343921927033206}
m_SourcePrefab: {fileID: 100100000, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
--- !u!1 &8132169685942340323 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3}
m_PrefabInstance: {fileID: 4964334121554974978}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2012343921927033206
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8132169685942340323}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 57e5dbde2eb0d2b419d7f0ae58106bb3, type: 3}
m_Name:
m_EditorClassIdentifier:
<MaxHealthPoint>k__BackingField: 1
<CurrentHealthPoint>k__BackingField: 0
<InvincibilityDuration>k__BackingField: 0
DieSfxName: SpikeAttacked
DieParticle: {fileID: 1732485757689188744, guid: 3f54769ccfa54f64eb074ce5dc9786a3, type: 3}

2
Assets/05.Prefabs/Props/Environment/Ice.prefab.meta → Assets/05.Prefabs/Props/DamageableProps/Spike.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: debf7b76b0478c84595259122f220b1a
guid: 2bb9f657adfee8c4aa182f51c1821988
PrefabImporter:
externalObjects: {}
userData:

75
Assets/05.Prefabs/Props/Environment/Ice.prefab
View File

@ -1,75 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8368194104949569211
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1566068327986459636, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_Name
value: Ice
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9396927
objectReference: {fileID: 0}
- target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalRotation.x
value: 0.3420201
objectReference: {fileID: 0}
- target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 6749177542453196807, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3770065ecdd9c6348989031b36c5324d, type: 3}

BIN
Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes
View File

Binary file not shown.

BIN
Assets/Resources/Excel/CharacterData.xlsx
View File

Binary file not shown.

BIN
Assets/Resources/Excel/ItemDataTable.xlsx
View File

Binary file not shown.

BIN
Assets/Resources/Excel/ItemDropTable.xlsx
View File

Binary file not shown.

2
Assets/Resources/JSON/CharacterData.json
View File

@ -13,6 +13,6 @@
},
{
"CharacterIdx": 4,
"Name": "유령 술통"
"Name": "술통 유령"
}
]

9
Assets/Resources/JSON/ItemDataTable.json
View File

@ -403,5 +403,14 @@
"Price": 0,
"Weight": 0,
"Desciption": ""
},
{
"Idx": 60001,
"Name": "젬스톤",
"Category": 6,
"Type": 0,
"Price": 1000,
"Weight": 100,
"Desciption": ""
}
]

7
Assets/Resources/JSON/ItemDropTable.json
View File

@ -20,6 +20,13 @@
"QuantityMin": 1,
"QuantityMax": 1
},
{
"CharacterIdx": 1,
"ItemIdx": 60001,
"DropRate": 100,
"QuantityMin": 1,
"QuantityMax": 1
},
{
"CharacterIdx": 2,
"ItemIdx": 50002,

1
Packages/manifest.json
View File

@ -4,6 +4,7 @@
"com.esotericsoftware.spine.spine-csharp": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-csharp/src#4.2",
"com.esotericsoftware.spine.spine-unity": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2",
"com.esotericsoftware.spine.spine-unity-examples": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine Examples#4.2",
"com.esotericsoftware.spine.timeline": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2",
"com.esotericsoftware.spine.urp-shaders": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2",
"com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity",
"com.unity.cinemachine": "3.1.0",

10
Packages/packages-lock.json
View File

@ -71,6 +71,16 @@
},
"hash": "c79f89b1eb0fcacaab3b3ff9b10f4338699d8152"
},
"com.esotericsoftware.spine.timeline": {
"version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2",
"depth": 0,
"source": "git",
"dependencies": {
"com.unity.timeline": "1.2.10",
"com.esotericsoftware.spine.spine-unity": "4.2.13"
},
"hash": "82cb7f5cad3e33b11094a7f52c8fdfa70c7c1787"
},
"com.esotericsoftware.spine.urp-shaders": {
"version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2",
"depth": 0,