Browse Source

alone scene

Виктор Шейко 4 years ago
parent
commit
c163d90e98

+ 0 - 555
Assets/Scenes/Authorization.unity

@@ -1,555 +0,0 @@
-%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
+ 0 - 9342
Assets/Scenes/Editor2D.unity


File diff suppressed because it is too large
+ 0 - 1197
Assets/Scenes/Editor3D.unity


File diff suppressed because it is too large
+ 0 - 21319
Assets/Scenes/Location.unity


+ 0 - 7
Assets/Scenes/Location.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 20 - 35
Assets/Scripts/Components/WallCreate.cs

@@ -23,23 +23,26 @@ public class WallCreate : MonoBehaviour
     private Vector3 curPosition;
 
     private Vector3 start_pos;
+    Vector3 Point;
 
 
     // Start is called before the first frame update
     void Start()
     {
        // gameObject.GetComponent<BoxCollider>().enabled = BoxColliderEnabled;
-        //cursor_end = transform.GetChild(6).gameObject;
+        //cursor_end = transform.GetChild(6).gameObject; 
+        Point = Camera.main.WorldToScreenPoint(gameObject.transform.position);
     }
-
+   
     // Update is called once per frame
     void Update()
     {
         // if (gameObject.GetComponent<BoxCollider>().enabled != BoxColliderEnabled) gameObject.GetComponent<BoxCollider>().enabled = BoxColliderEnabled;
         if (!Input.GetMouseButtonDown(0))
         {
-            var Point = Camera.main.WorldToScreenPoint(gameObject.transform.position);
+           
             transform.position = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, Point.z));
+            Debug.Log($"transform.position={transform.position}");
         }
     }
 
@@ -78,53 +81,32 @@ public class WallCreate : MonoBehaviour
 
             var end_pos = Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z));
 
-            var x = (float)Math.Round((start_pos.x + end_pos.x) / 2, Rounding);
-            var z = (float)Math.Round((start_pos.z + end_pos.z) / 2, Rounding);
             scale_x = (float)Math.Round(end_pos.x - start_pos.x, Rounding);
             scale_z = (float)Math.Round(end_pos.z - start_pos.z, Rounding);
 
-            //Debug.Log($"pos = {end_pos-start_pos}");
-            //transform.position = new Vector3(x, Height, z);
-            //gameObject.GetComponent<BoxCollider>().size = new Vector3(x, Height, z);
-            var pos = new Vector3(x, transform.localScale.y / 2f, z);
-            //transform.position = pos;
-
-            //LocationController.Cube(gameObject, );
             switch (mode)
             {
                 case Mode.Wall:
-                    if (x > z/* && x_mod >= 0.4f*/)
+                    if (scale_x > scale_z/* && x_mod >= 0.4f*/)
                     {
                         wall.transform.localScale = new Vector3(scale_x, WallHeight, WallThickness);
-                        wall.transform.position = new Vector3(x, start_pos.y, start_pos.z);
+                        wall.transform.position = new Vector3(scale_x / 2 + start_pos.x, WallHeight / 2, start_pos.z);
                     }
-                    if (z > x/* && z_mod >= 0.4f*/)
+                    if (scale_z > scale_x/* && z_mod >= 0.4f*/)
                     {
+                   
                         wall.transform.localScale = new Vector3(WallThickness, WallHeight, scale_z);
-                        wall.transform.position = new Vector3(start_pos.x, start_pos.y, z);
-                    }
-                    //if(x_mod <0.4f && z_mod < 0.4f)
-                    //{
-                    //    wall.transform.localScale = new Vector3((float)Math.Round(end_pos.x - start_pos.x, 1), 45, 0.1f);
-                    //    wall.transform.rotation = Quaternion.Euler(0,45,0);
-                    //    wall.transform.position = new Vector3(start_pos.x, start_pos.y, start_pos.z);
-                    //}  
-
-
-
-                    //transform.transform.position = new Vector3(scale.x *5, 0, scale.z *5);
-
-                    //scaleChange = new Vector3(deltaScale, 0, z);
-                    //positionChange = new Vector3(deltaScale * 5, 0, z * 5);
+                        wall.transform.position = new Vector3(start_pos.x, WallHeight/2, scale_z/2+start_pos.z);
+                    }                    
 
                     break;
                 case Mode.Room:
                     /*if (scale_x > 0 && scale_z > 0) */LocationController.Cube(wall, new Vector3(scale_x, scale_z, WallHeight), 
-                                                            new Vector2((float)Math.Round(start_pos.x,Rounding), (float)Math.Round(start_pos.z,Rounding)),0.05f);
-                    break;
-                case Mode.Pole:
-                    AddWall(pos);
+                                                            new Vector2((float)Math.Round(start_pos.x,Rounding), (float)Math.Round(start_pos.z,Rounding)), WallThickness);
                     break;
+                //case Mode.Pole:
+                //    AddWall(pos);
+                //    break;
             }
         }
     }
@@ -141,6 +123,7 @@ public class WallCreate : MonoBehaviour
     {
         var wall = Instantiate(Resources.Load("GameObjects/Pole", typeof(GameObject))) as GameObject;
         wall.transform.position = pos;
+        wall.transform.SetParent(GameObject.Find("Walls").transform);
         Walls.Add(wall);
         return wall;
     }
@@ -148,10 +131,12 @@ public class WallCreate : MonoBehaviour
     GameObject AddRoom()
     {
         var room = Instantiate(Resources.Load("GameObjects/Cube", typeof(GameObject))) as GameObject;
+        room.transform.SetParent(GameObject.Find("Walls").transform);
         LocationController.Cube(room, new Vector3(0.1f, 0.1f, 1));
         for (var i = 0; i < room.transform.childCount; i++)
-            if (room.transform.GetChild(i).gameObject.activeSelf == true)
+            if (room.transform.GetChild(i).gameObject.activeSelf == true)            
                 Walls.Add(room.transform.GetChild(i).gameObject);
+            
         return room;
     }
 }

+ 2 - 2
Assets/Scripts/Controllers/AuthorizationController.cs

@@ -39,8 +39,8 @@ public class AuthorizationController : MonoBehaviour
         if (success)
         {//SceneManager.LoadScene("Location");
             transform.gameObject.SetActive(false);
-            client.SendGetUsers((uint)WorkerController.active_company + 1);
-            client.BeaconsRequest((uint)WorkerController.locations[WorkerController.active_location].id);
+            client.SendGetUsers((uint)PlayerController.active_company + 1);
+            client.BeaconsRequest((uint)PlayerController.locations[PlayerController.active_location].id);
         }
         if(error) Error.SetActive(true);
     }

+ 0 - 130
Assets/Scripts/Controllers/Editor2DController.cs

@@ -1,130 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-
-/// <summary>
-/// Редактор
-/// </summary>
-public class Editor2DController : MonoBehaviour
-{
-    public InputField Name;
-    public InputField Image;
-    public InputField SizeX;
-    public InputField SizeY;
-    public GameObject plane;
-    public GameObject BeaconsContent;
-    public GameObject PanelBeaconEdit;
-    public Toggle ToggleGrid;
-    public Toggle ToggleScalePanel;
-    public Toggle projection;
-    public GameObject Grid;
-
-    public List<Beacon> Beacons = new List<Beacon>();
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        SizeX.text = $"{plane.transform.localScale.x}";
-        SizeY.text = $"{plane.transform.localScale.z}";
-        if (ToggleGrid.isOn != Grid.activeSelf) Grid.SetActive(ToggleGrid.isOn);
-        if (ToggleScalePanel.isOn != plane.GetComponent<TouchScript>().activeScript) plane.GetComponent<TouchScript>().activeScript = ToggleScalePanel.isOn;
-
-        if (projection.isOn)
-        {
-            Camera.main.orthographic = true;
-        }
-        else
-        {
-            Camera.main.orthographic = false;
-        }
-    }
-
-    public void UpdatePanel()
-    {
-        if (!Image.text.Equals(""))
-            StartCoroutine(SendingFormController.LoadImage(Image.text, plane));
-
-        var x = 1f;
-        if (!SizeX.text.Equals(""))
-            x = float.Parse(SizeX.text, CultureInfo.InvariantCulture);
-        var y = 1f;
-        if (!SizeY.text.Equals(""))
-            y = float.Parse(SizeY.text, CultureInfo.InvariantCulture);
-        plane.transform.localScale = new Vector3(x, 1, y); 
-        var scale = plane.transform.localScale;
-        plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
-    }
-
-    public void Save()
-    {
-        SceneManager.LoadScene("Location");
-    }
-
-    public void Back()
-    {
-        SceneManager.LoadScene("Location");
-    }
-
-    public void AddBeacon()
-    {
-        PanelBeaconEdit.SetActive(true);
-        PanelBeaconEdit.transform.GetChild(0).GetComponent<Text>().text = $"Маяк_{Beacons.Count}";
-        var beacon = Instantiate(Resources.Load("GameObjects/Beacon", typeof(GameObject))) as GameObject;
-        beacon.GetComponent<BeaconController>().mode = BeaconController.Mode.Editor;
-        var panel_button = Instantiate(Resources.Load("GameObjects/Panel_Beacon", typeof(GameObject))) as GameObject;
-        panel_button.transform.SetParent(BeaconsContent.transform);
-        var button = panel_button.transform.GetChild(0).GetComponent<Button>();      
-        button.name = $"BeaconButton_{Beacons.Count}";
-        
-        button.transform.GetChild(0).GetComponent<Text>().text = $"Маяк_{Beacons.Count}";
-
-        var b = new Beacon { };
-
-        button.onClick.AddListener(() =>
-        {
-            PanelBeaconEdit.SetActive(true);
-        });
-        //var text = PanelBeaconEdit.transform.GetChild(0).GetComponent<Text>().text = "";
-        //var uuid = PanelBeaconEdit.transform.GetChild(1).GetComponent<InputField>().text = "";
-        var button_ok = PanelBeaconEdit.transform.GetChild(5).transform.GetChild(0).GetComponent<Button>();
-        button_ok.onClick.AddListener(() =>
-        {
-            b.uuid = PanelBeaconEdit.transform.GetChild(1).GetComponent<InputField>().text;
-            b.minor = uint.Parse(PanelBeaconEdit.transform.GetChild(2).GetComponent<InputField>().text);
-            b.major = uint.Parse(PanelBeaconEdit.transform.GetChild(3).GetComponent<InputField>().text);
-
-            PanelBeaconEdit.SetActive(false);
-        });
-        var button_close = PanelBeaconEdit.transform.GetChild(5).transform.GetChild(1).GetComponent<Button>();
-        button_close.onClick.AddListener(() =>
-        {
-            PanelBeaconEdit.SetActive(false);
-        });
-
-         var button_del = panel_button.transform.GetChild(1).GetComponent<Button>();
-        button_del.onClick.AddListener(() =>
-        {
-            Destroy(beacon);
-            Destroy(panel_button);
-            Beacons.Remove(b);
-            if (PanelBeaconEdit.activeSelf) PanelBeaconEdit.SetActive(false);
-        });
-
-        b.id = (uint)Beacons.Count;
-        b.beacon = beacon;
-        b.button = button;
-
-        Beacons.Add(b);
-    }
-
-
-}

+ 0 - 1
Assets/Scripts/Controllers/LocationController.cs

@@ -7,7 +7,6 @@ using UnityEngine.AI;
 
 /// <summary>
 /// Проектирование помещения
-/// не используется
 /// </summary>
 public class LocationController : MonoBehaviour
 {

+ 0 - 472
Assets/Scripts/Controllers/WorkerController.cs

@@ -1,472 +0,0 @@
-using Assets.Scripts.Models;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-
-public class WorkerController : MonoBehaviour
-{
-    public static Dictionary<uint, List<Structure>> Workers = new Dictionary<uint, List<Structure>>();
-    public static List<Structure> TestStructures = new List<Structure>();
-    public static List<Beacon> Beacons = new List<Beacon>();
-
-    public GameObject WorkersList; // scroll content
-    public Dropdown DropdownCompany;
-    public Dropdown DropdownLocation;
-    public Dropdown DropdownData;
-    public GameObject inputField_date;
-    //public InputField inputField_location;
-    public GameObject TimeStart;
-    public GameObject TimeEnd;
-    public GameObject StartHour;
-    public GameObject StartMin;
-    public GameObject StartSec;
-    public GameObject EndHour;
-    public GameObject EndMin;
-    public GameObject EndSec;
-    public GameObject StartStopButton;
-    public GameObject ErrorDialog;
-   // public GameObject ButtonPlay;
-    public Dropdown DropdownMode;
-    public Toggle ToggleLine;
-    public Toggle ToggleDisappearance;
-    public GameObject DatePicker;
-    public Camera camera;
-    public Toggle projection;
-
-    enum Mode { RealTime = 0, History = 1, Stop = 2 };
-    Mode active_mode = Mode.Stop;
-    int mode = 0;
-    //public GameObject Time;
-
-    static Client client = new Client();
-
-    DateTimePicker Date;
-
-    public List<GameObject> maps;
-    static bool starting = false; // флаг остановки
-    public static Dictionary<uint, bool> end_send = new Dictionary<uint, bool>(); // флаги завершения загрузки
-    Dictionary<uint, MarkerMoving> moving = new Dictionary<uint, MarkerMoving>(); // флаги начала движения
-    float interpolationPeriod = 0.1f;
-    float time_realtime = 0;
-    float time_draw = 0;
-    public static List<User> users = new List<User>();
-    public static bool users_load = false;
-    public static bool beacons_load = false;
-    uint location_id = 1;
-    public static  List<Location> locations;
-    public static List<Marker> markers;
-
-    //List<bool> StartStop = new List<bool>();
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        DebugHelper.ActivateConsole();
-        markers = new List<Marker>();
-        locations = new List<Location>();
-
-        Date = DatePicker.GetComponent<DateTimePicker>();
-        locations.Add(new Location { id = 1, name = "1 Братск" });
-        locations.Add(new Location { id = 22, name = "22 Офис Ижевск" });
-        locations.Add(new Location { id = 25, name = "1 Братск" });
-        foreach(var l in locations)
-        DropdownLocation.options.Add(new Dropdown.OptionData(l.name));
-
-        DropdownCompany.options.Add(new Dropdown.OptionData("Тайшет"));
-        DropdownCompany.options.Add(new Dropdown.OptionData("Тестовая"));
-        DropdownCompany.options.Add(new Dropdown.OptionData("Братское"));
-      
-    }
-
-    public static int active_location = 0;
-    public static int active_company = 0;
-    // Update is called once per frame
-    void Update()
-    {
-        if (DropdownMode.value != mode)
-        {
-            StopProgress();
-
-            active_mode = Mode.Stop;
-            mode = DropdownMode.value;
-            switch (DropdownMode.value)
-            {
-                case 0:
-                    DatePicker.SetActive(false);
-                    TimeStart.SetActive(false);
-                    TimeEnd.SetActive(false);
-                    break;
-                case 1:
-                    DatePicker.SetActive(true);
-                    TimeStart.SetActive(true);
-                    TimeEnd.SetActive(true);
-                    break;
-            }
-        }
-
-        if(active_company != DropdownCompany.value)
-        {
-            active_company = DropdownCompany.value;
-            foreach(var m in markers)
-            {
-                Destroy(m.marker.gameObject);
-                Destroy(m.marker_line.gameObject);
-                Destroy(m.toggle.gameObject);
-            }
-            markers = new List<Marker>();
-            client.SendGetUsers((uint) active_company + 1);
-        }
-
-        if (active_location != DropdownLocation.value)
-        {
-            maps.ElementAt(active_location).SetActive(false);
-            maps.ElementAt(DropdownLocation.value).SetActive(true);
-            active_location = DropdownLocation.value;
-            switch (DropdownLocation.value)
-            {
-                case 0:
-                    location_id = 1;
-                    break;
-                case 1:
-                    location_id = 22;
-                    break;
-                case 2:
-                    location_id = 25;
-                    break;
-            }
-
-            foreach (var b in Beacons)
-            {
-                Destroy(b.beacon);
-                Destroy(b.button);
-            }
-            Beacons = new List<Beacon>();
-            client.BeaconsRequest((uint)locations[DropdownLocation.value].id);
-        }
-
-        time_draw += Time.deltaTime;
-        if (time_draw >= interpolationPeriod)
-        {
-            foreach (var m in markers.Select((value,i) => (value, i)))
-            {
-                m.value.marker.SetActive(m.value.toggle.isOn);
-                if (m.value.toggle.isOn && Workers.ContainsKey(m.value.acc_id) && starting && end_send[m.value.acc_id])
-                {
-                    //end_send[m.value.acc_id] = false;
-                    // moving.Add(true);
-
-                    //if (markers.Count - 1 == m.i)                   
-
-                    StartingAccPositiong(m.value);
-
-                    var temp = Workers.Values.Max().FirstOrDefault();
-                    if (temp != null)
-                    {
-                        if (active_mode == Mode.History && moving[m.value.acc_id].index == Workers[temp.acc_id].Count && moving[moving.Keys.Last()].step >= 1f)
-                        {
-                            StopProgress();
-                        }
-                    }
-                    else
-                    {
-                        StopProgress();
-                    }
-                    if (active_mode == Mode.RealTime && moving[moving.Keys.Last()].index == 1)
-                    {
-                        starting = false;
-                    }
-                }
-            }            
-
-           
-
-            time_draw -= interpolationPeriod;
-        }
-
-        //time_realtime += Time.deltaTime;
-        if (active_mode == Mode.RealTime /*&& !inputField_location.text.Equals("")*/ /*&& time_realtime >= interpolationPeriod*/ && !starting)
-        {
-            //time_realtime -= interpolationPeriod;
-            
-            //var location_id = uint.Parse(inputField_location.text);
-            foreach (var m in markers)
-            {
-                if (m.toggle.isOn)
-                {
-                    client.CoordinatesRequest(0, 0, 1, location_id, m.acc_id);
-                    end_send[m.acc_id] = false;
-                }
-            }
-            starting = true;
-        }
-
-        if (ToggleLine.isOn)
-        {
-            foreach (var m in markers)
-                m.marker_line.gameObject.SetActive(true);
-            ToggleDisappearance.interactable = true;
-        }
-        else
-        {
-            foreach (var m in markers)
-            {
-                m.marker_line.gameObject.SetActive(false);
-                m.marker_line.positionCount = 0;
-            }
-            ToggleDisappearance.interactable = false;
-        }
-
-        if (projection.isOn)
-        {
-            camera.orthographic = true;
-        }
-        else
-        {
-            camera.orthographic = false;
-        }
-
-        if (users_load)
-        {
-            users_load = false;
-            foreach (var u in users.OrderBy(u => u.id))
-                WorkerMarker(u, Color.green);
-        }
-
-        if (beacons_load)
-        {
-            beacons_load = false;
-            foreach (var b in Beacons)
-                AddBeacon(b);
-        }
-    }   
-
-    /// <summary>
-    /// Создание маркера для сотрудника
-    /// </summary>
-    /// <param name="acc_id"></param>
-    void WorkerMarker(User user, Color color)
-    {
-        var toggle = Instantiate(Resources.Load("GameObjects/Toggle", typeof(Toggle))) as Toggle;
-        toggle.name = $"{user.id}";
-        toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{user.id} {user.name}";
-        toggle.transform.SetParent(WorkersList.transform);
-        toggle.isOn = false;
-
-        var marker = Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
-        marker.name = $"marker_{user.id}";
-        marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{user.id}";
-
-        marker.GetComponent<Renderer>().material.color = color; // UnityEngine.Random.ColorHSV(0f, 1f, 1f, 1f, 0.5f, 1f);
-
-        var marker_line = Instantiate(Resources.Load("GameObjects/Line", typeof(LineRenderer))) as LineRenderer;
-        marker_line.name = $"marker_line_{user.id}";
-        marker_line.startColor = color;
-        marker_line.endColor = Color.white;
-        marker_line.material.color = color;
-
-        markers.Add(new Marker { acc_id = user.id, marker = marker, toggle = toggle, marker_line = marker_line });
-    }
-
-    /// <summary>
-    /// Смена положения маркера
-    /// </summary>
-    /// <param name="step">Шаг до нового положения</param>
-    /// <param name="start_pos">Начальное положение</param>
-    /// <param name="end_pos">Финальное положение</param>
-    /// <param name="marker">Маркер сотрудника</param>
-    /// <param name="w">Данные из БД</param>
-    /// <param name="progress">Номер записи из БД</param>
-    /// <returns></returns>
-    void Position(float step, Vector3 start_pos, Vector3 end_pos, Marker marker, Structure w, string progress)
-    {
-        if (marker.marker.activeSelf == true)
-        {
-            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}");
-            var new_position = new Vector3(x_position, 0.5f, y_position);
-            if (marker.marker.transform.position != new_position)
-            {
-                marker.marker.transform.position = new Vector3(x_position, 0.5f, y_position);
-                marker.marker_line.SetPosition(marker.marker_line.positionCount++, new Vector3(x_position, 0, y_position));
-                if(ToggleDisappearance.isOn)marker.marker_line = LineDisappearance(marker.marker_line);
-            }
-            marker.marker.transform.GetChild(0).transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{w.acc_id} x={end_pos.x} y={end_pos.z}";
-            marker.toggle.transform.GetChild(1).gameObject.GetComponent<Text>().text = $"{w.acc_id} {w.ts:hh:mm:ss}{progress}";
-        }
-    }
-
-    /// <summary>
-    /// Запуск отрисовки
-    /// </summary>
-    public void ButtonStart()
-    {
-        if (active_mode == Mode.Stop)
-            foreach (var m in markers)
-                m.marker_line.positionCount = 0;
-
-        var button_text = StartStopButton.transform.GetChild(0);
-        switch (DropdownMode.value)
-        {
-            case 0:
-                //real_time = !real_time;
-                if (active_mode == Mode.Stop/*real_time*/)
-                {
-                    active_mode = Mode.RealTime;
-                    button_text.GetComponent<Text>().text = "Остановить";
-                }
-                else
-                {
-                    active_mode = Mode.Stop;
-                    button_text.GetComponent<Text>().text = "Отобразить";
-                }
-                break;
-            case 1:
-                if (int.Parse(StartHour.GetComponent<InputField>().text) == 99) SceneManager.LoadScene("Editor3D");
-                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=true;
-                    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_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));
-                    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;
-        }
-    }
-
-    public void ErrorDialogClose()
-    {
-        ErrorDialog.SetActive(false);
-    }
-
-    void StopProgress()
-    {
-        starting = false;
-        StartStopButton.transform.GetChild(0).GetComponent<Text>().text = "Отобразить";
-        active_mode = Mode.Stop;
-        foreach (var m in markers)
-        {
-            end_send[m.acc_id] = false;
-            moving.Remove(m.acc_id);            
-        }
-    }
-
-    /// <summary>
-    /// Затухание траектории
-    /// </summary>
-    /// <param name="lineRenderer">Траектория</param>
-    /// <returns></returns>
-    LineRenderer LineDisappearance(LineRenderer lineRenderer)
-    {
-        //LineRenderer lineRenderer = GetComponent<LineRenderer>();
-        int newPositionCount = lineRenderer.positionCount - 1;
-        Vector3[] newPositions = new Vector3[newPositionCount];
-
-        for (int i = 0; i < newPositionCount; i++)
-        {
-            newPositions[i] = lineRenderer.GetPosition(i + 1);
-        }
-        
-        lineRenderer.SetPositions(newPositions);
-        return lineRenderer;
-    }
-
-    /// <summary>
-    /// Смена положения по интервалу
-    /// Шаги для плавного перемещения
-    /// </summary>
-    /// <param name="m">Данные о маркере</param>
-    void StartingAccPositiong(Marker m)
-    {
-        int i = 0;
-        float step = 0.1f;
-        if (moving.ContainsKey(m.acc_id))
-        {
-            if (moving[m.acc_id].index < Workers[m.acc_id].Count) i = moving[m.acc_id].index;
-            if (moving[m.acc_id].step < 1.1f) step = moving[m.acc_id].step;
-        }
-        else moving[m.acc_id] = new MarkerMoving();
-
-        var worker = Workers[m.acc_id].OrderBy(wr => wr.ts).ToList();
-        if (worker.Any())
-        {
-            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);
-            if (active_mode == Mode.History && i == 0) start_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
-
-            var end_pos = new Vector3(w.coord_x / 100f, 0.5f, w.coord_y / 100f);
-
-            var progress = "";
-            if (active_mode == Mode.History) progress = $"\n{i + 1} из {Workers[m.acc_id].Count}";
-            if (starting) Position(step, start_pos, end_pos, m, w, progress);
-            // StartingAccPositiong(m.value, time_step);
-
-        }
-
-        if (step >= 1) i++;
-        step += interpolationPeriod; // 0.1f;
-        moving[m.acc_id].index = i;
-        moving[m.acc_id].step = step;     
-    }
-
-    /// <summary>
-    /// Отображение маяков
-    /// </summary>
-    /// <param name="b"></param>
-    public void AddBeacon(Beacon b)
-    {
-        var beacon = Instantiate(Resources.Load("GameObjects/Beacon", typeof(GameObject))) as GameObject;
-        beacon.transform.position = new Vector3(b.x/100, 0.5f, b.y/100);
-        beacon.name = $"BeaconButton_{b.id}";
-        beacon.GetComponent<BeaconController>().move = false;
-        beacon.GetComponent<BeaconController>().info = false;
-        var canvas = beacon.transform.GetChild(0);
-        canvas.transform.GetChild(0).transform.GetChild(0).GetComponent<Text>().text = $"{b.id}\nuuid={b.uuid}\nmajor={b.major}\nminor={b.minor}";
-      
-        b.beacon = beacon;
-    }
-
-    public void OpenEditor()
-    {
-        SceneManager.LoadScene("Scenes/Editor2D");
-    }
-
-    void OnGUI()
-    {
-        //if (Input.GetKeyDown(KeyCode.BackQuote)) 
-            DebugHelper.DrawConsole();
-    }
-}
-

+ 0 - 11
Assets/Scripts/Controllers/WorkerController.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7a693ef021b8fb84aa24335eb21b80ab
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 4
Assets/Scripts/Models/Marker.cs

@@ -6,13 +6,11 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Assets.Scripts.Models
-{
-    public class Marker
+ public class Marker
     {
         public Toggle toggle { get; set; }
         public GameObject marker { get; set; }
         public LineRenderer marker_line { get; set; }
         public uint acc_id { get; set; }
     }
-}
+

+ 8 - 8
Assets/Scripts/Net/Client.cs

@@ -167,8 +167,8 @@ public class Client : MonoBehaviour
                 zone_id = 1
             });
         }
-        WorkerController.Workers[accid] = worker;
-        WorkerController.end_send[accid] = true;
+        PlayerController.Workers[accid] = worker;
+        PlayerController.end_send[accid] = true;
     }
 
     public void Myping(byte[] bytedata)
@@ -795,7 +795,7 @@ public class Client : MonoBehaviour
     public void UsersReceive(byte[] bytedata)
     {
         print("UsersReceive");
-        WorkerController.users = new List<User>();
+        PlayerController.users = new List<User>();
         int read = 5;
         while (read < bytedata.Length)
         {
@@ -804,9 +804,9 @@ public class Client : MonoBehaviour
             var name = Encoding.UTF8.GetString(bytedata, read+5, lenname);
             read += 5 + lenname;
             //print($"user received id {id} lenname {lenname} name {name}");
-            WorkerController.users.Add(new User { id = id, name = name });
+            PlayerController.users.Add(new User { id = id, name = name });
         }
-        WorkerController.users_load = true;        
+        PlayerController.users_load = true;        
     }
 
 
@@ -815,7 +815,7 @@ public class Client : MonoBehaviour
         GameObject canvas = GameObject.Find("Canvas");
         if (canvas != null)
         {
-            var e2c = canvas.GetComponent<Editor2DController>();
+            var e2c = canvas.GetComponent<EditorController>();
             var beacons = e2c.Beacons;
             if (beacons.Count > 0)
             {
@@ -852,9 +852,9 @@ public class Client : MonoBehaviour
             print($"beacon received id {id} uuid {uuid} x {x} y {y} z {z} minor {minor} major {major}");
             read += 56;
 
-            WorkerController.Beacons.Add(new Beacon { id = id, uuid = uuid, x = x, y = y, z = z, minor = minor, major = major });            
+            PlayerController.Beacons.Add(new Beacon { id = id, uuid = uuid, x = x, y = y, z = z, minor = minor, major = major });            
         }
-        WorkerController.beacons_load = true;
+        PlayerController.beacons_load = true;
     }
 
     public void BeaconsRequest(uint locationId)

+ 1 - 1
ProjectSettings/EditorBuildSettings.asset

@@ -6,7 +6,7 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Location.unity
+    path: Assets/Scenes/Player.unity
     guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
   - enabled: 1
     path: Assets/Scenes/Editor2D.unity