bug fix

2025-10-29 12:22:07 +01:00 · 2021-10-01 21:47:46 +02:00
parent d3dc582f95
commit b2fb6dfef2
4 changed files with 79 additions and 118 deletions
--- a/Assets/Prefabs/Buildings/HouseBlueprint.prefab
+++ b/Assets/Prefabs/Buildings/HouseBlueprint.prefab
@@ -47,7 +47,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  isColliding: 0
-  followMouse: 1
  constructionPrefab: {fileID: 4975262029746308050, guid: f33a8569297837340a0e2ff7f85847a8, type: 3}
  collisionMat: {fileID: 2100000, guid: a1e8fb1ea637c0e45bed70dd7d1feaab, type: 2}
  blueprintMat: {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2}
@@ -58,7 +57,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 194332003443584216}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
@@ -115,6 +114,7 @@ MeshRenderer:
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@@ -196,6 +196,7 @@ MeshRenderer:
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
--- a/Assets/Prefabs/FirstPerson
+++ b/Assets/Prefabs/FirstPerson
@@ -126,8 +126,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 27ccf256a5b5a4841834e2cc7ef253e0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  mouseSensitivityX: 800
-  mouseSensitivityY: 800
+  mouseSensitivityX: 600
+  mouseSensitivityY: 600
  playerBody: {fileID: 8390537188327133022}
 --- !u!1 &8390537188327133021
 GameObject:
@@ -140,9 +140,12 @@ GameObject:
  - component: {fileID: 8390537188327133022}
  - component: {fileID: 8390537188327133020}
  - component: {fileID: 8390537188327132961}
+  - component: {fileID: 95348670}
+  - component: {fileID: 95348669}
+  - component: {fileID: 95348673}
  m_Layer: 0
  m_Name: FirstPerson Player
-  m_TagString: Untagged
+  m_TagString: FPSPlayer
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@@ -177,15 +180,18 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  speed: 12
-  adjustedSpeed: 0
-  sneakSpeed: 0.8
-  sprintSpeed: 1.1
-  jumpHeight: 3.5
+  sneakSpeedModifier: 0.6
+  sprintSpeedModifier: 1.4
+  jumpSprintSpeedModifier: 2000
+  jumpForce: 4
+  fallMultiplier: 1.8
  groundCheck: {fileID: 8390537187855206696}
  groundDistance: 0.4
  groundMask:
    serializedVersion: 2
    m_Bits: 128
+  isSprinting: 0
+  isSneaking: 0
 --- !u!114 &8390537188327132961
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -200,6 +206,50 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  interactionDistance: 20
  interactionText: {fileID: 0}
+--- !u!54 &95348670
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8390537188327133021}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 0
+--- !u!136 &95348669
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8390537188327133021}
+  m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.8
+  m_Height: 3.5
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &95348673
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8390537188327133021}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2fe01a752f991734aa307cc7b7665015, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  terrain: {fileID: 0}
+  prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3}
 --- !u!1 &8390537189371922020
 GameObject:
  m_ObjectHideFlags: 0
@@ -226,7 +276,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8390537189371922020}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -18.4}
  m_LocalScale: {x: 1.2, y: 1.8, z: 1.2}
  m_Children: []
  m_Father: {fileID: 8390537188327133022}
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -123,55 +123,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &95348668 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-  m_PrefabInstance: {fileID: 8390537188401440993}
-  m_PrefabAsset: {fileID: 0}
--- !u!136 &95348669
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 95348668}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.8
-  m_Height: 3.5
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &95348670
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 95348668}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 112
-  m_CollisionDetection: 0
--- !u!114 &95348673
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 95348668}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2fe01a752f991734aa307cc7b7665015, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  terrain: {fileID: 1417065444}
-  prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3}
 --- !u!1 &114639927
 GameObject:
  m_ObjectHideFlags: 0
@@ -1600,9 +1551,21 @@ PrefabInstance:
      propertyPath: m_RootOrder
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -500
+      value: -500.00003
      objectReference: {fileID: 0}
    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
      propertyPath: m_LocalPosition.y
@@ -1610,7 +1573,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -500
+      value: -500.00003
      objectReference: {fileID: 0}
    - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3}
      propertyPath: m_LocalRotation.w
@@ -1654,66 +1617,18 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 8390537187866079437, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: mouseSensitivityX
-      value: 600
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537187866079437, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: mouseSensitivityY
-      value: 600
-      objectReference: {fileID: 0}
+    - target: {fileID: 95348673, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
+      propertyPath: terrain
+      value: 
+      objectReference: {fileID: 1417065444}
    - target: {fileID: 8390537188327132961, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
      propertyPath: interactionText
      value: 
      objectReference: {fileID: 114639929}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: gravity
-      value: -9.86
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: airSpeed
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: jumpForce
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: jumpHeight
-      value: 3.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: sneakSpeed
-      value: 0.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: sprintSpeed
-      value: 1.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: fallMultiplier
-      value: 1.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: sprintJumpSpeed
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: sneakSpeedModifier
-      value: 0.6
-      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133020, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: jumpSprintSpeedModifier
-      value: 2000
-      objectReference: {fileID: 0}
    - target: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
      propertyPath: m_Name
      value: FirstPerson Player
      objectReference: {fileID: 0}
-    - target: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: m_TagString
-      value: FPSPlayer
-      objectReference: {fileID: 0}
    - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
      propertyPath: m_RootOrder
      value: 1
@@ -1758,9 +1673,5 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 8390537189371922023, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -18.4
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3}
--- a/Assets/Scripts/Building/BuildingBlueprint.cs
+++ b/Assets/Scripts/Building/BuildingBlueprint.cs
@@ -117,7 +117,6 @@ public abstract class BuildingBlueprint : MonoBehaviour
    public void OnCollisionEnter(Collision c)
    {
        isColliding = true;
-
        Debug.Log("Colliding True");
    }
    public void OnCollisionStay(Collision c)