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

Misc fixes

This commit is contained in:
Jens Pitkänen 2020-04-19 23:22:24 +03:00
parent cd1c3f27d4
commit dff09ea028
4 changed files with 93 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
Assets/Scenes/MainScene.unity
View File

@ -334,7 +334,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &237467733
GameObject:
@ -428,75 +428,6 @@ Light:
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &311702584
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2469457951508719009, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_Name
value: PineTree
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalPosition.x
value: 13.882904
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalPosition.z
value: 11.874908
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5327936629455661424, guid: 46e8ab3179fc53841920eb9ab6986b24,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 46e8ab3179fc53841920eb9ab6986b24, type: 3}
--- !u!1001 &397359278
PrefabInstance:
m_ObjectHideFlags: 0
@ -2143,75 +2074,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1475581714}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1487796365
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalPosition.x
value: 14.694244
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.000122
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.8123627
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6700814859666117554, guid: 410d196d969ed404a883c67749ad3170,
type: 3}
propertyPath: m_Name
value: LefaTree
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 410d196d969ed404a883c67749ad3170, type: 3}
--- !u!1001 &1512016787
PrefabInstance:
m_ObjectHideFlags: 0
@ -2489,7 +2351,7 @@ Transform:
- {fileID: 1694329891}
- {fileID: 1467350795}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1694329890
GameObject:
@ -2948,82 +2810,13 @@ RectTransform:
- {fileID: 1344354208}
- {fileID: 429180126}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1001 &1932969144
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3828898392337730748, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_Name
value: DeadTree
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalPosition.x
value: 9.048676
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.5434723
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6146008682649884421, guid: b6ff003e05b42fb4e9319ea8bb82d882,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b6ff003e05b42fb4e9319ea8bb82d882, type: 3}
--- !u!1 &2038862783
GameObject:
m_ObjectHideFlags: 0
@ -3375,7 +3168,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &531861614376686525
PrefabInstance:

113
Assets/Scenes/Yee.unity
View File

@ -782,6 +782,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
GameState: {fileID: 834592896}
Options: {fileID: 5400695019531174118}
Mixer: {fileID: 24100000, guid: 032de345950918c4e89684078c6a7213, type: 2}
PlayingSnapshot: {fileID: -3105936107480203619, guid: 032de345950918c4e89684078c6a7213,
type: 2}
@ -1541,31 +1542,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1927089121}
m_PrefabAsset: {fileID: 0}
--- !u!1 &429180125 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 531861614786402144, guid: 0a942b74adc03b248ac74ce8af504ca5,
type: 3}
m_PrefabInstance: {fileID: 531861614376686525}
m_PrefabAsset: {fileID: 0}
--- !u!224 &429180126 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 531861614786402147, guid: 0a942b74adc03b248ac74ce8af504ca5,
type: 3}
m_PrefabInstance: {fileID: 531861614376686525}
m_PrefabAsset: {fileID: 0}
--- !u!114 &429180127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 429180125}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a7f3567286257eb4fb092e419d7e7e71, type: 3}
m_Name:
m_EditorClassIdentifier:
GameState: {fileID: 834592896}
--- !u!4 &470463894 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1416060363081332451, guid: 410d196d969ed404a883c67749ad3170,
@ -4427,7 +4409,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1921606960}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4448,7 +4430,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -5230,7 +5212,7 @@ RectTransform:
m_Children:
- {fileID: 1849724585}
m_Father: {fileID: 1921606960}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5246,8 +5228,8 @@ CanvasGroup:
m_GameObject: {fileID: 1364366411}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!4 &1386360587 stripped
Transform:
@ -6580,6 +6562,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8651001597528790401, guid: 8ee6eecf5317b4841817712d24763e37,
type: 3}
propertyPath: GameState
value:
objectReference: {fileID: 834592896}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ee6eecf5317b4841817712d24763e37, type: 3}
--- !u!4 &1570118683 stripped
@ -7646,7 +7633,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -7968,9 +7955,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1344354208}
- {fileID: 1364366412}
- {fileID: 1156509021}
- {fileID: 1344354208}
- {fileID: 429180126}
m_Father: {fileID: 0}
m_RootOrder: 2
@ -8882,6 +8869,11 @@ PrefabInstance:
propertyPath: m_Interactable
value: 0
objectReference: {fileID: 0}
- target: {fileID: 452814073520004166, guid: 0a942b74adc03b248ac74ce8af504ca5,
type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 531861614786402144, guid: 0a942b74adc03b248ac74ce8af504ca5,
type: 3}
propertyPath: m_Name
@ -8992,6 +8984,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9067262984299284594, guid: 0a942b74adc03b248ac74ce8af504ca5,
type: 3}
propertyPath: GameState
value:
objectReference: {fileID: 834592896}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3}
--- !u!1001 &5400695019531174117
@ -9001,6 +8998,26 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1921606960}
m_Modifications:
- target: {fileID: 317676106527232818, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 410328268247982429, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1470294652521727049, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3682198691915602031, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3965423868489175230, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
@ -9011,6 +9028,11 @@ PrefabInstance:
propertyPath: m_Alpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5400695020334462788, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_BlocksRaycasts
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_LocalPosition.x
@ -9024,7 +9046,7 @@ PrefabInstance:
- target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
@ -9051,6 +9073,26 @@ PrefabInstance:
propertyPath: m_Name
value: Pause Menu
objectReference: {fileID: 0}
- target: {fileID: 6723009973072559076, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6793835621275301599, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8362288861398798554, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8596077905715532586, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8904450836871494407, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
propertyPath: m_AnchorMax.y
@ -9058,6 +9100,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3}
--- !u!114 &5400695019531174118 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2837007226937140173, guid: 2cd64e49ad7ad1c4bb4a4264703d7915,
type: 3}
m_PrefabInstance: {fileID: 5400695019531174117}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4082236b98d7bfb42b8cd2b342f7f31c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6125707629521091122
PrefabInstance:
m_ObjectHideFlags: 0
@ -9075,6 +9129,11 @@ PrefabInstance:
propertyPath: GameState
value:
objectReference: {fileID: 834592896}
- target: {fileID: 6125707630481988370, guid: 558201eae20fa5540a826edb23937665,
type: 3}
propertyPath: Options
value:
objectReference: {fileID: 5400695019531174118}
- target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665,
type: 3}
propertyPath: m_LocalPosition.x

4
Assets/Scripts/Flame.cs
View File

@ -1,5 +1,5 @@
using System.Collections;
using System.Collections.Generic;
#pragma warning disable CS0618
using UnityEngine;
[ExecuteAlways]

2
Assets/Scripts/Options.cs
View File

@ -13,7 +13,7 @@ public class Options : MonoBehaviour {
private void Awake() {
InvertMouseX = false;
InvertMouseY = false;
CameraBobbing = false;
CameraBobbing = true;
MouseSensitivity = 2f;
MasterVolume = 0.3f;
CampfireVolume = 1f;