s452674/Scriptum
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'melania-dev'

Browse Source
This commit is contained in:
KrolMel 2023-01-05 15:50:53 +01:00
commit c55714c486
18 changed files with 157 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Animations/Monster/Crab/Crab.prefab
View File

@ -153,6 +153,7 @@ MonoBehaviour:
worldPosition: {x: 0, y: 0, z: 0}
gridPosition: {x: 0, y: 0}
isChasing: 0
point: {x: 0, y: 0, z: 0}
path: []
--- !u!50 &576360972805091780
Rigidbody2D:
@ -191,7 +192,9 @@ MonoBehaviour:
enemyName: Crab
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 4
baseAttack: 1
baseAttack: 3.5
isKilled: 0
MinionName:
target: {fileID: 0}
chaseRadius: 5
attackRadius: 0.5
@ -210,7 +213,6 @@ MonoBehaviour:
player: {fileID: 4869648843286970700, guid: 4cb7163e44af59f4c9350005c199db3c, type: 3}
thrust: 5
knockTime: 0.2
isKilled: 0
isKilled2: 0
isPanelEnabled: 1
expValue: 4

2
Assets/Animations/Monster/FireSmall/FireSmall.prefab
View File

@ -151,7 +151,7 @@ MonoBehaviour:
enemyName: FireSmall
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 8
baseAttack: 2
baseAttack: 5
isKilled: 0
MinionName:
target: {fileID: 0}

2
Assets/Animations/Monster/Klackon/Klackon.prefab
View File

@ -192,7 +192,7 @@ MonoBehaviour:
enemyName: Klackon
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 10
baseAttack: 2
baseAttack: 6
isKilled: 0
MinionName:
target: {fileID: 0}

4
Assets/Animations/Monster/Mask/Mask.prefab
View File

@ -191,8 +191,8 @@ MonoBehaviour:
moveSpeed: 2
enemyName: Mask
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 6
baseAttack: 1.5
health: 9
baseAttack: 5
isKilled: 0
MinionName:
target: {fileID: 0}

4
Assets/Animations/Monster/Mushroom/Mushroom.prefab
View File

@ -191,8 +191,8 @@ MonoBehaviour:
moveSpeed: 1.7
enemyName: Mushroom
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 8
baseAttack: 2
health: 12
baseAttack: 5.5
isKilled: 0
MinionName:
path: []

4
Assets/Animations/Monster/Skull/Skull.prefab
View File

@ -169,8 +169,8 @@ MonoBehaviour:
moveSpeed: 2
enemyName: Skull
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 12
baseAttack: 1
health: 18
baseAttack: 4
isKilled: 0
MinionName:
target: {fileID: 0}

4
Assets/Animations/Monster/SmallEarth/EarthSmall.prefab
View File

@ -191,8 +191,8 @@ MonoBehaviour:
moveSpeed: 1.6
enemyName: EarthSmall
maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2}
health: 6
baseAttack: 1.5
health: 9
baseAttack: 4.5
isKilled: 0
MinionName:
path: []

4
Assets/Scenes/FirstVillage.unity
View File

@ -563501,7 +563501,7 @@ MonoBehaviour:
Dialogue: {fileID: 0}
EndactionEventList: []
keyToOpen: 101
CanBeOpened: 1
CanBeOpened: 0
OpenInDefaultWay: 1
--- !u!114 &1636410214
MonoBehaviour:
@ -563527,7 +563527,7 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}

347
Assets/Scenes/SampleScene.unity
View File

File diff suppressed because it is too large Load Diff

15
Assets/Scripts/Scriptable Objects/FiveHitEnemy.asset Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86e55e24317208c4ca1e30d641bf42f0, type: 3}
m_Name: FiveHitEnemy
m_EditorClassIdentifier:
initialValue: 15

8
Assets/Scripts/Scriptable Objects/FiveHitEnemy.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 57098e0ce33c2864291aa12279938b9a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Scripts/Scriptable Objects/NineHitEnemy.asset Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86e55e24317208c4ca1e30d641bf42f0, type: 3}
m_Name: NineHitEnemy
m_EditorClassIdentifier:
initialValue: 27

8
Assets/Scripts/Scriptable Objects/NineHitEnemy.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f57d405a3ac6e744d8c03036cd481f64
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Scripts/Scriptable Objects/OneHitEnemy.asset Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86e55e24317208c4ca1e30d641bf42f0, type: 3}
m_Name: OneHitEnemy
m_EditorClassIdentifier:
initialValue: 3

8
Assets/Scripts/Scriptable Objects/OneHitEnemy.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 91834fc89b809df468d4727d2e4ec84b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Scripts/Scriptable Objects/SevenHitEnemy.asset Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86e55e24317208c4ca1e30d641bf42f0, type: 3}
m_Name: SevenHitEnemy
m_EditorClassIdentifier:
initialValue: 21

8
Assets/Scripts/Scriptable Objects/SevenHitEnemy.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0d924c889f92b764e9802521d61f11c7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/Scriptable Objects/ThreeHitEnemyHealth.asset
View File

@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 86e55e24317208c4ca1e30d641bf42f0, type: 3}
m_Name: ThreeHitEnemyHealth
m_EditorClassIdentifier:
initialValue: 3
initialValue: 9