Skip to content

G
GalaxySmash
Commit fb7e62ab authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)
Browse files
Options

no message

parent e8d7b3c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14429 additions and 1237 deletions
Assets/Game Resources/Atlas.spriteatlas
View file @ fb7e62ab
This diff is collapsed.
Assets/Game Resources/Prefabs/Skills/Energy shockwave.prefab
View file @ fb7e62ab
......@@ -9922,7 +9922,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &3258256146233535668
Transform:
m_ObjectHideFlags: 0
Assets/Game Resources/Sprites/Home/Group 14 copy 2.png.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 7d95b8d59464d8740bcf1c7afefa5eb4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sprites/Home/Group 14 copy 3.png.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: e0859eafa85c6344f8a59db413d321af
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sprites/Home/Group 14 copy.png.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 52c3b49259b88d44d8860f0408596534
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sprites/Home/Group 14.png.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: e14146b9c88d8b54ebdd5077e159f7f8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Sprites/Home/Layer 93.png.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 5dd6522e1df98014997371fea81ee68e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/TreasureFX/Upgrade/Treasure FX URP (2019.4 LTS).unitypackage.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 6a30a4578cddd424fa473c03ec4c51de
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Joystick Pack/Scripts/Joysticks/DynamicJoystick.cs
View file @ fb7e62ab
......@@ -22,6 +22,7 @@ public class DynamicJoystick : Joystick
public override void OnPointerDown(PointerEventData eventData)
{
Controller.CanMove = true;
v_difference = Vector2.zero;
time = 0.05f;
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
......@@ -31,6 +32,7 @@ public class DynamicJoystick : Joystick
public override void OnPointerUp(PointerEventData eventData)
{
Controller.CanMove = false;
v_difference = Vector2.zero;
if (time > 0f)
{
......
Assets/OSG Infinity Square Space/Player/Scripts/Controller.cs
View file @ fb7e62ab
......@@ -316,7 +316,7 @@ public class Controller : MonoBehaviour
if (Class_Controller.collapsarMouseButtonDown == true) Class_Controller.collapsarMouseButtonDown = false;
if (Class_Controller.destroyerMouseButtonDown == true) Class_Controller.destroyerMouseButtonDown = false;
}
if (Input.GetMouseButtonUp(0))
if (Input.GetMouseButtonUp(0) && Interface.instance.timeTouch == 0f)
{
float currentTime = Time.time;
if (currentTime - timeTouch < 0.15f)
......@@ -324,23 +324,31 @@ public class Controller : MonoBehaviour
Debug.Log("Negaxy: Touch!!!");
if (attacking)
{
if (Class_Interface.specialEnabled)
{
if (Interface.instance.newSkillGUI.selectedSkillID == 7) StartCoroutine(ie_skill_7());
if (Interface.instance.newSkillGUI.selectedSkillID == 8) StartCoroutine(ie_skill_8());
if (Interface.instance.newSkillGUI.selectedSkillID == 9) StartCoroutine(ie_skill_9());
if (Interface.instance.newSkillGUI.selectedSkillID == 11) StartCoroutine(ie_skill_11());
if (Interface.instance.newSkillGUI.selectedSkillID == 12) StartCoroutine(ie_skill_12());
return;
}
if (Class_Interface.powerEnabled == true) Power_Weapon();
if (Class_Interface.missleEnabled == true) StartCoroutine(Missle_Weapon());
if (Class_Interface.laserEnabled == true) StartCoroutine(Laser_Weapon());
if (Class_Interface.pulseEnabled == true) StartCoroutine(Blackhole_Weapon());
if (Class_Interface.eraserEnabled == true) Eraser_Weapon();
if (Class_Interface.collapsarEnabled == true) Collapsar_Weapon();
if (Class_Interface.collapsarEnabled == true) StartCoroutine(Destroyer_Weapon());
if (Class_Interface.defaultEnabled == true/* UseDefaultWeapon()*/ && !default_attacking) StartCoroutine(Default_Weapon());
if (Interface.instance.skillSelectionManager == null) return;
if (Interface.instance.skillSelectionManager.SelectedID == 0) StartCoroutine(Default_Weapon());
if (Interface.instance.skillSelectionManager.SelectedID == 1) StartCoroutine(Laser_Weapon());
if (Interface.instance.skillSelectionManager.SelectedID == 2) StartCoroutine(Blackhole_Weapon());
if (Interface.instance.skillSelectionManager.SelectedID == 3) StartCoroutine(Missle_Weapon());
if (Interface.instance.skillSelectionManager.SelectedID == 4) StartCoroutine(Destroyer_Weapon());
if (Interface.instance.skillSelectionManager.SelectedID == 5) Eraser_Weapon();
if (Interface.instance.skillSelectionManager.SelectedID == 6) Collapsar_Weapon();
if (Interface.instance.skillSelectionManager.SelectedID == 7) StartCoroutine(ie_skill_7());
if (Interface.instance.skillSelectionManager.SelectedID == 8) StartCoroutine(ie_skill_8());
if (Interface.instance.skillSelectionManager.SelectedID == 9) StartCoroutine(ie_skill_9());
if (Interface.instance.skillSelectionManager.SelectedID == 10) StartCoroutine(ie_skill_10());
if (Interface.instance.skillSelectionManager.SelectedID == 11) StartCoroutine(ie_skill_11());
if (Interface.instance.skillSelectionManager.SelectedID == 12) StartCoroutine(ie_skill_12());
//if (Class_Interface.powerEnabled == true) Power_Weapon(); //
//if (Class_Interface.missleEnabled == true) StartCoroutine(Missle_Weapon()); // 3
//if (Class_Interface.laserEnabled == true) StartCoroutine(Laser_Weapon()); // 1
//if (Class_Interface.pulseEnabled == true) StartCoroutine(Blackhole_Weapon()); // 2
//if (Class_Interface.eraserEnabled == true) Eraser_Weapon(); // 5
//if (Class_Interface.collapsarEnabled == true) Collapsar_Weapon(); // 6
//if (Class_Interface.collapsarEnabled == true) StartCoroutine(Destroyer_Weapon()); // 4
//if (Class_Interface.defaultEnabled == true/* UseDefaultWeapon()*/ && !default_attacking) StartCoroutine(Default_Weapon());
}
}
attacking = false;
......@@ -1063,6 +1071,16 @@ public class Controller : MonoBehaviour
yield break;
}
}
private IEnumerator ie_skill_10()
{
if (Interface.instance.newSkillGUI.skills[3].CanUse())
{
GameObject skill = Instantiate(WeaponsPool.Instance.skill_10);
Interface.instance.newSkillGUI.skills[3].CountDown(15f);
yield return new WaitForSeconds(15f);
Destroy(skill);
}
}
private IEnumerator ie_skill_11()
{
if (Interface.instance.newSkillGUI.skills[4].CanUse())
......@@ -1089,4 +1107,8 @@ public class Controller : MonoBehaviour
WeaponsPool.TakeWeapons(skill);
}
}
private IEnumerator ie_skill_13()
{
yield break;
}
}
\ No newline at end of file
Assets/OSG Infinity Square Space/Player/Scripts/Interface.cs
View file @ fb7e62ab
......@@ -57,6 +57,8 @@ public class Interface : MonoBehaviour
public bool lightningTrigger, laserTrigger, pulseTrigger, eraserTrigger, collapsarTrigger, destroyerTrigger;
bool pause;
public NewSkillSystemGUI newSkillGUI { get; set; }
public SkillSelectionManager skillSelectionManager { get; set; }
public float timeTouch { get; set; }
void Awake()
{
//--------------
......@@ -64,9 +66,10 @@ public class Interface : MonoBehaviour
{
Destroy(instance.gameObject);
}
timeTouch = 0f;
instance = this;
newSkillGUI = GetComponent<NewSkillSystemGUI>();
//skillSelectionManager = GetComponentInChildren<SkillSelectionManager>();
joystick.gameObject.SetActive(false);
Time.timeScale = 1;
Class_Interface.HideLockMouse(hideLockMouse);
......@@ -233,7 +236,10 @@ public class Interface : MonoBehaviour
UnityEngine.SceneManagement.SceneManager.LoadScene("home");
}
private void Update()
{
timeTouch = Mathf.Max(timeTouch - Time.deltaTime, 0f);
}
void LateUpdate()
{
//--------------
......
Assets/OSG Infinity Square Space/Player/Scripts/Weapons/WeaponsPool.cs
View file @ fb7e62ab
......@@ -4,7 +4,8 @@ using System.Collections.Generic;
public class WeaponsPool : MonoBehaviour
{
public GameObject skill_10;
public GameObject skill_13;
public List<Weapons> weaponsList = new List<Weapons>();
//--------------
......@@ -12,11 +13,11 @@ public class WeaponsPool : MonoBehaviour
static Transform stThisTransform;
static int[] stNumberWeapons;
static GameObject[][] stWeapons;
public static WeaponsPool Instance;
private void Awake()
{
//--------------
Instance = this;
stThisTransform = transform;
AddObjectsToPool();
......
Assets/Scripts/DataManager.cs
View file @ fb7e62ab
......@@ -496,6 +496,19 @@ public class DataManager : Singleton<DataManager>
if (results.Count > 0) return results[0];
return null;
}
public MergeData GetRandomMergeData()
{
List<MergeData> res = new List<MergeData>();
foreach(MergeData data in mergeDatas)
{
if(GetSkill(data.skill_id_1) > 0 && GetSkill(data.skill_id_2) > 0)
{
res.Add(data);
}
}
if (res.Count > 0) return res[UnityEngine.Random.Range(0, res.Count)];
else return null;
}
#endregion
[Serializable]
......
Assets/Scripts/UI/ArsenalPopup.cs
View file @ fb7e62ab
......@@ -13,7 +13,21 @@ public class ArsenalPopup : BasePopup
public Slot slot_2;
public Slot slot_result;
[Header("Spaceship")]
public List<RectTransform> spaceShips = new List<RectTransform>();
public Button buyBtn;
public TextMeshProUGUI buyPrice;
private int currentId = 0;
[Header("Content")]
public Button fuseBtn;
public Button autoFillBtn;
public GameObject spaceShipTab;
public GameObject armoryTab;
public GameObject spaceShipContent;
public GameObject armoryContent;
public GameObject basicTab;
public GameObject specialTab;
public GameObject basicContent;
......@@ -22,10 +36,203 @@ public class ArsenalPopup : BasePopup
[Header("Skill Elements")]
public List<SkillElement> basicSkills = new List<SkillElement>();
public List<SkillElement> specialSkills = new List<SkillElement>();
[Header("Merge system")]
public Slider slider;
public TextMeshProUGUI sliderText;
public TextMeshProUGUI amountText;
public Button mergePreBtn;
public Button mergeNextBtn;
public override void OnShow()
{
base.OnShow();
OnClick_SpaceShip();
}
public void OnClick_SpaceShip()
{
spaceShipTab.SetActive(true);
spaceShipContent.SetActive(true);
armoryTab.SetActive(false);
armoryContent.SetActive(false);
LoadCurrentSpaceShip();
}
public void OnClick_Armory()
{
spaceShipTab.SetActive(false);
spaceShipContent.SetActive(false);
armoryTab.SetActive(true);
armoryContent.SetActive(true);
LoadArmoryPopup();
RefreshMergeSystem();
}
#region Merge system
private void RefreshMergeSystem()
{
slider.value = slider.minValue;
LoadMergeSystem();
}
private void LoadMergeSystem()
{
amountText.text = slider.value.ToString();
sliderText.text = slider.value.ToString();
if(slot_1.IsEmpty() || slot_2.IsEmpty())
{
slider.interactable = false;
mergePreBtn.interactable = false;
mergeNextBtn.interactable = false;
if (!slot_1.IsEmpty()) slot_1.SetAmount(1);
if (!slot_2.IsEmpty()) slot_2.SetAmount(1);
fuseBtn.interactable = false;
autoFillBtn.interactable = slot_1.IsEmpty() && slot_2.IsEmpty();
}
else
{
fuseBtn.interactable = true;
autoFillBtn.interactable = false;
slot_1.SetAmount((int)slider.value);
slot_2.SetAmount((int)slider.value);
slot_result.SetAmount((int)slider.value);
slider.maxValue = Mathf.Min(DataManager.Instance.GetSkill(slot_1.SkillID), DataManager.Instance.GetSkill(slot_2.SkillID));
slider.interactable = true;
mergePreBtn.interactable = !(slider.value == slider.minValue);
mergeNextBtn.interactable = !(slider.value == slider.maxValue);
}
}
public void OnClick_Pre_Merge()
{
slider.value = Mathf.Max(slider.minValue, slider.value - 1);
LoadMergeSystem();
}
public void OnClick_Next_Merge()
{
slider.value = Mathf.Max(slider.maxValue, slider.value + 1);
LoadMergeSystem();
}
public void OnValueChanged()
{
LoadMergeSystem();
}
public void OnClick_Fuse()
{
if(!slot_1.IsEmpty() && !slot_2.IsEmpty())
{
int amount = (int)slider.value;
DataManager.Instance.AddSkill(slot_1.SkillID, -amount);
DataManager.Instance.AddSkill(slot_2.SkillID, -amount);
DataManager.Instance.AddSkill(slot_result.SkillID, amount);
GuiManager.Instance.mergePopup.amount = amount;
GuiManager.Instance.mergePopup.resultID = slot_result.SkillID;
GuiManager.Instance.mergePopup.gameObject.SetActive(true);
OnClick_Slot1();
OnClick_Slot2();
}
}
public void OnClick_AutoFill()
{
if (slot_1.IsEmpty() && slot_2.IsEmpty())
{
DataManager.MergeData mergeData = DataManager.Instance.GetRandomMergeData();
if (mergeData != null)
{
PushSlot(mergeData.skill_id_1);
PushSlot(mergeData.skill_id_2);
}
}
}
#endregion
#region Spaceship
public void OnClick_Buy()
{
if (DataManager.Instance.userData.coin >= DataManager.Instance.GetSpaceShipPrice(currentId))
{
DataManager.Instance.AddCoin(-DataManager.Instance.GetSpaceShipPrice(currentId));
DataManager.Instance.UnlockShip(currentId);
DataManager.Instance.SelectShip(currentId);
CheckPriceStatus();
}
}
private void LoadCurrentSpaceShip()
{
for (int i = 0; i < spaceShips.Count; i++)
{
spaceShips[i].gameObject.SetActive(false);
}
spaceShips[DataManager.Instance.userData.currentShipId].anchoredPosition3D = spaceShips[DataManager.Instance.userData.currentShipId].anchoredPosition3D.SetX(0f);
spaceShips[DataManager.Instance.userData.currentShipId].gameObject.SetActive(true);
currentId = DataManager.Instance.userData.currentShipId;
CheckPriceStatus();
}
public void OnClick_Pre()
{
int cur_idx = currentId;
int pre_idx = (cur_idx - 1) < 0 ? spaceShips.Count - 1 : cur_idx - 1;
spaceShips[pre_idx].anchoredPosition3D = spaceShips[pre_idx].anchoredPosition3D.SetX(-1154f);
spaceShips[pre_idx].gameObject.SetActive(true);
spaceShips[pre_idx].DOAnchorPosX(0f, 0.5f);
spaceShips[cur_idx].DOAnchorPosX(1154f, 0.5f).OnComplete(() =>
{
spaceShips[cur_idx].gameObject.SetActive(false);
});
currentId = pre_idx;
CheckPriceStatus();
}
public void OnClick_Next()
{
int cur_idx = currentId;
int next_idx = (cur_idx + 1) >= spaceShips.Count ? 0 : (cur_idx + 1);
spaceShips[next_idx].anchoredPosition3D = spaceShips[next_idx].anchoredPosition3D.SetX(1154f);
spaceShips[next_idx].gameObject.SetActive(true);
spaceShips[next_idx].DOAnchorPosX(0f, 0.5f);
spaceShips[cur_idx].DOAnchorPosX(-1154f, 0.5f).OnComplete(() =>
{
spaceShips[cur_idx].gameObject.SetActive(false);
});
currentId = next_idx;
CheckPriceStatus();
}
private void CheckPriceStatus()
{
if (DataManager.Instance.HasThisSpaceShip(currentId))
{
buyBtn.gameObject.SetActive(false);
DataManager.Instance.SelectShip(currentId);
}
else
{
buyBtn.gameObject.SetActive(true);
buyBtn.transform.localScale = Vector3.one * 0.1f;
buyBtn.transform.DOScale(Vector3.one, 0.3f);
buyPrice.text = DataManager.Instance.GetSpaceShipPrice(currentId).ToString();
buyBtn.interactable = DataManager.Instance.userData.coin >= DataManager.Instance.GetSpaceShipPrice(currentId);
}
LoadSampleShip();
}
private void LoadSampleShip()
{
if (DataManager.Instance.userData.unlockedShipIds.Contains(currentId))
{
SampleManager.Instance.LoadCurrentShip();
}
}
#endregion
#region Armory
public void LoadSkillElements()
{
basicSkills.ForEach(a => a.LoadData(this));
specialSkills.ForEach(a => a.LoadData(this));
}
private void LoadBasicContent()
{
......@@ -47,8 +254,7 @@ public class ArsenalPopup : BasePopup
slot_1.Deactive();
slot_2.Deactive();
slot_result.Deactive();
basicSkills.ForEach(a => a.LoadData(this));
specialSkills.ForEach(a => a.LoadData(this));
LoadSkillElements();
}
public void PushSlot(int id)
{
......@@ -62,6 +268,7 @@ public class ArsenalPopup : BasePopup
}
CheckResultSlot();
CheckRemainSlot();
RefreshMergeSystem();
}
private void CheckResultSlot()
{
......@@ -84,6 +291,7 @@ public class ArsenalPopup : BasePopup
if (!slot_1.IsEmpty())
{
slot_1.Deactive();
RefreshMergeSystem();
}
if (slot_2.IsEmpty())
{
......@@ -93,13 +301,14 @@ public class ArsenalPopup : BasePopup
{
slot_result.Deactive();
CheckRemainSlot();
}
}
}
public void OnClick_Slot2()
{
if (!slot_2.IsEmpty())
{
slot_2.Deactive();
RefreshMergeSystem();
}
if (slot_1.IsEmpty())
{
......@@ -154,6 +363,7 @@ public class ArsenalPopup : BasePopup
{
LoadSpecialContent();
}
#endregion
[System.Serializable]
public class Slot
......@@ -172,6 +382,10 @@ public class ArsenalPopup : BasePopup
icon.transform.localScale = Vector3.one * 1.5f;
icon.transform.DOScale(Vector3.one, 0.3f);
}
public void SetAmount(int amount)
{
amountText.text = amount.ToString();
}
public void Deactive()
{
skillId = -1;
......
Assets/Scripts/UI/ConfirmPopup.cs 0 → 100644
View file @ fb7e62ab
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using UnityEngine.UI;
public class ConfirmPopup : BasePopup
{
public Image icon;
public TextMeshProUGUI price;
public TextMeshProUGUI amountBarText;
public TextMeshProUGUI amountText;
public Button buyBtn;
public Button preBtn;
public Button nextBtn;
public Slider slider;
public SkillElement skill { get; set; }
private int amount = 1;
public override void OnShow()
{
base.OnShow();
amount = 1;
LoadPopup();
}
private void LoadPopup()
{
icon.sprite = skill.icon.sprite;
amountBarText.text = amount.ToString();
amountText.text = amount.ToString();
slider.value = amount;
price.text = (amount * skill.price).ToString();
buyBtn.interactable = DataManager.Instance.userData.coin >= (amount * skill.price);
preBtn.interactable = !(amount == slider.minValue);
nextBtn.interactable = !(amount == slider.maxValue);
}
public void OnClick_Pre()
{
amount = Mathf.Max((int)slider.minValue, amount - 1);
LoadPopup();
}
public void OnClick_Next()
{
amount = Mathf.Min((int)slider.maxValue, amount + 1);
LoadPopup();
}
public void OnValueChanged()
{
amount = (int)slider.value;
LoadPopup();
}
public void OnClick_Buy()
{
if (DataManager.Instance.userData.coin >= (amount * skill.price))
{
DataManager.Instance.AddCoin(-(amount * skill.price));
DataManager.Instance.AddSkill(skill.skillId, amount);
LoadPopup();
skill.arsenalPopup.LoadSkillElements();
OnClick_Close();
}
}
}
Assets/Scripts/UI/ConfirmPopup.cs.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 4b6dbe01e6943b641b129c19ba2c15d7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/GuiManager.cs
View file @ fb7e62ab
......@@ -23,6 +23,9 @@ public class GuiManager : MonoBehaviour
public ShopPopup shopPopup;
public RatePopup ratePopup;
public RankRewardPopup rankRewardPopup;
public ArsenalPopup arsenalPopup;
public ConfirmPopup confirmPopup;
public MergePopup mergePopup;
[Header("Audios")]
public AudioSource source;
......
Assets/Scripts/UI/HomeScreen.cs
View file @ fb7e62ab
......@@ -55,6 +55,10 @@ public class HomeScreen : MonoBehaviour
{
GuiManager.Instance.shopPopup.gameObject.SetActive(true);
}
public void OnClick_Arsenal()
{
GuiManager.Instance.arsenalPopup.gameObject.SetActive(true);
}
public void OnClick_Smash()
{
GuiManager.Instance.ShowSolarScreen();
......
Assets/Scripts/UI/MergePopup.cs 0 → 100644
View file @ fb7e62ab
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using UnityEngine.UI;
public class MergePopup : BasePopup
{
public Image icon;
public TextMeshProUGUI amountText;
public int resultID { get; set; }
public int amount { get; set; }
public override void OnShow()
{
base.OnShow();
LoadPopup();
}
private void LoadPopup()
{
icon.sprite = DataManager.Instance.GetSkillIcon(resultID);
amountText.text = amount.ToString();
}
}
Assets/Scripts/UI/MergePopup.cs.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 4146e88cc1821c8488bd702eedd555ac
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/NewSkillSystemGUI.cs
View file @ fb7e62ab
......@@ -29,13 +29,13 @@ public class NewSkillSystemGUI : MonoBehaviour
if(selectedSkillID == id)
{
UnselectAll();
Interface.instance.UnselectAll();
//Interface.instance.UnselectAll();
return;
}
UnselectAll();
selectedSkillID = id;
skills[selectedSkillID - 7].Select();
Interface.instance.UnselectAll();
//Interface.instance.UnselectAll();
}
public void UnselectAll()
{
......@@ -73,7 +73,7 @@ public class NewSkillSystemGUI : MonoBehaviour
if (addonSkillTab.gameObject.activeSelf)
{
// Tat
Interface.instance.UnselectAll();
//Interface.instance.UnselectAll();
addonSkillTab.localScale = Vector3.one;
addonSkillTab.DOScale(Vector3.zero, 0.01f).OnComplete(() =>
{
......@@ -94,7 +94,7 @@ public class NewSkillSystemGUI : MonoBehaviour
addonSelection.localScale = Vector3.one * 1.3f;
addonSelection.DOScale(Vector3.one, 0.25f);
addonSelection.gameObject.SetActive(true);
Interface.instance.UnselectAll();
//Interface.instance.UnselectAll();
}
}
[System.Serializable]
......
Assets/Scripts/UI/ShopPopup.cs
View file @ fb7e62ab
......@@ -25,8 +25,9 @@ public class ShopPopup : BasePopup
public override void OnShow()
{
base.OnShow();
OnClick_Ship();
LoadCurrentSpaceShip();
//OnClick_Ship();
//LoadCurrentSpaceShip();
OnClick_Pack();
LoadPrice();
CheckRemoveAds();
}
......
Assets/Scripts/UI/SkillElement.cs
View file @ fb7e62ab
......@@ -15,10 +15,10 @@ public class SkillElement : MonoBehaviour
public TextMeshProUGUI amountText;
public TextMeshProUGUI priceText;
private ArsenalPopup arsenalPopup;
public void LoadData(ArsenalPopup _ars)
public ArsenalPopup arsenalPopup { get; set; }
public void LoadData(ArsenalPopup _ars = null)
{
arsenalPopup = _ars;
if(_ars != null) arsenalPopup = _ars;
icon.sprite = DataManager.Instance.GetSkillIcon(skillId);
amountText.text = DataManager.Instance.GetSkill(skillId).ToString();
if (priceText) priceText.text = price.ToString();
......@@ -41,9 +41,12 @@ public class SkillElement : MonoBehaviour
{
if(DataManager.Instance.userData.coin >= price)
{
DataManager.Instance.AddCoin(-price);
DataManager.Instance.AddSkill(skillId, 1);
LoadData(arsenalPopup);
//DataManager.Instance.AddCoin(-price);
//DataManager.Instance.AddSkill(skillId, 1);
//LoadData(arsenalPopup);
GuiManager.Instance.confirmPopup.skill = this;
GuiManager.Instance.confirmPopup.gameObject.SetActive(true);
}
}
public void OnClick_Ads()
......@@ -51,7 +54,7 @@ public class SkillElement : MonoBehaviour
AdsController.instance.ShowReward(() =>
{
DataManager.Instance.AddSkill(skillId, 1);
LoadData(arsenalPopup);
arsenalPopup.LoadSkillElements();
});
}
public void OnClick_Select()
......
Assets/Scripts/UI/SkillSelectionGUI.cs 0 → 100644
View file @ fb7e62ab
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
using DG.Tweening;
public class SkillSelectionGUI : MonoBehaviour
{
public int ID = 0;
public Image icon;
public Image countDown;
public Image selection;
public TextMeshProUGUI amountText;
public GameObject videoAds;
private float countdownValue = 0f;
public SkillSelectionManager skillSelectionManager { get; set; }
public bool CanUse()
{
return countdownValue == 0f;
}
public void CountDown(float timer)
{
if (CanUse() && countDown)
{
countdownValue = timer;
DOTween.To(() => { return countdownValue; }, (a) =>
{
countDown.fillAmount = countdownValue / timer;
countdownValue = a;
}, 0f, timer);
}
}
public void LoadData(SkillSelectionManager _manager = null)
{
if (_manager != null) skillSelectionManager = _manager;
if(ID > 0)
{
icon.sprite = DataManager.Instance.GetSkillIcon(ID);
amountText.text = DataManager.Instance.GetSkill(ID).ToString();
if(videoAds) videoAds.SetActive(DataManager.Instance.GetSkill(ID) > 0);
}
if (ID == skillSelectionManager.SelectedID) Select();
else Unselect();
}
public void Select()
{
skillSelectionManager.SelectedID = ID;
selection.transform.localScale = Vector3.one * 1.3f;
selection.transform.DOScale(Vector3.one, 0.25f);
selection.gameObject.SetActive(true);
}
public void Unselect()
{
selection.gameObject.SetActive(false);
}
public void OnClick_Select()
{
Interface.instance.timeTouch = 0.2f;
skillSelectionManager.SelectedID = ID;
skillSelectionManager.Reload();
skillSelectionManager.CheckSpecialTab();
}
}
Assets/Scripts/UI/SkillSelectionGUI.cs.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 4e7ae405bb47d06438a6d72495554eba
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/SkillSelectionManager.cs 0 → 100644
View file @ fb7e62ab
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SkillSelectionManager : MonoBehaviour
{
public int SelectedID = 0;
public List<SkillSelectionGUI> skills = new List<SkillSelectionGUI>();
public Transform specialTab;
public GameObject selectionTab;
private void Start()
{
Interface.instance.skillSelectionManager = this;
skills.ForEach(a => a.LoadData(this));
specialTab.gameObject.SetActive(false);
selectionTab.SetActive(false);
}
public void Reload()
{
skills.ForEach(a => a.LoadData(this));
}
public void OnClick_SpecialTab()
{
specialTab.DOKill();
if (specialTab.gameObject.activeSelf)
{
// Tat
specialTab.localScale = Vector3.one;
specialTab.DOScale(Vector3.zero, 0.01f).OnComplete(() =>
{
specialTab.gameObject.SetActive(false);
});
selectionTab.SetActive(SelectedID >= 7);
}
else
{
// Bat
specialTab.localScale = Vector3.zero;
specialTab.gameObject.SetActive(true);
specialTab.DOScale(Vector3.one, 0.2f);
}
}
public void CheckSpecialTab()
{
if(SelectedID < 7 && specialTab.gameObject.activeSelf)
{
specialTab.localScale = Vector3.one;
specialTab.DOScale(Vector3.zero, 0.01f).OnComplete(() =>
{
specialTab.gameObject.SetActive(false);
});
}
selectionTab.SetActive(SelectedID >= 7);
}
}
Assets/Scripts/UI/SkillSelectionManager.cs.meta 0 → 100644
View file @ fb7e62ab
fileFormatVersion: 2
guid: 90b4fde62ec097d48a806fee411c9e4d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
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