Jam
/
GGJ_2019
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Everything fixed EXCEPT game manager is deleted upon main scene loaded

master
Bernard Laptop 5 years ago
parent
b244849293
commit
5ae5755629
11 changed files with 308 additions and 752 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -8
      Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta
  2. +0
    -8
      Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta
  3. +0
    -8
      Assets/AmplifyShaderEditor/Examples/Official/Substance.meta
  4. +0
    -8
      Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta
  5. +0
    -8
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta
  6. +6
    -386
      Assets/Scenes/MainScene.unity
  7. +2
    -2
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
  8. +75
    -75
      Assets/Tiles/pr_terr1.prefab
  9. +75
    -75
      Assets/Tiles/pr_terr2.prefab
  10. +75
    -75
      Assets/Tiles/pr_terr3.prefab
  11. +75
    -99
      Assets/Tiles/pr_terr4.prefab

+ 0
- 8
Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 917f314cd7500ab41a37e0c60edaf755
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 8
Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e14f9199031928442a76fcb851644355
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 8
Assets/AmplifyShaderEditor/Examples/Official/Substance.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 3a1c9292d8fac714e9091922355abcd7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 8
Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 50c3f69bf74856340867f04dd9288b24
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 8
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: cc9e432e1a0a4764f80870c080173cb7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 6
- 386
Assets/Scenes/MainScene.unity View File

@ -954,7 +954,6 @@ GameObject:
m_Component:
- component: {fileID: 221906470}
- component: {fileID: 221906469}
- component: {fileID: 221906468}
m_Layer: 0
m_Name: OriginalLight (1)
m_TagString: Untagged
@ -962,41 +961,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &221906468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 221906467}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90a0ecd4363b0a547a4c174b9a95dd5d, type: 3}
m_Name:
m_EditorClassIdentifier:
_TargetFogVolumes: []
MiniaturePosition: {x: 110, y: 320}
_ProminentFogVolume: {fileID: 0}
FogVolumeMaterial: {fileID: 0}
_CameraVerticalPosition: 500
_Antialiasing: 1
Size: 512
ShadowCamera: {fileID: 0}
_FogVolumeShadowMapEdgeSoftness: 0.001
_ScaleMode: 0
LayersToRender:
serializedVersion: 2
m_Bits: 0
outputDepth: {fileID: 0}
GOShadowCamera: {fileID: 0}
CameraVisible: 0
_UpdateMode: 1
Scale: 50
SkipFrames: 2
ShowMiniature: 0
DebugViewMaterial: {fileID: 0}
_GameObjectFocus: {fileID: 0}
_FocusMode: 0
quadShader: {fileID: 0}
--- !u!108 &221906469
Light:
m_ObjectHideFlags: 0
@ -1755,10 +1719,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Tiles:
- {fileID: 1421776024591220, guid: fdf1303f04661cd4fba35d2770a28852, type: 2}
- {fileID: 1199775478807856, guid: 04b30710d790a7849a5b498461f2ff6c, type: 2}
- {fileID: 1979546481006892, guid: 0dbacc73da8fd0942b7f5ec44f60f2cd, type: 2}
- {fileID: 1462668465096564, guid: 86578d8e121fe074b9eaccf0e34498b7, type: 2}
- {fileID: 1521013867655950, guid: 6cd09716f6819a54abd38f88de55ca36, type: 2}
- {fileID: 1047126995481286, guid: 86a3029e051d5284283633d9eb3a7db1, type: 2}
- {fileID: 1660903737017894, guid: 1aa01a9ff81aa694791689d515f3a3d3, type: 2}
- {fileID: 1112537678137220, guid: 874cc8af6646d5549b9338196f0d449f, type: 2}
Landmarks:
- {fileID: 1191978790607594, guid: 812f2a3c0f4016746aca35578f0fbdae, type: 2}
- {fileID: 1625714886565098, guid: 351e292603aa2064bb39eb5c7c729c85, type: 2}
@ -3894,281 +3858,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!1 &1376576714
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1376576717}
- component: {fileID: 1376576716}
- component: {fileID: 1376576715}
- component: {fileID: 1376576718}
- component: {fileID: 1376576719}
- component: {fileID: 1376576720}
- component: {fileID: 1376576721}
- component: {fileID: 1376576722}
- component: {fileID: 1376576723}
- component: {fileID: 1376576724}
- component: {fileID: 1376576725}
- component: {fileID: 1376576726}
m_Layer: 5
m_Name: FogVolume Debug Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1376576715
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &1376576716
Canvas:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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 &1376576717
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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: 1678315779}
m_Father: {fileID: 0}
m_RootOrder: 19
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!114 &1376576718
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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!114 &1376576719
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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!114 &1376576720
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576721
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576722
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576723
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576724
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576725
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!114 &1376576726
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1376576714}
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!1 &1427235361
GameObject:
m_ObjectHideFlags: 1
@ -5060,75 +4749,6 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1673073036}
m_CullTransparentMesh: 0
--- !u!1 &1678315778
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1678315779}
- component: {fileID: 1678315781}
- component: {fileID: 1678315780}
m_Layer: 5
m_Name: FogVolume Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1678315779
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1678315778}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 1376576717}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 110, y: 320}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1678315780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1678315778}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1678315781
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1678315778}
m_CullTransparentMesh: 0
--- !u!1 &1695138042
GameObject:
m_ObjectHideFlags: 0
@ -5493,7 +5113,7 @@ Prefab:
m_Modifications:
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalPosition.x
@ -5525,7 +5145,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x

+ 2
- 2
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b286f0b5e84a118f6c58908a57643df7d8b0a3659a717b3d69ba6d9a0099c730
size 2173994
oid sha256:049f34e4c9072a5c69296b1dfeafc90bb172f2841d25b275e3041f15d9a12eb8
size 1075104

+ 75
- 75
Assets/Tiles/pr_terr1.prefab View File

@ -5047,23 +5047,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1815916670909664
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4983721259025714}
- component: {fileID: 33443686885288890}
- component: {fileID: 23919682735424328}
m_Layer: 0
m_Name: _Combined Mesh [terrain1_Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1817986397962284
GameObject:
m_ObjectHideFlags: 1
@ -5099,6 +5082,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1824370792929472
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4092955920869666}
- component: {fileID: 33845277287728200}
- component: {fileID: 23638799068184098}
m_Layer: 0
m_Name: _Combined Mesh [terrain1_Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1825610577270112
GameObject:
m_ObjectHideFlags: 1
@ -6357,7 +6357,7 @@ Transform:
- {fileID: 4687664122665640}
- {fileID: 4020038942344246}
- {fileID: 4124925208079896}
- {fileID: 4983721259025714}
- {fileID: 4092955920869666}
m_Father: {fileID: 4395454239531100}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6530,6 +6530,19 @@ Transform:
m_Father: {fileID: 4167482482278952}
m_RootOrder: 50
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4092955920869666
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1824370792929472}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -314.512, y: -1150.6947, z: -1556.7737}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4059878402800038}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4094100727690414
Transform:
m_ObjectHideFlags: 1
@ -8152,7 +8165,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1421776024591220}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 100, y: 0, z: 0}
m_LocalPosition: {x: 414.512, y: 1149.6947, z: 1566.7737}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4227858036761968}
@ -11048,19 +11061,6 @@ Transform:
m_Father: {fileID: 4167482482278952}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4983721259025714
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1815916670909664}
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: 4059878402800038}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4987873775640044
Transform:
m_ObjectHideFlags: 1
@ -18651,6 +18651,41 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23638799068184098
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1824370792929472}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23639267283430630
MeshRenderer:
m_ObjectHideFlags: 1
@ -22361,41 +22396,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23919682735424328
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1815916670909664}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23926188788960916
MeshRenderer:
m_ObjectHideFlags: 1
@ -24370,13 +24370,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1861282106131080}
m_Mesh: {fileID: 4300000, guid: 9dae45b81ec582a4f802ff1844cf7303, type: 3}
--- !u!33 &33443686885288890
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1815916670909664}
m_Mesh: {fileID: 0}
--- !u!33 &33444878728196780
MeshFilter:
m_ObjectHideFlags: 1
@ -25378,6 +25371,13 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1713305465987034}
m_Mesh: {fileID: 4300000, guid: 1d709efcbfa8f7042839daaaaaf9dbbb, type: 3}
--- !u!33 &33845277287728200
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1824370792929472}
m_Mesh: {fileID: 0}
--- !u!33 &33847635967443216
MeshFilter:
m_ObjectHideFlags: 1
@ -27859,7 +27859,7 @@ MonoBehaviour:
- {fileID: 1703207856945230}
- {fileID: 1411517779220294}
- {fileID: 1555599282914518}
combined: {fileID: 1815916670909664}
combined: {fileID: 1824370792929472}
meshName: Combined_Meshes
_canGenerateLightmapUV: 1
vCount: 22184

+ 75
- 75
Assets/Tiles/pr_terr2.prefab View File

@ -969,6 +969,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1217560052492410
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4141312050862846}
- component: {fileID: 33445440838382674}
- component: {fileID: 23450115827982846}
m_Layer: 0
m_Name: _Combined Mesh [terrain2Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1217930575919014
GameObject:
m_ObjectHideFlags: 1
@ -4394,23 +4411,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1887349134435260
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4236848652900128}
- component: {fileID: 33692902475984530}
- component: {fileID: 23677387226894862}
m_Layer: 0
m_Name: _Combined Mesh [terrain2Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1889547306075530
GameObject:
m_ObjectHideFlags: 1
@ -5620,6 +5620,19 @@ Transform:
m_Father: {fileID: 4056276813511610}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4141312050862846
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1217560052492410}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -549.433, y: 1590.846, z: -1212.1039}
m_LocalScale: {x: 1, y: 1.0000002, z: 1.0000002}
m_Children: []
m_Father: {fileID: 4148564755384522}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4141670279782600
Transform:
m_ObjectHideFlags: 1
@ -5673,7 +5686,7 @@ Transform:
- {fileID: 4056276813511610}
- {fileID: 4502774209990392}
- {fileID: 4883645340353456}
- {fileID: 4236848652900128}
- {fileID: 4141312050862846}
m_Father: {fileID: 4349050225693716}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5924,19 +5937,6 @@ Transform:
m_Father: {fileID: 4950887593552746}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 62.077003}
--- !u!4 &4236848652900128
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1887349134435260}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -287.2, y: -27.300003, z: -0.0000038146973}
m_LocalScale: {x: 1, y: 1.0000002, z: 1.0000002}
m_Children: []
m_Father: {fileID: 4148564755384522}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4237195117320570
Transform:
m_ObjectHideFlags: 1
@ -6425,7 +6425,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1199775478807856}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 200, y: 0, z: 0}
m_LocalPosition: {x: 462.23297, y: 1212.104, z: 1618.1456}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4704913551563400}
@ -13728,6 +13728,41 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23450115827982846
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1217560052492410}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23451420773554100
MeshRenderer:
m_ObjectHideFlags: 1
@ -15723,41 +15758,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23677387226894862
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1887349134435260}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23679182341179932
MeshRenderer:
m_ObjectHideFlags: 1
@ -19482,6 +19482,13 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1920429958055048}
m_Mesh: {fileID: 4300000, guid: b0982a751c0d0e647affc6e3890eb82f, type: 3}
--- !u!33 &33445440838382674
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1217560052492410}
m_Mesh: {fileID: 0}
--- !u!33 &33445616591694638
MeshFilter:
m_ObjectHideFlags: 1
@ -20007,13 +20014,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1591192460137230}
m_Mesh: {fileID: 4300000, guid: 96b076526de62144f8819c21d2430507, type: 3}
--- !u!33 &33692902475984530
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1887349134435260}
m_Mesh: {fileID: 0}
--- !u!33 &33695865195868870
MeshFilter:
m_ObjectHideFlags: 1
@ -22751,7 +22751,7 @@ MonoBehaviour:
- {fileID: 1180920081425522}
- {fileID: 1326757910161426}
- {fileID: 1196278861444064}
combined: {fileID: 1887349134435260}
combined: {fileID: 1217560052492410}
meshName: Combined_Meshes
_canGenerateLightmapUV: 1
vCount: 18950

+ 75
- 75
Assets/Tiles/pr_terr3.prefab View File

@ -1430,23 +1430,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1186265363878036
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4073518188884136}
- component: {fileID: 33313768646023266}
- component: {fileID: 23699025399922776}
m_Layer: 0
m_Name: _Combined Mesh [terrain3Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1186484061882008
GameObject:
m_ObjectHideFlags: 1
@ -7116,6 +7099,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1841576653603988
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4016825338878728}
- component: {fileID: 33801907755432982}
- component: {fileID: 23125168222915994}
m_Layer: 0
m_Name: _Combined Mesh [terrain3Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1841667210794450
GameObject:
m_ObjectHideFlags: 1
@ -8587,6 +8587,19 @@ Transform:
m_Father: {fileID: 4159035896239286}
m_RootOrder: 75
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4016825338878728
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1841576653603988}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -344.56158, y: -1397.1123, z: -1924.8547}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4925633840388356}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4019237118819512
Transform:
m_ObjectHideFlags: 1
@ -8833,19 +8846,6 @@ Transform:
m_Father: {fileID: 4181181604161576}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4073518188884136
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1186265363878036}
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: 4925633840388356}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4073545628153784
Transform:
m_ObjectHideFlags: 1
@ -8970,7 +8970,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1979546481006892}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 200, y: 0, z: -100}
m_LocalPosition: {x: 544.5616, y: 1396.1123, z: 1834.8547}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4675537137757124}
@ -14712,7 +14712,7 @@ Transform:
- {fileID: 4067029306833796}
- {fileID: 4181181604161576}
- {fileID: 4329549158107692}
- {fileID: 4073518188884136}
- {fileID: 4016825338878728}
m_Father: {fileID: 4087143529260056}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -17305,6 +17305,41 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23125168222915994
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1841576653603988}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23125789587899860
MeshRenderer:
m_ObjectHideFlags: 1
@ -27245,41 +27280,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23699025399922776
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1186265363878036}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23699937645154902
MeshRenderer:
m_ObjectHideFlags: 1
@ -33153,13 +33153,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1022720117056214}
m_Mesh: {fileID: 4300000, guid: d22a4ea983bf6b043ab9d1271edfa150, type: 3}
--- !u!33 &33313768646023266
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1186265363878036}
m_Mesh: {fileID: 0}
--- !u!33 &33314115946478680
MeshFilter:
m_ObjectHideFlags: 1
@ -34756,6 +34749,13 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1633732443090872}
m_Mesh: {fileID: 4300000, guid: 62982ed3b4c007e429247a51bd997b68, type: 3}
--- !u!33 &33801907755432982
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1841576653603988}
m_Mesh: {fileID: 0}
--- !u!33 &33802942082749518
MeshFilter:
m_ObjectHideFlags: 1
@ -38096,7 +38096,7 @@ MonoBehaviour:
- {fileID: 1745596365628368}
- {fileID: 1272165977252596}
- {fileID: 1037663741131562}
combined: {fileID: 1186265363878036}
combined: {fileID: 1841576653603988}
meshName: Combined_Meshes
_canGenerateLightmapUV: 1
vCount: 27039

+ 75
- 99
Assets/Tiles/pr_terr4.prefab View File

@ -470,23 +470,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1100290047192092
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4673984607227176}
- component: {fileID: 33459652201701000}
- component: {fileID: 23034933879860636}
m_Layer: 0
m_Name: _Combined Mesh [Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1102255662244420
GameObject:
m_ObjectHideFlags: 1
@ -2320,7 +2303,6 @@ GameObject:
- component: {fileID: 4910242897329246}
- component: {fileID: 33116922380824116}
- component: {fileID: 23831073987003936}
- component: {fileID: 114800660811039208}
- component: {fileID: 64377371269562142}
m_Layer: 0
m_Name: terr4
@ -4243,6 +4225,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1885866485710254
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4839131722852466}
- component: {fileID: 33209464455449472}
- component: {fileID: 23752711699619610}
m_Layer: 0
m_Name: _Combined Mesh [Objects]
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &1889061431364598
GameObject:
m_ObjectHideFlags: 1
@ -7460,19 +7459,6 @@ Transform:
m_Father: {fileID: 4936626542823834}
m_RootOrder: 89
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 85.86201}
--- !u!4 &4673984607227176
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1100290047192092}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -100, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4932958440249164}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4676567128338982
Transform:
m_ObjectHideFlags: 1
@ -7792,7 +7778,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1462668465096564}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 100, y: 0, z: -100}
m_LocalPosition: {x: 837.3713, y: 1910.077, z: 2383.5862}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4884259133553794}
@ -8010,6 +7996,19 @@ Transform:
m_Father: {fileID: 4783761455984518}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4839131722852466
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1885866485710254}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -837.3713, y: -1910.077, z: -2383.5862}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4932958440249164}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4845554538635258
Transform:
m_ObjectHideFlags: 1
@ -8364,7 +8363,7 @@ Transform:
- {fileID: 4074618878323054}
- {fileID: 4936626542823834}
- {fileID: 4129004418840630}
- {fileID: 4673984607227176}
- {fileID: 4839131722852466}
m_Father: {fileID: 4783761455984518}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9172,41 +9171,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23034933879860636
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1100290047192092}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23037854875717742
MeshRenderer:
m_ObjectHideFlags: 1
@ -16032,6 +15996,41 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23752711699619610
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1885866485710254}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 7a5287b922210d14a9cc72d8fed088a1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23755824329092122
MeshRenderer:
m_ObjectHideFlags: 1
@ -19049,6 +19048,13 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1844591194010228}
m_Mesh: {fileID: 4300000, guid: c434477132438bd4b99e16af2a6afdd4, type: 3}
--- !u!33 &33209464455449472
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1885866485710254}
m_Mesh: {fileID: 0}
--- !u!33 &33210164163886358
MeshFilter:
m_ObjectHideFlags: 1
@ -19469,13 +19475,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1287039616535442}
m_Mesh: {fileID: 4300000, guid: 96b076526de62144f8819c21d2430507, type: 3}
--- !u!33 &33459652201701000
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1100290047192092}
m_Mesh: {fileID: 0}
--- !u!33 &33460165241823310
MeshFilter:
m_ObjectHideFlags: 1
@ -21844,29 +21843,6 @@ MonoBehaviour:
LandMarkLocations:
- {fileID: 4884259133553794}
- {fileID: 4826329614882072}
--- !u!114 &114800660811039208
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1485417082401180}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dfb7158c97e1aaa42a81c459b8e85374, type: 3}
m_Name:
m_EditorClassIdentifier:
combinedGameOjects: []
combined: {fileID: 0}
meshName: Combined_Meshes
_canGenerateLightmapUV: 1
vCount: 529
generateLightmapUV: 0
lightmapScale: 1
copyTarget: {fileID: 0}
destroyOldColliders: 0
keepStructure: 1
autoOverwrite: {fileID: 0}
setStatic: 1
--- !u!114 &114815982771033550
MonoBehaviour:
m_ObjectHideFlags: 1
@ -22153,7 +22129,7 @@ MonoBehaviour:
- {fileID: 1102255662244420}
- {fileID: 1929690373503358}
- {fileID: 1683976830776886}
combined: {fileID: 1100290047192092}
combined: {fileID: 1885866485710254}
meshName: Combined_Meshes
_canGenerateLightmapUV: 1
vCount: 13292

Write Preview
Loading…
Cancel
Save