铁球移动方块bug修改

SteelBall/Assembly-CSharp.csproj

@@ -67,6 +67,8 @@
     <Compile Include="Assets\0A2_Scripts\Battle\Collision\GroundCollision.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Collision\ThirdLevelBoxCollision.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Collision\ThirdLevelBoxTarget.cs" />
+    <Compile Include="Assets\0A2_Scripts\Battle\Collision\WallCollsionX.cs" />
+    <Compile Include="Assets\0A2_Scripts\Battle\Collision\WallCollsionY.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Empty4Raycast.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\FifthLevelTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\FirstLevelTrigger.cs" />
@@ -77,7 +79,9 @@
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\SecondLevelTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\SevenLevelOneTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\SevenLevelTwoTrigger.cs" />
+    <Compile Include="Assets\0A2_Scripts\Battle\Trigger\SixthLevelTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\TargetTrigger.cs" />
+    <Compile Include="Assets\0A2_Scripts\Battle\Trigger\ThirdLevelTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\Trigger\ThreeClawTrigger.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\UI\BattleUI.cs" />
     <Compile Include="Assets\0A2_Scripts\Battle\UI\Fade.cs" />

SteelBall/Assets/0A2_Scripts/Battle/Collision/WallCollsionX.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WallCollsionX : MonoBehaviour
+{
+    private bool m_bCollider = true;
+    private void OnCollisionEnter(Collision other)
+    {
+        if (other.collider.gameObject.CompareTag("Player") && m_bCollider)
+        {
+            m_bCollider = false;
+            GameServices.inputService.joyStick.axisX.speed = 0.5f;
+
+        }
+    }
+    private void OnCollisionExit(Collision other)
+    {
+        if (other.collider.gameObject.CompareTag("Player"))
+        {
+            m_bCollider = true;
+            GameServices.inputService.joyStick.axisX.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        }
+    }
+}

SteelBall/Assets/0A2_Scripts/Battle/Collision/WallCollsionX.cs.meta

+fileFormatVersion: 2
+guid: 0d94030e23d5b424aa606086788abd86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0A2_Scripts/Battle/Collision/WallCollsionY.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WallCollsionY : MonoBehaviour
+{
+    private bool m_bCollider = true;
+    private void OnCollisionEnter(Collision other)
+    {
+        if (other.collider.gameObject.CompareTag("Player") && m_bCollider)
+        {
+            m_bCollider = false;
+            GameServices.inputService.joyStick.axisY.speed = 0.5f;
+
+        }
+    }
+    private void OnCollisionExit(Collision other)
+    {
+        if (other.collider.gameObject.CompareTag("Player"))
+        {
+            m_bCollider = true;
+            GameServices.inputService.joyStick.axisY.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        }
+    }
+}

SteelBall/Assets/0A2_Scripts/Battle/Collision/WallCollsionY.cs.meta

+fileFormatVersion: 2
+guid: fb6e70002b0961b40ab4d5fc9d582b63
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0A2_Scripts/Battle/Trigger/FirstLevelTrigger.cs

@@ -5,11 +5,23 @@ using UnityEngine;
 public class FirstLevelTrigger : MonoBehaviour
 {
     //public Transform m_targetTrans;
-    private Vector3 m_pos = new Vector3(-1.61f, 0.22f, 0);
-    private Quaternion m_rotation = Quaternion.identity;
+    //private Vector3 m_pos = new Vector3(-1.61f, 0.22f, 0);
+    //private Quaternion m_rotation = Quaternion.identity;
+    //private bool m_bControl = true;
+    //private Transform m_targetTrans;
+    public Collider m_collider;
+    public MeshCollider m_meshCollider;
+    private Transform m_ballTrans;
+    private Transform m_handleTrans;
     private bool m_bControl = true;
-    private Transform m_targetTrans;
-
+    private bool m_bControlCollider = true;
+    private LevelEnum.MouseDirEnum m_mouseDir = LevelEnum.MouseDirEnum.Left;
+    private float m_speed = 0.0f;
+    private void Start()
+    {
+        m_handleTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.transform;
+        m_ballTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.SteelBallTrans;
+    }
     //private void OnTriggerEnter(Collider other)
     //{
     //    if (other.gameObject.CompareTag("Target"))
@@ -20,23 +32,65 @@ public class FirstLevelTrigger : MonoBehaviour
     //        m_targetTrans.localRotation = m_rotation;
     //    }
     //}
-    protected virtual void OnTriggerEnter(Collider collider)
-    {
-        Rigidbody rb = collider.GetComponent<Rigidbody>();
-        if (collider.gameObject.CompareTag("Target") && m_bControl && rb)
-        {
-            m_bControl = false;
-            m_targetTrans = collider.transform;
-            rb.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionY | RigidbodyConstraints.FreezePositionZ |
-                                              RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY;
-            BattleCtrl.instance.OnBattleWin();
-        }
-    }
+    //protected virtual void OnTriggerEnter(Collider collider)
+    //{
+    //    Rigidbody rb = collider.GetComponent<Rigidbody>();
+    //    if (collider.gameObject.CompareTag("Target") && m_bControl && rb)
+    //    {
+    //        m_bControl = false;
+    //        m_targetTrans = collider.transform;
+    //        rb.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionY | RigidbodyConstraints.FreezePositionZ |
+    //                                          RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationY;
+    //        BattleCtrl.instance.OnBattleWin();
+    //    }
+    //}
+    //private void OnCollisionEnter(Collision other)
+    //{
+    //    if (other.collider.gameObject.CompareTag("Player") && m_bControlCollider)
+    //    {
+    //        m_bControlCollider = false;
+    //        m_speed = GameServices.inputService.joyStick.axisX.speed;
+    //        GameServices.inputService.joyStick.axisX.speed = 0.5f;
+    //        GameServices.inputService.joyStick.axisY.speed = 0.5f;
+    //        //m_mouseDir = BattleCtrl.instance.levelManager.curLevel.chainHandle.MouseDir;
+    //        //BattleCtrl.instance.levelManager.curLevel.chainHandle.SetJoyStickDirectTrans(null);
+
+    //    }
+    //}
+    //private void OnCollisionExit(Collision other)
+    //{
+    //    if (other.collider.gameObject.CompareTag("Player"))
+    //    {
+    //        Debug.LogError("Exit");
+    //        m_bControlCollider = true;
+    //        GameServices.inputService.joyStick.axisX.speed = m_speed;
+    //        GameServices.inputService.joyStick.axisY.speed = m_speed;
+    //        //BattleCtrl.instance.levelManager.curLevel.chainHandle.SetJoyStickDirectTrans(BattleCtrl.instance.levelManager.curLevel.chainHandle.transform);
+    //    }
+    //}
     private void Update()
     {
-        if(!m_bControl && m_targetTrans)
+        //if(!m_bControl && m_targetTrans)
+        //{
+        //    m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_pos, 0.03f);
+        //}
+        float varDis = Vector3.SqrMagnitude(m_ballTrans.position - m_handleTrans.position);
+        if(varDis >= 20.0f && m_bControl)
         {
-            m_targetTrans.localPosition = Vector3.Lerp(m_targetTrans.localPosition, m_pos, 0.03f);
+            m_bControl = false;
+            m_collider.enabled = false;
+            m_meshCollider.enabled = false;
+            GameServices.timerServices.Push(this, 0.5f, delegate
+            {
+                m_bControl = true;
+                m_collider.enabled = true;
+                m_meshCollider.enabled = true;
+            });
         }
+        //if(!m_bControlCollider && !m_mouseDir.Equals(BattleCtrl.instance.levelManager.curLevel.chainHandle.MouseDir))
+        //{
+        //    m_bControlCollider = true;
+        //    BattleCtrl.instance.levelManager.curLevel.chainHandle.SetJoyStickDirectTrans(BattleCtrl.instance.levelManager.curLevel.chainHandle.transform);
+        //}
     }
 }

SteelBall/Assets/0A2_Scripts/Battle/Trigger/FourthLevelTrigger.cs

@@ -4,18 +4,44 @@ using UnityEngine;
 
 public class FourthLevelTrigger : MonoBehaviour
 {
-    public Transform m_targetTrans;
-    private Vector3 m_pos = new Vector3(0.21f,1.0f, -0.98f);
-    private Quaternion m_rotation = Quaternion.Euler(-14.7f, -146, -12.6f);
+    //public Transform m_targetTrans;
+    //private Vector3 m_pos = new Vector3(0.21f,1.0f, -0.98f);
+    //private Quaternion m_rotation = Quaternion.Euler(-14.7f, -146, -12.6f);
 
-    private void OnTriggerEnter(Collider other)
+    //private void OnTriggerEnter(Collider other)
+    //{
+    //    if (other.gameObject.CompareTag("Target"))
+    //    {
+    //        BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
+    //        BattleCtrl.instance.OnBattleWin();
+    //        m_targetTrans.localPosition = m_pos;
+    //        m_targetTrans.localRotation = m_rotation;
+    //    }
+    //}
+    public Collider m_collider;
+    public MeshCollider m_meshCollider;
+    private Transform m_ballTrans;
+    private Transform m_handleTrans;
+    private bool m_bControl = true;
+    private void Start()
     {
-        if (other.gameObject.CompareTag("Target"))
+        m_handleTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.transform;
+        m_ballTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.SteelBallTrans;
+    }
+    private void Update()
+    {
+        float varDis = Vector3.SqrMagnitude(m_ballTrans.position - m_handleTrans.position);
+        if (varDis >= 20.0f && m_bControl)
         {
-            BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
-            BattleCtrl.instance.OnBattleWin();
-            m_targetTrans.localPosition = m_pos;
-            m_targetTrans.localRotation = m_rotation;
+            m_bControl = false;
+            m_collider.enabled = false;
+            m_meshCollider.enabled = false;
+            GameServices.timerServices.Push(this, 0.5f, delegate
+            {
+                m_bControl = true;
+                m_collider.enabled = true;
+                m_meshCollider.enabled = true;
+            });
         }
     }
 }

SteelBall/Assets/0A2_Scripts/Battle/Trigger/SecondLevelTrigger.cs

@@ -4,18 +4,44 @@ using UnityEngine;
 
 public class SecondLevelTrigger : MonoBehaviour
 {
-    public Transform m_targetTrans;
-    private Vector3 m_pos = new Vector3(0.09f, 1.3f, -0.54f);
-    private Quaternion m_rotation = Quaternion.Euler(-15,256, -2.594f);
+    //public Transform m_targetTrans;
+    //private Vector3 m_pos = new Vector3(0.09f, 1.3f, -0.54f);
+    //private Quaternion m_rotation = Quaternion.Euler(-15,256, -2.594f);
 
-    private void OnTriggerEnter(Collider other)
+    //private void OnTriggerEnter(Collider other)
+    //{
+    //    if (other.gameObject.CompareTag("Target"))
+    //    {
+    //        BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
+    //        BattleCtrl.instance.OnBattleWin();
+    //        m_targetTrans.localPosition = m_pos;
+    //        m_targetTrans.localRotation = m_rotation;
+    //    }
+    //}
+    public Collider m_collider;
+    public MeshCollider m_meshCollider;
+    private Transform m_ballTrans;
+    private Transform m_handleTrans;
+    private bool m_bControl = true;
+    private void Start()
     {
-        if (other.gameObject.CompareTag("Target"))
+        m_handleTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.transform;
+        m_ballTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.SteelBallTrans;
+    }
+    private void Update()
+    {
+        float varDis = Vector3.SqrMagnitude(m_ballTrans.position - m_handleTrans.position);
+        if (varDis >= 20.0f && m_bControl)
         {
-            BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
-            BattleCtrl.instance.OnBattleWin();
-            m_targetTrans.localPosition = m_pos;
-            m_targetTrans.localRotation = m_rotation;
+            m_bControl = false;
+            m_collider.enabled = false;
+            m_meshCollider.enabled = false;
+            GameServices.timerServices.Push(this, 0.5f, delegate
+            {
+                m_bControl = true;
+                m_collider.enabled = true;
+                m_meshCollider.enabled = true;
+            });
         }
     }
 }

SteelBall/Assets/0A2_Scripts/Battle/Trigger/SixthLevelTrigger.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SixthLevelTrigger : MonoBehaviour
+{
+    public Collider m_collider;
+    private Transform m_ballTrans;
+    private Transform m_handleTrans;
+    private bool m_bControl = true;
+    private void Start()
+    {
+        m_handleTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.transform;
+        m_ballTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.SteelBallTrans;
+    }
+    private void Update()
+    {
+        float varDis = Vector3.SqrMagnitude(m_ballTrans.position - m_handleTrans.position);
+        if (varDis >= 20.0f && m_bControl)
+        {
+            m_bControl = false;
+            m_collider.enabled = false;
+            GameServices.timerServices.Push(this, 0.5f, delegate
+            {
+                m_bControl = true;
+                m_collider.enabled = true;
+            });
+        }
+    }
+}

SteelBall/Assets/0A2_Scripts/Battle/Trigger/SixthLevelTrigger.cs.meta

+fileFormatVersion: 2
+guid: 3a94cf5fd0a0e7a40bd6a5a0d1491859
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0A2_Scripts/Battle/Trigger/ThirdLevelTrigger.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ThirdLevelTrigger : MonoBehaviour
+{
+    public Collider m_collider;
+    private Transform m_ballTrans;
+    private Transform m_handleTrans;
+    private bool m_bControl = true;
+    private void Start()
+    {
+        m_handleTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.transform;
+        m_ballTrans = BattleCtrl.instance.levelManager.curLevel.chainHandle.SteelBallTrans;
+    }
+    private void Update()
+    {
+        float varDis = Vector3.SqrMagnitude(m_ballTrans.position - m_handleTrans.position);
+        if (varDis >= 20.0f && m_bControl)
+        {
+            m_bControl = false;
+            m_collider.enabled = false;
+            GameServices.timerServices.Push(this, 0.5f, delegate
+            {
+                m_bControl = true;
+                m_collider.enabled = true;
+            });
+        }
+    }
+}

SteelBall/Assets/0A2_Scripts/Battle/Trigger/ThirdLevelTrigger.cs.meta

+fileFormatVersion: 2
+guid: 55e9abcbbc2dc804c8564db7b73f518a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0A2_Scripts/Battle/UI/BattleUI.cs

@@ -64,6 +64,7 @@ public class BattleUI : MonoBehaviour
         GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
         GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值
         GameServices.configService.playerConfig.SteelBallMass = 10.0f;
+        GameServices.configService.playerConfig.HandleMoveSpeed = 3.0f;
     }
     void SetDragMode()
     {
@@ -162,18 +163,19 @@ public class BattleUI : MonoBehaviour
     public void ClawMoveSpeedAddBtn()
     {
         //onClawMoveSpeedAddBtn?.Invoke();
-        GameServices.inputService.joyStick.axisX.speed += Time.deltaTime;
-        GameServices.inputService.joyStick.axisY.speed += Time.deltaTime;
-        m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.inputService.joyStick.axisX.speed);
-
+        GameServices.configService.playerConfig.HandleMoveSpeed += Time.deltaTime;
+        GameServices.inputService.joyStick.axisX.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        GameServices.inputService.joyStick.axisY.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.configService.playerConfig.HandleMoveSpeed);
     }
     //爪子移动速度减少
     public void ClawMoveSpeedDownBtn()
     {
         //onClawMoveSpeedDownBtn?.Invoke();
-        GameServices.inputService.joyStick.axisX.speed -= Time.deltaTime;
-        GameServices.inputService.joyStick.axisY.speed -= Time.deltaTime;
-        m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.inputService.joyStick.axisX.speed);
+        GameServices.configService.playerConfig.HandleMoveSpeed -= Time.deltaTime;
+        GameServices.inputService.joyStick.axisX.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        GameServices.inputService.joyStick.axisY.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+        m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.configService.playerConfig.HandleMoveSpeed);
     }
     //胜利
     public void OnBattleWin()
@@ -238,10 +240,12 @@ public class BattleUI : MonoBehaviour
             m_cameraPosY.text = string.Format("pos{0:f3}", varCam.transform.position.y);
             m_cameraFieldView.text = string.Format("fieldView{0:f1}", varCam.fieldOfView);
         }
-        GameServices.timerServices.Push(this, 1, delegate
+        GameServices.timerServices.Push(this, 0.2f, delegate
         {
+            GameServices.inputService.joyStick.axisX.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
+            GameServices.inputService.joyStick.axisY.speed = GameServices.configService.playerConfig.HandleMoveSpeed;
             m_cameraFieldView.text = string.Format("铁球重量{0:f3}", GameServices.configService.playerConfig.SteelBallMass);
-            m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.inputService.joyStick.axisX.speed);
+            m_clawMoveSpeed.text = string.Format("速度{0:f3}", GameServices.configService.playerConfig.HandleMoveSpeed);
         });
     }
     //设置战斗UI状态

SteelBall/Assets/0A2_Scripts/Battle/View/ChainHandle.cs

@@ -6,7 +6,12 @@ using UnityEngine;
 public class ChainHandle : MonoBehaviour
 {
     public Rigidbody m_steelBallRigidBody;//铁球
+    public Transform SteelBallTrans => m_steelBallRigidBody.transform;
     private RectTransform m_thumbRT;//摇杆
+    private LevelEnum.MouseDirEnum m_mouseDir = LevelEnum.MouseDirEnum.Left;
+    public LevelEnum.MouseDirEnum MouseDir => m_mouseDir;
+    private Vector2 m_StartPos;
+    private Vector2 m_DragPos;
     // Start is called before the first frame update
     private void Awake()
     {
@@ -14,6 +19,7 @@ public class ChainHandle : MonoBehaviour
     }
     private void Start()
     {
+        GameServices.inputService.pad.onMoveVec3 += OnMove;
         GameServices.inputService.joyStick.onTouchStart.AddListener(OnTouchStart);
         GameServices.inputService.joyStick.onTouchUp.AddListener(OnTouchUp);
         BattleCtrl.instance.battleUI.onFieldFarBtn = onSteelBallAddMassBtn;
@@ -33,7 +39,7 @@ public class ChainHandle : MonoBehaviour
         m_steelBallRigidBody.mass = GameServices.configService.playerConfig.SteelBallMass;
     }
     //设置摇杆目标
-    void SetJoyStickDirectTrans(Transform trans)
+    public void SetJoyStickDirectTrans(Transform trans)
     {
         GameServices.inputService.joyStick.axisX.directTransform = trans;
         GameServices.inputService.joyStick.axisY.directTransform = trans;
@@ -63,8 +69,75 @@ public class ChainHandle : MonoBehaviour
         varThumb.y = 4000;
         m_thumbRT.sizeDelta = varThumb;
     }
-        // Update is called once per frame
+    //移动
+    void OnMove(Vector3 dir)
+    {
+        //向左滑
+        if (dir.x > 0)
+        {
+            m_mouseDir = LevelEnum.MouseDirEnum.Left;
+        }
+        //向右滑
+        if (dir.x < 0)
+        {
+            m_mouseDir = LevelEnum.MouseDirEnum.Right;
+        }
+        //向上滑
+        if (dir.y < 0)
+        {
+            m_mouseDir = LevelEnum.MouseDirEnum.Up;
+        }
+        //向下滑
+        if (dir.y > 0)
+        {
+            m_mouseDir = LevelEnum.MouseDirEnum.Down;
+        }
+    }
+    private void OnDestroy()
+    {
+        if (GameServices.inputService != null)
+        {
+            GameServices.inputService.pad.onMoveVec3 -= OnMove;
+        }
+    }
+    // Update is called once per frame
     void Update()
     {
+        //if (Input.GetMouseButtonDown(0))
+        //{
+        //    m_StartPos = Input.mousePosition;
+        //}
+        //if(Input.GetMouseButton(0))
+        //{
+        //    m_DragPos = Input.mousePosition;
+        //    Vector2 varVec2 = m_StartPos - m_DragPos;
+        //    OnMove(varVec2);
+        //    m_StartPos = m_DragPos;
+        //}
+        //float varMinX = GameServices.configService.playerConfig.xDirMinDis;
+        //float varMaxX = GameServices.configService.playerConfig.xDirMaxDis;
+        //float varMinY = GameServices.configService.playerConfig.yDirMinDis;
+        //float varMaxY = GameServices.configService.playerConfig.yDirMaxDis;
+        //Vector3 varVec3 = transform.position;
+        //if(varVec3.x <= varMinX)
+        //{
+        //    varVec3.x = varMinX;
+        //}
+        //if (varVec3.x >= varMaxX)
+        //{
+        //    varVec3.x = varMaxX;
+        //}
+        //if (varVec3.y <= varMinY)
+        //{
+        //    varVec3.y = varMinY;
+        //}
+        //if (varVec3.y >= varMaxY)
+        //{
+        //    varVec3.y = varMaxY;
+        //}
+        //transform.position = varVec3;
+        //transform.position = new Vector3(Mathf.Clamp(transform.position.x, varMinX, varMaxX),
+        //                                       Mathf.Clamp(transform.position.y, varMinY, varMaxY),
+        //                                       0);
     }
 }

SteelBall/Assets/0A2_Scripts/Enum/LevelEnum.cs

@@ -18,4 +18,13 @@ public class LevelEnum
     public static int levelFourIndex => (int)LevelIndexEnum.fourLevel;
     public static int levelFiveIndex => (int)LevelIndexEnum.fiveLevel;
     public static int levelSixIndex => (int)LevelIndexEnum.sixLevel;
+
+
+    public enum MouseDirEnum
+    {
+        Left = 0,
+        Right,
+        Up,
+        Down,
+    }
 }

SteelBall/Assets/0A2_Scripts/Services/BattleConfig.cs

@@ -65,6 +65,8 @@ public class PlayerConfig
     public float ClawMoveSpeed { get; set; }
     //铁球质量
     public float SteelBallMass { get; set; }
+    //摇杆移动速度
+    public float HandleMoveSpeed { get; set; }
 }
 [Serializable]
 public class LevelConfig

SteelBall/Assets/Res/Prefabs/Levels/Level01.prefab

@@ -388,6 +388,7 @@ GameObject:
   - component: {fileID: 4053580056025497868}
   - component: {fileID: 4053580056025497869}
   - component: {fileID: 4053580056025497870}
+  - component: {fileID: 573854538027350525}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -469,6 +470,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &573854538027350525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4053580056025497864}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4053580056053796956
 GameObject:
   m_ObjectHideFlags: 0
@@ -481,6 +494,7 @@ GameObject:
   - component: {fileID: 4053580056053796944}
   - component: {fileID: 4053580056053796945}
   - component: {fileID: 4053580056053796946}
+  - component: {fileID: 6491447342041234376}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -562,6 +576,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6491447342041234376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4053580056053796956}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4053580056238870544
 GameObject:
   m_ObjectHideFlags: 0
@@ -690,7 +716,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4053580056437145372}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -711,6 +737,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_steelBallRigidBody: {fileID: 4053580057105078457}
+--- !u!114 &8969631323616389603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4053580056437145372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7aa9cd085e519b545b88a1e2def2d692, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_collider: {fileID: 2135020472}
+  m_meshCollider: {fileID: 4082256404318503069}
 --- !u!1 &4053580056445237779
 GameObject:
   m_ObjectHideFlags: 0
@@ -754,6 +794,7 @@ GameObject:
   - component: {fileID: 4053580056688853021}
   - component: {fileID: 4053580056688853022}
   - component: {fileID: 4053580056688853023}
+  - component: {fileID: 3187850689743378332}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -835,6 +876,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &3187850689743378332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4053580056688853017}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4053580056717761739
 GameObject:
   m_ObjectHideFlags: 0
@@ -1405,6 +1458,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bd97c05e714e4e44a95ebdeaa26a6c9f, type: 3}
+--- !u!64 &4082256404318503069 stripped
+MeshCollider:
+  m_CorrespondingSourceObject: {fileID: 64777759979151366, guid: bd97c05e714e4e44a95ebdeaa26a6c9f,
+    type: 3}
+  m_PrefabInstance: {fileID: 4053580056387182747}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4057812587987502687 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4796727144638148, guid: bd97c05e714e4e44a95ebdeaa26a6c9f,
@@ -1573,6 +1632,11 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+        type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
         type: 3}
       propertyPath: linkInstances.Array.size
@@ -2132,6 +2196,12 @@ PrefabInstance:
     - {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
     - {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
+--- !u!4 &4543393482479621757 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
+    type: 3}
+  m_PrefabInstance: {fileID: 9080765533001982304}
+  m_PrefabAsset: {fileID: 0}
 --- !u!54 &4053580057105078457 stripped
 Rigidbody:
   m_CorrespondingSourceObject: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
@@ -2144,9 +2214,3 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 9080765533001982304}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &4543393482479621757 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
-    type: 3}
-  m_PrefabInstance: {fileID: 9080765533001982304}
-  m_PrefabAsset: {fileID: 0}

SteelBall/Assets/Res/Prefabs/Levels/Level02.prefab

@@ -72,7 +72,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5932101835391293156}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -80,6 +80,20 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
+--- !u!114 &3694806808945857083
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932101835391293156}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 368684d5a7e29b64ea5ab38453c7a14a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_collider: {fileID: 7643235999391824448}
+  m_meshCollider: {fileID: 5959718296697448805}
 --- !u!114 &6719769748436920960
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -198,6 +212,7 @@ GameObject:
   - component: {fileID: 5932101835609860581}
   - component: {fileID: 5932101835609860582}
   - component: {fileID: 5932101835609860583}
+  - component: {fileID: 2346490223121878285}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -279,6 +294,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2346490223121878285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932101835609860577}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5932101835631293747
 GameObject:
   m_ObjectHideFlags: 0
@@ -415,6 +442,7 @@ GameObject:
   - component: {fileID: 5932101835774638504}
   - component: {fileID: 5932101835774638505}
   - component: {fileID: 5932101835774638506}
+  - component: {fileID: 6560846626491269994}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -496,6 +524,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6560846626491269994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932101835774638500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5932101835786152176
 GameObject:
   m_ObjectHideFlags: 0
@@ -508,6 +548,7 @@ GameObject:
   - component: {fileID: 5932101835786152180}
   - component: {fileID: 5932101835786152181}
   - component: {fileID: 5932101835786152182}
+  - component: {fileID: 1724175480332989050}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -589,6 +630,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1724175480332989050
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5932101835786152176}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5932101835992218088
 GameObject:
   m_ObjectHideFlags: 0
@@ -1275,6 +1328,7 @@ GameObject:
   - component: {fileID: 5927916410465448630}
   - component: {fileID: 2321493663492369738}
   - component: {fileID: 1980185785408506977}
+  - component: {fileID: 4227269008891281732}
   m_Layer: 0
   m_Name: Target (6)
   m_TagString: Untagged
@@ -1373,6 +1427,18 @@ MonoBehaviour:
   thickness: 0
   m_SourceCollider: {fileID: 5927916410465448630}
   m_DistanceField: {fileID: 0}
+--- !u!114 &4227269008891281732
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7757526596633281668}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1447738534194202776
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1460,6 +1526,11 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+        type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
         type: 3}
       propertyPath: linkInstances.Array.size
@@ -2112,6 +2183,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 5932101835307026787}
   m_PrefabAsset: {fileID: 0}
+--- !u!64 &5959718296697448805 stripped
+MeshCollider:
+  m_CorrespondingSourceObject: {fileID: 64777759979151366, guid: bd97c05e714e4e44a95ebdeaa26a6c9f,
+    type: 3}
+  m_PrefabInstance: {fileID: 5932101835307026787}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5932101836978075324
 PrefabInstance:
   m_ObjectHideFlags: 0

SteelBall/Assets/Res/Prefabs/Levels/Level03.prefab

@@ -1627,6 +1627,7 @@ GameObject:
   - component: {fileID: 2585293414694001238}
   - component: {fileID: 2585293414694001237}
   - component: {fileID: 2585293414694001236}
+  - component: {fileID: 8006917263167993340}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -1708,6 +1709,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8006917263167993340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2585293414694001234}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2585293414728851161
 GameObject:
   m_ObjectHideFlags: 0
@@ -1840,7 +1853,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2585293414878225751}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -1861,6 +1874,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_steelBallRigidBody: {fileID: 2585293414461932274}
+--- !u!114 &6838234003616286104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2585293414878225751}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55e9abcbbc2dc804c8564db7b73f518a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_collider: {fileID: 1991148745562245619}
 --- !u!1 &2585293414950088119
 GameObject:
   m_ObjectHideFlags: 0
@@ -1993,6 +2019,7 @@ GameObject:
   - component: {fileID: 2585293415529040411}
   - component: {fileID: 2585293415529040410}
   - component: {fileID: 2585293415529040409}
+  - component: {fileID: 8953565342523449336}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -2074,6 +2101,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8953565342523449336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2585293415529040407}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2585293415540333379
 GameObject:
   m_ObjectHideFlags: 0
@@ -2086,6 +2125,7 @@ GameObject:
   - component: {fileID: 2585293415540333383}
   - component: {fileID: 2585293415540333382}
   - component: {fileID: 2585293415540333381}
+  - component: {fileID: 1085655339761733877}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -2167,6 +2207,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1085655339761733877
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2585293415540333379}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2585293415591360864
 GameObject:
   m_ObjectHideFlags: 0
@@ -2654,6 +2706,11 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+        type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
         type: 3}
       propertyPath: linkInstances.Array.size
@@ -3213,12 +3270,6 @@ PrefabInstance:
     - {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
     - {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
---- !u!4 &2642657989172382774 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
-    type: 3}
-  m_PrefabInstance: {fileID: 7324162648252332843}
-  m_PrefabAsset: {fileID: 0}
 --- !u!54 &2585293414461932274 stripped
 Rigidbody:
   m_CorrespondingSourceObject: {fileID: 5063288112137550297, guid: 026b5780346325e4b98d62d9430fe8e1,
@@ -3231,3 +3282,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 7324162648252332843}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &2642657989172382774 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
+    type: 3}
+  m_PrefabInstance: {fileID: 7324162648252332843}
+  m_PrefabAsset: {fileID: 0}

SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab

@@ -1861,7 +1861,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7338952965756810065}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -1869,6 +1869,20 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
+--- !u!114 &7599762983877702851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7338952965756810065}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2debece20ec1524428ca90052cc4f9c0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_collider: {fileID: 6744148426749976565}
+  m_meshCollider: {fileID: 7357519326862051663}
 --- !u!114 &7695340174472154933
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1960,6 +1974,7 @@ GameObject:
   - component: {fileID: 7338952966042078288}
   - component: {fileID: 7338952966042078291}
   - component: {fileID: 7338952966042078290}
+  - component: {fileID: 4311052771044578644}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -2041,6 +2056,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4311052771044578644
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7338952966042078292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7338952966169364703
 GameObject:
   m_ObjectHideFlags: 0
@@ -2146,6 +2173,7 @@ GameObject:
   - component: {fileID: 7338952966407265309}
   - component: {fileID: 7338952966407265308}
   - component: {fileID: 7338952966407265311}
+  - component: {fileID: 8270270567055102481}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -2227,6 +2255,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8270270567055102481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7338952966407265297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7338952966435687749
 GameObject:
   m_ObjectHideFlags: 0
@@ -2239,6 +2279,7 @@ GameObject:
   - component: {fileID: 7338952966435687745}
   - component: {fileID: 7338952966435687744}
   - component: {fileID: 7338952966435687747}
+  - component: {fileID: 4496903706161768207}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -2320,6 +2361,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4496903706161768207
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7338952966435687749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7338952966486388582
 GameObject:
   m_ObjectHideFlags: 0
@@ -2623,6 +2676,7 @@ GameObject:
   - component: {fileID: 7421100814300355224}
   - component: {fileID: 7421100814300355225}
   - component: {fileID: 7421100814300355230}
+  - component: {fileID: 2497569419088544380}
   m_Layer: 0
   m_Name: Cube (4)
   m_TagString: Untagged
@@ -2704,6 +2758,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2497569419088544380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7421100814300355228}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7421100814829075156
 GameObject:
   m_ObjectHideFlags: 0
@@ -2717,6 +2783,7 @@ GameObject:
   - component: {fileID: 7421100814829075152}
   - component: {fileID: 7421100814829075153}
   - component: {fileID: 7421100814829075158}
+  - component: {fileID: 3839035298222870181}
   m_Layer: 0
   m_Name: Target (6)
   m_TagString: Untagged
@@ -2815,6 +2882,18 @@ MonoBehaviour:
   thickness: 0
   m_SourceCollider: {fileID: 7421100814829075152}
   m_DistanceField: {fileID: 0}
+--- !u!114 &3839035298222870181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7421100814829075156}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7421100814882302377
 GameObject:
   m_ObjectHideFlags: 0
@@ -3077,6 +3156,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7083863452264801693}
   - component: {fileID: 5038023540465334065}
+  - component: {fileID: 4232476220704922376}
   m_Layer: 16
   m_Name: CubeObstruct
   m_TagString: Obstruct
@@ -3111,6 +3191,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4232476220704922376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8795498804540688342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &2566307832903331117
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3788,9 +3880,9 @@ PrefabInstance:
     - {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
     - {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
---- !u!4 &7103697303545125424 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
+--- !u!1 &7338952965756810065 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
     type: 3}
   m_PrefabInstance: {fileID: 2566307832903331117}
   m_PrefabAsset: {fileID: 0}
@@ -3800,9 +3892,9 @@ Rigidbody:
     type: 3}
   m_PrefabInstance: {fileID: 2566307832903331117}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &7338952965756810065 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+--- !u!4 &7103697303545125424 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
     type: 3}
   m_PrefabInstance: {fileID: 2566307832903331117}
   m_PrefabAsset: {fileID: 0}
@@ -3956,6 +4048,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 7421100813873326409}
   m_PrefabAsset: {fileID: 0}
+--- !u!64 &7357519326862051663 stripped
+MeshCollider:
+  m_CorrespondingSourceObject: {fileID: 64777759979151366, guid: bd97c05e714e4e44a95ebdeaa26a6c9f,
+    type: 3}
+  m_PrefabInstance: {fileID: 7421100813873326409}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7607302503064333348
 PrefabInstance:
   m_ObjectHideFlags: 0

SteelBall/Assets/Res/Prefabs/Levels/Level05.prefab

@@ -182,6 +182,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2422231685862188115}
   - component: {fileID: 2479404184301286160}
+  - component: {fileID: 1562321654957098118}
   m_Layer: 16
   m_Name: CubeObstruct
   m_TagString: Untagged
@@ -216,6 +217,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1562321654957098118
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 106463959488253690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &988018843723496819
 GameObject:
   m_ObjectHideFlags: 0
@@ -1608,7 +1621,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4040573734206883611}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -1674,6 +1687,7 @@ GameObject:
   - component: {fileID: 4040573734458488858}
   - component: {fileID: 4040573734458488857}
   - component: {fileID: 4040573734458488856}
+  - component: {fileID: 4162688729782847967}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -1755,6 +1769,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4162688729782847967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4040573734458488862}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4040573734504031436
 GameObject:
   m_ObjectHideFlags: 0
@@ -1891,6 +1917,7 @@ GameObject:
   - component: {fileID: 4040573734885914891}
   - component: {fileID: 4040573734885914890}
   - component: {fileID: 4040573734885914889}
+  - component: {fileID: 8210094709537047774}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -1972,6 +1999,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8210094709537047774
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4040573734885914895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4040573734893267035
 GameObject:
   m_ObjectHideFlags: 0
@@ -1984,6 +2023,7 @@ GameObject:
   - component: {fileID: 4040573734893267031}
   - component: {fileID: 4040573734893267030}
   - component: {fileID: 4040573734893267029}
+  - component: {fileID: 1901874693404383462}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -2065,6 +2105,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1901874693404383462
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4040573734893267035}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4040573735078340631
 GameObject:
   m_ObjectHideFlags: 0
@@ -2307,6 +2359,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.x
       value: -2.9
       objectReference: {fileID: 0}
+    - target: {fileID: 2883321869090243963, guid: 54c939b922ce3e742b9aecc128cdd154,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.06
+      objectReference: {fileID: 0}
     - target: {fileID: 2986675907246666288, guid: 54c939b922ce3e742b9aecc128cdd154,
         type: 3}
       propertyPath: m_Name
@@ -2563,6 +2620,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 13
       objectReference: {fileID: 0}
+    - target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+        type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     - target: {fileID: 5063288112863477293, guid: 026b5780346325e4b98d62d9430fe8e1,
         type: 3}
       propertyPath: m_Layer
@@ -3127,6 +3189,12 @@ PrefabInstance:
     - {fileID: 5063288112813874807, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
     - {fileID: 5063288112813874806, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 026b5780346325e4b98d62d9430fe8e1, type: 3}
+--- !u!4 &4566462821820411514 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
+    type: 3}
+  m_PrefabInstance: {fileID: 9103861518316231015}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4040573734206883611 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
@@ -3139,9 +3207,3 @@ Rigidbody:
     type: 3}
   m_PrefabInstance: {fileID: 9103861518316231015}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &4566462821820411514 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4686061859939579677, guid: 026b5780346325e4b98d62d9430fe8e1,
-    type: 3}
-  m_PrefabInstance: {fileID: 9103861518316231015}
-  m_PrefabAsset: {fileID: 0}

SteelBall/Assets/Res/Prefabs/Levels/Level06.prefab

@@ -376,6 +376,7 @@ GameObject:
   - component: {fileID: 2708402588840823499}
   - component: {fileID: 2708402588840823498}
   - component: {fileID: 2708402588840823497}
+  - component: {fileID: 4811209639536656815}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -457,6 +458,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4811209639536656815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2708402588840823503}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb6e70002b0961b40ab4d5fc9d582b63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2708402588850117531
 GameObject:
   m_ObjectHideFlags: 0
@@ -469,6 +482,7 @@ GameObject:
   - component: {fileID: 2708402588850117527}
   - component: {fileID: 2708402588850117526}
   - component: {fileID: 2708402588850117525}
+  - component: {fileID: 7492711758620289403}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -550,6 +564,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7492711758620289403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2708402588850117531}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2708402588924094700
 GameObject:
   m_ObjectHideFlags: 0
@@ -737,7 +763,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2708402589234509019}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 0.0000001
   m_Drag: 10
   m_AngularDrag: 0.05
   m_UseGravity: 0
@@ -758,6 +784,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_steelBallRigidBody: {fileID: 2708402589917123454}
+--- !u!114 &8993441922684310625
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2708402589234509019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a94cf5fd0a0e7a40bd6a5a0d1491859, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_collider: {fileID: 2150214130439084159}
 --- !u!1 &2708402589260558804
 GameObject:
   m_ObjectHideFlags: 0
@@ -866,6 +905,7 @@ GameObject:
   - component: {fileID: 2708402589620571098}
   - component: {fileID: 2708402589620571097}
   - component: {fileID: 2708402589620571096}
+  - component: {fileID: 6071003843078013274}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -947,6 +987,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6071003843078013274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2708402589620571102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d94030e23d5b424aa606086788abd86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2708402589652406101
 GameObject:
   m_ObjectHideFlags: 0
@@ -1996,6 +2048,11 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 5063288112813874812, guid: 026b5780346325e4b98d62d9430fe8e1,
+        type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
     - target: {fileID: 5063288113430786112, guid: 026b5780346325e4b98d62d9430fe8e1,
         type: 3}
       propertyPath: linkInstances.Array.size

SteelBall/Assets/Resources/BattleConfig.asset

@@ -14,10 +14,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   playerConfig:
     moveSpeed: 1
-    xDirMinDis: -2.5
-    xDirMaxDis: 2.5
-    yDirMinDis: -4.2
-    yDirMaxDis: 4.2
+    xDirMinDis: -2.7
+    xDirMaxDis: 2.9
+    yDirMinDis: 0.5
+    yDirMaxDis: 9.5
     clawMaxAngle: 34
     clawRotateSpeed: 50
     ropeReduceSpeed: 2

SteelBall/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: DySpace
-  productName: "Iron Ball\uFF01"
+  productName: Iron Ball!
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}

SteelBall/SteelBall.sln

 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{1B985C42-6A04-3291-2420-3672882FD2F1}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Obi", "Obi.csproj", "{7F43D7CA-F90A-41F3-9EA7-6703C169B4DF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{9DE97DC7-0AB5-A78E-DC42-EC9A2E71DDEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{1B985C42-6A04-3291-2420-3672882FD2F1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Obi.Editor", "Obi.Editor.csproj", "{CB4FFC4B-D48F-A584-5685-0E30567DC5C7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{CF580614-5780-DF27-57B1-33D1FD3C69BB}"
@@ -17,6 +17,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B985C42-6A04-3291-2420-3672882FD2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B985C42-6A04-3291-2420-3672882FD2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B985C42-6A04-3291-2420-3672882FD2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B985C42-6A04-3291-2420-3672882FD2F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F43D7CA-F90A-41F3-9EA7-6703C169B4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F43D7CA-F90A-41F3-9EA7-6703C169B4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F43D7CA-F90A-41F3-9EA7-6703C169B4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -25,10 +29,6 @@ Global
 		{9DE97DC7-0AB5-A78E-DC42-EC9A2E71DDEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9DE97DC7-0AB5-A78E-DC42-EC9A2E71DDEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9DE97DC7-0AB5-A78E-DC42-EC9A2E71DDEA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B985C42-6A04-3291-2420-3672882FD2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B985C42-6A04-3291-2420-3672882FD2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B985C42-6A04-3291-2420-3672882FD2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B985C42-6A04-3291-2420-3672882FD2F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB4FFC4B-D48F-A584-5685-0E30567DC5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB4FFC4B-D48F-A584-5685-0E30567DC5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB4FFC4B-D48F-A584-5685-0E30567DC5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU