Browse Source

Перемещение маяков

Виктор Шейко 5 years ago
parent
commit
db54d28272

+ 69 - 134
Assets/Materials/UnitBody.mat

@@ -2,144 +2,79 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: UnitBody
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
-  m_CustomRenderQueue: -1
+  m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
   m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TexEnvs:
-      data:
-        first:
-          name: _MainTex
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _BumpMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _DetailNormalMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _ParallaxMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _OcclusionMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _EmissionMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _DetailMask
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _DetailAlbedoMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
-      data:
-        first:
-          name: _MetallicGlossMap
-        second:
-          m_Texture: {fileID: 0}
-          m_Scale: {x: 1, y: 1}
-          m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
-      data:
-        first:
-          name: _Cutoff
-        second: .5
-      data:
-        first:
-          name: _SrcBlend
-        second: 1
-      data:
-        first:
-          name: _DstBlend
-        second: 0
-      data:
-        first:
-          name: _Parallax
-        second: .0199999996
-      data:
-        first:
-          name: _ZWrite
-        second: 1
-      data:
-        first:
-          name: _Glossiness
-        second: 0
-      data:
-        first:
-          name: _BumpScale
-        second: 1
-      data:
-        first:
-          name: _OcclusionStrength
-        second: 1
-      data:
-        first:
-          name: _DetailNormalMapScale
-        second: 1
-      data:
-        first:
-          name: _UVSec
-        second: 0
-      data:
-        first:
-          name: _EmissionScaleUI
-        second: 0
-      data:
-        first:
-          name: _Mode
-        second: 0
-      data:
-        first:
-          name: _Metallic
-        second: 0
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _EmissionScaleUI: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
     m_Colors:
-      data:
-        first:
-          name: _EmissionColor
-        second: {r: 0, g: 0, b: 0, a: 0}
-      data:
-        first:
-          name: _Color
-        second: {r: .647058845, g: .0666089877, b: .0666089877, a: 1}
-      data:
-        first:
-          name: _EmissionColorUI
-        second: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.64705884, g: 0.06660899, b: 0.06660899, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}

+ 1 - 1
Assets/Resources/GameObjects/Capsule.prefab

@@ -348,7 +348,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 862c646f32d45274882eb618f666ffa4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

+ 555 - 0
Assets/Scenes/Authorization.unity

@@ -0,0 +1,555 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 1
+  m_LightmapEditorSettings:
+    serializedVersion: 10
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &687048869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 687048873}
+  - component: {fileID: 687048872}
+  - component: {fileID: 687048871}
+  - component: {fileID: 687048870}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &687048870
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 687048869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &687048871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 687048869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &687048872
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 687048869}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &687048873
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 687048869}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1463759107}
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1 &1444849611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1444849613}
+  - component: {fileID: 1444849612}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1444849612
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1444849611}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &1444849613
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1444849611}
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!224 &1463759107 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+    type: 3}
+  m_PrefabInstance: {fileID: 970171090484538151}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1821236596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1821236599}
+  - component: {fileID: 1821236598}
+  - component: {fileID: 1821236597}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1821236597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1821236596}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1821236598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1821236596}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1821236599
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1821236596}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1925012355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1925012358}
+  - component: {fileID: 1925012357}
+  - component: {fileID: 1925012356}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1925012356
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1925012355}
+  m_Enabled: 1
+--- !u!20 &1925012357
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1925012355}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
+  m_projectionMatrixMode: 1
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_GateFitMode: 2
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1925012358
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1925012355}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  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!1001 &970171090484538151
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 687048873}
+    m_Modifications:
+    - target: {fileID: 970171089157102117, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Panel
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1099f35d22ddc9d44a0a9d91e9711b6a, type: 3}

File diff suppressed because it is too large
+ 1099 - 362
Assets/Scenes/Editor2D.unity


+ 3 - 12
Assets/Scenes/Editor3D.unity

@@ -744,19 +744,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   axes: 0
-  sensitivityX: 2
-  sensitivityY: 2
-  minimumX: -360
-  maximumX: 360
-  minimumY: -90
-  maximumY: 90
+  movementSpeed: 0.1
+  mouseSpeed: 10
+  smoothness: 0.85
   target: {fileID: 480695797}
-  offset: {x: 0, y: 0, z: -20}
-  sensitivity: 3
-  limit: 90
-  zoom: 0.5
-  zoomMax: 50
-  zoomMin: 0.5
 --- !u!114 &947374858
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 404 - 253
Assets/Scenes/Location.unity

@@ -37,8 +37,8 @@ RenderSettings:
   m_ReflectionBounces: 1
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 170076734}
-  m_IndirectSpecularColor: {r: 0.43667555, g: 0.48427123, b: 0.5645229, a: 1}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -470,7 +470,7 @@ PrefabInstance:
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
@@ -615,10 +615,11 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 271432280}
   - {fileID: 2137186684}
   - {fileID: 1765107641}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &67017180
 GameObject:
@@ -857,7 +858,6 @@ MonoBehaviour:
   DropdownLocation: {fileID: 1806286239}
   DropdownData: {fileID: 1917842946}
   inputField_date: {fileID: 872770023}
-  inputField_location: {fileID: 1769440376}
   TimeStart: {fileID: 1248881267}
   TimeEnd: {fileID: 1905530447}
   StartHour: {fileID: 1491054892}
@@ -950,12 +950,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
+  - {fileID: 239907550}
   - {fileID: 1001736067155254424}
   - {fileID: 3538187245544653789}
   - {fileID: 995816063}
   - {fileID: 577460074}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1569,75 +1570,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 165224743}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &170076733
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 170076735}
-  - component: {fileID: 170076734}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &170076734
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 170076733}
-  m_Enabled: 1
-  serializedVersion: 8
-  m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_Lightmapping: 1
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &170076735
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 170076733}
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1001 &178012968
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2120,6 +2052,12 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 234121886}
   m_CullTransparentMesh: 0
+--- !u!224 &239907550 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+    type: 3}
+  m_PrefabInstance: {fileID: 561633024}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &253152211
 GameObject:
   m_ObjectHideFlags: 0
@@ -2197,6 +2135,98 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 253152211}
   m_CullTransparentMesh: 0
+--- !u!1 &271432276
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 271432280}
+  - component: {fileID: 271432279}
+  - component: {fileID: 271432278}
+  - component: {fileID: 271432277}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!64 &271432277
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271432276}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &271432278
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271432276}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 4a007fa89aa4c134ea2316da76f383fc, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &271432279
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271432276}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &271432280
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271432276}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalPosition: {x: 13.1, y: 0.01, z: 2.7}
+  m_LocalScale: {x: 3.49, y: 1, z: 1.13}
+  m_Children: []
+  m_Father: {fileID: 60701537}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &294692787
 GameObject:
   m_ObjectHideFlags: 0
@@ -2269,97 +2299,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 294692787}
   m_CullTransparentMesh: 0
---- !u!1 &299363344
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 299363345}
-  - component: {fileID: 299363348}
-  - component: {fileID: 299363347}
-  - component: {fileID: 299363346}
-  m_Layer: 0
-  m_Name: Plane_d
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &299363345
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 299363344}
-  m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
-  m_LocalPosition: {x: 0, y: -0.5, z: 0}
-  m_LocalScale: {x: 22.8, y: 0.01, z: 5.5}
-  m_Children: []
-  m_Father: {fileID: 1765107641}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
---- !u!65 &299363346
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 299363344}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &299363347
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 299363344}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, 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_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!33 &299363348
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 299363344}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &302417704
 GameObject:
   m_ObjectHideFlags: 0
@@ -3937,6 +3876,7 @@ GameObject:
   - component: {fileID: 534669903}
   - component: {fileID: 534669906}
   - component: {fileID: 534669907}
+  - component: {fileID: 534669908}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -4044,12 +3984,224 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   account_id: 0
   _dataPath: 
+--- !u!114 &534669908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534669902}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dce27bed8edc28d4d9237538d7c5df85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  selectionCirclePrefab: {fileID: 0}
 --- !u!1 &545978266 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 6099118876963798654, guid: 04e9dfc406038d741b31aeebae5c71cb,
     type: 3}
   m_PrefabInstance: {fileID: 315985607}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &561633024
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 100471033}
+    m_Modifications:
+    - target: {fileID: 970171089157102117, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Name
+      value: Authorization
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089157102116, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089338376315, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089338376315, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089338376315, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089338376315, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171090285854931, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171090285854931, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171090285854931, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171090285854931, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089825919862, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089825919862, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089825919862, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089825919862, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089800876103, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089800876103, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089800876103, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 970171089800876103, guid: 1099f35d22ddc9d44a0a9d91e9711b6a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1099f35d22ddc9d44a0a9d91e9711b6a, type: 3}
 --- !u!1 &577460073
 GameObject:
   m_ObjectHideFlags: 0
@@ -4082,7 +4234,7 @@ RectTransform:
   m_Children:
   - {fileID: 702497365}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4945,7 +5097,7 @@ Transform:
   - {fileID: 748378562}
   - {fileID: 1597225010}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &725044859
 MonoBehaviour:
@@ -6735,7 +6887,7 @@ RectTransform:
   - {fileID: 1605365114}
   - {fileID: 2062404953}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -7329,7 +7481,7 @@ Transform:
   - {fileID: 434253706}
   - {fileID: 302417705}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1055061661
 PrefabInstance:
@@ -7386,7 +7538,7 @@ PrefabInstance:
     - target: {fileID: 3745245769283395707, guid: fefe9af169294bd44956e74bc6e69db9,
         type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 3745245769283395707, guid: fefe9af169294bd44956e74bc6e69db9,
         type: 3}
@@ -8057,7 +8209,7 @@ PrefabInstance:
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
@@ -8261,7 +8413,7 @@ PrefabInstance:
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7472118420504627703, guid: 7850c6db5506d6f4683d61bfd7dd9672,
         type: 3}
@@ -8766,7 +8918,7 @@ Transform:
   m_LocalScale: {x: 22.8, y: 0.01, z: 1}
   m_Children: []
   m_Father: {fileID: 1765107641}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!65 &1232781062
 BoxCollider:
@@ -9485,7 +9637,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9752,7 +9904,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1387821160
 GameObject:
@@ -9857,6 +10009,75 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1157685385}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1413667701
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1413667703}
+  - component: {fileID: 1413667702}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1413667702
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1413667701}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &1413667703
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1413667701}
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 6.358076, y: 8.313333, z: 11.2368}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &1420891851
 GameObject:
   m_ObjectHideFlags: 0
@@ -10125,7 +10346,7 @@ Transform:
   m_LocalScale: {x: 5.5, y: 0.01, z: 1}
   m_Children: []
   m_Father: {fileID: 1765107641}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90}
 --- !u!65 &1461780114
 BoxCollider:
@@ -11977,7 +12198,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1644416564
 GameObject:
@@ -12776,11 +12997,10 @@ Transform:
   - {fileID: 520403232}
   - {fileID: 1785988359}
   - {fileID: 115867242}
-  - {fileID: 299363345}
   - {fileID: 1461780113}
   - {fileID: 1232781061}
   m_Father: {fileID: 60701537}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1769440374
 GameObject:
@@ -15243,7 +15463,7 @@ Transform:
   - {fileID: 1192993685}
   - {fileID: 364289869}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2034636932
 PrefabInstance:
@@ -15634,75 +15854,6 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 0
---- !u!1 &2081233395
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2081233397}
-  - component: {fileID: 2081233396}
-  m_Layer: 0
-  m_Name: Directional Light (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!108 &2081233396
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2081233395}
-  m_Enabled: 1
-  serializedVersion: 8
-  m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &2081233397
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2081233395}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &2085345281
 GameObject:
   m_ObjectHideFlags: 0
@@ -16325,7 +16476,7 @@ Transform:
   - {fileID: 1387821161}
   - {fileID: 724272961}
   m_Father: {fileID: 60701537}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2137762242
 GameObject:
@@ -16518,7 +16669,7 @@ RectTransform:
   - {fileID: 2719688693530493369}
   - {fileID: 2049188347}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -17133,7 +17284,7 @@ RectTransform:
   - {fileID: 1629331508}
   - {fileID: 3538187244587909497}
   m_Father: {fileID: 100471033}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

+ 54 - 23
Assets/Scripts/Components/Grid.cs

@@ -1,13 +1,20 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class Grid : MonoBehaviour
 {
+    //public GameObject grid;
+    //public float Length = 40;
+    public int Quantity = 20;
+    public enum Axis { XY, XZ, YZ };
+    public Axis axis = Axis.XZ;
+
     // Start is called before the first frame update
     void Start()
     {
-        
+        CreateGrid();
     }
 
     // Update is called once per frame
@@ -15,29 +22,53 @@ public class Grid : MonoBehaviour
     {
         
     }
-    //public override void OnInspectorGUI()
-    //{
-    //    //grid = (Grid)target;
-
-    //    //EditorGUILayout.LabelField("Настройка шага:", EditorStyles.boldLabel);
-    //    //grid.Width = EditorGUILayout.FloatField("По оси X", grid.Width);
-    //    //grid.Height = EditorGUILayout.FloatField("По оси Y", grid.Height);
-    //    //grid.Length = EditorGUILayout.FloatField("По оси Y", grid.Length);
-    //    //grid.Draw = EditorGUILayout.Toggle("Показывать", grid.Draw);
-
-    //    //EditorGUILayout.LabelField("Настройка сетки:", EditorStyles.boldLabel);
-    //    //grid.CountLines = EditorGUILayout.IntSlider("Кол-во линий", (int)grid.CountLines, 1, 1000);
 
-    //    //EditorGUILayout.LabelField("Выбранные объекты:", EditorStyles.boldLabel);
-    //    //foreach (var obj in objects)
-    //    //{
-    //    //    EditorGUILayout.TextField("Имя объекта:", obj.name);
-    //    //}
+    public void CreateGrid()
+    {
+        for (int i = 0; i < Quantity; i++)
+        {
+            for (float j = 0; j < 1; j += 0.1f)
+            {
+                var width = 0.01f;
+                if (j == 0)
+                    width = 0.1f;
+                if (j == 0.5f) width = 0.05f;
 
-    //    //grid.name = "Grid By Kilosoft";
-    //    //EditorUtility.SetDirty(grid);
+                switch (axis)
+                {
+                    case Axis.YZ:
+                        NewLine(new Vector3(0, 0, i + j), new Vector3(0, 0, i + j), new Vector3(0, Quantity * 2, i + j), "LineY_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                        NewLine(new Vector3(0, i + j, 0), new Vector3(0, i + j, 0), new Vector3(0, i + j, Quantity * 2), "LineZ_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                        break;
+                    case Axis.XZ:
+                NewLine(new Vector3(0, 0, i + j), new Vector3(0, 0, i + j), new Vector3(Quantity * 2, 0, i + j), "LineX_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                NewLine(new Vector3(i + j, 0, 0), new Vector3(i + j, 0, 0), new Vector3(i + j, 0, Quantity * 2), "LineZ_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                        break;
+                    case Axis.XY:
+                        NewLine(new Vector3(i + j, 0, 0), new Vector3(i + j, 0, 0), new Vector3(i + j, Quantity * 2, 0), "LineY_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                        NewLine(new Vector3(0, i + j, 0), new Vector3(0, i + j, 0), new Vector3(Quantity * 2, i + j, 0), "LineX_" + (i + j).ToString("#.#"), width, transform.gameObject);
+                        break;
+                }
+            }
+        }
+        transform.position = new Vector3(0, 0.01f, 0);
+    }  
 
-    //    //EditorGUILayout.LabelField("О программе:", EditorStyles.boldLabel);
-    //    //EditorGUILayout.LabelField("Name: Grid By Kilosoft\nAuthor: Kilosoft\nVersion: 0.1", EditorStyles.helpBox);
-    //}
+    public static LineRenderer NewLine(Vector3 pos, Vector3 start, Vector3 end, string name_line, float width = 0.1f, GameObject parent = null)
+    {
+        var line = Instantiate(Resources.Load("GameObjects/Line", typeof(LineRenderer))) as LineRenderer;
+        line.transform.position = pos;
+        line.name = name_line;
+        line.SetPosition(line.positionCount++, start);
+        line.SetPosition(line.positionCount++, end);
+        line.startColor = Color.gray;
+        line.endColor = Color.gray;
+        line.material.color = Color.gray;
+        if(parent != null)line.transform.parent = parent.transform;
+        //line.name = name_line;
+        //line.transform.localScale = localScale;
+        //line.transform.position = position;
+        line.startWidth = width;
+        return line;
+    }
 }

+ 34 - 0
Assets/Scripts/Components/Size.cs

@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Size : MonoBehaviour
+{
+    GameObject LineX;
+    GameObject LineZ;
+    float sizeX;
+    float sizeZ;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        sizeX = transform.position.x;
+        sizeZ = transform.position.z;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (sizeX != transform.position.x || sizeZ != transform.position.z) {
+            Destroy(LineX);
+            Destroy(LineZ);
+            CreateSize();
+        }        
+    }
+    public void CreateSize()
+    {
+        var size = transform.localScale;
+        LineX = Grid.NewLine(new Vector3(0, 0, -0.5f), new Vector3(0, 0, -0.5f), new Vector3(size.x*10, 0, -0.5f), "SizeX", 0.1f).gameObject;
+        LineZ=Grid.NewLine(new Vector3(-0.5f, 0, 0), new Vector3(-0.5f, 0, 0), new Vector3(-0.5f, 0, size.z*10), "SizeZ", 0.1f).gameObject;
+    }
+}

+ 7 - 4
Assets/Scripts/Components/TouchScript.cs

@@ -39,6 +39,7 @@ public class TouchScript : MonoBehaviour
     private Vector3 positionChange = new Vector3(0.0f, -0.0005f, 0.0f);
     private bool increase = false;
     public GameObject panel;
+    float deltaScale = 0.001f;
 
     // Нажатие
     void OnMouseDown()
@@ -110,17 +111,19 @@ public class TouchScript : MonoBehaviour
             case Tools.Scale:
                 //var scale = transform.localScale;
                 //transform.localScale = new Vector3(scale.x + (h + v), scale.z + (h + v), scale.z);
+                var proportions = transform.transform.localScale.z / transform.transform.localScale.x;              
+                var z = proportions * deltaScale;
 
                 //transform.transform.position = new Vector3(scale.x *5, 0, scale.z *5);
                 if (increase)
                 {
-                    scaleChange = new Vector3(0.01f, 0, 0.01f);
-                    positionChange = new Vector3(0.05f, 0, 0.05f);
+                    scaleChange = new Vector3(deltaScale, 0, z);
+                    positionChange = new Vector3(deltaScale * 5, 0, z*5);
                 }
                 else
                 {
-                    scaleChange = new Vector3(-0.01f, 0, -0.01f);
-                    positionChange = new Vector3(-0.05f, 0, -0.05f);
+                    scaleChange = new Vector3(-deltaScale, 0, -z);
+                    positionChange = new Vector3(-deltaScale*5, 0, -z*5);
                 }
                 transform.transform.localScale += scaleChange;
                 transform.transform.position += positionChange;

+ 52 - 0
Assets/Scripts/Controllers/AuthorizationController.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+public class AuthorizationController : MonoBehaviour
+{
+    public static string login;
+    public static string password;
+    public InputField Login;
+    public InputField Password;
+    public GameObject Error;
+    public GameObject loading;
+
+    public static bool send = false;
+    public static bool success = false;
+    public static bool error = false;
+    static string textError = "Неправильный логин или пароль";
+
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        DebugHelper.ActivateConsole();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (success) //SceneManager.LoadScene("Location");
+            transform.gameObject.SetActive(false);
+        if(error) Error.SetActive(true);
+    }
+
+    public void Authorization()
+    {
+        login = Login.text;
+        password = Password.text;
+
+        if (!string.IsNullOrEmpty(login) && !string.IsNullOrEmpty(password))
+        {
+           send = true;
+            error = false;
+            Error.SetActive(false);           
+        }
+    }
+    void OnGUI()
+    {
+        DebugHelper.DrawConsole();
+    }
+}
+    

+ 51 - 0
Assets/Scripts/Controllers/BeaconController.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BeaconController : MonoBehaviour
+{
+    public float Height = 0.5f;
+    public int Rounding = 1;
+    public bool move = false;
+
+    private Vector3 screenPoint;
+    private Vector3 offset;
+    private Vector3 curScreenPoint;
+    private Vector3 curPosition;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+    }
+
+    void OnMouseDown()
+    {
+        //Debug.Log(StagesEditorController.indexCursor);
+        if (move)
+        {
+            screenPoint = Camera.main.WorldToScreenPoint(gameObject.transform.position);
+            offset = gameObject.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z));
+        }
+    }
+
+    // Перемещение
+    void OnMouseDrag()
+    {
+        if (move)
+        {
+            curScreenPoint = new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z);
+            curPosition = Camera.main.ScreenToWorldPoint(curScreenPoint) + offset;
+
+            var x =(float) Math.Round(curPosition.x, Rounding);
+            var z = (float)Math.Round(curPosition.z, Rounding);
+            transform.position = new Vector3(x, Height, z);
+        }
+    }
+}

+ 30 - 30
Assets/Scripts/Controllers/CameraController.cs

@@ -11,7 +11,7 @@ public class CameraController : MonoBehaviour
     public enum RotationAxes { Mouse, TrackMarker }
     public RotationAxes axes = RotationAxes.Mouse;
     public float movementSpeed = 0.1f;
-    public int mouseSpeed = 4;
+    public int mouseSpeed = 10;
     public float smoothness = 0.85f;
 
     Vector3 targetPosition;
@@ -51,23 +51,23 @@ public class CameraController : MonoBehaviour
    
     private void MouseCommands()
     {
-        if (Input.GetKey(KeyCode.W))
-        {
-            targetPosition += transform.forward * movementSpeed;
-            Camera.main.orthographicSize++;
-        }
-        if (Input.GetKey(KeyCode.A))
+        //if (Input.GetKey(KeyCode.W))
+        //{
+        //    targetPosition += transform.forward * movementSpeed;
+        //    Camera.main.orthographicSize++;
+        //}
+        if (Input.GetKey(KeyCode.LeftArrow))
             targetPosition -= transform.right * movementSpeed;
-        if (Input.GetKey(KeyCode.S))
-        {
-            targetPosition -= transform.forward * movementSpeed;
-            if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
-        }
-        if (Input.GetKey(KeyCode.D))
+        //if (Input.GetKey(KeyCode.S))
+        //{
+        //    targetPosition -= transform.forward * movementSpeed;
+        //    if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
+        //}
+        if (Input.GetKey(KeyCode.RightArrow))
             targetPosition += transform.right * movementSpeed;
-        if (Input.GetKey(KeyCode.Q))
+        if (Input.GetKey(KeyCode.DownArrow))
             targetPosition -= transform.up * movementSpeed;
-        if (Input.GetKey(KeyCode.E))
+        if (Input.GetKey(KeyCode.UpArrow))
             targetPosition += transform.up * movementSpeed;
 
         if (Input.GetMouseButtonDown(2))
@@ -92,12 +92,12 @@ public class CameraController : MonoBehaviour
         if (Input.GetAxis("Mouse ScrollWheel") > 0)
         {
             targetPosition += transform.forward * movementSpeed* mouseSpeed;
-            Camera.main.orthographicSize++;
+            if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
         }
         else if (Input.GetAxis("Mouse ScrollWheel") < 0)
         {
             targetPosition -= transform.forward * movementSpeed*mouseSpeed;
-            if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize -= 1;
+            Camera.main.orthographicSize++;
         }
 
         transform.position = Vector3.Lerp(transform.position, targetPosition, (1.0f - smoothness));
@@ -105,25 +105,25 @@ public class CameraController : MonoBehaviour
 
     void TrackMarker()
     {
-        if (Input.GetKey(KeyCode.W))
-        {            
-            targetPosition += transform.forward * movementSpeed;
-            Camera.main.orthographicSize++;
-        }
-        if (Input.GetKey(KeyCode.S))
-        {
-            targetPosition -= transform.forward * movementSpeed;
-            if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
-        }
+        //if (Input.GetKey(KeyCode.W))
+        //{            
+        //    targetPosition += transform.forward * movementSpeed;
+        //    Camera.main.orthographicSize++;
+        //}
+        //if (Input.GetKey(KeyCode.S))
+        //{
+        //    targetPosition -= transform.forward * movementSpeed;
+        //    if (Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
+        //}
         if (Input.GetAxis("Mouse ScrollWheel") > 0)
         {
-            targetPosition += transform.forward * movementSpeed* mouseSpeed;
-            Camera.main.orthographicSize++;
+            targetPosition += transform.forward * movementSpeed* mouseSpeed; 
+            if(Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;           
         }
         else if (Input.GetAxis("Mouse ScrollWheel") < 0)
         {
             targetPosition -= transform.forward * movementSpeed* mouseSpeed;
-            if(Camera.main.orthographicSize > 1) Camera.main.orthographicSize--;
+            Camera.main.orthographicSize++;
         }
         var marker_offset = new Vector3(target.position.x, targetPosition.y, target.position.z);
         transform.position = Vector3.Lerp(transform.position, /*targetPosition + target.position - */marker_offset, (1.0f - smoothness));

+ 10 - 71
Assets/Scripts/Controllers/Editor2DController.cs

@@ -11,20 +11,19 @@ public class Editor2DController : MonoBehaviour
     public InputField SizeX;
     public InputField SizeY;
     public GameObject plane;
-
-    public GameObject Grid;
-    public float Length = 20;
+    public GameObject BeaconsContent;
+    public List<Beacon> Beacons = new List<Beacon>();
 
     // Start is called before the first frame update
     void Start()
     {
-        CreateGrid(10);
     }
 
     // Update is called once per frame
     void Update()
     {
-        
+        SizeX.text = $"{plane.transform.localScale.x}";
+        SizeY.text = $"{plane.transform.localScale.z}";
     }
 
     public void UpdatePanel()
@@ -53,72 +52,12 @@ public class Editor2DController : MonoBehaviour
         SceneManager.LoadScene("Location");
     }
 
-    public void CreateGrid(int l)
-    {
-        float s = -0.5f;
-
-        for (int i = 0; i < l; i++)
-        {
-            var posX = new Vector3(0, 0, i);
-            var positionX_start = new Vector3(0, 0, i);
-            var positionX_end = new Vector3(Length, 0, i);            
-            var LineX = NewLine(posX, positionX_start, positionX_end, "LineX_" + i);
-            //LineX.transform.parent = Grid.transform;
-
-            var posY = new Vector3(i, 0, 0);
-            var positionY_start = new Vector3(i, 0, 0);
-            var positionY_end = new Vector3(i, 0, Length);
-            var LineY = NewLine(posY, positionY_start, positionY_end, "LineY_" + i);
-            //LineY.transform.parent = Grid.transform;
-
-            //var positionY_start = new Vector3(i, 10, 0);
-            //var positionY_end = new Vector3(i, 10, 0);
-            //var LineY = NewLine(pos, positionY_start, positionY_end, "LineY_" + i);
-            //LineY.transform.parent = Grid.transform;
-
-            //var positionZ_start = new Vector3(i, 0, 10);
-            //var positionZ_end = new Vector3(i, 0, 10);
-            //var LineZ = NewLine(pos, positionZ_start, positionZ_end, "LineZ_" + i);
-            //LineZ.transform.parent = Grid.transform;
-
-            //if (positionX.y == 0)
-            //{
-            //    var cubeRendererX = LineX.GetComponent<Renderer>();
-            //    cubeRendererX.material.SetColor("_Color", Color.red);
-
-            //    LineX_zero = LineX;
-            //    cubeRendererX_zero = LineX_zero.GetComponent<Renderer>();
-            //}
-
-            //if (positionY.x == 0)
-            //{
-            //    var cubeRendererY = LineY.GetComponent<Renderer>();
-            //    cubeRendererY.material.SetColor("_Color", Color.green);
-
-            //    LineY_zero = LineY;
-            //    cubeRendererY_zero = LineY_zero.GetComponent<Renderer>();
-            //}
-
-            s += 0.05f;
-        }
-        Grid.transform.position = new Vector3(0, 0.01f, 0);
-    }
-
-    LineRenderer NewLine(Vector3 pos, Vector3 start, Vector3 end, string name_line)
+  public void AddBeacon()
     {
-        var line = Instantiate(Resources.Load("GameObjects/Line", typeof(LineRenderer))) as LineRenderer;
-        line.transform.position = pos;
-        line.name = name_line;
-        line.SetPosition(line.positionCount++, start);
-        line.SetPosition(line.positionCount++, end);
-        line.startColor = Color.gray;
-        line.endColor = Color.gray;
-        line.material.color = Color.gray;
-        line.transform.parent = Grid.transform;
-        //line.name = name_line;
-        //line.transform.localScale = localScale;
-        //line.transform.position = position;
-
-        return line;
+        var beacon = Instantiate(Resources.Load("GameObjects/Beacon", typeof(GameObject))) as GameObject;
+        var button = Instantiate(Resources.Load("GameObjects/ButtonUI", typeof(Button))) as Button;
+        button.name = $"BeaconButton_{Beacons.Count}";
+        button.transform.SetParent(BeaconsContent.transform);
+        Beacons.Add(new Beacon { id = (uint)Beacons.Count, beacon = beacon, button = button });
     }
 }

+ 1 - 1
Assets/Scripts/Controllers/SendingFormController.cs

@@ -153,7 +153,7 @@ public class SendingFormController : MonoBehaviour
 
         Renderer renderer = plane.GetComponent<Renderer>();
         renderer.material.mainTexture = texture;
-        plane.transform.localScale = new Vector3(img.texture.width / 100f, 1, img.texture.height / 100f);
+        plane.transform.localScale = new Vector3(img.texture.width / 1000f, 1, img.texture.height / 1000f);
         var scale = plane.transform.localScale;
         plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
         //GetComponent<Renderer>().material.mainTexture = img.texture;

+ 18 - 104
Assets/Scripts/Controllers/WorkerController.cs

@@ -92,7 +92,6 @@ public class WorkerController : MonoBehaviour
         DropdownLocation.options.Add(new Dropdown.OptionData("1 Братск"));
         DropdownLocation.options.Add(new Dropdown.OptionData("22 Офис Ижевск"));
         DropdownLocation.options.Add(new Dropdown.OptionData("25"));
-        inputField_date_text.text = DateTime.Now.ToString("yyyy.MM.dd");
 
         DropdownCompany.options.Add(new Dropdown.OptionData("Тайшет"));
         DropdownCompany.options.Add(new Dropdown.OptionData("Тестовая"));
@@ -283,26 +282,6 @@ public class WorkerController : MonoBehaviour
     /// <param name="progress">Номер записи из БД</param>
     /// <param name="all">Всего записей из БД</param>
     /// <returns></returns>
-    //static IEnumerator MarkerPostion(float pause, float step, Vector3 start_pos, Vector3 end_pos, GameObject worker_marker, Toggle toggle, Structure w, int count, int progress, int all)
-    //{
-    //    yield return new WaitForSeconds(pause);
-    //    if (worker_marker.activeSelf == true && history_start && starting[count])
-    //    {
-    //        var x_position = Mathf.Lerp(start_pos.x, end_pos.x, step);
-    //        var y_position = Mathf.Lerp(start_pos.z, end_pos.z, step);
-    //        //Debug.Log($"marker name={worker_marker.name} time={pause} step={step} sec x={x_position} y={y_position} x0={start_pos.x} y0={start_pos.z} x1={end_pos.x} y1={end_pos.z}");
-    //        worker_marker.transform.position = new Vector3(x_position, 0.5f, y_position);
-    //        worker_marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
-    //        toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts:hh:mm:ss}\n{progress + 1} из {all}";
-    //        if (progress + 1 == all)
-    //        {
-    //            sStartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
-    //            starting[count] = false;
-    //            history_start = false;
-    //        }
-    //    }
-    //}
-
     void Position(float step, Vector3 start_pos, Vector3 end_pos, Marker marker, Structure w, int count, string progress)
     {
         if (marker.marker.activeSelf == true && starting[count])
@@ -345,89 +324,53 @@ public class WorkerController : MonoBehaviour
         {
             case 0:
                 //real_time = !real_time;
-                if (active_mode == Mode.Stop/*real_time*/) { 
+                if (active_mode == Mode.Stop/*real_time*/)
+                {
                     active_mode = Mode.RealTime;
                     button_text.GetComponent<Text>().text = "Остановить";
                 }
-                else {
+                else
+                {
                     active_mode = Mode.Stop;
-                    button_text.GetComponent<Text>().text = "Отобразить"; 
+                    button_text.GetComponent<Text>().text = "Отобразить";
                 }
                 break;
             case 1:
                 if (int.Parse(StartHour.GetComponent<InputField>().text) == 99) SceneManager.LoadScene("Editor3D");
-                else {
+                else
+                {
                     if (active_mode == Mode.Stop/*real_time*/) active_mode = Mode.History;
                     else active_mode = Mode.Stop;
                 }//history_start = !history_start;
                 if (active_mode == Mode.History/*history_start*/)
                 {
                     starting.Add(true);
-                    //var date = DateTime.Now; var error_date = false;
-                    ////////try
-                    ////////{
-                        //date = DateTime.Parse(inputField_date_text.text);
-                        var date = Date.Date;
-                    //////}
-                    //////catch (Exception e)
-                    //////{
-                    //////    ErrorDialog.SetActive(true);
-                    //////    error_date = true;
-                    //////    var text = ErrorDialog.transform.GetChild(0).GetComponent<Text>().text = "Некорректный формат даты";
-                    //////    //history_start = false;
-                    //////    active_mode = Mode.Stop;
-                    //////}
+                    var date = Date.Date;
 
                     var time_start = date; //new DateTime(dates.ElementAt(DropdownData.value).Ticks);
                     time_start = time_start.AddHours(int.Parse(StartHour.GetComponent<InputField>().text));
                     time_start = time_start.AddMinutes(int.Parse(StartMin.GetComponent<InputField>().text));
                     time_start = time_start.AddSeconds(int.Parse(StartSec.GetComponent<InputField>().text));
                     Debug.Log(time_start);
-                    //var time_start = new DateTime(1, 1, 1, int.Parse(StartHour.GetComponent<InputField>().text), int.Parse(StartMin.GetComponent<InputField>().text), int.Parse(StartSec.GetComponent<InputField>().text));
-
-                    //var time_end = new DateTime(1, 1, 1, int.Parse(EndHour.GetComponent<InputField>().text), int.Parse(EndMin.GetComponent<InputField>().text), int.Parse(EndSec.GetComponent<InputField>().text));
                     var time_end = date; //new DateTime(dates.ElementAt(DropdownData.value).Ticks);
                     time_end = time_end.AddHours(int.Parse(EndHour.GetComponent<InputField>().text));
                     time_end = time_end.AddMinutes(int.Parse(EndMin.GetComponent<InputField>().text));
                     time_end = time_end.AddSeconds(int.Parse(EndSec.GetComponent<InputField>().text));
-                    // client.account_id = 356;     
-
-                    //StartCoroutine(RequestPostion(time_start.Ticks, time_end.Ticks, 22, 356));
-                    //if (!error_date)
-                    //{
-                        //try
-                        //{
-                            //var location_id = uint.Parse(inputField_location.text);
-                            foreach (var m in markers)
-                            {
-                                if (m.toggle.isOn)
-                                {
-                                    client.CoordinatesRequest(time_start.Ticks, time_end.Ticks, 1, location_id, m.acc_id);
-                                    end_send[m.acc_id] = false;
-                                }
-                            }
-                            button_text.GetComponent<Text>().text = "Остановить";
-                        //}
-                        //catch (Exception e)
-                        //{
-                        //    ErrorDialog.SetActive(true);
-                        //    ErrorDialog.transform.GetChild(0).GetComponent<Text>().text = "Введите идентификатор локации";
-                        //    //history_start = false;
-                        //    active_mode = Mode.Stop;
-                        //}
-                    //}
-
-                    // var workers = structures.Where(w => w.ts >= time_start && w.ts <= time_end && w.location_id == int.Parse(DropdownLocation.options[DropdownLocation.value].text.ToString())).ToList();
-
-                    //foreach (var m in markers)            
-                    //    if (m.toggle.isOn)                
-                    //        StartingAccPositiong(m);                           
+                    foreach (var m in markers)
+                    {
+                        if (m.toggle.isOn)
+                        {
+                            client.CoordinatesRequest(time_start.Ticks, time_end.Ticks, 1, location_id, m.acc_id);
+                            end_send[m.acc_id] = false;
+                        }
+                    }
+                    button_text.GetComponent<Text>().text = "Остановить";
                 }
                 else
                 {
                     StopProgress();
                 }
-                break;         
+                break;
         }
     }
 
@@ -468,35 +411,6 @@ public class WorkerController : MonoBehaviour
         return lineRenderer;
     }
 
-    //void StartingAccPositiong(Marker m, float time)
-    //{
-    //    var worker = Workers[m.acc_id].OrderBy(wr => wr.ts).ToList();
-    //    if (worker.Any())
-    //    {
-    //        var offset = 0.1f;
-    //        for (int i = 0; i < worker.Count; i++)
-    //        {
-    //            var w = worker.ElementAt(i);
-    //            var start_pos = m.marker.transform.position;
-    //            if (i != 0) start_pos = new Vector3(worker.ElementAt(i - 1).coord_x / 100f, 0.5f, worker.ElementAt(i - 1).coord_y / 100f);
-
-    //            var end_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
-
-    //            //if (real_time) 
-    //                Position(time, start_pos, end_pos, m, w, starting.Count - 1, "");
-    //            //if (history_start)
-    //            //{
-    //            //    for (float j = 0; j <= 1.1f; j += 0.1f) // 1.1f из-за округления float
-    //            //    {
-
-    //            //        StartCoroutine(MarkerPostion(i + offset + j, j, start_pos, end_pos, m.marker, m.toggle, w, starting.Count - 1, i, worker.Count));
-    //            //    }
-    //            //    offset += 0.1f;
-    //            //}
-    //        }
-    //    }
-    //}
-
     /// <summary>
     /// Смена положения по интервалу
     /// Шаги для плавного перемещения

+ 18 - 0
Assets/Scripts/Models/Beacon.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Beacon
+{
+    public uint id { get; set; }
+    public float x { get; set; }
+    public float y { get; set; }
+    public float z { get; set; } // этаж
+    public GameObject beacon { get; set; }
+    public Button button { get; set; }
+}
+

+ 7 - 6
Assets/Scripts/Net/Client.cs

@@ -269,19 +269,20 @@ public class Client : MonoBehaviour
         if (accid == 0xFFFFFFFF)
         {
             Debug.LogError("Login or password incorrect");
+            AuthorizationController.error = true;
             return;
         }
         else if (accid == 0xFFFFFFFE)
         {
-            Debug.LogError("Account was already connected");
+            Debug.LogError("Account was already connected");          
             return;
         }
         else if (accid == 0xFFFFFFFD)
         {
-            Debug.LogError("Incorrect client version");
+            Debug.LogError("Incorrect client version");           
             return;
         }
-
+        AuthorizationController.success = true;
         account_id = accid;
         //var ts = DateTime.Now.Ticks-1000000000000;
         //var te = DateTime.Now.Ticks;
@@ -344,7 +345,7 @@ public class Client : MonoBehaviour
                 StartConnectFlag = true;
             }
         }
-        SendLogin();
+        if(AuthorizationController.send)SendLogin();
         int from_connect = DateTime.Now.Subtract(connect_started).Seconds;
 
         if (from_connect > 7 && from_connect != DateTime.Now.Second && account_id == 0)
@@ -812,8 +813,8 @@ public class Client : MonoBehaviour
         {
             login_sent = true;
             Debug.Log("SendLogin");
-            string passwordToEdit = "123";
-            string login = "Admin12";
+            string passwordToEdit = AuthorizationController.password;// "8*9Efc2%";
+            string login = AuthorizationController.login;//"vsheiko";
             string pass = GetMD5Hash(passwordToEdit);
 
             byte[] bpass = Encoding.UTF8.GetBytes(pass);

+ 1 - 4
ProjectSettings/QualitySettings.asset

@@ -216,7 +216,4 @@ QualitySettings:
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
     excludedTargetPlatforms: []
-  m_PerPlatformDefaultQuality:
-    Android: 0
-    Standalone: 0
-    WebGL: 0
+  m_PerPlatformDefaultQuality: {}