Resolve merge conflicts using incoming branch

2026-03-10 15:26:52 +01:00
parent e07fb7dc4b 8c4c2b372b
commit 94e44ad7af
136 changed files with 11173 additions and 218 deletions
--- a/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial
+++ b/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicsMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: No_Friction
+  serializedVersion: 2
+  m_DynamicFriction: 0
+  m_StaticFriction: 0
+  m_Bounciness: 0
+  m_FrictionCombine: 0
+  m_BounceCombine: 0
--- a/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial.meta
+++ b/Assets/Settings/PhysicsMaterial/Player/No_Friction.physicMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7ddf8204ae4327bb84e928c9ae561d4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: