From 5f293bba824df4ab9647041b6640f36d38b6c41b Mon Sep 17 00:00:00 2001 From: sebastianhampel1 Date: Thu, 1 Jun 2023 11:47:55 -0400 Subject: [PATCH] crypod added --- .../cecil-0.11.4/Mono.Cecil.sln.meta | 7 ++ .../Network LOD/Prefabs/PlayerInputDriver.cs | 1 + .../Tugboat/LiteNetLib/LiteNetLib.csproj.meta | 7 ++ Assets/Models/WorldEnviornment/Cryopod.fbx | 3 + .../Models/WorldEnviornment/Cryopod.fbx.meta | 106 ++++++++++++++++++ Assets/Scripts/Enemies/AI/AIStateMachine.cs | 39 +++++++ .../Scripts/Enemies/AI/AIStateMachine.cs.meta | 11 ++ Assets/Scripts/Enemies/AI/EnemyState.cs | 12 ++ Assets/Scripts/Enemies/AI/EnemyState.cs.meta | 11 ++ Assets/Scripts/Steam/SteamLobbyManager.cs | 7 ++ ...uzzle_2020.3_HDRP_v1.0.1.unitypackage.meta | 7 ++ ...Muzzle_2020.3_URP_v1.0.1.unitypackage.meta | 7 ++ 12 files changed, 218 insertions(+) create mode 100644 Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta create mode 100644 Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta create mode 100644 Assets/Models/WorldEnviornment/Cryopod.fbx create mode 100644 Assets/Models/WorldEnviornment/Cryopod.fbx.meta create mode 100644 Assets/Scripts/Enemies/AI/AIStateMachine.cs create mode 100644 Assets/Scripts/Enemies/AI/AIStateMachine.cs.meta create mode 100644 Assets/Scripts/Enemies/AI/EnemyState.cs create mode 100644 Assets/Scripts/Enemies/AI/EnemyState.cs.meta create mode 100644 Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta create mode 100644 Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta diff --git a/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta b/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta new file mode 100644 index 0000000..aa8a077 --- /dev/null +++ b/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 246f31a0e00fea74a93125fec6d80da8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FishNet/Demos/Network LOD/Prefabs/PlayerInputDriver.cs b/Assets/FishNet/Demos/Network LOD/Prefabs/PlayerInputDriver.cs index 90d8507..909154f 100644 --- a/Assets/FishNet/Demos/Network LOD/Prefabs/PlayerInputDriver.cs +++ b/Assets/FishNet/Demos/Network LOD/Prefabs/PlayerInputDriver.cs @@ -43,6 +43,7 @@ public class PlayerInputDriver : NetworkBehaviour GameObject obj = Instantiate(spawnable); ServerManager.Spawn(obj); + } _moveDirection.y += gravity * Time.deltaTime; _characterController.Move(_moveDirection * Time.deltaTime); diff --git a/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta b/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta new file mode 100644 index 0000000..f9c48e9 --- /dev/null +++ b/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2ad85b0f43f25f1499c27a4dca23ddd8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/WorldEnviornment/Cryopod.fbx b/Assets/Models/WorldEnviornment/Cryopod.fbx new file mode 100644 index 0000000..da09b3a --- /dev/null +++ b/Assets/Models/WorldEnviornment/Cryopod.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b66c5d8412dc325e10059abacac09678c550afde03f7e6b89bc5677fced1240 +size 682012 diff --git a/Assets/Models/WorldEnviornment/Cryopod.fbx.meta b/Assets/Models/WorldEnviornment/Cryopod.fbx.meta new file mode 100644 index 0000000..996070d --- /dev/null +++ b/Assets/Models/WorldEnviornment/Cryopod.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: c038a760050b2c644a3947a794190aac +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemies/AI/AIStateMachine.cs b/Assets/Scripts/Enemies/AI/AIStateMachine.cs new file mode 100644 index 0000000..2f963d8 --- /dev/null +++ b/Assets/Scripts/Enemies/AI/AIStateMachine.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using System; +using EnemyAI; +/* +# Enemy System +## States +1. **Passive** +- Enemy is unaware of danger and performing idle actions. Not actively searching for anything. +- Perception range is at its minimum. +- If agressive target is "visible" enter `Agressive` state. +- If nonagressive target is "visible" enter `Aware` state. +2. **Guard** +- Enemy is looking out for danger. Can be moving along a path or standing +- Perception range is at regular level. +- If aggressive target is "visible" enter `Agressive` state. +- If nonagressive target is "visible" enter `Aware` state. +3. **Aware** +- Enemy has noticed something and is moving towards location of interest. +- Peception range is at regular level. +- If player is "visible" enter `Agressive` state. +- If nonagresive target is "visible" of equal or greater importance change target. +- If at location and no new item of note is added to "visible", then enter either `Passive` or `Guard` mode based on original mode. +4. **Aggressive** +- Enemy has noticed player: +- Apply these actions in sequence: + a. If player has not been "visible" for more than 5 seconds enter `Guard` mode. + b. If player has not been "visible" for < 5 seconds move to last location it was visible. + c. If player is in attack range and is visible, stop moving, and attack if able. + d. If player is not in attack range and is visible, run in direction of player. + + +*/ +class AIStateMachine : MonoBehaviour{ + [SerializeField] + private EnemyState state; + + + +} \ No newline at end of file diff --git a/Assets/Scripts/Enemies/AI/AIStateMachine.cs.meta b/Assets/Scripts/Enemies/AI/AIStateMachine.cs.meta new file mode 100644 index 0000000..e55919f --- /dev/null +++ b/Assets/Scripts/Enemies/AI/AIStateMachine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ecb02583e05945c42b91880d7bb76fec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemies/AI/EnemyState.cs b/Assets/Scripts/Enemies/AI/EnemyState.cs new file mode 100644 index 0000000..b166f48 --- /dev/null +++ b/Assets/Scripts/Enemies/AI/EnemyState.cs @@ -0,0 +1,12 @@ +using System; + +namespace EnemyAI{ + ///The state the enemy is currently in. + ///Passive: Enemy is not searching for anyone and is at minimum perception distance. + ///Guard: Enemy is on the lookout for enemies. May be following a patrol path. + ///Aware: Enemy has noticed something and is investigating it. + ///Aggressive: Enemy has seen something it wants to attack and is performing its attack. + public enum EnemyState{PASSIVE, GUARD, AWARE, AGGRESSIVE}; + + +} \ No newline at end of file diff --git a/Assets/Scripts/Enemies/AI/EnemyState.cs.meta b/Assets/Scripts/Enemies/AI/EnemyState.cs.meta new file mode 100644 index 0000000..2f66810 --- /dev/null +++ b/Assets/Scripts/Enemies/AI/EnemyState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cb7c23d6f892d824ebcd580774822eff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Steam/SteamLobbyManager.cs b/Assets/Scripts/Steam/SteamLobbyManager.cs index fcb0311..ea85b13 100644 --- a/Assets/Scripts/Steam/SteamLobbyManager.cs +++ b/Assets/Scripts/Steam/SteamLobbyManager.cs @@ -173,4 +173,11 @@ using UnityEngine.UI; { } } + + private void Update() + { + if(Input.GetKeyDown(KeyCode.Return)) { + print("OWNER?:"+CurrentLobby.Owner); + } } +} diff --git a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta new file mode 100644 index 0000000..a4d019d --- /dev/null +++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96a44475794fb6445a6f3c4b9ee13966 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta new file mode 100644 index 0000000..e4693ea --- /dev/null +++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0957b521a08374f4aa508231735153bc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: