Everything else???

This commit is contained in:
Dan Foster
2026-02-11 19:48:19 +00:00
parent 8b1b276a28
commit 6450534fba
58 changed files with 7437 additions and 7577 deletions

Binary file not shown.

View File

@@ -0,0 +1,34 @@
fileFormatVersion: 2
guid: d26387bf4a33f4f03b916907f6b50828
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 1
animationMethod: 2
generateMipMaps: 1
texturesReadable: 0
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies: []
reportItems:
- type: 2
code: 19
messages: []
- type: 2
code: 19
messages: []

View File

@@ -0,0 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: material_0 1
m_Shader: {fileID: 4800000, guid: 4340a3cf1cde6416d957808a6ac79eed, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- baseColorTexture:
m_Texture: {fileID: -5390149515647955136, guid: 220b65233f75f478bad0dc3b0ad499be, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CullMode: 0
- _DstBlend: 0
- _Mode: 0
- _SrcBlend: 1
- _ZWrite: 1
- alphaCutoff: 0.5
- baseColorTexture_texCoord: 0
m_Colors:
- baseColorFactor: {r: 1, g: 1, b: 1, a: 1}
- baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

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

View File

@@ -0,0 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: material_0 2
m_Shader: {fileID: 4800000, guid: 4340a3cf1cde6416d957808a6ac79eed, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- baseColorTexture:
m_Texture: {fileID: -5390149515647955136, guid: d26387bf4a33f4f03b916907f6b50828, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CullMode: 0
- _DstBlend: 0
- _Mode: 0
- _SrcBlend: 1
- _ZWrite: 1
- alphaCutoff: 0.5
- baseColorTexture_texCoord: 0
m_Colors:
- baseColorFactor: {r: 1, g: 1, b: 1, a: 1}
- baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 89dc982f32a73451180a9bb51b10113e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: material_0 3
m_Shader: {fileID: 4800000, guid: 4340a3cf1cde6416d957808a6ac79eed, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- baseColorTexture:
m_Texture: {fileID: -5390149515647955136, guid: e441a5f7b65db4968913329b4cdfbf75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CullMode: 0
- _DstBlend: 0
- _Mode: 0
- _SrcBlend: 1
- _ZWrite: 1
- alphaCutoff: 0.5
- baseColorTexture_texCoord: 0
m_Colors:
- baseColorFactor: {r: 1, g: 1, b: 1, a: 1}
- baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 632d820e0796d4d93b1e78324061da87
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,34 @@
fileFormatVersion: 2
guid: 616f875523ad0435495d3759227bb4ea
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 1
animationMethod: 2
generateMipMaps: 1
texturesReadable: 0
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies: []
reportItems:
- type: 2
code: 19
messages: []
- type: 2
code: 19
messages: []

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,28 @@
fileFormatVersion: 2
guid: 9e848a421785b4212abcb7cf4ae082f3
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
editorImportSettings:
generateSecondaryUVSet: 0
importSettings:
nodeNameMethod: 0
animationMethod: 0
generateMipMaps: 1
texturesReadable: 0
defaultMinFilterMode: 9729
defaultMagFilterMode: 9729
anisotropicFilterLevel: 1
instantiationSettings:
mask: -1
layer: 0
skinUpdateWhenOffscreen: 1
lightIntensityFactor: 1
sceneObjectCreation: 2
assetDependencies: []
reportItems: []

Binary file not shown.

View File

@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 126029702024624554}
- component: {fileID: 3002660132190180648}
- component: {fileID: 4383523072808109851}
- component: {fileID: 3609363995277177833}
- component: {fileID: 5383724707706325514}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@@ -53,8 +55,8 @@ CharacterController:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Height: 2
m_Radius: 0.5
m_Height: 1.75
m_Radius: 0.24
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
@@ -75,10 +77,10 @@ MonoBehaviour:
walkSpeed: 5
runSpeed: 10
jumpHeight: 2
gravity: -9.81
gravity: -19.62
mouseSensitivity: 2
maxLookAngle: 90
playerCamera: {fileID: 0}
playerCamera: {fileID: 2075247097621853228}
--- !u!114 &4383523072808109851
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -94,37 +96,63 @@ MonoBehaviour:
crosshairColor: {r: 0.021564394, g: 0.9811321, b: 0, a: 1}
crosshairSize: 10
crosshairThickness: 2
--- !u!1 &8003886823554712882
GameObject:
--- !u!33 &3609363995277177833
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1479447108976249471}
m_Layer: 0
m_Name: Gun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1479447108976249471
Transform:
m_GameObject: {fileID: 6882903375964528458}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5383724707706325514
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8003886823554712882}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.3, y: -0.2, z: 0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4867483367381507360}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_GameObject: {fileID: 6882903375964528458}
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_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
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_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8543759782269834926
GameObject:
m_ObjectHideFlags: 0
@@ -136,6 +164,7 @@ GameObject:
- component: {fileID: 4867483367381507360}
- component: {fileID: 2075247097621853228}
- component: {fileID: 6877818284364034329}
- component: {fileID: 8719656586330480197}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
@@ -152,11 +181,11 @@ Transform:
m_GameObject: {fileID: 8543759782269834926}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.6, z: 0}
m_LocalPosition: {x: 0, y: 0.658, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1479447108976249471}
- {fileID: 4354687167556866568}
m_Father: {fileID: 8110894233409421727}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &2075247097621853228
@@ -190,8 +219,8 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
near clip plane: 0.1
far clip plane: 3394
field of view: 60
orthographic: 0
orthographic size: 5
@@ -218,3 +247,112 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8543759782269834926}
m_Enabled: 1
--- !u!114 &8719656586330480197
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8543759782269834926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ad5c2eb6d6ecad47af3a531cd239ec5, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CameraShake
--- !u!1001 &1420362106600511514
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4867483367381507360}
m_Modifications:
- target: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_Name
value: Gun Splat
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalPosition.x
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalPosition.y
value: -0.0791769
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalPosition.z
value: 0.755
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9211828
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalRotation.x
value: -0.30416393
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalRotation.y
value: -0.21869422
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalRotation.z
value: 0.105259016
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -30.954
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -32.99
objectReference: {fileID: 0}
- target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 22.412
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
insertIndex: -1
addedObject: {fileID: 1440475385873073364}
m_SourcePrefab: {fileID: 3150474306388093854, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
--- !u!1 &2029899304289424255 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
m_PrefabInstance: {fileID: 1420362106600511514}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1440475385873073364
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2029899304289424255}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e348b4e172ba23d45960c0071cc09b1f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::SimpleGun
damage: 25
range: 100
fireRate: 8
maxAmmo: 30
currentAmmo: 0
isAutomatic: 1
recoilKickback: 0.08
recoilKickUp: 0.04
recoilRecoverySpeed: 12
bobFrequency: 10
bobHorizontalAmplitude: 0.05
bobVerticalAmplitude: 0.03
sprintBobMultiplier: 1.5
bobReturnSpeed: 6
fpsCam: {fileID: 0}
--- !u!4 &4354687167556866568 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
m_PrefabInstance: {fileID: 1420362106600511514}
m_PrefabAsset: {fileID: 0}

File diff suppressed because one or more lines are too long

View File

@@ -24,10 +24,10 @@ public class FirstPersonController : MonoBehaviour
void Start()
{
Debug.Log("Starting game");
// FORCE NORMAL TIME (in case something external changed it)
Time.timeScale = 1f;
controller = GetComponent<CharacterController>();
if (controller == null)
@@ -56,9 +56,9 @@ public class FirstPersonController : MonoBehaviour
float moveX = 0f;
float moveZ = 0f;
if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) moveZ += 1f;
if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) moveZ -= 1f;
if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) moveX -= 1f;
if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) moveZ += 1f;
if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) moveZ -= 1f;
if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) moveX -= 1f;
if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow)) moveX += 1f;
// DEBUG: Log once when W is first pressed
@@ -74,19 +74,19 @@ public class FirstPersonController : MonoBehaviour
move.Normalize();
float currentSpeed = Input.GetKey(KeyCode.LeftShift) ? runSpeed : walkSpeed;
Vector3 posBefore = transform.position;
controller.Move(move * currentSpeed * Time.deltaTime);
// DEBUG: Log if we tried to move but didn't
if (move.magnitude > 0f && Input.GetKeyDown(KeyCode.W))
{
Vector3 posAfter = transform.position;
Debug.Log($"[FPC DEBUG] Move attempt: delta={move * currentSpeed * Time.deltaTime} | actualDelta={(posAfter - posBefore)} | controller.height={controller.height} | controller.radius={controller.radius}");
//Debug.Log($"[FPC DEBUG] Move attempt: delta={move * currentSpeed * Time.deltaTime} | actualDelta={(posAfter - posBefore)} | controller.height={controller.height} | controller.radius={controller.radius}");
// Check what we're colliding with
Collider[] nearbyColliders = Physics.OverlapSphere(transform.position, controller.radius + 0.5f);
Debug.Log($"[FPC DEBUG] Found {nearbyColliders.Length} colliders near player");
//Debug.Log($"[FPC DEBUG] Found {nearbyColliders.Length} colliders near player");
foreach (Collider col in nearbyColliders)
{
if (col != controller && !(col is CharacterController))

View File

@@ -94,7 +94,7 @@
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ShapeBuilder.ActiveShapeIndex",
"value": "{\"m_Value\":6}"
"value": "{\"m_Value\":8}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@@ -104,7 +104,7 @@
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize.Stairs",
"value": "{\"m_Value\":{\"x\":-6.0228424072265629,\"y\":4.082866668701172,\"z\":-12.89936351776123}}"
"value": "{\"m_Value\":{\"x\":11.711395263671875,\"y\":6.23270320892334,\"z\":-9.701751708984375}}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.