Merge branch 'master' of http://103.147.34.20:30081/trung.ha/galaxysmash

Assets/OSG Infinity Square Space/Main/Scripts/ExplosionCount.cs

@@ -82,7 +82,7 @@ public class ExplosionCount : MonoBehaviour
         coll.SetActive(true);
         coll.transform.DOScale(80, 0.4f);
         InterfaceOperation.Instance.CheckStar(1);
-        Interface.instance.healthPlanet.fill.fillAmount = 0;
+        Interface.instance.healthPlanet.fill.fillAmount = 1f;
         //Interface.instance.healthPlanet.text.text = "0";
         if (DataManager.Instance.IsVibrationOn())
             Handheld.Vibrate();

Assets/OSG Infinity Square Space/Player/Scripts/Controller.cs

@@ -613,6 +613,7 @@ public class Controller : MonoBehaviour
         CheckInput();
     }
     private Vector2 _controlRotation;
+    private float rotate_value = 0f;
     private void CheckInput()
     {
         Vector2 input = Interface.instance.joystick.Direction;
@@ -630,6 +631,12 @@ public class Controller : MonoBehaviour
 
         SetControlRotation(new Vector2(pitchAngle, yawAngle));
         transform.rotation = Quaternion.Euler(_controlRotation.x, _controlRotation.y, 0f);
+
+        //Vector3 localAngles = currentShip.transform.localEulerAngles.SetZ(input.x * -2f);
+        //currentShip.transform.rotation = Quaternion.Lerp(currentShip.transform.rotation,
+        //     Quaternion.Euler(localAngles.x, localAngles.y, localAngles.z), Time.deltaTime * 10f);
+        rotate_value = Mathf.Lerp(rotate_value, input.x * -4f, Time.deltaTime * 10f);
+        currentShip.transform.localEulerAngles = currentShip.transform.localEulerAngles.SetZ(rotate_value);
     }
     public Vector2 GetControlRotation()
     {
@@ -823,7 +830,7 @@ public class Controller : MonoBehaviour
         {
             DataManager.Instance.AddSkill(1, -1);
             CheckRemainAmmo(1);
-            Interface.instance.skillSelectionManager.skills[1].CountDown(3f);
+            Interface.instance.skillSelectionManager.skills[1].CountDown(2f);
             default_attacking = false;
             //-----------
             if (laserTrigger0 == false) Class_Controller.laserMouseButtonDown = true;
@@ -1013,7 +1020,7 @@ public class Controller : MonoBehaviour
         {
             DataManager.Instance.AddSkill(4, -1);
             CheckRemainAmmo(4);
-            Interface.instance.skillSelectionManager.skills[4].CountDown(3f);
+            Interface.instance.skillSelectionManager.skills[4].CountDown(2f);
             default_attacking = false;
             //-----------