Merge branch 'hdrp' of https://git.bit5.ru/r.nikolin/rabidus-test into hdrp
This commit is contained in:
commit
380deb29bf
File diff suppressed because it is too large
Load Diff
|
@ -652,6 +652,11 @@ PrefabInstance:
|
||||||
propertyPath: spawned.Array.data[5].rotation.z
|
propertyPath: spawned.Array.data[5].rotation.z
|
||||||
value: 0.087249026
|
value: 0.087249026
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 936928571483295304, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: spawned.Array.data[24].rotation.y
|
||||||
|
value: 0.042043038
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 936928571614691587, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 936928571614691587, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: _rawSamples.Array.data[0].up.x
|
propertyPath: _rawSamples.Array.data[0].up.x
|
||||||
|
@ -1127,6 +1132,26 @@ PrefabInstance:
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1585878652112193086, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1734252198549141781, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1734252198549141781, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1734252198549141781, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2405160406628050680, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 2405160406628050680, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -1522,6 +1547,11 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalRotation.z
|
propertyPath: m_LocalRotation.z
|
||||||
value: 0.038546298
|
value: 0.038546298
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3527110335546942821, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Size
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 3527110335546942821, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 3527110335546942821, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Value
|
propertyPath: m_Value
|
||||||
|
@ -1532,20 +1562,25 @@ PrefabInstance:
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3617012300356075120, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -0.000030517578
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 68.5863
|
value: 75
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: -10.121435
|
value: -9.8
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 268.08087
|
value: 267.1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 4198722582663188243, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -1572,6 +1607,11 @@ PrefabInstance:
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4543572722188107984, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0.00021362305
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5781701973181615971, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 5781701973181615971, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -1867,6 +1907,16 @@ PrefabInstance:
|
||||||
propertyPath: _clipFromSample.up.z
|
propertyPath: _clipFromSample.up.z
|
||||||
value: 0.0074506663
|
value: 0.0074506663
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7868072697293516880, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Size
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7868072697293516880, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Value
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8091035853936515696, guid: 9833bf56bae880743a209d376ff78b67,
|
- target: {fileID: 8091035853936515696, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: _clipFromSample.up.x
|
propertyPath: _clipFromSample.up.x
|
||||||
|
@ -1890,6 +1940,12 @@ Transform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 267753515711800827}
|
m_PrefabInstance: {fileID: 267753515711800827}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &1060566879089863695 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 936928572099987956, guid: 9833bf56bae880743a209d376ff78b67,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 267753515711800827}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &839020763146513164
|
--- !u!1001 &839020763146513164
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1959,3 +2015,72 @@ PrefabInstance:
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: b0bde6fac39c3e24a86072ee05ed4520, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: b0bde6fac39c3e24a86072ee05ed4520, type: 3}
|
||||||
|
--- !u!1001 &9081346507769197105
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 1060566879089863695}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 50
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 75.3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: -1.9
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 313.4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.96355647
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0.015138441
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0.26536718
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0.030168453
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513762, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3028706887086513766, guid: d4a2612f0eceacd47b6bcf78e825e482,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: EnergyItem (1)
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: d4a2612f0eceacd47b6bcf78e825e482, type: 3}
|
||||||
|
|
Loading…
Reference in New Issue