mirror of
https://github.com/ConjureETS/PillowFight.git
synced 2026-03-24 00:50:59 +00:00
Merge branch 'master' of https://github.com/ConjureETS/PillowFight
Conflicts: Assets/Scripts/Child.cs Signed-off-by: RosimInc <rosim_inc@hotmail.com>
This commit is contained in:
commit
1088a8f589
138
Assets/Art/Materials/T_Kid-pyjama.mat
Normal file
138
Assets/Art/Materials/T_Kid-pyjama.mat
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
%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: T_Kid-pyjama
|
||||||
|
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 5
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_TexEnvs:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MainTex
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 2800000, guid: b5d49db93cceafd458c3b0b7f61d0d1b, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ParallaxMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailMask
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailAlbedoMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MetallicGlossMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _SrcBlend
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DstBlend
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Cutoff
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Parallax
|
||||||
|
second: .0199999996
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ZWrite
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Glossiness
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionStrength
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMapScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _UVSec
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Mode
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Metallic
|
||||||
|
second: 0
|
||||||
|
m_Colors:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionColor
|
||||||
|
second: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Color
|
||||||
|
second: {r: .588, g: .588, b: .588, a: 1}
|
||||||
8
Assets/Art/Materials/T_Kid-pyjama.mat.meta
Normal file
8
Assets/Art/Materials/T_Kid-pyjama.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5754ad352d5ea6849bc7c4cf32f45b1c
|
||||||
|
timeCreated: 1440336028
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
138
Assets/Art/Materials/T_Kid-pyjama_Face.mat
Normal file
138
Assets/Art/Materials/T_Kid-pyjama_Face.mat
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
%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: T_Kid-pyjama_Face
|
||||||
|
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 5
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_TexEnvs:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MainTex
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 7f3a2b4b876ebef4c9233eedb006f1e3, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ParallaxMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailMask
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailAlbedoMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MetallicGlossMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _SrcBlend
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DstBlend
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Cutoff
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Parallax
|
||||||
|
second: .0199999996
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ZWrite
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Glossiness
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionStrength
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMapScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _UVSec
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Mode
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Metallic
|
||||||
|
second: 0
|
||||||
|
m_Colors:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionColor
|
||||||
|
second: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Color
|
||||||
|
second: {r: .588, g: .588, b: .588, a: 1}
|
||||||
8
Assets/Art/Materials/T_Kid-pyjama_Face.mat.meta
Normal file
8
Assets/Art/Materials/T_Kid-pyjama_Face.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 69f2bc4f89f0a4444a494ed14b8baed9
|
||||||
|
timeCreated: 1440336028
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
138
Assets/Art/Materials/T_Pillow.mat
Normal file
138
Assets/Art/Materials/T_Pillow.mat
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
%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: T_Pillow
|
||||||
|
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 5
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_TexEnvs:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MainTex
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 2800000, guid: 48ae88018d91f93498ab72c5e26bf101, type: 3}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ParallaxMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailMask
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailAlbedoMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _MetallicGlossMap
|
||||||
|
second:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _SrcBlend
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DstBlend
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Cutoff
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Parallax
|
||||||
|
second: .0199999996
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _ZWrite
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Glossiness
|
||||||
|
second: .5
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _BumpScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _OcclusionStrength
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _DetailNormalMapScale
|
||||||
|
second: 1
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _UVSec
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Mode
|
||||||
|
second: 0
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Metallic
|
||||||
|
second: 0
|
||||||
|
m_Colors:
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _EmissionColor
|
||||||
|
second: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
data:
|
||||||
|
first:
|
||||||
|
name: _Color
|
||||||
|
second: {r: .588235319, g: .588235319, b: .588235319, a: 1}
|
||||||
8
Assets/Art/Materials/T_Pillow.mat.meta
Normal file
8
Assets/Art/Materials/T_Pillow.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7fd1e23597f61964d87409da70b6149c
|
||||||
|
timeCreated: 1440336028
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/Textures.meta
Normal file
9
Assets/Art/Textures.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6bf04b6d6a00e9748afca92194416541
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440336197
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Textures/T_Kid-pyjama.tga
Normal file
BIN
Assets/Art/Textures/T_Kid-pyjama.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
55
Assets/Art/Textures/T_Kid-pyjama.tga.meta
Normal file
55
Assets/Art/Textures/T_Kid-pyjama.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b5d49db93cceafd458c3b0b7f61d0d1b
|
||||||
|
timeCreated: 1440336204
|
||||||
|
licenseType: Free
|
||||||
|
TextureImporter:
|
||||||
|
fileIDToRecycleName: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
linearTexture: 0
|
||||||
|
correctGamma: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: .25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 0
|
||||||
|
cubemapConvolution: 0
|
||||||
|
cubemapConvolutionSteps: 8
|
||||||
|
cubemapConvolutionExponent: 1.5
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: -1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -1
|
||||||
|
wrapMode: -1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
rGBM: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: .5, y: .5}
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
textureType: -1
|
||||||
|
buildTargetSettings: []
|
||||||
|
spriteSheet:
|
||||||
|
sprites: []
|
||||||
|
spritePackingTag:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Textures/T_Kid-pyjama_Face.tga
Normal file
BIN
Assets/Art/Textures/T_Kid-pyjama_Face.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 MiB |
55
Assets/Art/Textures/T_Kid-pyjama_Face.tga.meta
Normal file
55
Assets/Art/Textures/T_Kid-pyjama_Face.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7f3a2b4b876ebef4c9233eedb006f1e3
|
||||||
|
timeCreated: 1440336203
|
||||||
|
licenseType: Free
|
||||||
|
TextureImporter:
|
||||||
|
fileIDToRecycleName: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
linearTexture: 0
|
||||||
|
correctGamma: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: .25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 0
|
||||||
|
cubemapConvolution: 0
|
||||||
|
cubemapConvolutionSteps: 8
|
||||||
|
cubemapConvolutionExponent: 1.5
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: -1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -1
|
||||||
|
wrapMode: -1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
rGBM: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: .5, y: .5}
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
textureType: -1
|
||||||
|
buildTargetSettings: []
|
||||||
|
spriteSheet:
|
||||||
|
sprites: []
|
||||||
|
spritePackingTag:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Textures/T_Pillow.tga
Normal file
BIN
Assets/Art/Textures/T_Pillow.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
55
Assets/Art/Textures/T_Pillow.tga.meta
Normal file
55
Assets/Art/Textures/T_Pillow.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 48ae88018d91f93498ab72c5e26bf101
|
||||||
|
timeCreated: 1440336203
|
||||||
|
licenseType: Free
|
||||||
|
TextureImporter:
|
||||||
|
fileIDToRecycleName: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
linearTexture: 0
|
||||||
|
correctGamma: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: .25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 0
|
||||||
|
cubemapConvolution: 0
|
||||||
|
cubemapConvolutionSteps: 8
|
||||||
|
cubemapConvolutionExponent: 1.5
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: -1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -1
|
||||||
|
wrapMode: -1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
rGBM: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: .5, y: .5}
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
textureType: -1
|
||||||
|
buildTargetSettings: []
|
||||||
|
spriteSheet:
|
||||||
|
sprites: []
|
||||||
|
spritePackingTag:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/anim_gotosleep.FBX
Normal file
BIN
Assets/Art/anim_gotosleep.FBX
Normal file
Binary file not shown.
143
Assets/Art/anim_gotosleep.FBX.meta
Normal file
143
Assets/Art/anim_gotosleep.FBX.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 243113af3263d63468ca8ac749281697
|
||||||
|
timeCreated: 1440336029
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
100002: Bip001
|
||||||
|
100004: Bip001 Footsteps
|
||||||
|
100006: Bip001 Head
|
||||||
|
100008: Bip001 HeadNub
|
||||||
|
100010: Bip001 L Calf
|
||||||
|
100012: Bip001 L Clavicle
|
||||||
|
100014: Bip001 L Finger0
|
||||||
|
100016: Bip001 L Finger0Nub
|
||||||
|
100018: Bip001 L Foot
|
||||||
|
100020: Bip001 L Forearm
|
||||||
|
100022: Bip001 L Hand
|
||||||
|
100024: Bip001 L Thigh
|
||||||
|
100026: Bip001 L Toe0
|
||||||
|
100028: Bip001 L Toe0Nub
|
||||||
|
100030: Bip001 L UpperArm
|
||||||
|
100032: Bip001 Neck
|
||||||
|
100034: Bip001 Pelvis
|
||||||
|
100036: Bip001 R Calf
|
||||||
|
100038: Bip001 R Clavicle
|
||||||
|
100040: Bip001 R Finger0
|
||||||
|
100042: Bip001 R Finger0Nub
|
||||||
|
100044: Bip001 R Foot
|
||||||
|
100046: Bip001 R Forearm
|
||||||
|
100048: Bip001 R Hand
|
||||||
|
100050: Bip001 R Thigh
|
||||||
|
100052: Bip001 R Toe0
|
||||||
|
100054: Bip001 R Toe0Nub
|
||||||
|
100056: Bip001 R UpperArm
|
||||||
|
100058: Bip001 Spine
|
||||||
|
100060: Bip001 Spine1
|
||||||
|
100062: Bip001 Spine2
|
||||||
|
100064: Kid
|
||||||
|
100066: SM_Pillow
|
||||||
|
400000: //RootNode
|
||||||
|
400002: Bip001
|
||||||
|
400004: Bip001 Footsteps
|
||||||
|
400006: Bip001 Head
|
||||||
|
400008: Bip001 HeadNub
|
||||||
|
400010: Bip001 L Calf
|
||||||
|
400012: Bip001 L Clavicle
|
||||||
|
400014: Bip001 L Finger0
|
||||||
|
400016: Bip001 L Finger0Nub
|
||||||
|
400018: Bip001 L Foot
|
||||||
|
400020: Bip001 L Forearm
|
||||||
|
400022: Bip001 L Hand
|
||||||
|
400024: Bip001 L Thigh
|
||||||
|
400026: Bip001 L Toe0
|
||||||
|
400028: Bip001 L Toe0Nub
|
||||||
|
400030: Bip001 L UpperArm
|
||||||
|
400032: Bip001 Neck
|
||||||
|
400034: Bip001 Pelvis
|
||||||
|
400036: Bip001 R Calf
|
||||||
|
400038: Bip001 R Clavicle
|
||||||
|
400040: Bip001 R Finger0
|
||||||
|
400042: Bip001 R Finger0Nub
|
||||||
|
400044: Bip001 R Foot
|
||||||
|
400046: Bip001 R Forearm
|
||||||
|
400048: Bip001 R Hand
|
||||||
|
400050: Bip001 R Thigh
|
||||||
|
400052: Bip001 R Toe0
|
||||||
|
400054: Bip001 R Toe0Nub
|
||||||
|
400056: Bip001 R UpperArm
|
||||||
|
400058: Bip001 Spine
|
||||||
|
400060: Bip001 Spine1
|
||||||
|
400062: Bip001 Spine2
|
||||||
|
400064: Kid
|
||||||
|
400066: SM_Pillow
|
||||||
|
4300000: Kid
|
||||||
|
4300002: SM_Pillow
|
||||||
|
7400000: Take 001
|
||||||
|
9500000: //RootNode
|
||||||
|
13700000: Kid
|
||||||
|
13700002: SM_Pillow
|
||||||
|
materials:
|
||||||
|
importMaterials: 1
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: .5
|
||||||
|
animationPositionError: .5
|
||||||
|
animationScaleError: .5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 1
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
importBlendShapes: 1
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
optimizeMeshForGPU: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
splitTangentsAcrossUV: 1
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 1
|
||||||
|
importAnimation: 1
|
||||||
|
copyAvatar: 0
|
||||||
|
humanDescription:
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: .5
|
||||||
|
foreArmTwist: .5
|
||||||
|
upperLegTwist: .5
|
||||||
|
legTwist: .5
|
||||||
|
armStretch: .0500000007
|
||||||
|
legStretch: .0500000007
|
||||||
|
feetSpacing: 0
|
||||||
|
rootMotionBoneName:
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
animationType: 2
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/anim_idle_bed.FBX
Normal file
BIN
Assets/Art/anim_idle_bed.FBX
Normal file
Binary file not shown.
143
Assets/Art/anim_idle_bed.FBX.meta
Normal file
143
Assets/Art/anim_idle_bed.FBX.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e5f3a4e591e65bf428734805439965bb
|
||||||
|
timeCreated: 1440336030
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
100002: Bip001
|
||||||
|
100004: Bip001 Footsteps
|
||||||
|
100006: Bip001 Head
|
||||||
|
100008: Bip001 HeadNub
|
||||||
|
100010: Bip001 L Calf
|
||||||
|
100012: Bip001 L Clavicle
|
||||||
|
100014: Bip001 L Finger0
|
||||||
|
100016: Bip001 L Finger0Nub
|
||||||
|
100018: Bip001 L Foot
|
||||||
|
100020: Bip001 L Forearm
|
||||||
|
100022: Bip001 L Hand
|
||||||
|
100024: Bip001 L Thigh
|
||||||
|
100026: Bip001 L Toe0
|
||||||
|
100028: Bip001 L Toe0Nub
|
||||||
|
100030: Bip001 L UpperArm
|
||||||
|
100032: Bip001 Neck
|
||||||
|
100034: Bip001 Pelvis
|
||||||
|
100036: Bip001 R Calf
|
||||||
|
100038: Bip001 R Clavicle
|
||||||
|
100040: Bip001 R Finger0
|
||||||
|
100042: Bip001 R Finger0Nub
|
||||||
|
100044: Bip001 R Foot
|
||||||
|
100046: Bip001 R Forearm
|
||||||
|
100048: Bip001 R Hand
|
||||||
|
100050: Bip001 R Thigh
|
||||||
|
100052: Bip001 R Toe0
|
||||||
|
100054: Bip001 R Toe0Nub
|
||||||
|
100056: Bip001 R UpperArm
|
||||||
|
100058: Bip001 Spine
|
||||||
|
100060: Bip001 Spine1
|
||||||
|
100062: Bip001 Spine2
|
||||||
|
100064: Kid
|
||||||
|
100066: SM_Pillow
|
||||||
|
400000: //RootNode
|
||||||
|
400002: Bip001
|
||||||
|
400004: Bip001 Footsteps
|
||||||
|
400006: Bip001 Head
|
||||||
|
400008: Bip001 HeadNub
|
||||||
|
400010: Bip001 L Calf
|
||||||
|
400012: Bip001 L Clavicle
|
||||||
|
400014: Bip001 L Finger0
|
||||||
|
400016: Bip001 L Finger0Nub
|
||||||
|
400018: Bip001 L Foot
|
||||||
|
400020: Bip001 L Forearm
|
||||||
|
400022: Bip001 L Hand
|
||||||
|
400024: Bip001 L Thigh
|
||||||
|
400026: Bip001 L Toe0
|
||||||
|
400028: Bip001 L Toe0Nub
|
||||||
|
400030: Bip001 L UpperArm
|
||||||
|
400032: Bip001 Neck
|
||||||
|
400034: Bip001 Pelvis
|
||||||
|
400036: Bip001 R Calf
|
||||||
|
400038: Bip001 R Clavicle
|
||||||
|
400040: Bip001 R Finger0
|
||||||
|
400042: Bip001 R Finger0Nub
|
||||||
|
400044: Bip001 R Foot
|
||||||
|
400046: Bip001 R Forearm
|
||||||
|
400048: Bip001 R Hand
|
||||||
|
400050: Bip001 R Thigh
|
||||||
|
400052: Bip001 R Toe0
|
||||||
|
400054: Bip001 R Toe0Nub
|
||||||
|
400056: Bip001 R UpperArm
|
||||||
|
400058: Bip001 Spine
|
||||||
|
400060: Bip001 Spine1
|
||||||
|
400062: Bip001 Spine2
|
||||||
|
400064: Kid
|
||||||
|
400066: SM_Pillow
|
||||||
|
4300000: Kid
|
||||||
|
4300002: SM_Pillow
|
||||||
|
7400000: Take 001
|
||||||
|
9500000: //RootNode
|
||||||
|
13700000: Kid
|
||||||
|
13700002: SM_Pillow
|
||||||
|
materials:
|
||||||
|
importMaterials: 1
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: .5
|
||||||
|
animationPositionError: .5
|
||||||
|
animationScaleError: .5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 1
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
importBlendShapes: 1
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
optimizeMeshForGPU: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
splitTangentsAcrossUV: 1
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 1
|
||||||
|
importAnimation: 1
|
||||||
|
copyAvatar: 0
|
||||||
|
humanDescription:
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: .5
|
||||||
|
foreArmTwist: .5
|
||||||
|
upperLegTwist: .5
|
||||||
|
legTwist: .5
|
||||||
|
armStretch: .0500000007
|
||||||
|
legStretch: .0500000007
|
||||||
|
feetSpacing: 0
|
||||||
|
rootMotionBoneName:
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
animationType: 2
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/anim_idle_normal.FBX
Normal file
BIN
Assets/Art/anim_idle_normal.FBX
Normal file
Binary file not shown.
143
Assets/Art/anim_idle_normal.FBX.meta
Normal file
143
Assets/Art/anim_idle_normal.FBX.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1b74db1da008e1458f86e393b24bcf4
|
||||||
|
timeCreated: 1440336029
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
100002: Bip001
|
||||||
|
100004: Bip001 Footsteps
|
||||||
|
100006: Bip001 Head
|
||||||
|
100008: Bip001 HeadNub
|
||||||
|
100010: Bip001 L Calf
|
||||||
|
100012: Bip001 L Clavicle
|
||||||
|
100014: Bip001 L Finger0
|
||||||
|
100016: Bip001 L Finger0Nub
|
||||||
|
100018: Bip001 L Foot
|
||||||
|
100020: Bip001 L Forearm
|
||||||
|
100022: Bip001 L Hand
|
||||||
|
100024: Bip001 L Thigh
|
||||||
|
100026: Bip001 L Toe0
|
||||||
|
100028: Bip001 L Toe0Nub
|
||||||
|
100030: Bip001 L UpperArm
|
||||||
|
100032: Bip001 Neck
|
||||||
|
100034: Bip001 Pelvis
|
||||||
|
100036: Bip001 R Calf
|
||||||
|
100038: Bip001 R Clavicle
|
||||||
|
100040: Bip001 R Finger0
|
||||||
|
100042: Bip001 R Finger0Nub
|
||||||
|
100044: Bip001 R Foot
|
||||||
|
100046: Bip001 R Forearm
|
||||||
|
100048: Bip001 R Hand
|
||||||
|
100050: Bip001 R Thigh
|
||||||
|
100052: Bip001 R Toe0
|
||||||
|
100054: Bip001 R Toe0Nub
|
||||||
|
100056: Bip001 R UpperArm
|
||||||
|
100058: Bip001 Spine
|
||||||
|
100060: Bip001 Spine1
|
||||||
|
100062: Bip001 Spine2
|
||||||
|
100064: Kid
|
||||||
|
100066: SM_Pillow
|
||||||
|
400000: //RootNode
|
||||||
|
400002: Bip001
|
||||||
|
400004: Bip001 Footsteps
|
||||||
|
400006: Bip001 Head
|
||||||
|
400008: Bip001 HeadNub
|
||||||
|
400010: Bip001 L Calf
|
||||||
|
400012: Bip001 L Clavicle
|
||||||
|
400014: Bip001 L Finger0
|
||||||
|
400016: Bip001 L Finger0Nub
|
||||||
|
400018: Bip001 L Foot
|
||||||
|
400020: Bip001 L Forearm
|
||||||
|
400022: Bip001 L Hand
|
||||||
|
400024: Bip001 L Thigh
|
||||||
|
400026: Bip001 L Toe0
|
||||||
|
400028: Bip001 L Toe0Nub
|
||||||
|
400030: Bip001 L UpperArm
|
||||||
|
400032: Bip001 Neck
|
||||||
|
400034: Bip001 Pelvis
|
||||||
|
400036: Bip001 R Calf
|
||||||
|
400038: Bip001 R Clavicle
|
||||||
|
400040: Bip001 R Finger0
|
||||||
|
400042: Bip001 R Finger0Nub
|
||||||
|
400044: Bip001 R Foot
|
||||||
|
400046: Bip001 R Forearm
|
||||||
|
400048: Bip001 R Hand
|
||||||
|
400050: Bip001 R Thigh
|
||||||
|
400052: Bip001 R Toe0
|
||||||
|
400054: Bip001 R Toe0Nub
|
||||||
|
400056: Bip001 R UpperArm
|
||||||
|
400058: Bip001 Spine
|
||||||
|
400060: Bip001 Spine1
|
||||||
|
400062: Bip001 Spine2
|
||||||
|
400064: Kid
|
||||||
|
400066: SM_Pillow
|
||||||
|
4300000: Kid
|
||||||
|
4300002: SM_Pillow
|
||||||
|
7400000: Take 001
|
||||||
|
9500000: //RootNode
|
||||||
|
13700000: Kid
|
||||||
|
13700002: SM_Pillow
|
||||||
|
materials:
|
||||||
|
importMaterials: 1
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: .5
|
||||||
|
animationPositionError: .5
|
||||||
|
animationScaleError: .5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 1
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
importBlendShapes: 1
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
optimizeMeshForGPU: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
splitTangentsAcrossUV: 1
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 1
|
||||||
|
importAnimation: 1
|
||||||
|
copyAvatar: 0
|
||||||
|
humanDescription:
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: .5
|
||||||
|
foreArmTwist: .5
|
||||||
|
upperLegTwist: .5
|
||||||
|
legTwist: .5
|
||||||
|
armStretch: .0500000007
|
||||||
|
legStretch: .0500000007
|
||||||
|
feetSpacing: 0
|
||||||
|
rootMotionBoneName:
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
animationType: 2
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/anim_lava_bounce.FBX
Normal file
BIN
Assets/Art/anim_lava_bounce.FBX
Normal file
Binary file not shown.
143
Assets/Art/anim_lava_bounce.FBX.meta
Normal file
143
Assets/Art/anim_lava_bounce.FBX.meta
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 08096ebdef099a243ba1759510c9330d
|
||||||
|
timeCreated: 1440336028
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
100002: Bip001
|
||||||
|
100004: Bip001 Footsteps
|
||||||
|
100006: Bip001 Head
|
||||||
|
100008: Bip001 HeadNub
|
||||||
|
100010: Bip001 L Calf
|
||||||
|
100012: Bip001 L Clavicle
|
||||||
|
100014: Bip001 L Finger0
|
||||||
|
100016: Bip001 L Finger0Nub
|
||||||
|
100018: Bip001 L Foot
|
||||||
|
100020: Bip001 L Forearm
|
||||||
|
100022: Bip001 L Hand
|
||||||
|
100024: Bip001 L Thigh
|
||||||
|
100026: Bip001 L Toe0
|
||||||
|
100028: Bip001 L Toe0Nub
|
||||||
|
100030: Bip001 L UpperArm
|
||||||
|
100032: Bip001 Neck
|
||||||
|
100034: Bip001 Pelvis
|
||||||
|
100036: Bip001 R Calf
|
||||||
|
100038: Bip001 R Clavicle
|
||||||
|
100040: Bip001 R Finger0
|
||||||
|
100042: Bip001 R Finger0Nub
|
||||||
|
100044: Bip001 R Foot
|
||||||
|
100046: Bip001 R Forearm
|
||||||
|
100048: Bip001 R Hand
|
||||||
|
100050: Bip001 R Thigh
|
||||||
|
100052: Bip001 R Toe0
|
||||||
|
100054: Bip001 R Toe0Nub
|
||||||
|
100056: Bip001 R UpperArm
|
||||||
|
100058: Bip001 Spine
|
||||||
|
100060: Bip001 Spine1
|
||||||
|
100062: Bip001 Spine2
|
||||||
|
100064: Kid
|
||||||
|
100066: SM_Pillow
|
||||||
|
400000: //RootNode
|
||||||
|
400002: Bip001
|
||||||
|
400004: Bip001 Footsteps
|
||||||
|
400006: Bip001 Head
|
||||||
|
400008: Bip001 HeadNub
|
||||||
|
400010: Bip001 L Calf
|
||||||
|
400012: Bip001 L Clavicle
|
||||||
|
400014: Bip001 L Finger0
|
||||||
|
400016: Bip001 L Finger0Nub
|
||||||
|
400018: Bip001 L Foot
|
||||||
|
400020: Bip001 L Forearm
|
||||||
|
400022: Bip001 L Hand
|
||||||
|
400024: Bip001 L Thigh
|
||||||
|
400026: Bip001 L Toe0
|
||||||
|
400028: Bip001 L Toe0Nub
|
||||||
|
400030: Bip001 L UpperArm
|
||||||
|
400032: Bip001 Neck
|
||||||
|
400034: Bip001 Pelvis
|
||||||
|
400036: Bip001 R Calf
|
||||||
|
400038: Bip001 R Clavicle
|
||||||
|
400040: Bip001 R Finger0
|
||||||
|
400042: Bip001 R Finger0Nub
|
||||||
|
400044: Bip001 R Foot
|
||||||
|
400046: Bip001 R Forearm
|
||||||
|
400048: Bip001 R Hand
|
||||||
|
400050: Bip001 R Thigh
|
||||||
|
400052: Bip001 R Toe0
|
||||||
|
400054: Bip001 R Toe0Nub
|
||||||
|
400056: Bip001 R UpperArm
|
||||||
|
400058: Bip001 Spine
|
||||||
|
400060: Bip001 Spine1
|
||||||
|
400062: Bip001 Spine2
|
||||||
|
400064: Kid
|
||||||
|
400066: SM_Pillow
|
||||||
|
4300000: Kid
|
||||||
|
4300002: SM_Pillow
|
||||||
|
7400000: Take 001
|
||||||
|
9500000: //RootNode
|
||||||
|
13700000: Kid
|
||||||
|
13700002: SM_Pillow
|
||||||
|
materials:
|
||||||
|
importMaterials: 1
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
motionNodeName:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: .5
|
||||||
|
animationPositionError: .5
|
||||||
|
animationScaleError: .5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 1
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
importBlendShapes: 1
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
optimizeMeshForGPU: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
splitTangentsAcrossUV: 1
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 1
|
||||||
|
importAnimation: 1
|
||||||
|
copyAvatar: 0
|
||||||
|
humanDescription:
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: .5
|
||||||
|
foreArmTwist: .5
|
||||||
|
upperLegTwist: .5
|
||||||
|
legTwist: .5
|
||||||
|
armStretch: .0500000007
|
||||||
|
legStretch: .0500000007
|
||||||
|
feetSpacing: 0
|
||||||
|
rootMotionBoneName:
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
animationType: 2
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
16
Assets/Materials/Bounciness.physicMaterial
Normal file
16
Assets/Materials/Bounciness.physicMaterial
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!134 &13400000
|
||||||
|
PhysicMaterial:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_Name: Bounciness
|
||||||
|
dynamicFriction: 0
|
||||||
|
staticFriction: 0
|
||||||
|
bounciness: .5
|
||||||
|
frictionCombine: 3
|
||||||
|
bounceCombine: 0
|
||||||
|
frictionDirection2: {x: 0, y: 0, z: 0}
|
||||||
|
dynamicFriction2: 0
|
||||||
|
staticFriction2: 0
|
||||||
8
Assets/Materials/Bounciness.physicMaterial.meta
Normal file
8
Assets/Materials/Bounciness.physicMaterial.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0aee2f6497df4f147aa581dac5fa5447
|
||||||
|
timeCreated: 1440320158
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -104,7 +104,7 @@ Rigidbody:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Mass: 1
|
m_Mass: 1
|
||||||
m_Drag: 0
|
m_Drag: 0
|
||||||
m_AngularDrag: .0500000007
|
m_AngularDrag: 0
|
||||||
m_UseGravity: 1
|
m_UseGravity: 1
|
||||||
m_IsKinematic: 0
|
m_IsKinematic: 0
|
||||||
m_Interpolate: 0
|
m_Interpolate: 0
|
||||||
@ -125,7 +125,7 @@ MonoBehaviour:
|
|||||||
JumpForce: 200
|
JumpForce: 200
|
||||||
MaxInvulnerableTime: 2
|
MaxInvulnerableTime: 2
|
||||||
ThrowForce: 30
|
ThrowForce: 30
|
||||||
hitPushBackForce: 250
|
hitPushBackForce: 25
|
||||||
GroundCheck: {fileID: 100272}
|
GroundCheck: {fileID: 100272}
|
||||||
pillow: {fileID: 0}
|
pillow: {fileID: 0}
|
||||||
Mom: {fileID: 0}
|
Mom: {fileID: 0}
|
||||||
@ -153,7 +153,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 567fe96dcacb08f4ab716a98ce99fc88, type: 3}
|
m_Script: {fileID: 11500000, guid: 567fe96dcacb08f4ab716a98ce99fc88, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
minAngleRange: 60
|
minAngleRange: 10
|
||||||
--- !u!135 &13545904
|
--- !u!135 &13545904
|
||||||
SphereCollider:
|
SphereCollider:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -184,7 +184,7 @@ CapsuleCollider:
|
|||||||
m_PrefabParentObject: {fileID: 0}
|
m_PrefabParentObject: {fileID: 0}
|
||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 190616}
|
m_GameObject: {fileID: 190616}
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 13400000, guid: 0aee2f6497df4f147aa581dac5fa5447, type: 2}
|
||||||
m_IsTrigger: 0
|
m_IsTrigger: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_Radius: .5
|
m_Radius: .5
|
||||||
@ -214,6 +214,10 @@ Prefab:
|
|||||||
propertyPath: Speed
|
propertyPath: Speed
|
||||||
value: 2
|
value: 2
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 0}
|
||||||
|
propertyPath: minAngleRange
|
||||||
|
value: 10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_ParentPrefab: {fileID: 0}
|
m_ParentPrefab: {fileID: 0}
|
||||||
m_RootGameObject: {fileID: 190616}
|
m_RootGameObject: {fileID: 190616}
|
||||||
|
|||||||
@ -42,7 +42,7 @@ Transform:
|
|||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 195926}
|
m_GameObject: {fileID: 195926}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 2, z: -.550000012}
|
m_LocalPosition: {x: -.119999997, y: .930000007, z: -4.69999981}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 485004}
|
- {fileID: 485004}
|
||||||
@ -113,7 +113,7 @@ Light:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Type: 2
|
m_Type: 2
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_Intensity: .709999979
|
m_Intensity: 2.29999995
|
||||||
m_Range: 100
|
m_Range: 100
|
||||||
m_SpotAngle: 30
|
m_SpotAngle: 30
|
||||||
m_CookieSize: 10
|
m_CookieSize: 10
|
||||||
|
|||||||
@ -15,6 +15,24 @@ GameObject:
|
|||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 1
|
||||||
|
--- !u!1 &127518
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Component:
|
||||||
|
- 4: {fileID: 470260}
|
||||||
|
- 33: {fileID: 3351896}
|
||||||
|
- 23: {fileID: 2302856}
|
||||||
|
- 95: {fileID: 9564462}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: SM_Murs_Inversed
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
--- !u!1 &188430
|
--- !u!1 &188430
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -29,7 +47,7 @@ GameObject:
|
|||||||
- 64: {fileID: 6472040}
|
- 64: {fileID: 6472040}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: SM_Murs
|
m_Name: SM_Murs
|
||||||
m_TagString: Untagged
|
m_TagString: Walls
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@ -45,6 +63,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 453194}
|
- {fileID: 453194}
|
||||||
|
- {fileID: 470260}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
--- !u!4 &453194
|
--- !u!4 &453194
|
||||||
@ -54,11 +73,47 @@ Transform:
|
|||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 188430}
|
m_GameObject: {fileID: 188430}
|
||||||
m_LocalRotation: {x: -.707106829, y: 0, z: -0, w: .707106829}
|
m_LocalRotation: {x: -.707106829, y: 0, z: -0, w: .707106829}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: -.0898000002}
|
||||||
m_LocalScale: {x: 1, y: 1.01551056, z: 1}
|
m_LocalScale: {x: 1, y: 1.01551056, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 420792}
|
m_Father: {fileID: 420792}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
|
--- !u!4 &470260
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 127518}
|
||||||
|
m_LocalRotation: {x: -.707106829, y: 0, z: -0, w: .707106829}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: -.0898000002}
|
||||||
|
m_LocalScale: {x: 1, y: 1.01551056, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 420792}
|
||||||
|
m_RootOrder: 1
|
||||||
|
--- !u!23 &2302856
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 127518}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 3
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: de86e11ce17d70943a076b500bc76e8b, type: 2}
|
||||||
|
m_SubsetIndices:
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_UseLightProbes: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_AutoUVMaxDistance: .5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
--- !u!23 &2392106
|
--- !u!23 &2392106
|
||||||
MeshRenderer:
|
MeshRenderer:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -90,6 +145,13 @@ MeshFilter:
|
|||||||
m_PrefabInternal: {fileID: 100100000}
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
m_GameObject: {fileID: 188430}
|
m_GameObject: {fileID: 188430}
|
||||||
m_Mesh: {fileID: 4300000, guid: 56d82b7f76516a84f8211df1eb5a5fa6, type: 3}
|
m_Mesh: {fileID: 4300000, guid: 56d82b7f76516a84f8211df1eb5a5fa6, type: 3}
|
||||||
|
--- !u!33 &3351896
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 127518}
|
||||||
|
m_Mesh: {fileID: 4300000, guid: 468783296f7855642ae57783908446f7, type: 3}
|
||||||
--- !u!64 &6472040
|
--- !u!64 &6472040
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -119,6 +181,23 @@ Animator:
|
|||||||
m_WarningMessage:
|
m_WarningMessage:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
--- !u!95 &9564462
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 100100000}
|
||||||
|
m_GameObject: {fileID: 127518}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 9000000, guid: 468783296f7855642ae57783908446f7, type: 3}
|
||||||
|
m_Controller: {fileID: 0}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
--- !u!1001 &100100000
|
--- !u!1001 &100100000
|
||||||
Prefab:
|
Prefab:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@ using System.Collections.Generic;
|
|||||||
public class AutoTarget : MonoBehaviour
|
public class AutoTarget : MonoBehaviour
|
||||||
{
|
{
|
||||||
private List<Transform> targets;
|
private List<Transform> targets;
|
||||||
public float minAngleRange = 60f;
|
public float minAngleRange = 20f;
|
||||||
|
|
||||||
// Use this for initialization
|
// Use this for initialization
|
||||||
void Start ()
|
void Start ()
|
||||||
|
|||||||
@ -9,11 +9,11 @@ public class Child : MonoBehaviour
|
|||||||
public float MaxInvulnerableTime = 2f;
|
public float MaxInvulnerableTime = 2f;
|
||||||
public float ThrowForce = 30f;
|
public float ThrowForce = 30f;
|
||||||
public float hitPushBackForce = 250f;
|
public float hitPushBackForce = 250f;
|
||||||
|
public float yAngleVector = 9f;
|
||||||
|
|
||||||
public GameObject GroundCheck;
|
public GameObject GroundCheck;
|
||||||
public Pillow pillow;
|
public Pillow pillow;
|
||||||
public MomBehavior Mom;
|
public MomBehavior Mom;
|
||||||
public PlayerAvatar Avatar;
|
|
||||||
|
|
||||||
private Rigidbody _rb;
|
private Rigidbody _rb;
|
||||||
private bool _isGrounded = false;
|
private bool _isGrounded = false;
|
||||||
@ -26,17 +26,10 @@ public class Child : MonoBehaviour
|
|||||||
|
|
||||||
private int _index;
|
private int _index;
|
||||||
private bool _isPushed = false;
|
private bool _isPushed = false;
|
||||||
private int _numZ = 0;
|
private bool _wasPushed = false;
|
||||||
public int NumZ
|
private Vector3 _pushedDir;
|
||||||
{
|
|
||||||
get { return _numZ; }
|
private float _stunTime;
|
||||||
set
|
|
||||||
{
|
|
||||||
_numZ = value;
|
|
||||||
Avatar.NumZ = _numZ;
|
|
||||||
if (_numZ == 3) Die();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Index
|
public int Index
|
||||||
{
|
{
|
||||||
@ -55,11 +48,6 @@ public class Child : MonoBehaviour
|
|||||||
_rb = GetComponent<Rigidbody>();
|
_rb = GetComponent<Rigidbody>();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Start()
|
|
||||||
{
|
|
||||||
Avatar.PlayerNum = Index + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
_isGrounded = IsGrounded();
|
_isGrounded = IsGrounded();
|
||||||
@ -68,6 +56,41 @@ public class Child : MonoBehaviour
|
|||||||
if (target != null) {
|
if (target != null) {
|
||||||
transform.LookAt(target);
|
transform.LookAt(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We move the child depending on the camera orientation
|
||||||
|
|
||||||
|
if (_stunTime >= Time.deltaTime * 3f && _wasPushed && _rb.velocity == Vector3.zero)
|
||||||
|
{
|
||||||
|
_wasPushed = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_isPushed)
|
||||||
|
{
|
||||||
|
_stunTime += Time.deltaTime;
|
||||||
|
|
||||||
|
if (_stunTime >= Time.deltaTime * 3f && _rb.velocity == Vector3.zero)
|
||||||
|
{
|
||||||
|
_isPushed = false;
|
||||||
|
_wasPushed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_stunTime = 0f;
|
||||||
|
Vector3 forwardDir = Camera.main.transform.forward;
|
||||||
|
Vector3 rightDir = Camera.main.transform.right;
|
||||||
|
|
||||||
|
forwardDir.y = 0f;
|
||||||
|
forwardDir = forwardDir.normalized * _zValue * Speed;
|
||||||
|
|
||||||
|
rightDir.y = 0f;
|
||||||
|
rightDir = rightDir.normalized * _xValue * Speed;
|
||||||
|
|
||||||
|
Vector3 movement = forwardDir + rightDir;
|
||||||
|
movement.y = _rb.velocity.y;
|
||||||
|
|
||||||
|
_rb.velocity = movement;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnTriggerEnter(Collider other) {
|
void OnTriggerEnter(Collider other) {
|
||||||
@ -100,35 +123,6 @@ public class Child : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FixedUpdate()
|
|
||||||
{
|
|
||||||
// We move the child depending on the camera orientation
|
|
||||||
|
|
||||||
if (_isPushed)
|
|
||||||
{
|
|
||||||
if (_rb.velocity == Vector3.zero)
|
|
||||||
{
|
|
||||||
_isPushed = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Vector3 forwardDir = Camera.main.transform.forward;
|
|
||||||
Vector3 rightDir = Camera.main.transform.right;
|
|
||||||
|
|
||||||
forwardDir.y = 0f;
|
|
||||||
forwardDir = forwardDir.normalized * _zValue * Speed;
|
|
||||||
|
|
||||||
rightDir.y = 0f;
|
|
||||||
rightDir = rightDir.normalized * _xValue * Speed;
|
|
||||||
|
|
||||||
Vector3 movement = forwardDir + rightDir;
|
|
||||||
movement.y = _rb.velocity.y;
|
|
||||||
|
|
||||||
_rb.velocity = movement;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool IsGrounded()
|
private bool IsGrounded()
|
||||||
{
|
{
|
||||||
int mask = (1 << LayerMask.NameToLayer("Ground")) | (1 << LayerMask.NameToLayer("Bed"));
|
int mask = (1 << LayerMask.NameToLayer("Ground")) | (1 << LayerMask.NameToLayer("Bed"));
|
||||||
@ -244,6 +238,11 @@ public class Child : MonoBehaviour
|
|||||||
|
|
||||||
void OnCollisionStay(Collision collision)
|
void OnCollisionStay(Collision collision)
|
||||||
{
|
{
|
||||||
|
if (collision.gameObject.tag == "Walls")
|
||||||
|
{
|
||||||
|
Debug.Log(_isPushed);
|
||||||
|
}
|
||||||
|
|
||||||
if (collision.gameObject.tag == "Lava")
|
if (collision.gameObject.tag == "Lava")
|
||||||
{
|
{
|
||||||
_invulnerableTime += Time.deltaTime;
|
_invulnerableTime += Time.deltaTime;
|
||||||
@ -260,12 +259,25 @@ public class Child : MonoBehaviour
|
|||||||
{
|
{
|
||||||
ActivateVibration(false);
|
ActivateVibration(false);
|
||||||
}
|
}
|
||||||
|
else if (_wasPushed && collision.gameObject.tag == "Walls")
|
||||||
|
{
|
||||||
|
_wasPushed = false;
|
||||||
|
|
||||||
|
Push(Vector3.Reflect(_pushedDir.normalized, collision.contacts[0].normal) * _pushedDir.magnitude);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Push(Vector3 force)
|
public void Push(Vector3 force)
|
||||||
{
|
{
|
||||||
_isPushed = true;
|
_isPushed = true;
|
||||||
_rb.AddForce(force);
|
|
||||||
|
Debug.Log(force);
|
||||||
|
|
||||||
|
force.y = yAngleVector;
|
||||||
|
|
||||||
|
_rb.AddForce(force, ForceMode.Impulse);
|
||||||
|
|
||||||
|
_pushedDir = force;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ActivateVibration(bool activate)
|
private void ActivateVibration(bool activate)
|
||||||
@ -277,16 +289,10 @@ public class Child : MonoBehaviour
|
|||||||
|
|
||||||
private void TakeLavaDamage()
|
private void TakeLavaDamage()
|
||||||
{
|
{
|
||||||
NumZ += 1;
|
|
||||||
// TODO: Lose a life (probably) and become immune for ~ 2 or 3 seconds
|
// TODO: Lose a life (probably) and become immune for ~ 2 or 3 seconds
|
||||||
_invulnerableTime = 0f;
|
_invulnerableTime = 0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Die()
|
|
||||||
{
|
|
||||||
Destroy(gameObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OnDestroy()
|
void OnDestroy()
|
||||||
{
|
{
|
||||||
ActivateVibration(false);
|
ActivateVibration(false);
|
||||||
|
|||||||
@ -89,6 +89,18 @@ public class ChildController : MonoBehaviour
|
|||||||
transform.eulerAngles.z);
|
transform.eulerAngles.z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
_child.target = null; // no auto targeting when not actively pressing the joystick in a direction
|
||||||
|
|
||||||
|
// if player is not look with the right joystick, then face the direction we're going
|
||||||
|
// if left joystick is used, else we don't change the facing direction
|
||||||
|
if (xValue != 0 || zValue!= 0) {
|
||||||
|
transform.eulerAngles = new Vector3(
|
||||||
|
transform.eulerAngles.x,
|
||||||
|
Mathf.Atan2(xValue, zValue) * Mathf.Rad2Deg - 90,
|
||||||
|
transform.eulerAngles.z);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (input.Ranges.ContainsKey("Throw")) {
|
if (input.Ranges.ContainsKey("Throw")) {
|
||||||
_child.Throw();
|
_child.Throw();
|
||||||
|
|||||||
@ -63,7 +63,7 @@ public class MomBehavior : MonoBehaviour
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case State.InRoom:
|
case State.InRoom:
|
||||||
if (_elapsedTime >= 2f)
|
if (_elapsedTime >= MotherStayTime)
|
||||||
{
|
{
|
||||||
SetState(State.Away);
|
SetState(State.Away);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ TagManager:
|
|||||||
- Pillow
|
- Pillow
|
||||||
- Lava
|
- Lava
|
||||||
- Floor
|
- Floor
|
||||||
|
- Walls
|
||||||
layers:
|
layers:
|
||||||
- Default
|
- Default
|
||||||
- TransparentFX
|
- TransparentFX
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user