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

Assets/Game Resources/Sounds/OptionFuse.ogg.meta

+fileFormatVersion: 2
+guid: 390752f529b2ffd40925b843466832eb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/OSG Infinity Square Space/Scenes/home.unity

@@ -36671,6 +36671,7 @@ GameObject:
   m_Component:
   - component: {fileID: 685625562}
   - component: {fileID: 685625563}
+  - component: {fileID: 685625564}
   m_Layer: 5
   m_Name: ArsenalPopup
   m_TagString: Untagged
@@ -36738,6 +36739,8 @@ MonoBehaviour:
   buyPrice: {fileID: 512498904}
   fuseBtn: {fileID: 2020637492}
   autoFillBtn: {fileID: 1850930839}
+  fuseClip: {fileID: 8300000, guid: 390752f529b2ffd40925b843466832eb, type: 3}
+  audioSource: {fileID: 685625564}
   spaceShipTab: {fileID: 406033387}
   armoryTab: {fileID: 1395599469}
   spaceShipContent: {fileID: 195480298}
@@ -36768,6 +36771,102 @@ MonoBehaviour:
   slot1Effect: {fileID: 1238213596}
   slot2Effect: {fileID: 1238213595}
   centerEffect: {fileID: 1238213594}
+--- !u!82 &685625564
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 685625561}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &688291515
 GameObject:
   m_ObjectHideFlags: 0
@@ -159909,7 +160008,7 @@ AudioSource:
   m_PlayOnAwake: 0
   m_Volume: 0
   m_Pitch: 1
-  Loop: 0
+  Loop: 1
   Mute: 0
   Spatialize: 0
   SpatializePostEffects: 0

Assets/Scripts/UI/ArsenalPopup.cs

@@ -27,6 +27,8 @@ public class ArsenalPopup : BasePopup
     [Header("Content")]
     public Button fuseBtn;
     public Button autoFillBtn;
+    public AudioClip fuseClip;
+    public AudioSource audioSource;
 
     public GameObject spaceShipTab;
     public GameObject armoryTab;
@@ -150,15 +152,17 @@ public class ArsenalPopup : BasePopup
 
     IEnumerator ShowMergeEffect()
     {
+        audioSource.clip = fuseClip;
+        audioSource.Play();
         slot1Effect.SetActive(false);
         slot2Effect.SetActive(false);
         slot1UI.transform.DOLocalMoveX(0, 0.5f).SetEase(Ease.InBack);
         slot2UI.transform.DOLocalMoveX(0, 0.5f).SetEase(Ease.InBack);
         yield return new WaitForSecondsRealtime(0.4f);
         effMergeStart.SetActive(true);
-        yield return new WaitForSecondsRealtime(2.5f);
+        yield return new WaitForSecondsRealtime(2f);
         effMergeEnd.SetActive(true);
-        yield return new WaitForSecondsRealtime(0.3f);
+        yield return new WaitForSecondsRealtime(0.5f);
         effMergeStart.SetActive(false);
         effMergeEnd.SetActive(false);
         slot1Effect.SetActive(false);

UserSettings/EditorUserSettings.asset

@@ -27,13 +27,13 @@ EditorUserSettings:
       value: 22424703114646680c031c2e153010253f57282b3e3c2f33212c5260acb37a61adc333e4e8750a150903fd280d3d0d3acd2e0c06f9451f05181ae4
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650