More stuff

This commit is contained in:
2018-04-12 21:33:30 +10:00
parent b2743d59b5
commit db436758cf
20 changed files with 109 additions and 423 deletions
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e11bed71f2eb9d4832cd631c57fd77fe520a66743b733fe89bb566eb1d1f3c24 oid sha256:d0ac5fedf117ffc205f246081ffbdb67ffd20a00e1410232cba6520c177c125a
size 512076 size 347785
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e146081d721bf39ec5f46a299503d050232629235b0f59bcc49c4968656b8b07 oid sha256:f39766406cca9ce03f644b0aae0d4ed2c3512afd236547ade005197f3b31cf0b
size 149882 size 146962
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:341360b46182f563ab158872e3b18b87f78e003317d767082bdbf3a14e95f4a5
size 108599
@@ -1,6 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 06a43762e45f85c4cb73c36813fa6a94 guid: 72ab5eca4e43e564cb49a9da30b26dea
timeCreated: 1523449943 timeCreated: 1523530559
licenseType: Free licenseType: Free
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-77
View File
@@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: ab0661dd43441494cb99ee649ed68d7b
timeCreated: 1523449943
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-77
View File
@@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: 0a39ba7561cbee740b270a9fa4935608
timeCreated: 1523449943
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-77
View File
@@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: 89204b1068bcef544a49788fcb973279
timeCreated: 1523449943
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-77
View File
@@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: e0c9fdbcfb56eea458a11a8336efe755
timeCreated: 1523449943
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd
size 1926
-77
View File
@@ -1,77 +0,0 @@
fileFormatVersion: 2
guid: c8e4a030ea4d4e54c8b164b74d13f096
timeCreated: 1523449943
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 4
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4432a999e87b1a9e3caf46ec158cf6e73eecfbe1b3d3e73a15490076b4aae470 oid sha256:c6a2b5e49116a82daadea6c50a7364cefae3c75c46597e50daf121b24394f965
size 731459 size 1279350
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3a015b650ccce4f75ab4f2a23587135ba14f7df8afd0541cc7aba3cb17038d1c oid sha256:1738a36807b661b78a70385ce1fe3d33294f24b077ca440540e2eae43b10f7a9
size 683822 size 1325496
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:16e4e3de9272d6a2371095169409ef45fd9a04c22da1da8cfdfebbdb3ae04a0e oid sha256:3d5bc239c110eb51438ee37114fb17ec60ce4b358056804cb686fda77419de23
size 893419 size 1612454
+93 -7
View File
@@ -215,7 +215,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2001262636} m_Father: {fileID: 2001262636}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &202786776 --- !u!212 &202786776
SpriteRenderer: SpriteRenderer:
@@ -300,7 +300,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2001262636} m_Father: {fileID: 2001262636}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &305962859 --- !u!212 &305962859
SpriteRenderer: SpriteRenderer:
@@ -440,11 +440,11 @@ Prefab:
m_Modifications: m_Modifications:
- target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 8.26 value: 10.61
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 7.33 value: -7.01
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
@@ -477,7 +477,7 @@ Prefab:
- target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
type: 2} type: 2}
propertyPath: motion.x propertyPath: motion.x
value: -2 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
type: 2} type: 2}
@@ -493,7 +493,7 @@ Prefab:
- target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
type: 2} type: 2}
propertyPath: motion.y propertyPath: motion.y
value: -2 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
@@ -1299,7 +1299,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2001262636} m_Father: {fileID: 2001262636}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1479090323 --- !u!114 &1479090323
MonoBehaviour: MonoBehaviour:
@@ -1436,6 +1436,91 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &1610597799
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1610597800}
- component: {fileID: 1610597802}
- component: {fileID: 1610597801}
m_Layer: 0
m_Name: Rocks_BG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1610597800
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1610597799}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2001262636}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1610597801
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1610597799}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72cfcd727b69cf543893b4d457e109e1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &1610597802
SpriteRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1610597799}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 72ab5eca4e43e564cb49a9da30b26dea, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 38.399998, y: 10.799999}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
--- !u!1 &1616901764 --- !u!1 &1616901764
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1786,6 +1871,7 @@ Transform:
- {fileID: 536661334} - {fileID: 536661334}
- {fileID: 560600666} - {fileID: 560600666}
- {fileID: 1188024904} - {fileID: 1188024904}
- {fileID: 1610597800}
- {fileID: 305962858} - {fileID: 305962858}
- {fileID: 202786775} - {fileID: 202786775}
- {fileID: 1479090322} - {fileID: 1479090322}
+1 -1
View File
@@ -32,7 +32,7 @@ public class GameOverController : MonoBehaviour {
GameObject obj = new GameObject (); GameObject obj = new GameObject ();
obj.AddComponent<SpriteRenderer> (); obj.AddComponent<SpriteRenderer> ();
obj.GetComponent<SpriteRenderer> ().sprite = spr; obj.GetComponent<SpriteRenderer> ().sprite = spr;
obj.transform.localScale = new Vector3 (0.3f, 0.3f, 1f); obj.transform.localScale = new Vector3 (0.25f, 0.25f, 1f);
obj.transform.position = new Vector3 (posX, 0, 0); obj.transform.position = new Vector3 (posX, 0, 0);
objectSet.Add (str, obj); objectSet.Add (str, obj);