Building

2020-01-31 22:32:05 +01:00
parent 55c87eaf4c
commit ecb85cc68f
14 changed files with 1295 additions and 329 deletions
--- a/Assets/Scenes/Test-Haitem.unity
+++ b/Assets/Scenes/Test-Haitem.unity
@@ -121,46 +121,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &391253621 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3667633384733631754, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &391253622
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 391253621}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -2228417370725966487, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &531707007 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7469484624682501897, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &531707008
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 531707007}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -1550514412580984892, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@@ -253,283 +213,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &742958227 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -492420421572216379, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &742958228
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 742958227}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -8678823145569952518, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1012541192
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1012541196}
-  - component: {fileID: 1012541195}
-  - component: {fileID: 1012541194}
-  - component: {fileID: 1012541193}
-  m_Layer: 0
-  m_Name: Cube
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!65 &1012541193
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  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 &1012541194
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  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: 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_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  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 &1012541195
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1012541196
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1012541192}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.5, z: 4.81}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1046847972 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -594094835925579944, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1046847973
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1046847972}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 2212009239438826721, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1083437162 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -6203755416157869376, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1083437163
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1083437162}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -5611087096184871397, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1139821472 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4695666576454475813, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1139821473
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1139821472}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4493585093827132993, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1001 &1260635599
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.68
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-        type: 3}
-      propertyPath: m_Name
-      value: cabin
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
--- !u!1 &1432614924 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7462036371361415008, guid: babc4ee5f4c7fe24a895b5687e946a8e,
-    type: 3}
-  m_PrefabInstance: {fileID: 1260635599}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &1432614925
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1432614924}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -5053925668127403250, guid: babc4ee5f4c7fe24a895b5687e946a8e, type: 3}
 --- !u!1 &1655437821
 GameObject:
  m_ObjectHideFlags: 0
@@ -542,7 +225,7 @@ GameObject:
  - component: {fileID: 1655437824}
  - component: {fileID: 1655437823}
  - component: {fileID: 1655437822}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Ground
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -623,6 +306,75 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &6179705720582673448
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5859379536716062794, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_Name
+      value: cabin
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5322794fa1699704b8e50a14cef106b1, type: 3}
 --- !u!1001 &7985979212702423926
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -635,15 +387,31 @@ PrefabInstance:
      propertyPath: m_Name
      value: Player
      objectReference: {fileID: 0}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: weaponList.Array.size
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
      propertyPath: runSpeed
      value: 25
      objectReference: {fileID: 0}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: weaponList.Array.data[0]
+      value: 
+      objectReference: {fileID: 1999182813209888360, guid: 7933df0606f61e94e9008c58a313b22c,
+        type: 3}
+    - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c,
+        type: 3}
+      propertyPath: buildRate
+      value: 0.5
+      objectReference: {fileID: 0}
    - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: 5.19
      objectReference: {fileID: 0}
    - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
        type: 3}