diff --git a/Assets/Resources/Games/lumbearjack.prefab b/Assets/Resources/Games/lumbearjack.prefab index eb90aa2b6..cbbfb3671 100644 --- a/Assets/Resources/Games/lumbearjack.prefab +++ b/Assets/Resources/Games/lumbearjack.prefab @@ -30404,7 +30404,7 @@ MonoBehaviour: _hugeLogCutParticle: {fileID: 9061173392440300293} _catAnimationOffsetStart: -0.5 _catAnimationOffsetEnd: 0.5 - _catMoveLength: 0.5 + _catMoveLength: 1 --- !u!1 &3527631078867808426 GameObject: m_ObjectHideFlags: 0 @@ -61850,7 +61850,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: b9ca8fb7eac93474d9d3f948ab929711, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -62191,7 +62191,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: ac0216601d1b58341b48624e21797def, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -62536,7 +62536,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: ac0216601d1b58341b48624e21797def, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -62695,7 +62695,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: b9ca8fb7eac93474d9d3f948ab929711, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -62854,7 +62854,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: 787e88dbe04c1494b82e541717b98862, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63013,7 +63013,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: 787e88dbe04c1494b82e541717b98862, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63172,7 +63172,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: b9ca8fb7eac93474d9d3f948ab929711, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63331,7 +63331,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: ac0216601d1b58341b48624e21797def, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63490,7 +63490,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: ac0216601d1b58341b48624e21797def, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63649,7 +63649,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: b9ca8fb7eac93474d9d3f948ab929711, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63808,7 +63808,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: 787e88dbe04c1494b82e541717b98862, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 @@ -63967,7 +63967,7 @@ PrefabInstance: - target: {fileID: 975253968622856459, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 80a3377bf2a9b4f4289c3d4015492887, type: 2} + objectReference: {fileID: 2100000, guid: ac0216601d1b58341b48624e21797def, type: 2} - target: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat new file mode 100644 index 000000000..bb1688ee3 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CatPantsBlue + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.47843137, g: 0.8392157, b: 0.8627451, a: 1} + - _ColorBravo: {r: 0.28235295, g: 0.58431375, b: 0.6039216, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat.meta b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat.meta new file mode 100644 index 000000000..486f6d5ff --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsBlue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 787e88dbe04c1494b82e541717b98862 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat new file mode 100644 index 000000000..66376b6c6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CatPantsGreen + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.20784314, g: 0.6627451, b: 0.39607844, a: 1} + - _ColorBravo: {r: 0.16078432, g: 0.49411765, b: 0.29803923, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat.meta b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat.meta new file mode 100644 index 000000000..2e33d257f --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsGreen.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9ca8fb7eac93474d9d3f948ab929711 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat new file mode 100644 index 000000000..5d81ff52c --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CatPantsPink + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.84313726, g: 0.35686275, b: 0.7137255, a: 1} + - _ColorBravo: {r: 0.65882355, g: 0.19607843, b: 0.59607846, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat.meta b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat.meta new file mode 100644 index 000000000..48645587d --- /dev/null +++ b/Assets/Resources/Sprites/Games/Lumbearjack/CatPantsPink.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac0216601d1b58341b48624e21797def +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs b/Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs index 60fcbbf71..54a1be8c5 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs @@ -29,7 +29,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack } else { - _otherPosition = _thisPosition += new Vector3(_slideOffset, 0); + _otherPosition = _thisPosition + new Vector3(_slideOffset / 2, 0); } if (_startAtOther) transform.position = _otherPosition; }