Browse Source

Change starting cube colour

Josh_Dev_branch
Claire Peta 5 years ago
parent
commit
63b1ef13ad
8 changed files with 98 additions and 1100 deletions
  1. +1
    -1
      Assets/Prefabs/GameManager.prefab
  2. +2
    -2
      Assets/Scenes/Client Scenes/ClientScene.unity
  3. +81
    -1090
      Assets/Scenes/ColourCollideOne.unity
  4. +2
    -2
      Assets/Scenes/Server Scenes/ServerTestScene.unity
  5. +6
    -1
      Assets/Scenes/TuteLevelOne.unity
  6. +1
    -1
      Assets/Scripts/Character.cs
  7. +5
    -1
      Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs
  8. +0
    -2
      Assets/Scripts/Managers/GameManager.cs

+ 1
- 1
Assets/Prefabs/GameManager.prefab View File

@ -43,7 +43,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a22c943adbcdf7f4d8c3b5dee307012d, type: 3} m_Script: {fileID: 11500000, guid: a22c943adbcdf7f4d8c3b5dee307012d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
AnimationTime: 1
AnimationTime: 0.7
CurrentGameMode: {fileID: 11400000, guid: be8c78868a86aad448fd14e46bd40e51, type: 2} CurrentGameMode: {fileID: 11400000, guid: be8c78868a86aad448fd14e46bd40e51, type: 2}
characterPrefab: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, characterPrefab: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}

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

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -665,7 +665,7 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000015258789
value: 0.000015258789
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3} type: 3}

+ 81
- 1090
Assets/Scenes/ColourCollideOne.unity
File diff suppressed because it is too large
View File


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

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {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 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -2587,7 +2587,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!64 &2085069967 --- !u!64 &2085069967
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 6
- 1
Assets/Scenes/TuteLevelOne.unity View File

@ -2733,6 +2733,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: characterSpeed
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3} type: 3}
propertyPath: blockReader.LogicChain.Array.size propertyPath: blockReader.LogicChain.Array.size
@ -3946,7 +3951,7 @@ PrefabInstance:
- target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c, - target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3} type: 3}

+ 1
- 1
Assets/Scripts/Character.cs View File

@ -48,7 +48,7 @@ public class Character : MonoBehaviour
//get character string from player replace from "Bear" //get character string from player replace from "Bear"
GameObject prefab = Resources.Load(CharacterModel) as GameObject; GameObject prefab = Resources.Load(CharacterModel) as GameObject;
GameObject Bear = Instantiate(prefab, this.gameObject.transform);
GameObject animal = Instantiate(prefab, this.gameObject.transform);
characterAnimator = GetComponentInChildren<Animator>(); characterAnimator = GetComponentInChildren<Animator>();
} }

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

@ -33,7 +33,7 @@ public class ColorGameMode : GameMode
/// <returns>returns if game is finished</returns> /// <returns>returns if game is finished</returns>
public override bool isGameOver(PlayerData[] allPlayers) public override bool isGameOver(PlayerData[] allPlayers)
{ {
return (RoundCount >= MaxRound);
return (RoundCount >= MaxRound -1);
} }
@ -137,5 +137,9 @@ public class ColorGameMode : GameMode
{ {
BlocksOwned = new Dictionary<ClientData, List<Block>>(); BlocksOwned = new Dictionary<ClientData, List<Block>>();
RoundCount = 0; RoundCount = 0;
for(int i = 0; i < allPlayers.Length; i++)
{
OnPlayerFinishedMove(allPlayers[i].character, allPlayers[i].client, allPlayers[i].character.CurrentBlock);
}
} }
} }

+ 0
- 2
Assets/Scripts/Managers/GameManager.cs View File

@ -48,8 +48,6 @@ public class GameManager : MonoBehaviour
SpawnCharacters(); SpawnCharacters();
gamemode.GameStart(playerArray.ToArray()); gamemode.GameStart(playerArray.ToArray());
ClientList.ForEach(p => p.ChangeScene("ClientScene")); ClientList.ForEach(p => p.ChangeScene("ClientScene"));
gamemode.GameStart(playerArray.ToArray());
} }
private void Start() private void Start()

Loading…
Cancel
Save