mirror of
https://github.com/Steffo99/bleach-beach.git
synced 2024-12-04 19:04:19 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
e050f3d913
1 changed files with 19 additions and 37 deletions
56
Assets/Scenes/Game.unity
generated
56
Assets/Scenes/Game.unity
generated
|
@ -321,47 +321,28 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 244194707}
|
||||
--- !u!4 &1410052127 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 244194707}
|
||||
--- !u!1 &1570992614
|
||||
--- !u!1 &1456580292
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1570992615}
|
||||
- component: {fileID: 1570992616}
|
||||
- component: {fileID: 1570992617}
|
||||
- component: {fileID: 1456580294}
|
||||
- component: {fileID: 1456580293}
|
||||
m_Layer: 0
|
||||
m_Name: Cannon
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1570992615
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570992614}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.214, y: 0.428, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1410052127}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &1570992616
|
||||
--- !u!212 &1456580293
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570992614}
|
||||
m_GameObject: {fileID: 1456580292}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
|
@ -390,27 +371,28 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 1
|
||||
m_Sprite: {fileID: 21300000, guid: bdd08b099cc1c614096f43a9ccf99b59, type: 3}
|
||||
m_SortingOrder: -3
|
||||
m_Sprite: {fileID: 21300000, guid: aa55a5c6b0f009a428147c305780d1de, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.48, y: 1.02}
|
||||
m_Size: {x: 6.83, y: 10.42}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!114 &1570992617
|
||||
MonoBehaviour:
|
||||
--- !u!4 &1456580294
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570992614}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7bc860ed21bbef247869c07bd6fef82f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
rotationSpeed: 90
|
||||
m_GameObject: {fileID: 1456580292}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -3.1, y: 44.5, z: 2.77}
|
||||
m_LocalScale: {x: 2.7887762, y: 2.7887762, z: 2.7887762}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
Loading…
Reference in a new issue