Upgrade to Unity 2018.2.20f1

This commit is contained in:
vis2k 2019-01-29 22:44:21 +01:00
parent d4e4af3fa8
commit 2e0c38aec8
3 changed files with 89 additions and 40 deletions

View File

@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2 --- !u!104 &2
RenderSettings: RenderSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 8 serializedVersion: 9
m_Fog: 0 m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3 m_FogMode: 3
@ -39,6 +39,7 @@ RenderSettings:
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -54,11 +55,10 @@ LightmapSettings:
m_EnableBakedLightmaps: 0 m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0 m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings: m_LightmapEditorSettings:
serializedVersion: 9 serializedVersion: 10
m_Resolution: 2 m_Resolution: 2
m_BakeResolution: 40 m_BakeResolution: 40
m_TextureWidth: 1024 m_AtlasSize: 1024
m_TextureHeight: 1024
m_AO: 0 m_AO: 0
m_AOMaxDistance: 1 m_AOMaxDistance: 1
m_CompAOExponent: 1 m_CompAOExponent: 1
@ -116,9 +116,9 @@ NavMeshSettings:
--- !u!1 &88936773 --- !u!1 &88936773
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 88936777} - component: {fileID: 88936777}
- component: {fileID: 88936776} - component: {fileID: 88936776}
@ -134,27 +134,31 @@ GameObject:
--- !u!81 &88936774 --- !u!81 &88936774
AudioListener: AudioListener:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 88936773} m_GameObject: {fileID: 88936773}
m_Enabled: 1 m_Enabled: 1
--- !u!124 &88936775 --- !u!124 &88936775
Behaviour: Behaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 88936773} m_GameObject: {fileID: 88936773}
m_Enabled: 1 m_Enabled: 1
--- !u!20 &88936776 --- !u!20 &88936776
Camera: Camera:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 88936773} m_GameObject: {fileID: 88936773}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 1 m_ClearFlags: 1
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
@ -184,7 +188,7 @@ Camera:
--- !u!4 &88936777 --- !u!4 &88936777
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 88936773} m_GameObject: {fileID: 88936773}
m_LocalRotation: {x: 0.49582607, y: -0, z: -0, w: 0.86842185} m_LocalRotation: {x: 0.49582607, y: -0, z: -0, w: 0.86842185}
@ -197,9 +201,9 @@ Transform:
--- !u!1 &1107091652 --- !u!1 &1107091652
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1107091656} - component: {fileID: 1107091656}
- component: {fileID: 1107091655} - component: {fileID: 1107091655}
@ -219,7 +223,7 @@ GameObject:
--- !u!23 &1107091653 --- !u!23 &1107091653
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Enabled: 1 m_Enabled: 1
@ -229,6 +233,7 @@ MeshRenderer:
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials: m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
@ -253,7 +258,7 @@ MeshRenderer:
--- !u!64 &1107091654 --- !u!64 &1107091654
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -267,14 +272,14 @@ MeshCollider:
--- !u!33 &1107091655 --- !u!33 &1107091655
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1107091656 --- !u!4 &1107091656
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@ -287,7 +292,7 @@ Transform:
--- !u!65 &1107091657 --- !u!65 &1107091657
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -299,7 +304,7 @@ BoxCollider:
--- !u!65 &1107091658 --- !u!65 &1107091658
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -311,7 +316,7 @@ BoxCollider:
--- !u!65 &1107091659 --- !u!65 &1107091659
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -323,7 +328,7 @@ BoxCollider:
--- !u!65 &1107091660 --- !u!65 &1107091660
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1107091652} m_GameObject: {fileID: 1107091652}
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -335,9 +340,9 @@ BoxCollider:
--- !u!1 &1282001517 --- !u!1 &1282001517
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1282001518} - component: {fileID: 1282001518}
- component: {fileID: 1282001520} - component: {fileID: 1282001520}
@ -353,7 +358,7 @@ GameObject:
--- !u!4 &1282001518 --- !u!4 &1282001518
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1282001517} m_GameObject: {fileID: 1282001517}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@ -366,7 +371,7 @@ Transform:
--- !u!114 &1282001519 --- !u!114 &1282001519
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1282001517} m_GameObject: {fileID: 1282001517}
m_Enabled: 1 m_Enabled: 1
@ -380,7 +385,7 @@ MonoBehaviour:
--- !u!114 &1282001520 --- !u!114 &1282001520
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1282001517} m_GameObject: {fileID: 1282001517}
m_Enabled: 1 m_Enabled: 1
@ -388,27 +393,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3} m_Script: {fileID: 11500000, guid: 8aab4c8111b7c411b9b92cf3dbc5bd4e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
networkPort: 7777
serverBindToIP: 0
serverBindAddress:
networkAddress: localhost
dontDestroyOnLoad: 1 dontDestroyOnLoad: 1
runInBackground: 1 runInBackground: 1
startOnHeadless: 1
showDebugMessages: 0 showDebugMessages: 0
offlineScene:
onlineScene:
transport: {fileID: 1282001521}
networkAddress: localhost
maxConnections: 4
playerPrefab: {fileID: 1916082411674582, guid: 6f43bf5488a7443d19ab2a83c6b91f35, playerPrefab: {fileID: 1916082411674582, guid: 6f43bf5488a7443d19ab2a83c6b91f35,
type: 2} type: 2}
autoCreatePlayer: 1 autoCreatePlayer: 1
playerSpawnMethod: 0 playerSpawnMethod: 0
offlineScene:
onlineScene:
maxConnections: 4
spawnPrefabs: [] spawnPrefabs: []
clientLoadedScene: 0
isNetworkActive: 0
--- !u!114 &1282001521 --- !u!114 &1282001521
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1282001517} m_GameObject: {fileID: 1282001517}
m_Enabled: 1 m_Enabled: 1
@ -416,12 +418,52 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3} m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
OnClientConnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
OnClientDataReceived:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventByteArray, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnClientError:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventException, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnClientDisconnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
OnServerConnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
OnServerDataReceived:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventIntByteArray, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnServerError:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventIntException, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnServerDisconnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
port: 7777
NoDelay: 1
--- !u!1 &2054208274 --- !u!1 &2054208274
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
serializedVersion: 5 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2054208276} - component: {fileID: 2054208276}
- component: {fileID: 2054208275} - component: {fileID: 2054208275}
@ -435,7 +477,7 @@ GameObject:
--- !u!108 &2054208275 --- !u!108 &2054208275
Light: Light:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2054208274} m_GameObject: {fileID: 2054208274}
m_Enabled: 1 m_Enabled: 1
@ -462,6 +504,7 @@ Light:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 4294967295
m_Lightmapping: 4 m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1} m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1 m_BounceIntensity: 1
m_ColorTemperature: 6570 m_ColorTemperature: 6570
@ -471,7 +514,7 @@ Light:
--- !u!4 &2054208276 --- !u!4 &2054208276
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2054208274} m_GameObject: {fileID: 2054208274}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}

View File

@ -0,0 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1386491679 &1
PresetManager:
m_ObjectHideFlags: 0
m_DefaultList: []

View File

@ -1 +1 @@
m_EditorVersion: 2017.4.17f1 m_EditorVersion: 2018.2.20f1