diff --git a/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab b/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab index 6d7e61a..d608e1e 100644 --- a/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab +++ b/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab @@ -136,6 +136,7 @@ MonoBehaviour: playerHookSpeed: 2 springForce: Infinity damperForce: Infinity + breakForce: 600 ropeSwing: 5 dashSpeed: 15 smallProjectile: {fileID: 1556668439340832, guid: be1300b1777602f448d537a75a9093c3, @@ -224,5 +225,5 @@ SpringJoint: m_BreakTorque: Infinity m_EnableCollision: 1 m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 10 + m_MassScale: 0.1 + m_ConnectedMassScale: 1 diff --git a/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab b/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab deleted file mode 100644 index e2f4d80..0000000 --- a/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab +++ /dev/null @@ -1,97 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1418822140686544} - m_IsPrefabParent: 1 ---- !u!1 &1418822140686544 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4903368495715552} - - component: {fileID: 33044757619173282} - - component: {fileID: 65552646387415420} - - component: {fileID: 23946507598594760} - m_Layer: 0 - m_Name: Grass-Midle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4903368495715552 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1418822140686544} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!23 &23946507598594760 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1418822140686544} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: a91e12983a731124d9c3b4c14aacf569, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &33044757619173282 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1418822140686544} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65552646387415420 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1418822140686544} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab.meta b/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab.meta deleted file mode 100644 index 2744dcc..0000000 --- a/Assets/Prefabs/Plateform/Grass-Test/Grass-Midle.prefab.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 995c1b88ff2258944a27e0144d0deca8 -timeCreated: 1521042320 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/MapGenerator.cs b/Assets/Script/MapGenerator.cs index eba9f16..a8a0b7a 100644 --- a/Assets/Script/MapGenerator.cs +++ b/Assets/Script/MapGenerator.cs @@ -32,8 +32,8 @@ public class MapGenerator : MonoBehaviour Camera cam = GameObject.Find("Main Camera").GetComponent(); Vector3 topLeft = new Vector3(0, map.height, 0); Vector3 bottomRight = new Vector3(map.width, 0, 0); - cam.transform.position = new Vector3(map.width / 2, map.height / 2, -Vector3.Distance(topLeft, bottomRight) / 2.5f); + NetworkManager netManager = GameObject.Find("GameManager").GetComponent(); StartCoroutine(netManager.SetDeathZone(topLeft, bottomRight)); } @@ -55,10 +55,15 @@ public class MapGenerator : MonoBehaviour return; bool topPosition = (y + 1 < map.height) ? map.GetPixel(x, y + 1) == pixelColor : false; - //bool underPosition = (y - 1 > 0) ? map.GetPixel(x, y - 1) == pixelColor : false; + bool underPosition = (y - 1 > 0) ? map.GetPixel(x, y - 1) == pixelColor : false; bool leftPosition = (x - 1 > 0) ? map.GetPixel(x - 1, y) == pixelColor : false; bool rightPosition = (x + 1 < map.width) ? map.GetPixel(x + 1, y) == pixelColor : false; + bool topLeft = (x - 1 > 0 && y + 1 < map.height) ? map.GetPixel(x - 1, y + 1) == pixelColor : false; + bool topRight = (x + 1 < map.width && y + 1 < map.height) ? map.GetPixel(x + 1, y + 1) == pixelColor : false; + bool bottomLeft = (x - 1 > 0 && y - 1 > 0) ? map.GetPixel(x - 1, y - 1) == pixelColor : false; + bool bottomRight = (x + 1 < map.width && y + 1 > 0) ? map.GetPixel(x - 1, y + 1) == pixelColor : false; + GameObject prefab = null; if (topPosition) @@ -69,14 +74,29 @@ public class MapGenerator : MonoBehaviour if (!rightPosition) prefab = tile.bothUnder; + else if (!topRight) + prefab = tile.cornerRTL; } else if (!rightPosition) { prefab = tile.rightUnder; + + if (leftPosition && !topLeft) + prefab = tile.cornerLTR; } else { - prefab = tile.underPrefab; + if (!topLeft) + { + if (topRight) + prefab = tile.cornerLT; + else + prefab = tile.cornerLTRT; + } + else if (!topRight) + prefab = tile.cornerRT; + else + prefab = tile.underPrefab; } } else if (!leftPosition) diff --git a/Assets/Script/MapTile.cs b/Assets/Script/MapTile.cs index 8dfef49..06a1a20 100644 --- a/Assets/Script/MapTile.cs +++ b/Assets/Script/MapTile.cs @@ -13,4 +13,12 @@ public class MapTile public GameObject rightUnder; public GameObject bothUnder; public GameObject bothTop; + + public GameObject cornerLT; + public GameObject cornerRT; + + public GameObject cornerLTR; + public GameObject cornerRTL; + + public GameObject cornerLTRT; } diff --git a/Assets/Script/PlayerMovement.cs b/Assets/Script/PlayerMovement.cs index 81a3ab8..0a19c20 100644 --- a/Assets/Script/PlayerMovement.cs +++ b/Assets/Script/PlayerMovement.cs @@ -32,6 +32,7 @@ public class PlayerMovement : MonoBehaviour [SerializeField] private float playerHookSpeed = 15; [SerializeField] private float springForce = Mathf.Infinity; [SerializeField] private float damperForce = Mathf.Infinity; + [SerializeField] private float breakForce = 600; [SerializeField] private float ropeSwing = 1; private GameObject hook; private HookType hookType = HookType.Wall; @@ -238,19 +239,17 @@ public class PlayerMovement : MonoBehaviour if(hook != null) hook.GetComponent().SetPosition(0, rb.position); } - //if(hookType == HookType.SmallProjectile) + //if (hookType == HookType.SmallProjectile) //{ - // if(objectHooked != null) + // if (objectHooked != null) // { // if (hook != null) // hook.GetComponent().SetPositions(new Vector3[] { rb.position, objectHooked.transform.position }); - - // objectHooked.GetComponent().connectedAnchor = rb.position; // } //} //Handle dash after user pressed the button - if(dashTime > 0) + if (dashTime > 0) { rb.velocity = dashVelocity; dashVelocity.y -= dashVelocity.y / 10; @@ -338,23 +337,16 @@ public class PlayerMovement : MonoBehaviour { Destroy(hook); SpringJoint spring = GetComponent(); - spring.connectedAnchor = new Vector3(0, 0, 0); - spring.spring = 0; - spring.damper = 0; - spring.maxDistance = 0; + if(spring != null) + { + spring.connectedAnchor = new Vector3(0, 0, 0); + spring.spring = 0; + spring.damper = 0; + spring.maxDistance = 0; + } hookType = HookType.None; hookPosition = Vector3.zero; hookLength = 0; - - if (objectHooked != null) - { - spring = objectHooked.GetComponent(); - spring.connectedBody = rb; - spring.spring = 0; - spring.damper = 0; - spring.minDistance = 0; - spring.maxDistance = 0; - } } } else @@ -376,17 +368,18 @@ public class PlayerMovement : MonoBehaviour } else if(hit.collider.tag == "SmallProjectile") { - hookType = HookType.SmallProjectile; - hook = Instantiate(hookObject, rb.position, Quaternion.identity); - hook.GetComponent().SetPositions(new Vector3[] { rb.position, hit.point }); - objectHooked = hit.collider.gameObject; + //Cancel et boop le projectile + //hookType = HookType.SmallProjectile; + //hook = Instantiate(hookObject, rb.position, Quaternion.identity); + //hook.GetComponent().SetPositions(new Vector3[] { rb.position, hit.point }); + //objectHooked = hit.collider.gameObject; - SpringJoint spring = GetComponent(); - spring.spring = springForce; - spring.damper = damperForce; - spring.maxDistance = Vector3.Distance(rb.position, hit.point); - //spring.minDistance = Vector3.Distance(rb.position, hit.point); - spring.connectedBody = hit.collider.GetComponent(); + //SpringJoint spring = GetComponent(); + //spring.spring = springForce; + //spring.damper = damperForce; + //spring.maxDistance = Vector3.Distance(rb.position, hit.point); + //spring.breakForce = breakForce; + //spring.connectedBody = hit.collider.GetComponent(); } else { @@ -395,6 +388,7 @@ public class PlayerMovement : MonoBehaviour spring.connectedAnchor = hit.point; spring.spring = springForce; spring.damper = damperForce; + spring.breakForce = Mathf.Infinity; spring.maxDistance = Vector3.Distance(rb.position, hit.point); hook = Instantiate(hookObject, rb.position, Quaternion.identity); diff --git a/Assets/Textures/GrassTest/Grass-Both.png b/Assets/Textures/GrassTest/Grass-Both.png deleted file mode 100644 index 70b083d..0000000 Binary files a/Assets/Textures/GrassTest/Grass-Both.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Grass-Both.png.meta b/Assets/Textures/GrassTest/Grass-Both.png.meta deleted file mode 100644 index c0dda5a..0000000 --- a/Assets/Textures/GrassTest/Grass-Both.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: f65cabc4878215e4980bae991c7a8384 -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Grass-Left.png b/Assets/Textures/GrassTest/Grass-Left.png deleted file mode 100644 index 31fc72a..0000000 Binary files a/Assets/Textures/GrassTest/Grass-Left.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Grass-Left.png.meta b/Assets/Textures/GrassTest/Grass-Left.png.meta deleted file mode 100644 index de9e6c5..0000000 --- a/Assets/Textures/GrassTest/Grass-Left.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 6b0b37f2df74ed14b97528c214d013ca -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Grass-Middle.mat b/Assets/Textures/GrassTest/Grass-Middle.mat deleted file mode 100644 index db0e6b4..0000000 --- a/Assets/Textures/GrassTest/Grass-Middle.mat +++ /dev/null @@ -1,76 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Grass-Middle - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 5cc2e81ca76c6f440aed3cbe73ace915, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Textures/GrassTest/Grass-Middle.mat.meta b/Assets/Textures/GrassTest/Grass-Middle.mat.meta deleted file mode 100644 index a551bfd..0000000 --- a/Assets/Textures/GrassTest/Grass-Middle.mat.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a91e12983a731124d9c3b4c14aacf569 -timeCreated: 1521042089 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/GrassTest/Grass-Middle.png b/Assets/Textures/GrassTest/Grass-Middle.png deleted file mode 100644 index 9aea4fc..0000000 Binary files a/Assets/Textures/GrassTest/Grass-Middle.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Grass-Middle.png.meta b/Assets/Textures/GrassTest/Grass-Middle.png.meta deleted file mode 100644 index 048d122..0000000 --- a/Assets/Textures/GrassTest/Grass-Middle.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 5cc2e81ca76c6f440aed3cbe73ace915 -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Grass-Right.png b/Assets/Textures/GrassTest/Grass-Right.png deleted file mode 100644 index 0cc3e0e..0000000 Binary files a/Assets/Textures/GrassTest/Grass-Right.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Grass-Right.png.meta b/Assets/Textures/GrassTest/Grass-Right.png.meta deleted file mode 100644 index e80368a..0000000 --- a/Assets/Textures/GrassTest/Grass-Right.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 8acc46ac5e4c6da478a08b364eab0118 -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Under-Both.png b/Assets/Textures/GrassTest/Under-Both.png deleted file mode 100644 index 2b6f133..0000000 Binary files a/Assets/Textures/GrassTest/Under-Both.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Under-Both.png.meta b/Assets/Textures/GrassTest/Under-Both.png.meta deleted file mode 100644 index b83fb86..0000000 --- a/Assets/Textures/GrassTest/Under-Both.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 69f96d7a3a1e9f34c9c2e372688da0e3 -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Under-Left.png b/Assets/Textures/GrassTest/Under-Left.png deleted file mode 100644 index cd8697a..0000000 Binary files a/Assets/Textures/GrassTest/Under-Left.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Under-Left.png.meta b/Assets/Textures/GrassTest/Under-Left.png.meta deleted file mode 100644 index edd1e5c..0000000 --- a/Assets/Textures/GrassTest/Under-Left.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 7dbc6c4b1d22d7748a5f269e0efe5ed4 -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Under-Middle.png b/Assets/Textures/GrassTest/Under-Middle.png deleted file mode 100644 index ddc9eac..0000000 Binary files a/Assets/Textures/GrassTest/Under-Middle.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Under-Middle.png.meta b/Assets/Textures/GrassTest/Under-Middle.png.meta deleted file mode 100644 index 5ca293f..0000000 --- a/Assets/Textures/GrassTest/Under-Middle.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: a4ea9f321a42ad04e9eb4f4b1d0d3e9e -timeCreated: 1521042002 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: diff --git a/Assets/Textures/GrassTest/Under-Right.png b/Assets/Textures/GrassTest/Under-Right.png deleted file mode 100644 index bf99d3e..0000000 Binary files a/Assets/Textures/GrassTest/Under-Right.png and /dev/null differ diff --git a/Assets/Textures/GrassTest/Under-Right.png.meta b/Assets/Textures/GrassTest/Under-Right.png.meta deleted file mode 100644 index fe1e4bb..0000000 --- a/Assets/Textures/GrassTest/Under-Right.png.meta +++ /dev/null @@ -1,77 +0,0 @@ -fileFormatVersion: 2 -guid: 4c081a30a485cf041aa4f17aca41fe67 -timeCreated: 1521042001 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: