Skip to content

tetra-tower
tetra-tower
Commit f830a09e authored by 18손재민's avatar 18손재민
Browse files
Options

Merge remote-tracking branch 'origin/item' into tetris

parents 0b4ee9eb 21de9755
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1307 additions and 4482 deletions
Assets/Animation/Enemy/melee.controller
View file @ f830a09e
...@@ -13,25 +13,31 @@ AnimatorController: ...@@ -13,25 +13,31 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: AttackTrigger - m_Name: AttackTrigger
m_Type: 9 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: DamagedTrigger - m_Name: DamagedTrigger
m_Type: 9 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: DeadTrigger - m_Name: DeadTrigger
m_Type: 9 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: knockbackDistance
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
......
Assets/Animation/Player/PlayerIdleAnim.anim
View file @ f830a09e
...@@ -30,7 +30,7 @@ AnimationClip: ...@@ -30,7 +30,7 @@ AnimationClip:
value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3} value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3}
- time: 0.5 - time: 0.5
value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3} value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3}
- time: 0.6 - time: 0.6166667
value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3} value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3}
- time: 0.7 - time: 0.7
value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3} value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3}
......
Assets/Prefabs/Characters/Enemy/Goblin.prefab
View file @ f830a09e
...@@ -21,7 +21,7 @@ GameObject: ...@@ -21,7 +21,7 @@ GameObject:
- component: {fileID: 4015301101001556} - component: {fileID: 4015301101001556}
- component: {fileID: 212540714587432698} - component: {fileID: 212540714587432698}
- component: {fileID: 95413729269184064} - component: {fileID: 95413729269184064}
- component: {fileID: 114138317320723260} - component: {fileID: 114118738857420128}
m_Layer: 0 m_Layer: 0
m_Name: Body m_Name: Body
m_TagString: Untagged m_TagString: Untagged
...@@ -71,7 +71,7 @@ Transform: ...@@ -71,7 +71,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1225288737757304} m_GameObject: {fileID: 1225288737757304}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.15799999, y: 0.40100002, z: 0} m_LocalPosition: {x: -0.234, y: 0.621, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4140258981397796} - {fileID: 4140258981397796}
...@@ -98,7 +98,7 @@ Transform: ...@@ -98,7 +98,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1636491341446076} m_GameObject: {fileID: 1636491341446076}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.876, y: 1.034, z: -0.1645136} m_LocalPosition: {x: 6.01, y: 2.009, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4015301101001556} - {fileID: 4015301101001556}
...@@ -133,11 +133,11 @@ BoxCollider2D: ...@@ -133,11 +133,11 @@ BoxCollider2D:
m_GameObject: {fileID: 1636491341446076} m_GameObject: {fileID: 1636491341446076}
m_Enabled: 1 m_Enabled: 1
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 6200000, guid: 90e689a435f304c469db49daef28ed89, type: 2}
m_IsTrigger: 0 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: 0.08, y: 0.325} m_Offset: {x: -0.020877361, y: 0.5497493}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0} pivot: {x: 0, y: 0}
...@@ -148,7 +148,7 @@ BoxCollider2D: ...@@ -148,7 +148,7 @@ BoxCollider2D:
adaptiveTiling: 0 adaptiveTiling: 0
m_AutoTiling: 0 m_AutoTiling: 0
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.55, y: 1.1} m_Size: {x: 0.5978651, y: 1.1179954}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!61 &61362187134790794 --- !u!61 &61362187134790794
BoxCollider2D: BoxCollider2D:
...@@ -193,7 +193,7 @@ Animator: ...@@ -193,7 +193,7 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114138317320723260 --- !u!114 &114118738857420128
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -201,12 +201,12 @@ MonoBehaviour: ...@@ -201,12 +201,12 @@ MonoBehaviour:
m_GameObject: {fileID: 1225288737757304} m_GameObject: {fileID: 1225288737757304}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f12bf401d26646a488bc32ca7e3845be, type: 3} m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
monsterID: 101 monsterID: 101
maxHealth: 5 maxHealth: 5
weight: 3 weight: 1
patrolRange: 2 patrolRange: 2
noticeRange: 2 noticeRange: 2
attackRange: 1 attackRange: 1
......
Assets/Prefabs/Characters/Player.prefab
View file @ f830a09e
...@@ -44,7 +44,6 @@ GameObject: ...@@ -44,7 +44,6 @@ GameObject:
- component: {fileID: 61129044981816742} - component: {fileID: 61129044981816742}
- component: {fileID: 114402380471012178} - component: {fileID: 114402380471012178}
- component: {fileID: 60342798607647292} - component: {fileID: 60342798607647292}
- component: {fileID: 114190796731463818}
m_Layer: 0 m_Layer: 0
m_Name: AttackColider m_Name: AttackColider
m_TagString: Untagged m_TagString: Untagged
...@@ -195,22 +194,6 @@ Animator: ...@@ -195,22 +194,6 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114190796731463818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1862495014651308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 0
knockBackMultiplier: 1
debuffNum: 0
debuffType:
debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
--- !u!114 &114294925164316638 --- !u!114 &114294925164316638
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -279,13 +262,8 @@ MonoBehaviour: ...@@ -279,13 +262,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3} m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
attackRaw: attack: 000000
- 0 cancel: 0
- 0
- 0
attackKeyState: 000000000000000000000000
cancelRaw: 0
cancelKeyState: 0
playingSkill: 0 playingSkill: 0
comboTime: 1 comboTime: 1
time: {fileID: 0} time: {fileID: 0}
...@@ -295,10 +273,11 @@ MonoBehaviour: ...@@ -295,10 +273,11 @@ MonoBehaviour:
anim: {fileID: 95992411616135034} anim: {fileID: 95992411616135034}
aoc: {fileID: 0} aoc: {fileID: 0}
normalAttack: normalAttack:
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
inventoryManager: {fileID: 0} inventoryManager: {fileID: 0}
lifeStoneManager: {fileID: 0}
--- !u!114 &114906702720267008 --- !u!114 &114906702720267008
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -310,7 +289,6 @@ MonoBehaviour: ...@@ -310,7 +289,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3} m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
LCUI: {fileID: 0}
ttx: 8 ttx: 8
tty: 0 tty: 0
--- !u!212 &212187280661781960 --- !u!212 &212187280661781960
......
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
View file @ f830a09e
...@@ -30,6 +30,35 @@ GameObject: ...@@ -30,6 +30,35 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1886512004533810
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4161324837726830}
- component: {fileID: 212809307172866322}
m_Layer: 13
m_Name: Highlight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4161324837726830
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1886512004533810}
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_Children: []
m_Father: {fileID: 4490692399716652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4490692399716652 --- !u!4 &4490692399716652
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -39,7 +68,8 @@ Transform: ...@@ -39,7 +68,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 203.65184, y: 44.907085, z: -0.060713544} m_LocalPosition: {x: 203.65184, y: 44.907085, z: -0.060713544}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 4161324837726830}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -100,6 +130,7 @@ MonoBehaviour: ...@@ -100,6 +130,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
itemAddon: 0 itemAddon: 0
highlight: {fileID: 1886512004533810}
--- !u!212 &212078234558260036 --- !u!212 &212078234558260036
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -146,3 +177,49 @@ SpriteRenderer: ...@@ -146,3 +177,49 @@ SpriteRenderer:
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!212 &212809307172866322
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1886512004533810}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 2145601713
m_SortingLayer: 9
m_SortingOrder: -1
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
Assets/Prefabs/UI/In-Game UI/LifeStoneUI/LifeUnitHighlight.prefab
View file @ f830a09e
...@@ -72,9 +72,9 @@ SpriteRenderer: ...@@ -72,9 +72,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 996861525 m_SortingLayerID: 2145601713
m_SortingLayer: 8 m_SortingLayer: 9
m_SortingOrder: 0 m_SortingOrder: -1
m_Sprite: {fileID: 21300000, guid: aa7dc19ed61c9bd45b964e4bdf98b84b, type: 3} m_Sprite: {fileID: 21300000, guid: aa7dc19ed61c9bd45b964e4bdf98b84b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
......
Assets/Prefabs/UI/LifeStoneTestUI.prefab
View file @ f830a09e
...@@ -145,7 +145,7 @@ GameObject: ...@@ -145,7 +145,7 @@ GameObject:
- component: {fileID: 114072708642970626} - component: {fileID: 114072708642970626}
- component: {fileID: 114757692378018086} - component: {fileID: 114757692378018086}
m_Layer: 5 m_Layer: 5
m_Name: PushButton m_Name: CreateButton
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
......
Assets/Resources/Animations/normalAttackA.anim 0 → 100644
View file @ f830a09e
This diff is collapsed.
Assets/Prefabs/Rooms/SpecialRoom/Room Start_enemyAdded.prefab.meta → Assets/Resources/Animations/normalAttackA.anim.meta
View file @ f830a09e
fileFormatVersion: 2 fileFormatVersion: 2
guid: c7a987df794900341bf68b8263f6e205 guid: b1bf5cd583e214e448b83335f6c2d7a6
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 7400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
Assets/Resources/Sprites/Items/Baculus.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/Festo.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/Frost Shield.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/Morgenstern.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/bamboo spear.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/chain sickle.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/dagger.png.meta 0 → 100644
View file @ f830a09e
fileFormatVersion: 2
guid: c6e7c50fdf2c1e34487f8ed145d97ecf
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9a381f72a64930741969d7b3102139b0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Sprites/Items/dagger_border.png.meta 0 → 100644
View file @ f830a09e
fileFormatVersion: 2
guid: e30bda849e89c2b4687b76d15c3f45e3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 26aff9fc2c5f7ca48864fb117cff5f85
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Sprites/Items/explosion gloves.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/ksanife.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Resources/Sprites/Items/meteor sword.png.meta
View file @ f830a09e
...@@ -31,7 +31,7 @@ TextureImporter: ...@@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: 0
aniso: -1 aniso: -1
mipBias: -100 mipBias: -100
wrapU: 1 wrapU: 1
...@@ -63,7 +63,18 @@ TextureImporter: ...@@ -63,7 +63,18 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
......
Assets/Scenes/PlayScene.unity
View file @ f830a09e
...@@ -506,21 +506,6 @@ Prefab: ...@@ -506,21 +506,6 @@ Prefab:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
type: 2}
propertyPath: m_LocalScale.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
type: 2}
propertyPath: m_LocalScale.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
type: 2}
propertyPath: m_LocalScale.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114627791461826676, guid: 799f0e9cc16535e449586b399b37aa56, - target: {fileID: 114627791461826676, guid: 799f0e9cc16535e449586b399b37aa56,
type: 2} type: 2}
propertyPath: ui propertyPath: ui
...@@ -968,6 +953,26 @@ Prefab: ...@@ -968,6 +953,26 @@ Prefab:
propertyPath: lifeStoneManager propertyPath: lifeStoneManager
value: value:
objectReference: {fileID: 1206751493} objectReference: {fileID: 1206751493}
- target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: damage
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[0]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[1]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[2]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
......
Assets/Scenes/testEnemy.unity
View file @ f830a09e
...@@ -757,6 +757,86 @@ Prefab: ...@@ -757,6 +757,86 @@ Prefab:
propertyPath: dropTableData propertyPath: dropTableData
value: value:
objectReference: {fileID: 4900000, guid: 6216895c658a2af40890a4446cc10a8c, type: 3} objectReference: {fileID: 4900000, guid: 6216895c658a2af40890a4446cc10a8c, type: 3}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[1]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[2]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[3]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[4]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[5]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[6]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[7]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[8]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[9]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[10]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[11]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[12]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[13]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[14]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[15]
value: Bow
objectReference: {fileID: 0}
- target: {fileID: 114768470604838176, guid: 54c1a7b414e41724197333a9e17dd49b,
type: 2}
propertyPath: dropItemList.Array.data[0]
value: Bow
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 54c1a7b414e41724197333a9e17dd49b, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 54c1a7b414e41724197333a9e17dd49b, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -1090,7 +1170,7 @@ Prefab: ...@@ -1090,7 +1170,7 @@ Prefab:
- target: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb, - target: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2} type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: UpgradeStage value: SummonEnemy
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224008356030171754, guid: e6794ab8e2e4c6340a23b382e9497cbb, - target: {fileID: 224008356030171754, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2} type: 2}
...@@ -1117,6 +1197,11 @@ Prefab: ...@@ -1117,6 +1197,11 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 224667404527337120, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2} m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -1240,15 +1325,15 @@ Prefab: ...@@ -1240,15 +1325,15 @@ Prefab:
m_Modifications: m_Modifications:
- target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2} - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 6.876 value: 6.01
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2} - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 1.034 value: 2.009
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2} - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0.1645136 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2} - target: {fileID: 4639192263818050, guid: a164c147037e89448820f7387c724c42, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
......
Assets/Scenes/testEnemyPattern.unity deleted 100644 → 0
View file @ 0b4ee9eb
This diff is collapsed.
Assets/Scenes/testEnemyPattern.unity.meta deleted 100644 → 0
View file @ 0b4ee9eb
fileFormatVersion: 2
guid: 7f2a5cd3b45ab364a9b2e39e41de53e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Damaged.cs → Assets/Scripts/Characters/Animator State/Damaged.cs
View file @ f830a09e
...@@ -6,8 +6,11 @@ public class Damaged : StateMachineBehaviour { ...@@ -6,8 +6,11 @@ public class Damaged : StateMachineBehaviour {
RuntimeAnimatorController ac; RuntimeAnimatorController ac;
float knockbackTime; float knockbackTime;
float knockbackSpeed;
float knockbackDir; // 1: right \ -1: left
Vector3 leftsideAngle = new Vector3(0, 0, 0); Vector3 leftsideAngle = new Vector3(0, 0, 0);
Vector3 rightsideAngle = new Vector3(0, 180, 0); Vector3 rightsideAngle = new Vector3(0, 180, 0);
Transform pivotTransform;
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
...@@ -19,15 +22,20 @@ public class Damaged : StateMachineBehaviour { ...@@ -19,15 +22,20 @@ public class Damaged : StateMachineBehaviour {
knockbackTime = clip.length; knockbackTime = clip.length;
} }
} }
knockbackSpeed = animator.GetFloat("knockbackDistance") / knockbackTime;
Transform playerTransform = EnemyManager.Instance.player.transform; Transform playerTransform = EnemyManager.Instance.player.transform;
Transform pivotTransform = animator.transform.parent; pivotTransform = animator.transform.parent;
pivotTransform.eulerAngles = (playerTransform.position.x - pivotTransform.position.x < 0) ? leftsideAngle : rightsideAngle; pivotTransform.eulerAngles = (playerTransform.position.x - pivotTransform.position.x < 0) ? leftsideAngle : rightsideAngle;
} knockbackDir = (playerTransform.position.x - pivotTransform.position.x < 0) ? 1 : -1;
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
Vector2 currPosition = pivotTransform.position;
} Vector2 movingDistance = new Vector2(knockbackSpeed * Time.deltaTime, 0) * knockbackDir;
pivotTransform.gameObject.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state // OnStateExit is called when a transition ends and the state machine finishes evaluating this state
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { //override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
......
Assets/Scripts/Characters/AttackProperty.cs
View file @ f830a09e
...@@ -13,9 +13,9 @@ public class AttackProperty : MonoBehaviour{ ...@@ -13,9 +13,9 @@ public class AttackProperty : MonoBehaviour{
if (collision.CompareTag("Enemy")) if (collision.CompareTag("Enemy"))
{ {
Debug.Log(damage);
PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffNum, debuffType, debuffTime); PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffNum, debuffType, debuffTime);
Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>(); Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>();
Debug.Log("Ugh!");
collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack); collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack);
} }
} }
......
Assets/Scripts/Characters/Enemy.cs
View file @ f830a09e
...@@ -40,21 +40,28 @@ public class Enemy : MonoBehaviour { ...@@ -40,21 +40,28 @@ public class Enemy : MonoBehaviour {
// for animation // for animation
[HideInInspector] [HideInInspector]
public float playerDistance; public float playerDistance;
private Animator animator;
// drop item // drop item
private InventoryManager inventoryManager;
private int[] dropTable;
// for test
public GameObject droppedItem;
public Item item;
// method // method
// Standard Method // Standard Method
private void Awake() private void Awake()
{ {
enemyManager = EnemyManager.Instance; enemyManager = EnemyManager.Instance;
inventoryManager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
animator = GetComponent<Animator>();
} }
private void Start() private void Start()
{ {
this.currHealth = maxHealth; this.currHealth = maxHealth;
playerDistance = Vector2.Distance(enemyManager.player.transform.position, transform.parent.position); dropTable = enemyManager.dropTableByID[monsterID];
} }
private void Update() private void Update()
...@@ -66,10 +73,32 @@ public class Enemy : MonoBehaviour { ...@@ -66,10 +73,32 @@ public class Enemy : MonoBehaviour {
public void GetDamaged(PlayerAttackInfo attack) { public void GetDamaged(PlayerAttackInfo attack) {
currHealth -= attack.damage; currHealth -= attack.damage;
if(currHealth <= 0) { if(currHealth <= 0) {
gameObject.SetActive(false); processDeath();
return; return;
} }
gameObject.GetComponent<Animator>().SetTrigger("DamagedTrigger"); animator.SetFloat("knockbackDistance", attack.damage / this.weight * attack.knockBackMultiplier);
animator.SetTrigger("DamagedTrigger");
}
private void processDeath()
{
float denominator = dropTable[dropTable.Length - 1];
float numerator = Random.Range(0, denominator);
int indexOfItem = 0;
for (int i = 0; i < dropTable.Length; i++)
{
if(numerator <= dropTable[i])
{
indexOfItem = i;
break;
}
}
inventoryManager.ItemInstantiate(enemyManager.dropItemList[indexOfItem], transform.parent.position);
gameObject.SetActive(false);
// animator.SetTrigger("DeadTrigger");
return;
} }
IEnumerator DebuffCase(EnemyDebuffed sCase) IEnumerator DebuffCase(EnemyDebuffed sCase)
......
Assets/Scripts/Characters/EnemyManager.cs
View file @ f830a09e
...@@ -17,7 +17,7 @@ public class EnemyManager : Singleton<EnemyManager> ...@@ -17,7 +17,7 @@ public class EnemyManager : Singleton<EnemyManager>
// data of drop item // data of drop item
public TextAsset dropTableData; public TextAsset dropTableData;
public Dictionary<int, int[]> dropTableByID = new Dictionary<int, int[]>(); public Dictionary<int, int[]> dropTableByID = new Dictionary<int, int[]>();
public GameObject[] dropItemList; // insert drop item here(on right order) public string[] dropItemList; // insert drop item here(on right order)
// enemy prefab // enemy prefab
public GameObject[] enemyPrefab; public GameObject[] enemyPrefab;
......
Assets/Scripts/Characters/EnemyMelee.cs deleted 100644 → 0
View file @ 0b4ee9eb
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class EnemyMelee : Enemy {
}
Assets/Scripts/Characters/PlayerController.cs
View file @ f830a09e
...@@ -102,12 +102,11 @@ public class PlayerController : MonoBehaviour ...@@ -102,12 +102,11 @@ public class PlayerController : MonoBehaviour
if (lastDropItem != null && interaction) if (lastDropItem != null && interaction)
{ {
print(lastDropItem.PushItem() + "냠냠"); lastDropItem.PushItem();
} }
if (lastLifeStone != null && interaction) if (lastLifeStone != null && interaction)
{ {
lastLifeStone.ApplyLifeStone(); lastLifeStone.ApplyLifeStone();
print("생명석 냠냠");
} }
} }
......
Assets/Scripts/Item/Addon.cs
View file @ f830a09e
...@@ -8,6 +8,7 @@ public abstract class Addon { ...@@ -8,6 +8,7 @@ public abstract class Addon {
public ItemQuality quality; public ItemQuality quality;
public AddonType type; public AddonType type;
public Sprite sprite; public Sprite sprite;
public Sprite highlight;
public Vector2 sizeInventory; public Vector2 sizeInventory;
public Addon() public Addon()
...@@ -20,6 +21,7 @@ public abstract class Addon { ...@@ -20,6 +21,7 @@ public abstract class Addon {
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = null; sprite = null;
highlight = null;
sizeInventory = new Vector2(0, 0); sizeInventory = new Vector2(0, 0);
} }
} }
Assets/Scripts/Item/Addons/ApprenticesMark.cs
View file @ f830a09e
...@@ -13,6 +13,7 @@ public class ApprenticesMark : Addon ...@@ -13,6 +13,7 @@ public class ApprenticesMark : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
Assets/Scripts/Item/Addons/CoollyPride.cs
View file @ f830a09e
...@@ -13,6 +13,7 @@ public class CoollyPride : Addon ...@@ -13,6 +13,7 @@ public class CoollyPride : Addon
quality = ItemQuality.Ordinary; quality = ItemQuality.Ordinary;
type = AddonType.Theory; type = AddonType.Theory;
sprite = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Coolly Pride"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
Assets/Scripts/Item/Addons/GlowingHerb.cs
View file @ f830a09e
...@@ -13,6 +13,7 @@ public class GlowingHerb : Addon ...@@ -13,6 +13,7 @@ public class GlowingHerb : Addon
quality = ItemQuality.Ordinary; quality = ItemQuality.Ordinary;
type = AddonType.Matter; type = AddonType.Matter;
sprite = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Glowing Herb"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
Assets/Scripts/Item/Addons/KnightsStirrup.cs
View file @ f830a09e
...@@ -13,6 +13,7 @@ public class KnightsStirrup : Addon ...@@ -13,6 +13,7 @@ public class KnightsStirrup : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/Knight's stirrup"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
Assets/Scripts/Item/Addons/ParchmentPiece.cs
View file @ f830a09e
...@@ -13,6 +13,7 @@ public class ParchmentPiece : Addon ...@@ -13,6 +13,7 @@ public class ParchmentPiece : Addon
quality = ItemQuality.Study; quality = ItemQuality.Study;
type = AddonType.Prop; type = AddonType.Prop;
sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ; sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
sizeInventory = new Vector2(80, 80); sizeInventory = new Vector2(80, 80);
} }
} }
\ No newline at end of file
Assets/Scripts/Item/DroppedItem.cs
View file @ f830a09e
...@@ -8,6 +8,7 @@ public class DroppedItem : MonoBehaviour ...@@ -8,6 +8,7 @@ public class DroppedItem : MonoBehaviour
public bool itemAddon; //false: item true: addon public bool itemAddon; //false: item true: addon
public Item item; public Item item;
public Addon addon; public Addon addon;
public GameObject highlight;
float itemSizeMultiplier = 0.0077f; float itemSizeMultiplier = 0.0077f;
Rigidbody2D rb2D; Rigidbody2D rb2D;
BoxCollider2D bc2D; BoxCollider2D bc2D;
...@@ -23,8 +24,12 @@ public class DroppedItem : MonoBehaviour ...@@ -23,8 +24,12 @@ public class DroppedItem : MonoBehaviour
transform.position = pos; transform.position = pos;
sprt.sprite = item.sprite; sprt.sprite = item.sprite;
highlight.GetComponent<SpriteRenderer>().sprite = item.highlight;
highlight.SetActive(false);
bc2D.size = sprt.size; bc2D.size = sprt.size;
transform.localScale = new Vector3((item.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (item.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1); transform.localScale = new Vector3((item.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (item.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);
} }
public void Init(Addon _addon, Vector3 pos) public void Init(Addon _addon, Vector3 pos)
...@@ -38,7 +43,8 @@ public class DroppedItem : MonoBehaviour ...@@ -38,7 +43,8 @@ public class DroppedItem : MonoBehaviour
transform.position = pos; transform.position = pos;
sprt.sprite = addon.sprite; sprt.sprite = addon.sprite;
sprt.size = addon.sizeInventory / 100f; highlight.GetComponent<SpriteRenderer>().sprite = addon.highlight;
highlight.SetActive(false);
bc2D.size = sprt.size; bc2D.size = sprt.size;
transform.localScale = new Vector3((addon.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (addon.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1); transform.localScale = new Vector3((addon.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (addon.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);
} }
...@@ -58,7 +64,8 @@ public class DroppedItem : MonoBehaviour ...@@ -58,7 +64,8 @@ public class DroppedItem : MonoBehaviour
} }
public void HighlightSwitch(bool enabled) public void HighlightSwitch(bool enabled)
{ {
if (itemAddon) Debug.Log(addon.name + (enabled ? "on" : "off")); highlight.SetActive(enabled);
else Debug.Log(item.name + (enabled ? "on" : "off")); highlight.GetComponent<SpriteRenderer>().sortingOrder = -1 + (enabled ? 2 : 0);
GetComponent<SpriteRenderer>().sortingOrder = (enabled ? 2 : 0);
} }
} }
Assets/Scripts/Item/InventoryManager.cs
View file @ f830a09e
...@@ -7,8 +7,8 @@ public class InventoryManager : MonoBehaviour { ...@@ -7,8 +7,8 @@ public class InventoryManager : MonoBehaviour {
public List<Item> itemList = new List<Item>(); public List<Item> itemList = new List<Item>();
public List<Addon> addonList = new List<Addon>(); public List<Addon> addonList = new List<Addon>();
InventoryUI ui; InventoryUI ui;
public List<string> itemPool = new List<string>(); public List<string>[] itemPool = new List<string>[4];
public List<string> addonPool = new List<string>(); public List<string>[] addonPool = new List<string>[4];
public GameObject droppedPrefab; public GameObject droppedPrefab;
GameObject player; GameObject player;
...@@ -19,24 +19,71 @@ public class InventoryManager : MonoBehaviour { ...@@ -19,24 +19,71 @@ public class InventoryManager : MonoBehaviour {
player = GameObject.Find("Player"); player = GameObject.Find("Player");
//itemPool SetPool();
itemPool.Add("Baculus");
itemPool.Add("BambooSpear");
itemPool.Add("Bow");
itemPool.Add("ChainSickle");
itemPool.Add("Festo");
//addonPool StartCoroutine(TestCoroutine());
addonPool.Add("ApprenticesMark");
addonPool.Add("ParchmentPiece");
addonPool.Add("GlowingHerb");
StartCoroutine("TestCoroutine");
} }
/// <summary>
/// Set Item, Addon Pool and shuffle them
/// </summary>
void SetPool()
{
for(int i=0; i<4; i++)
{
itemPool[i] = new List<string>();
addonPool[i] = new List<string>();
}
itemPool[0].Add("Bow");
itemPool[0].Add("Dagger");
itemPool[1].Add("Baculus");
itemPool[1].Add("BambooSpear");
itemPool[1].Add("ChainSickle");
itemPool[1].Add("ExplosionGloves");
itemPool[1].Add("Festo");
itemPool[1].Add("FrostShield");
itemPool[2].Add("Ksanife");
itemPool[2].Add("MeteorSword");
itemPool[2].Add("Morgenstern");
//itemPool[3].Add("");
addonPool[0].Add("ParchmentPiece");
addonPool[0].Add("KnightsStirrup");
addonPool[0].Add("ApprenticesMark");
addonPool[1].Add("GlowingHerb");
addonPool[1].Add("CoollyPride");
//addonPool[2].Add("");
//addonPool[3].Add("");
for (int i = 0; i < 4; i++)
{
ShuffleList(itemPool[i]);
ShuffleList(addonPool[i]);
}
}
void ShuffleList(List<string> list)
{
System.Random random = new System.Random();
for(int i= list.Count - 1; i>=0; i--)
{
string tmp = list[i];
int n = random.Next(i + 1);
list[i] = list[n];
list[n] = tmp;
}
}
IEnumerator TestCoroutine() IEnumerator TestCoroutine()
{ {
yield return null; yield return null;
ItemInstantiate(ItemQuality.Study, player.transform.position);
/*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0]))); /*PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2]))); PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
yield return new WaitForSeconds(1.5f); yield return new WaitForSeconds(1.5f);
...@@ -65,35 +112,93 @@ public class InventoryManager : MonoBehaviour { ...@@ -65,35 +112,93 @@ public class InventoryManager : MonoBehaviour {
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
*/ */
} }
/// <summary>
/// Instantiate random item by quality
/// </summary>
/// <param name="quality"></param>
/// <param name="pos"></param>
public void ItemInstantiate(ItemQuality quality, Vector3 pos)
{
if(itemPool[(int)quality].Count > 0)
{
ItemInstantiate(itemPool[(int)quality][0], pos);
itemPool[(int)quality].RemoveAt(0);
}
}
/// <summary>
/// Instantiate item by name on pos, also Instantiate Item class
/// </summary>
/// <param name="str"></param>
/// <param name="pos"></param>
public void ItemInstantiate(string str, Vector3 pos) public void ItemInstantiate(string str, Vector3 pos)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init((Item)System.Activator.CreateInstance(System.Type.GetType(str)), pos); tmpItem.GetComponent<DroppedItem>().Init((Item)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
} }
/// <summary>
/// Instantiate item by Item Instance on pos
/// </summary>
/// <param name="item"></param>
/// <param name="pos"></param>
public void ItemInstantiate(Item item, Vector3 pos) public void ItemInstantiate(Item item, Vector3 pos)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init(item, pos); tmpItem.GetComponent<DroppedItem>().Init(item, pos);
} }
/// <summary>
/// Instantiate random addon by quality
/// </summary>
/// <param name="quality"></param>
/// <param name="pos"></param>
public void AddonInstantiate(ItemQuality quality, Vector3 pos)
{
if (addonPool[(int)quality].Count > 0)
{
AddonInstantiate(addonPool[(int)quality][0], pos);
addonPool[(int)quality].RemoveAt(0);
}
}
/// <summary>
/// Instantiate addon by name on pos, also Instantiate Addon class
/// </summary>
/// <param name="str"></param>
/// <param name="pos"></param>
public void AddonInstantiate(string str, Vector3 pos) public void AddonInstantiate(string str, Vector3 pos)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos); tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
} }
/// <summary>
/// Instantiate addon by Addon Instance on pos
/// </summary>
/// <param name="item"></param>
/// <param name="pos"></param>
public void AddonInstantiate(Addon addon, Vector3 pos) public void AddonInstantiate(Addon addon, Vector3 pos)
{ {
GameObject tmpItem = Instantiate(droppedPrefab); GameObject tmpItem = Instantiate(droppedPrefab);
tmpItem.GetComponent<DroppedItem>().Init(addon, pos); tmpItem.GetComponent<DroppedItem>().Init(addon, pos);
} }
/// <summary>
/// reset inventory canvas
/// </summary>
public void SetOnPosition() public void SetOnPosition()
{ {
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// call when item has been clicked
/// </summary>
/// <param name="itemIndex"></param>
public void ItemSelect(int itemIndex) public void ItemSelect(int itemIndex)
{ {
ui.selectedItem = itemIndex; ui.selectedItem = itemIndex;
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// push item in inventory
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool PushItem(Item item) public bool PushItem(Item item)
{ {
for(int i = 0; i<item.skillNum; i++) for(int i = 0; i<item.skillNum; i++)
...@@ -108,6 +213,11 @@ public class InventoryManager : MonoBehaviour { ...@@ -108,6 +213,11 @@ public class InventoryManager : MonoBehaviour {
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
return true; return true;
} }
/// <summary>
/// push addon in inventory
/// </summary>
/// <param name="addon"></param>
/// <returns></returns>
public bool PushAddon(Addon addon) public bool PushAddon(Addon addon)
{ {
if (addonList.Count > 8) return false; if (addonList.Count > 8) return false;
...@@ -116,6 +226,10 @@ public class InventoryManager : MonoBehaviour { ...@@ -116,6 +226,10 @@ public class InventoryManager : MonoBehaviour {
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
return true; return true;
} }
/// <summary>
/// call when item has been discarded. instantiate dropped item object
/// </summary>
/// <param name="index"></param>
public void DiscardItem(int index) public void DiscardItem(int index)
{ {
if (itemList.Count > index) if (itemList.Count > index)
...@@ -127,6 +241,10 @@ public class InventoryManager : MonoBehaviour { ...@@ -127,6 +241,10 @@ public class InventoryManager : MonoBehaviour {
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// call when addon(not attached on item) has been discarded. instantiate dropped addon object
/// </summary>
/// <param name="index"></param>
public void DiscardAddon(int index) public void DiscardAddon(int index)
{ {
if (addonList.Count > index) if (addonList.Count > index)
...@@ -136,6 +254,11 @@ public class InventoryManager : MonoBehaviour { ...@@ -136,6 +254,11 @@ public class InventoryManager : MonoBehaviour {
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// call when addon(attached on item) has been discarded. instantiate dropped addon object
/// </summary>
/// <param name="itemIndex"></param>
/// <param name="addonType"></param>
public void DiscardAddon(int itemIndex, AddonType addonType) public void DiscardAddon(int itemIndex, AddonType addonType)
{ {
if (itemList[itemIndex].addons[(int)addonType] != null) if (itemList[itemIndex].addons[(int)addonType] != null)
...@@ -145,6 +268,11 @@ public class InventoryManager : MonoBehaviour { ...@@ -145,6 +268,11 @@ public class InventoryManager : MonoBehaviour {
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// attach addon to item
/// </summary>
/// <param name="itemIndex"></param>
/// <param name="addonIndex"></param>
public void AttachAddon(int itemIndex, int addonIndex) public void AttachAddon(int itemIndex, int addonIndex)
{ {
if(itemList[itemIndex].attachable[(int)addonList[addonIndex].type] && itemList[itemIndex].addons[(int)addonList[addonIndex].type] == null) if(itemList[itemIndex].attachable[(int)addonList[addonIndex].type] && itemList[itemIndex].addons[(int)addonList[addonIndex].type] == null)
...@@ -154,6 +282,11 @@ public class InventoryManager : MonoBehaviour { ...@@ -154,6 +282,11 @@ public class InventoryManager : MonoBehaviour {
} }
ui.SetOnPosition(itemList, addonList); ui.SetOnPosition(itemList, addonList);
} }
/// <summary>
/// dettach addon from item
/// </summary>
/// <param name="itemIndex"></param>
/// <param name="addonType"></param>
public void DetachAddon(int itemIndex, AddonType addonType) public void DetachAddon(int itemIndex, AddonType addonType)
{ {
if(addonList.Count < 9 && itemList[itemIndex].addons[(int)addonType] != null) if(addonList.Count < 9 && itemList[itemIndex].addons[(int)addonType] != null)
......
Assets/Scripts/Item/Item.cs
View file @ f830a09e
...@@ -12,6 +12,7 @@ public abstract class Item { ...@@ -12,6 +12,7 @@ public abstract class Item {
public bool[] attachable = new bool[4]; //0: prop 1: matter 2: component 3:theory public bool[] attachable = new bool[4]; //0: prop 1: matter 2: component 3:theory
public Addon[] addons = new Addon[4]; //0: prop 1: matter 2: component 3:theory public Addon[] addons = new Addon[4]; //0: prop 1: matter 2: component 3:theory
public Sprite sprite; public Sprite sprite;
public Sprite highlight;
public Vector2 sizeInventory; public Vector2 sizeInventory;
public bool ComboAction(string currentCombo) public bool ComboAction(string currentCombo)
...@@ -47,6 +48,7 @@ public abstract class Item { ...@@ -47,6 +48,7 @@ public abstract class Item {
combo = new string[3] { "", "", "" }; combo = new string[3] { "", "", "" };
attachable = new bool[4] { false, false, false, false }; attachable = new bool[4] { false, false, false, false };
sprite = null; sprite = null;
highlight = null;
animation[0] = null; animation[0] = null;
animation[1] = null; animation[1] = null;
animation[2] = null; animation[2] = null;
......
Assets/Scripts/Item/Items/Baculus.cs
View file @ f830a09e
...@@ -15,6 +15,7 @@ public class Baculus : Item ...@@ -15,6 +15,7 @@ public class Baculus : Item
combo = new string[3] { "BCB", "ACBC", "" }; combo = new string[3] { "BCB", "ACBC", "" };
attachable = new bool[4] { true, true, false, true }; attachable = new bool[4] { true, true, false, true };
sprite = Resources.Load<Sprite>("Sprites/Items/Baculus"); sprite = Resources.Load<Sprite>("Sprites/Items/Baculus");
highlight = Resources.Load<Sprite>("Sprites/Items/Baculus");
animation[0] = Resources.Load<AnimationClip>("Animations/baculusAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/baculusAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2");
animation[2] = null; animation[2] = null;
......
Assets/Scripts/Item/Items/BambooSpear.cs
View file @ f830a09e
...@@ -15,6 +15,7 @@ public class BambooSpear : Item ...@@ -15,6 +15,7 @@ public class BambooSpear : Item
combo = new string[3] { "BAA", "BAC", "" }; combo = new string[3] { "BAA", "BAC", "" };
attachable = new bool[4] { true, false, true, true }; attachable = new bool[4] { true, false, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear"); sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
highlight = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
animation[0] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack2");
animation[2] = null; animation[2] = null;
......
Assets/Scripts/Item/Items/Bow.cs
View file @ f830a09e
...@@ -15,6 +15,7 @@ public class Bow : Item { ...@@ -15,6 +15,7 @@ public class Bow : Item {
combo = new string[3] { "BB", "BC", "" }; combo = new string[3] { "BB", "BC", "" };
attachable = new bool[4] { true, true, true, true }; attachable = new bool[4] { true, true, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bow"); sprite = Resources.Load<Sprite>("Sprites/Items/bow");
highlight = Resources.Load<Sprite>("Sprites/Items/bow");
animation[0] = Resources.Load<AnimationClip>("Animations/bowAttack1"); animation[0] = Resources.Load<AnimationClip>("Animations/bowAttack1");
animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2"); animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2");
animation[2] = null; animation[2] = null;
......
Assets/Scripts/Item/Items/ChainSickle.cs
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/Dagger.cs 0 → 100644
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/Festo.cs
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/FrostShield.cs
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/Ksanife.cs
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/MeteorSword.cs
View file @ f830a09e
This diff is collapsed.
Assets/Scripts/Item/Items/Morgenstern.cs
View file @ f830a09e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment