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

Assets/OSG Infinity Square Space/Player/Prefabs/Weapons/Laser Bullet.prefab

@@ -43,7 +43,7 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 2
+  m_Radius: 50
   m_Height: 5
   m_Direction: 2
   m_Center: {x: 0, y: 0, z: 0}

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

@@ -804,7 +804,7 @@ public class Controller : MonoBehaviour
         //}
         if (Interface.instance.skillSelectionManager.skills[3].CanUse())
         {
-            Interface.instance.skillSelectionManager.skills[3].CountDown(3f);
+            Interface.instance.skillSelectionManager.skills[3].CountDown(0.5f);
             default_attacking = false;
             homeMissile.LaunchMissle();
 
@@ -974,7 +974,7 @@ public class Controller : MonoBehaviour
     {
         if (Interface.instance.skillSelectionManager.skills[6].CanUse())
         {
-            Interface.instance.skillSelectionManager.skills[6].CountDown(4f);
+            Interface.instance.skillSelectionManager.skills[6].CountDown(3f);
             default_attacking = false;
             //-----------
 
@@ -1122,7 +1122,7 @@ public class Controller : MonoBehaviour
             CheckRemainAmmo(8);
             default_attacking = false;
             homeMissile.LaunchMissle();
-            Interface.instance.skillSelectionManager.skills[8].CountDown(2f);
+            Interface.instance.skillSelectionManager.skills[8].CountDown(1f);
             yield break;
         }
     }