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

Merge branch 'main' of https://github.com/Crizomb/ProjetAMJV_CR

Browse source
This commit is contained in:
Kirabsol 2025-01-28 20:31:35 +01:00
commit 0e815e1a05
18 changed files with 32090 additions and 26395 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 2249466492159173874}
- component: {fileID: 8661231803799691655}
- component: {fileID: 1472681377386678432}
- component: {fileID: 6067729508240838155}
m_Layer: 0
m_Name: Camera
m_TagString: MainCamera
@ -105,4 +106,122 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1f894d8f1147824dca47609a059e3c28, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 5
moveSpeed: 15
--- !u!114 &6067729508240838155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8911717581403283216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 289c1b55c9541489481df5cc06664110, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1472681377386678432}
m_TargetAssemblyTypeName: CameraMouvement, Assembly-CSharp
m_MethodName: HandleCameraMovement
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408
m_ActionName: 'Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8
m_ActionName: 'Player/Look[/Mouse/delta]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a
m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/enter]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 852140f2-7766-474d-8707-702459ba45f3
m_ActionName: 'Player/Interact[/Keyboard/e]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3
m_ActionName: 'Player/Crouch[/Keyboard/c]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70
m_ActionName: 'Player/Jump[/Keyboard/space]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0
m_ActionName: 'Player/Previous[/Keyboard/1]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba
m_ActionName: 'Player/Next[/Keyboard/2]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290
m_ActionName: 'Player/Sprint[/Keyboard/leftShift]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: c95b2375-e6d9-4b88-9c4c-c5e76515df4b
m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 7607c7b6-cd76-4816-beef-bd0341cfe950
m_ActionName: 'UI/Submit[/Keyboard/enter]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 15cef263-9014-4fd5-94d9-4e4a6234a6ef
m_ActionName: 'UI/Cancel[/Keyboard/escape]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 32b35790-4ed0-4e9a-aa41-69ac6d629449
m_ActionName: 'UI/Point[/Mouse/position]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 3c7022bf-7922-4f7c-a998-c437916075ad
m_ActionName: 'UI/Click[/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 44b200b1-1557-4083-816c-b22cbdf77ddf
m_ActionName: 'UI/RightClick[/Mouse/rightButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: dad70c86-b58c-4b17-88ad-f5e53adf419e
m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 0489e84a-4833-4c40-bfae-cea84b696689
m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 24908448-c609-4bc3-a128-ea258674378a
m_ActionName: UI/TrackedDevicePosition
- m_PersistentCalls:
m_Calls: []
m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be
m_ActionName: UI/TrackedDeviceOrientation
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}

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

@ -9,7 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2326023822257198758}
- component: {fileID: 7444322309943002451}
- component: {fileID: -4518928198845659541}
- component: {fileID: 4500885157334573855}
m_Layer: 0
@ -36,124 +35,6 @@ Transform:
- {fileID: 375035397367856416}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7444322309943002451
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: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 289c1b55c9541489481df5cc06664110, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1472681377386678432, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
m_TargetAssemblyTypeName: CameraMouvement, Assembly-CSharp
m_MethodName: HandleCameraMovement
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408
m_ActionName: 'Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8
m_ActionName: 'Player/Look[/Mouse/delta]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a
m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/enter]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 852140f2-7766-474d-8707-702459ba45f3
m_ActionName: 'Player/Interact[/Keyboard/e]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3
m_ActionName: 'Player/Crouch[/Keyboard/c]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70
m_ActionName: 'Player/Jump[/Keyboard/space]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0
m_ActionName: 'Player/Previous[/Keyboard/1]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba
m_ActionName: 'Player/Next[/Keyboard/2]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290
m_ActionName: 'Player/Sprint[/Keyboard/leftShift]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: c95b2375-e6d9-4b88-9c4c-c5e76515df4b
m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 7607c7b6-cd76-4816-beef-bd0341cfe950
m_ActionName: 'UI/Submit[/Keyboard/enter]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 15cef263-9014-4fd5-94d9-4e4a6234a6ef
m_ActionName: 'UI/Cancel[/Keyboard/escape]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 32b35790-4ed0-4e9a-aa41-69ac6d629449
m_ActionName: 'UI/Point[/Mouse/position]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 3c7022bf-7922-4f7c-a998-c437916075ad
m_ActionName: 'UI/Click[/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 44b200b1-1557-4083-816c-b22cbdf77ddf
m_ActionName: 'UI/RightClick[/Mouse/rightButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: dad70c86-b58c-4b17-88ad-f5e53adf419e
m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 0489e84a-4833-4c40-bfae-cea84b696689
m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 24908448-c609-4bc3-a128-ea258674378a
m_ActionName: UI/TrackedDevicePosition
- m_PersistentCalls:
m_Calls: []
m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be
m_ActionName: UI/TrackedDeviceOrientation
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &-4518928198845659541
MonoBehaviour:
m_ObjectHideFlags: 0
@ -186,6 +67,7 @@ MonoBehaviour:
- 2_Plaza
- 3_Flat
- 4_NotVillage
levelsMoney: 0f0000001e000000320000006400000096000000
--- !u!1 &7552951648969690334
GameObject:
m_ObjectHideFlags: 0

27
Assets/Scenes/LevelsTest/0_Steeve.unity
View file

@ -448,6 +448,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1
@ -509,6 +513,14 @@ PrefabInstance:
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2045002905}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: HandleCameraMovement
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -753,6 +765,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1
@ -990,6 +1006,17 @@ MonoBehaviour:
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!114 &2045002905 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1472681377386678432, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
m_PrefabInstance: {fileID: 2094749809}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f894d8f1147824dca47609a059e3c28, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2094749809
PrefabInstance:
m_ObjectHideFlags: 0

27
Assets/Scenes/LevelsTest/1_Pumpkin.unity
View file

@ -268,6 +268,14 @@ PrefabInstance:
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2094749810}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: HandleCameraMovement
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -690,6 +698,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1
@ -897,6 +909,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1
@ -967,6 +983,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
--- !u!114 &2094749810 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1472681377386678432, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
m_PrefabInstance: {fileID: 2094749809}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f894d8f1147824dca47609a059e3c28, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0

8
Assets/Scenes/LevelsTest/2_Plaza.unity
View file

@ -167,6 +167,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6879188814390164746, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1
@ -607,6 +611,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8820838586788899307, guid: a0750dd4706e5480da2ad597b62d8531, type: 3}
propertyPath: <IsQueen>k__BackingField
value: 1

26316
Assets/Scenes/LevelsTest/3_Flat.unity
View file

File diff suppressed because it is too large Load diff

31628
Assets/Scenes/LevelsTest/3_Flat_lot_of_unites.unity Normal file
View file

File diff suppressed because it is too large Load diff

7
Assets/Scenes/LevelsTest/3_Flat_lot_of_unites.unity.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6aa5c00d2c7189f31b4e29d44e9f8514
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Scenes/LevelsTest/4_NotVillageButFine.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1c3b758df16b40244b6cb8f0c289d9b6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

167
Assets/Scenes/LevelsTest/4_NotVillageButFine.unity
View file

@ -520,6 +520,18 @@ PrefabInstance:
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1405991356}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7444322309943002451, guid: e0cd2add4bbdcf59a8c46048ba422a58, type: 3}
propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: HandleCameraMovement
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -689,7 +701,7 @@ PrefabInstance:
- target: {fileID: 1969199041552567758, guid: 6ad55a398b7989c9cbd10b7804913360, type: 3}
propertyPath: m_NavMeshData
value:
objectReference: {fileID: 23800000, guid: a5f0861dda283fafba6725b90c79e526, type: 2}
objectReference: {fileID: 23800000, guid: afee5035d822c08428c88fe97eab9bf5, type: 2}
- target: {fileID: 1969199041552567758, guid: 6ad55a398b7989c9cbd10b7804913360, type: 3}
propertyPath: m_GenerateLinks
value: 0
@ -701,7 +713,7 @@ PrefabInstance:
- target: {fileID: 6778669920814834500, guid: 6ad55a398b7989c9cbd10b7804913360, type: 3}
propertyPath: m_NavMeshData
value:
objectReference: {fileID: 23800000, guid: 2a4993ced28298d909cd0574b71ace20, type: 2}
objectReference: {fileID: 23800000, guid: 0e87bbe2be7bb609e988af89df37bd98, type: 2}
- target: {fileID: 6778669920814834500, guid: 6ad55a398b7989c9cbd10b7804913360, type: 3}
propertyPath: m_GenerateLinks
value: 0
@ -751,6 +763,17 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ad55a398b7989c9cbd10b7804913360, type: 3}
--- !u!114 &1405991356 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1472681377386678432, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
m_PrefabInstance: {fileID: 2094749809}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f894d8f1147824dca47609a059e3c28, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1561059824
GameObject:
m_ObjectHideFlags: 0
@ -808,7 +831,7 @@ MonoBehaviour:
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!1001 &1726440814
--- !u!1001 &1832786605
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -816,63 +839,67 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5113075489251224786, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 1643108264674905834, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5113075489251224786, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 1643108264674905834, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143014781293929899, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 1686490180342253459, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5143014781293929899, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 1686490180342253459, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5229567879775661338, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 1777546452201213730, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_Name
value: WitchB
value: SkeletonA
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 2868153537474490702, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalPosition.x
value: -28.25
value: -2.279069
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalPosition.y
value: 2.103097
value: 2.05
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalPosition.z
value: 6.18
value: -17.433907
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
- target: {fileID: 3355382189405610363, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
@ -880,7 +907,7 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: eaae2ffdc489e1694a7987f8739ada29, type: 3}
--- !u!1 &1850341132
GameObject:
m_ObjectHideFlags: 0
@ -938,6 +965,83 @@ MonoBehaviour:
m_Bidirectional: 1
m_AutoUpdatePosition: 0
m_Area: 0
--- !u!1001 &1932630782
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1336978073320850108, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1336978073320850108, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1380078243395029957, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1380078243395029957, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2083905689776276340, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_Name
value: SkeletonB
objectReference: {fileID: 0}
- target: {fileID: 2561741463155129624, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: _isQueen
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalPosition.x
value: -22.043972
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalPosition.y
value: 1.78
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalPosition.z
value: 11.753212
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3085016774773828909, guid: b015905a96a8532a98d619573f9e665b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b015905a96a8532a98d619573f9e665b, type: 3}
--- !u!1 &2075543941
GameObject:
m_ObjectHideFlags: 0
@ -1009,31 +1113,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalPosition.x
value: -29.180618
value: -17.41034
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalPosition.y
value: 82.724
value: 14.611649
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalPosition.z
value: -84.00799
value: -25.317358
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalRotation.w
value: -0.866493
value: -0.9443275
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalRotation.x
value: -0.40771976
value: -0.24344613
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalRotation.y
value: -0.2605984
value: -0.21429971
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalRotation.z
value: 0.12265012
value: 0.055275388
objectReference: {fileID: 0}
- target: {fileID: 4530405755252736471, guid: e06ef2ca4b6f9e4eabce443a22c76cc7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -1065,4 +1169,5 @@ SceneRoots:
- {fileID: 936761048}
- {fileID: 2094749809}
- {fileID: 148391555}
- {fileID: 1726440814}
- {fileID: 1932630782}
- {fileID: 1832786605}

BIN
Assets/Scenes/LevelsTest/4_NotVillageButFine/NavMesh-NavMesh Surface 1.asset Normal file
View file

Binary file not shown.

8
Assets/Scenes/LevelsTest/4_NotVillageButFine/NavMesh-NavMesh Surface 1.asset.meta Normal file
View file

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

BIN
Assets/Scenes/LevelsTest/4_NotVillageButFine/NavMesh-NavMesh Surface.asset Normal file
View file

Binary file not shown.

8
Assets/Scenes/LevelsTest/4_NotVillageButFine/NavMesh-NavMesh Surface.asset.meta Normal file
View file

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

2
Assets/Scripts/CameraMouvement.cs
View file

@ -23,6 +23,6 @@ public class CameraMouvement : MonoBehaviour
void Update()
{
var mouvement = moveSpeed * Time.deltaTime * (new Vector3(_moveInput.y, 0, -_moveInput.x));
transform.Translate(mouvement, Space.World);
transform.Translate(transform.TransformVector(mouvement), Space.World);
}
}

23
Assets/Scripts/Singletons/GameManager.cs
View file

@ -7,8 +7,8 @@ using UnityEngine.SceneManagement;
public class GameManager : MonoBehaviourSingletonPersistent<GameManager>
{
[SerializeField] private List<string> levelNames;
int current_level = 0;
[SerializeField] private List<int> levelsMoney;
int current_level = -1;
[SerializeField] GameObject GameUI;
[SerializeField] GameObject LoseUI;
@ -18,7 +18,7 @@ public class GameManager : MonoBehaviourSingletonPersistent<GameManager>
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
GoNextLevel();
}
// Update is called once per frame
@ -40,14 +40,29 @@ public class GameManager : MonoBehaviourSingletonPersistent<GameManager>
}
}
private void SetGlobals(int current_level)
{
GlobalsVariable.AliveUnitsTeamB = new List<AbstractUnit>();
GlobalsVariable.AliveUnitsTeamA = new List<AbstractUnit>();
GlobalsVariable.QueenA = null;
GlobalsVariable.QueenB = null;
GlobalsVariable.money = levelsMoney[current_level];
}
public void ReloadLevel()
{
print("get good, reload current scene");
SetGlobals(current_level);
SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().name);
}
public void GoNextLevel()
{
if (current_level < levelNames.Count)
{
current_level++;
SetGlobals(current_level);
SceneManager.LoadScene(levelNames[current_level]);
return;
}
throw new Exception("Bro there is no next level like stop pls");

5
Assets/Scripts/UnitScripts/HealthHandler.cs
View file

@ -52,13 +52,10 @@ public class HealthHandler : MonoBehaviour
return;
}
GlobalsVariable.AliveUnitsTeamB = new List<AbstractUnit>();
GlobalsVariable.AliveUnitsTeamA = new List<AbstractUnit>();
if (deathState == DeathSate.QueenBDead)
{
print("get good, reload current scene");
SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().name);
GameManager.Instance.ReloadLevel();
}
if (deathState == DeathSate.QueenADead)

8
Assets/Scripts/UnitScripts/MinecraftUnit.cs
View file

@ -31,6 +31,14 @@ public class MinecraftUnit : AbstractUnit
if (IsQueen)
{
transform.Find("Crown").gameObject.SetActive(true);
if (IsTeamA)
{
GlobalsVariable.QueenA = this;
}
else
{
GlobalsVariable.QueenB = this;
}
}
}