diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index e5dd76c..ff0101f 100755 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -60,6 +60,8 @@ public int[] LeafsForPile; + private AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + // Update is called once per frame void Update () { @@ -78,7 +80,7 @@ dir.Normalize(); playerDir.x = dir.x; - playerDir.y = dir.y; + playerDir.z = dir.z; float speed = Speed; if (runCycle < RunFrameTime) @@ -102,7 +104,7 @@ { runCycle -= RunCycleTime; } - int frame = runCycle < RunFrameTime ? 1 : 0; + int frame = ((int)Mathf.Floor(runCycle / RunCycleTime * 4.0f) + 1) % 4; //< RunFrameTime ? 1 : 0; anim.SetFrame(frame); } else @@ -164,6 +166,7 @@ if (rakeTime >= 0 && localRakeDir.magnitude > 0.7f && rakeTime < TimeToPushRake) { + playerDir = -localRakeDir; rakeDir = localRakeDir; state = State.Raking; @@ -171,7 +174,7 @@ if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -190,11 +193,11 @@ rakeDir = playerDir; state = State.MakingPile; - float angle = Mathf.Atan2(-rakeDir.z, -rakeDir.x); + float angle = Mathf.Atan2(rakeDir.z, rakeDir.x); if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -205,7 +208,11 @@ anim.SetState("Rake", rakeAnimDir, 0); - rakeTimer.Start(0.35f, MakePile); + rakeTimer.Start(0.175f, () => + { + anim.SetState("Rake", rakeAnimDir, 1); + rakeTimer.Start(0.175f, MakePile); + }); } } @@ -228,6 +235,8 @@ private void Rake() { + anim.SetState("Rake", rakeAnimDir, 1); + Vector3 rakeMove = rakeDir * RakeBackDist; rakeBackStart = transform.position; charC.Move(rakeMove); @@ -258,7 +267,7 @@ dist += UnityEngine.Random.Range(-0.1f, 0.1f); Vector3 pull = rakeDir * dist; - if (rand < 0.5f) + if (rand < 0.65f) { // pull the leaf back, and then destroy @@ -287,7 +296,7 @@ //GameObject.Destroy(leaf.gameObject); }; } - else if (rand < 0.7f) + else if (rand < 0.83f) { pull.Normalize(); pull = Quaternion.Euler(UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f)) * pull; @@ -301,7 +310,7 @@ } } - public GameObject PilePrefab; + public Pile PilePrefab; public float PileSearchRadius = 0.7f; @@ -319,7 +328,55 @@ } } + int numLeaves = potentialPile.Count; + bool madePile = false; + for (int i = LeafsForPile.Length - 1; i >= 0; i--) + { + if (numLeaves >= LeafsForPile[i]) + { + if (UnityEngine.Random.Range(0, 1.0f) < 0.15f) + { + i--; + if (i < 0) break; + numLeaves = LeafsForPile[i] - 1; + } + + float pileScale = (float)i / (LeafsForPile.Length - 1) + 0.4f; + + Pile pile = Instantiate(PilePrefab); + + pile.NumLeaves = numLeaves; + + pile.InitialPop = pileScale; + + pile.transform.position = transform.position + rakeDir * RakeReachDist + new Vector3(UnityEngine.Random.Range(-0.1f, 0.1f), 0, UnityEngine.Random.Range(-0.1f, 0.1f)); + + madePile = true; + + break; + } + } + + if (madePile) + { + foreach (LeafPhysics leaf in potentialPile) + { + if (UnityEngine.Random.Range(0, 1f) < 0.8f) + { + leaf.FadeOut(0.3f); + } + } + } + else + { + foreach (LeafPhysics leaf in potentialPile) + { + leaf.Body.AddForce(new Vector3(UnityEngine.Random.Range(-2, 2), 0, UnityEngine.Random.Range(-2, 2)), ForceMode.Impulse); + } + } + + FinishedRake(); } private void FinishedRake() diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index e5dd76c..ff0101f 100755 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -60,6 +60,8 @@ public int[] LeafsForPile; + private AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + // Update is called once per frame void Update () { @@ -78,7 +80,7 @@ dir.Normalize(); playerDir.x = dir.x; - playerDir.y = dir.y; + playerDir.z = dir.z; float speed = Speed; if (runCycle < RunFrameTime) @@ -102,7 +104,7 @@ { runCycle -= RunCycleTime; } - int frame = runCycle < RunFrameTime ? 1 : 0; + int frame = ((int)Mathf.Floor(runCycle / RunCycleTime * 4.0f) + 1) % 4; //< RunFrameTime ? 1 : 0; anim.SetFrame(frame); } else @@ -164,6 +166,7 @@ if (rakeTime >= 0 && localRakeDir.magnitude > 0.7f && rakeTime < TimeToPushRake) { + playerDir = -localRakeDir; rakeDir = localRakeDir; state = State.Raking; @@ -171,7 +174,7 @@ if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -190,11 +193,11 @@ rakeDir = playerDir; state = State.MakingPile; - float angle = Mathf.Atan2(-rakeDir.z, -rakeDir.x); + float angle = Mathf.Atan2(rakeDir.z, rakeDir.x); if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -205,7 +208,11 @@ anim.SetState("Rake", rakeAnimDir, 0); - rakeTimer.Start(0.35f, MakePile); + rakeTimer.Start(0.175f, () => + { + anim.SetState("Rake", rakeAnimDir, 1); + rakeTimer.Start(0.175f, MakePile); + }); } } @@ -228,6 +235,8 @@ private void Rake() { + anim.SetState("Rake", rakeAnimDir, 1); + Vector3 rakeMove = rakeDir * RakeBackDist; rakeBackStart = transform.position; charC.Move(rakeMove); @@ -258,7 +267,7 @@ dist += UnityEngine.Random.Range(-0.1f, 0.1f); Vector3 pull = rakeDir * dist; - if (rand < 0.5f) + if (rand < 0.65f) { // pull the leaf back, and then destroy @@ -287,7 +296,7 @@ //GameObject.Destroy(leaf.gameObject); }; } - else if (rand < 0.7f) + else if (rand < 0.83f) { pull.Normalize(); pull = Quaternion.Euler(UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f)) * pull; @@ -301,7 +310,7 @@ } } - public GameObject PilePrefab; + public Pile PilePrefab; public float PileSearchRadius = 0.7f; @@ -319,7 +328,55 @@ } } + int numLeaves = potentialPile.Count; + bool madePile = false; + for (int i = LeafsForPile.Length - 1; i >= 0; i--) + { + if (numLeaves >= LeafsForPile[i]) + { + if (UnityEngine.Random.Range(0, 1.0f) < 0.15f) + { + i--; + if (i < 0) break; + numLeaves = LeafsForPile[i] - 1; + } + + float pileScale = (float)i / (LeafsForPile.Length - 1) + 0.4f; + + Pile pile = Instantiate(PilePrefab); + + pile.NumLeaves = numLeaves; + + pile.InitialPop = pileScale; + + pile.transform.position = transform.position + rakeDir * RakeReachDist + new Vector3(UnityEngine.Random.Range(-0.1f, 0.1f), 0, UnityEngine.Random.Range(-0.1f, 0.1f)); + + madePile = true; + + break; + } + } + + if (madePile) + { + foreach (LeafPhysics leaf in potentialPile) + { + if (UnityEngine.Random.Range(0, 1f) < 0.8f) + { + leaf.FadeOut(0.3f); + } + } + } + else + { + foreach (LeafPhysics leaf in potentialPile) + { + leaf.Body.AddForce(new Vector3(UnityEngine.Random.Range(-2, 2), 0, UnityEngine.Random.Range(-2, 2)), ForceMode.Impulse); + } + } + + FinishedRake(); } private void FinishedRake() diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png index efd5bf2..ad12012 100644 --- a/FallUnity/Assets/Player/PlayerRake.png +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index e5dd76c..ff0101f 100755 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -60,6 +60,8 @@ public int[] LeafsForPile; + private AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + // Update is called once per frame void Update () { @@ -78,7 +80,7 @@ dir.Normalize(); playerDir.x = dir.x; - playerDir.y = dir.y; + playerDir.z = dir.z; float speed = Speed; if (runCycle < RunFrameTime) @@ -102,7 +104,7 @@ { runCycle -= RunCycleTime; } - int frame = runCycle < RunFrameTime ? 1 : 0; + int frame = ((int)Mathf.Floor(runCycle / RunCycleTime * 4.0f) + 1) % 4; //< RunFrameTime ? 1 : 0; anim.SetFrame(frame); } else @@ -164,6 +166,7 @@ if (rakeTime >= 0 && localRakeDir.magnitude > 0.7f && rakeTime < TimeToPushRake) { + playerDir = -localRakeDir; rakeDir = localRakeDir; state = State.Raking; @@ -171,7 +174,7 @@ if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -190,11 +193,11 @@ rakeDir = playerDir; state = State.MakingPile; - float angle = Mathf.Atan2(-rakeDir.z, -rakeDir.x); + float angle = Mathf.Atan2(rakeDir.z, rakeDir.x); if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -205,7 +208,11 @@ anim.SetState("Rake", rakeAnimDir, 0); - rakeTimer.Start(0.35f, MakePile); + rakeTimer.Start(0.175f, () => + { + anim.SetState("Rake", rakeAnimDir, 1); + rakeTimer.Start(0.175f, MakePile); + }); } } @@ -228,6 +235,8 @@ private void Rake() { + anim.SetState("Rake", rakeAnimDir, 1); + Vector3 rakeMove = rakeDir * RakeBackDist; rakeBackStart = transform.position; charC.Move(rakeMove); @@ -258,7 +267,7 @@ dist += UnityEngine.Random.Range(-0.1f, 0.1f); Vector3 pull = rakeDir * dist; - if (rand < 0.5f) + if (rand < 0.65f) { // pull the leaf back, and then destroy @@ -287,7 +296,7 @@ //GameObject.Destroy(leaf.gameObject); }; } - else if (rand < 0.7f) + else if (rand < 0.83f) { pull.Normalize(); pull = Quaternion.Euler(UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f)) * pull; @@ -301,7 +310,7 @@ } } - public GameObject PilePrefab; + public Pile PilePrefab; public float PileSearchRadius = 0.7f; @@ -319,7 +328,55 @@ } } + int numLeaves = potentialPile.Count; + bool madePile = false; + for (int i = LeafsForPile.Length - 1; i >= 0; i--) + { + if (numLeaves >= LeafsForPile[i]) + { + if (UnityEngine.Random.Range(0, 1.0f) < 0.15f) + { + i--; + if (i < 0) break; + numLeaves = LeafsForPile[i] - 1; + } + + float pileScale = (float)i / (LeafsForPile.Length - 1) + 0.4f; + + Pile pile = Instantiate(PilePrefab); + + pile.NumLeaves = numLeaves; + + pile.InitialPop = pileScale; + + pile.transform.position = transform.position + rakeDir * RakeReachDist + new Vector3(UnityEngine.Random.Range(-0.1f, 0.1f), 0, UnityEngine.Random.Range(-0.1f, 0.1f)); + + madePile = true; + + break; + } + } + + if (madePile) + { + foreach (LeafPhysics leaf in potentialPile) + { + if (UnityEngine.Random.Range(0, 1f) < 0.8f) + { + leaf.FadeOut(0.3f); + } + } + } + else + { + foreach (LeafPhysics leaf in potentialPile) + { + leaf.Body.AddForce(new Vector3(UnityEngine.Random.Range(-2, 2), 0, UnityEngine.Random.Range(-2, 2)), ForceMode.Impulse); + } + } + + FinishedRake(); } private void FinishedRake() diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png index efd5bf2..ad12012 100644 --- a/FallUnity/Assets/Player/PlayerRake.png +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 9c07b17..cb59bdb 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index e5dd76c..ff0101f 100755 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -60,6 +60,8 @@ public int[] LeafsForPile; + private AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + // Update is called once per frame void Update () { @@ -78,7 +80,7 @@ dir.Normalize(); playerDir.x = dir.x; - playerDir.y = dir.y; + playerDir.z = dir.z; float speed = Speed; if (runCycle < RunFrameTime) @@ -102,7 +104,7 @@ { runCycle -= RunCycleTime; } - int frame = runCycle < RunFrameTime ? 1 : 0; + int frame = ((int)Mathf.Floor(runCycle / RunCycleTime * 4.0f) + 1) % 4; //< RunFrameTime ? 1 : 0; anim.SetFrame(frame); } else @@ -164,6 +166,7 @@ if (rakeTime >= 0 && localRakeDir.magnitude > 0.7f && rakeTime < TimeToPushRake) { + playerDir = -localRakeDir; rakeDir = localRakeDir; state = State.Raking; @@ -171,7 +174,7 @@ if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -190,11 +193,11 @@ rakeDir = playerDir; state = State.MakingPile; - float angle = Mathf.Atan2(-rakeDir.z, -rakeDir.x); + float angle = Mathf.Atan2(rakeDir.z, rakeDir.x); if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -205,7 +208,11 @@ anim.SetState("Rake", rakeAnimDir, 0); - rakeTimer.Start(0.35f, MakePile); + rakeTimer.Start(0.175f, () => + { + anim.SetState("Rake", rakeAnimDir, 1); + rakeTimer.Start(0.175f, MakePile); + }); } } @@ -228,6 +235,8 @@ private void Rake() { + anim.SetState("Rake", rakeAnimDir, 1); + Vector3 rakeMove = rakeDir * RakeBackDist; rakeBackStart = transform.position; charC.Move(rakeMove); @@ -258,7 +267,7 @@ dist += UnityEngine.Random.Range(-0.1f, 0.1f); Vector3 pull = rakeDir * dist; - if (rand < 0.5f) + if (rand < 0.65f) { // pull the leaf back, and then destroy @@ -287,7 +296,7 @@ //GameObject.Destroy(leaf.gameObject); }; } - else if (rand < 0.7f) + else if (rand < 0.83f) { pull.Normalize(); pull = Quaternion.Euler(UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f)) * pull; @@ -301,7 +310,7 @@ } } - public GameObject PilePrefab; + public Pile PilePrefab; public float PileSearchRadius = 0.7f; @@ -319,7 +328,55 @@ } } + int numLeaves = potentialPile.Count; + bool madePile = false; + for (int i = LeafsForPile.Length - 1; i >= 0; i--) + { + if (numLeaves >= LeafsForPile[i]) + { + if (UnityEngine.Random.Range(0, 1.0f) < 0.15f) + { + i--; + if (i < 0) break; + numLeaves = LeafsForPile[i] - 1; + } + + float pileScale = (float)i / (LeafsForPile.Length - 1) + 0.4f; + + Pile pile = Instantiate(PilePrefab); + + pile.NumLeaves = numLeaves; + + pile.InitialPop = pileScale; + + pile.transform.position = transform.position + rakeDir * RakeReachDist + new Vector3(UnityEngine.Random.Range(-0.1f, 0.1f), 0, UnityEngine.Random.Range(-0.1f, 0.1f)); + + madePile = true; + + break; + } + } + + if (madePile) + { + foreach (LeafPhysics leaf in potentialPile) + { + if (UnityEngine.Random.Range(0, 1f) < 0.8f) + { + leaf.FadeOut(0.3f); + } + } + } + else + { + foreach (LeafPhysics leaf in potentialPile) + { + leaf.Body.AddForce(new Vector3(UnityEngine.Random.Range(-2, 2), 0, UnityEngine.Random.Range(-2, 2)), ForceMode.Impulse); + } + } + + FinishedRake(); } private void FinishedRake() diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png index efd5bf2..ad12012 100644 --- a/FallUnity/Assets/Player/PlayerRake.png +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 9c07b17..cb59bdb 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 377f42e..b4b5554 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -514,6 +514,106 @@ m_Father: {fileID: 257733089} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &113141829 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 113141830} + m_Layer: 0 + m_Name: BBQ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &113141830 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 113141829} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.77, y: 1.06, z: 6.09} + m_LocalScale: {x: 0.9999978, y: 0.9999975, z: 1.0531754} + m_Children: + - {fileID: 128138219} + m_Father: {fileID: 1529148493} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &128138218 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 128138219} + - component: {fileID: 128138221} + - component: {fileID: 128138220} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &128138219 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.51, y: 2.8, z: 0} + m_LocalScale: {x: 1.0504848, y: 1.144383, z: 0.58686304} + m_Children: [] + m_Father: {fileID: 113141830} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &128138220 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + 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: 7c2c63f9fc1719e40b6070a89dfa23be, 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 &128138221 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &145158626 GameObject: m_ObjectHideFlags: 0 @@ -647,8 +747,8 @@ m_Script: {fileID: 11500000, guid: 1edfc6f3905730c449618c44081c09e1, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 5 - Num: 400 + Radius: 7.1 + Num: 320 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} @@ -707,9 +807,40 @@ - {fileID: 354365766} - {fileID: 971715428} - {fileID: 2013353733} + - {fileID: 258811609} + - {fileID: 1091233790} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!1 &258811608 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 258811609} + m_Layer: 0 + m_Name: BBQ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &258811609 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 258811608} + 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: + - {fileID: 948575890} + m_Father: {fileID: 257733089} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &277372078 GameObject: m_ObjectHideFlags: 0 @@ -1258,6 +1389,35 @@ m_Father: {fileID: 1529148493} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &529940768 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 529940769} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &529940769 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 529940768} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.41, y: 2.91, z: 6.09} + m_LocalScale: {x: 0.9999978, y: 0.9999975, z: 1.0531754} + m_Children: + - {fileID: 901578421} + m_Father: {fileID: 1529148493} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &594869233 GameObject: m_ObjectHideFlags: 0 @@ -1843,6 +2003,77 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 864402134} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &901578420 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 901578421} + - component: {fileID: 901578423} + - component: {fileID: 901578422} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &901578421 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 2.4813209, y: 2.0952232, z: 0.30211523} + m_Children: [] + m_Father: {fileID: 529940769} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &901578422 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + 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: 9f7c0f3b0d9a42f4784ea0f52ce13555, 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 &901578423 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &935798408 Prefab: m_ObjectHideFlags: 0 @@ -1915,6 +2146,116 @@ m_PrefabParentObject: {fileID: 1585444000422512, guid: 63f33181f13463347b259afc54dd1bbe, type: 2} m_PrefabInternal: {fileID: 935798408} +--- !u!1 &948575889 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 948575890} + - component: {fileID: 948575894} + - component: {fileID: 948575893} + - component: {fileID: 948575892} + - component: {fileID: 948575891} + m_Layer: 11 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &948575890 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.36, y: -0.63, z: 3.26} + m_LocalScale: {x: 0.7151478, y: 0.94926333, z: 1.1642822} + m_Children: [] + m_Father: {fileID: 258811609} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &948575891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b34189096d561ef48859c46a7d8eac3b, type: 3} + m_Name: + m_EditorClassIdentifier: + CameraSpace: {x: 0, y: 0, z: 0} + SetDepth: 0 + LinkedImage: {fileID: 113141829} + lastPos: {x: 0, y: 0, z: 0} + IsoRadius: 0 + IsoPerspective: 0 + AllowMovedFlag: 0 + ObjectManualDepth: 6 + CustomCapsuleHeight: 1.4 + CustomSphereRadius: 1 + CustomSphereHeight: 1 + Thickness: 0 + Custom: 0 + IsoType: 1 +--- !u!23 &948575892 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + 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: d76887554d5b2e441b3ecb5e4e52b392, 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!65 &948575893 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + 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} +--- !u!33 &948575894 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &971715427 Prefab: m_ObjectHideFlags: 0 @@ -2396,6 +2737,35 @@ Thickness: 0 Custom: 0 IsoType: 1 +--- !u!1 &1091233789 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1091233790} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1091233790 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1091233789} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.34, y: 0, z: -7.87} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1708555911} + m_Father: {fileID: 257733089} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1146308193 GameObject: m_ObjectHideFlags: 0 @@ -2509,8 +2879,8 @@ m_Script: {fileID: 11500000, guid: 540cb6c0be5490d4687e3eb9c06ab209, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 11.19 - Rate: 7.33 + Radius: 12.8 + Rate: 12.4 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} @@ -3051,6 +3421,8 @@ - {fileID: 1649869453} - {fileID: 1864863093} - {fileID: 935798409} + - {fileID: 113141830} + - {fileID: 529940769} m_Father: {fileID: 1832090302} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3543,6 +3915,116 @@ m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &1708555910 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1708555911} + - component: {fileID: 1708555915} + - component: {fileID: 1708555914} + - component: {fileID: 1708555913} + - component: {fileID: 1708555912} + m_Layer: 11 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1708555911 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.51, y: -0.25, z: 3.61} + m_LocalScale: {x: 2.7706826, y: 1.6628792, z: 1.8082469} + m_Children: [] + m_Father: {fileID: 1091233790} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1708555912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b34189096d561ef48859c46a7d8eac3b, type: 3} + m_Name: + m_EditorClassIdentifier: + CameraSpace: {x: 0, y: 0, z: 0} + SetDepth: 0 + LinkedImage: {fileID: 529940768} + lastPos: {x: 0, y: 0, z: 0} + IsoRadius: 0 + IsoPerspective: 0 + AllowMovedFlag: 0 + ObjectManualDepth: 4 + CustomCapsuleHeight: 1.4 + CustomSphereRadius: 1 + CustomSphereHeight: 1 + Thickness: 0 + Custom: 0 + IsoType: 1 +--- !u!23 &1708555913 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + 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: d76887554d5b2e441b3ecb5e4e52b392, 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!65 &1708555914 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + 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} +--- !u!33 &1708555915 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1772932288 GameObject: m_ObjectHideFlags: 0 @@ -3732,6 +4214,47 @@ propertyPath: LeafsForPile.Array.data[2] value: 40 objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Frames + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Offset.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Offset.y + value: 261 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[1].Offset.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[1].Offset.y + value: 261 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: PilePrefab + value: + objectReference: {fileID: 114713898265350852, guid: d6cf61ddfecafa14991e99ec6f1e33f0, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 @@ -3971,8 +4494,8 @@ m_Script: {fileID: 11500000, guid: 1edfc6f3905730c449618c44081c09e1, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 10 - Num: 100 + Radius: 14.92 + Num: 160 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} diff --git a/Build/fall_Data/Managed/Assembly-CSharp.dll b/Build/fall_Data/Managed/Assembly-CSharp.dll index 7e14020..60ad0db 100644 --- a/Build/fall_Data/Managed/Assembly-CSharp.dll +++ b/Build/fall_Data/Managed/Assembly-CSharp.dll Binary files differ diff --git a/Build/fall_Data/globalgamemanagers b/Build/fall_Data/globalgamemanagers index e79341a..edcefa4 100644 --- a/Build/fall_Data/globalgamemanagers +++ b/Build/fall_Data/globalgamemanagers Binary files differ diff --git a/Build/fall_Data/globalgamemanagers.assets b/Build/fall_Data/globalgamemanagers.assets index 8cb05c1..b33ab3e 100644 --- a/Build/fall_Data/globalgamemanagers.assets +++ b/Build/fall_Data/globalgamemanagers.assets Binary files differ diff --git a/Build/fall_Data/level0 b/Build/fall_Data/level0 index 4a45106..dcbeebd 100644 --- a/Build/fall_Data/level0 +++ b/Build/fall_Data/level0 Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets b/Build/fall_Data/sharedassets0.assets index 3e933fc..b29d611 100644 --- a/Build/fall_Data/sharedassets0.assets +++ b/Build/fall_Data/sharedassets0.assets Binary files differ diff --git a/Build/fall_Data/sharedassets0.assets.resS b/Build/fall_Data/sharedassets0.assets.resS index 091e899..4a62af8 100644 --- a/Build/fall_Data/sharedassets0.assets.resS +++ b/Build/fall_Data/sharedassets0.assets.resS Binary files differ diff --git a/FallUnity/Assets/Animations/AnimationHandler.cs b/FallUnity/Assets/Animations/AnimationHandler.cs index 30537f3..9414e30 100644 --- a/FallUnity/Assets/Animations/AnimationHandler.cs +++ b/FallUnity/Assets/Animations/AnimationHandler.cs @@ -55,7 +55,7 @@ private void UpdateMat() { - spriteSize = new Vector3(animationInfo.Sheet.width * 0.25f, animationInfo.Sheet.height / animationInfo.Frames, 1); + spriteSize = new Vector3(animationInfo.Sheet.width / animationInfo.Frames, animationInfo.Sheet.height * 0.25f, 1); mat.SetTexture("_MainTex", animationInfo.Sheet); } @@ -85,13 +85,21 @@ verts[3] = (Vector3.Scale(new Vector3(0, 1, 0), spriteSize) - offset) * PixelScale; mesh.SetVertices(verts); - float uStart = ((int)Dir * spriteSize.x) / animationInfo.Sheet.width; + //float uStart = / animationInfo.Sheet.width; + //float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; + // + //float vStart = / animationInfo.Sheet.height; + //float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; + + //float uStart = ((animationInfo.Frames - Frame - 1) * spriteSize.x) / animationInfo.Sheet.width; + float uStart = (Frame * spriteSize.x) / animationInfo.Sheet.width; float uEnd = uStart + spriteSize.x / animationInfo.Sheet.width; - float vStart = ((animationInfo.Frames - Frame - 1) * spriteSize.y) / animationInfo.Sheet.height; + //float vStart = ((int)Dir * spriteSize.y) / animationInfo.Sheet.height; + float vStart = ((3 - (int)Dir) * spriteSize.y) / animationInfo.Sheet.height; float vEnd = vStart + spriteSize.y / animationInfo.Sheet.height; - + uvs[0] = new Vector3(uEnd, vEnd); uvs[1] = new Vector3(uEnd, vStart); diff --git a/FallUnity/Assets/Doodad.meta b/FallUnity/Assets/Doodad.meta new file mode 100644 index 0000000..67f64f6 --- /dev/null +++ b/FallUnity/Assets/Doodad.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 347c104b7628f344ca5ad8a086b6ac5c +folderAsset: yes +timeCreated: 1572227665 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png b/FallUnity/Assets/Doodad/Doodad_Barbecue.png new file mode 100644 index 0000000..a8f296a --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta new file mode 100644 index 0000000..13e7240 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Barbecue.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 7a1b587589d107a49b7aeda3c64938b5 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png b/FallUnity/Assets/Doodad/Doodad_Car.png new file mode 100644 index 0000000..43fbb97 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png Binary files differ diff --git a/FallUnity/Assets/Doodad/Doodad_Car.png.meta b/FallUnity/Assets/Doodad/Doodad_Car.png.meta new file mode 100644 index 0000000..e7c6c29 --- /dev/null +++ b/FallUnity/Assets/Doodad/Doodad_Car.png.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: f1981dabca36b26459ea1f46bf2c5d23 +timeCreated: 1572227665 +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: 0 + 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 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials.meta b/FallUnity/Assets/Doodad/Materials.meta new file mode 100644 index 0000000..5109b62 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 38527a29374967440a6562358c4f9e6b +folderAsset: yes +timeCreated: 1572227696 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat new file mode 100644 index 0000000..7af9f92 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat @@ -0,0 +1,35 @@ +%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: Doodad_Barbecue + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7a1b587589d107a49b7aeda3c64938b5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta new file mode 100644 index 0000000..c411168 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Barbecue.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7c2c63f9fc1719e40b6070a89dfa23be +timeCreated: 1572227697 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat new file mode 100644 index 0000000..54c1946 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat @@ -0,0 +1,35 @@ +%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: Doodad_Car + m_Shader: {fileID: 10753, 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: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f1981dabca36b26459ea1f46bf2c5d23, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta new file mode 100644 index 0000000..ca25891 --- /dev/null +++ b/FallUnity/Assets/Doodad/Materials/Doodad_Car.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9f7c0f3b0d9a42f4784ea0f52ce13555 +timeCreated: 1572227964 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FallUnity/Assets/Leaves/LeafHandler.cs b/FallUnity/Assets/Leaves/LeafHandler.cs index 8ba3c89..b26b5d4 100644 --- a/FallUnity/Assets/Leaves/LeafHandler.cs +++ b/FallUnity/Assets/Leaves/LeafHandler.cs @@ -53,9 +53,9 @@ float windAngle = UnityEngine.Random.Range(0, Mathf.PI * 2); Vector3 windVector = new Vector3(Mathf.Sin(windAngle), 0, Mathf.Cos(windAngle)); windVector.y = UnityEngine.Random.Range(0.8f, 1.2f); - float windStrength = UnityEngine.Random.Range(0.8f, 1.3f); - float fadeTime = UnityEngine.Random.Range(1.0f, 3.0f); - float windTime = UnityEngine.Random.Range(3.0f, 5.0f); + float windStrength = UnityEngine.Random.Range(1.1f, 1.5f); + float fadeTime = UnityEngine.Random.Range(1.0f, 2.0f); + float windTime = UnityEngine.Random.Range(4.0f, 7.0f); Debug.LogError("WIND: V:" + windVector + " S:" + windStrength + " F:" + fadeTime + " T:" + windTime); @@ -164,9 +164,9 @@ Vector3 force3D = new Vector3(force.x, whirlwindForceUp * (whirlwindRadius - distFrom + 2), force.y); - leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.75f, 1.0f), - force3D.y * UnityEngine.Random.Range(0.9f, 1.0f), - force3D.z * UnityEngine.Random.Range(0.75f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); + leaf.Body.AddForce(new Vector3(force3D.x * UnityEngine.Random.Range(0.55f, 1.0f), + force3D.y * UnityEngine.Random.Range(0.6f, 1.0f), + force3D.z * UnityEngine.Random.Range(0.55f, 1.0f)) * Time.deltaTime * 60 * (leaf.Resting ? 3.0f : 0.4f)); } diff --git a/FallUnity/Assets/Leaves/LeafPhysics.cs b/FallUnity/Assets/Leaves/LeafPhysics.cs index d59bfba..e085448 100755 --- a/FallUnity/Assets/Leaves/LeafPhysics.cs +++ b/FallUnity/Assets/Leaves/LeafPhysics.cs @@ -177,23 +177,7 @@ deadLife -= Time.deltaTime * (leafHandler.NumLeaves >= leafHandler.MaxLeaves ? 3 : 1); if (deadLife <= 0 && !isFading) { - isFading = true; - SimpleTween tweenOut = new SimpleTween(); - tweenOut.Init(v => - { - foreach (Material m in mats) - { - Color c = m.color; - c.a = v; - m.color = c; - } - }, SimpleTween.EaseLinear, 1, 0, 2); - GameObject t = this.gameObject; - tweenOut.OnFinish = () => - { - Destroy(t); - }; - Destroy(this); + FadeOut(2); } } @@ -202,4 +186,25 @@ Destroy(gameObject); } } + + public void FadeOut(float time) + { + isFading = true; + SimpleTween tweenOut = new SimpleTween(); + tweenOut.Init(v => + { + foreach (Material m in mats) + { + Color c = m.color; + c.a = v; + m.color = c; + } + }, SimpleTween.EaseLinear, 1, 0, time); + GameObject t = this.gameObject; + tweenOut.OnFinish = () => + { + Destroy(t); + }; + Destroy(this); + } } \ No newline at end of file diff --git a/FallUnity/Assets/Leaves/Pile.cs b/FallUnity/Assets/Leaves/Pile.cs index 47b81a1..be751d5 100644 --- a/FallUnity/Assets/Leaves/Pile.cs +++ b/FallUnity/Assets/Leaves/Pile.cs @@ -1,16 +1,61 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; public class Pile : MonoBehaviour { public int NumLeaves = 0; - // Use this for initialization - void Start () { - + public GameObject Mesh; + public float Height; + + private float currentScale = 0; + + private float? initialPop = null; + internal float InitialPop + { + set + { + if (tween == null) + { + initialPop = value; + } + else + { + Pop(value); + } + } + } + // Use this for initialization + void Start() { + tween = new SimpleTween(); + SetPileScale(0); + + if (initialPop.HasValue) + { + Pop(initialPop.Value); + } + } + + private void SetPileScale(float scale) + { + currentScale = scale; + Vector3 pos = Mesh.transform.position; + pos.y = -Height * (1.0f - scale); + Mesh.transform.position = pos; + + float meshScale = scale * 0.5f + 0.5f; + Mesh.transform.localScale = new Vector3(meshScale, meshScale, meshScale); } // Update is called once per frame void Update () { - } + } + + private SimpleTween tween; + public void Pop(float pileScale) + { + initialPop = null; + tween.Init(SetPileScale, SimpleTween.QuadEaseOut, currentScale, pileScale, (pileScale - currentScale) * 0.8f); + } } diff --git a/FallUnity/Assets/Leaves/Pile.prefab b/FallUnity/Assets/Leaves/Pile.prefab index 7399566..88340d0 100644 --- a/FallUnity/Assets/Leaves/Pile.prefab +++ b/FallUnity/Assets/Leaves/Pile.prefab @@ -36,7 +36,8 @@ serializedVersion: 5 m_Component: - component: {fileID: 4028432306176728} - - component: {fileID: 114442147144980038} + - component: {fileID: 114435946092068608} + - component: {fileID: 114713898265350852} m_Layer: 0 m_Name: Pile m_TagString: Untagged @@ -212,7 +213,7 @@ serializedVersion: 2 m_Size: {x: 1.7360601, y: 0.5797963, z: 1.5846038} m_Center: {x: -0.045802593, y: 0.28532714, z: -0.026267767} ---- !u!114 &114442147144980038 +--- !u!114 &114435946092068608 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} @@ -225,15 +226,28 @@ m_EditorClassIdentifier: CameraSpace: {x: 0, y: 0, z: 0} SetDepth: 0 - LinkedImage: {fileID: 1018466900139470} + LinkedImage: {fileID: 1865097145533800} lastPos: {x: 0, y: 0, z: 0} IsoRadius: 0 IsoPerspective: 0 AllowMovedFlag: 0 ObjectManualDepth: 0 CustomCapsuleHeight: 1.4 - CustomSphereRadius: 0.5 - CustomSphereHeight: 0.2 + CustomSphereRadius: 0.3 + CustomSphereHeight: 0.4 Thickness: 1 Custom: 2 IsoType: 0 +--- !u!114 &114713898265350852 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1430576817403556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aba3a790a516f143a6189a050883fe6, type: 3} + m_Name: + m_EditorClassIdentifier: + NumLeaves: 0 + Mesh: {fileID: 1676669835933754} diff --git a/FallUnity/Assets/Player/PlayerController.cs b/FallUnity/Assets/Player/PlayerController.cs index e5dd76c..ff0101f 100755 --- a/FallUnity/Assets/Player/PlayerController.cs +++ b/FallUnity/Assets/Player/PlayerController.cs @@ -60,6 +60,8 @@ public int[] LeafsForPile; + private AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + // Update is called once per frame void Update () { @@ -78,7 +80,7 @@ dir.Normalize(); playerDir.x = dir.x; - playerDir.y = dir.y; + playerDir.z = dir.z; float speed = Speed; if (runCycle < RunFrameTime) @@ -102,7 +104,7 @@ { runCycle -= RunCycleTime; } - int frame = runCycle < RunFrameTime ? 1 : 0; + int frame = ((int)Mathf.Floor(runCycle / RunCycleTime * 4.0f) + 1) % 4; //< RunFrameTime ? 1 : 0; anim.SetFrame(frame); } else @@ -164,6 +166,7 @@ if (rakeTime >= 0 && localRakeDir.magnitude > 0.7f && rakeTime < TimeToPushRake) { + playerDir = -localRakeDir; rakeDir = localRakeDir; state = State.Raking; @@ -171,7 +174,7 @@ if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -190,11 +193,11 @@ rakeDir = playerDir; state = State.MakingPile; - float angle = Mathf.Atan2(-rakeDir.z, -rakeDir.x); + float angle = Mathf.Atan2(rakeDir.z, rakeDir.x); if (angle < 0) angle += Mathf.PI * 2; - AnimationHandler.Direction rakeAnimDir = AnimationHandler.Direction.UpRight; + rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpRight; if (angle < Mathf.PI && angle >= Mathf.PI / 2.0f) rakeAnimDir = AnimationHandler.Direction.UpLeft; @@ -205,7 +208,11 @@ anim.SetState("Rake", rakeAnimDir, 0); - rakeTimer.Start(0.35f, MakePile); + rakeTimer.Start(0.175f, () => + { + anim.SetState("Rake", rakeAnimDir, 1); + rakeTimer.Start(0.175f, MakePile); + }); } } @@ -228,6 +235,8 @@ private void Rake() { + anim.SetState("Rake", rakeAnimDir, 1); + Vector3 rakeMove = rakeDir * RakeBackDist; rakeBackStart = transform.position; charC.Move(rakeMove); @@ -258,7 +267,7 @@ dist += UnityEngine.Random.Range(-0.1f, 0.1f); Vector3 pull = rakeDir * dist; - if (rand < 0.5f) + if (rand < 0.65f) { // pull the leaf back, and then destroy @@ -287,7 +296,7 @@ //GameObject.Destroy(leaf.gameObject); }; } - else if (rand < 0.7f) + else if (rand < 0.83f) { pull.Normalize(); pull = Quaternion.Euler(UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f), UnityEngine.Random.Range(-30.0f, 30.0f)) * pull; @@ -301,7 +310,7 @@ } } - public GameObject PilePrefab; + public Pile PilePrefab; public float PileSearchRadius = 0.7f; @@ -319,7 +328,55 @@ } } + int numLeaves = potentialPile.Count; + bool madePile = false; + for (int i = LeafsForPile.Length - 1; i >= 0; i--) + { + if (numLeaves >= LeafsForPile[i]) + { + if (UnityEngine.Random.Range(0, 1.0f) < 0.15f) + { + i--; + if (i < 0) break; + numLeaves = LeafsForPile[i] - 1; + } + + float pileScale = (float)i / (LeafsForPile.Length - 1) + 0.4f; + + Pile pile = Instantiate(PilePrefab); + + pile.NumLeaves = numLeaves; + + pile.InitialPop = pileScale; + + pile.transform.position = transform.position + rakeDir * RakeReachDist + new Vector3(UnityEngine.Random.Range(-0.1f, 0.1f), 0, UnityEngine.Random.Range(-0.1f, 0.1f)); + + madePile = true; + + break; + } + } + + if (madePile) + { + foreach (LeafPhysics leaf in potentialPile) + { + if (UnityEngine.Random.Range(0, 1f) < 0.8f) + { + leaf.FadeOut(0.3f); + } + } + } + else + { + foreach (LeafPhysics leaf in potentialPile) + { + leaf.Body.AddForce(new Vector3(UnityEngine.Random.Range(-2, 2), 0, UnityEngine.Random.Range(-2, 2)), ForceMode.Impulse); + } + } + + FinishedRake(); } private void FinishedRake() diff --git a/FallUnity/Assets/Player/PlayerRake.png b/FallUnity/Assets/Player/PlayerRake.png index efd5bf2..ad12012 100644 --- a/FallUnity/Assets/Player/PlayerRake.png +++ b/FallUnity/Assets/Player/PlayerRake.png Binary files differ diff --git a/FallUnity/Assets/Player/PlayerStand.png b/FallUnity/Assets/Player/PlayerStand.png index 9c07b17..cb59bdb 100644 --- a/FallUnity/Assets/Player/PlayerStand.png +++ b/FallUnity/Assets/Player/PlayerStand.png Binary files differ diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity index 377f42e..b4b5554 100755 --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -514,6 +514,106 @@ m_Father: {fileID: 257733089} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &113141829 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 113141830} + m_Layer: 0 + m_Name: BBQ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &113141830 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 113141829} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.77, y: 1.06, z: 6.09} + m_LocalScale: {x: 0.9999978, y: 0.9999975, z: 1.0531754} + m_Children: + - {fileID: 128138219} + m_Father: {fileID: 1529148493} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &128138218 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 128138219} + - component: {fileID: 128138221} + - component: {fileID: 128138220} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &128138219 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.51, y: 2.8, z: 0} + m_LocalScale: {x: 1.0504848, y: 1.144383, z: 0.58686304} + m_Children: [] + m_Father: {fileID: 113141830} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &128138220 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + 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: 7c2c63f9fc1719e40b6070a89dfa23be, 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 &128138221 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 128138218} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &145158626 GameObject: m_ObjectHideFlags: 0 @@ -647,8 +747,8 @@ m_Script: {fileID: 11500000, guid: 1edfc6f3905730c449618c44081c09e1, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 5 - Num: 400 + Radius: 7.1 + Num: 320 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} @@ -707,9 +807,40 @@ - {fileID: 354365766} - {fileID: 971715428} - {fileID: 2013353733} + - {fileID: 258811609} + - {fileID: 1091233790} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!1 &258811608 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 258811609} + m_Layer: 0 + m_Name: BBQ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &258811609 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 258811608} + 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: + - {fileID: 948575890} + m_Father: {fileID: 257733089} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &277372078 GameObject: m_ObjectHideFlags: 0 @@ -1258,6 +1389,35 @@ m_Father: {fileID: 1529148493} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &529940768 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 529940769} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &529940769 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 529940768} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.41, y: 2.91, z: 6.09} + m_LocalScale: {x: 0.9999978, y: 0.9999975, z: 1.0531754} + m_Children: + - {fileID: 901578421} + m_Father: {fileID: 1529148493} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &594869233 GameObject: m_ObjectHideFlags: 0 @@ -1843,6 +2003,77 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 864402134} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &901578420 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 901578421} + - component: {fileID: 901578423} + - component: {fileID: 901578422} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &901578421 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 2.4813209, y: 2.0952232, z: 0.30211523} + m_Children: [] + m_Father: {fileID: 529940769} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &901578422 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + 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: 9f7c0f3b0d9a42f4784ea0f52ce13555, 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 &901578423 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 901578420} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &935798408 Prefab: m_ObjectHideFlags: 0 @@ -1915,6 +2146,116 @@ m_PrefabParentObject: {fileID: 1585444000422512, guid: 63f33181f13463347b259afc54dd1bbe, type: 2} m_PrefabInternal: {fileID: 935798408} +--- !u!1 &948575889 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 948575890} + - component: {fileID: 948575894} + - component: {fileID: 948575893} + - component: {fileID: 948575892} + - component: {fileID: 948575891} + m_Layer: 11 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &948575890 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.36, y: -0.63, z: 3.26} + m_LocalScale: {x: 0.7151478, y: 0.94926333, z: 1.1642822} + m_Children: [] + m_Father: {fileID: 258811609} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &948575891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b34189096d561ef48859c46a7d8eac3b, type: 3} + m_Name: + m_EditorClassIdentifier: + CameraSpace: {x: 0, y: 0, z: 0} + SetDepth: 0 + LinkedImage: {fileID: 113141829} + lastPos: {x: 0, y: 0, z: 0} + IsoRadius: 0 + IsoPerspective: 0 + AllowMovedFlag: 0 + ObjectManualDepth: 6 + CustomCapsuleHeight: 1.4 + CustomSphereRadius: 1 + CustomSphereHeight: 1 + Thickness: 0 + Custom: 0 + IsoType: 1 +--- !u!23 &948575892 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + 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: d76887554d5b2e441b3ecb5e4e52b392, 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!65 &948575893 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + 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} +--- !u!33 &948575894 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 948575889} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &971715427 Prefab: m_ObjectHideFlags: 0 @@ -2396,6 +2737,35 @@ Thickness: 0 Custom: 0 IsoType: 1 +--- !u!1 &1091233789 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1091233790} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1091233790 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1091233789} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.34, y: 0, z: -7.87} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1708555911} + m_Father: {fileID: 257733089} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1146308193 GameObject: m_ObjectHideFlags: 0 @@ -2509,8 +2879,8 @@ m_Script: {fileID: 11500000, guid: 540cb6c0be5490d4687e3eb9c06ab209, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 11.19 - Rate: 7.33 + Radius: 12.8 + Rate: 12.4 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} @@ -3051,6 +3421,8 @@ - {fileID: 1649869453} - {fileID: 1864863093} - {fileID: 935798409} + - {fileID: 113141830} + - {fileID: 529940769} m_Father: {fileID: 1832090302} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3543,6 +3915,116 @@ m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &1708555910 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1708555911} + - component: {fileID: 1708555915} + - component: {fileID: 1708555914} + - component: {fileID: 1708555913} + - component: {fileID: 1708555912} + m_Layer: 11 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1708555911 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.51, y: -0.25, z: 3.61} + m_LocalScale: {x: 2.7706826, y: 1.6628792, z: 1.8082469} + m_Children: [] + m_Father: {fileID: 1091233790} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1708555912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b34189096d561ef48859c46a7d8eac3b, type: 3} + m_Name: + m_EditorClassIdentifier: + CameraSpace: {x: 0, y: 0, z: 0} + SetDepth: 0 + LinkedImage: {fileID: 529940768} + lastPos: {x: 0, y: 0, z: 0} + IsoRadius: 0 + IsoPerspective: 0 + AllowMovedFlag: 0 + ObjectManualDepth: 4 + CustomCapsuleHeight: 1.4 + CustomSphereRadius: 1 + CustomSphereHeight: 1 + Thickness: 0 + Custom: 0 + IsoType: 1 +--- !u!23 &1708555913 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + 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: d76887554d5b2e441b3ecb5e4e52b392, 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!65 &1708555914 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + 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} +--- !u!33 &1708555915 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708555910} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1772932288 GameObject: m_ObjectHideFlags: 0 @@ -3732,6 +4214,47 @@ propertyPath: LeafsForPile.Array.data[2] value: 40 objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Frames + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Offset.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[0].Offset.y + value: 261 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[1].Offset.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 114432391297954942, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: Animations.Array.data[1].Offset.y + value: 261 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunCycleTime + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: RunFrameTime + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114770286734950254, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, + type: 2} + propertyPath: PilePrefab + value: + objectReference: {fileID: 114713898265350852, guid: d6cf61ddfecafa14991e99ec6f1e33f0, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 9f3dd22cf8fe21a43a067ab4b4ab708f, type: 2} m_IsPrefabParent: 0 @@ -3971,8 +4494,8 @@ m_Script: {fileID: 11500000, guid: 1edfc6f3905730c449618c44081c09e1, type: 3} m_Name: m_EditorClassIdentifier: - Radius: 10 - Num: 100 + Radius: 14.92 + Num: 160 Leafs: - {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} - {fileID: 114512182666289016, guid: 9f2c90804e5745a4da348dc7b5713e22, type: 2} diff --git a/Flash/RECOVER_Player.fla b/Flash/RECOVER_Player.fla deleted file mode 100644 index d2f0385..0000000 --- a/Flash/RECOVER_Player.fla +++ /dev/null Binary files differ