Skip to content
Snippets Groups Projects
Commit cf95c495 authored by Kristýna Janovská's avatar Kristýna Janovská
Browse files

Merge branch 'dev' of...

parents ef7829c0 74046cdc
No related branches found
No related tags found
No related merge requests found
Pipeline #248695 passed
...@@ -18235,7 +18235,7 @@ PrefabInstance: ...@@ -18235,7 +18235,7 @@ PrefabInstance:
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -38.219 value: -37.816
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
...@@ -18250,7 +18250,7 @@ PrefabInstance: ...@@ -18250,7 +18250,7 @@ PrefabInstance:
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
...@@ -18260,7 +18260,7 @@ PrefabInstance: ...@@ -18260,7 +18260,7 @@ PrefabInstance:
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
...@@ -18275,7 +18275,7 @@ PrefabInstance: ...@@ -18275,7 +18275,7 @@ PrefabInstance:
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 180 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664, - target: {fileID: 1506511303134764813, guid: e39fb4110f0dc19448c72afbc68e6664,
type: 3} type: 3}
...@@ -86,6 +86,7 @@ MonoBehaviour: ...@@ -86,6 +86,7 @@ MonoBehaviour:
- {fileID: -7388006016910938040} - {fileID: -7388006016910938040}
- {fileID: 2931124856128760629} - {fileID: 2931124856128760629}
- {fileID: 3292014902765919293} - {fileID: 3292014902765919293}
- {fileID: 3791532438475793846}
--- !u!114 &2931124856128760629 --- !u!114 &2931124856128760629
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
...@@ -127,3 +128,25 @@ MonoBehaviour: ...@@ -127,3 +128,25 @@ MonoBehaviour:
mode: mode:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 2 m_Value: 2
--- !u!114 &3791532438475793846
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5485954d14dfb9a4c8ead8edb0ded5b1, type: 3}
m_Name: LiftGammaGain
m_EditorClassIdentifier:
active: 1
lift:
m_OverrideState: 0
m_Value: {x: 1, y: 1, z: 1, w: 0}
gamma:
m_OverrideState: 1
m_Value: {x: 1, y: 1, z: 1, w: 0.08311688}
gain:
m_OverrideState: 0
m_Value: {x: 1, y: 1, z: 1, w: 0}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment