diff --git a/Assets/Resources/Models/Characters/Basic/BasicCharModel.prefab b/Assets/Resources/Models/Characters/Basic/BasicCharModel.prefab index c6ac7e45202eadbaf0458a07dcf376436223868e..3e874c341ad8a6f37a5dee9778c4d67cd7e5cabd 100644 --- a/Assets/Resources/Models/Characters/Basic/BasicCharModel.prefab +++ b/Assets/Resources/Models/Characters/Basic/BasicCharModel.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 9221680813695291731} - component: {fileID: 211686610887331952} - component: {fileID: 7854868560450781420} + - component: {fileID: 4321336250984689561} m_Layer: 6 m_Name: BasicCharModel m_TagString: Player @@ -60,6 +61,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -87,7 +90,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &211686610887331952 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -101,6 +104,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -127,3 +131,16 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4321336250984689561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125248941348886635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc4d5359067cdfb47a45684d6cc1482a, type: 3} + m_Name: + m_EditorClassIdentifier: + WeaponPivot: {x: 0.258, y: 0.75, z: 0.375} diff --git a/Assets/Resources/Models/Characters/Basic2/BasicChar2Model.prefab b/Assets/Resources/Models/Characters/Basic2/BasicChar2Model.prefab index 136bbe671248c1c4f2e02a08849b9798955459d2..b473d128882cfc07399a58ff8bf661d9f9647d9c 100644 --- a/Assets/Resources/Models/Characters/Basic2/BasicChar2Model.prefab +++ b/Assets/Resources/Models/Characters/Basic2/BasicChar2Model.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4666754847935405941} - component: {fileID: 7320871978689485787} - component: {fileID: 4205797128800968765} + - component: {fileID: 5114590188839600129} m_Layer: 7 m_Name: BasicChar2Model m_TagString: Untagged @@ -60,6 +61,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -87,7 +90,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &7320871978689485787 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -101,6 +104,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -127,3 +131,16 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0.000000059604645, y: 0, z: -0.000000059604645} +--- !u!114 &5114590188839600129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3596266059315004415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc4d5359067cdfb47a45684d6cc1482a, type: 3} + m_Name: + m_EditorClassIdentifier: + WeaponLocation: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Models/Environment/TestInteractable/TestInteractableModel.prefab b/Assets/Resources/Models/Environment/TestInteractable/TestInteractableModel.prefab index 8975cc8a2ceb423d0d9f3a29e593c560e205df2e..6ae69b6e4480b0f918523254f638211af5123d20 100644 --- a/Assets/Resources/Models/Environment/TestInteractable/TestInteractableModel.prefab +++ b/Assets/Resources/Models/Environment/TestInteractable/TestInteractableModel.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4615974585581482631} - component: {fileID: 1310652413205708510} - component: {fileID: 4681449771849682896} + - component: {fileID: 8799261022682318536} m_Layer: 0 m_Name: TestInteractableModel m_TagString: Untagged @@ -60,6 +61,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -108,7 +111,7 @@ BoxCollider: m_Center: {x: 0, y: 0, z: 0} --- !u!95 &4681449771849682896 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -122,8 +125,22 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &8799261022682318536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5071667469683539556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc4d5359067cdfb47a45684d6cc1482a, type: 3} + m_Name: + m_EditorClassIdentifier: + WeaponLocation: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab b/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab index 5a192af5ccd1ef525992a521998ff1c01e1099d4..8b0b181a75781531474c4a20e69dd802bdb83e1b 100644 --- a/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab +++ b/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 2791526420071666714} - component: {fileID: 1664417149787680797} - component: {fileID: 444274800546035912} + - component: {fileID: 3166162016965732317} m_Layer: 0 m_Name: TestWeaponModel m_TagString: Untagged @@ -59,6 +60,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -86,7 +89,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &444274800546035912 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -100,8 +103,22 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3166162016965732317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6146631199650576833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc4d5359067cdfb47a45684d6cc1482a, type: 3} + m_Name: + m_EditorClassIdentifier: + WeaponPivot: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Level0.unity b/Assets/Scenes/Level0.unity index 744e274364f5025e744c5f48c0d9bdf950f5c117..ba64724b247358371e32d0a19b517e00ff31337e 100644 --- a/Assets/Scenes/Level0.unity +++ b/Assets/Scenes/Level0.unity @@ -133,7 +133,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.75 objectReference: {fileID: 0} - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} propertyPath: m_LocalPosition.z @@ -442,7 +442,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.75 objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.z @@ -481,7 +481,8 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 7195061579406845517, guid: 71b1260932d07054caf2d52890e46704, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71b1260932d07054caf2d52890e46704, type: 3} @@ -782,7 +783,7 @@ Transform: m_GameObject: {fileID: 1652156424} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.5, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -812,10 +813,8 @@ MonoBehaviour: maxHealth: 10 health: 10 damagedDelay: 1 - weaponList: - - {fileID: 1829954854} + weaponList: [] baseDamage: 0 - weaponLocation: {x: 0, y: 0, z: 0} companionList: [] activeCompanions: --- !u!54 &1652156427 @@ -850,17 +849,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} m_PrefabInstance: {fileID: 84371474} m_PrefabAsset: {fileID: 0} ---- !u!114 &1829954854 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - m_PrefabInstance: {fileID: 84371474} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68705b8ed948aae4d98ef6e87b6f6961, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1847257072 GameObject: m_ObjectHideFlags: 0 @@ -1066,1057 +1054,3 @@ SceneRoots: - {fileID: 272310726} - {fileID: 1919968790} - {fileID: 862419725} - -%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: 10 - 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.46169513, g: 0.5124164, b: 0.58993304, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - 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_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: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - 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 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1001 &84371474 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1652156425} - m_Modifications: - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalPosition.x - value: 0.258 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalPosition.z - value: 0.375 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5240801910879785525, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - propertyPath: m_Name - value: TestWeapon - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} ---- !u!1 &272310724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 272310726} - - component: {fileID: 272310725} - m_Layer: 0 - m_Name: GameController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &272310725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 272310724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 354f6ba1c1428a04da1f256d1da9f51e, type: 3} - m_Name: - m_EditorClassIdentifier: - player: {fileID: 1652156426} ---- !u!4 &272310726 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 272310724} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1487068468} - - {fileID: 1847257073} - - {fileID: 531325656} - - {fileID: 387761188} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &374115585 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - m_PrefabInstance: {fileID: 1139456223} - m_PrefabAsset: {fileID: 0} ---- !u!1 &387761187 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 387761188} - - component: {fileID: 387761189} - m_Layer: 0 - m_Name: ObjectManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &387761188 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 387761187} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 272310726} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &387761189 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 387761187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c051aae39aef0264ba144bc30cbe301e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &493225843 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - m_PrefabInstance: {fileID: 791030441} - m_PrefabAsset: {fileID: 0} ---- !u!1 &531325655 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 531325656} - - component: {fileID: 531325657} - m_Layer: 0 - m_Name: EnvironmentManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &531325656 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531325655} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 374115585} - - {fileID: 754309252} - - {fileID: 666869943} - m_Father: {fileID: 272310726} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &531325657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531325655} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c54dc993f0d1e36499ea37e182a87cbc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &554185221 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - m_PrefabInstance: {fileID: 1104825471} - m_PrefabAsset: {fileID: 0} ---- !u!1 &666869941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666869943} - - component: {fileID: 666869942} - 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 &666869942 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666869941} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 0.5 - 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_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &666869943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666869941} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0.31, y: 3.87, z: -0.52} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 531325656} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &754309248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 754309252} - - component: {fileID: 754309251} - - component: {fileID: 754309250} - - component: {fileID: 754309249} - m_Layer: 0 - m_Name: Quad - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &754309249 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 754309248} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &754309250 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 754309248} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &754309251 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 754309248} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &754309252 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 754309248} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: -0.75, z: 0} - m_LocalScale: {x: 100, y: 100, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 531325656} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1001 &791030441 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1652156425} - m_Modifications: - - target: {fileID: 125248941348886635, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_Name - value: Model - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7854868560450781420, guid: 71b1260932d07054caf2d52890e46704, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 71b1260932d07054caf2d52890e46704, type: 3} ---- !u!1 &862419724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 862419725} - - component: {fileID: 862419726} - m_Layer: 0 - m_Name: GameInput - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &862419725 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 862419724} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &862419726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 862419724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 277e6d37ad3220543a05009070b3a2b8, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1104825471 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1847257073} - m_Modifications: - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalPosition.x - value: -0.8136101 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalPosition.y - value: -0.75 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalPosition.z - value: 2.4709601 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8491347043216026353, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: m_Name - value: Dummy - objectReference: {fileID: 0} - - target: {fileID: 8734659159874979979, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} - propertyPath: id - value: - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e312250336c0244193b4b75151d4fe3, type: 3} ---- !u!1001 &1139456223 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 531325656} - m_Modifications: - - target: {fileID: 6541102688641435260, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_Name - value: TestInteractable - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalPosition.x - value: 2.7590532 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalPosition.y - value: -0.75 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalPosition.z - value: -1.027792 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c98b222ded23bb24690e674886e5741a, type: 3} ---- !u!1 &1487068465 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1487068468} - - component: {fileID: 1487068467} - - component: {fileID: 1487068466} - 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 &1487068466 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1487068465} - m_Enabled: 1 ---- !u!20 &1487068467 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1487068465} - 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_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - 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 &1487068468 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1487068465} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.25, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 272310726} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1652156424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1652156425} - - component: {fileID: 1652156427} - - component: {fileID: 1652156426} - m_Layer: 0 - m_Name: Player - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1652156425 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652156424} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 493225843} - - {fileID: 1829954853} - m_Father: {fileID: 1847257073} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1652156426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652156424} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbd12f0cc12b22743998413b3f14b197, type: 3} - m_Name: - m_EditorClassIdentifier: - id: - knockbackResistance: 2 - baseSpeed: 100 - jumpForce: 10 - groundLayers: - serializedVersion: 2 - m_Bits: 0 - maxHealth: 10 - health: 10 - damagedDelay: 1 - weaponList: - - {fileID: 1829954854} - baseDamage: 0 - weaponLocation: {x: 0, y: 0, z: 0} - companionList: [] - activeCompanions: ---- !u!54 &1652156427 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1652156424} - serializedVersion: 4 - m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!4 &1829954853 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - m_PrefabInstance: {fileID: 84371474} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1829954854 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} - m_PrefabInstance: {fileID: 84371474} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68705b8ed948aae4d98ef6e87b6f6961, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1847257072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1847257073} - - component: {fileID: 1847257074} - m_Layer: 0 - m_Name: EntityManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1847257073 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847257072} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 554185221} - - {fileID: 1652156425} - m_Father: {fileID: 272310726} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1847257074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847257072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04dfd389d2725984eac71a7ab91689a3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1919968788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1919968790} - - component: {fileID: 1919968789} - m_Layer: 0 - m_Name: GameSaveData - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1919968789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919968788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e57b66e76eeafd4bb8ea101ee7598ae, type: 3} - m_Name: - m_EditorClassIdentifier: - difficulty: 1 ---- !u!4 &1919968790 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919968788} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 272310726} - - {fileID: 1919968790} - - {fileID: 862419725} diff --git a/Assets/_Scripts/Config/EnvironmentConfig.cs b/Assets/_Scripts/Config/EnvironmentConfig.cs index 2f093d4cd548a010ed5586861756202671a73aca..c5eec142531b945ccad708328249f3be2f15fd2e 100644 --- a/Assets/_Scripts/Config/EnvironmentConfig.cs +++ b/Assets/_Scripts/Config/EnvironmentConfig.cs @@ -17,6 +17,5 @@ public static class EnvironmentConfig{ public const string LAYER_COLLECTIBLE = "Collectible"; // Object Components - public const string OBJECT_WEAPON = "Weapon"; - public const string OBJECT_MODEL = "Model"; + public const string OBJECT_NAME_WEAPON = "Weapon"; } \ No newline at end of file diff --git a/Assets/_Scripts/Core/Entities/Pets/HealingPet/HealingCompanion.cs b/Assets/_Scripts/Core/Entities/Pets/HealingPet/HealingCompanion.cs index e72272e3b73394a3ba2e09b091f1a9a7decd4a39..a5957bc2822a65b8bbf7174fbe78189cbd88ea1d 100644 --- a/Assets/_Scripts/Core/Entities/Pets/HealingPet/HealingCompanion.cs +++ b/Assets/_Scripts/Core/Entities/Pets/HealingPet/HealingCompanion.cs @@ -36,9 +36,12 @@ public class HealingCompanion : Companion { base.Assign(owner); ownerDamageableComponent = Owner.CompanionController.gameObject.GetComponent<IDamageable>(); + + #if STRICT if(ownerDamageableComponent == null) { - Debug.LogWarning("HealingCompanion is assigned to a non-IDamageable object"); + Debug.LogError("HealingCompanion is assigned to a non-IDamageable object"); } + #endif } } \ No newline at end of file diff --git a/Assets/_Scripts/Core/Game/Data/GameInput.cs b/Assets/_Scripts/Core/Game/Data/GameInput.cs index a6ebf534b6849e00e07723a63594314ce1dcd595..65a7829d3d3dcc0aa76d1571e433f6b6e392dba0 100644 --- a/Assets/_Scripts/Core/Game/Data/GameInput.cs +++ b/Assets/_Scripts/Core/Game/Data/GameInput.cs @@ -4,20 +4,20 @@ using UnityEngine; public class GameInput : MonoBehaviour { // Static Instance - public static GameInput instance; + public static GameInput Instance; // Attributes [NonSerialized] public KeyCode backButton = KeyCode.Escape; [NonSerialized] public KeyCode attackButton = KeyCode.Mouse0; [NonSerialized] public KeyCode attackAlternateButton = KeyCode.Mouse1; - [NonSerialized] public KeyCode interactButton = KeyCode.C; + [NonSerialized] public KeyCode interactButton = KeyCode.Q; [NonSerialized] public KeyCode sprintButton = KeyCode.LeftShift; [NonSerialized] public KeyCode inputToggleButton = KeyCode.LeftControl; // Constructor protected void Awake() { - instance = this; + Instance = this; DontDestroyOnLoad(gameObject); } } diff --git a/Assets/_Scripts/Core/Game/GameController.cs b/Assets/_Scripts/Core/Game/GameController.cs index 7b5d23aa2ba9b9019932a05513e9262c6a50a472..94618805f193e77153a33c009c134d852468595b 100644 --- a/Assets/_Scripts/Core/Game/GameController.cs +++ b/Assets/_Scripts/Core/Game/GameController.cs @@ -4,7 +4,7 @@ using UnityEngine; public class GameController : MonoBehaviour { // Static Instance - public static GameController instance; + public static GameController Instance; // Attributes public Player player; @@ -17,9 +17,9 @@ public class GameController : MonoBehaviour // Constructor protected void Awake() { - if(instance == null) + if(Instance == null) { - instance = this; + Instance = this; } mainCamera = new GameCameraController(GetComponentInChildren<Camera>()); @@ -29,7 +29,7 @@ public class GameController : MonoBehaviour // Functions protected void Update() { - if(Input.GetKeyDown(GameInput.instance.backButton)) + if(Input.GetKeyDown(GameInput.Instance.backButton)) { stateController.HandleEscape(); } diff --git a/Assets/_Scripts/Core/Game/GameStateController.cs b/Assets/_Scripts/Core/Game/GameStateController.cs index ac2f5719a2c42cbd0883234d218bf807a70e9930..f50a0675282e335cf5d78738f289ea860c730a76 100644 --- a/Assets/_Scripts/Core/Game/GameStateController.cs +++ b/Assets/_Scripts/Core/Game/GameStateController.cs @@ -7,9 +7,9 @@ public class GameStateController { // Attributes private readonly Stack<GameState> gameStateStack = new(); - event GameStateChangeEvent OnGameStateChange; // Events + event GameStateChangeEvent OnGameStateChange; event Action OnPausedEvent; // Constructor diff --git a/Assets/_Scripts/Core/Game/Managers/EntityManager.cs b/Assets/_Scripts/Core/Game/Managers/EntityManager.cs index 933e4e714aa26a83b2d232da043ab945ffbf16c8..b798bd5cf500fe1dba8350e7512563ef4137bac7 100644 --- a/Assets/_Scripts/Core/Game/Managers/EntityManager.cs +++ b/Assets/_Scripts/Core/Game/Managers/EntityManager.cs @@ -5,12 +5,12 @@ using UnityEngine; public class EntityManager : BaseObjectManager { // Static instance - public static EntityManager instance; + public static EntityManager Instance; // Constructor protected void Awake() { - instance = this; + Instance = this; ManagerName = "Entity Manager"; } } diff --git a/Assets/_Scripts/Core/Game/Managers/EnvironmentManager.cs b/Assets/_Scripts/Core/Game/Managers/EnvironmentManager.cs index b06205ab9568e402bbdc2a56e288fa069c161804..5e95def52bb15431da8956781bf645a31c6a1e0d 100644 --- a/Assets/_Scripts/Core/Game/Managers/EnvironmentManager.cs +++ b/Assets/_Scripts/Core/Game/Managers/EnvironmentManager.cs @@ -5,12 +5,12 @@ using UnityEngine; public class EnvironmentManager : BaseObjectManager { // Static instance - public static EnvironmentManager instance; + public static EnvironmentManager Instance; // Constructor protected void Awake() { - instance = this; + Instance = this; ManagerName = "Environment Manager"; } } diff --git a/Assets/_Scripts/Core/Game/Managers/ObjectManager.cs b/Assets/_Scripts/Core/Game/Managers/ObjectManager.cs index ea2f62f614ab8d178d0a8b46058637deb1a9f7b6..16644cc83b2fe3857b510a869810230645d3441a 100644 --- a/Assets/_Scripts/Core/Game/Managers/ObjectManager.cs +++ b/Assets/_Scripts/Core/Game/Managers/ObjectManager.cs @@ -3,12 +3,12 @@ using UnityEngine; public class ObjectManager : BaseObjectManager { // Static Instance - public static ObjectManager instance; + public static ObjectManager Instance; // Constructor protected void Awake() { - instance = this; + Instance = this; ManagerName = "Object Manager"; } } \ No newline at end of file diff --git a/Assets/_Scripts/Core/Objects/Collectibles/Collectible.cs b/Assets/_Scripts/Core/Objects/Collectibles/Collectible.cs index 2f55343027051087eb87c4e10d90081dd56d895b..68e6f33111e26467b2cab73bb8fe1b0c0574fb45 100644 --- a/Assets/_Scripts/Core/Objects/Collectibles/Collectible.cs +++ b/Assets/_Scripts/Core/Objects/Collectibles/Collectible.cs @@ -12,8 +12,9 @@ public abstract class Collectible : WorldObject private event Action OnTimeoutEvent; // Constructor - protected void Start() + protected new void Start() { + base.Start(); OnCollectEvent += OnCollect; OnCollectEvent += OnCollectEnd; OnTimeoutEvent += OnTimeout; diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs index 0adf13eaaf4b7c7968267f4cce51446dfece9dca..0562fcee2d841f4c1f9b2dc9193cba5a4a61490f 100644 --- a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs +++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs @@ -52,7 +52,7 @@ public class TestWeapon : WeaponObject attackLayerCode: bearer.AttackLayerCode, damageModifier: bearer.AttackMultiplier, knockbackOrigin: transform.position, - parent: animationController.model, + parent: animationController.model.transform, objectName: "TestWeapon Hitbox" ); diff --git a/Assets/_Scripts/Core/Objects/Weapons/WeaponObject.cs b/Assets/_Scripts/Core/Objects/Weapons/WeaponObject.cs index 8bed7c9e627fe966275ed66165d109f1d4f1e9a0..0b5ffbf1be7fe94d14bf2f764eeece2edb6c0a2d 100644 --- a/Assets/_Scripts/Core/Objects/Weapons/WeaponObject.cs +++ b/Assets/_Scripts/Core/Objects/Weapons/WeaponObject.cs @@ -18,6 +18,14 @@ public abstract class WeaponObject : MonoBehaviour protected void Start() { bearer = GetComponentInParent<IArmed>(); + + #if STRICT + if(bearer == null) + { + Debug.LogError("Weapon object is assigned to a non-IArmed parent. How to resolve: create one or assign it to something else"); + } + #endif + canAttack = true; OnAttackEvent += OnAttack; OnAlternateAttackEvent += OnAlternateAttack; diff --git a/Assets/_Scripts/Core/Player/Player.cs b/Assets/_Scripts/Core/Player/Player.cs index 4fee20d0ffb2b3005c96136ab801bbe70d76f0a8..47052f96d7424bfde9a615c13497bf158cbd99bd 100644 --- a/Assets/_Scripts/Core/Player/Player.cs +++ b/Assets/_Scripts/Core/Player/Player.cs @@ -35,7 +35,7 @@ public class Player : PlayerEntity WeaponList.AddRange(GetComponentsInChildren<WeaponObject>()); EquipWeapon(0); - GameController.instance.player = this; + GameController.Instance.player = this; } // Functions diff --git a/Assets/_Scripts/Core/Player/PlayerAnimationController.cs b/Assets/_Scripts/Core/Player/PlayerAnimationController.cs index 2014cc5fde03b4ffbd45862b44759ee959f02960..02707188dd88f1de1ca202b816f18707907948c8 100644 --- a/Assets/_Scripts/Core/Player/PlayerAnimationController.cs +++ b/Assets/_Scripts/Core/Player/PlayerAnimationController.cs @@ -21,10 +21,13 @@ public class PlayerAnimationController : AnimationController // Functions public void AnimateStates() { + #if STRICT if(animator == null) { - Debug.LogWarning($"Animated object of {player.name} does not have an animator in its model"); + Debug.LogError($"Animated object of {player.name} does not have an animator in its model"); } + #endif + switch (player.stateController.state) { case PlayerState.IDLE: diff --git a/Assets/_Scripts/Core/Player/PlayerInputController.cs b/Assets/_Scripts/Core/Player/PlayerInputController.cs index 484eae27aee3e960e8451b3cbee3e0fba9a36141..78c69b1b87615be42934aa56fcdf9d0e548b3b82 100644 --- a/Assets/_Scripts/Core/Player/PlayerInputController.cs +++ b/Assets/_Scripts/Core/Player/PlayerInputController.cs @@ -38,7 +38,7 @@ public class PlayerInputController } - if(Input.GetKey(GameInput.instance.inputToggleButton)){ + if(Input.GetKey(GameInput.Instance.inputToggleButton)){ Debug.Log("Player control is Toggled"); if(movementInputScroll != 0) { @@ -51,7 +51,7 @@ public class PlayerInputController } - else if(Input.GetKeyDown(GameInput.instance.attackButton)) + else if(Input.GetKeyDown(GameInput.Instance.attackButton)) { Debug.Log("Player is Attacking"); if(player.Weapon == null) @@ -63,7 +63,7 @@ public class PlayerInputController player.Weapon.Attack(); } - else if(Input.GetKeyDown(GameInput.instance.attackAlternateButton)) + else if(Input.GetKeyDown(GameInput.Instance.attackAlternateButton)) { Debug.Log("Player is Attacking (alternate)"); if(player.Weapon == null) @@ -74,7 +74,7 @@ public class PlayerInputController player.Weapon.AlternateAttack(); } - else if(Input.GetKeyDown(GameInput.instance.interactButton)) + else if(Input.GetKeyDown(GameInput.Instance.interactButton)) { Debug.Log("Player is interacting"); if(player.stateController.currentInteractables.Count == 0) diff --git a/Assets/_Scripts/Core/Player/PlayerMovementController.cs b/Assets/_Scripts/Core/Player/PlayerMovementController.cs index e1bc5b58c51a876766a3ecdd813283e127a9fca2..ed11c59eeb2f5823e0cf75c2b032f1b617cd4191 100644 --- a/Assets/_Scripts/Core/Player/PlayerMovementController.cs +++ b/Assets/_Scripts/Core/Player/PlayerMovementController.cs @@ -13,8 +13,8 @@ public class PlayerMovementController { this.player = player; player.inputController.OnJumpEvent += HandleJump; - axisX = new(GameController.instance.mainCamera.Orientation.right.x, 0, GameController.instance.mainCamera.Orientation.right.z); - axisZ = new(GameController.instance.mainCamera.Orientation.forward.x, 0, GameController.instance.mainCamera.Orientation.forward.z); + axisX = new(GameController.Instance.mainCamera.Orientation.right.x, 0, GameController.Instance.mainCamera.Orientation.right.z); + axisZ = new(GameController.Instance.mainCamera.Orientation.forward.x, 0, GameController.Instance.mainCamera.Orientation.forward.z); } // Functions @@ -26,15 +26,14 @@ public class PlayerMovementController private void SnapshotCameraOrientation() { - axisX = new(GameController.instance.mainCamera.Orientation.right.x, 0, GameController.instance.mainCamera.Orientation.right.z); - axisZ = new(GameController.instance.mainCamera.Orientation.forward.x, 0, GameController.instance.mainCamera.Orientation.forward.z); + axisX = new(GameController.Instance.mainCamera.Orientation.right.x, 0, GameController.Instance.mainCamera.Orientation.right.z); + axisZ = new(GameController.Instance.mainCamera.Orientation.forward.x, 0, GameController.Instance.mainCamera.Orientation.forward.z); } public void HandleMovement() { float inputX = player.inputController.movementInputX; float inputZ = player.inputController.movementInputZ; - Debug.Log(inputX); SnapshotCameraOrientation(); diff --git a/Assets/_Scripts/Core/Player/PlayerStateController.cs b/Assets/_Scripts/Core/Player/PlayerStateController.cs index b91c7610768c840ea0182dc3533a61f3df237b74..3e654e64f7bda495d5c46854d1a4cd0f4923a553 100644 --- a/Assets/_Scripts/Core/Player/PlayerStateController.cs +++ b/Assets/_Scripts/Core/Player/PlayerStateController.cs @@ -20,7 +20,7 @@ public class PlayerStateController : EntityStateController } private bool DetectSprinting() { - return (Input.GetAxisRaw("Horizontal") != 0 || Input.GetAxisRaw("Vertical") != 0) && Input.GetKey(GameInput.instance.sprintButton); + return (Input.GetAxisRaw("Horizontal") != 0 || Input.GetAxisRaw("Vertical") != 0) && Input.GetKey(GameInput.Instance.sprintButton); } private bool DetectJumping() { diff --git a/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs b/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs index ce5dc902d5158ab85b47c8d6a34f3e63453dea82..f63ce5b27c81bd0299752a303a794158fa23fa78 100644 --- a/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs +++ b/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs @@ -17,7 +17,7 @@ public class CameraFollowObject : CameraBehaviour // Functions protected void FixedUpdate() { - if(GameController.instance.IsPaused) + if(GameController.Instance.IsPaused) { return; } diff --git a/Assets/_Scripts/Core/UI/Camera/CameraMouse.cs b/Assets/_Scripts/Core/UI/Camera/CameraMouse.cs index 39b532a7b6ff6f0752a80a486916c44637708635..a25b020eb3cad74e623735b3201551e1f2250f7c 100644 --- a/Assets/_Scripts/Core/UI/Camera/CameraMouse.cs +++ b/Assets/_Scripts/Core/UI/Camera/CameraMouse.cs @@ -20,7 +20,7 @@ public class CameraMouse : CameraFollowObject // Functions protected void Update() { - if(GameController.instance.IsPaused) + if(GameController.Instance.IsPaused) { return; } diff --git a/Assets/_Scripts/Library/BaseClasses/Controller/AnimationController.cs b/Assets/_Scripts/Library/BaseClasses/Controller/AnimationController.cs index 3d45b8217fae01e4714b9b19fbfd0a1f0b26cf3e..379b218f83b5dc1f667abaa4c60094ec9079fc44 100644 --- a/Assets/_Scripts/Library/BaseClasses/Controller/AnimationController.cs +++ b/Assets/_Scripts/Library/BaseClasses/Controller/AnimationController.cs @@ -3,18 +3,19 @@ using UnityEngine; public abstract class AnimationController { // Attributes - public Transform model; + public Model model; public MeshRenderer meshRenderer; public Animator animator; // Constructor public AnimationController(MonoBehaviour animable) { - model = animable.transform.Find(EnvironmentConfig.OBJECT_MODEL); + model = animable.GetComponentInChildren<Model>(); + #if STRICT if(model == null) { - Debug.LogWarning($"Animated object of {animable.name} does not have a model, Please create a gameObject named 'Model' as its child"); + Debug.LogError($"Animated object of {animable.name} does not have a model. How to resolve: create a gameObject with a model.cs script as its child"); } else { @@ -22,12 +23,16 @@ public abstract class AnimationController meshRenderer = model.GetComponent<MeshRenderer>(); if(animator == null) { - Debug.LogWarning($"Animated object of {animable.name} does not have an animator in its model"); + Debug.LogError($"Animated object of {animable.name} does not have an animator in its model. How to resolve: add an animator to its child containing the model.cs script"); } if(meshRenderer == null) { - Debug.LogWarning($"Animated object of {animable.name} does not have an meshRenderer in its model"); + Debug.LogError($"Animated object of {animable.name} does not have an meshRenderer in its model. How to resolve: add an meshrenderer to its child containing the model.cs script"); } } + #else + animator = model.GetComponent<Animator>(); + meshRenderer = model.GetComponent<MeshRenderer>(); + #endif } } \ No newline at end of file diff --git a/Assets/_Scripts/Library/BaseClasses/EntityObject/CombatantEntity.cs b/Assets/_Scripts/Library/BaseClasses/EntityObject/CombatantEntity.cs index 022e6a7e2ff5e5ac7b2685398e39aaea9f051f82..c6014e1d25e74a6a226eff2899cbb0a675de828e 100644 --- a/Assets/_Scripts/Library/BaseClasses/EntityObject/CombatantEntity.cs +++ b/Assets/_Scripts/Library/BaseClasses/EntityObject/CombatantEntity.cs @@ -9,7 +9,6 @@ public class CombatantEntity : DamageableEntity, IArmed // Attributes public List<WeaponObject> weaponList = new(); [SerializeField] protected float baseDamage; - [SerializeField] protected Vector3 weaponLocation; private int weaponIndex; private WeaponObject weapon; @@ -17,7 +16,7 @@ public class CombatantEntity : DamageableEntity, IArmed public List<WeaponObject> WeaponList => weaponList; public WeaponObject Weapon => weapon; public Transform Orientation => transform; - public Vector3 WeaponLocation => weaponLocation; + public Vector3 WeaponLocation => model.WeaponPivot; public string AttackLayerCode => EnvironmentConfig.LAYER_ENVIRONMENT_ATTACK; public float AttackMultiplier => 1f; public float BaseDamage @@ -38,6 +37,17 @@ public class CombatantEntity : DamageableEntity, IArmed } } + // Constructors + protected new void Start(){ + base.Start(); + #if STRICT + if(WeaponList.Count == 0) + { + Debug.LogError($"CombatantEntity {name} does not have any weapon. How to solve: Consider putting a NoWeapon instead in the class"); + } + #endif + } + // Functions public void EquipWeapon(int index) @@ -59,7 +69,7 @@ public class CombatantEntity : DamageableEntity, IArmed selectedWeapon = ObjectFactory.CreateObject<WeaponObject>( prefabPath: selectedWeapon.data.prefabPath, parent: transform, - objectName: EnvironmentConfig.OBJECT_WEAPON + objectName: EnvironmentConfig.OBJECT_NAME_WEAPON ); WeaponList[WeaponIndex] = selectedWeapon; } diff --git a/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldEntity.cs b/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldEntity.cs index 0a5e84839436c35486559a2014457bc8e09bbb6a..d1e6506fa98c5980c477b8f5ce55f51595b7569d 100644 --- a/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldEntity.cs +++ b/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldEntity.cs @@ -3,6 +3,7 @@ using UnityEngine; public class WorldEntity : WorldObject, IRigid { // Attributes + protected Model model; [SerializeField] private float knockbackResistance; [SerializeField] private float baseSpeed; [SerializeField] private float jumpForce; @@ -32,14 +33,24 @@ public class WorldEntity : WorldObject, IRigid } // Constructor - protected void Start() + protected new void Start() { + base.Start(); rigidbody = GetComponent<Rigidbody>(); - groundDetectionSize = new Vector3(0.05f, 0.05f, 0.05f); + model = GetComponentInChildren<Model>(); + + #if STRICT if(rigidbody == null) { - Debug.LogWarning($"Rigid entity {name} does not have a rigidbody"); + Debug.LogError($"Rigid entity {name} does not have a rigidbody. How to resolve: Add a rigidbody component to it"); + } + if(model == null) + { + Debug.LogError($"Rigid entity {name} does not have a model. How to resolve: Create a gameObject with a model.cs script as its child"); } + #endif + + groundDetectionSize = new Vector3(0.05f, 0.05f, 0.05f); groundLayers = LayerMask.GetMask(EnvironmentConfig.LAYER_DEFAULT); } @@ -60,7 +71,7 @@ public class WorldEntity : WorldObject, IRigid protected void Update() { - if(GameController.instance.IsPaused) + if(GameController.Instance.IsPaused) { return; } @@ -68,7 +79,7 @@ public class WorldEntity : WorldObject, IRigid protected void FixedUpdate() { - if(GameController.instance.IsPaused) + if(GameController.Instance.IsPaused) { return; } diff --git a/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldObject.cs b/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldObject.cs index 9780bd38f85691d83ca6f1050656797ee3937f66..1faf57973d282e0ba463afe4feebf44f62ff5a58 100644 --- a/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldObject.cs +++ b/Assets/_Scripts/Library/BaseClasses/EntityObject/WorldObject.cs @@ -13,8 +13,19 @@ public class WorldObject : MonoBehaviour public Quaternion Rotation => transform.rotation; // Constructor - protected void Awake() + protected void Start() { + #if STRICT + if(GameController.Instance == null + || GameSaveData.Instance == null + || GameInput.Instance == null + || EnvironmentManager.Instance == null + ) + { + Debug.LogError("The structural controller scripts does not exist in the scene. How to resolve: refer to https://docs.google.com/document/d/14ypRPRArb10h4RO5I6qJBkxmQ-dMVWQy3zJeMVDpSsM/edit#heading=h.rucy43z24dch for the scene's base structure"); + } + #endif + numberId = autoIncrement; id = numberId.ToString(); autoIncrement++; diff --git a/Assets/_Scripts/Library/BaseClasses/Model.cs b/Assets/_Scripts/Library/BaseClasses/Model.cs new file mode 100644 index 0000000000000000000000000000000000000000..a9fc6ec81ae70cda4d6eddd84866c62c7555dee7 --- /dev/null +++ b/Assets/_Scripts/Library/BaseClasses/Model.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +public class Model : MonoBehaviour +{ + // Attributes + public Vector3 WeaponPivot; +} \ No newline at end of file diff --git a/Assets/_Scripts/Library/BaseClasses/Model.cs.meta b/Assets/_Scripts/Library/BaseClasses/Model.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..b9b7fd12314b7fa64c3a79e3e0f84ddda97383c7 --- /dev/null +++ b/Assets/_Scripts/Library/BaseClasses/Model.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dc4d5359067cdfb47a45684d6cc1482a \ No newline at end of file diff --git a/Assets/_Scripts/Library/Util/ObjectFactory.cs b/Assets/_Scripts/Library/Util/ObjectFactory.cs index 8155f2572c9b3d5cc482731e32fb98cff90e2fbb..98f3684a7fc2fa8903becc4e9b6cbe215d0e1571 100644 --- a/Assets/_Scripts/Library/Util/ObjectFactory.cs +++ b/Assets/_Scripts/Library/Util/ObjectFactory.cs @@ -18,10 +18,12 @@ public static class ObjectFactory { UnityEngine.GameObject prefabObject = Resources.Load<UnityEngine.GameObject>(prefabPath); + #if STRICT if(prefabObject == null) { - Debug.LogError($"Prefab not found: {prefabPath}"); + Debug.LogError($"Prefab not found: {prefabPath}. How to resolve: check the prefabPath parameter, make sure a prefab on path Resources/{prefabPath} actually exist"); } + #endif return CreateObject(prefabObject, parent, position, scale, rotation, renderingOrder, objectName); } @@ -37,7 +39,7 @@ public static class ObjectFactory ) { UnityEngine.GameObject createdObject = parent == null? - UnityEngine.GameObject.Instantiate(gameObject, ObjectManager.instance.transform) : + UnityEngine.GameObject.Instantiate(gameObject, ObjectManager.Instance.transform) : UnityEngine.GameObject.Instantiate(gameObject, parent); if(position != null) @@ -73,7 +75,7 @@ public static class ObjectFactory { UnityEngine.GameObject prefabObject = CreateObject( prefabPath, - parent == null? ObjectManager.instance.transform : parent, + parent == null? ObjectManager.Instance.transform : parent, position, scale, rotation, @@ -81,12 +83,16 @@ public static class ObjectFactory objectName ); + #if STRICT if(!prefabObject.TryGetComponent<T>(out var UnityObject)) { - Debug.LogError($"Loaded prefab is not a a valid type: {prefabPath}"); + Debug.LogError($"Loaded prefab is not a a valid type: {prefabPath}. How to resolve: check the function call, most likely a typo in function call code"); } - return UnityObject; + #else + prefabObject.TryGetComponent<T>(out var UnityObject); + return UnityObject; + #endif } public static T CreateObject<T>( @@ -101,7 +107,7 @@ public static class ObjectFactory { UnityEngine.GameObject prefabObject = CreateObject( gameObject, - parent == null? ObjectManager.instance.transform : parent, + parent == null? ObjectManager.Instance.transform : parent, position, scale, rotation, @@ -109,12 +115,16 @@ public static class ObjectFactory objectName ); + #if STRICT if(!prefabObject.TryGetComponent<T>(out var UnityObject)) { - Debug.LogError($"Loaded gameobject is not a a valid type: {gameObject.name}"); + Debug.LogError($"Loaded gameobject is not a a valid type: {gameObject.name}. How to resolve: check the function call, most likely a typo in function call code"); } - return UnityObject; + #else + prefabObject.TryGetComponent<T>(out var UnityObject); + return UnityObject; + #endif } public static AttackObject CreateAttackObject( @@ -134,7 +144,7 @@ public static class ObjectFactory { AttackObject attackObject = CreateObject<AttackObject>( prefabPath, - parent == null? ObjectManager.instance.transform : parent, + parent == null? ObjectManager.Instance.transform : parent, position, scale, rotation, @@ -182,12 +192,16 @@ public static class ObjectFactory objectName ); + #if STRICT if(!attackObject.TryGetComponent<T>(out var UnityObject)) { - Debug.LogError($"Loaded prefab is not a a valid type: {prefabPath}"); + Debug.LogError($"Loaded prefab is not a a valid type: {prefabPath}. How to resolve: check the function call, most likely a typo in function call code"); } - return UnityObject; + #else + attackObject.TryGetComponent<T>(out var UnityObject); + return UnityObject; + #endif } @@ -201,7 +215,7 @@ public static class ObjectFactory ){ Collectible collectible = CreateObject<Collectible>( prefabPath, - ObjectManager.instance.transform, + ObjectManager.Instance.transform, position, scale, rotation, @@ -224,7 +238,7 @@ public static class ObjectFactory ){ WorldEntity prefabObject = CreateObject<WorldEntity>( prefabPath, - EntityManager.instance.transform, + EntityManager.Instance.transform, position, scale, rotation, @@ -238,7 +252,7 @@ public static class ObjectFactory public static void DestroyObject(MonoBehaviour gameObject, float delay = 0) { if(gameObject == null) return; - GameController.instance.StartCoroutine(DestroyWithDelay(gameObject.gameObject, delay)); + GameController.Instance.StartCoroutine(DestroyWithDelay(gameObject.gameObject, delay)); } // Internal functions diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cf49fe5c3a786dd24255b9c613f98b506ea641a1..36f85238054984b8c6e3493687bfbcc81032a59e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 26 + serializedVersion: 27 productGUID: 6281ff805568abb49a0cf0bd2dbcd0fb AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -76,6 +76,8 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidApplicationEntry: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -95,6 +97,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -126,10 +129,8 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchNVNGraphicsFirmwareMemory: 32 switchMaxWorkerMultiple: 8 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -157,15 +158,18 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + androidMinAspectRatio: 1 + applicationIdentifier: + Standalone: com.DefaultCompany.3dModelTest buildNumber: + Bratwurst: 0 Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -175,18 +179,18 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 - VisionOSSdkVersion: 0 - VisionOSTargetOSVersionString: 1.0 + tvOSTargetOSVersionString: 13.0 + bratwurstSdkVersion: 0 + bratwurstTargetOSVersionString: 13.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -234,10 +238,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: - VisionOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 - VisionOSManualSigningProvisioningProfileType: 0 + bratwurstManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -261,6 +265,7 @@ PlayerSettings: AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -278,6 +283,7 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: @@ -382,8 +388,9 @@ PlayerSettings: - m_BuildTarget: tvOS m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - - m_BuildTarget: Android - m_Format: 3 + - serializedVersion: 2 + m_BuildTarget: Android + m_Formats: 03000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -532,6 +539,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -640,13 +648,19 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + scriptingDefineSymbols: + Standalone: DEVELOPMENT additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -671,6 +685,7 @@ PlayerSettings: gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: 3dModelTest @@ -694,6 +709,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -744,9 +760,11 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiLogStartupTiming: 0 hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: 7b92f857-6bd5-415c-ad01-72f803038983