Crizomb/ProjetAMJV_CR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'Integration'"

Browse source 
This reverts commit 0727e44b80, reversing
changes made to 1fb3c9bfbe.
This commit is contained in:
Crizomb 2025-01-29 07:31:05 +01:00
parent 0727e44b80
commit 97b9d94930
103 changed files with 780 additions and 10299 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Prefabs/Units/Base/Bars/ManaBar.prefab
View file

@ -175,7 +175,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
m_PresetInfoIsWorld: 0
--- !u!114 &5571869179874451231
MonoBehaviour:
m_ObjectHideFlags: 0

6
Assets/Prefabs/Units/Base/BaseGolem.prefab
View file

@ -170,15 +170,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <Armor>k__BackingField
value: 25
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <MaxHealth>k__BackingField
value: 200
value: 150
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <CurrentHealth>k__BackingField
value: 200
value: 150
objectReference: {fileID: 0}
- target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: damage

6
Assets/Prefabs/Units/Base/BaseSkeleton.prefab
View file

@ -81,7 +81,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1854268353119403178, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: distanceGoal
value: 30
value: 15
objectReference: {fileID: 0}
- target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: m_Name
@ -149,11 +149,11 @@ PrefabInstance:
objectReference: {fileID: -3894500519728253097}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <MaxHealth>k__BackingField
value: 40
value: 50
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <CurrentHealth>k__BackingField
value: 40
value: 50
objectReference: {fileID: 0}
- target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: attackShape

6
Assets/Prefabs/Units/Base/BaseWitch.prefab
View file

@ -174,14 +174,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
damage: 0
cooldown: 3
cooldown: 1
attackShape: {fileID: 0}
knockbackHorizontalForce: 0
knockbackVerticalForce: 0
arrowPrefab: {fileID: 173966350544600092, guid: c7eca518d1c1db450b901d7d30f20d61, type: 3}
arrowBaseSpeed: 8
arrowBaseSpeed: 10
spawnPos: {fileID: 5966639341884708145}
directShot: 0
directShot: 1
--- !u!114 &1983685764473485393
MonoBehaviour:
m_ObjectHideFlags: 0

4
Assets/Prefabs/Units/Base/BaseZombie.prefab
View file

@ -142,11 +142,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <MaxHealth>k__BackingField
value: 50
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8213395333053285225, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: <CurrentHealth>k__BackingField
value: 50
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3}
propertyPath: m_Enabled

4
Assets/Prefabs/Units/SkeletonA.prefab
View file

@ -14,7 +14,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: directShot
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
@ -30,7 +30,7 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 3f2019db81a04f662aef4921a814266f, type: 2}
- target: {fileID: 6487507096035890842, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: distanceGoal
value: 20
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6872779381538554402, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: m_Name

4
Assets/Prefabs/Units/SkeletonB.prefab
View file

@ -14,7 +14,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: directShot
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
@ -30,7 +30,7 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 6876598314dc3045981aca3566e74903, type: 2}
- target: {fileID: 6487507096035890842, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: distanceGoal
value: 20
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6872779381538554402, guid: 31f097ed795257d8da1f9b48164def89, type: 3}
propertyPath: m_Name