Skip to content

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

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

parents be04242d ac345898
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 43 deletions
Assets/Epic Toon FX/Materials/Basics/gradient_horizontal_ADD.mat
View file @ a357b49d
......@@ -23,7 +23,7 @@ Material:
m_Name: gradient_horizontal_ADD
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
m_ShaderKeywords: _EMISSION _FADING_ON _SOFTPARTICLES_ON
m_LightmapFlags: 0
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
......
Assets/Game Resources/Prefabs/CollectionEffect.prefab
View file @ a357b49d
......@@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997177911105684
RectTransform:
m_ObjectHideFlags: 0
......@@ -92,7 +92,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997178163461241
RectTransform:
m_ObjectHideFlags: 0
......@@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b7727139b5466094aa0a4b3673552c4f, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -167,7 +167,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997178467640436
RectTransform:
m_ObjectHideFlags: 0
......@@ -242,7 +242,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997178513835397
RectTransform:
m_ObjectHideFlags: 0
......@@ -317,7 +317,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997178599251095
RectTransform:
m_ObjectHideFlags: 0
......@@ -433,12 +433,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
sprites:
- {fileID: 21300000, guid: b7727139b5466094aa0a4b3673552c4f, type: 3}
- {fileID: 21300000, guid: 5b12a70796aa5484389a091c0fb2f58b, type: 3}
- {fileID: 21300000, guid: ae1cc427bb9a22649a0063f4de6bc5dc, type: 3}
- {fileID: 21300000, guid: 45165792e80a48841836fb7d4a7f8f35, type: 3}
- {fileID: 21300000, guid: 748cd730bc56cfc48bbea6cf61a6a089, type: 3}
- {fileID: 21300000, guid: 9f737544bfa1b8244b17f7f0d05237c8, type: 3}
- {fileID: 21300000, guid: 2f10c58ef63b0ea46bafd8360681ef36, type: 3}
- {fileID: 21300000, guid: 071296b77d64a4c45b237f7587b3c424, type: 3}
- {fileID: 21300000, guid: 7c2dedc1ae7df154db9ef157dcf1ad67, type: 3}
- {fileID: 21300000, guid: 1075ec07f3ad1874cb118504435528e1, type: 3}
- {fileID: 21300000, guid: 10b271e4f5dfa0b4fbca30bc4e463574, type: 3}
- {fileID: 21300000, guid: f136ee6e88707d74fa5a615e7c89ff68, type: 3}
- {fileID: 21300000, guid: 87da56c371698f14f82c4c7c2aa7165b, type: 3}
- {fileID: 21300000, guid: 6f88d78228d3fbb47b60441b0da8512c, type: 3}
- {fileID: 21300000, guid: 8baa104b82edda94090ba46e21eb09e8, type: 3}
elements:
- {fileID: 3571997178163461240}
- {fileID: 3571997178467640439}
......@@ -466,7 +469,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997179220040380
RectTransform:
m_ObjectHideFlags: 0
......@@ -541,7 +544,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997179316726019
RectTransform:
m_ObjectHideFlags: 0
......@@ -616,7 +619,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997179701288148
RectTransform:
m_ObjectHideFlags: 0
......@@ -691,7 +694,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3571997179711773704
RectTransform:
m_ObjectHideFlags: 0
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 1.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 100.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 120.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 140.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 160.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 20.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 40.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 60.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/Layer 80.png.meta
View file @ a357b49d
......@@ -101,11 +101,11 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 512
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
......
Assets/OSG Infinity Square Space/StoneInfinity/stone_atlas.spriteatlas 0 → 100644
View file @ a357b49d
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!687078895 &4343727234628468602
SpriteAtlas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stone_atlas
m_EditorData:
serializedVersion: 2
textureSettings:
serializedVersion: 2
anisoLevel: 1
compressionQuality: 50
maxTextureSize: 2048
textureCompression: 0
filterMode: 1
generateMipMaps: 0
readable: 0
crunchedCompression: 0
sRGB: 1
platformSettings:
- serializedVersion: 3
m_BuildTarget: Android
m_MaxTextureSize: 1024
m_ResizeAlgorithm: 0
m_TextureFormat: 65
m_TextureCompression: 1
m_CompressionQuality: 50
m_CrunchedCompression: 0
m_AllowsAlphaSplitting: 0
m_Overridden: 1
m_AndroidETC2FallbackOverride: 0
m_ForceMaximumCompressionQuality_BC6H_BC7: 0
packingSettings:
serializedVersion: 2
padding: 4
blockOffset: 1
allowAlphaSplitting: 0
enableRotation: 0
enableTightPacking: 0
secondaryTextureSettings: {}
variantMultiplier: 1
packables:
- {fileID: 2800000, guid: 2f10c58ef63b0ea46bafd8360681ef36, type: 3}
- {fileID: 2800000, guid: 071296b77d64a4c45b237f7587b3c424, type: 3}
- {fileID: 2800000, guid: 7c2dedc1ae7df154db9ef157dcf1ad67, type: 3}
- {fileID: 2800000, guid: 1075ec07f3ad1874cb118504435528e1, type: 3}
- {fileID: 2800000, guid: 10b271e4f5dfa0b4fbca30bc4e463574, type: 3}
- {fileID: 2800000, guid: f136ee6e88707d74fa5a615e7c89ff68, type: 3}
- {fileID: 2800000, guid: 87da56c371698f14f82c4c7c2aa7165b, type: 3}
- {fileID: 2800000, guid: 6f88d78228d3fbb47b60441b0da8512c, type: 3}
- {fileID: 2800000, guid: 8baa104b82edda94090ba46e21eb09e8, type: 3}
totalSpriteSurfaceArea: 294912
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
m_MasterAtlas: {fileID: 0}
m_PackedSprites:
- {fileID: 21300000, guid: 7c2dedc1ae7df154db9ef157dcf1ad67, type: 3}
- {fileID: 21300000, guid: 6f88d78228d3fbb47b60441b0da8512c, type: 3}
- {fileID: 21300000, guid: 87da56c371698f14f82c4c7c2aa7165b, type: 3}
- {fileID: 21300000, guid: 10b271e4f5dfa0b4fbca30bc4e463574, type: 3}
- {fileID: 21300000, guid: 1075ec07f3ad1874cb118504435528e1, type: 3}
- {fileID: 21300000, guid: 071296b77d64a4c45b237f7587b3c424, type: 3}
- {fileID: 21300000, guid: 8baa104b82edda94090ba46e21eb09e8, type: 3}
- {fileID: 21300000, guid: f136ee6e88707d74fa5a615e7c89ff68, type: 3}
- {fileID: 21300000, guid: 2f10c58ef63b0ea46bafd8360681ef36, type: 3}
m_PackedSpriteNamesToIndex:
- Layer 40
- Layer 140
- Layer 120
- Layer 80
- Layer 60
- Layer 20
- Layer 160
- Layer 100
- Layer 1
m_RenderDataMap: {}
m_Tag: stone_atlas
m_IsVariant: 0
Assets/OSG Infinity Square Space/StoneInfinity/stone_atlas.spriteatlas.meta 0 → 100644
View file @ a357b49d
fileFormatVersion: 2
guid: 5dbfbd721490e6342a60a5bcffc790ba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4343727234628468602
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/IngameCollection_GuiFx.cs
View file @ a357b49d
......@@ -6,21 +6,39 @@ using UnityEngine.UI;
public class IngameCollection_GuiFx : MonoBehaviour
{
public List<Sprite> sprites = new List<Sprite>();
public List<Sprite> sprites = new List<Sprite>();
public List<Image> elements = new List<Image>();
public Vector3 target { set; get; }
private void OnEnable()
{
StartCoroutine(AnimateSprite());
StartCoroutine(ie_enable());
}
private IEnumerator AnimateSprite()
{
while (gameObject.activeInHierarchy)
{
for (int j = 0; j < sprites.Count; j++)
{
for (int i = 0; i < elements.Count; i++)
{
elements[i].sprite = sprites[j];
}
yield return new WaitForSecondsRealtime(0.04f);
}
}
}
private IEnumerator ie_enable()
{
for (int i = 0; i < elements.Count; i++)
{
elements[i].transform.localScale = Vector3.zero;
elements[i].transform.localPosition = Vector3.zero;
elements[i].gameObject.SetActive(false);
elements[i].sprite = sprites[Random.Range(0, sprites.Count)];
}
yield return new WaitForSeconds(0.1f);
for (int i = 0; i < elements.Count; i++)
......@@ -42,7 +60,7 @@ public class IngameCollection_GuiFx : MonoBehaviour
StarSystem.instance.planet.explosionCount.IncreaseInitChildCount();
});
}
yield return new WaitForSeconds(1f);
yield return new WaitForSeconds(2f);
ObjectPool.Set(this);
gameObject.SetActive(false);
}
......
Assets/Shader/Atmosphere/Shader Graphs_Atmosphere.mat
View file @ a357b49d
......@@ -36,8 +36,8 @@ Material:
- Vector1_037422ac7c3343b3b7493dead063f9bb: 0.006
- Vector1_7fc372182bde42b39d4fce1ca0ef8b6e: 6.8
- Vector1_dcb7b53c006f40ef9ae4c2c1d71198be: 0.5
- _Alpha: 0.0010200008
- _Alpha: -0.00011999909
m_Colors:
- Color_7b883b4cd7c248a580d2475d1da9ed40: {r: 0, g: 65110.777, b: 259086.64, a: 0}
- _AtmosphereColor: {r: 178874.73, g: 195322.98, b: 196351, a: 1}
- _AtmosphereColor: {r: 219995.36, g: 219995.36, b: 219995.36, a: 1}
m_BuildTextureStacks: []
Assets/SolarSystem/Materials/EarthDay.mat
View file @ a357b49d
......@@ -34,7 +34,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: c6594b8987f14e14395909be953a33a7, type: 3}
m_Texture: {fileID: 2800000, guid: 840fc8d7538628540b64d39d6f9dd942, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
......
Assets/StarSparrow/Materials/BonusContent/AsteroidsLava_Red.mat
View file @ a357b49d
......@@ -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: 2.1994803, g: 1.9821403, b: 1.1301678, a: 2.2168674}
- _EmissionColor: {r: 2.530628, g: 2.280566, b: 1.3003228, a: 2.550633}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
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