NeonTea
/
campfire
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stick collision and torch duration

This commit is contained in:
Jens Pitkänen 2020-04-20 05:29:27 +03:00
parent c2ea2e65d3
commit 52a8c2d6d3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Prefabs/Environment/BurningStick.prefab
View File

@ -49,8 +49,8 @@ MonoBehaviour:
Light: {fileID: 235010646391593287} Light: {fileID: 235010646391593287}
NormalColor: {r: 1, g: 0.88479936, b: 0.759434, a: 1} NormalColor: {r: 1, g: 0.88479936, b: 0.759434, a: 1}
PanicColor: {r: 1, g: 0.65243995, b: 0.4481132, a: 1} PanicColor: {r: 1, g: 0.65243995, b: 0.4481132, a: 1}
Lifetime: 10 Lifetime: 60
PanicLifetimeThreshold: 5 PanicLifetimeThreshold: 20
--- !u!1 &3363062943258591200 --- !u!1 &3363062943258591200
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -76,7 +76,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3363062943258591200} m_GameObject: {fileID: 3363062943258591200}
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: 0.307, z: 0.5} m_LocalPosition: {x: 0, y: 0.384, z: 0.152}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1830340994370403595} m_Father: {fileID: 1830340994370403595}
@ -169,7 +169,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6731946952526266997} m_GameObject: {fileID: 6731946952526266997}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.0075, y: 0.4445, z: -0.0039} m_LocalPosition: {x: 0.0075, y: 0.2145, z: -0.0039}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1830340994370403595} m_Father: {fileID: 1830340994370403595}
@ -4921,7 +4921,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: e44ff149e18c4334b82caa71b1fae7f7, - target: {fileID: -4216859302048453862, guid: e44ff149e18c4334b82caa71b1fae7f7,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -0.23
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: e44ff149e18c4334b82caa71b1fae7f7, - target: {fileID: -4216859302048453862, guid: e44ff149e18c4334b82caa71b1fae7f7,
type: 3} type: 3}

18
Assets/Prefabs/Environment/stick.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 4588890757707193608} - component: {fileID: 4588890757707193608}
- component: {fileID: 1732996613952540235} - component: {fileID: 1732996613952540235}
m_Layer: 10 m_Layer: 10
m_Name: stick m_Name: Stick
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -27,7 +27,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2086008818391599545} m_GameObject: {fileID: 2086008818391599545}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.583, y: 0.964, z: -0.598} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 4295605565537018981} - {fileID: 4295605565537018981}
@ -101,13 +101,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8445609960004857605} m_GameObject: {fileID: 8445609960004857605}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.002, y: 0.1136, z: 0.0031} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.0355564, y: 0.032333814, z: 0.2398695} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1830340994370403595} m_Father: {fileID: 1830340994370403595}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8953589864355665736 --- !u!65 &8953589864355665736
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -119,7 +119,7 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 0.05, y: 0.48, z: 0.06}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &9144482413452185471 --- !u!1001 &9144482413452185471
PrefabInstance: PrefabInstance:
@ -136,7 +136,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -0.23
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3} type: 3}
@ -206,7 +206,7 @@ PrefabInstance:
- target: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313, - target: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: stick (1) value: Stick
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313, - target: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313,
type: 3} type: 3}