Commit 7dd58094 authored by Bene's avatar Bene

Merge remote-tracking branch 'origin/master'

parents 583e1219 9400a732
......@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
m_UseShadowmask: 0
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
......@@ -120,6 +120,90 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &80893532
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 990818738648802836, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_Name
value: Target
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 05595cef9093ff9479bd9a408951ff34, type: 3}
--- !u!1 &480427843
GameObject:
m_ObjectHideFlags: 0
......
......@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
m_UseShadowmask: 0
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
......@@ -313,6 +313,90 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 206079091}
m_CullTransparentMesh: 0
--- !u!1001 &368198162
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 990818738648802836, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_Name
value: Target
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.y
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalScale.z
value: 0.25
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 05595cef9093ff9479bd9a408951ff34, type: 3}
--- !u!1 &396063180
GameObject:
m_ObjectHideFlags: 0
......
......@@ -248,3 +248,73 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1418634102
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 990818738648802836, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_Name
value: Target
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7623937761096657450, guid: 05595cef9093ff9479bd9a408951ff34, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 05595cef9093ff9479bd9a408951ff34, type: 3}
......@@ -296,112 +296,6 @@ Transform:
m_Father: {fileID: 515518058217752083}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5748100678628325233
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7935270155212314393}
- component: {fileID: 3155027143029603151}
- component: {fileID: 4996554647547635216}
- component: {fileID: 3894984904322928253}
m_Layer: 27
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7935270155212314393
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5748100678628325233}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4008350759416676906}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3155027143029603151
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5748100678628325233}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 5a6765eb346778a49b4632eb6dc9abe0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &4996554647547635216
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5748100678628325233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7b4e5416c9d98a489885dc55753cb9a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3894984904322928253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5748100678628325233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad1f6f92aa937f843a14a7737f633470, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6114649954707392157
GameObject:
m_ObjectHideFlags: 0
......@@ -808,6 +702,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 3407291416553578702}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4757282765725290853
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4008350759416676906}
m_Modifications:
- target: {fileID: 990818738648802836, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_Name
value: Target
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 05595cef9093ff9479bd9a408951ff34, type: 3}
--- !u!4 &7935270155212314393 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3178131014301288060, guid: 05595cef9093ff9479bd9a408951ff34,
type: 3}
m_PrefabInstance: {fileID: 4757282765725290853}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6880862651684846132
PrefabInstance:
m_ObjectHideFlags: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &990818738648802836
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3178131014301288060}
- component: {fileID: 7623937761096657450}
- component: {fileID: 527502260121614197}
- component: {fileID: 8361081529510240024}
m_Layer: 27
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3178131014301288060
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 990818738648802836}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7623937761096657450
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 990818738648802836}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 5a6765eb346778a49b4632eb6dc9abe0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &527502260121614197
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 990818738648802836}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7b4e5416c9d98a489885dc55753cb9a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8361081529510240024
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 990818738648802836}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad1f6f92aa937f843a14a7737f633470, type: 3}
m_Name:
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: 05595cef9093ff9479bd9a408951ff34
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment