浏览代码

clear code

Виктор Шейко 4 年之前
父节点
当前提交
37d9489225

+ 295 - 0
Assets/Resources/GameObjects/Location.prefab

@@ -0,0 +1,295 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3118421583927212900
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8212885825677231319}
+  - component: {fileID: 6304956382000534842}
+  m_Layer: 0
+  m_Name: Beacons
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8212885825677231319
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3118421583927212900}
+  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: 8368153524327203433}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6304956382000534842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3118421583927212900}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbee2130a2626894480accc3aa7513e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &3433816663359524833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8368153524327203433}
+  - component: {fileID: 449686657462475929}
+  m_Layer: 0
+  m_Name: Location
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8368153524327203433
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3433816663359524833}
+  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:
+  - {fileID: 2339894995021599733}
+  - {fileID: 3997876185032307186}
+  - {fileID: 8973185524663125868}
+  - {fileID: 8212885825677231319}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &449686657462475929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3433816663359524833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 503a24c7752c50343834ceb2cdf964e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 0
+  rooms: []
+  Ground: {fileID: 6212358543741949326}
+  Walls: {fileID: 7197556919001488873}
+  Zones: {fileID: 6750283321076483717}
+  Beacons: {fileID: 3118421583927212900}
+--- !u!1 &6212358543741949326
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2339894995021599733}
+  - component: {fileID: 2807483849327114394}
+  - component: {fileID: 5225995570307833878}
+  - component: {fileID: 5398258289543171007}
+  - component: {fileID: 5854755934749764014}
+  - component: {fileID: 2348373365336437820}
+  m_Layer: 0
+  m_Name: Ground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2339894995021599733
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalPosition: {x: 4.06004, y: 0.01, z: 4.03654}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8368153524327203433}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!33 &2807483849327114394
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5225995570307833878
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2859f2f7ec0751a40a558fbc51df98cf, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 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!64 &5398258289543171007
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &5854755934749764014
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0febc06224d0d394db577c9bc070104a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2348373365336437820
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6212358543741949326}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b779eb081cbdad4fa144fa9769068cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Resize: 0
+  horizontalSpeed: 1
+  verticalSpeed: 1
+  panel: {fileID: 6212358543741949326}
+--- !u!1 &6750283321076483717
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8973185524663125868}
+  - component: {fileID: 6183166089762281626}
+  m_Layer: 0
+  m_Name: Zones
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8973185524663125868
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6750283321076483717}
+  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: 8368153524327203433}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6183166089762281626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6750283321076483717}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad257c1991905f9458d42c7d278279df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &7197556919001488873
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3997876185032307186}
+  m_Layer: 0
+  m_Name: Walls
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3997876185032307186
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197556919001488873}
+  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: 8368153524327203433}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 7 - 0
Assets/Resources/GameObjects/Location.prefab.meta

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

+ 77 - 17
Assets/Scenes/Player.unity

@@ -1161,10 +1161,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 503a24c7752c50343834ceb2cdf964e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  id: 0
   rooms:
   - {fileID: 2137186683}
   - {fileID: 1765107640}
-  Location: {fileID: 60701535}
+  Ground: {fileID: 0}
+  Walls: {fileID: 0}
+  Zones: {fileID: 0}
+  Beacons: {fileID: 0}
 --- !u!4 &60701537
 Transform:
   m_ObjectHideFlags: 0
@@ -10678,6 +10682,11 @@ PrefabInstance:
       propertyPath: m_Padding.m_Right
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3179031381718342889, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 3381085879931397460, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10848,6 +10857,11 @@ PrefabInstance:
       propertyPath: m_Text
       value: H
       objectReference: {fileID: 0}
+    - target: {fileID: 4812254381176102215, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 5126628607193732931, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Text
@@ -10858,6 +10872,11 @@ PrefabInstance:
       propertyPath: m_CharacterLimit
       value: 59
       objectReference: {fileID: 0}
+    - target: {fileID: 6295689075591143488, guid: 04e9dfc406038d741b31aeebae5c71cb,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 7504885423334008393, guid: 04e9dfc406038d741b31aeebae5c71cb,
         type: 3}
       propertyPath: m_Spacing
@@ -15005,7 +15024,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -15786,11 +15805,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 503a24c7752c50343834ceb2cdf964e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  id: 0
   rooms:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  Location: {fileID: 670244520}
+  Ground: {fileID: 0}
+  Walls: {fileID: 0}
+  Zones: {fileID: 0}
+  Beacons: {fileID: 0}
 --- !u!1 &680301590
 GameObject:
   m_ObjectHideFlags: 0
@@ -16370,6 +16393,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291685771458029, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686035710041, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16395,6 +16423,11 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291686035710043, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686657835521, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16420,6 +16453,16 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 64
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291686657835523, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2709291686739621477, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2709291686739621483, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -16445,6 +16488,16 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 68
       objectReference: {fileID: 0}
+    - target: {fileID: 2709291687545950632, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2709291687718886266, guid: 34bc84621ace51d4392c51f2dab181af,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 4644357375386836452, guid: 34bc84621ace51d4392c51f2dab181af,
         type: 3}
       propertyPath: m_Spacing
@@ -24736,6 +24789,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 503a24c7752c50343834ceb2cdf964e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  id: 0
   rooms:
   - {fileID: 0}
   - {fileID: 925572859}
@@ -24743,7 +24797,10 @@ MonoBehaviour:
   - {fileID: 1911898849}
   - {fileID: 434253705}
   - {fileID: 302417704}
-  Location: {fileID: 1054412954}
+  Ground: {fileID: 0}
+  Walls: {fileID: 0}
+  Zones: {fileID: 0}
+  Beacons: {fileID: 0}
 --- !u!4 &1054412956
 Transform:
   m_ObjectHideFlags: 0
@@ -28917,7 +28974,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -29327,13 +29384,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -32298,13 +32355,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: ae38328e260b90740bef4ffdc634fb1b, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -42686,9 +42743,11 @@ MonoBehaviour:
   Rounding: 1
   move: 0
   BoxColliderEnabled: 1
-  Dialog: {fileID: 0}
+  Dialog: {fileID: 3538187245544653792}
   ZonesScroll: {fileID: 1296382291}
   Player: {fileID: 995816062}
+  redo: {fileID: 942212489}
+  undo: {fileID: 307553992}
 --- !u!1 &1765107640
 GameObject:
   m_ObjectHideFlags: 0
@@ -47864,7 +47923,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -47920,7 +47979,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -16, y: -16}
+  m_AnchoredPosition: {x: -15, y: -15}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1952724477
@@ -47984,7 +48043,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -48026,6 +48085,7 @@ MonoBehaviour:
   Building: {fileID: 2022292460}
   BuildingMode: {fileID: 935354065}
   GroundSettings: {fileID: 583944819}
+  DateTime: {fileID: 1259139722}
 --- !u!1 &1953112961
 GameObject:
   m_ObjectHideFlags: 0
@@ -53055,7 +53115,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -53466,7 +53526,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -56503,7 +56563,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -57003,7 +57063,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

文件差异内容过多而无法显示
+ 30794 - 0
Assets/Scenes/PlayerNoWorks.unity


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

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

+ 28 - 1
Assets/Scripts/Components/WallCreate.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -17,6 +18,11 @@ public class WallCreate : MonoBehaviour
     public Dialog Dialog;
     public GameObject ZonesScroll;
     public GameObject Player;
+
+    public Button redo;
+    public Button undo; // отмена
+    public List<History> histories = new List<History>();
+
     public enum Mode { Wall, Room, Zone, Pole, Cursor };
     public static Mode mode = Mode.Cursor;
     GameObject wall;
@@ -53,6 +59,8 @@ public class WallCreate : MonoBehaviour
         canvas = transform.GetChild(0).gameObject;
         text = transform.GetChild(0).GetChild(0).GetChild(0).GetComponent<Text>();
         company = CompanyController.instance;
+
+        undo.onClick.AddListener(Undo);
     }
    
     // Update is called once per frame
@@ -80,7 +88,8 @@ public class WallCreate : MonoBehaviour
             switch (mode)
             {
                 case Mode.Wall:
-                    wall = AddWall(company, Vector3.zero);     
+                    wall = AddWall(company, Vector3.zero);
+                    EventHistory(0, wall, null);
                     break;
                 case Mode.Room:
                     wall = AddRoom();
@@ -88,8 +97,12 @@ public class WallCreate : MonoBehaviour
                 case Mode.Zone:
                     wall = AddZone(Dialog, company, ZonesScroll);
 
+                    var location_id = company.locations_index[company.active_location];
+                    EventHistory(0, wall, Zones[location_id].Last().buttons);
                     break;
             }
+
+           
         }
 
         canvas.SetActive(true);       
@@ -208,6 +221,7 @@ public class WallCreate : MonoBehaviour
         var location = company.locations[company.locations_index[company.active_location]].location;
         wall.transform.SetParent(location.transform.GetChild(1).transform);
         //WallObjects.Add(wall);
+        
         return wall;
     }
 
@@ -320,4 +334,17 @@ public class WallCreate : MonoBehaviour
         var zone = Zones[location_id][num];
         return zone.id;
     }
+
+    void Undo()
+    {
+        var last = histories.Last();
+        last.obj.SetActive(false);
+        if(last.ButtonPanel != null) last.ButtonPanel.SetActive(false);
+        last.status = false;
+    }
+
+    public void EventHistory(uint id, GameObject gameObject, GameObject panel)
+    {
+        histories.Add(new History { id = id, obj = gameObject, ButtonPanel = panel, status = true });
+    }
 }

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

@@ -87,4 +87,19 @@ public class BeaconController : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// Информационная панель над маяком
+    /// </summary>
+    /// <param name="b"></param>
+    public void InformationPanel(Beacon b)
+    {
+        text_info = $"{b.id}\n{b.vagrant_label}\nuuid={b.uuid}\nmajor={b.major}\nminor={b.minor}\nmac={b.mac}";
+    }
+
+    public void BeaconEnabled(Beacon b, bool enabled)
+    {
+        b.enabled = enabled;
+        if (b.enabled == false) GetComponent<Renderer>().material.color = Color.grey;
+        else GetComponent<Renderer>().material.color = Color.red;
+    }
 }

+ 99 - 0
Assets/Scripts/Controllers/BeaconsEditorController.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+/// <summary>
+/// опт
+/// </summary>
+public class BeaconsEditorController : MonoBehaviour
+{
+    public Dictionary<uint, Beacon> Beacons = new Dictionary<uint, Beacon>();
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public Beacon CreateBeacon(uint loaction_id)
+    {
+        var beacon = new Beacon
+        {
+            id = Convert.ToUInt32(4000000000 + Beacons.Count),
+            location_id = loaction_id,
+            enabled = true
+        };
+        AddBeacon(beacon);
+        return beacon;
+    }
+
+    public void EditBeacon(Beacon beacon, string name)
+    {
+
+    }
+
+    /// <summary>
+    /// опт
+    /// </summary>
+    /// <param name="b"></param>
+    public void AddBeacon(Beacon b)
+    {
+        var beacon = Instantiate(Resources.Load("GameObjects/Beacon", typeof(GameObject))) as GameObject;
+        if (ModeController.editor) beacon.GetComponent<BeaconController>().mode = BeaconController.Mode.Editor;
+
+        beacon.name = $"Beacon_{b.id}";
+
+        beacon.transform.position = new Vector3(b.x, 0.5f, b.y);
+
+        var beaconController = beacon.GetComponent<BeaconController>();
+        beaconController.InformationPanel(b);
+        beaconController.id = $"{b.id}";
+        beaconController.BeaconEnabled(b, b.enabled);
+
+        beacon.transform.SetParent(transform);
+
+        var name_beacon = $"Маяк {b?.id.ToString() ?? Beacons.Count.ToString()}";
+        //PanelBeaconEdit.transform.GetChild(0).GetComponent<Text>().text = name_beacon;
+        var panel_button = Instantiate(Resources.Load("GameObjects/Panel_Beacon", typeof(GameObject))) as GameObject;
+        //
+        panel_button.name = $"Beacon_{b?.id.ToString() ?? Beacons.Count.ToString()}";
+        var button = panel_button.transform.GetChild(0).GetComponent<Button>();
+        button.name = $"BeaconButton_{Beacons.Count}";
+
+        button.transform.GetChild(0).GetComponent<Text>().text = name_beacon;
+
+        b.beacon = beacon;
+        b.panel_button = panel_button;
+
+        Beacons.Add(b.id, b);
+    }
+
+    public void SetParent(Transform parent)
+    {
+        foreach (var b in Beacons)
+            b.Value.panel_button.transform.SetParent(parent);
+    }
+
+    public void DeleteBeacon(Beacon b)
+    {
+        Destroy(b.beacon);
+        Destroy(b.panel_button);
+        Beacons.Remove(b.id);
+    }
+
+    public void DeleteAllBeacons()
+    {
+        foreach (var b in Beacons)
+            DeleteBeacon(b.Value);
+    }
+
+    
+}

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

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

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

@@ -57,6 +57,7 @@ public class EditorController : MonoBehaviour
 
         ButtonAddBeacon.onClick.AddListener(() => {
             AddBeacon(company);
+            
         });
 
         var random = new System.Random();

+ 20 - 9
Assets/Scripts/Controllers/HistoryController.cs

@@ -1,23 +1,25 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 
+/// <summary>
+/// отмена создания стены, маяка, зоны
+/// </summary>
 public class HistoryController : MonoBehaviour
 {
-  
-
-
-    class History
-    {
-
-    }
+    public Button redo;
+    public Button undo; // отмена
+    public List<History> histories = new List<History>();
+    
+   
 
 
     // Start is called before the first frame update
     void Start()
     {
-
+        undo.onClick.AddListener(Undo);
     }
 
     // Update is called once per frame
@@ -27,6 +29,15 @@ public class HistoryController : MonoBehaviour
     }
 
  
-
+    void Undo() {
+        var last = histories.Last();
+        last.obj.SetActive(false);
+        last.ButtonPanel.SetActive(false);
+        last.status = false;
+    }
   
+    public void EventHistory(uint id, GameObject gameObject, GameObject panel)
+    {
+        histories.Add(new History { id = id, obj = gameObject, ButtonPanel = panel, status = true });
+    }
 }

+ 35 - 2
Assets/Scripts/Controllers/LocationController.cs

@@ -10,8 +10,15 @@ using UnityEngine.AI;
 /// </summary>
 public class LocationController : MonoBehaviour
 {
+    public uint id;
     public List<GameObject> rooms;
-    public GameObject Location;
+    public GameObject Ground;
+    public GameObject Walls;
+    public GameObject Zones;
+    public GameObject Beacons;
+    Location location;
+
+    //public GameObject Location;
     // Start is called before the first frame update
     void Start()
     {
@@ -39,7 +46,7 @@ public class LocationController : MonoBehaviour
 
         // location_1
         var rooms_0 = Instantiate(Resources.Load("GameObjects/Cube", typeof(GameObject)) as GameObject);
-        rooms_0.transform.SetParent(Location.transform);
+        rooms_0.transform.SetParent(transform);
         Cube(rooms_0, new Vector3(22.8f, 5.5f, 1)); //x=6 y=8 h1
         rooms.Add(rooms_0);
 
@@ -183,4 +190,30 @@ public class LocationController : MonoBehaviour
             panel.transform.rotation = SideF.transform.rotation;
         }
     }    
+
+    /// <summary>
+    /// Загрузка текстуры
+    /// </summary>
+    public void GroundTexture(string url)
+    {
+        StartCoroutine(SendingFormController.LoadImage(url, Ground));
+    }
+
+    public void GroundResize(float x, float y)
+    {
+        Ground.transform.localScale = new Vector3(x, 1, y);
+        var scale = Ground.transform.localScale;
+        Ground.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
+    }
+
+
+    /// <summary>
+    /// опт
+    /// </summary>
+    /// <param name="location"></param>
+   public void LoadObj(Location location)
+    {
+        var z = Zones.GetComponent<ZonesEditorController>();
+        
+    }
 }

+ 2 - 1
Assets/Scripts/Controllers/ModeController.cs

@@ -20,6 +20,7 @@ public class ModeController : MonoBehaviour
     public GameObject Building;
     public GameObject BuildingMode;
     public GameObject GroundSettings;
+    public GameObject DateTime;
 
     Transform maps;
 
@@ -156,7 +157,7 @@ public class ModeController : MonoBehaviour
         var color = new Color();
         ColorUtility.TryParseHtmlString("#C8C8C8", out color);
         EditorTools.transform.GetChild(0).gameObject.GetComponent<Image>().color = color;
-
+        if (DateTime.activeSelf == true) DateTime.SetActive(false);
         //foreach (var m in PlayerController.markers)
         //{
         //    Destroy(m.marker.gameObject);

+ 10 - 4
Assets/Scripts/Controllers/ZoneController.cs

@@ -11,25 +11,31 @@ public class ZoneController : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        
+
     }
 
     // Update is called once per frame
     void Update()
     {
-       
 
-      
+
+
     }
 
 
     void OnMouseOver()
     {
-        if(ZoneColor) transform.GetComponent<Renderer>().material.color = new Color(0, 1, 0, 0.5f);
+        if (ZoneColor) transform.GetComponent<Renderer>().material.color = new Color(0, 1, 0, 0.5f);
     }
 
     void OnMouseExit()
     {
         if (ZoneColor) transform.GetComponent<Renderer>().material.color = new Color(1, 0, 0, 0.5f);
     }
+
+    public void Rename(string name_obj, string name)
+    {
+        gameObject.name = name_obj;
+        TextMesh.text = name;
+    }
 }

+ 77 - 0
Assets/Scripts/Controllers/ZonesEditorController.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+/// <summary>
+/// опт
+/// </summary>
+public class ZonesEditorController : MonoBehaviour
+{
+    public Dictionary<uint, Zone> Zones = new Dictionary<uint, Zone>();
+    //public class Zone
+    //{
+
+    //}
+
+        
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public Zone CreateZone(uint location_id)
+    {
+        var z = new Zone { 
+            id = Convert.ToUInt32(4000000000 + Zones.Count), 
+            location_id = location_id,
+            name = $"Зона {Zones.Count +1}"
+        };
+        AddZone(z);
+
+        return z;
+    }
+
+    public void EditZone()
+    {
+
+    }
+
+    /// <summary>
+    /// добавление зоны
+    /// </summary>
+    /// <param name="Dialog"></param>
+    /// <param name="location"></param>
+    /// <param name="ZonesScroll"></param>
+    /// <param name="z"></param>
+    public void AddZone(Zone z)
+    {
+        var zone = Instantiate(Resources.Load("GameObjects/Zone", typeof(GameObject))) as GameObject;
+        zone.transform.SetParent(transform);
+        var zoneController = zone.GetComponent<ZoneController>();
+        zoneController.Rename($"Zone_{Zones.Count + 1}", z.name);
+
+        if (z != null)
+        {
+            zone.transform.position = new Vector3(z.start_height, 1, z.start_width);
+            zone.transform.localScale = new Vector3(z.end_height, 1, z.end_width);
+        }
+    }
+
+    public void DeleteZone(uint id)
+    {
+        Destroy(Zones[id].go);
+        Destroy(Zones[id].buttons);
+        Zones.Remove(id);
+    }
+
+    
+}

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

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

+ 15 - 0
Assets/Scripts/Models/History.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class History
+{
+    public uint id { get; set; }
+    public GameObject obj { get; set; }
+    public GameObject ButtonPanel { get; set; }
+    public bool status { get; set; }
+}
+

+ 11 - 0
Assets/Scripts/Models/History.cs.meta

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