All done

Keyght · Apr 4, 2023 · 197a47e · 197a47e
1 parent dbf679a
commit 197a47e
Show file tree

Hide file tree

Showing 32 changed files with 4,176 additions and 995 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -85,7 +85,6 @@
      <None Include="Assets\StreamingAssets\SteamVR\binding_vive_tracker_camera.json" />
      <None Include="Assets\Terrain\Water\Water4\Shaders\FXWater4Advanced.shader" />
      <None Include="Assets\StreamingAssets\SteamVR\binding_vive_cosmos.json" />
-     <None Include="Assets\Terrain\Lava\lava.shader" />
      <None Include="Assets\StreamingAssets\SteamVR\binding_holographic_hmd.json" />
      <None Include="Assets\Terrain\Water\Water4\Shaders\FXWater4Simple.shader" />
      <None Include="Assets\StreamingAssets\SteamVR\bindings_vive_controller.json" />

diff --git a/Assets/Prefabs/Demon.prefab b/Assets/Prefabs/Demon.prefab
@@ -154,7 +154,7 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.11
+  m_Radius: 0.09
   m_Height: 0.46
   m_Direction: 1
   m_Center: {x: 0, y: 0.15, z: 0}
@@ -557,10 +557,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.13
-  m_Height: 0.77
+  m_Radius: 0.14
+  m_Height: 0.25
   m_Direction: 1
-  m_Center: {x: 0, y: 0.29, z: 0}
+  m_Center: {x: 0, y: 0.35, z: 0}
 --- !u!1 &1397780465862808664
 GameObject:
   m_ObjectHideFlags: 0
@@ -1670,10 +1670,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.13
-  m_Height: 0.77
+  m_Radius: 0.14
+  m_Height: 0.25
   m_Direction: 1
-  m_Center: {x: 0, y: 0.29, z: 0}
+  m_Center: {x: 0, y: 0.35, z: 0}
 --- !u!1 &1397780466509805151
 GameObject:
   m_ObjectHideFlags: 0
@@ -2235,7 +2235,7 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.11
+  m_Radius: 0.09
   m_Height: 0.46
   m_Direction: 1
   m_Center: {x: 0, y: 0.15, z: 0}
@@ -2398,7 +2398,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1397780466873120084}
-  - component: {fileID: 8575509478258240206}
+  - component: {fileID: 7679900974728730077}
   m_Layer: 8
   m_Name: mixamorig:Spine
   m_TagString: Untagged
@@ -2422,8 +2422,8 @@ Transform:
   m_Father: {fileID: 1397780465979570750}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!136 &8575509478258240206
-CapsuleCollider:
+--- !u!65 &7679900974728730077
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2432,10 +2432,9 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.23
-  m_Height: 1
-  m_Direction: 1
-  m_Center: {x: 0, y: 0.09, z: 0}
+  serializedVersion: 2
+  m_Size: {x: 0.31, y: 0.65, z: 0.37}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1397780466908257707
 GameObject:
   m_ObjectHideFlags: 0
@@ -2701,7 +2700,7 @@ CapsuleCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   m_Radius: 0.12
-  m_Height: 0.68
+  m_Height: 0.49
   m_Direction: 1
   m_Center: {x: 0, y: 0.24, z: 0}
 --- !u!1 &1397780467031929708
@@ -3265,10 +3264,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.12
-  m_Height: 0.53
+  m_Radius: 0.08
+  m_Height: 0.45
   m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0, y: 0.09, z: 0}
 --- !u!1 &1397780467374210090
 GameObject:
   m_ObjectHideFlags: 0
@@ -3512,10 +3511,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.12
-  m_Height: 0.53
+  m_Radius: 0.08
+  m_Height: 0.45
   m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0, y: 0.09, z: 0}
 --- !u!1 &1397780467387467385
 GameObject:
   m_ObjectHideFlags: 0
@@ -4072,7 +4071,7 @@ CapsuleCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   m_Radius: 0.12
-  m_Height: 0.68
+  m_Height: 0.49
   m_Direction: 1
   m_Center: {x: 0, y: 0.24, z: 0}
 --- !u!1 &1397780467759981581

diff --git a/Assets/Prefabs/Vampire.prefab b/Assets/Prefabs/Vampire.prefab
@@ -306,8 +306,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.14
-  m_Height: 0.62
+  m_Radius: 0.09
+  m_Height: 0.49
   m_Direction: 1
   m_Center: {x: 0, y: 0.34, z: 0}
 --- !u!1 &9217303617636054480
@@ -386,8 +386,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.2
-  m_Height: 0.48
+  m_Radius: 0.17
+  m_Height: 0.34
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &9217303617656821881
@@ -1545,10 +1545,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.17
-  m_Height: 1.06
+  m_Radius: 0.11
+  m_Height: 0.45
   m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0, y: 0.27, z: 0}
 --- !u!1 &9217303618265777101
 GameObject:
   m_ObjectHideFlags: 0
@@ -2070,8 +2070,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.14
-  m_Height: 0.7
+  m_Radius: 0.11
+  m_Height: 0.53
   m_Direction: 1
   m_Center: {x: 0, y: 0.31, z: 0}
 --- !u!1 &9217303618640776775
@@ -2216,10 +2216,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.12
-  m_Height: 0.58
+  m_Radius: 0.08
+  m_Height: 0.41
   m_Direction: 1
-  m_Center: {x: 0, y: 0.13, z: 0}
+  m_Center: {x: 0, y: 0.17, z: 0}
 --- !u!1 &9217303618718752100
 GameObject:
   m_ObjectHideFlags: 0
@@ -2691,10 +2691,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.12
-  m_Height: 0.58
+  m_Radius: 0.08
+  m_Height: 0.41
   m_Direction: 1
-  m_Center: {x: 0, y: 0.13, z: 0}
+  m_Center: {x: 0, y: 0.17, z: 0}
 --- !u!1 &9217303618962257312
 GameObject:
   m_ObjectHideFlags: 0
@@ -2802,8 +2802,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.14
-  m_Height: 0.7
+  m_Radius: 0.11
+  m_Height: 0.53
   m_Direction: 1
   m_Center: {x: 0, y: 0.31, z: 0}
 --- !u!1 &9217303619056950549
@@ -3074,10 +3074,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.3
-  m_Height: 1
+  m_Radius: 0.22
+  m_Height: 0.64
   m_Direction: 1
-  m_Center: {x: 0, y: 0.08, z: 0}
+  m_Center: {x: 0, y: 0.14, z: 0}
 --- !u!1 &9217303619221091596
 GameObject:
   m_ObjectHideFlags: 0
@@ -3344,10 +3344,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.17
-  m_Height: 1.06
+  m_Radius: 0.11
+  m_Height: 0.45
   m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0, y: 0.27, z: 0}
 --- !u!1 &9217303619423403604
 GameObject:
   m_ObjectHideFlags: 0
@@ -3423,8 +3423,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.14
-  m_Height: 0.62
+  m_Radius: 0.09
+  m_Height: 0.49
   m_Direction: 1
   m_Center: {x: 0, y: 0.34, z: 0}
 --- !u!1 &9217303619439655818

diff --git a/Assets/Prefabs/Zombie.prefab b/Assets/Prefabs/Zombie.prefab
@@ -171,10 +171,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.08
-  m_Height: 0.6
+  m_Radius: 0.04
+  m_Height: 0.32
   m_Direction: 1
-  m_Center: {x: 0, y: 0.25, z: 0}
+  m_Center: {x: 0, y: 0.13, z: 0}
 --- !u!1 &420425386171694098
 GameObject:
   m_ObjectHideFlags: 0
@@ -569,8 +569,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.15
-  m_Height: 0.4
+  m_Radius: 0.12
+  m_Height: 0.31
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &2104281059313026905
@@ -712,7 +712,7 @@ CapsuleCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   m_Radius: 0.1
-  m_Height: 0.67
+  m_Height: 0.34
   m_Direction: 1
   m_Center: {x: 0, y: 0.19, z: 0}
 --- !u!1 &3262307635048129818
@@ -981,8 +981,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.11
-  m_Height: 0.56
+  m_Radius: 0.08
+  m_Height: 0.43
   m_Direction: 1
   m_Center: {x: 0, y: 0.22, z: 0}
 --- !u!1 &4586338994848439890
@@ -1063,8 +1063,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.09
-  m_Height: 0.55
+  m_Radius: 0.06
+  m_Height: 0.46
   m_Direction: 1
   m_Center: {x: 0, y: -0.03, z: 0}
 --- !u!1 &4684618326813465648
@@ -1568,8 +1568,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.11
-  m_Height: 0.56
+  m_Radius: 0.08
+  m_Height: 0.43
   m_Direction: 1
   m_Center: {x: 0, y: 0.22, z: 0}
 --- !u!1 &6172092392781613504
@@ -1616,7 +1616,7 @@ CapsuleCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   m_Radius: 0.1
-  m_Height: 0.67
+  m_Height: 0.34
   m_Direction: 1
   m_Center: {x: 0, y: 0.19, z: 0}
 --- !u!1 &6183579814404074665
@@ -1977,8 +1977,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.09
-  m_Height: 0.55
+  m_Radius: 0.06
+  m_Height: 0.46
   m_Direction: 1
   m_Center: {x: 0, y: -0.03, z: 0}
 --- !u!1 &6755724866767390739
@@ -2215,8 +2215,8 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.19
-  m_Height: 0.8
+  m_Radius: 0.12
+  m_Height: 0.47
   m_Direction: 1
   m_Center: {x: 0, y: 0.18, z: 0}
 --- !u!1 &7833971883954467840
@@ -2516,10 +2516,10 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.08
-  m_Height: 0.6
+  m_Radius: 0.04
+  m_Height: 0.32
   m_Direction: 1
-  m_Center: {x: 0, y: 0.25, z: 0}
+  m_Center: {x: 0, y: 0.13, z: 0}
 --- !u!1 &9079889870476430612
 GameObject:
   m_ObjectHideFlags: 0