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

Assets/Script/Gameplay/Edit/RigidbodyEditableController.cs

@@ -34,7 +34,11 @@ namespace Script.Gameplay.Edit
         {
             _rigidbody = GetComponent<Rigidbody>();
             //应用序列化的初始状态
+<<<<<<< HEAD
             _rigidbody.isKinematic = !IsEnableEdit;
+=======
+            _rigidbody.isKinematic = !isOpenInEditor;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         }
 
 #if UNITY_EDITOR
@@ -43,7 +47,11 @@ namespace Script.Gameplay.Edit
             //在编辑器中即时生效
             _rigidbody = _rigidbody == null ? GetComponent<Rigidbody>() : _rigidbody;
             if (_rigidbody != null)
+<<<<<<< HEAD
                 _rigidbody.isKinematic = !IsEnableEdit;
+=======
+                _rigidbody.isKinematic = !isOpenInEditor;
+>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
         }
 #endif
     }