add some extra assets FX and SFX

Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentIconInfo.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentIconInfo.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentInfo.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentInfo.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentSlotInfo.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/attachmentSlotInfo.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/laserAttachment.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/laserAttachment.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/laserDotOnScreenSystem.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/laserDotOnScreenSystem.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/weaponAttachmentSystem.cs

@@ -15,6 +15,8 @@ public class weaponAttachmentSystem : MonoBehaviour
     public IKWeaponSystem IKWeaponManager;
     public bool editingAttachments;
 
+    public bool editAttachmentsEnabled = true;
+
     //UI Elements
 
     public GameObject attachmentInfoGameObject;
@@ -68,6 +70,7 @@ public class weaponAttachmentSystem : MonoBehaviour
 
     public bool showDebugPrint;
 
+
     List<GameObject> attachmentIconGameObjectList = new List<GameObject> ();
 
     bool chechAttachmentPlaces;
@@ -119,6 +122,8 @@ public class weaponAttachmentSystem : MonoBehaviour
 
     Coroutine updateCoroutine;
 
+    bool attachmentComponentsInitialized;
+
 
     private void InitializeAudioElements ()
     {
@@ -151,7 +156,7 @@ public class weaponAttachmentSystem : MonoBehaviour
         }
     }
 
-    void Start ()
+    public void initializeAttachmentSystem ()
     {
         InitializeAudioElements ();
 
@@ -167,10 +172,53 @@ public class weaponAttachmentSystem : MonoBehaviour
 
             weaponsManagerFound = true;
 
-            StartCoroutine (initializeAttachmentElements ());
+            if (gameObject.activeInHierarchy) {
+                StartCoroutine (initializeAttachmentElements ());
+            }
         }
     }
 
+    public void checkInitializeAttachmentElements ()
+    {
+        if (attachmentComponentsInitialized) {
+            return;
+        }
+
+        initializeAttachmentWithoutWait ();
+    }
+
+    IEnumerator initializeAttachmentElements ()
+    {
+        initializationInProcess = true;
+
+        initializationInStartCalled = true;
+
+        lastTimeInitializationCalled = Time.time;
+
+        yield return new WaitForSecondsRealtime (0.4f);
+
+        setAttachmentInitialState ();
+
+        initializationInProcess = false;
+
+        attachmentComponentsInitialized = true;
+    }
+
+    void initializeAttachmentWithoutWait ()
+    {
+        initializationInProcess = true;
+
+        initializationInStartCalled = true;
+
+        lastTimeInitializationCalled = Time.time;
+
+        setAttachmentInitialState ();
+
+        initializationInProcess = false;
+
+        attachmentComponentsInitialized = true;
+    }
+
     public void instantiateAttachmentIcons ()
     {
         int attachmentActiveIndex = 0;
@@ -309,20 +357,6 @@ public class weaponAttachmentSystem : MonoBehaviour
         }
     }
 
-    IEnumerator initializeAttachmentElements ()
-    {
-        initializationInProcess = true;
-
-        initializationInStartCalled = true;
-
-        lastTimeInitializationCalled = Time.time;
-
-        yield return new WaitForSecondsRealtime (0.4f);
-
-        setAttachmentInitialState ();
-
-        initializationInProcess = false;
-    }
 
     public void stopUpdateCoroutine ()
     {
@@ -333,7 +367,7 @@ public class weaponAttachmentSystem : MonoBehaviour
 
     IEnumerator updateSystemCoroutine ()
     {
-        var waitTime = new WaitForFixedUpdate ();
+        var waitTime = new WaitForSeconds (0.00001f);
 
         while (true) {
             updateSystem ();
@@ -383,65 +417,7 @@ public class weaponAttachmentSystem : MonoBehaviour
     void updateEditingAttachmentState ()
     {
         if (editingAttachments) {
-            if (canChangeAttachmentWithNumberKeys) {
-                for (int i = 0; i < currentAmountAttachments; i++) {
-                    if (i <= 8 && Input.GetKeyDown ("" + (i + 1))) {
-                        if (i < attachmentInfoList.Count) {
-                            if (attachmentInfoList [i].attachmentPlaceEnabled) {
-                                int currentIndex = attachmentInfoList [i].currentAttachmentSelectedIndex;
-
-                                currentIndex++;
-
-                                if (currentIndex > attachmentInfoList [i].attachmentPlaceInfoList.Count) {
-                                    currentIndex = 0;
-                                }
-
-                                if (currentIndex > 0) {
-                                    if (!attachmentInfoList [i].attachmentPlaceInfoList [currentIndex - 1].attachmentEnabled) {
-                                        int nextIndex = currentIndex;
-                                        int loop = 0;
-                                        int nextIndexToConfigure = -1;
-
-                                        while (nextIndex < attachmentInfoList [i].attachmentPlaceInfoList.Count) {
-                                            if (attachmentInfoList [i].attachmentPlaceInfoList [nextIndex].attachmentEnabled) {
-                                                //print (attachmentInfoList [i].attachmentPlaceInfoList [nextIndex].Name);
-
-                                                if (nextIndexToConfigure == -1) {
-                                                    nextIndexToConfigure = nextIndex;
-                                                }
-                                            }
-
-                                            nextIndex++;
-
-                                            if (loop > 1000) {
-                                                print ("loop error");
-
-                                                break;
-                                            }
-                                        }
-
-                                        if (nextIndexToConfigure != -1) {
-                                            currentIndex = nextIndexToConfigure + 1;
-                                            if (currentIndex > attachmentInfoList [i].attachmentPlaceInfoList.Count) {
-                                                currentIndex = 0;
-                                            }
-                                        } else {
-                                            currentIndex = 0;
-                                        }
-                                    }
-                                }
-
-                                //	print (currentIndex);
-                                if (currentIndex == 0) {
-                                    checkPressedAttachmentButton (attachmentInfoList [i].attachmentIconManager.notAttachmentButton.slotButton);
-                                } else {
-                                    checkPressedAttachmentButton (attachmentInfoList [i].attachmentPlaceInfoList [currentIndex - 1].attachmentSlotManager.slotButton);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+            checkAttachmentWithNumberKeys ();
 
             if (showCurrentAttachmentHoverInfo && Time.time > lastTimeAttachmentsActive + 0.5f && !IKWeaponManager.moving) {
                 int touchCount = Input.touchCount;
@@ -515,6 +491,76 @@ public class weaponAttachmentSystem : MonoBehaviour
         }
     }
 
+    void checkAttachmentWithNumberKeys ()
+    {
+        if (canChangeAttachmentWithNumberKeys) {
+            int currentNumberInput = weaponsManager.checkNumberInput (10);
+
+            if (currentNumberInput > 0) {
+
+                currentNumberInput--;
+
+                if (currentNumberInput >= currentAmountAttachments || currentNumberInput < 0) {
+                    return;
+                }
+
+                attachmentPlace currentPlace = attachmentInfoList [currentNumberInput];
+
+                if (currentPlace.attachmentPlaceEnabled) {
+                    int currentIndex = currentPlace.currentAttachmentSelectedIndex;
+
+                    currentIndex++;
+
+                    if (currentIndex > currentPlace.attachmentPlaceInfoList.Count) {
+                        currentIndex = 0;
+                    }
+
+                    if (currentIndex > 0) {
+                        if (!currentPlace.attachmentPlaceInfoList [currentIndex - 1].attachmentEnabled) {
+                            int nextIndex = currentIndex;
+                            int loop = 0;
+                            int nextIndexToConfigure = -1;
+
+                            while (nextIndex < currentPlace.attachmentPlaceInfoList.Count) {
+                                if (currentPlace.attachmentPlaceInfoList [nextIndex].attachmentEnabled) {
+                                    //print (attachmentInfoList [i].attachmentPlaceInfoList [nextIndex].Name);
+
+                                    if (nextIndexToConfigure == -1) {
+                                        nextIndexToConfigure = nextIndex;
+                                    }
+                                }
+
+                                nextIndex++;
+
+                                if (loop > 1000) {
+                                    print ("loop error");
+
+                                    break;
+                                }
+                            }
+
+                            if (nextIndexToConfigure != -1) {
+                                currentIndex = nextIndexToConfigure + 1;
+                                if (currentIndex > currentPlace.attachmentPlaceInfoList.Count) {
+                                    currentIndex = 0;
+                                }
+                            } else {
+                                currentIndex = 0;
+                            }
+                        }
+                    }
+
+                    //	print (currentIndex);
+                    if (currentIndex == 0) {
+                        checkPressedAttachmentButton (currentPlace.attachmentIconManager.notAttachmentButton.slotButton);
+                    } else {
+                        checkPressedAttachmentButton (currentPlace.attachmentPlaceInfoList [currentIndex - 1].attachmentSlotManager.slotButton);
+                    }
+                }
+            }
+        }
+    }
+
     public void activateAttachmentUIPanels ()
     {
         if (currentWeaponAttachmentsMenu.activeSelf != editingAttachments) {
@@ -775,6 +821,7 @@ public class weaponAttachmentSystem : MonoBehaviour
 
         setAttachmentInitialState ();
     }
+
     public void setAttachmentInitialState ()
     {
         if (attachmentInitialized) {
@@ -783,6 +830,8 @@ public class weaponAttachmentSystem : MonoBehaviour
 
         attachmentInitialized = true;
 
+        weaponSystem.initializeComponents ();
+
         attachmentInfo attachmentActiveInfo = new attachmentInfo ();
 
         for (int i = 0; i < attachmentInfoList.Count; i++) {
@@ -1434,6 +1483,14 @@ public class weaponAttachmentSystem : MonoBehaviour
 
     public bool canBeOpened ()
     {
+        if (!editAttachmentsEnabled) {
+            return false;
+        }
+
+        if (IKWeaponManager != null && !IKWeaponManager.checkIfWeaponUsesAttachment ()) {
+            return false;
+        }
+
         if (canEditWeaponWithoutAttchments || attachmentsActiveInWeapon) {
             return true;
         }

Assets/Game Kit Controller/Scripts/Weapons/Attachments/weaponAttachmentSystem.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/weaponAttachmentSystem.cs
-  uploadId: 814740
+  uploadId: 889948

Assets/Game Kit Controller/Scripts/Weapons/Attachments/weaponsAttachmentUIManager.cs.meta

@@ -13,7 +13,8 @@ MonoImporter:
 AssetOrigin:
   serializedVersion: 1
   productId: 40995
-  packageName: Game Kit Controller - Shooter Melee Adventure Creator 3D + 2.5D
-  packageVersion: 3.77g
+  packageName: Game Kit Controller - Shooter Melee Adventure FPS TPS Creator 3D +
+    2.5D
+  packageVersion: 3.77h
   assetPath: Assets/Game Kit Controller/Scripts/Weapons/Attachments/weaponsAttachmentUIManager.cs
-  uploadId: 814740
+  uploadId: 889948