Browse Source

Fixed some Changes

master
Joshua Reason 5 years ago
parent
commit
72ddd2b2d8
5 changed files with 179 additions and 42 deletions
  1. +176
    -1
      Assets/Scenes/MainScene.unity
  2. +1
    -31
      Assets/Scipts/GameMode.cs
  3. +1
    -1
      Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs
  4. +1
    -1
      Assets/SpiritBall/SpiritMat.mat
  5. +0
    -8
      Assets/_Mat.meta

+ 176
- 1
Assets/Scenes/MainScene.unity View File

@ -1843,7 +1843,6 @@ MonoBehaviour:
type: 2} type: 2}
RemotePlayerPrefab: {fileID: 1899238032005644, guid: 35b69a93d1dd9c24fbf2ba57dfc4aafb, RemotePlayerPrefab: {fileID: 1899238032005644, guid: 35b69a93d1dd9c24fbf2ba57dfc4aafb,
type: 2} type: 2}
LocalPlayer: {fileID: 0}
--- !u!114 &340012155 --- !u!114 &340012155
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5393,6 +5392,182 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1791178145} m_GameObject: {fileID: 1791178145}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &1890329102
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000010565031288, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0.024932861
objectReference: {fileID: 0}
- target: {fileID: 22450346, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 22439978, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 224000010937413736, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22424132, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 22445198, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 22460488, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 224000010243477314, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 224000010243477314, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 11.599998
objectReference: {fileID: 0}
- target: {fileID: 224000011886223928, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0.024978638
objectReference: {fileID: 0}
- target: {fileID: 224000011886223928, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0.0000038146973
objectReference: {fileID: 0}
- target: {fileID: 22477518, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 224000011192146308, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224000011192146308, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22465754, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.19995117
objectReference: {fileID: 0}
- target: {fileID: 224000010628903916, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0.12501526
objectReference: {fileID: 0}
- target: {fileID: 224000010628903916, guid: 0abab5bb77339e4428787a870eb31bd3,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0.42485046
objectReference: {fileID: 0}
- target: {fileID: 11496292, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_graphModulePosition
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11496292, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_audioModuleState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 11496292, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
propertyPath: m_ramModuleState
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0abab5bb77339e4428787a870eb31bd3, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1963101659 --- !u!1 &1963101659
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 1
- 31
Assets/Scipts/GameMode.cs View File

@ -67,35 +67,5 @@ public class GameMode : MonoBehaviour {
timer.enabled = false; timer.enabled = false;
} }
/*
//Check the values for player to see if it changes the minimum or maximum values of all players
void CheckValues()
{
float maxDistance = 0;
foreach(GameObject gamePlayer in Players)
{
float distance = (transform.position - gamePlayer.transform.position).magnitude;
Player playerScript = gamePlayer.GetComponent<Player>();
foreach (GameObject dummy in playerScript.dummies)
{
float newDis = (transform.position - gamePlayer.transform.position).magnitude;
if (newDis < distance)
{
distance = newDis;
}
}
if (distance > maxDistance)
{
maxDistance = distance;
}
}
if (maxDistance < DistanceToWin)
{
if (recipe.CheckVictory())
{
//Win Game here
}
}
}
*/
} }

+ 1
- 1
Assets/Scipts/Multiplayer/Client/ClientLoginManager.cs View File

@ -22,7 +22,7 @@ namespace Multiplayer
ClientManager.Client.RegisterHandler(MsgType.Connect, OnConnected); ClientManager.Client.RegisterHandler(MsgType.Connect, OnConnected);
ClientManager.Client.RegisterHandler(MsgType.Disconnect, OnDisconnected); ClientManager.Client.RegisterHandler(MsgType.Disconnect, OnDisconnected);
ClientManager.Client.RegisterHandler(LoginMsgID.QueryName, OnRecieveID); ClientManager.Client.RegisterHandler(LoginMsgID.QueryName, OnRecieveID);
ClientManager.Client.RegisterHandler(LoginMsgID.EnterLobby, StartLobby);
ClientManager.Client.RegisterHandler(PlayerMsgID.Lobby, StartLobby);
ClientManager.Client.RegisterHandler(PlayerMsgID.GameStart, StartGame); ClientManager.Client.RegisterHandler(PlayerMsgID.GameStart, StartGame);
ClientManager.Client.RegisterHandler(LoginMsgID.Seed, SetSeed); ClientManager.Client.RegisterHandler(LoginMsgID.Seed, SetSeed);
} }

+ 1
- 1
Assets/SpiritBall/SpiritMat.mat View File

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: New Material
m_Name: SpiritMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 0 m_LightmapFlags: 0

+ 0
- 8
Assets/_Mat.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: ff543b29e8c675c45b0fdac36d12ef5c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Loading…
Cancel
Save