Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb
This commit is contained in:
		@@ -14537,6 +14537,46 @@ PrefabInstance:
 | 
			
		||||
      propertyPath: m_Name
 | 
			
		||||
      value: water2
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalScale.x
 | 
			
		||||
      value: 0.98429507
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalScale.y
 | 
			
		||||
      value: 0.95135957
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.x
 | 
			
		||||
      value: 0.00007
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.y
 | 
			
		||||
      value: 0.0114
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.b
 | 
			
		||||
      value: 0.5932776
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.g
 | 
			
		||||
      value: 1
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.r
 | 
			
		||||
      value: 0.22075468
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.b
 | 
			
		||||
      value: 0.5769551
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.g
 | 
			
		||||
      value: 0.745283
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.r
 | 
			
		||||
      value: 0.16452472
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_RootOrder
 | 
			
		||||
      value: 14
 | 
			
		||||
@@ -26924,11 +26964,31 @@ PrefabInstance:
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalScale.x
 | 
			
		||||
      value: 0.98346794
 | 
			
		||||
      value: 0.9749355
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalScale.y
 | 
			
		||||
      value: 0.9773292
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.x
 | 
			
		||||
      value: -0.001447
 | 
			
		||||
      value: -0.002759
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_LocalPosition.y
 | 
			
		||||
      value: -0.0015
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.b
 | 
			
		||||
      value: 0.45489684
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.g
 | 
			
		||||
      value: 0.9433962
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_Color.r
 | 
			
		||||
      value: 0.32395867
 | 
			
		||||
      objectReference: {fileID: 0}
 | 
			
		||||
    - target: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3}
 | 
			
		||||
      propertyPath: m_RootOrder
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -1170,7 +1170,7 @@ AudioSource:
 | 
			
		||||
  m_Enabled: 1
 | 
			
		||||
  serializedVersion: 4
 | 
			
		||||
  OutputAudioMixerGroup: {fileID: 0}
 | 
			
		||||
  m_audioClip: {fileID: 8300000, guid: e7278b4bebe79784b9977672a9fc8e8a, type: 3}
 | 
			
		||||
  m_audioClip: {fileID: 8300000, guid: 183c10c135b624f7ea121037664d8580, type: 3}
 | 
			
		||||
  m_PlayOnAwake: 1
 | 
			
		||||
  m_Volume: 1
 | 
			
		||||
  m_Pitch: 1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user