Skip to content

G
GalaxySmash
Commit 57031647 authored by Trương Khoa (NEGAXY)'s avatar Trương Khoa (NEGAXY)
Browse files
Options

Khoatv: fix sound

parent 3baa4757
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 26 deletions
Assets/OSG Infinity Square Space/Main/Scripts/StarSystem.cs
View file @ 57031647
......@@ -79,10 +79,7 @@ public class StarSystem : MonoBehaviour
}
private void ReloadHome()
{
AdsController.instance.ShowInter(() =>
{
Interface.instance.ExitToMenuHome();
});
Interface.instance.ExitToMenuHome();
}
protected void Awake()
{
......@@ -131,7 +128,7 @@ public class StarSystem : MonoBehaviour
// PlayerPrefs.SetInt(LEVEL, chapter);
//}
for(int i=0; i<moons.Length; i++)
for (int i = 0; i < moons.Length; i++)
{
moons[i].SetActive(false);
}
......@@ -144,7 +141,7 @@ public class StarSystem : MonoBehaviour
planet.explosionCount.atmosphere.GetComponent<MeshRenderer>().sharedMaterial.SetColor("_AtmosphereColor", planetDatas[chapter].planetDatas[levelIndex].atmosphereColor);
int totalTime = DataManager.Instance.levelContents[chapter][levelIndex].Time;
int healhShield = DataManager.Instance.levelContents[chapter][levelIndex].Shield_HP;
if(healhShield == 0)
if (healhShield == 0)
{
shield.gameObject.SetActive(false);
}
......
Assets/OSG Infinity Square Space/Player/Scripts/Interface.cs
View file @ 57031647
......@@ -177,9 +177,12 @@ public class Interface : MonoBehaviour
public void ReturnToGame()
{
aim.SetActive(true);
StartCoroutine(DelayUnPause());
//--------------
AdsController.instance.ShowInter(() =>
{
aim.SetActive(true);
StartCoroutine(DelayUnPause());
});
}
IEnumerator DelayUnPause()
......@@ -202,11 +205,14 @@ public class Interface : MonoBehaviour
public void ExitToMenuHome()
{
MineralsPlayerPrefs(true);
Time.timeScale = 1;
DataManager.Instance.ShowCoin = true;
CheckShowRate(0);
UnityEngine.SceneManagement.SceneManager.LoadScene("home");
AdsController.instance.ShowInter(() =>
{
MineralsPlayerPrefs(true);
Time.timeScale = 1;
DataManager.Instance.ShowCoin = true;
CheckShowRate(0);
UnityEngine.SceneManagement.SceneManager.LoadScene("home");
});
}
public void ExitToMenuWin()
......@@ -249,7 +255,7 @@ public class Interface : MonoBehaviour
if (Class_Controller.playerAlive == true)
{
Inventory();
//Inventory();
}
//--------------
......
Assets/OSG Infinity Square Space/Player/Scripts/OST.cs
View file @ 57031647
......@@ -50,9 +50,6 @@ public class OST : MonoBehaviour
public void PlaySelectWeapon()
{
audioSource1.PlayOneShot(selectWeapon);
AdsController.instance.ShowInter(() => {
});
}
public void PlayDeselectWeapon()
......
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @ 57031647
......@@ -38996,7 +38996,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1411463341, guid: be52fa2f0a0d6604299802b6633e9420, type: 3}
propertyPath: delay
value: 3.5
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1199371425891559116, guid: be52fa2f0a0d6604299802b6633e9420,
type: 3}
......@@ -39473,6 +39473,150 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 74868020, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74868020, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74868020, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74868020, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74868022, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 246368179, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 246368179, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 246368179, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 246368179, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 246368181, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545963442, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 606323126, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 681525874, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 835879318, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 835879318, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 835879318, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 835879318, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 835879320, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1125146126, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1125146126, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1125146126, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1125146126, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1125146128, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295190574, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295190574, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295190574, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295190574, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295190576, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1654799097, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1773817395, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1834672627, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1834672627, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1834672627, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1834672627, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1834672629, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1877728009, guid: 0a65ca5d691aad948b7d3ccd46ee2f72, type: 3}
propertyPath: playeSoundOnclick
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1011976649899939479, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
......@@ -39563,6 +39707,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0.000015258789
objectReference: {fileID: 0}
- target: {fileID: 3504742971198732980, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504742971484943690, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
......@@ -45026,7 +45175,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 469985644, guid: 24f4214e71ba46046859b31f7dec5af4, type: 3}
propertyPath: m_LocalPosition.x
value: -0.000000026858434
value: -0.000000030583724
objectReference: {fileID: 0}
- target: {fileID: 469985645, guid: 24f4214e71ba46046859b31f7dec5af4, type: 3}
propertyPath: m_Follow
......@@ -45100,7 +45249,7 @@ PrefabInstance:
- target: {fileID: 7421222009779415704, guid: 24f4214e71ba46046859b31f7dec5af4,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.000000026858434
value: -0.000000030583724
objectReference: {fileID: 0}
- target: {fileID: 7421222010078394949, guid: 24f4214e71ba46046859b31f7dec5af4,
type: 3}
Assets/Scripts/UI/SkillSelectionGUI.cs
View file @ 57031647
......@@ -79,9 +79,14 @@ public class SkillSelectionGUI : MonoBehaviour
skillSelectionManager.SelectedID = ID;
skillSelectionManager.Reload();
skillSelectionManager.CheckSpecialTab();
OST.instance.PlaySelectWeapon();
AdsController.instance.ShowInter(() => {
});
}
else
{
OST.instance.PlayDeselectWeapon();
if (ID < 7) Interface.instance.ShowMoreAmmoPanel(ID);
}
}
......
Assets/Scripts/UI/UIButton.cs
View file @ 57031647
......@@ -8,7 +8,7 @@ using UnityEngine.UI;
public class UIButton : Button
{
public bool playeSoundOnclick = true;
[SerializeField]
public bool isScale = true;
......
Assets/Shader/Atmosphere/Shader Graphs_Atmosphere.mat
View file @ 57031647
......@@ -36,7 +36,7 @@ Material:
- Vector1_037422ac7c3343b3b7493dead063f9bb: 0.006
- Vector1_7fc372182bde42b39d4fce1ca0ef8b6e: 6.8
- Vector1_dcb7b53c006f40ef9ae4c2c1d71198be: 0.5
- _Alpha: 0.0040200003
- _Alpha: 0.00576
m_Colors:
- Color_7b883b4cd7c248a580d2475d1da9ed40: {r: 0, g: 65110.777, b: 259086.64, a: 0}
- _AtmosphereColor: {r: 0, g: 30840.47, b: 262144, a: 1}
......
Assets/StarSparrow/Materials/BonusContent/AsteroidsLava_Red.mat
View file @ 57031647
......@@ -122,6 +122,6 @@ Material:
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1.5161833, g: 1.3663628, b: 0.77906656, a: 1.5281689}
- _EmissionColor: {r: 1.1066365, g: 0.9972851, b: 0.56862754, a: 1.1153847}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
UserSettings/EditorUserSettings.asset
View file @ 57031647
......@@ -27,10 +27,10 @@ EditorUserSettings:
value: 22424703114646680c031c2e153010253f57282b3e3c2f33212c5260acb37a61adc333e4e8750a150903fd280d3d0d3acd2e0c06f9451f05181ae4
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment