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/Behavior Choice.prefab
View file

@ -288,7 +288,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6598983395310970009
RectTransform:
m_ObjectHideFlags: 0

5
Assets/Prefabs/GameUI.prefab
View file

@ -15,11 +15,11 @@ GameObject:
- component: {fileID: 4449522672392171314}
m_Layer: 5
m_Name: GameUI
m_TagString: GameUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6852038795024868816
RectTransform:
m_ObjectHideFlags: 0
@ -117,7 +117,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
timer: {fileID: 4056475341805437710}
time: 0
timerActive: 0
units: {fileID: 3325753247337786379}
--- !u!1 &1867498029930653014

5
Assets/Prefabs/LosingCanvas.prefab
View file

@ -15,11 +15,11 @@ GameObject:
- component: {fileID: 3125938197174985513}
m_Layer: 5
m_Name: LosingCanvas
m_TagString: LosingUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4456780033352153238
RectTransform:
m_ObjectHideFlags: 0
@ -118,6 +118,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5393cb13d8a7330418334d35a76e6da1, type: 3}
m_Name:
m_EditorClassIdentifier:
gameUI: {fileID: 0}
time: {fileID: 5539803304764880128}
--- !u!1 &2330334162970283666
GameObject:

2
Assets/Prefabs/ManagersAndCam/Camera.prefab
View file

@ -106,7 +106,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1f894d8f1147824dca47609a059e3c28, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 30
moveSpeed: 15
--- !u!114 &6067729508240838155
MonoBehaviour:
m_ObjectHideFlags: 0

26
Assets/Prefabs/ManagersAndCam/GameManager.prefab
View file

@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2326023822257198758}
- component: {fileID: -4518928198845659541}
- component: {fileID: 4500885157334573855}
m_Layer: 0
m_Name: GameManager
@ -34,6 +35,21 @@ Transform:
- {fileID: 375035397367856416}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-4518928198845659541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4421777460897078516}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 674cc8c0eaaaff27c890e7968596e1ec, type: 3}
m_Name:
m_EditorClassIdentifier:
EffectsSource: {fileID: 5412373041479583195}
MusicSource: {fileID: 6398205375808577097}
SoundsList: []
--- !u!114 &4500885157334573855
MonoBehaviour:
m_ObjectHideFlags: 0
@ -47,21 +63,21 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
levelNames:
- MainMenu
- 0_Steeve
- 1_Pumpkin
- 2_Plaza
- 3_Flat
- 4_NotVillageButFine
- 4_NotVillage
levelMusics:
- wait
- cat
- fallen
- pigstep
- sweden
- revenge
levelsMoney: 0000000003000000070000000a0000001900000028000000
fightStarted: 0
levelsMoney: 0f0000001e000000320000006400000096000000
GameUI: {fileID: 0}
LoseUI: {fileID: 0}
WinUI: {fileID: 0}
--- !u!1 &7552951648969690334
GameObject:
m_ObjectHideFlags: 0

2
Assets/Prefabs/Projectiles/Arrow.prefab
View file

@ -76,7 +76,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_lifeSpan: 8
baseDamage: 10
baseKnockback: 3
baseKnockback: 5
--- !u!1 &3333242642527957384
GameObject:
m_ObjectHideFlags: 0

2
Assets/Prefabs/Projectiles/HealthPotion.prefab
View file

@ -76,7 +76,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_lifeSpan: 8
healthAdd: 50
healthAdd: 100
healthPotionEffectArea: {fileID: 7930232572283191225}
explodeMesh: {fileID: 173966350544600092, guid: 4a740d83829a3f11b83abbd4acadc611, type: 3}
exploseMeshTime: 0

6
Assets/Prefabs/StartArea.prefab
View file

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 1852553920262438280}
- component: {fileID: 2847168729042094331}
- component: {fileID: 8329624772352468447}
- component: {fileID: 6043712002669602663}
- component: {fileID: 1911725677042590628}
m_Layer: 3
m_Name: StartArea
m_TagString: Untagged
@ -87,7 +87,7 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &6043712002669602663
--- !u!64 &1911725677042590628
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -100,7 +100,7 @@ MeshCollider:
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 64
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0

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

3
Assets/Prefabs/WinCanvas.prefab
View file

@ -151,7 +151,7 @@ GameObject:
- component: {fileID: 5144714098964261609}
m_Layer: 5
m_Name: WinCanvas
m_TagString: WinningUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -254,6 +254,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
time: {fileID: 1335902319491163578}
gameUI: {fileID: 0}
--- !u!1 &2994547276816314867
GameObject:
m_ObjectHideFlags: 0