Updated settings

Fixed MPB on boats
6 年前 · f9073ee5
--- a/Assets/LightweightAsset.asset
+++ b/Assets/LightweightAsset.asset
  m_RequireOpaqueTexture: 1
  m_OpaqueDownsampling: 1
  m_SupportsHDR: 0
-  m_MSAA: 2
+  m_MSAA: 1
  m_RenderScale: 1
  m_SupportsDynamicBatching: 0
  m_DirectionalShadowsSupported: 1
--- a/Assets/Scripts/Boat/BoatController.cs
+++ b/Assets/Scripts/Boat/BoatController.cs

 	void OnValidate()
 	{
-        if (boatRenderer)
-        {
-            MaterialPropertyBlock mpb = new MaterialPropertyBlock();
-            mpb.SetColor("_Color1", PrimaryColor);
-            mpb.SetColor("_Color2", TrimColor);
-            boatRenderer.SetPropertyBlock(mpb);
-        }
+        Colourize();
+        Colourize();
        if (Human == true) 
 		{
 			gameObject.AddComponent<HumanController>();
 			gameObject.AddComponent<AIcontroller>();
 		}
 	}
+
+    void Colourize()
+    {
+        if (boatRenderer)
+        {
+            MaterialPropertyBlock mpb = new MaterialPropertyBlock();
+            mpb.SetColor("_Color1", PrimaryColor);
+            mpb.SetColor("_Color2", TrimColor);
+            boatRenderer.SetPropertyBlock(mpb);
+        }
+    }
 }
--- a/Assets/scenes/Island.unity
+++ b/Assets/scenes/Island.unity
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1442025832}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 56.25, y: 0, z: 200}
+  m_LocalPosition: {x: -31.25, y: 0, z: -62.5}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 539384202}
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 5
+  m_Priority: 15
  m_LookAt: {fileID: 1940308779}
  m_Follow: {fileID: 1940308779}
  m_Lens:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 153441711}
-  m_LocalRotation: {x: 0.0064693526, y: -0.8171145, z: 0.04293682, w: 0.57483786}
+  m_LocalRotation: {x: 0.0064694067, y: -0.817114, z: 0.04293676, w: 0.5748385}
  m_LocalPosition: {x: -25.09651, y: 3.178153, z: -59.43288}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
    y: 0
    width: 1
    height: 1
-  near clip plane: 0.5
+  near clip plane: 0.1
-  field of view: 45
+  field of view: 80
  orthographic: 0
  orthographic size: 10
  m_Depth: -5
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1017609894}
-  m_LocalRotation: {x: 0.0072962358, y: 0.9910406, z: 0.06096192, w: -0.11861283}
-  m_LocalPosition: {x: 62.4, y: 4, z: 212.5}
+  m_LocalRotation: {x: 0.0064694067, y: -0.817114, z: 0.04293676, w: 0.5748385}
+  m_LocalPosition: {x: -25.09651, y: 3.178153, z: -59.43288}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 208737146}
  m_CookingOptions: 14
  m_SkinWidth: 0.01
  m_Mesh: {fileID: 4300158, guid: d26d9decbd70a483885e93c275492b2e, type: 3}
+--- !u!28 &1069441310
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 128
+  m_Height: 4
+  m_CompleteImageSize: 2048
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 2048
+  _typelessdata: ffffffffffe9fcfcffd4f8f8ffbef5f5ffa8f2f2ff93eeeeff7debebff67e8e8ff51e4e4ff3ce1e1ff26dedeff22dbdbff21d8d8ff20d4d5ff1fd1d2ff1ececfff1dcbccff1cc8c9ff1bc5c6ff1ac1c3ff19bec0ff18bbbdff17b8baff16b5b7ff15b2b4ff14aeb1ff13abaeff12a8abff12a5a8ff11a2a5ff109fa2ff0f9c9fff0e989cff0d9599ff0c9296ff0b8f93ff0a8c90ff09898dff08858aff078287ff067f84ff057d82ff057b81ff057a81ff057981ff057880ff057680ff05757fff05747fff04737fff04727eff04707eff046f7dff046e7dff046d7dff046b7cff046a7cff03697bff03687bff03667bff03657aff03647aff036379ff036179ff036079ff025f78ff025e78ff025d77ff025b77ff025a77ff025976ff025876ff025675ff025575ff015475ff015374ff015174ff015073ff014f73ff014e73ff014c72ff014b72ff004a71ff004971ff004871ff004670ff00456eff00436bff004169ff004066ff003e63ff003d61ff003b5eff00395cff003859ff003656ff003454ff003351ff00314eff002f4cff002e49ff002c47ff002b44ff002941ff00273fff00263cff00243aff002237ff002134ff001f32ff001d2fff001c2cff001a2aff001927ff001725ff001522ff00141fff00121dff00101aff000f18ff000d15ff000b12ff000a10ff00080dff00070aff000508ff000305ff000203ff000000ff010505ff020b09ff03100eff041612ff051b17ff06211bff072620ff092c24ff0a3129ff0b362dff0c3c32ff0d4136ff0e473bff0f4c3fff105244ff115748ff125d4dff136251ff146756ff156957ff156957ff156a58ff156a58ff166a58ff166b58ff166b59ff166c59ff176c59ff176c5aff176d5aff176d5aff186d5bff186e5bff186e5bff196f5cff196f5cff196f5cff19705cff1a705dff1a715dff1a715dff1a715eff1b725eff1b725eff1b725fff1b735fff1c735fff1c745fff1c7460ff1c7460ff1d7560ff1d7561ff1d7661ff1d7661ff1e7662ff1e7663ff1e7764ff1e7765ff1e7766ff1e7766ff1e7867ff1e7868ff1e7869ff1e796aff1e796bff1e796bff1e796cff1e7a6dff1e7a6eff1e7a6fff1e7a70ff1e7b70ff1e7b71ff1e7b72ff1e7b73ff1e7c74ff1e7c74ff1e7c75ff1e7c76ff1e7d77ff1e7d78ff1f7d79ff1f7d79ff1f7e7aff1f7e7bff1f7e7cff1f7e7dff1f7f7eff1f7f7eff1f7f7fff1f7f80ff1f8081ff1f8082ff1f8083ff1f8083ff1f8184ff1f8185ff1f8186ff1f8187ff1f8288ff1f8288ff1f8289ff1f838aff1f838bff1f838cff1f838dff1f848dff1f848eff20848fff208490ff208591ff208592ff208592ff208593ff208694ff208695ff208696ff208696ff208797ff208798ff208799ff20879aff20889bff20889bff20889cff20889dff20899eff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000009ff000018ff000028ff000039ff00004aff00005aff00006aff00007aff00008aff000099ff0000a7ff0002b5ff0009c1ff0011cdff0018d8ff001fe2ff0026ebff002ef4ff0035fbff003cffff0043faff004af6ff0050f2ff0056edff005ce9ff0062e5ff0067e1ff006edcff0073d9ff0078d5ff007dd1ff0081ceff0085caff0089c7ff008ec3ff0092c0ff0095bdff0099baff009cb7ff00a0b4ff00a3b2ff00a6afff00a9adff00acaaff00aea7ff00b1a5ff00b3a3ff00b6a1ff00b89eff00bb9bff00be99ff00c097ff00c295ff00c593ff00c790ff00c98eff02cc8cff04ce89ff05d087ff07d385ff0ad682ff0cd880ff0eda7dff11dd7aff14e077ff16e375ff19e671ff1ce96eff1fec6bff22ef67ff26f264ff2af560ff2df85cff32fd58ff36ff54ff3bfe4fff40fb4bff45f947ff4bf542ff51f23cff57ef37ff5deb32ff64e72dff6ce328ff73de22ff7bd91cff83d416ff8bcf11ff95c90bff9dc305ffa7bd00ffb1b600ffbaaf00ffc4a900ffcfa2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1072933540
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1143740434}
-  m_LocalRotation: {x: -0.0003573659, y: 0.9591907, z: -0.0012178028, w: -0.28275713}
+  m_LocalRotation: {x: -0.00035653586, y: 0.9591888, z: -0.001215072, w: -0.2827637}
  m_LocalPosition: {x: 42, y: 2.51, z: 62.1}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  m_Name: 
  m_EditorClassIdentifier: 
  m_settings:
-    m_ResolutionMultiplier: 1
+    m_ResolutionMultiplier: 2
    m_ClipPlaneOffset: 0.25
    m_ReflectLayers:
      serializedVersion: 2
  m_Script: {fileID: 11500000, guid: b6edb8448c9b94f018953ca2a6fa5891, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _rampTexture: {fileID: 1571584586}
+  _rampTexture: {fileID: 1069441310}
  _waves:
  - amplitude: 0.25450218
    direction: -167.8483
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1490334302}
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 3
  m_PlayableAsset: {fileID: 11400000, guid: 36b1ea17330374bf7a9b86462939f252, type: 2}
  m_InitialState: 1
  m_CorrespondingSourceObject: {fileID: 4556663440861136, guid: cf92f64c366a83f42b7636e1086fec18,
    type: 2}
  m_PrefabInternal: {fileID: 1568899653}
--- !u!28 &1571584586
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 128
-  m_Height: 4
-  m_CompleteImageSize: 2048
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 1
-    m_WrapV: 1
-    m_WrapW: 1
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 2048
-  _typelessdata: ffffffffffe9fcfcffd4f8f8ffbef5f5ffa8f2f2ff93eeeeff7debebff67e8e8ff51e4e4ff3ce1e1ff26dedeff22dbdbff21d8d8ff20d4d5ff1fd1d2ff1ececfff1dcbccff1cc8c9ff1bc5c6ff1ac1c3ff19bec0ff18bbbdff17b8baff16b5b7ff15b2b4ff14aeb1ff13abaeff12a8abff12a5a8ff11a2a5ff109fa2ff0f9c9fff0e989cff0d9599ff0c9296ff0b8f93ff0a8c90ff09898dff08858aff078287ff067f84ff057d82ff057b81ff057a81ff057981ff057880ff057680ff05757fff05747fff04737fff04727eff04707eff046f7dff046e7dff046d7dff046b7cff046a7cff03697bff03687bff03667bff03657aff03647aff036379ff036179ff036079ff025f78ff025e78ff025d77ff025b77ff025a77ff025976ff025876ff025675ff025575ff015475ff015374ff015174ff015073ff014f73ff014e73ff014c72ff014b72ff004a71ff004971ff004871ff004670ff00456eff00436bff004169ff004066ff003e63ff003d61ff003b5eff00395cff003859ff003656ff003454ff003351ff00314eff002f4cff002e49ff002c47ff002b44ff002941ff00273fff00263cff00243aff002237ff002134ff001f32ff001d2fff001c2cff001a2aff001927ff001725ff001522ff00141fff00121dff00101aff000f18ff000d15ff000b12ff000a10ff00080dff00070aff000508ff000305ff000203ff000000ff010505ff020b09ff03100eff041612ff051b17ff06211bff072620ff092c24ff0a3129ff0b362dff0c3c32ff0d4136ff0e473bff0f4c3fff105244ff115748ff125d4dff136251ff146756ff156957ff156957ff156a58ff156a58ff166a58ff166b58ff166b59ff166c59ff176c59ff176c5aff176d5aff176d5aff186d5bff186e5bff186e5bff196f5cff196f5cff196f5cff19705cff1a705dff1a715dff1a715dff1a715eff1b725eff1b725eff1b725fff1b735fff1c735fff1c745fff1c7460ff1c7460ff1d7560ff1d7561ff1d7661ff1d7661ff1e7662ff1e7663ff1e7764ff1e7765ff1e7766ff1e7766ff1e7867ff1e7868ff1e7869ff1e796aff1e796bff1e796bff1e796cff1e7a6dff1e7a6eff1e7a6fff1e7a70ff1e7b70ff1e7b71ff1e7b72ff1e7b73ff1e7c74ff1e7c74ff1e7c75ff1e7c76ff1e7d77ff1e7d78ff1f7d79ff1f7d79ff1f7e7aff1f7e7bff1f7e7cff1f7e7dff1f7f7eff1f7f7eff1f7f7fff1f7f80ff1f8081ff1f8082ff1f8083ff1f8083ff1f8184ff1f8185ff1f8186ff1f8187ff1f8288ff1f8288ff1f8289ff1f838aff1f838bff1f838cff1f838dff1f848dff1f848eff20848fff208490ff208591ff208592ff208592ff208593ff208694ff208695ff208696ff208696ff208797ff208798ff208799ff20879aff20889bff20889bff20889cff20889dff20899eff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000000ff000009ff000018ff000028ff000039ff00004aff00005aff00006aff00007aff00008aff000099ff0000a7ff0002b5ff0009c1ff0011cdff0018d8ff001fe2ff0026ebff002ef4ff0035fbff003cffff0043faff004af6ff0050f2ff0056edff005ce9ff0062e5ff0067e1ff006edcff0073d9ff0078d5ff007dd1ff0081ceff0085caff0089c7ff008ec3ff0092c0ff0095bdff0099baff009cb7ff00a0b4ff00a3b2ff00a6afff00a9adff00acaaff00aea7ff00b1a5ff00b3a3ff00b6a1ff00b89eff00bb9bff00be99ff00c097ff00c295ff00c593ff00c790ff00c98eff02cc8cff04ce89ff05d087ff07d385ff0ad682ff0cd880ff0eda7dff11dd7aff14e077ff16e375ff19e671ff1ce96eff1fec6bff22ef67ff26f264ff2af560ff2df85cff32fd58ff36ff54ff3bfe4fff40fb4bff45f947ff4bf542ff51f23cff57ef37ff5deb32ff64e72dff6ce328ff73de22ff7bd91cff83d416ff8bcf11ff95c90bff9dc305ffa7bd00ffb1b600ffbaaf00ffc4a900ffcfa2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1576604942
 Prefab:
  m_ObjectHideFlags: 0
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
  - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
    iOS: com.Unity3D.BoatAttack
  buildNumber: {}
  AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 21
-  AndroidTargetSdkVersion: 0
+  AndroidMinSdkVersion: 24
+  AndroidTargetSdkVersion: 24
  AndroidPreferredInstallLocation: 1
  aotOptions: 
  stripEngineCode: 1
    m_Automatic: 0
  m_BuildTargetVRSettings: []
  m_BuildTargetEnableVuforiaSettings: []
-  openGLRequireES31: 1
-  openGLRequireES31AEP: 1
+  openGLRequireES31: 0
+  openGLRequireES31AEP: 0
  m_TemplateCustomTags: {}
  mobileMTRendering:
    Android: 1
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
    blendWeights: 2
    textureQuality: 0
    anisotropicTextures: 1
-    antiAliasing: 2
+    antiAliasing: 0
    softParticles: 1
    softVegetation: 1
    realtimeReflectionProbes: 0