Some prefabs edit

2022-01-29 15:34:38 +01:00
parent 44d2c3a64a
commit 120fa2a82b
9 changed files with 22 additions and 9 deletions
--- a/Assets/Materials/PlayerMaterial.physicMaterial
+++ b/Assets/Materials/PlayerMaterial.physicMaterial
@@ -7,8 +7,8 @@ PhysicMaterial:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PlayerMaterial
-  dynamicFriction: 1
-  staticFriction: 1
+  dynamicFriction: 0
+  staticFriction: 0
  bounciness: 0
  frictionCombine: 0
  bounceCombine: 1
--- a/Assets/Prefabs/Platform_Blue.prefab
+++ b/Assets/Prefabs/Platform_Blue.prefab
@@ -207,7 +207,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8768991388683709947}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
--- a/Assets/Prefabs/Platform_Green.prefab
+++ b/Assets/Prefabs/Platform_Green.prefab
@@ -208,7 +208,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8768991388683709947}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
--- a/Assets/Prefabs/Platform_Orange.prefab
+++ b/Assets/Prefabs/Platform_Orange.prefab
@@ -207,7 +207,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6650340373999088090}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
--- a/Assets/Prefabs/Platform_Red.prefab
+++ b/Assets/Prefabs/Platform_Red.prefab
@@ -207,7 +207,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8768991388683709947}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
--- a/Assets/Prefabs/Platform_yellow.prefab
+++ b/Assets/Prefabs/Platform_yellow.prefab
@@ -207,7 +207,7 @@ BoxCollider:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8768991388683709947}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2}
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
--- a/Assets/Scenes/Haitem.unity
+++ b/Assets/Scenes/Haitem.unity
@@ -281,6 +281,14 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 3339862426328537977, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3}
+      propertyPath: type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3339862426328537977, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3}
+      propertyPath: speed
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 7752117488709240220, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3}
      propertyPath: m_Convex
      value: 0
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -121,6 +121,8 @@ public class PlayerController : MonoBehaviour
        {
            return;
        }
+        this.downDirection = -other.GetContact(0).normal;
+        saveDirection = -other.GetContact(0).normal;

        // TODO: Handle other PlatformTypes
        Physics.gravity = -other.GetContact(0).normal * 9.81f;
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,13 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a
+      value: 5150040003515f5f585f552011755e4446154e2e2a2a7e347c2c4965b1b4366a
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 50080c5756540a5e095b0d7a11210644154f1b7f782922642f281b35b0b86c6d
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      flags: 0
+    RecentlyUsedSceneGuid-2:
+      value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a
      flags: 0
    RecentlyUsedScenePath-0:
      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d