Updated to Unity 2019.3.0b6

UPDATE Unity version to 2019.3.0b6. UPDATE Mirror to 4.0.9. CHANGE Character prefabs to have the same order of components. CHANGE Hit Points of Sid Ketchum to 4.
javierfoe · Oct 14, 2019 · 70dccdd · 70dccdd
1 parent bacccad
commit 70dccdd
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 74 deletions.
diff --git a/Assets/Prefabs/Character/Kit Carlson.prefab b/Assets/Prefabs/Character/Kit Carlson.prefab
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7915496552382078928}
-  - component: {fileID: 7915496552382078935}
   - component: {fileID: 7915496552382078934}
+  - component: {fileID: 7915496552382078935}
   m_Layer: 0
   m_Name: Kit Carlson
   m_TagString: Untagged
@@ -32,7 +32,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7915496552382078935
+--- !u!114 &7915496552382078934
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,14 +41,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 7915496552382078933}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
+  m_Script: {fileID: 11500000, guid: 0d4612184ffe3f44f99056cf69c810f9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverOnly: 0
-  localPlayerAuthority: 0
-  m_AssetId: 
-  m_SceneId: 1035883293
---- !u!114 &7915496552382078934
+  syncMode: 0
+  syncInterval: 0.1
+  characterName: Kit Carlson
+  characterHP: 4
+--- !u!114 &7915496552382078935
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,9 +57,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 7915496552382078933}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0d4612184ffe3f44f99056cf69c810f9, type: 3}
+  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  syncInterval: 0.1
-  characterName: Kit Carlson
-  characterHP: 4
+  serverOnly: 0
+  localPlayerAuthority: 0
+  m_AssetId: 
+  m_SceneId: 2971758318
diff --git a/Assets/Prefabs/Character/Lemonade Jim.prefab b/Assets/Prefabs/Character/Lemonade Jim.prefab
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5389608874815740604}
-  - component: {fileID: 5389608874815740605}
   - component: {fileID: 5389608874815740602}
+  - component: {fileID: 5389608874815740605}
   m_Layer: 0
   m_Name: Lemonade Jim
   m_TagString: Untagged
@@ -32,7 +32,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5389608874815740605
+--- !u!114 &5389608874815740602
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,14 +41,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 5389608874815740603}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
+  m_Script: {fileID: 11500000, guid: 3dbd71c87151fae49b81bf010d57d5b2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ServerOnly: 0
-  m_LocalPlayerAuthority: 0
-  m_AssetId: 
-  m_SceneId: 185060260
---- !u!114 &5389608874815740602
+  syncMode: 0
+  syncInterval: 0.1
+  characterName: Lemonade Jim
+  characterHP: 4
+--- !u!114 &5389608874815740605
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,9 +57,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5389608874815740603}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3dbd71c87151fae49b81bf010d57d5b2, type: 3}
+  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  syncInterval: 0.1
-  characterName: Lemonade Jim
-  characterHP: 4
+  serverOnly: 0
+  localPlayerAuthority: 0
+  m_AssetId: 
+  m_SceneId: 740403312
diff --git a/Assets/Prefabs/Character/Lucky Duke.prefab b/Assets/Prefabs/Character/Lucky Duke.prefab
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7833244474940123918}
-  - component: {fileID: 7833244474940123919}
   - component: {fileID: 7833244474940123916}
+  - component: {fileID: 7833244474940123919}
   m_Layer: 0
   m_Name: Lucky Duke
   m_TagString: Untagged
@@ -32,7 +32,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7833244474940123919
+--- !u!114 &7833244474940123916
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,14 +41,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 7833244474940123917}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
+  m_Script: {fileID: 11500000, guid: 28633acd8f5b8d74ab48fa20cd012623, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  serverOnly: 0
-  localPlayerAuthority: 0
-  m_AssetId: 
-  m_SceneId: 738093744
---- !u!114 &7833244474940123916
+  syncMode: 0
+  syncInterval: 0.1
+  characterName: Lucky Duke
+  characterHP: 4
+--- !u!114 &7833244474940123919
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,9 +57,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 7833244474940123917}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 28633acd8f5b8d74ab48fa20cd012623, type: 3}
+  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  syncInterval: 0.1
-  characterName: Lucky Duke
-  characterHP: 4
+  serverOnly: 0
+  localPlayerAuthority: 0
+  m_AssetId: 
+  m_SceneId: 2865439807
diff --git a/Assets/Prefabs/Character/Molly Stark.prefab b/Assets/Prefabs/Character/Molly Stark.prefab
@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3279534552043588207}
-  - component: {fileID: 3279534552043588206}
   - component: {fileID: 3279534552043588201}
+  - component: {fileID: 3279534552043588206}
   m_Layer: 0
   m_Name: Molly Stark
   m_TagString: Untagged
@@ -32,7 +32,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3279534552043588206
+--- !u!114 &3279534552043588201
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,14 +41,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 3279534552043588200}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
+  m_Script: {fileID: 11500000, guid: b23abecef8498be4892d5d035d18e30e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ServerOnly: 0
-  m_LocalPlayerAuthority: 0
-  m_AssetId: b231de2e611f66c4189f93e692e277ea
-  m_SceneId: 0
---- !u!114 &3279534552043588201
+  syncMode: 0
+  syncInterval: 0.1
+  characterName: Molly Stark
+  characterHP: 4
+--- !u!114 &3279534552043588206
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,9 +57,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 3279534552043588200}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b23abecef8498be4892d5d035d18e30e, type: 3}
+  m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  syncInterval: 0.1
-  characterName: Molly Stark
-  characterHP: 4
+  serverOnly: 0
+  localPlayerAuthority: 0
+  m_AssetId: 
+  m_SceneId: 2288768565
diff --git a/Assets/Prefabs/Character/Sid Ketchum.prefab b/Assets/Prefabs/Character/Sid Ketchum.prefab
@@ -44,9 +44,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5fc4162c7a6a40d48be80646c4fc773c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncMode: 0
   syncInterval: 0.1
   characterName: Sid Ketchum
-  characterHP: 2
+  characterHP: 4
 --- !u!114 &2599033479935168032
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -62,4 +63,4 @@ MonoBehaviour:
   serverOnly: 0
   localPlayerAuthority: 0
   m_AssetId: 
-  m_SceneId: 1517100967
+  m_SceneId: 1147093267
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -7,10 +7,10 @@
     "com.unity.collab-proxy": "1.2.16",
     "com.unity.ext.nunit": "1.0.0",
     "com.unity.ide.rider": "1.1.0",
-    "com.unity.ide.vscode": "1.1.0",
-    "com.unity.multiplayer-hlapi": "1.0.2",
+    "com.unity.ide.vscode": "1.1.2",
+    "com.unity.multiplayer-hlapi": "1.0.4",
     "com.unity.purchasing": "2.0.6",
-    "com.unity.test-framework": "1.0.13",
+    "com.unity.test-framework": "1.1.2",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.0.2",

diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 13
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
@@ -63,3 +64,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_AllowEnlightenSupportForUpgradedProject: 1