RMIT
/
Major_Project_A
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

final push pre-beta presentation

Josh_Dev_branch
Claire Peta 5 years ago
parent
2897abef90
commit
267fdba368
15 changed files with 144 additions and 53 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -6
      Assets/Prefabs/UI/MainScoreboard.prefab
  2. +1
    -1
      Assets/Prefabs/UI/levelScoreboard.prefab
  3. +1
    -1
      Assets/Scenes/Client Scenes/ClientScene.unity
  4. +70
    -28
      Assets/Scenes/ColourCollide_Smaller.unity
  5. +1
    -1
      Assets/Scenes/Server Scenes/ServerTestScene.unity
  6. +1
    -1
      Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs
  7. +1
    -1
      Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs
  8. +4
    -0
      Assets/Scripts/GameMode/GameMode.cs
  9. +7
    -5
      Assets/Scripts/Managers/GameManager.cs
  10. +1
    -1
      Assets/Scripts/Networking/Server/ServerManager.cs.meta
  11. +2
    -2
      Assets/Scripts/Networking/Server/ServerObject.cs
  12. +2
    -2
      Assets/Scripts/UI/ScoreBoard.cs
  13. +2
    -2
      Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat
  14. +43
    -0
      Logs/Packages-Update.log
  15. +2
    -2
      ProjectSettings/EditorBuildSettings.asset

+ 6
- 6
Assets/Prefabs/UI/MainScoreboard.prefab View File

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 264, y: -215}
m_AnchoredPosition: {x: 264, y: -301.99997}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5370225792356624807
@ -268,7 +268,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 264.00006, y: -73}
m_AnchoredPosition: {x: 264.00006, y: -103}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &763696200295960340
@ -428,7 +428,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 264.00006, y: -146}
m_AnchoredPosition: {x: 264.00006, y: -196.00002}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5530482550460664304
@ -748,7 +748,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -130, y: -72.99999}
m_AnchoredPosition: {x: -130, y: -103}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947278990241992
@ -908,7 +908,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -130, y: -215.00002}
m_AnchoredPosition: {x: -130, y: -302}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947279057449064
@ -1068,7 +1068,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -130, y: -146}
m_AnchoredPosition: {x: -130, y: -196}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6715947279265788346

+ 1
- 1
Assets/Prefabs/UI/levelScoreboard.prefab View File

@ -856,7 +856,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7, y: -200}
m_AnchoredPosition: {x: 7, y: -272}
m_SizeDelta: {x: 0, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4166744806708482471

+ 1
- 1
Assets/Scenes/Client Scenes/ClientScene.unity View File

@ -665,7 +665,7 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000015258789
value: -0.000022888184
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}

+ 70
- 28
Assets/Scenes/ColourCollide_Smaller.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -2842,7 +2842,6 @@ GameObject:
- component: {fileID: 952972661}
- component: {fileID: 952972660}
- component: {fileID: 952972659}
- component: {fileID: 952972658}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
@ -2850,32 +2849,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &952972658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 952972657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3481b961a4a56046b973a51de723523, type: 3}
m_Name:
m_EditorClassIdentifier:
clientDataList: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
ConnectedClients: []
players:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
scores:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
nextScene: MainMenu
MainScoreboard: {fileID: 0}
--- !u!114 &952972659
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5928,6 +5901,75 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1863302646}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1908527879
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1698745550996942700, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.0356328
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.4375196
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.7047038
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1698745550996942701, guid: a199dd5d5f6e9ad48966d0d0a8961305,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a199dd5d5f6e9ad48966d0d0a8961305, type: 3}
--- !u!1 &1958555746
GameObject:
m_ObjectHideFlags: 0

+ 1
- 1
Assets/Scenes/Server Scenes/ServerTestScene.unity View File

@ -2587,7 +2587,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!64 &2085069967
MeshCollider:
m_ObjectHideFlags: 0

+ 1
- 1
Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs View File

@ -10,7 +10,7 @@ public class ColorGameMode : GameMode
{
public int MaxRound = 5;
public string nextScene = "ColourCollideOne";
public string nextScene = "ServerTestScene";
List<ClientData> ConnectedClients;
public Material OverlayMaterial;

+ 1
- 1
Assets/Scripts/GameMode/ColorGameMode/ScoreDisplay.cs View File

@ -49,7 +49,7 @@ public class ScoreDisplay : MonoBehaviour
assignedPoints--;
}
StartCoroutine(displayforSeconds(levelScoreboard, 10.0f));
StartCoroutine(displayforSeconds(levelScoreboard, 5.0f));
}
public void Start()

+ 4
- 0
Assets/Scripts/GameMode/GameMode.cs View File

@ -49,6 +49,10 @@ public abstract class GameMode : ScriptableObject
if (!String.IsNullOrEmpty(GameModeScene))
UnityEngine.SceneManagement.SceneManager.LoadScene(GameModeScene,UnityEngine.SceneManagement.LoadSceneMode.Additive);
for(int i = 0; i < allPlayers.Length; i++)
{
allPlayers[i].client.SceneScore = 0;
}
OnGameStart(allPlayers);
}

+ 7
- 5
Assets/Scripts/Managers/GameManager.cs View File

@ -114,11 +114,13 @@ public class GameManager : MonoBehaviour
Debug.Log("Finished one move");
}
if (gamemode.isGameOver(playerArray.ToArray()))
{
Debug.Log("Game Over");
SceneManager.LoadScene("ScoreBoards");
}
}
if (gamemode.isGameOver(playerArray.ToArray()))
{
Debug.Log("Game Over");
SceneManager.LoadScene("ScoreBoards");
}
gamemode.RoundEnd(playerArray.ToArray());

+ 1
- 1
Assets/Scripts/Networking/Server/ServerManager.cs.meta View File

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
executionOrder: -50
icon: {instanceID: 0}
userData:
assetBundleName:

+ 2
- 2
Assets/Scripts/Networking/Server/ServerObject.cs View File

@ -29,8 +29,8 @@ namespace Networking.Server {
public void StartServer(int port)
{
LoginHandler.ConnectedClients.Clear();
LoginHandler.DisconnectedClients.Clear();
LoginHandler.ConnectedClients = new List<ClientData>();
LoginHandler.DisconnectedClients = new List<ClientData>();
Debug.Log("Starting Server on " + port);
server = new NetworkServerSimple();

+ 2
- 2
Assets/Scripts/UI/ScoreBoard.cs View File

@ -27,7 +27,7 @@ public class ScoreBoard : MonoBehaviour
{
display.SetActive (true);
yield return new WaitForSeconds(time);
SceneManager.LoadScene("ColourCollideOne");
SceneManager.LoadScene("ServerTestScene");
}
public void endGame()
@ -40,6 +40,6 @@ public class ScoreBoard : MonoBehaviour
players[i].GetComponent<TextMeshProUGUI>().text = ConnectedClients[i].Name;
scores[i].GetComponent<TextMeshProUGUI>().text = ConnectedClients[i].Score.ToString();
}
StartCoroutine(displayforSeconds(MainScoreboard, 10.0f));
StartCoroutine(displayforSeconds(MainScoreboard, 5.0f));
}
}

+ 2
- 2
Assets/Third Party Assets/KUBIKOS - World/Materials/Fog_Mat.mat View File

@ -11,7 +11,7 @@ Material:
m_Shader: {fileID: 4800000, guid: dc4a231338e15834faad19cdcaff9a6d, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 0
m_EnableInstancingVariants: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
@ -39,4 +39,4 @@ Material:
- __dirty: 0
m_Colors:
- _Color0: {r: 0.07136677, g: 0.44117647, b: 0.41057152, a: 0}
- _FogColor: {r: 0.40757385, g: 0.55138147, b: 0.6698113, a: 0}
- _FogColor: {r: 0.40784314, g: 0.55138147, b: 0.6698113, a: 0}

+ 43
- 0
Logs/Packages-Update.log View File

@ -84,3 +84,46 @@ The following packages were added:
com.unity.modules.vr@1.0.0
com.unity.modules.wind@1.0.0
com.unity.modules.xr@1.0.0
=== Thu May 2 15:12:06 2019
Packages were changed.
Update Mode: resetToDefaultDependencies
The following packages were added:
com.unity.analytics@3.2.2
com.unity.purchasing@2.0.3
com.unity.ads@2.0.8
com.unity.textmeshpro@1.3.0
com.unity.package-manager-ui@2.0.3
com.unity.collab-proxy@1.2.15
com.unity.modules.ai@1.0.0
com.unity.modules.animation@1.0.0
com.unity.modules.assetbundle@1.0.0
com.unity.modules.audio@1.0.0
com.unity.modules.cloth@1.0.0
com.unity.modules.director@1.0.0
com.unity.modules.imageconversion@1.0.0
com.unity.modules.imgui@1.0.0
com.unity.modules.jsonserialize@1.0.0
com.unity.modules.particlesystem@1.0.0
com.unity.modules.physics@1.0.0
com.unity.modules.physics2d@1.0.0
com.unity.modules.screencapture@1.0.0
com.unity.modules.terrain@1.0.0
com.unity.modules.terrainphysics@1.0.0
com.unity.modules.tilemap@1.0.0
com.unity.modules.ui@1.0.0
com.unity.modules.uielements@1.0.0
com.unity.modules.umbra@1.0.0
com.unity.modules.unityanalytics@1.0.0
com.unity.modules.unitywebrequest@1.0.0
com.unity.modules.unitywebrequestassetbundle@1.0.0
com.unity.modules.unitywebrequestaudio@1.0.0
com.unity.modules.unitywebrequesttexture@1.0.0
com.unity.modules.unitywebrequestwww@1.0.0
com.unity.modules.vehicles@1.0.0
com.unity.modules.video@1.0.0
com.unity.modules.vr@1.0.0
com.unity.modules.wind@1.0.0
com.unity.modules.xr@1.0.0

+ 2
- 2
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bd4d395cb9e19688d6fc571157ae8ff28afcd911ab9e63e2af8cec8a67868e51
size 1546
oid sha256:31e748f0f30e04bb9cedd521dcad9abd362c27f80c32e5f81a69d9c250c2ccad
size 1654

Write Preview
Loading…
Cancel
Save