update

2023-10-13 16:33:46 +02:00 · 2023-10-13 16:33:46 +02:00 · 28a5116ef6
parent 9844fbf73a
commit 28a5116ef6
19 changed files with 5546 additions and 626 deletions
--- a/Assets/TerrainSampleAssets/Textures/Heightmaps.meta
+++ b/Assets/TerrainSampleAssets/Textures/Heightmaps.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: acfbac3344b07ed4f84ebf0c8828a729
+guid: 44b9f79fae4d33a4593cabd1f3182fa2
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/CustomMapAssets/loading_screen_image.jpg
+++ b/Assets/CustomMapAssets/loading_screen_image.jpg
--- a/Assets/CustomMapAssets/loading_screen_image.jpg.meta
+++ b/Assets/CustomMapAssets/loading_screen_image.jpg.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ef2e9208f4ebef84fae9a24a254adf4d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/CustomMapAssets/loading_screen_music.mp3
+++ b/Assets/CustomMapAssets/loading_screen_music.mp3
--- a/Assets/CustomMapAssets/loading_screen_music.mp3.meta
+++ b/Assets/CustomMapAssets/loading_screen_music.mp3.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 4961d9e7fba268c42a6737da0f3c17e5
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Mapify/Prefabs/Service
+++ b/Assets/Mapify/Prefabs/Service
@ -128,6 +128,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  asset: 52
+  keepChildren: 0
+  rotation: {x: 0, y: 0, z: 0}
 --- !u!114 &3957153289511670403
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Mapify/Prefabs/Service
+++ b/Assets/Mapify/Prefabs/Service
@ -23,6 +23,11 @@ PrefabInstance:
      propertyPath: asset
      value: 53
      objectReference: {fileID: 0}
+    - target: {fileID: 3543013568023383394, guid: a21c165e9bb9547d3a86bc0a6ef1fd91,
+        type: 3}
+      propertyPath: keepChildren
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6584377352624942545, guid: a21c165e9bb9547d3a86bc0a6ef1fd91,
        type: 3}
      propertyPath: m_RootOrder
--- a/Assets/Mapify/Prefabs/Service
+++ b/Assets/Mapify/Prefabs/Service
@ -128,6 +128,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  asset: 54
+  keepChildren: 0
+  rotation: {x: 0, y: 0, z: 0}
 --- !u!114 &3957153289511670403
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Mapify/Prefabs/Service
+++ b/Assets/Mapify/Prefabs/Service
@ -23,6 +23,16 @@ PrefabInstance:
      propertyPath: asset
      value: 55
      objectReference: {fileID: 0}
+    - target: {fileID: 3543013568023383394, guid: 0f09051f0758f351bb1b1f1602ec5b51,
+        type: 3}
+      propertyPath: rotation.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 3543013568023383394, guid: 0f09051f0758f351bb1b1f1602ec5b51,
+        type: 3}
+      propertyPath: keepChildren
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6584377352624942545, guid: 0f09051f0758f351bb1b1f1602ec5b51,
        type: 3}
      propertyPath: m_RootOrder
--- a/Assets/Mapify/Prefabs/Station/Dumpster.prefab
+++ b/Assets/Mapify/Prefabs/Station/Dumpster.prefab
@ -46,6 +46,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  asset: 13
+  keepChildren: 1
+  rotation: {x: 0, y: 90, z: 0}
 --- !u!33 &1285410329932861900
 MeshFilter:
  m_ObjectHideFlags: 0
--- a/Assets/Mapify/Scripts/MapifyEditor.dll
+++ b/Assets/Mapify/Scripts/MapifyEditor.dll
--- a/Assets/Scenes/GameContent.unity
+++ b/Assets/Scenes/GameContent.unity
--- a/Assets/Scenes/Railway.unity
+++ b/Assets/Scenes/Railway.unity
--- a/Assets/Scenes/Streaming.unity
+++ b/Assets/Scenes/Streaming.unity
@ -121,85 +121,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1001 &222559561
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5542900777551704045, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_Name
-      value: Terrain_A
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 2000
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -10
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 2000
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704046, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704047, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_DrawHeightmap
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5542900777551704047, guid: 80a25b3596c79c3469cefdec12b31546,
-        type: 3}
-      propertyPath: m_DrawInstanced
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 80a25b3596c79c3469cefdec12b31546, type: 3}
 --- !u!1 &1042920620202512
 GameObject:
  m_ObjectHideFlags: 0
@ -509,7 +430,7 @@ Transform:
  - {fileID: 4764351659023321}
  - {fileID: 4862239347397115}
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
 --- !u!4 &4638040554637057
 Transform:
--- a/Assets/Scenes/parking.unity
+++ b/Assets/Scenes/parking.unity
@ -121,96 +121,3 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &1261900509
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1261900513}
-  - component: {fileID: 1261900512}
-  - component: {fileID: 1261900511}
-  - component: {fileID: 1261900510}
-  m_Layer: 0
-  m_Name: kongcrete
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!135 &1261900510
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1261900509}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1261900511
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1261900509}
-  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: 90caba3031f3bb6489b26535a49cd81d, 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: 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 &1261900512
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1261900509}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1261900513
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1261900509}
-  m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 589.5, y: 5.2, z: 413.2}
-  m_LocalScale: {x: 125.00003, y: 1, z: 125.00003}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/russian_buildings/scenes.meta
+++ b/Assets/russian_buildings/scenes.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 60ede3029a9836e4f874a38f99973bc5
-folderAsset: yes
-timeCreated: 1518962468
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "com.siccity.gltfutility": "https://github.com/siccity/gltfutility.git",
    "com.unity.ide.rider": "1.2.1",
    "com.unity.ide.visualstudio": "2.0.15",
    "com.unity.ide.vscode": "1.2.5",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -1,5 +1,14 @@
 {
  "dependencies": {
+    "com.siccity.gltfutility": {
+      "version": "https://github.com/siccity/gltfutility.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0"
+      },
+      "hash": "96619fcd48ffe5c4ad122837a21601a6f7c20080"
+    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
@ -32,6 +41,13 @@
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "2.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.terrain-tools": {
      "version": "3.0.2-preview.3",
      "depth": 0,
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@ -38,6 +38,10 @@ GraphicsSettings:
  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 4800000, guid: 53e67882b6b523040b4d921689b3f11d, type: 3}
+  - {fileID: 4800000, guid: 1f7a25b55e91d814b91743e3c9b6ef91, type: 3}
+  - {fileID: 4800000, guid: eaa9e080a142a9442ba320a638322136, type: 3}
+  - {fileID: 4800000, guid: d06f5954e89943e4da05f6054b2ace45, type: 3}
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}