Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam

2025-10-25 15:43:10 +08:00
parent 180e03e4c2 2f1ad467aa
commit 1944fb40a1
15 changed files with 5081 additions and 19 deletions
--- a/Assets/Prefab/Gameplay/Player.prefab
+++ b/Assets/Prefab/Gameplay/Player.prefab
@@ -239,6 +239,11 @@ MonoBehaviour:
  groundMask:
    serializedVersion: 2
    m_Bits: 64
+<<<<<<< HEAD
+=======
+  fallDamageThreshold: 3
+  pushPower: 0.5
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
 --- !u!114 &2963170313432786625
 MonoBehaviour:
  m_ObjectHideFlags: 0