Video 4: Movement syncing, a bit of graphics & cleanup

Brackeys · Oct 11, 2015 · 3d96542 · 3d96542
1 parent da8338c
commit 3d96542
Show file tree

Hide file tree

Showing 15 changed files with 245 additions and 5 deletions.
diff --git a/MultiplayerFPS/Assets/MainLevel01.unity b/MultiplayerFPS/Assets/MainLevel01.unity
@@ -481,6 +481,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: fadddc63520db414bbc9126cbf4743ad, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: a94a40ef8f8ad12468533142a3e792f6, type: 2}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: fadddc63520db414bbc9126cbf4743ad, type: 3}
   m_IsPrefabParent: 0

diff --git a/MultiplayerFPS/Assets/Materials.meta b/MultiplayerFPS/Assets/Materials.meta
diff --git a/MultiplayerFPS/Assets/Materials/Ground.mat b/MultiplayerFPS/Assets/Materials/Ground.mat
@@ -0,0 +1,149 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Ground
+  m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 8b939c5b46fae7e49af7d85f731ba4ec, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BumpMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailNormalMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _ParallaxMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _OcclusionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _EmissionMap
+        second:
+          m_Texture: {fileID: 2800000, guid: a196fd6788131ec459bfb26012466fc1, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailMask
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailAlbedoMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _MetallicGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _SpecGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _SrcBlend
+        second: 1
+      data:
+        first:
+          name: _DstBlend
+        second: 0
+      data:
+        first:
+          name: _Cutoff
+        second: .5
+      data:
+        first:
+          name: _Parallax
+        second: .0199999996
+      data:
+        first:
+          name: _ZWrite
+        second: 1
+      data:
+        first:
+          name: _Glossiness
+        second: .300000012
+      data:
+        first:
+          name: _BumpScale
+        second: 1
+      data:
+        first:
+          name: _OcclusionStrength
+        second: 1
+      data:
+        first:
+          name: _DetailNormalMapScale
+        second: 1
+      data:
+        first:
+          name: _UVSec
+        second: 0
+      data:
+        first:
+          name: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 2, g: 2, b: 2, a: 1}
+      data:
+        first:
+          name: _Color
+        second: {r: .867647052, g: .961663306, b: 1, a: 1}
+      data:
+        first:
+          name: _SpecColor
+        second: {r: .200000003, g: .200000003, b: .200000003, a: 1}
diff --git a/MultiplayerFPS/Assets/Materials/Ground.mat.meta b/MultiplayerFPS/Assets/Materials/Ground.mat.meta
diff --git a/MultiplayerFPS/Assets/Gun.mat → MultiplayerFPS/Assets/Materials/Gun.mat b/MultiplayerFPS/Assets/Gun.mat → MultiplayerFPS/Assets/Materials/Gun.mat
diff --git a/MultiplayerFPS/Assets/Gun.mat.meta → MultiplayerFPS/Assets/Materials/Gun.mat.meta b/MultiplayerFPS/Assets/Gun.mat.meta → MultiplayerFPS/Assets/Materials/Gun.mat.meta
diff --git a/MultiplayerFPS/Assets/Player.prefab b/MultiplayerFPS/Assets/Player.prefab
@@ -14,6 +14,8 @@ GameObject:
   - 114: {fileID: 11433214}
   - 114: {fileID: 11420026}
   - 114: {fileID: 11483786}
+  - 114: {fileID: 11478292}
+  - 114: {fileID: 11468604}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -524,6 +526,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   speed: 5
   lookSensitivity: 3
+--- !u!114 &11468604
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1267208747, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Target: {fileID: 465354}
+  m_ChildIndex: 0
+  m_SendInterval: .100000001
+  m_SyncRotationAxis: 1
+  m_RotationSyncCompression: 0
+  m_MovementThreshold: .00100000005
+  m_InterpolateRotation: .300000012
+  m_InterpolateMovement: 0
+--- !u!114 &11478292
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 120524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1768714887, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TransformSyncMode: 3
+  m_SendInterval: .100000001
+  m_SyncRotationAxis: 2
+  m_RotationSyncCompression: 0
+  m_SyncSpin: 0
+  m_MovementTheshold: .00100000005
+  m_SnapThreshold: 5
+  m_InterpolateRotation: 10
+  m_InterpolateMovement: 1
 --- !u!114 &11483786
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -646,6 +687,22 @@ Prefab:
       propertyPath: componentsToDisable.Array.data[1]
       value: 
       objectReference: {fileID: 11433214}
+    - target: {fileID: 0}
+      propertyPath: m_SendInterval
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_InterpolateMovement
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_InterpolateRotation
+      value: .300000012
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
+      propertyPath: m_Target
+      value: 
+      objectReference: {fileID: 465354}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 120524}

diff --git a/MultiplayerFPS/Assets/Scripts.meta b/MultiplayerFPS/Assets/Scripts.meta
diff --git a/MultiplayerFPS/Assets/PlayerController.cs → ...yerFPS/Assets/Scripts/PlayerController.cs b/MultiplayerFPS/Assets/PlayerController.cs → ...yerFPS/Assets/Scripts/PlayerController.cs
diff --git a/...playerFPS/Assets/PlayerController.cs.meta → ...S/Assets/Scripts/PlayerController.cs.meta b/...playerFPS/Assets/PlayerController.cs.meta → ...S/Assets/Scripts/PlayerController.cs.meta
diff --git a/MultiplayerFPS/Assets/PlayerMotor.cs → MultiplayerFPS/Assets/Scripts/PlayerMotor.cs b/MultiplayerFPS/Assets/PlayerMotor.cs → MultiplayerFPS/Assets/Scripts/PlayerMotor.cs
diff --git a/MultiplayerFPS/Assets/PlayerMotor.cs.meta → ...yerFPS/Assets/Scripts/PlayerMotor.cs.meta b/MultiplayerFPS/Assets/PlayerMotor.cs.meta → ...yerFPS/Assets/Scripts/PlayerMotor.cs.meta
diff --git a/MultiplayerFPS/Assets/PlayerSetup.cs → MultiplayerFPS/Assets/Scripts/PlayerSetup.cs b/MultiplayerFPS/Assets/PlayerSetup.cs → MultiplayerFPS/Assets/Scripts/PlayerSetup.cs
diff --git a/MultiplayerFPS/Assets/PlayerSetup.cs.meta → ...yerFPS/Assets/Scripts/PlayerSetup.cs.meta b/MultiplayerFPS/Assets/PlayerSetup.cs.meta → ...yerFPS/Assets/Scripts/PlayerSetup.cs.meta
diff --git a/MultiplayerFPS/ProjectSettings/ProjectSettings.asset b/MultiplayerFPS/ProjectSettings/ProjectSettings.asset
@@ -15,8 +15,8 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_ShowUnitySplashScreen: 1
-  defaultScreenWidth: 1024
-  defaultScreenHeight: 768
+  defaultScreenWidth: 800
+  defaultScreenHeight: 600
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_RenderingPath: 1
@@ -28,7 +28,7 @@ PlayerSettings:
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosAppInBackgroundBehavior: 0
-  displayResolutionDialog: 1
+  displayResolutionDialog: 0
   iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
@@ -37,7 +37,7 @@ PlayerSettings:
   useOSAutorotation: 1
   use32BitDisplayBuffer: 1
   disableDepthAndStencilBuffers: 0
-  defaultIsFullScreen: 1
+  defaultIsFullScreen: 0
   defaultIsNativeResolution: 1
   runInBackground: 0
   captureSingleScreen: 0
@@ -160,7 +160,11 @@ PlayerSettings:
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
   resolutionDialogBanner: {fileID: 0}
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - m_Icon: {fileID: 0}
+      m_Size: 128
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []
   webPlayerTemplate: APPLICATION:Default