Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into enikeev/dev/2

This commit is contained in:
Enikeevtimur
2022-05-10 00:34:08 +07:00
77 changed files with 37745 additions and 4651 deletions

5
.gitignore vendored
View File

@ -2,6 +2,11 @@
# #
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
# #
# MLagents
Assets/ML-Agents/Timers/*
#
/[Ll]ibrary/ /[Ll]ibrary/
/[Tt]emp/ /[Tt]emp/
/[Oo]bj/ /[Oo]bj/

1
1 Normal file
View File

@ -0,0 +1 @@

View File

@ -1 +0,0 @@
{"count":1,"self":249.99626239999998,"total":250.70272609999998,"children":{"InitializeActuators":{"count":1,"self":0.0005131,"total":0.0005131,"children":null},"AgentSendState":{"count":8389,"self":0.1187579,"total":0.1187579,"children":null},"DecideAction":{"count":8389,"self":0.5871921,"total":0.5871921,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1649259643","unity_version":"2019.4.36f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2019.4.36f1\\Editor\\Unity.exe -projectpath D:\\real_shooter -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-user -hubSessionId 91406950-b5ad-11ec-a63c-e7b76cbae13d -accessToken EBt97pMhHqClFDnjD_uh-3vplxP-uI2yS0WK-hSxfuM012f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DemoScene01","end_time_seconds":"1649259893"}}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 1b328c4e26e7a994e8a42f269ca7419b
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +0,0 @@
<<<<<<< HEAD
{"count":1,"self":53.1106048,"total":53.237429,"children":{"InitializeActuators":{"count":2,"self":0.0019932,"total":0.0019932,"children":null},"InitializeSensors":{"count":2,"self":0.0019554999999999998,"total":0.0059847,"children":{"CreateObservableSensors":{"count":1,"self":0.0040292,"total":0.0040292,"children":null}}},"AgentSendState":{"count":1955,"self":0.0487552,"total":0.0846104,"children":{"CollectObservations":{"count":1955,"self":0.0069507,"total":0.0069507,"children":null},"WriteActionMask":{"count":1955,"self":0.0133727,"total":0.0133727,"children":null},"RequestDecision":{"count":1955,"self":0.0155318,"total":0.0155318,"children":null}}},"DecideAction":{"count":1955,"self":0.0238471,"total":0.0238471,"children":null},"AgentAct":{"count":1955,"self":0.0083594999999999989,"total":0.0083594999999999989,"children":null}},"gauges":{"Defender Behaviour.CumulativeReward":{"count":1,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0},"NPC.CumulativeReward":{"count":19,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1650269333","unity_version":"2019.4.36f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2019.4.36f1\\Editor\\Unity.exe -projectpath D:\\real-shooter-git -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-0gxjnU2tE3R1JAgVcOu84 -hubSessionId 617c85c0-beed-11ec-9737-adc452e9defe -accessToken jGHX5jX1yB9hRz2Om-mndr4yVItZwtReMKF_pNdib-I012f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1650269386"}}
=======
{"count":1,"self":19.9775968,"total":20.018629999999998,"children":{"InitializeActuators":{"count":1,"self":0.0010006,"total":0.0010006,"children":null},"AgentSendState":{"count":765,"self":0.0057472999999999995,"total":0.0057472999999999995,"children":null},"DecideAction":{"count":765,"self":0.0332866,"total":0.0332866,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1649742457","unity_version":"2019.4.35f1","command_line_arguments":"D:\\Unity\\2019.4.35f1\\Editor\\Unity.exe -projectpath C:\\Users\\kiril\\real-shooter -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-kiril -hubSessionId 21e9de90-ba14-11ec-9398-079edccf5e34 -accessToken oIpf_7gKWQQRilVTeJehUsFhrxasdzsG_K3j5Swtgx0009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1649742477"}}
>>>>>>> lisin/character/1

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 80ef0d75029e25243857877facd14d75
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1 +0,0 @@
{"count":1,"self":2463.6164095999998,"total":2463.7432165,"children":{"InitializeActuators":{"count":2,"self":0.0019932,"total":0.0019932,"children":null},"InitializeSensors":{"count":2,"self":0.0019554999999999998,"total":0.0059847,"children":{"CreateObservableSensors":{"count":1,"self":0.0040292,"total":0.0040292,"children":null}}},"AgentSendState":{"count":1955,"self":0.0487552,"total":0.0846104,"children":{"CollectObservations":{"count":1955,"self":0.0069507,"total":0.0069507,"children":null},"WriteActionMask":{"count":1955,"self":0.0133727,"total":0.0133727,"children":null},"RequestDecision":{"count":1955,"self":0.0155318,"total":0.0155318,"children":null}}},"DecideAction":{"count":1955,"self":0.0238471,"total":0.0238471,"children":null},"AgentAct":{"count":1955,"self":0.0083594999999999989,"total":0.0083594999999999989,"children":null},"CreateObservableSensors":{"count":18,"self":0.0019966,"total":0.0019966,"children":null}},"gauges":{"Defender Behaviour.CumulativeReward":{"count":1,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0},"NPC.CumulativeReward":{"count":19,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1650269333","unity_version":"2019.4.36f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2019.4.36f1\\Editor\\Unity.exe -projectpath D:\\real-shooter-git -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-0gxjnU2tE3R1JAgVcOu84 -hubSessionId 617c85c0-beed-11ec-9737-adc452e9defe -accessToken jGHX5jX1yB9hRz2Om-mndr4yVItZwtReMKF_pNdib-I012f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"dont touch me plz","end_time_seconds":"1650271796"}}

228
Assets/Prefabs/Bot.prefab generated Executable file → Normal file
View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &2988578997639256874 --- !u!1 &6171680323407988095
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,47 +8,86 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2988578997639256870} - component: {fileID: 6171680323407988094}
- component: {fileID: 2988578997639256869} m_Layer: 8
- component: {fileID: 2988578997639256868} m_Name: FeetTransform
- component: {fileID: 2988578997639256875}
- component: {fileID: 5447337162552783061}
m_Layer: 0
m_Name: Bot
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &2988578997639256870 --- !u!4 &6171680323407988094
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2988578997639256874} m_GameObject: {fileID: 6171680323407988095}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 28.310326, y: 13.98, z: 46.45} m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 6171680323948707550}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2988578997639256869 --- !u!1 &6171680323948707524
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6171680323948707550}
- component: {fileID: 6171680323948707551}
- component: {fileID: 5770895893828047079}
- component: {fileID: 6171680323948707521}
- component: {fileID: 6171680323948707549}
- component: {fileID: 6171680323948707520}
- component: {fileID: 8774702625908438859}
- component: {fileID: 6521536090983603910}
- component: {fileID: 6133354754598649724}
- component: {fileID: 2756943273076691504}
- component: {fileID: 6638271233700792696}
- component: {fileID: 5988018701276467001}
- component: {fileID: 1547882613481475944}
m_Layer: 8
m_Name: Bot
m_TagString: Defender
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6171680323948707550
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 50.67923, y: 1.16, z: -22.57}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6171680323407988094}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!33 &6171680323948707551
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2988578997639256874} m_GameObject: {fileID: 6171680323948707524}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2988578997639256868 --- !u!23 &5770895893828047079
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2988578997639256874} m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
@ -81,33 +120,170 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!136 &2988578997639256875 --- !u!136 &6171680323948707521
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2988578997639256874} m_GameObject: {fileID: 6171680323948707524}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
m_Radius: 0.5 m_Radius: 0.3
m_Height: 2 m_Height: 2
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5447337162552783061 --- !u!136 &6171680323948707549
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Radius: 0.3
m_Height: 1.3
m_Direction: 1
m_Center: {x: 0, y: -0.35, z: 0}
--- !u!136 &6171680323948707520
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.3
m_Height: 0.8
m_Direction: 1
m_Center: {x: 0, y: -0.6, z: 0}
--- !u!195 &8774702625908438859
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 0.5000001
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 2
m_BaseOffset: 1
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!114 &6521536090983603910
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2988578997639256874} m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
navMeshAgent: {fileID: 8774702625908438859}
flag: {fileID: 6818223691859422291, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3}
--- !u!114 &6133354754598649724
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dd8012d5925524537b27131fef517017, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SensorName: BufferSensor
m_ObservableSize: 5
m_MaxNumObservables: 10
--- !u!114 &2756943273076691504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BrainParameters:
VectorObservationSize: 14
NumStackedVectorObservations: 1
m_ActionSpec:
m_NumContinuousActions: 0
BranchSizes: 010000000100000001000000
VectorActionSize: 010000000100000001000000
VectorActionDescriptions: []
VectorActionSpaceType: 0
hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 0}
m_InferenceDevice: 0
m_BehaviorType: 0
m_BehaviorName: npc
TeamId: 0
m_UseChildSensors: 1
m_UseChildActuators: 1
m_ObservableAttributeHandling: 0
--- !u!114 &6638271233700792696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3} m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
HealthPoints: 100 agentParameters:
Armour: 100 maxStep: 0
Ammunition: 360 hasUpgradedFromAgentParameters: 1
LastTimeHit: 0 MaxStep: 100
--- !u!114 &5988018701276467001
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
navMeshAgent: {fileID: 8774702625908438859}
flag: {fileID: 6818223691859422291, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3}
--- !u!114 &1547882613481475944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6171680323948707524}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
m_Name:
m_EditorClassIdentifier:
DecisionPeriod: 5
TakeActionsBetweenDecisions: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4528203470433968325 --- !u!1 &5245491127989480125
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,101 +8,18 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4528203470433968376} - component: {fileID: 5245491127989480103}
- component: {fileID: 4528203470433968327} - component: {fileID: 5245491127989480102}
- component: {fileID: 4528203470433968326} - component: {fileID: 5583297852527723678}
m_Layer: 8 - component: {fileID: 5245491127989480120}
m_Name: Camera - component: {fileID: 5245491127989480100}
m_TagString: Untagged - component: {fileID: 5245491127989480121}
m_Icon: {fileID: 0} - component: {fileID: 7254047075221496626}
m_NavMeshLayer: 0 - component: {fileID: 5182704636738128575}
m_StaticEditorFlags: 0 - component: {fileID: 5220658550450318085}
m_IsActive: 1 - component: {fileID: 4264677542023120457}
--- !u!4 &4528203470433968376 - component: {fileID: 4715950961444674817}
Transform: - component: {fileID: 5653209015090846528}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470433968325}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.734, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4528203471293941515}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &4528203470433968327
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470433968325}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &4528203470433968326
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470433968325}
m_Enabled: 1
--- !u!1 &4528203470625763699
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4528203470625763689}
- component: {fileID: 4528203470625763688}
- component: {fileID: -4942972567661207728}
- component: {fileID: 4528203470625763702}
- component: {fileID: 4528203470625763690}
- component: {fileID: 4528203470625763703}
- component: {fileID: 4528203470625763701}
- component: {fileID: 4528203470625763700}
- component: {fileID: 1061105263471521090}
- component: {fileID: 1809549200}
- component: {fileID: 1809549201}
- component: {fileID: 1809549212}
m_Layer: 8 m_Layer: 8
m_Name: Player m_Name: Player
m_TagString: Defender m_TagString: Defender
@ -110,37 +27,37 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &4528203470625763689 --- !u!4 &5245491127989480103
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 28.21, y: 14.12, z: 48.395} m_LocalPosition: {x: 28.21, y: 10.9, z: 46.67}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4528203471293941515} - {fileID: 5245491129196666053}
- {fileID: 4528203471164033737} - {fileID: 5245491129603592455}
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: 90, z: 0}
--- !u!33 &4528203470625763688 --- !u!33 &5245491127989480102
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &-4942972567661207728 --- !u!23 &5583297852527723678
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
@ -173,13 +90,13 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!136 &4528203470625763702 --- !u!136 &5245491127989480120
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 0 m_Enabled: 0
@ -187,13 +104,13 @@ CapsuleCollider:
m_Height: 2 m_Height: 2
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!136 &4528203470625763690 --- !u!136 &5245491127989480100
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 0 m_Enabled: 0
@ -201,13 +118,13 @@ CapsuleCollider:
m_Height: 1.3 m_Height: 1.3
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: -0.35, z: 0} m_Center: {x: 0, y: -0.35, z: 0}
--- !u!136 &4528203470625763703 --- !u!136 &5245491127989480121
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
@ -215,119 +132,16 @@ CapsuleCollider:
m_Height: 0.8 m_Height: 0.8
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: -0.6, z: 0} m_Center: {x: 0, y: -0.6, z: 0}
--- !u!143 &4528203470625763701 --- !u!195 &7254047075221496626
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Height: 2
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4528203470625763700
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
m_Name:
m_EditorClassIdentifier:
input_View: {x: 0, y: 0}
cameraHolder: {fileID: 4528203471293941515}
feetTransform: {fileID: 4528203471164033737}
playerSettings:
ViewXSensetivity: 20
ViewYSensetivity: 20
ViewXInverted: 0
ViewYInverted: 0
SprintingHold: 0
MovementSmoothing: 0
RunningForwardSpeed: 10
RunningStrafeSpeed: 6
WalkingForwardSpeed: 4
WalkingBackwardSpeed: 2
WalkingStrafeSpeed: 3
JumpingHeight: 6
JumpingFalloff: 1
FallingSmoothing: 0
SpeedEffector: 1
CrouchSpeedEffector: 0
ProneSpeedEffector: 0
FallingSpeedEffector: 0
ViewClampYMin: -70
ViewClampYMax: 80
playerMask:
serializedVersion: 2
m_Bits: 55
gravityAmount: 0.05
gravityMin: -3
jumpingForce: {x: 0, y: 0, z: 0}
playerStance: 0
playerStanceSmoothing: 0.2
playerStandStance:
CameraHeight: 0.7
StanceCollider: {fileID: 4528203470625763702}
playerCrouchStance:
CameraHeight: 0.3
StanceCollider: {fileID: 4528203470625763690}
playerProneStance:
CameraHeight: -0.58
StanceCollider: {fileID: 4528203470625763703}
currentWeapon: {fileID: 0}
--- !u!114 &1061105263471521090
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
m_Name:
m_EditorClassIdentifier:
agentParameters:
maxStep: 0
hasUpgradedFromAgentParameters: 1
MaxStep: 10
moveController: {fileID: 1809549200}
--- !u!114 &1809549200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
mapManager: {fileID: 0}
navMeshAgent: {fileID: 1809549201}
--- !u!195 &1809549201
NavMeshAgent: NavMeshAgent:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1 m_Enabled: 1
m_AgentTypeID: 0 m_AgentTypeID: 0
m_Radius: 0.5 m_Radius: 0.5000001
m_Speed: 3.5 m_Speed: 3.5
m_Acceleration: 8 m_Acceleration: 8
avoidancePriority: 50 avoidancePriority: 50
@ -340,20 +154,49 @@ NavMeshAgent:
m_BaseOffset: 1 m_BaseOffset: 1
m_WalkableMask: 4294967295 m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4 m_ObstacleAvoidanceType: 4
--- !u!114 &1809549212 --- !u!114 &5182704636738128575
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203470625763699} m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
navMeshAgent: {fileID: 0}
flag: {fileID: 0}
--- !u!114 &5220658550450318085
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dd8012d5925524537b27131fef517017, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SensorName: BufferSensor
m_ObservableSize: 0
m_MaxNumObservables: 0
--- !u!114 &4264677542023120457
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3} m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_BrainParameters: m_BrainParameters:
VectorObservationSize: 4 VectorObservationSize: 1
NumStackedVectorObservations: 1 NumStackedVectorObservations: 1
m_ActionSpec: m_ActionSpec:
m_NumContinuousActions: 0 m_NumContinuousActions: 0
@ -363,14 +206,44 @@ MonoBehaviour:
VectorActionSpaceType: 0 VectorActionSpaceType: 0
hasUpgradedBrainParametersWithActionSpec: 1 hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 0} m_Model: {fileID: 0}
m_InferenceDevice: 3 m_InferenceDevice: 0
m_BehaviorType: 1 m_BehaviorType: 0
m_BehaviorName: Defender Behaviour m_BehaviorName: My Behavior
TeamId: 0 TeamId: 0
m_UseChildSensors: 0 m_UseChildSensors: 1
m_UseChildActuators: 1 m_UseChildActuators: 1
m_ObservableAttributeHandling: 2 m_ObservableAttributeHandling: 0
--- !u!1 &4528203471164033736 --- !u!114 &4715950961444674817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
m_Name:
m_EditorClassIdentifier:
agentParameters:
maxStep: 0
hasUpgradedFromAgentParameters: 1
MaxStep: 0
--- !u!114 &5653209015090846528
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
navMeshAgent: {fileID: 7254047075221496626}
flag: {fileID: 0}
--- !u!1 &5245491128202443531
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -378,29 +251,82 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4528203471164033737} - component: {fileID: 5245491128202443574}
- component: {fileID: 5245491128202443529}
- component: {fileID: 5245491128202443528}
m_Layer: 8 m_Layer: 8
m_Name: FeetTransform m_Name: Camera
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &4528203471164033737 --- !u!4 &5245491128202443574
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203471164033736} m_GameObject: {fileID: 5245491128202443531}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalPosition: {x: 0, y: 0.388, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4528203470625763689} m_Father: {fileID: 5245491129196666053}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4528203471293941514 --- !u!20 &5245491128202443529
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491128202443531}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.1
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &5245491128202443528
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491128202443531}
m_Enabled: 1
--- !u!1 &5245491129196666052
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -408,7 +334,7 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4528203471293941515} - component: {fileID: 5245491129196666053}
m_Layer: 8 m_Layer: 8
m_Name: CameraHolder m_Name: CameraHolder
m_TagString: Untagged m_TagString: Untagged
@ -416,18 +342,194 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &4528203471293941515 --- !u!4 &5245491129196666053
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4528203471293941514} m_GameObject: {fileID: 5245491129196666052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.7, z: 0} m_LocalPosition: {x: 0, y: 0.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4528203470433968376} - {fileID: 5245491128202443574}
m_Father: {fileID: 4528203470625763689} - {fileID: 8510909888689775087}
m_Father: {fileID: 5245491127989480103}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5245491129603592454
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5245491129603592455}
m_Layer: 8
m_Name: FeetTransform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5245491129603592455
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491129603592454}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5245491127989480103}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8510909888198732725
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8510909888198732726}
- component: {fileID: 8510909888198732713}
- component: {fileID: 8510909888198732712}
- component: {fileID: 8510909888198732727}
m_Layer: 8
m_Name: WeaponModel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8510909888198732726
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888198732725}
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: 8510909888689775087}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8510909888198732713
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888198732725}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8510909888198732712
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888198732725}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &8510909888198732727
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888198732725}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8510909888689775085
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8510909888689775087}
- component: {fileID: 8510909888689775086}
m_Layer: 8
m_Name: Weapon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8510909888689775087
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888689775085}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.332, y: 0.038, z: 0.394}
m_LocalScale: {x: 0.16226998, y: 0.1581135, z: 1}
m_Children:
- {fileID: 8510909888198732726}
m_Father: {fileID: 5245491129196666053}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8510909888689775086
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888689775085}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 088bf904d7c90a44dbb35c1d47c2692e, type: 3}
m_Name:
m_EditorClassIdentifier:
settings:
SwayAmount: 4
SwayYInverted: 0
SwayXInverted: 0
SwaySmoothing: 0.1
SwayResetSmoothing: 0.1
SwayClampX: 8
SwayClampY: 8

2
Assets/Prefabs/Player.prefab.meta generated Executable file → Normal file
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 99bb17a23a489624baeaf337f91a4f84 guid: a7480b77908b042d8adcdd84e8c2c15e
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 63fefa6166d5e6c4b96e83cc243f0a18 guid: 0399b431a9578c84498be1b74b85e3b3
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1 @@
{"androidStore":"GooglePlay"}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 249f8a9af2b0bc041a08a0009a6fdf44 guid: a9107cc6399d82a40836e1a1be4e5030
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:

696
Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity generated Executable file → Normal file
View File

@ -259,7 +259,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &140697607 --- !u!23 &140697607
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -352,7 +355,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &293522541 --- !u!23 &293522541
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1249,12 +1255,6 @@ Transform:
m_Father: {fileID: 671439045} m_Father: {fileID: 671439045}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!4 &868386701 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
m_PrefabInstance: {fileID: 1809549197}
m_PrefabAsset: {fileID: 0}
--- !u!1 &884498019 --- !u!1 &884498019
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1288,80 +1288,6 @@ Transform:
m_Father: {fileID: 782729761} m_Father: {fileID: 782729761}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1061293905
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 868386701}
m_Modifications:
- target: {fileID: 2836004473841745626, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 95a44e56d04c7d248ba723eda9611c51, type: 2}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591695743, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_Name
value: DragonFucker
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f432554f564e69242897607d34218939, type: 3}
--- !u!1 &1116745543 --- !u!1 &1116745543
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1393,7 +1319,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &1116745545 --- !u!23 &1116745545
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1554,7 +1483,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh17416 m_Name: pb_Mesh16900
serializedVersion: 10 serializedVersion: 10
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
@ -1840,7 +1769,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &1345085343 --- !u!23 &1345085343
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1933,7 +1865,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &1488699524 --- !u!23 &1488699524
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2152,7 +2087,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &1663305224 --- !u!23 &1663305224
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2200,105 +2138,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1663305221} m_GameObject: {fileID: 1663305221}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1809549197
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -4942972567661207728, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.x
value: 42.23
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.z
value: -15.91
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763699, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: playerStance
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: playerCrouchStance.CameraHeight
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763703, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.417
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99bb17a23a489624baeaf337f91a4f84, type: 3}
--- !u!1 &1858987083 --- !u!1 &1858987083
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2311,8 +2150,10 @@ GameObject:
- component: {fileID: 1858987086} - component: {fileID: 1858987086}
- component: {fileID: 1858987084} - component: {fileID: 1858987084}
- component: {fileID: 1858987089} - component: {fileID: 1858987089}
- component: {fileID: 1858987090}
- component: {fileID: 1858987088} - component: {fileID: 1858987088}
- component: {fileID: 1858987085} - component: {fileID: 1858987085}
- component: {fileID: 1858987091}
m_Layer: 0 m_Layer: 0
m_Name: Game m_Name: Game
m_TagString: Untagged m_TagString: Untagged
@ -2332,7 +2173,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 81d1d84442a0ba441976abd6fdd22788, type: 3} m_Script: {fileID: 11500000, guid: 81d1d84442a0ba441976abd6fdd22788, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
CurrentTime: 0
--- !u!114 &1858987085 --- !u!114 &1858987085
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2406,6 +2246,38 @@ MonoBehaviour:
- {fileID: 1345085342} - {fileID: 1345085342}
- {fileID: 1116745544} - {fileID: 1116745544}
- {fileID: 2004854094} - {fileID: 2004854094}
--- !u!114 &1858987090
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858987083}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0835d77f48130e4f81c678f710bf87c, type: 3}
m_Name:
m_EditorClassIdentifier:
spawnPointsForDefendersTeam:
- {fileID: 140697606}
spawnPointsForAttackersTeam:
- {fileID: 2004854094}
AIPrefab: {fileID: 6171680323948707524, guid: b016874eb34cc084aa4359f0bbec50e1,
type: 3}
PlayerPrefab: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
type: 3}
--- !u!114 &1858987091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858987083}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf3fe86787bfb0c4b8751fe495148ede, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1871257865 --- !u!1 &1871257865
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2659,7 +2531,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PointId: 1 navType: 1
PointId: 0
DeathAttr: 0
EnemiesSeen: []
--- !u!23 &2004854095 --- !u!23 &2004854095
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2877,88 +2752,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114154251} m_GameObject: {fileID: 2114154251}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &5078004101906046130
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
m_Name:
m_EditorClassIdentifier:
agentParameters:
maxStep: 0
hasUpgradedFromAgentParameters: 1
MaxStep: 100
moveController: {fileID: 5242608118223468128}
--- !u!114 &5242608118223468128
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
m_Name:
m_EditorClassIdentifier:
navMeshAgent: {fileID: 5242608118223468129}
--- !u!195 &5242608118223468129
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 0.5
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 2
m_BaseOffset: 1
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!114 &5242608118223468140
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BrainParameters:
VectorObservationSize: 4
NumStackedVectorObservations: 1
m_ActionSpec:
m_NumContinuousActions: 0
BranchSizes: 01000000
VectorActionSize: 01000000
VectorActionDescriptions: []
VectorActionSpaceType: 0
hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 0}
m_InferenceDevice: 0
m_BehaviorType: 1
m_BehaviorName: NPC
TeamId: 0
m_UseChildSensors: 1
m_UseChildActuators: 1
m_ObservableAttributeHandling: 0
--- !u!1001 &6818223692685937217 --- !u!1001 &6818223692685937217
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3033,366 +2826,3 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3}
--- !u!23 &8333476723876163232
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!1 &8509012040201336570
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8509012040201336571}
m_Layer: 8
m_Name: CameraHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8509012040201336571
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040201336570}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8509012041069629704}
m_Father: {fileID: 8509012040873181337}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8509012040340093752
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8509012040340093753}
m_Layer: 8
m_Name: FeetTransform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8509012040340093753
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040340093752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8509012040873181337}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8509012040873181315
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8509012040873181337}
- component: {fileID: 8509012040873181336}
- component: {fileID: 8333476723876163232}
- component: {fileID: 8509012040873181318}
- component: {fileID: 8509012040873181338}
- component: {fileID: 8509012040873181319}
- component: {fileID: 8509012040873181317}
- component: {fileID: 8509012040873181316}
- component: {fileID: 5078004101906046130}
- component: {fileID: 5242608118223468128}
- component: {fileID: 5242608118223468129}
- component: {fileID: 5242608118223468140}
- component: {fileID: 8509012040873181320}
m_Layer: 8
m_Name: 'Player '
m_TagString: Defender
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &8509012040873181316
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
m_Name:
m_EditorClassIdentifier:
input_View: {x: 0, y: 0}
cameraHolder: {fileID: 8509012040201336571}
feetTransform: {fileID: 8509012040340093753}
playerSettings:
ViewXSensetivity: 20
ViewYSensetivity: 20
ViewXInverted: 0
ViewYInverted: 0
SprintingHold: 0
MovementSmoothing: 0
RunningForwardSpeed: 10
RunningStrafeSpeed: 6
WalkingForwardSpeed: 4
WalkingBackwardSpeed: 2
WalkingStrafeSpeed: 3
JumpingHeight: 6
JumpingFalloff: 1
FallingSmoothing: 0
SpeedEffector: 1
CrouchSpeedEffector: 0
ProneSpeedEffector: 0
FallingSpeedEffector: 0
ViewClampYMin: -70
ViewClampYMax: 80
playerMask:
serializedVersion: 2
m_Bits: 55
gravityAmount: 0.05
gravityMin: -3
jumpingForce: {x: 0, y: 0, z: 0}
playerStance: 0
playerStanceSmoothing: 0.2
playerStandStance:
CameraHeight: 0.7
StanceCollider: {fileID: 8509012040873181318}
playerCrouchStance:
CameraHeight: 0.3
StanceCollider: {fileID: 8509012040873181338}
playerProneStance:
CameraHeight: -0.58
StanceCollider: {fileID: 8509012040873181319}
currentWeapon: {fileID: 0}
--- !u!143 &8509012040873181317
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Height: 2
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!136 &8509012040873181318
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Radius: 0.3
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!136 &8509012040873181319
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.3
m_Height: 0.8
m_Direction: 1
m_Center: {x: 0, y: -0.6, z: 0}
--- !u!114 &8509012040873181320
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
m_Name:
m_EditorClassIdentifier:
DecisionPeriod: 1
TakeActionsBetweenDecisions: 0
--- !u!33 &8509012040873181336
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &8509012040873181337
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_LocalRotation: {x: -0, y: 0.6820348, z: -0, w: 0.7313197}
m_LocalPosition: {x: 40.54, y: 1, z: -15.91}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8509012040201336571}
- {fileID: 8509012040340093753}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 86.006004, z: 0}
--- !u!136 &8509012040873181338
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012040873181315}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Radius: 0.3
m_Height: 1.3
m_Direction: 1
m_Center: {x: 0, y: -0.35, z: 0}
--- !u!4 &8509012041069629704
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012041069629749}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.734, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8509012040201336571}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8509012041069629749
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8509012041069629704}
- component: {fileID: 8509012041069629751}
- component: {fileID: 8509012041069629750}
m_Layer: 8
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &8509012041069629750
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012041069629749}
m_Enabled: 1
--- !u!20 &8509012041069629751
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8509012041069629749}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022

View File

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

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 09beff657ef5d1c4eba194a01e121c1a guid: 305bb221606d7a748acca94156e2d347
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 23800000 mainObjectFileID: 23800000

File diff suppressed because it is too large Load Diff

0
Assets/Scenes/tyt player.meta generated Executable file → Normal file
View File

View File

@ -1,572 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4839747462788443060
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8723084081118426009}
- component: {fileID: 5958306789513936477}
m_Layer: 0
m_Name: WeaponAnimations
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8723084081118426009
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4839747462788443060}
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:
- {fileID: 2009060004548700032}
m_Father: {fileID: 8510909888689775087}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &5958306789513936477
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4839747462788443060}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 1ae0500836ae5b040ab0c41e276bf073, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5245491127989480125
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5245491127989480103}
- component: {fileID: 5245491127989480102}
- component: {fileID: 5583297852527723678}
- component: {fileID: 5245491127989480120}
- component: {fileID: 5245491127989480100}
- component: {fileID: 5245491127989480121}
- component: {fileID: 5245491127989480123}
- component: {fileID: 5245491127989480122}
- component: {fileID: 8693388664594773644}
m_Layer: 8
m_Name: Player
m_TagString: Defender
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5245491127989480103
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 28.21, y: 10.9, z: 46.67}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5245491129196666053}
- {fileID: 5245491129603592455}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!33 &5245491127989480102
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5583297852527723678
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, 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_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!136 &5245491127989480120
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Radius: 0.3
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!136 &5245491127989480100
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
m_Radius: 0.3
m_Height: 1.3
m_Direction: 1
m_Center: {x: 0, y: -0.35, z: 0}
--- !u!136 &5245491127989480121
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.3
m_Height: 0.8
m_Direction: 1
m_Center: {x: 0, y: -0.6, z: 0}
--- !u!143 &5245491127989480123
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 2
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5245491127989480122
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
m_Name:
m_EditorClassIdentifier:
input_Movement: {x: 0, y: 0}
input_View: {x: 0, y: 0}
cameraHolder: {fileID: 5245491129196666053}
feetTransform: {fileID: 5245491129603592455}
playerSettings:
ViewXSensetivity: 20
ViewYSensetivity: 20
ViewXInverted: 0
ViewYInverted: 0
SprintingHold: 0
MovementSmoothing: 0
RunningForwardSpeed: 10
RunningStrafeSpeed: 6
WalkingForwardSpeed: 4
WalkingBackwardSpeed: 2
WalkingStrafeSpeed: 3
JumpingHeight: 6
JumpingFalloff: 1
FallingSmoothing: 0
SpeedEffector: 1
CrouchSpeedEffector: 0
ProneSpeedEffector: 0
FallingSpeedEffector: 0
ViewClampYMin: -70
ViewClampYMax: 80
playerMask:
serializedVersion: 2
m_Bits: 55
gravityAmount: 0.05
gravityMin: -3
jumpingForce: {x: 0, y: 0, z: 0}
playerStance: 0
playerStanceSmoothing: 0.2
playerStandStance:
CameraHeight: 0.7
StanceCollider: {fileID: 5245491127989480120}
playerCrouchStance:
CameraHeight: 0.3
StanceCollider: {fileID: 5245491127989480100}
playerProneStance:
CameraHeight: -0.58
StanceCollider: {fileID: 5245491127989480121}
isSprinting: 0
currentWeapon: {fileID: 8510909888689775086}
weaponAnimationSpeed: 0
damage: 10
range: 100
fpsCam: {fileID: 0}
muzzleFlash: {fileID: 0}
impactEffect: {fileID: 0}
--- !u!114 &8693388664594773644
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491127989480125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
m_Name:
m_EditorClassIdentifier:
agentParameters:
maxStep: 0
hasUpgradedFromAgentParameters: 1
MaxStep: 0
moveController: {fileID: 0}
--- !u!1 &5245491128202443531
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5245491128202443574}
- component: {fileID: 5245491128202443529}
- component: {fileID: 5245491128202443528}
m_Layer: 8
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5245491128202443574
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491128202443531}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.388, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5245491129196666053}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &5245491128202443529
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491128202443531}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.1
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &5245491128202443528
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491128202443531}
m_Enabled: 1
--- !u!1 &5245491129196666052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5245491129196666053}
m_Layer: 8
m_Name: CameraHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5245491129196666053
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491129196666052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.7, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5245491128202443574}
- {fileID: 8510909888689775087}
m_Father: {fileID: 5245491127989480103}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5245491129603592454
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5245491129603592455}
m_Layer: 8
m_Name: FeetTransform
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5245491129603592455
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5245491129603592454}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5245491127989480103}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8510909888689775085
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8510909888689775087}
- component: {fileID: 8510909888689775086}
m_Layer: 8
m_Name: Weapon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8510909888689775087
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888689775085}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.332, y: 0.038, z: 0.394}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8723084081118426009}
m_Father: {fileID: 5245491129196666053}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8510909888689775086
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8510909888689775085}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 088bf904d7c90a44dbb35c1d47c2692e, type: 3}
m_Name:
m_EditorClassIdentifier:
settings:
SwayAmount: 4
SwayYInverted: 0
SwayXInverted: 0
SwaySmoothing: 0.1
SwayResetSmoothing: 0.1
SwayClampX: 8
SwayClampY: 8
MovementSwayX: 0
MovementSwayY: 0
MovementSwayYInverted: 0
MovementSwayXInverted: 0
MovementSwaySmoothing: 0
weaponAnimator: {fileID: 5958306789513936477}
--- !u!1001 &6817088243126258842
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8723084081118426009}
m_Modifications:
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalScale.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalScale.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.145
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.76
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
propertyPath: m_Name
value: AKM
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3}
--- !u!4 &2009060004548700032 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8,
type: 3}
m_PrefabInstance: {fileID: 6817088243126258842}
m_PrefabAsset: {fileID: 0}

0
Assets/Scenes/tyt player/Player.prefab.meta generated Executable file → Normal file
View File

View File

@ -0,0 +1,118 @@
using System.Collections.Generic;
using Unity.Barracuda;
using Unity.MLAgents.Policies;
using UnityEngine;
public class CharacterFactory : MonoBehaviour
{
private static CharacterFactory instance;
public static CharacterFactory Instance => instance;
[SerializeField] private List<NavPoint> spawnPointsForDefendersTeam;
[SerializeField] private List<NavPoint> spawnPointsForAttackersTeam;
[SerializeField] private GameObject AIPrefab;
[SerializeField] private GameObject PlayerPrefab;
private List<GameObject> bots = new List<GameObject>();
public GameObject player { get; private set; }
private void Awake()
{
if (instance == null)
instance = this;
else
{
Destroy(gameObject);
Debug.LogError("Only 1 Instance");
}
}
private void Start()
{
var attcNum = SettingsReader.Instance.GetSettings.NumOfAttackers;
var defNum = SettingsReader.Instance.GetSettings.NumOfDefenders;
var humanDef = SettingsReader.Instance.GetSettings.HasHumanDefender == true ? 1 : 0;
var humanAtc = SettingsReader.Instance.GetSettings.HasHumanAttacker == true ? 1 : 0;
if (humanAtc == 1 && humanDef == 1)
throw new System.ArgumentException("Can be only one human player");
for (int i = 0; i < attcNum - humanAtc; i++)
InstanciateEntity(Team.Attackers, TypeAI.D0DiskAI,
spawnPointsForAttackersTeam[Random.Range(0, spawnPointsForAttackersTeam.Count)]);
for (int i = 0; i < defNum - humanDef; i++)
InstanciateEntity(Team.Defenders, TypeAI.D0DiskAI,
spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)]);
if (humanAtc == 1)
InstanciateEntity(Team.Attackers, TypeAI.HumanAI,
spawnPointsForAttackersTeam[Random.Range(0, spawnPointsForAttackersTeam.Count)]);
if (humanDef == 1)
InstanciateEntity(Team.Defenders, TypeAI.HumanAI,
spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)]);
GameManager.OnResetScene += ResetCharacters;
}
private void InstanciateEntity(Team team, TypeAI typeAi, NavPoint spawnPoint)
{
var gameobject = GameObject.Instantiate(
typeAi == TypeAI.HumanAI ? PlayerPrefab : AIPrefab,
spawnPoint.Position,
Quaternion.identity);
gameobject.SetActive(true);
if (team == Team.Attackers)
gameObject.tag = "Attacker";
else
gameObject.tag = "Defender";
if (typeAi == TypeAI.HumanAI)
{
gameobject.GetComponent<Player>().GetCharacter.Team = team;
player = gameobject;
}
else
{
var npc = gameobject.GetComponent<NPC>();
npc.GetCharacter.Team = team;
npc.SetModel(team.ToString(), ScriptableObject.CreateInstance<NNModel>(), InferenceDevice.Default );
gameobject.GetComponent<MovementController>().PointStartID = spawnPoint.PointId;
bots.Add(gameobject);
}
}
public void ReSpawn(ICharacter character, ref Vector3 pos, ref int startPointId)
{
character.ResetCharacter();
var team = character.GetCharacter.Team;
NavPoint navPoint;
if (team == Team.Attackers)
navPoint = spawnPointsForAttackersTeam[Random.Range(0, spawnPointsForAttackersTeam.Count)];
else
navPoint = spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)];
pos = navPoint.Position;
startPointId = navPoint.PointId;
}
private void ResetCharacters()
{
foreach (var bot in bots)
{
var npc = bot.GetComponent<NPC>();
npc.ResetCharacter();
if (npc.GetCharacter.Team == Team.Attackers)
bot.transform.position = spawnPointsForAttackersTeam[Random.Range(0, spawnPointsForAttackersTeam.Count)].Position;
else
bot.transform.position = spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)].Position;
}
Player player;
if (TryGetComponent<Player>(out player))
{
player.ResetCharacter();
if (player.GetCharacter.Team == Team.Attackers)
this.player.transform.position = spawnPointsForAttackersTeam[Random.Range(0, spawnPointsForAttackersTeam.Count)].Position;
else
this.player.transform.position = spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)].Position;
}
}
}

View File

@ -1,4 +0,0 @@
public class CharacterPooler
{
}

View File

@ -2,4 +2,15 @@
{ {
Defenders, Defenders,
Attackers, Attackers,
}
public static class TeamExtension
{
public static Team GetOppositeTeam(this Team team)
{
if (team == Team.Attackers)
return Team.Defenders;
else
return Team.Attackers;
}
} }

View File

@ -0,0 +1,12 @@
using UnityEngine;
public class Character
{
public Team Team { get; set; }
public float LastTimeHit = 0;
public CharacterCondition Condition;
public Character()
{
Condition = new CharacterCondition();
}
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8f76201fe6436164789d10350a0fd6e2 guid: 44d6a17ad31b31241928e1a17e9aba37
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

View File

@ -1,12 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
public enum NPCState
{
InCover,
InBlancPoint,
InRunning,
}
public class CharacterCondition public class CharacterCondition
{ {
@ -25,7 +19,18 @@ public class CharacterCondition
{ {
health = value; health = value;
OnChangeHealthEvent?.Invoke(value); OnChangeHealthEvent?.Invoke(value);
} }
}
public int GetHealthPointsInQuantile()
{
if (health < 25)
return 0;
else if (health < 50)
return 1;
else if (health < 75)
return 2;
else return 3;
} }
private int armour; private int armour;
public int ArmourPoints public int ArmourPoints
@ -40,6 +45,17 @@ public class CharacterCondition
OnChangeArmourEvent?.Invoke(value); OnChangeArmourEvent?.Invoke(value);
} }
} }
public int GetArmourPointsInQuantile()
{
if (armour < 25)
return 0;
else if (armour < 50)
return 1;
else if (armour < 75)
return 2;
else return 3;
}
private int ammo; private int ammo;
public int Ammunition public int Ammunition
{ {
@ -54,15 +70,17 @@ public class CharacterCondition
} }
} }
[HideInInspector]
public NPCState npcState { get; private set; }
public CharacterCondition() public CharacterCondition()
{
this.Reset();
}
public void Reset()
{ {
var settings = SettingsReader.Instance.GetSettings; var settings = SettingsReader.Instance.GetSettings;
ammo = settings.maxAmmo; ammo = settings.MaxAmmo;
health = settings.maxHealth; health = settings.MaxHealth;
armour = settings.maxArmour; armour = settings.MaxArmour;
} }
public void GiveHealth(int health) => HealthPoints = Mathf.Clamp(health + HealthPoints, 0, 100); public void GiveHealth(int health) => HealthPoints = Mathf.Clamp(health + HealthPoints, 0, 100);

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5e73ba257bc6b684c86edf9ecfd475ef guid: f23b6db3be1e4cd469fd18dfe3e39764
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -0,0 +1,5 @@
public interface ICharacter
{
Character GetCharacter { get; }
void ResetCharacter();
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4599c57bc5b1c3945847dead0f9f0ba4 guid: b6dfb78244ae35c4db1326d5f5b73375
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

View File

@ -0,0 +1,17 @@
using UnityEngine;
public interface INpcBaseState
{
NpcEnumState State { get; }
bool InCover { get; }
bool IsRunning { get; }
bool InDirectPoint { get; }
float HitChance { get; }
float DoDamageChance { get; }
}
public interface INpcBaseBodyState
{
NpcBodyState State { get; }
Vector3 GetPointToHit(GameObject go);
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 58b7e1962495ada4c8e6ee6219c99a20
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

87
Assets/Scripts/Character/MovementController.cs Executable file → Normal file
View File

@ -1,40 +1,83 @@
using System.Linq; using System.Collections.Generic;
using System.Collections.Generic; using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.AI; using UnityEngine.AI;
[RequireComponent(typeof(NavMeshAgent))] [RequireComponent(typeof(NavMeshAgent))]
public class MovementController : MonoBehaviour public class MovementController : MonoBehaviour
{ {
public NavPoint currentPosition { get; private set; } public int PointStartID { get; set; }
public int PointEndID { get; private set; }
public float FlagDistance { get; private set; }
private const float UpdateFlagPositionDelay = 5;
private const float UpdateReachedDestinationDelay = 5;
[SerializeField] private NavMeshAgent navMeshAgent; [SerializeField] private NavMeshAgent navMeshAgent;
[SerializeField] private GameObject flag;
public float DistanceToGo { get; private set; }
public float RemainingDistance => navMeshAgent.remainingDistance;
private Dictionary<int, NavPoint> _idNavPointDict;
private void Start()
private void Awake()
{ {
navMeshAgent.speed = SettingsReader.Instance.GetSettings.movementSpeed; navMeshAgent.speed = SettingsReader.Instance.GetSettings.MovementSpeed;
_idNavPointDict = MapManager.Instance.IDToNavPoint;
InvokeRepeating(nameof(UpdateFlagPosition), 0, UpdateFlagPositionDelay);
InvokeRepeating(nameof(ReachedDestination), 0, UpdateReachedDestinationDelay);
}
private void OnDestroy()
{
CancelInvoke(nameof(UpdateFlagPosition));
CancelInvoke(nameof(ReachedDestination));
} }
public void Move() private void UpdateFlagPosition()
{ {
var pointCandidate = getPointCandidate(); FlagDistance = (flag.transform.position - gameObject.transform.position).magnitude;
goToNextNavPoint(pointCandidate);
} }
public void MoveToRandomPoint() public void MoveToRandomPoint()
{
Debug.Log(MapManager.navPoints == null);
goToNextNavPoint(MapManager.navPoints[Random.Range(0, MapManager.navPoints.Count)]);
}
private NavPoint getPointCandidate()
{ {
var NavPointsPositions = MapManager.navPoints GoToNextNavPoint(MapManager.Instance.NavPoints[Random.Range(0, MapManager.Instance.NavPoints.Count)]);
.Select(point => point.transform.position)
.Where(point => (currentPosition.transform.position - point).magnitude <= SettingsReader.Instance.GetSettings.movementSpeed)
.ToList();
return null;
} }
public void goToNextNavPoint(NavPoint destination) => public List<NavPoint> GetPointsCandidate()
navMeshAgent.SetDestination(destination.transform.position); {
return MapManager.Instance.NavPoints
.Where(point =>
(_idNavPointDict[PointStartID].Position - point.Position).magnitude < SettingsReader.Instance.GetSettings.MovementDistance)
.ToList();
}
public void GoToNextNavPoint(NavPoint destination)
{
if (navMeshAgent.isStopped == true) navMeshAgent.isStopped = false;
PointStartID = PointEndID;
PointEndID = destination.PointId;
navMeshAgent.SetDestination(destination.Position);
DistanceToGo = navMeshAgent.remainingDistance;
}
public void ReturnToStartPoint()
{
if (navMeshAgent.isStopped == true) navMeshAgent.isStopped = false;
navMeshAgent.SetDestination(_idNavPointDict[PointStartID].Position);
PointEndID = PointStartID;
PointStartID = -1;
}
public void StopOnPath()
{
navMeshAgent.isStopped = true;
PointStartID = -1;
PointEndID = -1;
}
public void ReachedDestination()
{
if ((navMeshAgent.isStopped == false) && (navMeshAgent.velocity.magnitude < 0.1))
PointStartID = PointEndID;
}
} }

205
Assets/Scripts/Character/NPC.cs Executable file → Normal file
View File

@ -1,61 +1,212 @@
using System; using System;
using UnityEngine; using System.Collections.Generic;
using Unity.MLAgents; using Unity.MLAgents;
using Unity.MLAgents.Sensors;
using Unity.MLAgents.Actuators; using Unity.MLAgents.Actuators;
using Unity.MLAgents.Sensors;
using UnityEngine;
[RequireComponent(typeof(MovementController))] [RequireComponent(typeof(MovementController),typeof(BufferSensorComponent))]
public class NPC : Agent public class NPC : Agent, ICharacter
{ {
public Team Team { get; set; }
[HideInInspector] [HideInInspector]
private float LastTimeHit; private Character AgentCharacter;
public CharacterCondition Condition; public CharacterCondition Condition;
private FlagZone flagZone = null;
public MovementController moveController; public INpcBaseState NpcState { get; private set; }
public INpcBaseBodyState NpcBodyState { get; private set; }
private void Start()
public Character GetCharacter => AgentCharacter;
private NpcDirectPointState DirectState;
private NpcInCoverState CoverState;
private NpcRunningState RunningState;
private NpcStandingState StandingState;
private NpcCrouchingState CrouchingState;
private MovementController moveController;
private BufferSensorComponent bufferSensor;
private Dictionary<int, NavPoint> navPointIdDict;
#region UnityEvents and ML
private void Awake()
{ {
Condition = new CharacterCondition(); DirectState = new NpcDirectPointState();
CoverState = new NpcInCoverState();
RunningState = new NpcRunningState();
NpcState = DirectState;
CrouchingState = new NpcCrouchingState();
StandingState = new NpcStandingState();
NpcBodyState = StandingState;
AgentCharacter = new Character();
Condition = AgentCharacter.Condition;
moveController = gameObject.GetComponent<MovementController>(); moveController = gameObject.GetComponent<MovementController>();
bufferSensor = gameObject.GetComponent<BufferSensorComponent>();
flagZone = GameObject.FindObjectOfType<FlagZone>();
if (flagZone is null)
Debug.LogError("Flag Is Not Set");
navPointIdDict = MapManager.Instance.IDToNavPoint;
if (navPointIdDict is null)
Debug.LogError("Cant Find Nav Point Dictionary");
}
private void OnDestroy()
{
Debug.LogWarning("Pooled object was destroyed");
} }
public override void OnEpisodeBegin() public override void OnEpisodeBegin()
{ {
if (navPointIdDict is null)
Debug.LogError("Cant Find Nav Point Dictionary");
NpcState = DirectState;
flagZone = GameObject.FindObjectOfType<FlagZone>();
} }
public override void CollectObservations(VectorSensor sensor) public override void CollectObservations(VectorSensor sensor)
{ {
sensor.AddObservation(Condition.HealthPoints); // Debug.Log("Collect observations called!");
sensor.AddObservation(Condition.ArmourPoints); navPointIdDict = MapManager.Instance.IDToNavPoint;
sensor.AddObservation(Condition.Ammunition); if (navPointIdDict is null)
sensor.AddObservation((int)Condition.npcState); Debug.LogError("Cant Find Nav Point Dictionary");
} var candidates = moveController.GetPointsCandidate();
public override void Heuristic(in ActionBuffers actionsOut) //common sensors
{ sensor.AddObservation(GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(),
var discreteActionsOut = actionsOut.DiscreteActions; NpcBodyState.GetPointToHit(gameObject)).ToInt());
if (Input.GetKeyDown(KeyCode.W)) sensor.AddObservation(AgentCharacter.LastTimeHit);
sensor.AddObservation((!flagZone.IsNotOccup).ToInt());
sensor.AddObservation(Condition.GetHealthPointsInQuantile());
sensor.AddObservation(Condition.GetArmourPointsInQuantile());
sensor.AddObservation(candidates.Count);
sensor.AddObservation(moveController.PointStartID);
sensor.AddObservation(moveController.PointEndID);
// Debug.Log("Done common!");
//state sensors
sensor.AddObservation((int)NpcState.State);
sensor.AddObservation((int)NpcBodyState.State);
sensor.AddObservation(GameManager.IsEnemyNearby(gameObject.transform.position, AgentCharacter.Team));
sensor.AddObservation(navPointIdDict[moveController.PointStartID].DeathAttr);
sensor.AddObservation(navPointIdDict[moveController.PointEndID].DeathAttr);
sensor.AddObservation(moveController.FlagDistance);
// Debug.Log("Done state sensors!");
//point sensors
foreach (var point in candidates)
{ {
discreteActionsOut[0] = 1; var position = transform.position;
bufferSensor.AppendObservation(new float[] {
point.DeathAttr,
(int)point.navType,
//4 flagEnemyDistance
GameManager.IsCloserToFlagFromNextNavPoint(point, position).ToInt(),
//5 EnemyVsNavPointDistance
GameManager.IsCloserToEnemyThanToNextNavPoint(point, position, AgentCharacter.Team.GetOppositeTeam()).ToInt(),
//6 Have been seen by enemy in this point
GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(),
point.Position).ToInt()
});
} }
// Debug.Log("Done collect observations!");
} }
public override void OnActionReceived(ActionBuffers actions) public override void OnActionReceived(ActionBuffers actions)
{ {
if (actions.DiscreteActions[0] == 1) // Debug.Log("Actions recieved!");
moveController.MoveToRandomPoint(); var result = actions.DiscreteActions;
// Debug.Log(result[0] + " " + result[1]);
if (result[0] == 0)
{
if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Cover)
return;
NpcState = CoverState;
switch (result[1])
{
case 0: Peek(); break;
case 1: Cover(); break;
case 3: Peek(); moveController.GoToNextNavPoint(navPointIdDict[result[2]]); break;
case 4: NpcState = DirectState; break;
default: throw new ArgumentException("Undefined Action recieved");
}
}
// Debug.Log(result[0] == 1);
if (result[0] == 1)
{
// Debug.Log("BEFORE SOme shitty if >:(");
if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Direction)
{
// Debug.Log("SOme shitty if >:(");
return;
}
// Debug.Log("FUCK");
switch (result[1])
{
case 0: moveController.GoToNextNavPoint(navPointIdDict[result[2]]);
NpcState = RunningState; Debug.Log("Go to point " + result[2]);break;
case 1: NpcState = DirectState; break;
default: throw new ArgumentException("Undefined Action recieved");
}
}
if (result[0] == 2)
{
if (moveController.PointStartID == moveController.PointEndID && moveController.PointEndID != -1)
return;
switch (result[1])
{
case 0: moveController.StopOnPath(); NpcState = DirectState; break;
case 1: moveController.ReturnToStartPoint(); NpcState = RunningState; break;
default: throw new ArgumentException("Undefined Action recieved");
}
}
// Debug.Log("Actions processed!");
}
#endregion
public event Action<NpcBodyState> OnChangePosition;
private void Peek()
{
OnChangePosition?.Invoke(global::NpcBodyState.Standing);
NpcBodyState = StandingState;
} }
public event Action<object> OnKilledEvent; private void Cover()
public void GetDamage(float damage)
{ {
OnChangePosition?.Invoke(global::NpcBodyState.Crouching);
NpcBodyState = CrouchingState;
}
public event Action<int, Team> OnDamageRecieved;
public void GetDamage(int damage)
{
AgentCharacter.LastTimeHit = TimeManager.Instance.CurrentTime;
Condition.GiveHealth(-Mathf.RoundToInt(damage * (1 - Condition.ArmourPoints * 0.5f))); Condition.GiveHealth(-Mathf.RoundToInt(damage * (1 - Condition.ArmourPoints * 0.5f)));
Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5)); Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5));
OnDamageRecieved?.Invoke(damage, AgentCharacter.Team);
if (Condition.HealthPoints < 0) if (Condition.HealthPoints < 0)
OnKilledEvent?.Invoke(this); {
MapManager.AddDeathAttributeToPoints(moveController.PointStartID, moveController.PointEndID,
moveController.DistanceToGo, moveController.RemainingDistance);
var pos = gameObject.transform.position;
var id = moveController.PointStartID;
CharacterFactory.Instance.ReSpawn(this, ref pos, ref id);
}
}
public void ResetCharacter()
{
Condition.Reset();
EndEpisode();
} }
} }

View File

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: 200
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:

View File

@ -0,0 +1,68 @@
using UnityEngine;
public enum NpcEnumState
{
InCover,
InDirectPoint,
InRunning,
}
public enum NpcBodyState
{
Crouching,
Standing,
}
public class NpcCrouchingState : INpcBaseBodyState
{
public NpcBodyState State => NpcBodyState.Crouching;
public Vector3 GetPointToHit(GameObject go)
{
MeshRenderer meshRenderer;
go.TryGetComponent<MeshRenderer>(out meshRenderer);
return meshRenderer.bounds.center;
}
}
public class NpcStandingState : INpcBaseBodyState
{
public NpcBodyState State => NpcBodyState.Standing;
public Vector3 GetPointToHit(GameObject go)
{
MeshRenderer meshRenderer;
go.TryGetComponent<MeshRenderer>(out meshRenderer);
return meshRenderer.bounds.center;
}
}
public class NpcDirectPointState : INpcBaseState
{
public bool InCover => false;
public bool IsRunning => false;
public bool InDirectPoint => false;
public float HitChance => SettingsReader.Instance.GetSettings.GetHitChanceInDirectPoint;
public float DoDamageChance => SettingsReader.Instance.GetSettings.DoDamageChanceInDirectPoint;
public NpcEnumState State => NpcEnumState.InDirectPoint;
}
public class NpcRunningState : INpcBaseState
{
public bool InCover => false;
public bool IsRunning => true;
public bool InDirectPoint => false;
public float HitChance => SettingsReader.Instance.GetSettings.GetHitChanceInRunning;
public float DoDamageChance => SettingsReader.Instance.GetSettings.DoDamageChanceInRunning;
public NpcEnumState State => NpcEnumState.InRunning;
}
public class NpcInCoverState : INpcBaseState
{
public bool InCover => true;
public bool IsRunning => false;
public bool InDirectPoint => false;
public float HitChance => SettingsReader.Instance.GetSettings.GetHitChanceInCover;
public float DoDamageChance => SettingsReader.Instance.GetSettings.DoDamageChanceInCover;
public NpcEnumState State => NpcEnumState.InCover;
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a192e433e26797745ad0b46de2586de3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,38 @@
using System;
using UnityEngine;
public class Player : MonoBehaviour, ICharacter
{
[HideInInspector]
public Character PlayerCharacter;
public CharacterCondition Condition;
public Character GetCharacter => PlayerCharacter;
private void Awake()
{
PlayerCharacter = new Character();
Condition = PlayerCharacter.Condition;
}
private void OnDestroy()
{
Debug.LogWarning("Pooled object was destroyed");
}
public event Action<object> OnKilledEvent;
public void GetDamage(float damage)
{
PlayerCharacter.LastTimeHit = TimeManager.Instance.CurrentTime;
Condition.GiveHealth(-Mathf.RoundToInt(damage * (1 - Condition.ArmourPoints * 0.5f)));
Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5));
if (Condition.HealthPoints < 0)
OnKilledEvent?.Invoke(this);
}
public void ResetCharacter()
{
Condition = new CharacterCondition();
}
}

11
Assets/Scripts/Character/Player.cs.meta generated Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a8c9a8e604d395c4ab9d03d28adc4982
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,7 +5,7 @@ using Unity.Barracuda;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using static scr_Models; using static scr_Models;
public class scr_CharacterController : MonoBehaviour public class scr_CharacterController : MonoBehaviour
{ {
@ -17,7 +17,7 @@ public class scr_CharacterController : MonoBehaviour
public Vector2 input_Movement; public Vector2 input_Movement;
[HideInInspector] [HideInInspector]
public Vector2 input_View; public Vector2 input_View;
private Vector3 newCameraRotation; private Vector3 newCameraRotation;
private Vector3 newCharacterRotation; private Vector3 newCharacterRotation;
@ -25,14 +25,14 @@ public class scr_CharacterController : MonoBehaviour
public Transform cameraHolder; public Transform cameraHolder;
public Transform feetTransform; public Transform feetTransform;
[Header("Settings")] [Header("Settings")]
public PlayerSettingsModel playerSettings; public PlayerSettingsModel playerSettings;
public float ViewClampYMin = -70; public float ViewClampYMin = -70;
public float ViewClampYMax = 80; public float ViewClampYMax = 80;
public LayerMask playerMask; public LayerMask playerMask;
[Header("Gravity")] [Header("Gravity")]
public float gravityAmount; public float gravityAmount;
public float gravityMin; public float gravityMin;
private float playerGravity; private float playerGravity;
@ -40,14 +40,14 @@ public class scr_CharacterController : MonoBehaviour
public Vector3 jumpingForce; public Vector3 jumpingForce;
private Vector3 jumpingForceVelocity; private Vector3 jumpingForceVelocity;
[Header("Stance")] [Header("Stance")]
public PlayerStance playerStance; public PlayerStance playerStance;
public float playerStanceSmoothing; public float playerStanceSmoothing;
public CharacterStance playerStandStance; public CharacterStance playerStandStance;
public CharacterStance playerCrouchStance; public CharacterStance playerCrouchStance;
public CharacterStance playerProneStance; public CharacterStance playerProneStance;
private float stanceCheckErrorMargin = 0.05f; private float stanceCheckErrorMargin = 0.05f;
private float cameraHeight; private float cameraHeight;
private float cameraHeightVelocity; private float cameraHeightVelocity;
@ -77,13 +77,13 @@ public class scr_CharacterController : MonoBehaviour
defaultInput.Character.Movement.performed += e => input_Movement = e.ReadValue<Vector2>(); defaultInput.Character.Movement.performed += e => input_Movement = e.ReadValue<Vector2>();
defaultInput.Character.View.performed += e => input_View = e.ReadValue<Vector2>(); defaultInput.Character.View.performed += e => input_View = e.ReadValue<Vector2>();
defaultInput.Character.Jump.performed += e => Jump(); defaultInput.Character.Jump.performed += e => Jump();
defaultInput.Character.Crouch.performed += e => Crouch(); defaultInput.Character.Crouch.performed += e => Crouch();
defaultInput.Character.Prone.performed += e => Prone(); defaultInput.Character.Prone.performed += e => Prone();
defaultInput.Character.Sprint.performed += e => ToggleSprint(); defaultInput.Character.Sprint.performed += e => ToggleSprint();
defaultInput.Character.SprintReleased.performed += e => StopSprint(); defaultInput.Character.SprintReleased.performed += e => StopSprint();
defaultInput.Enable(); defaultInput.Enable();
newCameraRotation = cameraHolder.localRotation.eulerAngles; newCameraRotation = cameraHolder.localRotation.eulerAngles;
@ -134,10 +134,10 @@ public class scr_CharacterController : MonoBehaviour
{ {
newCharacterRotation.y += playerSettings.ViewXSensetivity * (playerSettings.ViewXInverted ? -input_View.x : input_View.x) * Time.deltaTime; newCharacterRotation.y += playerSettings.ViewXSensetivity * (playerSettings.ViewXInverted ? -input_View.x : input_View.x) * Time.deltaTime;
transform.localRotation = Quaternion.Euler(newCharacterRotation); transform.localRotation = Quaternion.Euler(newCharacterRotation);
newCameraRotation.x += playerSettings.ViewYSensetivity * (playerSettings.ViewYInverted ? input_View.y : -input_View.y) * Time.deltaTime; newCameraRotation.x += playerSettings.ViewYSensetivity * (playerSettings.ViewYInverted ? input_View.y : -input_View.y) * Time.deltaTime;
newCameraRotation.x = Mathf.Clamp(newCameraRotation.x, ViewClampYMin, ViewClampYMax); newCameraRotation.x = Mathf.Clamp(newCameraRotation.x, ViewClampYMin, ViewClampYMax);
cameraHolder.localRotation = Quaternion.Euler(newCameraRotation); cameraHolder.localRotation = Quaternion.Euler(newCameraRotation);
} }
@ -159,18 +159,18 @@ public class scr_CharacterController : MonoBehaviour
verticalSpeed = playerSettings.RunningForwardSpeed; verticalSpeed = playerSettings.RunningForwardSpeed;
horizontalSpeed = playerSettings.RunningStrafeSpeed; horizontalSpeed = playerSettings.RunningStrafeSpeed;
} }
// Effectors // Effectors
if (!characterController.isGrounded) if (!characterController.isGrounded)
{ {
playerSettings.SpeedEffector = playerSettings.FallingSpeedEffector; playerSettings.SpeedEffector = playerSettings.FallingSpeedEffector;
} }
else if(playerStance == PlayerStance.Crouch) else if (playerStance == PlayerStance.Crouch)
{ {
playerSettings.SpeedEffector = playerSettings.CrouchSpeedEffector; playerSettings.SpeedEffector = playerSettings.CrouchSpeedEffector;
} }
else if(playerStance == PlayerStance.Prone) else if (playerStance == PlayerStance.Prone)
{ {
playerSettings.SpeedEffector = playerSettings.ProneSpeedEffector; playerSettings.SpeedEffector = playerSettings.ProneSpeedEffector;
} }
@ -188,12 +188,12 @@ public class scr_CharacterController : MonoBehaviour
verticalSpeed *= playerSettings.SpeedEffector; verticalSpeed *= playerSettings.SpeedEffector;
horizontalSpeed *= playerSettings.SpeedEffector; horizontalSpeed *= playerSettings.SpeedEffector;
newMovementSpeed = Vector3.SmoothDamp(newMovementSpeed, newMovementSpeed = Vector3.SmoothDamp(newMovementSpeed,
new Vector3(horizontalSpeed * input_Movement.x * Time.deltaTime, new Vector3(horizontalSpeed * input_Movement.x * Time.deltaTime,
0, verticalSpeed * input_Movement.y * Time.deltaTime), 0, verticalSpeed * input_Movement.y * Time.deltaTime),
ref newMovementSpeedVelocity, characterController.isGrounded ? playerSettings.MovementSmoothing : playerSettings.FallingSmoothing); ref newMovementSpeedVelocity, characterController.isGrounded ? playerSettings.MovementSmoothing : playerSettings.FallingSmoothing);
var MovementSpeed = transform.TransformDirection(newMovementSpeed); var MovementSpeed = transform.TransformDirection(newMovementSpeed);
if (playerGravity > gravityMin) if (playerGravity > gravityMin)
@ -208,7 +208,7 @@ public class scr_CharacterController : MonoBehaviour
MovementSpeed.y += playerGravity; MovementSpeed.y += playerGravity;
MovementSpeed += jumpingForce * Time.deltaTime; MovementSpeed += jumpingForce * Time.deltaTime;
characterController.Move(MovementSpeed); characterController.Move(MovementSpeed);
} }
@ -229,7 +229,7 @@ public class scr_CharacterController : MonoBehaviour
{ {
stanceHeight = playerProneStance.CameraHeight; stanceHeight = playerProneStance.CameraHeight;
} }
cameraHeight = Mathf.SmoothDamp(cameraHolder.localPosition.y, stanceHeight, ref cameraHeightVelocity, playerStanceSmoothing); cameraHeight = Mathf.SmoothDamp(cameraHolder.localPosition.y, stanceHeight, ref cameraHeightVelocity, playerStanceSmoothing);
cameraHolder.localPosition = new Vector3(cameraHolder.localPosition.x, cameraHeight, cameraHolder.localPosition.z); cameraHolder.localPosition = new Vector3(cameraHolder.localPosition.x, cameraHeight, cameraHolder.localPosition.z);
@ -240,7 +240,7 @@ public class scr_CharacterController : MonoBehaviour
{ {
return; return;
} }
if (playerStance == PlayerStance.Crouch) if (playerStance == PlayerStance.Crouch)
{ {
if (StanceCheck(playerStandStance.StanceCollider.height)) if (StanceCheck(playerStandStance.StanceCollider.height))
@ -250,7 +250,7 @@ public class scr_CharacterController : MonoBehaviour
playerStance = PlayerStance.Stand; playerStance = PlayerStance.Stand;
return; return;
} }
// Jump // Jump
jumpingForce = Vector3.up * playerSettings.JumpingHeight; jumpingForce = Vector3.up * playerSettings.JumpingHeight;
playerGravity = 0; playerGravity = 0;
@ -283,8 +283,8 @@ public class scr_CharacterController : MonoBehaviour
{ {
var start = new Vector3(feetTransform.position.x, feetTransform.position.y + characterController.radius + stanceCheckErrorMargin, feetTransform.position.z); var start = new Vector3(feetTransform.position.x, feetTransform.position.y + characterController.radius + stanceCheckErrorMargin, feetTransform.position.z);
var end = new Vector3(feetTransform.position.x, feetTransform.position.y - characterController.radius - stanceCheckErrorMargin + stanceCheckheight, feetTransform.position.z); var end = new Vector3(feetTransform.position.x, feetTransform.position.y - characterController.radius - stanceCheckErrorMargin + stanceCheckheight, feetTransform.position.z);
return Physics.CheckCapsule(start, end, characterController.radius, playerMask); return Physics.CheckCapsule(start, end, characterController.radius, playerMask);
} }
@ -297,7 +297,7 @@ public class scr_CharacterController : MonoBehaviour
} }
isSprinting = !isSprinting; isSprinting = !isSprinting;
} }
private void StopSprint() private void StopSprint()
{ {
if (playerSettings.SprintingHold) if (playerSettings.SprintingHold)
@ -305,5 +305,5 @@ public class scr_CharacterController : MonoBehaviour
isSprinting = false; isSprinting = false;
} }
} }
} }

View File

@ -1,62 +1,45 @@
using System; using System;
using UnityEngine; using UnityEngine;
public static class scr_Models public static class scr_Models
{ {
#region Player #region Player
public enum PlayerStance
{
Stand,
Crouch,
Prone
}
[Serializable]
public class PlayerSettingsModel
{
[Header("View Settings")]
public float ViewXSensetivity;
public float ViewYSensetivity;
public bool ViewXInverted; public enum PlayerStance
public bool ViewYInverted; {
Stand,
Crouch,
Prone
}
[Header("Movement Settings")] [Serializable]
public bool SprintingHold; public class PlayerSettingsModel
public float MovementSmoothing; {
[Header("View Settings")]
[Header("Movement - Running")] public float ViewXSensetivity;
public float RunningForwardSpeed; public float ViewYSensetivity;
public float RunningStrafeSpeed;
[Header("Movement - Walking")]
public float WalkingForwardSpeed;
public float WalkingBackwardSpeed;
public float WalkingStrafeSpeed;
[Header("Jumping")] public bool ViewXInverted;
public float JumpingHeight; public bool ViewYInverted;
public float JumpingFalloff;
public float FallingSmoothing;
[Header("Speed Effectors")] [Header("Movement Settings")]
public float SpeedEffector = 1; public bool SprintingHold;
public float CrouchSpeedEffector; public float MovementSmoothing;
public float ProneSpeedEffector;
public float FallingSpeedEffector;
}
[Serializable] [Header("Movement - Running")]
public class CharacterStance public float RunningForwardSpeed;
{ public float RunningStrafeSpeed;
public float CameraHeight;
public CapsuleCollider StanceCollider;
}
#endregion [Header("Movement - Walking")]
public float WalkingForwardSpeed;
public float WalkingBackwardSpeed;
public float WalkingStrafeSpeed;
#region - Weapons - [Header("Jumping")]
public float JumpingHeight;
public float JumpingFalloff;
public float FallingSmoothing;
}
[Serializable] [Serializable]
public class WeaponSettingsModel public class WeaponSettingsModel
@ -78,5 +61,29 @@ public static class scr_Models
public float MovementSwaySmoothing; public float MovementSwaySmoothing;
} }
#endregion [Serializable]
public class CharacterStance
{
public float CameraHeight;
public CapsuleCollider StanceCollider;
}
#endregion
#region - Weapons -
[Serializable]
public class WeaponSettingsModel
{
[Header("Sway")]
public float SwayAmount;
public bool SwayYInverted;
public bool SwayXInverted;
public float SwaySmoothing;
public float SwayResetSmoothing;
public float SwayClampX;
public float SwayClampY;
}
#endregion
} }

View File

@ -1,57 +1,150 @@
using System.Collections; using System;
using System.Collections.Generic; using Unity.MLAgents;
using UnityEditorInternal;
using UnityEngine; using UnityEngine;
public class GameManager : MonoBehaviour public class GameManager : MonoBehaviour
{ {
private static GameManager instance; private static GameManager instance;
public static GameManager Instance { get { return instance; } } public static GameManager Instance => instance;
private static SimpleMultiAgentGroup defendersTeam = new SimpleMultiAgentGroup();
private static SimpleMultiAgentGroup attackersTeam = new SimpleMultiAgentGroup();
private void Awake() private void Awake()
{ {
if (Instance == null) if (instance is null)
instance = this; instance = this;
else if (Instance == this) else
{
Destroy(gameObject); Destroy(gameObject);
Debug.LogError("Only 1 Instance");
}
} }
private void Start() private void Start()
{ {
GlobalEventManager.onCaptureFlag += flagCaptured; Academy.Instance.OnEnvironmentReset += ResetScene;
GlobalEventManager.onTimeLeft += timeOut; GlobalEventManager.OnCaptureFlag += FlagCaptured;
} GlobalEventManager.OnTimeLeft += TimeOut;
private void Update() var agents = GameObject.FindObjectsOfType<Agent>();
{ foreach (var item in agents)
}
private void flagCaptured(Team team)
{
switch(team)
{ {
case Team.Attackers: var agent = item as NPC;
Debug.Log("Attackers Win"); if (agent.GetCharacter.Team == Team.Attackers)
break; attackersTeam.RegisterAgent(item);
case Team.Defenders: else
Debug.Log("Defenders Win"); defendersTeam.RegisterAgent(item);
break;
default:
Debug.LogError("Unexpected Team");
break;
} }
} }
private void timeOut() private static SimpleMultiAgentGroup getAgentList(Team team)
{ {
Debug.Log("Time is out"); if (team == Team.Attackers)
return attackersTeam;
else
return defendersTeam;
}
public static bool IsCloserToEnemyThanToNextNavPoint(NavPoint navPoint, Vector3 currentTransform, Team oppositeTeam)
{
var agentGroup = getAgentList(oppositeTeam);
var distToNavPoint = (currentTransform - navPoint.Position).magnitude;
foreach (var agent in agentGroup.GetRegisteredAgents())
if (distToNavPoint > (currentTransform - agent.transform.position).magnitude)
return true;
if ((SettingsReader.Instance.GetSettings.HasHumanAttacker == true && oppositeTeam == Team.Attackers) ||
(SettingsReader.Instance.GetSettings.HasHumanDefender == true && oppositeTeam == Team.Defenders))
{
if (distToNavPoint > (currentTransform - CharacterFactory.Instance.player.transform.position).magnitude)
return true;
}
return false;
}
public static bool IsEnemyNearby(Vector3 currentTransform, Team oppositeTeam)
{
var agentGroup = getAgentList(oppositeTeam);
foreach (var agent in agentGroup.GetRegisteredAgents())
if ((currentTransform - agent.transform.position).magnitude < SettingsReader.Instance.GetSettings.ViewDistance)
return true;
if ((SettingsReader.Instance.GetSettings.HasHumanAttacker == true && oppositeTeam == Team.Attackers) ||
(SettingsReader.Instance.GetSettings.HasHumanDefender == true && oppositeTeam == Team.Defenders))
{
if ((currentTransform - CharacterFactory.Instance.player.transform.position).magnitude < SettingsReader.Instance.GetSettings.ViewDistance)
return true;
}
return false;
}
public static bool IsCloserToFlagFromNextNavPoint(NavPoint navPoint, Vector3 currentTransform)
=> navPoint.FlagDistance < (currentTransform - GameObject.FindGameObjectWithTag("Flag").transform.position).magnitude;
public static bool IsHaveSeenByEnemy(Team oppositeTeam, Vector3 position)
{
var agentGroup = getAgentList(oppositeTeam);
RaycastHit rayHit = new RaycastHit();
foreach (var agent in agentGroup.GetRegisteredAgents() )
{
var npc = agent as NPC;
if (Physics.Raycast(position,
(npc.NpcBodyState.GetPointToHit(npc.gameObject) - position).normalized,
out rayHit,
SettingsReader.Instance.GetSettings.ViewDistance))
{
if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null)
return true;
}
}
if ((SettingsReader.Instance.GetSettings.HasHumanAttacker == true && oppositeTeam == Team.Attackers) ||
(SettingsReader.Instance.GetSettings.HasHumanDefender == true && oppositeTeam == Team.Defenders))
{
var player = CharacterFactory.Instance.player;
if (Physics.Raycast(position,
(player.GetComponent<MeshRenderer>().bounds.center - position).normalized,
out rayHit,
SettingsReader.Instance.GetSettings.ViewDistance))
{
if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null)
return true;
}
}
return false;
}
private void FlagCaptured(Team team)
{
switch (team)
{
case Team.Attackers:
Debug.Log("Attackers Win");
ResetScene();
break;
case Team.Defenders:
Debug.Log("Defenders Win");
ResetScene();
break;
}
ResetScene();
}
private void TimeOut()
{
ResetScene();
} }
private void OnDestroy() private void OnDestroy()
{ {
GlobalEventManager.onCaptureFlag -= flagCaptured; GlobalEventManager.OnCaptureFlag -= FlagCaptured;
GlobalEventManager.onTimeLeft -= timeOut; GlobalEventManager.OnTimeLeft -= TimeOut;
}
public static event Action OnResetScene;
private void ResetScene()
{
Debug.Log("Scene Reset");
OnResetScene?.Invoke();
} }
} }

View File

@ -2,18 +2,18 @@
public class GlobalEventManager public class GlobalEventManager
{ {
public static event Action<Team> onCaptureFlag; public static event Action<Team> OnCaptureFlag;
public static void SendCaptureFlag(Team team) public static void SendCaptureFlag(Team team)
{ {
onCaptureFlag?.Invoke(team); OnCaptureFlag?.Invoke(team);
onCaptureFlag = null; OnCaptureFlag = null;
} }
public static event Action onTimeLeft; public static event Action OnTimeLeft;
public static void SendTimeout() public static void SendTimeout()
{ {
onTimeLeft?.Invoke(); OnTimeLeft?.Invoke();
onTimeLeft = null; OnTimeLeft = null;
} }
} }

View File

@ -3,15 +3,61 @@ using UnityEngine;
public class MapManager : MonoBehaviour public class MapManager : MonoBehaviour
{ {
public static List<NavPoint> navPoints { get; private set; } private static MapManager _instance;
private void Start() public static MapManager Instance => _instance;
[SerializeField] private List<NavPoint> _navPoints;
public List<NavPoint> NavPoints { get => _navPoints; private set => _navPoints = value; }
public Dictionary<int, NavPoint> IDToNavPoint {get; private set; }
private void Awake()
{ {
navPoints = new List<NavPoint>(); if (_instance is null)
var navPointsGameObj = GameObject.FindGameObjectsWithTag("Point"); _instance = this;
foreach (var gameobj in navPointsGameObj) else
{ {
Debug.Log(" a "); Destroy(gameObject);
navPoints.Add(gameobj.GetComponent<NavPoint>()); Debug.LogError("Only 1 Instance");
}
NavPoints = new List<NavPoint>();
var navPointSet = GameObject.Find("NavPoint Set");
var count = navPointSet.transform.childCount;
for (var i=0; i < count; i++)
NavPoints.Add(navPointSet.transform.GetChild(i)
.gameObject.GetComponent<NavPoint>());
print(NavPoints.Count);
NavPointSetToID();
}
private void NavPointSetToID()
{
IDToNavPoint = new Dictionary<int, NavPoint>();
int i = 0;
foreach (var navPoint in NavPoints)
{
IDToNavPoint.Add(i, navPoint);
navPoint.PointId = i;
i++;
} }
} }
public static void AddDeathAttributeToPoints(int startPoint, int endPoint,
float allDistance, float remainingDistance)
{
var startNavPoint = _instance.IDToNavPoint[startPoint];
var endNavPoint = _instance.IDToNavPoint[endPoint];
float coef;
try
{
coef = remainingDistance / allDistance;
}
catch (System.ArithmeticException)
{
Debug.LogError("Path Length is zero");
return;
}
startNavPoint.DeathAttr += 1 - coef;
endNavPoint.DeathAttr += coef;
}
} }

View File

@ -1,11 +1,11 @@
using System.Collections; using UnityEngine;
using System.Collections.Generic;
using UnityEngine;
public class TimeManager : MonoBehaviour public class TimeManager : MonoBehaviour
{ {
public static TimeManager instance = null; private static TimeManager instance;
public float CurrentTime; public static TimeManager Instance { get { return instance; } }
public float CurrentTime { get; private set; }
void Start() void Start()
{ {
if (instance == null) if (instance == null)
@ -15,12 +15,14 @@ public class TimeManager : MonoBehaviour
} }
else else
{ {
Debug.LogError("Only one Instance"); Debug.LogError("Only 1 Instance");
Destroy(gameObject); Destroy(gameObject);
} }
} }
void Update() void Update()
{ {
CurrentTime += Time.deltaTime; CurrentTime += Time.deltaTime;
if (CurrentTime > SettingsReader.Instance.GetSettings.TimeOut)
GlobalEventManager.SendTimeout();
} }
} }

View File

@ -1,6 +1,4 @@
using System.Collections; using UnityEngine;
using System.Collections.Generic;
using UnityEngine;
public class FlagZone : MonoBehaviour public class FlagZone : MonoBehaviour
{ {
@ -9,14 +7,14 @@ public class FlagZone : MonoBehaviour
public float TimeStayDefenders { get; private set; } public float TimeStayDefenders { get; private set; }
private int occupDefenders; private int occupDefenders;
private int occupAttackers; private int occupAttackers;
private bool isOccupBoth => (occupDefenders>0) && (occupAttackers>0); public bool IsOccupBoth => (occupDefenders > 0) && (occupAttackers > 0);
private bool isNotOccup => (occupDefenders == 0) && (occupAttackers == 0); public bool IsNotOccup => (occupDefenders == 0) && (occupAttackers == 0);
private float timeForWin; private float timeForWin;
private void Start() private void Start()
{ {
timeForWin = SettingsReader.Instance.GetSettings.timeToWin; timeForWin = SettingsReader.Instance.GetSettings.TimeToWin;
TimeStayAttackers = 0; TimeStayAttackers = 0;
TimeStayDefenders = 0; TimeStayDefenders = 0;
occupAttackers = 0; occupAttackers = 0;
@ -24,7 +22,7 @@ public class FlagZone : MonoBehaviour
} }
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
switch(other.tag) switch (other.tag)
{ {
case "Defender": case "Defender":
occupDefenders++; occupDefenders++;
@ -54,7 +52,7 @@ public class FlagZone : MonoBehaviour
} }
private void Update() private void Update()
{ {
if (isOccupBoth || isNotOccup) if (IsOccupBoth || IsNotOccup)
{ {
TimeStayAttackers = 0; TimeStayAttackers = 0;
TimeStayDefenders = 0; TimeStayDefenders = 0;
@ -64,7 +62,7 @@ public class FlagZone : MonoBehaviour
{ {
TimeStayAttackers += Time.deltaTime; TimeStayAttackers += Time.deltaTime;
if (TimeStayAttackers > timeForWin) if (TimeStayAttackers > timeForWin)
GlobalEventManager.SendCaptureFlag(Team.Attackers); GlobalEventManager.SendCaptureFlag(Team.Attackers);
} }
else else
{ {

View File

@ -1,27 +1,28 @@
using System.Collections; using System.Collections.Generic;
using System.Collections.Generic; using System;
using UnityEngine; using UnityEngine;
public enum NavPointType
{
Cover,
Direction,
}
public class NavPoint : MonoBehaviour public class NavPoint : MonoBehaviour
{ {
public Vector3 position => gameObject.transform.position; public Vector3 Position => gameObject.transform.position;
public float FlagDistance { get; private set; } public float FlagDistance { get; private set; }
[System.NonSerialized] public float DeathAttr;
[System.NonSerialized] public List<Vector3> EnemiesSeen;
//Here other attributes;
[SerializeField] public NavPointType navType = NavPointType.Direction;
public int PointId;
private void Awake() [HideInInspector]
{ public int PointId = 0;
//DO NOT DELETE public float DeathAttr = 0;
} public List<Vector3> EnemiesSeen = new List<Vector3>();
private void Start() private void Start()
{ {
FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - position).magnitude; FlagDistance = (GameObject.FindGameObjectWithTag("Flag").transform.position - Position).magnitude;
EnemiesSeen = new List<Vector3>();
DeathAttr = 0;
} }
} }

View File

@ -1,30 +1,41 @@
using UnityEngine; using UnityEngine;
[CreateAssetMenu(fileName ="Game Settings", menuName = "Game/Settings", order = 51)] [CreateAssetMenu(fileName = "Game Settings", menuName = "Game/Settings", order = 51)]
public class Settings : ScriptableObject public class Settings : ScriptableObject
{ {
public bool isTesting; public bool IsTesting;
public float timeToWin; public float TimeToWin;
public float timeOut; public float TimeOut;
[Header("movement")] [Header("movement")]
public float movementDistance; public float MovementDistance;
public float movementSpeed; public float MovementSpeed;
public TypeAI defTeamAI; public TypeAI DefTeamAI;
public TypeAI atcTeamAI; public TypeAI AtcTeamAI;
public int numOfDefenders; public int NumOfDefenders;
public int numOfAttackers; public int NumOfAttackers;
public bool hasHumanDefender; public bool HasHumanDefender;
public bool hasHumanAttacker; public bool HasHumanAttacker;
public int healthPickupAmount; public int HealthPickupAmount;
public int armourPickupAmount; public int ArmourPickupAmount;
public int ammunitionPickupAmount; public int AmmunitionPickupAmount;
public int pickupsAmount; public int PickupsAmount;
public int maxHealth; public int MaxHealth;
public int maxArmour; public int MaxArmour;
public int maxAmmo; public int MaxAmmo;
public float ViewDistance;
public float GetHitChanceInDirectPoint;
public float GetHitChanceInRunning;
public float GetHitChanceInCover;
public float DoDamageChanceInDirectPoint;
public float DoDamageChanceInRunning;
public float DoDamageChanceInCover;
public float CrouchingCoefficient;
} }

View File

@ -1,17 +1,21 @@
using System.Collections; using UnityEngine;
using System.Collections.Generic;
using UnityEngine;
public class SettingsReader : MonoBehaviour public class SettingsReader : MonoBehaviour
{ {
private static SettingsReader instance; private static SettingsReader instance;
public static SettingsReader Instance { get { return instance; } } public static SettingsReader Instance => instance;
private void Awake() private void Awake()
{ {
instance = this; if (instance is null)
instance = this;
else
{
Destroy(gameObject);
Debug.LogError("Only 1 Instance");
}
} }
[SerializeField] private Settings gameSettings; [SerializeField] private Settings gameSettings;
public Settings GetSettings { get { return gameSettings; } } public Settings GetSettings => gameSettings;
} }

View File

@ -1,9 +0,0 @@
using UnityEngine;
public class Statistics : MonoBehaviour
{
private void Start()
{
}
}

View File

@ -1,5 +1,4 @@
using System; using UnityEngine;
using UnityEngine;
[RequireComponent(typeof(BoxCollider))] [RequireComponent(typeof(BoxCollider))]
public class AmmoPickUp : MonoBehaviour, IPickable public class AmmoPickUp : MonoBehaviour, IPickable
@ -11,9 +10,14 @@ public class AmmoPickUp : MonoBehaviour, IPickable
PickObject(other.gameObject); PickObject(other.gameObject);
} }
private void OnDestroy()
{
Debug.LogWarning("Pooled object was destroyed");
}
public void PickObject(GameObject obj) public void PickObject(GameObject obj)
{ {
obj.GetComponent<CharacterCondition>()?.TakeAmmo(SettingsReader.Instance.GetSettings.ammunitionPickupAmount); obj.GetComponent<ICharacter>()?.GetCharacter.Condition.TakeAmmo(SettingsReader.Instance.GetSettings.AmmunitionPickupAmount);
gameObject.SetActive(false); gameObject.SetActive(false);
} }
} }

View File

@ -1,5 +1,4 @@
using System; using UnityEngine;
using UnityEngine;
[RequireComponent(typeof(BoxCollider))] [RequireComponent(typeof(BoxCollider))]
public class ArmourPickUp : MonoBehaviour, IPickable public class ArmourPickUp : MonoBehaviour, IPickable
@ -11,9 +10,14 @@ public class ArmourPickUp : MonoBehaviour, IPickable
PickObject(other.gameObject); PickObject(other.gameObject);
} }
private void OnDestroy()
{
Debug.LogWarning("Pooled object was destroyed");
}
public void PickObject(GameObject obj) public void PickObject(GameObject obj)
{ {
obj.GetComponent<CharacterCondition>()?.GiveArmour(SettingsReader.Instance.GetSettings.armourPickupAmount); obj.GetComponent<ICharacter>()?.GetCharacter.Condition.GiveArmour(SettingsReader.Instance.GetSettings.ArmourPickupAmount);
gameObject.SetActive(false); gameObject.SetActive(false);
} }
} }

View File

@ -1,5 +1,4 @@
using System; using UnityEngine;
using UnityEngine;
[RequireComponent(typeof(BoxCollider))] [RequireComponent(typeof(BoxCollider))]
public class HealthPickUp : MonoBehaviour, IPickable public class HealthPickUp : MonoBehaviour, IPickable
@ -11,9 +10,14 @@ public class HealthPickUp : MonoBehaviour, IPickable
PickObject(other.gameObject); PickObject(other.gameObject);
} }
private void OnDestroy()
{
Debug.LogWarning("Pooled object was destroyed");
}
public void PickObject(GameObject obj) public void PickObject(GameObject obj)
{ {
obj.GetComponent<CharacterCondition>()?.GiveHealth(SettingsReader.Instance.GetSettings.healthPickupAmount); obj.GetComponent<ICharacter>()?.GetCharacter.Condition.GiveHealth(SettingsReader.Instance.GetSettings.HealthPickupAmount);
gameObject.SetActive(false); gameObject.SetActive(false);
} }
} }

View File

@ -1,7 +1,6 @@
using System; using UnityEngine;
using UnityEngine;
public interface IPickable public interface IPickable
{ {
PickUpType type { get; } PickUpType type { get; }
void PickObject(GameObject obj); void PickObject(GameObject obj);
} }

View File

@ -16,10 +16,18 @@ public class PickUpSpawner : MonoBehaviour
[SerializeField] private List<NavPoint> spawnPoints; [SerializeField] private List<NavPoint> spawnPoints;
private void Awake()
{
if (instance == null)
instance = this;
else
Destroy(gameObject);
}
private void Start() private void Start()
{ {
pickups = new List<GameObject>(); pickups = new List<GameObject>();
var amount = SettingsReader.Instance.GetSettings.pickupsAmount; var amount = SettingsReader.Instance.GetSettings.PickupsAmount;
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
pickups.Add(GameObject.Instantiate(healthPrefab, spawnPoints[Random.Range(0, spawnPoints.Count)].transform.position, Quaternion.identity)); pickups.Add(GameObject.Instantiate(healthPrefab, spawnPoints[Random.Range(0, spawnPoints.Count)].transform.position, Quaternion.identity));
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
@ -36,25 +44,25 @@ public class PickUpSpawner : MonoBehaviour
private IEnumerator SpawnNewPickUps() private IEnumerator SpawnNewPickUps()
{ {
while(true) while (true)
{ {
GameObject item; GameObject item;
if(IsDisableCheck(out item)) if (IsDisableCheck(out item))
{ {
yield return new WaitForSeconds(3); yield return new WaitForSeconds(3);
if (item != null) if (item != null)
{ {
item.transform.position = spawnPoints[Random.Range(0, spawnPoints.Count)].position; item.transform.position = spawnPoints[Random.Range(0, spawnPoints.Count)].Position;
item.SetActive(true); item.SetActive(true);
} }
} }
yield return new WaitForSeconds(2); yield return new WaitForSeconds(2);
} }
} }
private bool IsDisableCheck(out GameObject gameobj) private bool IsDisableCheck(out GameObject gameobj)
{ {
foreach(var pick in pickups) foreach (var pick in pickups)
{ {
if (!pick.activeInHierarchy) if (!pick.activeInHierarchy)
{ {

View File

@ -1,6 +0,0 @@
public enum SensorType
{
Visual,
Sound,
Other
}

View File

@ -1,4 +0,0 @@
using System.Collections.Generic;
using Unity.MLAgents.Sensors;

View File

@ -1,6 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c886079c5bf3e67408d356ea1a932c5f guid: 3a9f7f0a9faf11f49a433480722bffc5
PrefabImporter: folderAsset: yes
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

View File

@ -0,0 +1,19 @@
using System.IO;
using UnityEngine;
public class Logger
{
private const string Directory = "/Logs/";
private const string BaseName = "Log#";
public static void SaveLog<T>(T objToSerialize)
{
var dir = Application.persistentDataPath + Directory;
if (!System.IO.Directory.Exists(dir))
System.IO.Directory.CreateDirectory(dir);
var logName = BaseName + (System.IO.Directory.GetFiles(dir).Length + 1).ToString();
var json = JsonUtility.ToJson(objToSerialize);
File.WriteAllText(dir + logName, json);
}
}

11
Assets/Scripts/Statistics/Logger.cs.meta generated Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b3a1cec894fa98b4bbe20470f1e316c4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,51 @@
using UnityEngine;
internal class Log
{
public int damageTakenByDefs = 0;
public int damageTakenByAtc = 0;
public int AtcWin = 0;
public int DefWin = 0;
public int TimeOuts = 0;
}
public class StatisticManager : MonoBehaviour
{
private Log log = new Log();
private void Awake()
{
foreach (var npc in GameObject.FindObjectsOfType<NPC>())
npc.OnDamageRecieved += RegisterDamage;
GlobalEventManager.OnCaptureFlag += RegisterWin;
GlobalEventManager.OnTimeLeft += RegisterTimeOut;
}
private void RegisterDamage(int damage, Team team)
{
if (team == Team.Attackers)
log.damageTakenByAtc += damage;
else
log.damageTakenByDefs += damage;
}
private void RegisterWin(Team team)
{
if (team == Team.Attackers)
log.AtcWin += 1;
else
log.DefWin += 1;
}
private void RegisterTimeOut()
{
log.TimeOuts += 1;
}
private void OnApplicationQuit()
{
Logger.SaveLog<Log>(log);
}
}

View File

@ -0,0 +1,7 @@
public static class BoolExtension
{
public static int ToInt(this bool _bool)
{
return _bool == true ? 1 : 0;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f48fff3c2eda14d4fba923fe8875f651
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,10 +1,10 @@
using System; using System;
using System.Linq;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using UnityEngine; using System.Linq;
using UnityEditor; using UnityEditor;
using UnityEngine;
using UnityObject = UnityEngine.Object; using UnityObject = UnityEngine.Object;
[Serializable, DebuggerDisplay("Count = {Count}")] [Serializable, DebuggerDisplay("Count = {Count}")]

View File

@ -1,4 +1,4 @@
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
@ -7,7 +7,7 @@ using static scr_Models;
public class scr_WeaponController : MonoBehaviour public class scr_WeaponController : MonoBehaviour
{ {
private scr_CharacterController characterController; private scr_CharacterController characterController;
[Header("Settings")] [Header("Settings")]
public WeaponSettingsModel settings; public WeaponSettingsModel settings;
[Header("References")] [Header("References")]
@ -52,9 +52,9 @@ public class scr_WeaponController : MonoBehaviour
weaponAnimator.speed = characterController.weaponAnimationSpeed; weaponAnimator.speed = characterController.weaponAnimationSpeed;
targetWeaponRotation.y += settings.SwayAmount * (settings.SwayXInverted ? -characterController.input_View.x : characterController.input_View.x) * Time.deltaTime; targetWeaponRotation.y += settings.SwayAmount * (settings.SwayXInverted ? -characterController.input_View.x : characterController.input_View.x) * Time.deltaTime;
targetWeaponRotation.x += settings.SwayAmount * (settings.SwayYInverted ? characterController.input_View.y : -characterController.input_View.y) * Time.deltaTime; targetWeaponRotation.x += settings.SwayAmount * (settings.SwayYInverted ? characterController.input_View.y : -characterController.input_View.y) * Time.deltaTime;
//newWeaponRotation.x = Mathf.Clamp(newWeaponRotation.x, ViewClampYMin, ViewClampYMax); //newWeaponRotation.x = Mathf.Clamp(newWeaponRotation.x, ViewClampYMin, ViewClampYMax);
targetWeaponRotation.x = Mathf.Clamp(targetWeaponRotation.x, -settings.SwayClampX, settings.SwayClampX); targetWeaponRotation.x = Mathf.Clamp(targetWeaponRotation.x, -settings.SwayClampX, settings.SwayClampX);
targetWeaponRotation.y = Mathf.Clamp(targetWeaponRotation.y, -settings.SwayClampY, settings.SwayClampY); targetWeaponRotation.y = Mathf.Clamp(targetWeaponRotation.y, -settings.SwayClampY, settings.SwayClampY);
@ -77,4 +77,4 @@ public class scr_WeaponController : MonoBehaviour
{ {
weaponAnimator.SetBool("isSprinting", characterController.isSprinting); weaponAnimator.SetBool("isSprinting", characterController.isSprinting);
} }
} }

44
Assets/Settings/Game Settings.asset generated Executable file → Normal file
View File

@ -12,21 +12,29 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e2c47233b9062c84482336b145c6891b, type: 3} m_Script: {fileID: 11500000, guid: e2c47233b9062c84482336b145c6891b, type: 3}
m_Name: Game Settings m_Name: Game Settings
m_EditorClassIdentifier: m_EditorClassIdentifier:
isTesting: 1 IsTesting: 0
timeToWin: 5 TimeToWin: 15
timeOut: 1600 TimeOut: 3600
movementDistance: 50 MovementDistance: 50
movementSpeed: 3 MovementSpeed: 5
defTeamAI: 0 DefTeamAI: 3
atcTeamAI: 0 AtcTeamAI: 3
numOfDefenders: 0 NumOfDefenders: 1
numOfAttackers: 0 NumOfAttackers: 1
hasHumanDefender: 0 HasHumanDefender: 0
hasHumanAttacker: 0 HasHumanAttacker: 0
healthPickupAmount: 50 HealthPickupAmount: 50
armourPickupAmount: 50 ArmourPickupAmount: 50
ammunitionPickupAmount: 120 AmmunitionPickupAmount: 60
pickupsAmount: 2 PickupsAmount: 0
maxHealth: 0 MaxHealth: 100
maxArmour: 0 MaxArmour: 100
maxAmmo: 0 MaxAmmo: 360
ViewDistance: 100
GetHitChanceInDirectPoint: 50
GetHitChanceInRunning: 25
GetHitChanceInCover: 20
DoDamageChanceInDirectPoint: 70
DoDamageChanceInRunning: 30
DoDamageChanceInCover: 25
CrouchingCoefficient: 1.4

0
Docs/api.md Normal file
View File

View File

@ -1,17 +1,24 @@
{ {
"dependencies": { "dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.7.5",
"com.unity.analytics": "3.6.12",
"com.unity.collab-proxy": "1.14.12", "com.unity.collab-proxy": "1.14.12",
"com.unity.ide.rider": "1.2.1", "com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.4", "com.unity.ide.vscode": "1.2.4",
"com.unity.inputsystem": "1.3.0", "com.unity.inputsystem": "1.3.0",
"com.unity.ml-agents": "2.0.1", "com.unity.ml-agents": "2.0.1",
"com.unity.multiplayer-hlapi": "1.0.8",
"com.unity.probuilder": "4.5.2", "com.unity.probuilder": "4.5.2",
"com.unity.purchasing": "4.1.2",
"com.unity.test-framework": "1.1.30", "com.unity.test-framework": "1.1.30",
"com.unity.textmeshpro": "2.1.6", "com.unity.textmeshpro": "2.1.6",
"com.unity.timeline": "1.2.18", "com.unity.timeline": "1.2.18",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.0", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.0",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",

View File

@ -1,5 +1,35 @@
{ {
"dependencies": { "dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.2d.tilemap": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.ads": {
"version": "3.7.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.analytics": {
"version": "3.6.12",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.barracuda": { "com.unity.barracuda": {
"version": "2.0.0", "version": "2.0.0",
"depth": 1, "depth": 1,
@ -86,6 +116,15 @@
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
"depth": 0,
"source": "registry",
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.com"
},
"com.unity.probuilder": { "com.unity.probuilder": {
"version": "4.5.2", "version": "4.5.2",
"depth": 0, "depth": 0,
@ -95,6 +134,29 @@
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.purchasing": {
"version": "4.1.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.0.1",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": { "com.unity.settings-manager": {
"version": "1.0.3", "version": "1.0.3",
"depth": 1, "depth": 1,
@ -169,6 +231,23 @@
"com.unity.modules.imgui": "1.0.0" "com.unity.modules.imgui": "1.0.0"
} }
}, },
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.8",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": { "com.unity.modules.ai": {
"version": "1.0.0", "version": "1.0.0",
"depth": 0, "depth": 0,

View File

@ -631,7 +631,8 @@ PlayerSettings:
gcIncremental: 0 gcIncremental: 0
assemblyVersionValidation: 1 assemblyVersionValidation: 1
gcWBarrierValidation: 0 gcWBarrierValidation: 0
apiCompatibilityLevelPerPlatform: {} apiCompatibilityLevelPerPlatform:
Standalone: 3
m_RenderingPath: 1 m_RenderingPath: 1
m_MobileRenderingPath: 1 m_MobileRenderingPath: 1
metroPackageName: Template_3D metroPackageName: Template_3D

0
ProjectSettings/ProjectVersion.txt Executable file → Normal file
View File

7477
StyleCop.Cache Normal file

File diff suppressed because it is too large Load Diff

20623
test-ml-agents.ipynb Normal file

File diff suppressed because it is too large Load Diff