cailean
/
beep-final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

merge done

main
cailean 2 years ago
parent
a0357757c4
commit
5e81f5749b
1 changed files with 9 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      Assets/6_Scenes/Beep.unity

33
Assets/6_Scenes/Beep.unity
View File

@ -350,7 +350,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83569712} m_GameObject: {fileID: 83569712}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.09285925, y: 0.45725608, z: -0.04807753, w: -0.8831663} m_LocalRotation: {x: -0.09285962, y: 0.45725456, z: -0.048077524, w: -0.883167}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -747,7 +747,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155411616} m_GameObject: {fileID: 155411616}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.15844774, y: 0.45239735, z: -0.082035385, w: -0.87378556} m_LocalRotation: {x: -0.15844774, y: 0.45239738, z: -0.08203539, w: -0.87378556}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -2403,7 +2403,7 @@ Camera:
m_Iso: 50 m_Iso: 50
m_ShutterSpeed: 0.002 m_ShutterSpeed: 0.002
m_Aperture: 3.6 m_Aperture: 3.6
m_FocusDistance: 8.544008 m_FocusDistance: 8.543994
m_FocalLength: 35.000004 m_FocalLength: 35.000004
m_BladeCount: 5 m_BladeCount: 5
m_Curvature: {x: 26.748837, y: 32} m_Curvature: {x: 26.748837, y: 32}
@ -2445,7 +2445,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470663197} m_GameObject: {fileID: 470663197}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.04618708, y: 0.9504154, z: -0.17234343, w: 0.25470608} m_LocalRotation: {x: 0.046187077, y: 0.9504154, z: -0.17234343, w: 0.25470605}
m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261} m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -5061,7 +5061,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &999681661 --- !u!4 &999681661
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5348,7 +5348,7 @@ Transform:
m_GameObject: {fileID: 1124157896} m_GameObject: {fileID: 1124157896}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696} m_LocalRotation: {x: -0, y: -0.97678393, z: -0, w: 0.21422696}
m_LocalPosition: {x: 5.6286316, y: -3.307354, z: 10.080261} m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -5693,7 +5693,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1178814724} m_GameObject: {fileID: 1178814724}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.15844774, y: 0.45239738, z: -0.08203539, w: -0.87378556} m_LocalRotation: {x: -0.15844774, y: 0.45239735, z: -0.082035385, w: -0.87378556}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -6213,7 +6213,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1357627196 --- !u!4 &1357627196
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -7022,11 +7022,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: 360 Projection Center value: 360 Projection Center
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 933460690407818085, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838, - target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -7836,7 +7831,7 @@ Transform:
m_GameObject: {fileID: 1803922973} m_GameObject: {fileID: 1803922973}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -12.73, y: -32.24, z: 99.17} m_LocalPosition: {x: -12.190001, y: -31.56, z: 96.79}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -9601,16 +9596,6 @@ PrefabInstance:
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4487813433276970665, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.095
objectReference: {fileID: 0}
- target: {fileID: 4487813433276970665, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.054
objectReference: {fileID: 0}
- target: {fileID: 4648500137498506069, guid: 14d8283abcefffd4a916b8611ccd49fa, - target: {fileID: 4648500137498506069, guid: 14d8283abcefffd4a916b8611ccd49fa,
type: 3} type: 3}
propertyPath: m_Material propertyPath: m_Material

Write Preview
Loading…
Cancel
Save