This commit is contained in:
2022-05-15 18:24:43 +07:00
parent abf262095f
commit bb6aea8720
22 changed files with 5008 additions and 170 deletions

2
Assets/ML-Agents.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 62f583f33c6117349bc0a54fa07f81ec guid: 59261180081fe884e95800512ea8cf82
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

8
Assets/ML-Agents/Timers.meta generated Normal file
View File

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

8
Assets/Prefabs/Bot.meta generated Normal file
View File

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

3601
Assets/Prefabs/Bot/Bot.prefab generated Normal file

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Bot/Bot.prefab.meta generated Normal file
View File

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

View File

@ -109,7 +109,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6257298797327811109} - component: {fileID: 6257298797327811109}
m_Layer: 5 m_Layer: 5
m_Name: GameObject m_Name: Health
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -133,7 +133,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -183, y: -194} m_AnchoredPosition: {x: -238, y: -194}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2528273238195332097 --- !u!1 &2528273238195332097
@ -1424,6 +1424,7 @@ Transform:
- {fileID: 2528273238195566595} - {fileID: 2528273238195566595}
- {fileID: 8363231377287553871} - {fileID: 8363231377287553871}
- {fileID: 3808104189668072889} - {fileID: 3808104189668072889}
- {fileID: 3826586624661553856}
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: 0, z: 0}
@ -1537,15 +1538,14 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2528273238195332181} m_GameObject: {fileID: 2528273238195332181}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5f5f761e43327448b64038300d71e5b, type: 3} m_Script: {fileID: 11500000, guid: e5f5f761e43327448b64038300d71e5b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
enemy: {fileID: 164324136889094180, guid: 2d8d8fcef9fc43144982428bd40ad6f0, type: 3} enemy: {fileID: 164324136889094180, guid: 2d8d8fcef9fc43144982428bd40ad6f0, type: 3}
_isFiring: 0
lookSpeed: 50 lookSpeed: 50
player: {fileID: 2528273238195332181}
camera: {fileID: 5592602041335177245}
--- !u!114 &5170482295850327424 --- !u!114 &5170482295850327424
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3146,6 +3146,76 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!1 &5585342347362633954
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3826586624661553856}
- component: {fileID: 295784659895838445}
m_Layer: 0
m_Name: CM vcam1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3826586624661553856
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5585342347362633954}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.099999994, y: 2.5029998, z: -1.8900003}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7744902250868623004}
m_Father: {fileID: 2528273238195566709}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0.03, y: 0, z: 0}
--- !u!114 &295784659895838445
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5585342347362633954}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 8684673709126177962}
m_Follow: {fileID: 8684673709126177962}
m_Lens:
FieldOfView: 100
OrthographicSize: 5
NearClipPlane: 0.3
FarClipPlane: 1000
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
m_SensorSize: {x: 1.6, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 7744902250868623004}
--- !u!1 &5976244347261228749 --- !u!1 &5976244347261228749
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3251,6 +3321,86 @@ Transform:
m_Father: {fileID: 2528273238195566709} m_Father: {fileID: 2528273238195566709}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6683937336608666690
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7744902250868623004}
- component: {fileID: 6289055591422148019}
- component: {fileID: 7201673227051290720}
- component: {fileID: 4055886025353125702}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7744902250868623004
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6683937336608666690}
m_LocalRotation: {x: 0.041552354, y: 0.9369783, z: -0.32565695, w: -0.11955187}
m_LocalPosition: {x: -0.17889261, y: -1.7345405, z: 10.136744}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3826586624661553856}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6289055591422148019
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6683937336608666690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7201673227051290720
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6683937336608666690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: -0.273, y: 1.1759999, z: -2.9950004}
m_XDamping: 0
m_YDamping: 0
m_ZDamping: 0
m_AngularDampingMode: 0
m_PitchDamping: 0
m_YawDamping: 1.1
m_RollDamping: 0
m_AngularDamping: 0
--- !u!114 &4055886025353125702
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6683937336608666690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4c41ac9245b87c4192012080077d830, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Damping: 0
--- !u!1 &6696900663370617578 --- !u!1 &6696900663370617578
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3329,6 +3479,9 @@ MonoBehaviour:
targetTransform: {fileID: 2528273238195566709} targetTransform: {fileID: 2528273238195566709}
cameraTransform: {fileID: 3401070369230030472} cameraTransform: {fileID: 3401070369230030472}
cameraPivotTransform: {fileID: 916820916668423615} cameraPivotTransform: {fileID: 916820916668423615}
LookSpeed: 0.1
FollowSpeed: 0.1
PivotSpeed: 0.03
minimumPivot: -35 minimumPivot: -35
maximumPivot: 35 maximumPivot: 35
--- !u!1 &8287218850849767936 --- !u!1 &8287218850849767936

799
Assets/Scenes/kirill 2.unity generated Normal file
View File

@ -0,0 +1,799 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &318098249 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1740317275426328350, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
m_PrefabInstance: {fileID: 1400233690}
m_PrefabAsset: {fileID: 0}
--- !u!114 &318098250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
m_Name:
m_EditorClassIdentifier:
DecisionPeriod: 5
TakeActionsBetweenDecisions: 0
--- !u!114 &318098251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
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
--- !u!114 &318098252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
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 &318098253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
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 &318098254
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
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!195 &318098255
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
m_Enabled: 0
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: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!114 &318098256
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318098249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 954fb0076c55707429047d7d4a3e8ded, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 200
--- !u!1 &565746530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 565746532}
- component: {fileID: 565746531}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &565746531
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 565746530}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &565746532
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 565746530}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1046875826
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1046875830}
- component: {fileID: 1046875829}
- component: {fileID: 1046875828}
- component: {fileID: 1046875827}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1046875827
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1046875826}
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!23 &1046875828
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1046875826}
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!33 &1046875829
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1046875826}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1046875830
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1046875826}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.2797263, y: 1.673382, z: -0.3043819}
m_LocalScale: {x: 10, y: 1, z: 10}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1400233690
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1740317275426328350, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_Name
value: Bot (1)
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.x
value: -4.28
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.173382
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.2758465
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2063326275591512128, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: enemy
value:
objectReference: {fileID: 1773426747}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be2f9603c4cf8194b9c67f41250d63d0, type: 3}
--- !u!1 &1700332386
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1700332389}
- component: {fileID: 1700332388}
- component: {fileID: 1700332387}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1700332387
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1700332386}
m_Enabled: 1
--- !u!20 &1700332388
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1700332386}
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: -1
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!4 &1700332389
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1700332386}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 5.51, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1773426747 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1740317275426328350, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
m_PrefabInstance: {fileID: 1836855923}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1773426748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
m_Name:
m_EditorClassIdentifier:
DecisionPeriod: 5
TakeActionsBetweenDecisions: 0
--- !u!114 &1773426749
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
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
--- !u!114 &1773426750
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
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 &1773426751
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
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 &1773426752
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
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!195 &1773426753
NavMeshAgent:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
m_Enabled: 0
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: 0
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!114 &1773426754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773426747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 954fb0076c55707429047d7d4a3e8ded, type: 3}
m_Name:
m_EditorClassIdentifier:
health: 200
--- !u!1001 &1836855923
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1740317275426328350, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_Name
value: Bot (2)
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.376
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.173382
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.711
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1740317275426427710, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2063326275591512128, guid: be2f9603c4cf8194b9c67f41250d63d0,
type: 3}
propertyPath: enemy
value:
objectReference: {fileID: 318098249}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be2f9603c4cf8194b9c67f41250d63d0, type: 3}

7
Assets/Scenes/kirill 2.unity.meta generated Normal file
View File

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

View File

@ -347,11 +347,31 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 916820916668423615, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2528273238195332181, guid: b5b04f22586a72c438dddf26e4474a4b, - target: {fileID: 2528273238195332181, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Character value: Character
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2528273238195332182, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: movementSpeed
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2528273238195332182, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: rotationSpeed
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2528273238195566629, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2528273238195566709, guid: b5b04f22586a72c438dddf26e4474a4b, - target: {fileID: 2528273238195566709, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
@ -412,6 +432,164 @@ PrefabInstance:
propertyPath: m_Enabled propertyPath: m_Enabled
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.099999994
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.5029998
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.8900003
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3401070369230030472, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0.39
objectReference: {fileID: 0}
- target: {fileID: 4209587867545793288, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_RenderMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4209587867545793288, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_AdditionalShaderChannelsFlag
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.size
value: 15
objectReference: {fileID: 0}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[2]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[3]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[4]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[5]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[6]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[7]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[8]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[9]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[10]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[11]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[12]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[13]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: Prefabs.Array.data[14]
value:
objectReference: {fileID: 1595252117517162, guid: e7776336bc56a9b4caa1c90ea92ff765,
type: 3}
- target: {fileID: 5519976521156458274, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6900876834040779050, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: LookSpeed
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 6900876834040779050, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: PivotSpeed
value: 0.03
objectReference: {fileID: 0}
- target: {fileID: 6900876834040779050, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: maximumPivot
value: 20
objectReference: {fileID: 0}
- target: {fileID: 6900876834040779050, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
propertyPath: minimumPivot
value: -20
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3}
--- !u!1 &1047261409 --- !u!1 &1047261409
@ -480,6 +658,46 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1163197377 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8287218850849767936, guid: b5b04f22586a72c438dddf26e4474a4b,
type: 3}
m_PrefabInstance: {fileID: 553264655}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1163197379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1163197377}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 2
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 0}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1697852391 --- !u!1 &1697852391
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -86,12 +86,8 @@ namespace Animators.Leonid_Animator
private void HandleRotation(float delta) private void HandleRotation(float delta)
{ {
if (Mathf.Abs(_inputHandler.horizontal) + Mathf.Abs(_inputHandler.vertical) < 0.1) if (Mathf.Abs(_inputHandler.horizontal) + Mathf.Abs(_inputHandler.vertical) < 0.1)
{
print("stop");
return; return;
}
print("begin");
var moveAmount = _inputHandler.moveAmount; var moveAmount = _inputHandler.moveAmount;
var targetDir = _cameraObject.forward * _inputHandler.vertical var targetDir = _cameraObject.forward * _inputHandler.vertical
+ _cameraObject.right * _inputHandler.horizontal; + _cameraObject.right * _inputHandler.horizontal;

View File

@ -15,9 +15,9 @@ namespace CameraScripts
public static CameraHandler Singleton; public static CameraHandler Singleton;
public const float LookSpeed = 0.1f; [SerializeField] private float LookSpeed = 0.1f;
public const float FollowSpeed = 0.1f; [SerializeField] private float FollowSpeed = 0.1f;
public const float PivotSpeed = 0.03f; [SerializeField] private float PivotSpeed = 0.03f;
private float _defaultPosition; private float _defaultPosition;
private float _lookAngle; private float _lookAngle;
@ -50,12 +50,7 @@ namespace CameraScripts
var rotation = Vector3.zero; var rotation = Vector3.zero;
rotation.y = _lookAngle; rotation.y = _lookAngle;
var targetRotation = Quaternion.Euler(rotation); var targetRotation = Quaternion.Euler(rotation);
_myTransform.rotation = targetRotation; targetTransform.rotation = targetRotation;
rotation = Vector3.zero;
rotation.x = _pivotAngle;
targetRotation = Quaternion.Euler(rotation);
cameraPivotTransform.localRotation = targetRotation;
} }
} }
} }

View File

@ -1,5 +1,8 @@
public interface ICharacter using System;
public interface ICharacter
{ {
Character GetCharacter { get; } Character GetCharacter { get; }
void ResetCharacter(); void ResetCharacter();
event Action<bool> OnDeathEvent;
} }

View File

@ -16,6 +16,8 @@ public class MovementController : MonoBehaviour
[SerializeField] private GameObject flag; [SerializeField] private GameObject flag;
public float DistanceToGo { get; private set; } public float DistanceToGo { get; private set; }
public float RemainingDistance => navMeshAgent.remainingDistance; public float RemainingDistance => navMeshAgent.remainingDistance;
public Vector3 Velocity => navMeshAgent.velocity;
private Dictionary<int, NavPoint> _idNavPointDict; private Dictionary<int, NavPoint> _idNavPointDict;

View File

@ -1,6 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using Animators.Leonid_Animator;
using Unity.MLAgents; using Unity.MLAgents;
using Unity.MLAgents.Actuators; using Unity.MLAgents.Actuators;
using Unity.MLAgents.Sensors; using Unity.MLAgents.Sensors;
@ -10,51 +10,57 @@ using UnityEngine;
public class NPC : Agent, ICharacter public class NPC : Agent, ICharacter
{ {
[HideInInspector] [HideInInspector]
private Character AgentCharacter; private Character _agentCharacter;
public CharacterCondition Condition;
private FlagZone flagZone = null;
public INpcBaseState NpcState { get; private set; } private CharacterCondition _condition;
private FlagZone _flagZone = null;
private INpcBaseState NpcState { get; set; }
public INpcBaseBodyState NpcBodyState { get; private set; } public INpcBaseBodyState NpcBodyState { get; private set; }
public Character GetCharacter => AgentCharacter; public Character GetCharacter => _agentCharacter;
private NpcDirectPointState DirectState; private NpcDirectPointState _directState;
private NpcInCoverState CoverState; private NpcInCoverState _coverState;
private NpcRunningState RunningState; private NpcRunningState _runningState;
private NpcStandingState StandingState; private NpcStandingState _standingState;
private NpcCrouchingState CrouchingState; private NpcCrouchingState _crouchingState;
private MovementController moveController; private MovementController _moveController;
private BufferSensorComponent bufferSensor; private BufferSensorComponent _bufferSensor;
private AnimatorHandler _animatorHandler;
private AimAssistant _assistant;
private Dictionary<int, NavPoint> _navPointIdDict;
private Dictionary<int, NavPoint> navPointIdDict;
#region UnityEvents and ML #region UnityEvents and ML
private void Awake() private void Awake()
{ {
DirectState = new NpcDirectPointState(); _directState = new NpcDirectPointState();
CoverState = new NpcInCoverState(); _coverState = new NpcInCoverState();
RunningState = new NpcRunningState(); _runningState = new NpcRunningState();
NpcState = DirectState; NpcState = _directState;
CrouchingState = new NpcCrouchingState(); _crouchingState = new NpcCrouchingState();
StandingState = new NpcStandingState(); _standingState = new NpcStandingState();
NpcBodyState = StandingState; NpcBodyState = _standingState;
AgentCharacter = new Character(); _agentCharacter = new Character();
Condition = AgentCharacter.Condition; _condition = _agentCharacter.Condition;
moveController = gameObject.GetComponent<MovementController>(); _moveController = gameObject.GetComponent<MovementController>();
bufferSensor = gameObject.GetComponent<BufferSensorComponent>(); _bufferSensor = gameObject.GetComponent<BufferSensorComponent>();
_animatorHandler = gameObject.GetComponent<AnimatorHandler>();
_assistant = gameObject.GetComponent<AimAssistant>();
flagZone = GameObject.FindObjectOfType<FlagZone>(); _flagZone = GameObject.FindObjectOfType<FlagZone>();
if (flagZone is null) if (_flagZone is null)
Debug.LogError("Flag Is Not Set"); Debug.LogError("Flag Is Not Set");
navPointIdDict = MapManager.Instance.IDToNavPoint; _navPointIdDict = MapManager.Instance.IDToNavPoint;
if (navPointIdDict is null) if (_navPointIdDict is null)
Debug.LogError("Cant Find Nav Point Dictionary"); Debug.LogError("Cant Find Nav Point Dictionary");
} }
@ -65,54 +71,54 @@ public class NPC : Agent, ICharacter
public override void OnEpisodeBegin() public override void OnEpisodeBegin()
{ {
if (navPointIdDict is null) if (_navPointIdDict is null)
Debug.LogError("Cant Find Nav Point Dictionary"); Debug.LogError("Cant Find Nav Point Dictionary");
NpcState = DirectState; NpcState = _directState;
flagZone = GameObject.FindObjectOfType<FlagZone>(); _flagZone = GameObject.FindObjectOfType<FlagZone>();
} }
public override void CollectObservations(VectorSensor sensor) public override void CollectObservations(VectorSensor sensor)
{ {
// Debug.Log("Collect observations called!"); // Debug.Log("Collect observations called!");
navPointIdDict = MapManager.Instance.IDToNavPoint; _navPointIdDict = MapManager.Instance.IDToNavPoint;
if (navPointIdDict is null) if (_navPointIdDict is null)
Debug.LogError("Cant Find Nav Point Dictionary"); Debug.LogError("Cant Find Nav Point Dictionary");
var candidates = moveController.GetPointsCandidate(); var candidates = _moveController.GetPointsCandidate();
//common sensors //common sensors
sensor.AddObservation(GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(), sensor.AddObservation(GameManager.IsHaveSeenByEnemy(_agentCharacter.Team.GetOppositeTeam(),
NpcBodyState.GetPointToHit(gameObject)).ToInt()); NpcBodyState.GetPointToHit(gameObject)).ToInt());
sensor.AddObservation(AgentCharacter.LastTimeHit); sensor.AddObservation(_agentCharacter.LastTimeHit);
sensor.AddObservation((!flagZone.IsNotOccup).ToInt()); sensor.AddObservation((!_flagZone.IsNotOccup).ToInt());
sensor.AddObservation(Condition.GetHealthPointsInQuantile()); sensor.AddObservation(_condition.GetHealthPointsInQuantile());
sensor.AddObservation(Condition.GetArmourPointsInQuantile()); sensor.AddObservation(_condition.GetArmourPointsInQuantile());
sensor.AddObservation(candidates.Count); sensor.AddObservation(candidates.Count);
sensor.AddObservation(moveController.PointStartID); sensor.AddObservation(_moveController.PointStartID);
sensor.AddObservation(moveController.PointEndID); sensor.AddObservation(_moveController.PointEndID);
// Debug.Log("Done common!"); // Debug.Log("Done common!");
//state sensors //state sensors
sensor.AddObservation((int)NpcState.State); sensor.AddObservation((int)NpcState.State);
sensor.AddObservation((int)NpcBodyState.State); sensor.AddObservation((int)NpcBodyState.State);
sensor.AddObservation(GameManager.IsEnemyNearby(gameObject.transform.position, AgentCharacter.Team)); sensor.AddObservation(GameManager.IsEnemyNearby(gameObject.transform.position, _agentCharacter.Team));
sensor.AddObservation(navPointIdDict[moveController.PointStartID].DeathAttr); sensor.AddObservation(_navPointIdDict[_moveController.PointStartID].DeathAttr);
sensor.AddObservation(navPointIdDict[moveController.PointEndID].DeathAttr); sensor.AddObservation(_navPointIdDict[_moveController.PointEndID].DeathAttr);
sensor.AddObservation(moveController.FlagDistance); sensor.AddObservation(_moveController.FlagDistance);
// Debug.Log("Done state sensors!"); // Debug.Log("Done state sensors!");
//point sensors //point sensors
foreach (var point in candidates) foreach (var point in candidates)
{ {
var position = transform.position; var position = transform.position;
bufferSensor.AppendObservation(new float[] { _bufferSensor.AppendObservation(new float[] {
point.DeathAttr, point.DeathAttr,
(int)point.navType, (int)point.navType,
//4 flagEnemyDistance //4 flagEnemyDistance
GameManager.IsCloserToFlagFromNextNavPoint(point, position).ToInt(), GameManager.IsCloserToFlagFromNextNavPoint(point, position).ToInt(),
//5 EnemyVsNavPointDistance //5 EnemyVsNavPointDistance
GameManager.IsCloserToEnemyThanToNextNavPoint(point, position, AgentCharacter.Team.GetOppositeTeam()).ToInt(), GameManager.IsCloserToEnemyThanToNextNavPoint(point, position, _agentCharacter.Team.GetOppositeTeam()).ToInt(),
//6 Have been seen by enemy in this point //6 Have been seen by enemy in this point
GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(), GameManager.IsHaveSeenByEnemy(_agentCharacter.Team.GetOppositeTeam(),
point.Position).ToInt() point.Position).ToInt()
}); });
} }
@ -126,16 +132,16 @@ public class NPC : Agent, ICharacter
// Debug.Log(result[0] + " " + result[1]); // Debug.Log(result[0] + " " + result[1]);
if (result[0] == 0) if (result[0] == 0)
{ {
if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Cover) if (_navPointIdDict[_moveController.PointStartID].navType != NavPointType.Cover)
return; return;
NpcState = CoverState; NpcState = _coverState;
switch (result[1]) switch (result[1])
{ {
case 0: Peek(); break; case 0: Peek(); break;
case 1: Cover(); break; case 1: Cover(); break;
case 3: Peek(); moveController.GoToNextNavPoint(navPointIdDict[result[2]]); break; case 3: Peek(); _moveController.GoToNextNavPoint(_navPointIdDict[result[2]]); break;
case 4: NpcState = DirectState; break; case 4: NpcState = _directState; break;
default: throw new ArgumentException("Undefined Action recieved"); default: throw new ArgumentException("Undefined Action recieved");
} }
} }
@ -143,7 +149,7 @@ public class NPC : Agent, ICharacter
if (result[0] == 1) if (result[0] == 1)
{ {
// Debug.Log("BEFORE SOme shitty if >:("); // Debug.Log("BEFORE SOme shitty if >:(");
if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Direction) if (_navPointIdDict[_moveController.PointStartID].navType != NavPointType.Direction)
{ {
// Debug.Log("SOme shitty if >:("); // Debug.Log("SOme shitty if >:(");
return; return;
@ -152,64 +158,72 @@ public class NPC : Agent, ICharacter
switch (result[1]) switch (result[1])
{ {
case 0: moveController.GoToNextNavPoint(navPointIdDict[result[2]]); case 0: _moveController.GoToNextNavPoint(_navPointIdDict[result[2]]);
NpcState = RunningState; Debug.Log("Go to point " + result[2]);break; NpcState = _runningState; Debug.Log("Go to point " + result[2]);break;
case 1: NpcState = DirectState; break; case 1: NpcState = _directState; break;
default: throw new ArgumentException("Undefined Action recieved"); default: throw new ArgumentException("Undefined Action recieved");
} }
} }
if (result[0] == 2) if (result[0] == 2)
{ {
if (moveController.PointStartID == moveController.PointEndID && moveController.PointEndID != -1) if (_moveController.PointStartID == _moveController.PointEndID && _moveController.PointEndID != -1)
return; return;
switch (result[1]) switch (result[1])
{ {
case 0: moveController.StopOnPath(); NpcState = DirectState; break; case 0: _moveController.StopOnPath(); NpcState = _directState; break;
case 1: moveController.ReturnToStartPoint(); NpcState = RunningState; break; case 1: _moveController.ReturnToStartPoint(); NpcState = _runningState; break;
default: throw new ArgumentException("Undefined Action recieved"); default: throw new ArgumentException("Undefined Action recieved");
} }
} }
// Debug.Log("Actions processed!"); // Debug.Log("Actions processed!");
} }
private void UpdateAnimatorValues()
{
var movementDir = _moveController.Velocity;
//Тут может быть косяк, так как я не помню горизонтальное по x или y.
_animatorHandler.UpdateAnimatorValues(movementDir.x, movementDir.y,
false, NpcBodyState == _crouchingState, _assistant._isFiring);
}
#endregion #endregion
public event Action<NpcBodyState> OnChangePosition; public event Action<NpcBodyState> OnChangePosition;
private void Peek() private void Peek()
{ {
OnChangePosition?.Invoke(global::NpcBodyState.Standing); OnChangePosition?.Invoke(global::NpcBodyState.Standing);
NpcBodyState = StandingState; NpcBodyState = _standingState;
} }
private void Cover() private void Cover()
{ {
OnChangePosition?.Invoke(global::NpcBodyState.Crouching); OnChangePosition?.Invoke(global::NpcBodyState.Crouching);
NpcBodyState = CrouchingState; NpcBodyState = _crouchingState;
} }
public event Action<bool> OnDeathEvent;
public event Action<int, Team> OnDamageRecieved; public event Action<int, Team> OnDamageRecieved;
public void GetDamage(int damage) public void GetDamage(int damage)
{ {
AgentCharacter.LastTimeHit = TimeManager.Instance.CurrentTime; _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); OnDamageRecieved?.Invoke(damage, _agentCharacter.Team);
if (Condition.HealthPoints < 0) if (_condition.HealthPoints < 0)
{ {
MapManager.AddDeathAttributeToPoints(moveController.PointStartID, moveController.PointEndID, OnDeathEvent?.Invoke(true);
moveController.DistanceToGo, moveController.RemainingDistance); MapManager.AddDeathAttributeToPoints(_moveController.PointStartID, _moveController.PointEndID,
_moveController.DistanceToGo, _moveController.RemainingDistance);
var pos = gameObject.transform.position; var pos = gameObject.transform.position;
var id = moveController.PointStartID; var id = _moveController.PointStartID;
CharacterFactory.Instance.ReSpawn(this, ref pos, ref id); CharacterFactory.Instance.ReSpawn(this, ref pos, ref id);
} }
} }
//public event OnDeathEvent<
public void ResetCharacter() public void ResetCharacter()
{ {
Condition.Reset(); _condition.Reset();
EndEpisode(); EndEpisode();
} }
} }

View File

@ -20,7 +20,7 @@ public class Player : MonoBehaviour, ICharacter
Debug.LogWarning("Pooled object was destroyed"); Debug.LogWarning("Pooled object was destroyed");
} }
public event Action<object> OnKilledEvent; public event Action<bool> OnDeathEvent;
public void GetDamage(float damage) public void GetDamage(float damage)
{ {
PlayerCharacter.LastTimeHit = TimeManager.Instance.CurrentTime; PlayerCharacter.LastTimeHit = TimeManager.Instance.CurrentTime;
@ -28,7 +28,7 @@ public class Player : MonoBehaviour, ICharacter
Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5)); Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5));
if (Condition.HealthPoints < 0) if (Condition.HealthPoints < 0)
OnKilledEvent?.Invoke(this); OnDeathEvent?.Invoke(true);
} }
public void ResetCharacter() public void ResetCharacter()

View File

@ -1,19 +1,20 @@
using System; using System;
using System.Collections.Generic;
using Unity.MLAgents; using Unity.MLAgents;
using UnityEngine; using UnityEngine;
public class GameManager : MonoBehaviour public class GameManager : MonoBehaviour
{ {
private static GameManager instance; private static GameManager _instance;
public static GameManager Instance => instance; public static GameManager Instance => _instance;
private static SimpleMultiAgentGroup defendersTeam = new SimpleMultiAgentGroup(); private static SimpleMultiAgentGroup _defendersTeam = new SimpleMultiAgentGroup();
private static SimpleMultiAgentGroup attackersTeam = new SimpleMultiAgentGroup(); private static SimpleMultiAgentGroup _attackersTeam = new SimpleMultiAgentGroup();
private void Awake() private void Awake()
{ {
if (instance is null) if (_instance is null)
instance = this; _instance = this;
else else
{ {
Destroy(gameObject); Destroy(gameObject);
@ -32,23 +33,23 @@ public class GameManager : MonoBehaviour
{ {
var agent = item as NPC; var agent = item as NPC;
if (agent.GetCharacter.Team == Team.Attackers) if (agent.GetCharacter.Team == Team.Attackers)
attackersTeam.RegisterAgent(item); _attackersTeam.RegisterAgent(item);
else else
defendersTeam.RegisterAgent(item); _defendersTeam.RegisterAgent(item);
} }
} }
private static SimpleMultiAgentGroup getAgentList(Team team) private static SimpleMultiAgentGroup GetAgentList(Team team)
{ {
if (team == Team.Attackers) if (team == Team.Attackers)
return attackersTeam; return _attackersTeam;
else else
return defendersTeam; return _defendersTeam;
} }
public static bool IsCloserToEnemyThanToNextNavPoint(NavPoint navPoint, Vector3 currentTransform, Team oppositeTeam) public static bool IsCloserToEnemyThanToNextNavPoint(NavPoint navPoint, Vector3 currentTransform, Team oppositeTeam)
{ {
var agentGroup = getAgentList(oppositeTeam); var agentGroup = GetAgentList(oppositeTeam);
var distToNavPoint = (currentTransform - navPoint.Position).magnitude; var distToNavPoint = (currentTransform - navPoint.Position).magnitude;
foreach (var agent in agentGroup.GetRegisteredAgents()) foreach (var agent in agentGroup.GetRegisteredAgents())
@ -65,7 +66,7 @@ public class GameManager : MonoBehaviour
public static bool IsEnemyNearby(Vector3 currentTransform, Team oppositeTeam) public static bool IsEnemyNearby(Vector3 currentTransform, Team oppositeTeam)
{ {
var agentGroup = getAgentList(oppositeTeam); var agentGroup = GetAgentList(oppositeTeam);
foreach (var agent in agentGroup.GetRegisteredAgents()) foreach (var agent in agentGroup.GetRegisteredAgents())
if ((currentTransform - agent.transform.position).magnitude < SettingsReader.Instance.GetSettings.ViewDistance) if ((currentTransform - agent.transform.position).magnitude < SettingsReader.Instance.GetSettings.ViewDistance)
@ -84,18 +85,23 @@ public class GameManager : MonoBehaviour
public static bool IsHaveSeenByEnemy(Team oppositeTeam, Vector3 position) public static bool IsHaveSeenByEnemy(Team oppositeTeam, Vector3 position)
{ {
var agentGroup = getAgentList(oppositeTeam); return GetVisibleEnemies(oppositeTeam, position).Count > 0 ? true : false;
}
public static List<GameObject> GetVisibleEnemies(Team oppositeTeam, Vector3 position)
{
var agentGroup = GetAgentList(oppositeTeam);
RaycastHit rayHit = new RaycastHit(); RaycastHit rayHit = new RaycastHit();
foreach (var agent in agentGroup.GetRegisteredAgents() ) foreach (var agent in agentGroup.GetRegisteredAgents() )
{ {
var npc = agent as NPC; var npc = agent as NPC;
if (Physics.Raycast(position, if (Physics.Raycast(position,
(npc.NpcBodyState.GetPointToHit(npc.gameObject) - position).normalized, (npc.NpcBodyState.GetPointToHit(npc.gameObject) - position).normalized,
out rayHit, out rayHit,
SettingsReader.Instance.GetSettings.ViewDistance)) SettingsReader.Instance.GetSettings.ViewDistance))
{ {
if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null) if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null)
return true; return null;
} }
} }
if ((SettingsReader.Instance.GetSettings.HasHumanAttacker == true && oppositeTeam == Team.Attackers) || if ((SettingsReader.Instance.GetSettings.HasHumanAttacker == true && oppositeTeam == Team.Attackers) ||
@ -103,15 +109,15 @@ public class GameManager : MonoBehaviour
{ {
var player = CharacterFactory.Instance.player; var player = CharacterFactory.Instance.player;
if (Physics.Raycast(position, if (Physics.Raycast(position,
(player.GetComponent<MeshRenderer>().bounds.center - position).normalized, (player.GetComponent<MeshRenderer>().bounds.center - position).normalized,
out rayHit, out rayHit,
SettingsReader.Instance.GetSettings.ViewDistance)) SettingsReader.Instance.GetSettings.ViewDistance))
{ {
if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null) if (rayHit.collider.gameObject.GetComponent<ICharacter>() != null)
return true; return null;
} }
} }
return false; return null;
} }
private void FlagCaptured(Team team) private void FlagCaptured(Team team)

View File

@ -0,0 +1,62 @@
using UnityEngine;
[RequireComponent(typeof(NPC))]
public class AimAssistant : MonoBehaviour
{
public GameObject enemy;
public bool _isFiring = false;
private ICharacter _myNpc;
public float lookSpeed = 200f;
private void Awake()
{
_myNpc = GetComponent<NPC>();
}
private void Update()
{
//Ищем противника на сцене.
if (_isFiring == false)
{
var enemies = GameManager.GetVisibleEnemies(_myNpc.GetCharacter.Team, transform.position);
enemy = enemies[new System.Random().Next(enemies.Count)];
if (enemies.Count == 0)
{
return;
}
else
{
var character = enemy.GetComponent<ICharacter>();
character.OnDeathEvent += _ => _isFiring = false;
_isFiring = true;
}
}
else
{
//Raycast до противника enemy
var range = 200f;
while (true)
{
if (!Physics.Raycast(this.transform.position, this.transform.forward, out var hit, range))
{
_isFiring = false;
enemy = null;
return;
}
else
{
GetComponent<Shooting>().Shoot();
}
}
}
var direction = enemy.transform.position - gameObject.transform.position;
var targetRotation = Quaternion.LookRotation(direction);
var lookAt = Quaternion.RotateTowards(gameObject.transform.rotation, targetRotation,
Time.deltaTime * lookSpeed);
lookAt.z = 0;
lookAt.x = 0;
gameObject.transform.rotation = lookAt;
}
}

View File

@ -1,29 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AutoAim : MonoBehaviour
{
// Start is called before the first frame update
public GameObject enemy;
public float lookSpeed = 200f;
public GameObject player;
public Camera camera;
void Start()
{
}
// Update is called once per frame
void Update()
{
Vector3 direction = enemy.transform.position - camera.transform.position;
Quaternion targetRotation = Quaternion.LookRotation(direction);
Quaternion lookAt = Quaternion.RotateTowards(camera.transform.rotation, targetRotation, Time.deltaTime * lookSpeed);
camera.transform.rotation = lookAt;
}
}

View File

@ -24,13 +24,6 @@ public class Shooting : MonoBehaviour
public GameObject gun; public GameObject gun;
void Update() void Update()
{ {
/*if (Input.GetButtonDown("Fire1"))
{
Prefab = Random.Range(0, 1);
Instantiate(Prefabs[Prefab], FirePoint.transform.position, FirePoint.transform.rotation);
Shoot();
}*/
//if(Input.GetButtonDown("")
if (Input.GetMouseButton(0) && fireCountdown <= 0f) if (Input.GetMouseButton(0) && fireCountdown <= 0f)
{ {
Instantiate(Prefabs[Prefab], FirePoint.transform.position, FirePoint.transform.rotation); Instantiate(Prefabs[Prefab], FirePoint.transform.position, FirePoint.transform.rotation);
@ -41,27 +34,14 @@ public class Shooting : MonoBehaviour
fireCountdown -= Time.deltaTime; fireCountdown -= Time.deltaTime;
} }
void Shoot() public void Shoot()
{ {
RaycastHit hit; if (Physics.Raycast(raycast.transform.position, raycast.transform.forward, out var hit, range))
if (Physics.Raycast(raycast.transform.position, raycast.transform.forward, out hit, range))
{ {
Debug.Log(hit.transform.name); Debug.Log(hit.transform.name);
Target target = hit.transform.GetComponent<Target>(); if (hit.transform.TryGetComponent<Target>(out var target))
if (target != null)
{
target.TakeDamage(damage); target.TakeDamage(damage);
}
RotateToGunDirection(gun, hit.point);
} }
} }
void RotateToGunDirection(GameObject obj, Vector3 destination)
{
direction = destination - obj.transform.position;
rotation = Quaternion.LookRotation(direction);
obj.transform.localRotation = Quaternion.Lerp(obj.transform.rotation, rotation, 1);
}
} }

View File

@ -4,6 +4,7 @@
"com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.7.5", "com.unity.ads": "3.7.5",
"com.unity.analytics": "3.6.12", "com.unity.analytics": "3.6.12",
"com.unity.cinemachine": "2.8.3",
"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",

View File

@ -50,6 +50,13 @@
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.cinemachine": {
"version": "2.8.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.14.12", "version": "1.14.12",
"depth": 0, "depth": 0,