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

Misc fixes

Browse Source
This commit is contained in:
Jens Pitkänen 2020-04-20 03:38:37 +03:00
parent e68df78beb
commit c7667eca42
9 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Burn Qualities/Stick Burn Quality.asset
View File

@ -15,3 +15,4 @@ MonoBehaviour:
FuelValue: 5
FlameEffect: 0.7
SoundEffect: 1.5
Ignitable: 1

27
Assets/Prefabs/Environment/DeadTree.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3828898392337730748}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.407, y: 0, z: -1.24}
m_LocalPosition: {x: -2.407, y: -0.11852026, z: -1.24}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 669944596385405257}
@ -44,6 +44,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 049498ca6910d2d4d915c7a47791a4dc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!136 &3559412524811406020
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4546180240118410074}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.002
m_Height: 0.03
m_Direction: 2
m_Center: {x: 0.0002456251, y: 0.0014098934, z: 0.014013803}
--- !u!1001 &5491765641430381139
PrefabInstance:
m_ObjectHideFlags: 0
@ -126,6 +140,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2}
- target: {fileID: -1504981713932161579, guid: ae19706e422d48b4384dd004bef022d4,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: ae19706e422d48b4384dd004bef022d4,
type: 3}
propertyPath: m_Name
@ -133,6 +152,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ae19706e422d48b4384dd004bef022d4, type: 3}
--- !u!1 &4546180240118410074 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: ae19706e422d48b4384dd004bef022d4,
type: 3}
m_PrefabInstance: {fileID: 5491765641430381139}
m_PrefabAsset: {fileID: 0}
--- !u!4 &669944596385405257 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: ae19706e422d48b4384dd004bef022d4,

17
Assets/Prefabs/Environment/Foliage.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3986516409580175158}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.625, y: 0, z: -1.461}
m_LocalPosition: {x: -0.625, y: -0.19786787, z: -1.461}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4062859912688411040}
@ -111,6 +111,21 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: ce6371ce3a8420d42a2c6f94b76ab224, type: 2}
- target: {fileID: -1504981713932161579, guid: 006cefd98002a17459397b4536a46054,
type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 006cefd98002a17459397b4536a46054,
type: 3}
propertyPath: m_ReceiveShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 006cefd98002a17459397b4536a46054,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 006cefd98002a17459397b4536a46054,
type: 3}
propertyPath: m_Name

12
Assets/Prefabs/Environment/LefaTree.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6700814859666117554}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.53, y: 0, z: 0.47}
m_LocalPosition: {x: -2.53, y: -0.10917902, z: 0.47}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 907746880502108434}
@ -131,11 +131,21 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: ce6371ce3a8420d42a2c6f94b76ab224, type: 2}
- target: {fileID: 449489735629676091, guid: 69199c2062afc1f41908440ccbf9b84f,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5325818365212002807, guid: 69199c2062afc1f41908440ccbf9b84f,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2}
- target: {fileID: 5325818365212002807, guid: 69199c2062afc1f41908440ccbf9b84f,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 69199c2062afc1f41908440ccbf9b84f, type: 3}
--- !u!4 &907746880502108434 stripped

12
Assets/Prefabs/Environment/PineTree.prefab
View File

@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2469457951508719009}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.655, y: 0, z: -3.685}
m_LocalPosition: {x: -2.655, y: -0.032812595, z: -3.685}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7159935559873607530}
@ -126,6 +126,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2dcd2cd2f8bead34c90107282712c6ae, type: 2}
- target: {fileID: -1867164823436825046, guid: 5e924ac251896824783ca38373727892,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 5e924ac251896824783ca38373727892,
type: 3}
propertyPath: m_Name
@ -136,6 +141,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2}
- target: {fileID: 5325818365212002807, guid: 5e924ac251896824783ca38373727892,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e924ac251896824783ca38373727892, type: 3}
--- !u!4 &7159935559873607530 stripped

4
Assets/Prefabs/Player/Player.prefab
View File

@ -320,7 +320,7 @@ GameObject:
- component: {fileID: 462937706053753531}
m_Layer: 11
m_Name: Player
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -424,7 +424,7 @@ MonoBehaviour:
ThrowVelocity: 6
TorchPrefab: {fileID: 2086008818391599545, guid: dc8417fd4adf1fb41a9ac47d53341a6e,
type: 3}
GrabbedItem: {fileID: 0}
GrabbedItems: []
Torch: {fileID: 0}
--- !u!114 &462937706053753531
MonoBehaviour:

2
Assets/Scripts/AutoListPositioner.cs
View File

@ -8,7 +8,7 @@ public class AutoListPositioner : MonoBehaviour {
public List<float> SpecificPaddings;
private void Update() {
if (Application.isEditor) {
if (!Application.isPlaying) {
for (int Index = SpecificPaddings.Count; Index < transform.childCount - 1; Index++) {
SpecificPaddings.Add(Padding);
}

1
Assets/Scripts/BurnQuality.cs
View File

@ -7,4 +7,5 @@ public class BurnQuality : ScriptableObject {
public float FuelValue;
public float FlameEffect;
public float SoundEffect;
public bool Ignitable;
}

2
Assets/Scripts/TerrainModelPlacer.cs
View File

@ -5,7 +5,7 @@ using UnityEngine;
[ExecuteAlways]
public class TerrainModelPlacer : MonoBehaviour {
private void Update() {
if (Application.isEditor) {
if (!Application.isPlaying) {
// Update is called in editor when values change
Terrain Terrain = GameObject.FindObjectOfType<Terrain>();
Vector3 Pos = transform.position;