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
This commit is contained in:
RosimInc
commit
305e4923b2
BIN
Assets/Art/Materials/T_chevet_D.mat
Normal file
BIN
Assets/Art/Materials/T_chevet_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_chevet_D.mat.meta
Normal file
8
Assets/Art/Materials/T_chevet_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c515dc6f871f5348b83a50290cd52f5
|
||||||
|
timeCreated: 1440284351
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_commode_1_D.mat
Normal file
BIN
Assets/Art/Materials/T_commode_1_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_commode_1_D.mat.meta
Normal file
8
Assets/Art/Materials/T_commode_1_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1894dbc07d32ec040af40e55380a9d5f
|
||||||
|
timeCreated: 1440297631
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_commode_D.mat
Normal file
BIN
Assets/Art/Materials/T_commode_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_commode_D.mat.meta
Normal file
8
Assets/Art/Materials/T_commode_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 507be854a4d610b4c9227d57afdcb6d3
|
||||||
|
timeCreated: 1440297625
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_table_D.mat
Normal file
BIN
Assets/Art/Materials/T_table_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_table_D.mat.meta
Normal file
8
Assets/Art/Materials/T_table_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cb9eee2422923294f8b16ba5554d38ae
|
||||||
|
timeCreated: 1440284354
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_tabouret_1_D.mat
Normal file
BIN
Assets/Art/Materials/T_tabouret_1_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_tabouret_1_D.mat.meta
Normal file
8
Assets/Art/Materials/T_tabouret_1_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2c1e52f94d0869e47838def9bbdfac06
|
||||||
|
timeCreated: 1440284353
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_tabouret_2_D.mat
Normal file
BIN
Assets/Art/Materials/T_tabouret_2_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_tabouret_2_D.mat.meta
Normal file
8
Assets/Art/Materials/T_tabouret_2_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 839208c8f5dbd954e9f4e6cd4285e003
|
||||||
|
timeCreated: 1440284352
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/Materials/T_tabouret_3_D.mat
Normal file
BIN
Assets/Art/Materials/T_tabouret_3_D.mat
Normal file
Binary file not shown.
8
Assets/Art/Materials/T_tabouret_3_D.mat.meta
Normal file
8
Assets/Art/Materials/T_tabouret_3_D.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5cf6191e7bd3329498e04b29171dfcfd
|
||||||
|
timeCreated: 1440284352
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_Lit_Superpose.FBX
Normal file
BIN
Assets/Art/SM_Lit_Superpose.FBX
Normal file
Binary file not shown.
98
Assets/Art/SM_Lit_Superpose.FBX.meta
Normal file
98
Assets/Art/SM_Lit_Superpose.FBX.meta
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1123f70c6f112c44493359e23a8cc687
|
||||||
|
timeCreated: 1440284351
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: Object002
|
||||||
|
100002: Object003
|
||||||
|
100004: Object004
|
||||||
|
100006: Object005
|
||||||
|
100008: Object006
|
||||||
|
100010: //RootNode
|
||||||
|
400000: Object002
|
||||||
|
400002: Object003
|
||||||
|
400004: Object004
|
||||||
|
400006: Object005
|
||||||
|
400008: Object006
|
||||||
|
400010: //RootNode
|
||||||
|
2300000: Object002
|
||||||
|
2300002: Object003
|
||||||
|
2300004: Object004
|
||||||
|
2300006: Object005
|
||||||
|
2300008: Object006
|
||||||
|
3300000: Object002
|
||||||
|
3300002: Object003
|
||||||
|
3300004: Object004
|
||||||
|
3300006: Object005
|
||||||
|
3300008: Object006
|
||||||
|
4300000: Object002
|
||||||
|
4300002: Object003
|
||||||
|
4300004: Object004
|
||||||
|
4300006: Object005
|
||||||
|
4300008: Object006
|
||||||
|
7400000: Take 001
|
||||||
|
9500000: //RootNode
|
||||||
|
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/SM_chevet.FBX
Normal file
BIN
Assets/Art/SM_chevet.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_chevet.FBX.meta
Normal file
74
Assets/Art/SM_chevet.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0b3a73315fe9a6a4cac00fff6de2726f
|
||||||
|
timeCreated: 1440284351
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Box071
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_chevet.fbm.meta
Normal file
9
Assets/Art/SM_chevet.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e83c53db9cf3dad4d9d1958ba27d957d
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440284350
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_chevet.fbm/T_chevet_D.tga
Normal file
BIN
Assets/Art/SM_chevet.fbm/T_chevet_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_chevet.fbm/T_chevet_D.tga.meta
Normal file
55
Assets/Art/SM_chevet.fbm/T_chevet_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d8ec5ddb265e07b43afbfc423f4e5f8c
|
||||||
|
timeCreated: 1440284350
|
||||||
|
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/SM_commode_1_.FBX
Normal file
BIN
Assets/Art/SM_commode_1_.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_commode_1_.FBX.meta
Normal file
74
Assets/Art/SM_commode_1_.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5db9b9991e715344a89919be8ce49389
|
||||||
|
timeCreated: 1440297625
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Box054
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_commode_1_.fbm.meta
Normal file
9
Assets/Art/SM_commode_1_.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e24261dccdd4ec142959624f87ea6140
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440297624
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_commode_1_.fbm/T_commode_D.tga
Normal file
BIN
Assets/Art/SM_commode_1_.fbm/T_commode_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 MiB |
55
Assets/Art/SM_commode_1_.fbm/T_commode_D.tga.meta
Normal file
55
Assets/Art/SM_commode_1_.fbm/T_commode_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f7e9071f7a47fb947858f8dabffd3bbf
|
||||||
|
timeCreated: 1440297625
|
||||||
|
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/SM_commode_2_.FBX
Normal file
BIN
Assets/Art/SM_commode_2_.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_commode_2_.FBX.meta
Normal file
74
Assets/Art/SM_commode_2_.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ef8771875030cca4b8ae59900904752a
|
||||||
|
timeCreated: 1440297631
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Box065
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_commode_2_.fbm.meta
Normal file
9
Assets/Art/SM_commode_2_.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 36f98f419991a654d81ade73afcee8fa
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440297631
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_commode_2_.fbm/T_commode_1_D.tga
Normal file
BIN
Assets/Art/SM_commode_2_.fbm/T_commode_1_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_commode_2_.fbm/T_commode_1_D.tga.meta
Normal file
55
Assets/Art/SM_commode_2_.fbm/T_commode_1_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d75d0130f08061a43a0aec68715549dd
|
||||||
|
timeCreated: 1440297631
|
||||||
|
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/SM_table.FBX
Normal file
BIN
Assets/Art/SM_table.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_table.FBX.meta
Normal file
74
Assets/Art/SM_table.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ff2b042dd4c576b4ba51ed6b0e957121
|
||||||
|
timeCreated: 1440284354
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Cylinder014
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_table.fbm.meta
Normal file
9
Assets/Art/SM_table.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 10a913047a94a1b41bf313f4273e5a86
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440284353
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_table.fbm/T_table_D.tga
Normal file
BIN
Assets/Art/SM_table.fbm/T_table_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_table.fbm/T_table_D.tga.meta
Normal file
55
Assets/Art/SM_table.fbm/T_table_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f1cbbb7bae0a9934980958fe2306e229
|
||||||
|
timeCreated: 1440284354
|
||||||
|
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/SM_tabouret.FBX
Normal file
BIN
Assets/Art/SM_tabouret.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_tabouret.FBX.meta
Normal file
74
Assets/Art/SM_tabouret.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e83f1b2f7e5de9f44a09f7d66dc898df
|
||||||
|
timeCreated: 1440284352
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Object013
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_tabouret.fbm.meta
Normal file
9
Assets/Art/SM_tabouret.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 76a0454811dfb184aa70e365c856fb69
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440284352
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_tabouret.fbm/T_tabouret_3_D.tga
Normal file
BIN
Assets/Art/SM_tabouret.fbm/T_tabouret_3_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_tabouret.fbm/T_tabouret_3_D.tga.meta
Normal file
55
Assets/Art/SM_tabouret.fbm/T_tabouret_3_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 06bbdb9b44c5a504288eabb96a157aa6
|
||||||
|
timeCreated: 1440284352
|
||||||
|
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/SM_tabouret1_.FBX
Normal file
BIN
Assets/Art/SM_tabouret1_.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_tabouret1_.FBX.meta
Normal file
74
Assets/Art/SM_tabouret1_.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 324326cf6ad16a64182c8119aee4bf6b
|
||||||
|
timeCreated: 1440284352
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Object014
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_tabouret1_.fbm.meta
Normal file
9
Assets/Art/SM_tabouret1_.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: af3e70cf6e569fe42a2c5aa2b7e54029
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440284351
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_tabouret1_.fbm/T_tabouret_2_D.tga
Normal file
BIN
Assets/Art/SM_tabouret1_.fbm/T_tabouret_2_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_tabouret1_.fbm/T_tabouret_2_D.tga.meta
Normal file
55
Assets/Art/SM_tabouret1_.fbm/T_tabouret_2_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c0542fe0d656f204da3e7f7ea55becb2
|
||||||
|
timeCreated: 1440284351
|
||||||
|
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/SM_tabouret2_.FBX
Normal file
BIN
Assets/Art/SM_tabouret2_.FBX
Normal file
Binary file not shown.
74
Assets/Art/SM_tabouret2_.FBX.meta
Normal file
74
Assets/Art/SM_tabouret2_.FBX.meta
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f8d71ad97fe6bf24dbe88e556db405ef
|
||||||
|
timeCreated: 1440284353
|
||||||
|
licenseType: Free
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 18
|
||||||
|
fileIDToRecycleName:
|
||||||
|
100000: //RootNode
|
||||||
|
400000: //RootNode
|
||||||
|
2300000: //RootNode
|
||||||
|
3300000: //RootNode
|
||||||
|
4300000: Object012
|
||||||
|
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: 0
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
9
Assets/Art/SM_tabouret2_.fbm.meta
Normal file
9
Assets/Art/SM_tabouret2_.fbm.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 511df599df8ad51429919bfc32187698
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1440284353
|
||||||
|
licenseType: Free
|
||||||
|
DefaultImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Art/SM_tabouret2_.fbm/T_tabouret_1_D.tga
Normal file
BIN
Assets/Art/SM_tabouret2_.fbm/T_tabouret_1_D.tga
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 768 KiB |
55
Assets/Art/SM_tabouret2_.fbm/T_tabouret_1_D.tga.meta
Normal file
55
Assets/Art/SM_tabouret2_.fbm/T_tabouret_1_D.tga.meta
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 048f9d1e5a228bc4fbb04e5a0c775080
|
||||||
|
timeCreated: 1440284353
|
||||||
|
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/Prefabs/BunkBed.prefab
Normal file
BIN
Assets/Prefabs/BunkBed.prefab
Normal file
Binary file not shown.
8
Assets/Prefabs/BunkBed.prefab.meta
Normal file
8
Assets/Prefabs/BunkBed.prefab.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f93941ef628c4c84980e0c7f76463e59
|
||||||
|
timeCreated: 1440291993
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Prefabs/Pillow.prefab
Normal file
BIN
Assets/Prefabs/Pillow.prefab
Normal file
Binary file not shown.
8
Assets/Prefabs/Pillow.prefab.meta
Normal file
8
Assets/Prefabs/Pillow.prefab.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a576af077db55e24b82098add55cc9dc
|
||||||
|
timeCreated: 1440294303
|
||||||
|
licenseType: Free
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@ -7,6 +7,9 @@ public class Child : MonoBehaviour
|
|||||||
public float Speed = 10f;
|
public float Speed = 10f;
|
||||||
public float JumpForce = 10f;
|
public float JumpForce = 10f;
|
||||||
public float MaxInvulnerableTime = 2f;
|
public float MaxInvulnerableTime = 2f;
|
||||||
|
public float ThrowForce = 30f;
|
||||||
|
public float hitPushBackForce = 250f;
|
||||||
|
|
||||||
public GameObject GroundCheck;
|
public GameObject GroundCheck;
|
||||||
public Pillow pillow;
|
public Pillow pillow;
|
||||||
public MomBehavior Mom;
|
public MomBehavior Mom;
|
||||||
@ -51,14 +54,31 @@ public class Child : MonoBehaviour
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OnTriggerEnter(Collider other) {
|
void OnTriggerEnter(Collider other) {
|
||||||
if (other.tag == "Pillow") {
|
if (other.tag == "Pillow"){
|
||||||
|
|
||||||
pillow = other.GetComponent<Pillow>();
|
|
||||||
other.transform.parent = transform; // make the pillow a child of Child
|
|
||||||
|
|
||||||
// TODO: place the pillow correctly or animate or something...
|
|
||||||
|
|
||||||
//Debug.Log(_isGrounded);
|
Pillow incomingPillow = other.GetComponent<Pillow>();
|
||||||
|
|
||||||
|
// picking up a pillow
|
||||||
|
if (this.pillow == null && !incomingPillow.IsThrown) {
|
||||||
|
|
||||||
|
pillow = incomingPillow;
|
||||||
|
|
||||||
|
pillow.transform.parent = transform; // make the pillow a child of Child
|
||||||
|
pillow.transform.localPosition = new Vector3(0f, 1.5f, 0f);
|
||||||
|
pillow.GetComponent<Rigidbody>().isKinematic = true; // dont make pillow obey to gravity when in a child's hands
|
||||||
|
|
||||||
|
// TODO: place the pillow correctly or animate or something...
|
||||||
|
}
|
||||||
|
|
||||||
|
// getting hit by a pillow
|
||||||
|
else if (incomingPillow.IsThrown) {
|
||||||
|
|
||||||
|
//player is hit
|
||||||
|
Debug.Log("Child is hit by a pillow");
|
||||||
|
|
||||||
|
Push( other.GetComponent<Rigidbody>().velocity.normalized * 10 * hitPushBackForce);
|
||||||
|
Destroy(other.gameObject);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -152,6 +172,28 @@ public class Child : MonoBehaviour
|
|||||||
return colliders.Length > 0 ? colliders[0].GetComponent<Bed>() : null;
|
return colliders.Length > 0 ? colliders[0].GetComponent<Bed>() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal void Throw() {
|
||||||
|
|
||||||
|
if (pillow != null) {
|
||||||
|
|
||||||
|
Vector3 direction;
|
||||||
|
|
||||||
|
if (target != null) {
|
||||||
|
direction = target.transform.position - pillow.transform.position;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
direction = transform.forward;
|
||||||
|
}
|
||||||
|
direction = direction.normalized;
|
||||||
|
|
||||||
|
|
||||||
|
pillow.Throw(direction * ThrowForce);
|
||||||
|
|
||||||
|
pillow = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void OnCollisionEnter(Collision collision)
|
void OnCollisionEnter(Collision collision)
|
||||||
{
|
{
|
||||||
if (collision.gameObject.tag == "Lava")
|
if (collision.gameObject.tag == "Lava")
|
||||||
|
|||||||
@ -85,7 +85,7 @@ public class ChildController : MonoBehaviour
|
|||||||
else {
|
else {
|
||||||
transform.eulerAngles = new Vector3(
|
transform.eulerAngles = new Vector3(
|
||||||
transform.eulerAngles.x,
|
transform.eulerAngles.x,
|
||||||
Mathf.Atan2(xLookingValue, zLookingValue) * Mathf.Rad2Deg,
|
Mathf.Atan2(xLookingValue, zLookingValue) * Mathf.Rad2Deg -90, // -90 to correct forward facing angle...
|
||||||
transform.eulerAngles.z);
|
transform.eulerAngles.z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -111,6 +111,10 @@ public class ChildController : MonoBehaviour
|
|||||||
_child.WakeUp();
|
_child.WakeUp();
|
||||||
InputManager.Instance.PushActiveContext("Awake", (int)PlayerNumber);
|
InputManager.Instance.PushActiveContext("Awake", (int)PlayerNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (input.Actions.Contains("Throw")) {
|
||||||
|
_child.Throw();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,7 +8,6 @@ using InputHandler;
|
|||||||
|
|
||||||
public class MomBehavior : MonoBehaviour
|
public class MomBehavior : MonoBehaviour
|
||||||
{
|
{
|
||||||
public Action OnWarning;
|
|
||||||
public Action OnEnterRoom;
|
public Action OnEnterRoom;
|
||||||
public Action OnLeaveRoom;
|
public Action OnLeaveRoom;
|
||||||
|
|
||||||
@ -17,20 +16,23 @@ public class MomBehavior : MonoBehaviour
|
|||||||
public float MaxTriggerTime = 90f;
|
public float MaxTriggerTime = 90f;
|
||||||
public float WarningHeadsupTime = 5f;
|
public float WarningHeadsupTime = 5f;
|
||||||
public float MotherStayTime = 2f;
|
public float MotherStayTime = 2f;
|
||||||
|
public Door RoomDoor;
|
||||||
|
|
||||||
public Child[] Children;
|
public Child[] Children;
|
||||||
|
|
||||||
|
private enum State { Away, Warning, InRoom }
|
||||||
|
|
||||||
|
private State _currentState;
|
||||||
|
|
||||||
private float _elapsedTime = 0f;
|
private float _elapsedTime = 0f;
|
||||||
|
|
||||||
private float _nextTriggerTime;
|
private float _nextTriggerTime;
|
||||||
|
|
||||||
private bool _isInRoom;
|
|
||||||
|
|
||||||
private bool _gameOver = false;
|
private bool _gameOver = false;
|
||||||
|
|
||||||
public bool IsInRoom
|
public bool IsInRoom
|
||||||
{
|
{
|
||||||
get { return _isInRoom; }
|
get { return _currentState == State.InRoom; }
|
||||||
}
|
}
|
||||||
|
|
||||||
void Awake()
|
void Awake()
|
||||||
@ -46,83 +48,100 @@ public class MomBehavior : MonoBehaviour
|
|||||||
|
|
||||||
_elapsedTime += Time.deltaTime;
|
_elapsedTime += Time.deltaTime;
|
||||||
|
|
||||||
if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime)
|
switch (_currentState)
|
||||||
{
|
{
|
||||||
WarningText.gameObject.SetActive(true);
|
case State.Away:
|
||||||
|
if (_elapsedTime >= _nextTriggerTime - WarningHeadsupTime && _elapsedTime < _nextTriggerTime)
|
||||||
if (OnWarning != null)
|
|
||||||
{
|
|
||||||
OnWarning();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (_elapsedTime >= _nextTriggerTime)
|
|
||||||
{
|
|
||||||
WarningText.gameObject.SetActive(false);
|
|
||||||
_nextTriggerTime = GetNextTriggerTime();
|
|
||||||
|
|
||||||
_elapsedTime = 0f;
|
|
||||||
|
|
||||||
StartCoroutine(StayInRoom());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_isInRoom)
|
|
||||||
{
|
|
||||||
List<Child> safeChildren = new List<Child>();
|
|
||||||
|
|
||||||
foreach (Child child in Children)
|
|
||||||
{
|
|
||||||
if (child == null) continue;
|
|
||||||
|
|
||||||
if (child.IsSleeping)
|
|
||||||
{
|
{
|
||||||
safeChildren.Add(child);
|
SetState(State.Warning);
|
||||||
}
|
}
|
||||||
else
|
break;
|
||||||
|
case State.Warning:
|
||||||
|
if (_elapsedTime >= _nextTriggerTime)
|
||||||
{
|
{
|
||||||
Debug.Log("Player " + child.Index + " has been spotted by mom.");
|
SetState(State.InRoom);
|
||||||
|
}
|
||||||
// TODO: Visual animation that the player lost (lasso?)
|
break;
|
||||||
|
case State.InRoom:
|
||||||
Destroy(child.gameObject);
|
if (_elapsedTime >= 2f)
|
||||||
|
{
|
||||||
|
SetState(State.Away);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (safeChildren.Count == 0)
|
CheckIfSleeping();
|
||||||
{
|
break;
|
||||||
Debug.Log("Mom wins!");
|
|
||||||
|
|
||||||
MenusManager.Instance.ShowMenu("MomWinsMenu");
|
|
||||||
|
|
||||||
_gameOver = true;
|
|
||||||
}
|
|
||||||
else if (safeChildren.Count == 1)
|
|
||||||
{
|
|
||||||
Debug.Log("Player " + safeChildren[0].Index + " wins!");
|
|
||||||
|
|
||||||
PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu");
|
|
||||||
menu.SetPlayerIndex(safeChildren[0].Index);
|
|
||||||
|
|
||||||
_gameOver = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator StayInRoom()
|
private void SetState(State newState)
|
||||||
{
|
{
|
||||||
if (OnEnterRoom != null)
|
switch (newState)
|
||||||
{
|
{
|
||||||
OnEnterRoom();
|
case State.Away:
|
||||||
|
RoomDoor.Close(OnLeaveRoom);
|
||||||
|
_elapsedTime = 0f;
|
||||||
|
break;
|
||||||
|
case State.Warning:
|
||||||
|
// Temporary
|
||||||
|
WarningText.gameObject.SetActive(true);
|
||||||
|
|
||||||
|
RoomDoor.Open();
|
||||||
|
break;
|
||||||
|
case State.InRoom:
|
||||||
|
// Temporary
|
||||||
|
WarningText.gameObject.SetActive(false);
|
||||||
|
_nextTriggerTime = GetNextTriggerTime();
|
||||||
|
|
||||||
|
_elapsedTime = 0f;
|
||||||
|
|
||||||
|
if (OnEnterRoom != null)
|
||||||
|
{
|
||||||
|
OnEnterRoom();
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
_isInRoom = true;
|
_currentState = newState;
|
||||||
|
}
|
||||||
|
|
||||||
yield return new WaitForSeconds(MotherStayTime);
|
private void CheckIfSleeping()
|
||||||
|
{
|
||||||
|
List<Child> safeChildren = new List<Child>();
|
||||||
|
|
||||||
_isInRoom = false;
|
foreach (Child child in Children)
|
||||||
|
|
||||||
if (OnLeaveRoom != null)
|
|
||||||
{
|
{
|
||||||
OnLeaveRoom();
|
if (child == null) continue;
|
||||||
|
|
||||||
|
if (child.IsSleeping)
|
||||||
|
{
|
||||||
|
safeChildren.Add(child);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("Player " + child.Index + " has been spotted by mom.");
|
||||||
|
|
||||||
|
// TODO: Visual animation that the player lost (lasso?)
|
||||||
|
|
||||||
|
Destroy(child.gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (safeChildren.Count == 0)
|
||||||
|
{
|
||||||
|
Debug.Log("Mom wins!");
|
||||||
|
|
||||||
|
MenusManager.Instance.ShowMenu("MomWinsMenu");
|
||||||
|
|
||||||
|
_gameOver = true;
|
||||||
|
}
|
||||||
|
else if (safeChildren.Count == 1)
|
||||||
|
{
|
||||||
|
Debug.Log("Player " + safeChildren[0].Index + " wins!");
|
||||||
|
|
||||||
|
PlayerWinsMenu menu = (PlayerWinsMenu)MenusManager.Instance.ShowMenu("PlayerWinsMenu");
|
||||||
|
menu.SetPlayerIndex(safeChildren[0].Index);
|
||||||
|
|
||||||
|
_gameOver = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,28 +4,51 @@ using System.Collections;
|
|||||||
public class Pillow : MonoBehaviour {
|
public class Pillow : MonoBehaviour {
|
||||||
|
|
||||||
public bool IsThrown = false;
|
public bool IsThrown = false;
|
||||||
|
|
||||||
|
private bool IsPickable = true;
|
||||||
|
|
||||||
|
private Collider _col;
|
||||||
|
private Rigidbody _rb;
|
||||||
|
|
||||||
|
|
||||||
// Use this for initialization
|
// Use this for initialization
|
||||||
void Start () {
|
void Start () {
|
||||||
|
_col = GetComponent<Collider>();
|
||||||
|
_rb = GetComponent<Rigidbody>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update () {
|
void Update () {
|
||||||
if (transform.position.y < -10) {
|
|
||||||
|
if (transform.position.y < -1) {
|
||||||
Destroy(this.gameObject);
|
Destroy(this.gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnTriggerEnter(Collider other) {
|
void OnCollisionEnter(Collision other) {
|
||||||
if (IsThrown && other.tag == "Player") {
|
if (!IsPickable) {
|
||||||
|
// on first collision, revert the pillow as pickable
|
||||||
Debug.Log("A child got hit by a pillow!");
|
MakePickable();
|
||||||
|
|
||||||
//other.GetComponent<Child>().takeHit();
|
|
||||||
|
|
||||||
Destroy(this.gameObject);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void Throw(Vector3 force) {
|
||||||
|
IsThrown = true;
|
||||||
|
IsPickable = false;
|
||||||
|
transform.parent = null; // detach the pillow from the child object
|
||||||
|
_rb.isKinematic = false;
|
||||||
|
_col.enabled = true;
|
||||||
|
_rb.AddForce(force, ForceMode.Impulse);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void MakePickable() {
|
||||||
|
IsThrown = false;
|
||||||
|
IsPickable = true;
|
||||||
|
|
||||||
|
_col.enabled = true;
|
||||||
|
_rb.isKinematic = false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,41 +1,70 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System;
|
||||||
|
|
||||||
public class Door : MonoBehaviour {
|
public class Door : MonoBehaviour
|
||||||
|
{
|
||||||
private float state = 0f; //From 0 to 1 (closed to open)
|
public float MaxAngle = 135f;
|
||||||
private float goal = -1f; //-1 or 1
|
public float OpenDuration = 5f;
|
||||||
public float angles;
|
public float CloseDuration = 1f;
|
||||||
public float openingSpeed;
|
|
||||||
public AnimationCurve curvature;
|
|
||||||
|
|
||||||
// Use this for initialization
|
/*
|
||||||
void Start () {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update () {
|
void Update ()
|
||||||
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.A))
|
|
||||||
{
|
|
||||||
goal *= -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
state = Mathf.Clamp(state + goal * openingSpeed * Time.deltaTime, 0f, 1f);
|
state = Mathf.Clamp(state + goal * openingSpeed * Time.deltaTime, 0f, 1f);
|
||||||
|
|
||||||
//transform.rotation = Quaternion.identity;
|
//transform.rotation = Quaternion.identity;
|
||||||
//transform.Rotate(Vector3.up * state * angles);
|
//transform.Rotate(Vector3.up * state * angles);
|
||||||
transform.rotation = Quaternion.Euler(Vector3.up * curvature.Evaluate(state) * -angles);
|
transform.rotation = Quaternion.Euler(Vector3.up * curvature.Evaluate(state) * -angles);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
public void Open()
|
public void Open()
|
||||||
{
|
{
|
||||||
|
StartCoroutine(OpenDoor());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Close()
|
private IEnumerator OpenDoor()
|
||||||
{
|
{
|
||||||
|
Vector3 initialRot = transform.localEulerAngles;
|
||||||
|
Vector3 finalRot = new Vector3(initialRot.x, initialRot.y - MaxAngle, initialRot.z);
|
||||||
|
|
||||||
}
|
float ratio = 0f;
|
||||||
|
|
||||||
|
while (ratio < 1f)
|
||||||
|
{
|
||||||
|
ratio += Time.deltaTime / OpenDuration;
|
||||||
|
|
||||||
|
transform.localEulerAngles = Vector3.Lerp(initialRot, finalRot, ratio);
|
||||||
|
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Close(Action callback)
|
||||||
|
{
|
||||||
|
StartCoroutine("CloseDoor", callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerator CloseDoor(object callback)
|
||||||
|
{
|
||||||
|
Vector3 initialRot = transform.localEulerAngles;
|
||||||
|
Vector3 finalRot = new Vector3(initialRot.x, initialRot.y + MaxAngle, initialRot.z);
|
||||||
|
|
||||||
|
float ratio = 0f;
|
||||||
|
|
||||||
|
while (ratio < 1f)
|
||||||
|
{
|
||||||
|
ratio += Time.deltaTime / CloseDuration;
|
||||||
|
|
||||||
|
transform.localEulerAngles = Vector3.Lerp(initialRot, finalRot, Mathf.Pow(ratio, 4));
|
||||||
|
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (callback != null)
|
||||||
|
{
|
||||||
|
((Action)callback)();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user