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

Add proper sticks to main scene

This commit is contained in:
Jens Pitkänen 2020-04-19 05:05:54 +03:00
parent c858bb5bd6
commit f43ba19be0
8 changed files with 994 additions and 2308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/Prefabs/Burnables.meta → Assets/Burn Qualities.meta
View File

0
Assets/Prefabs/Burnables/Stick Burn Quality.asset → Assets/Burn Qualities/Stick Burn Quality.asset
View File

0
Assets/Prefabs/Burnables/Stick Burn Quality.asset.meta → Assets/Burn Qualities/Stick Burn Quality.asset.meta
View File

171
Assets/Prefabs/Burnables/Stick.prefab
View File

@ -1,171 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5145448032959125661
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3101902165573212776}
- component: {fileID: 5080344277934357577}
- component: {fileID: 8966079174287621822}
- component: {fileID: 2134983512241497966}
m_Layer: 10
m_Name: Cylinder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3101902165573212776
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5145448032959125661}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.2, z: 0.1}
m_Children: []
m_Father: {fileID: 9177655811231306216}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &5080344277934357577
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5145448032959125661}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8966079174287621822
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5145448032959125661}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &2134983512241497966
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5145448032959125661}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.0000001, y: 2.0000005, z: 1.0000005}
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940699}
--- !u!1 &9177655811231306215
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9177655811231306216}
- component: {fileID: 456025085184268836}
- component: {fileID: 8167482766655706823}
- component: {fileID: 2107507585819105735}
m_Layer: 0
m_Name: Stick
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9177655811231306216
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9177655811231306215}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.296, y: 2, z: 0.147}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3101902165573212776}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &456025085184268836
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9177655811231306215}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &8167482766655706823
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9177655811231306215}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f70b810850590804092bb2c772ea6012, type: 3}
m_Name:
m_EditorClassIdentifier:
Grabbed: 0
--- !u!114 &2107507585819105735
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9177655811231306215}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b647d1ea5d6785a4d8e6f6b2208e5f1c, type: 3}
m_Name:
m_EditorClassIdentifier:
Quality: {fileID: 11400000, guid: 273b9cf97d0c80e449f24a33a2d261d1, type: 2}

7
Assets/Prefabs/Burnables/Stick.prefab.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 46cbe90ffaf140c4990d7e0232834b91
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@ -1,5 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!64 &6294591651480027558
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 992576804869936758}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 14
m_Mesh: {fileID: 5385617091279237461, guid: 88768e5e916bdea47b890bb833348313, type: 3}
--- !u!1 &2086008818391599545
GameObject:
m_ObjectHideFlags: 0
@ -9,8 +23,11 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1830340994370403595}
m_Layer: 0
m_Name: stick
- component: {fileID: 3556743581346332214}
- component: {fileID: 4588890757707193608}
- component: {fileID: 1732996613952540235}
m_Layer: 10
m_Name: Stick
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -31,6 +48,48 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3556743581346332214
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2086008818391599545}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f70b810850590804092bb2c772ea6012, type: 3}
m_Name:
m_EditorClassIdentifier:
Grabbed: 0
--- !u!114 &4588890757707193608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2086008818391599545}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b647d1ea5d6785a4d8e6f6b2208e5f1c, type: 3}
m_Name:
m_EditorClassIdentifier:
Quality: {fileID: 11400000, guid: 273b9cf97d0c80e449f24a33a2d261d1, type: 2}
--- !u!54 &1732996613952540235
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2086008818391599545}
serializedVersion: 2
m_Mass: 0.4
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &9144482413452185471
PrefabInstance:
m_ObjectHideFlags: 0
@ -56,22 +115,22 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.5868687
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.5010344
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.39444327
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.49896312
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
@ -81,32 +140,32 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -10.976001
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -101.213005
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90.00001
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalScale.x
value: 147.75279
value: 200
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalScale.y
value: 147.75279
value: 200
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_LocalScale.z
value: 147.75279
value: 200
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
@ -118,8 +177,19 @@ PrefabInstance:
propertyPath: m_Name
value: stick (1)
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88768e5e916bdea47b890bb833348313, type: 3}
--- !u!1 &992576804869936758 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 88768e5e916bdea47b890bb833348313,
type: 3}
m_PrefabInstance: {fileID: 9144482413452185471}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4295605565537018981 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313,

3029
Assets/Scenes/MainScene.unity
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/Burnable.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
[RequireComponent(typeof(Rigidbody))]
public class Burnable : MonoBehaviour {
public BurnQuality Quality;
}