Browse Source

Winlosefunctionsadded

master
MB 5 years ago
parent
commit
f3fd15cefe
9 changed files with 96 additions and 20 deletions
  1. +14
    -1
      Assets/Prefabs/RealLocalPlayer.prefab
  2. +16
    -1
      Assets/Scipts/GameMode.cs
  3. +0
    -8
      Assets/Shaders.meta
  4. +16
    -0
      Assets/VeggieSpots/Mushroom spot.prefab
  5. +16
    -0
      Assets/VeggieSpots/carrot_02.prefab
  6. +16
    -0
      Assets/VeggieSpots/potato_01.prefab
  7. +16
    -0
      Assets/VeggieSpots/pumpkin.prefab
  8. +0
    -8
      Assets/WorldAssets/Models.meta
  9. +2
    -2
      Assets/post/soup.asset

+ 14
- 1
Assets/Prefabs/RealLocalPlayer.prefab View File

@ -38,9 +38,10 @@ GameObject:
- component: {fileID: 114144325375728200} - component: {fileID: 114144325375728200}
- component: {fileID: 114874876091907484} - component: {fileID: 114874876091907484}
- component: {fileID: 143426586791887808} - component: {fileID: 143426586791887808}
- component: {fileID: 65991673409660740}
m_Layer: 0 m_Layer: 0
m_Name: RealLocalPlayer m_Name: RealLocalPlayer
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -1166,6 +1167,18 @@ BoxCollider:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1} m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &65991673409660740
BoxCollider:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1067952265812482}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!81 &81470123203253098 --- !u!81 &81470123203253098
AudioListener: AudioListener:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

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

@ -10,7 +10,10 @@ public class GameMode : MonoBehaviour {
GameObject LocalPlayer; GameObject LocalPlayer;
public CharacterMovement charMove; public CharacterMovement charMove;
public GameObject timer;
public GameObject winCanvas;
public GameObject loseCanvas;
private void Start() private void Start()
{ {
LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer; LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer;
@ -36,6 +39,18 @@ public class GameMode : MonoBehaviour {
Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.Lobby); Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.Lobby);
} }
public void GameWin()
{
winCanvas.SetActive(true);
timer.SetActive(false);
}
public void GameLose()
{
loseCanvas.SetActive(true);
timer.SetActive(false);
}
/* /*
//Check the values for player to see if it changes the minimum or maximum values of all players //Check the values for player to see if it changes the minimum or maximum values of all players
void CheckValues() void CheckValues()

+ 0
- 8
Assets/Shaders.meta View File

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

+ 16
- 0
Assets/VeggieSpots/Mushroom spot.prefab View File

@ -23,6 +23,7 @@ GameObject:
- component: {fileID: 23066903033166784} - component: {fileID: 23066903033166784}
- component: {fileID: 65576532979852656} - component: {fileID: 65576532979852656}
- component: {fileID: 114486742490627892} - component: {fileID: 114486742490627892}
- component: {fileID: 54565867815028620}
m_Layer: 0 m_Layer: 0
m_Name: Mushroom spot m_Name: Mushroom spot
m_TagString: Untagged m_TagString: Untagged
@ -86,6 +87,21 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1920492649654550} m_GameObject: {fileID: 1920492649654550}
m_Mesh: {fileID: 4300000, guid: 79212885923a8b04fbe9237207a285f6, type: 3} m_Mesh: {fileID: 4300000, guid: 79212885923a8b04fbe9237207a285f6, type: 3}
--- !u!54 &54565867815028620
Rigidbody:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1920492649654550}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &65576532979852656 --- !u!65 &65576532979852656
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 16
- 0
Assets/VeggieSpots/carrot_02.prefab View File

@ -38,6 +38,7 @@ GameObject:
- component: {fileID: 4365294101830012} - component: {fileID: 4365294101830012}
- component: {fileID: 65285727482329386} - component: {fileID: 65285727482329386}
- component: {fileID: 114730137093934732} - component: {fileID: 114730137093934732}
- component: {fileID: 54899189070266880}
m_Layer: 0 m_Layer: 0
m_Name: carrot_02 m_Name: carrot_02
m_TagString: Untagged m_TagString: Untagged
@ -188,6 +189,21 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1299243923031594} m_GameObject: {fileID: 1299243923031594}
m_Mesh: {fileID: 4300002, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} m_Mesh: {fileID: 4300002, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3}
--- !u!54 &54899189070266880
Rigidbody:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1507904707863932}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &65285727482329386 --- !u!65 &65285727482329386
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 16
- 0
Assets/VeggieSpots/potato_01.prefab View File

@ -23,6 +23,7 @@ GameObject:
- component: {fileID: 23385680880581990} - component: {fileID: 23385680880581990}
- component: {fileID: 65470407959044724} - component: {fileID: 65470407959044724}
- component: {fileID: 114909207236204264} - component: {fileID: 114909207236204264}
- component: {fileID: 54606795516042544}
m_Layer: 0 m_Layer: 0
m_Name: potato_01 m_Name: potato_01
m_TagString: Untagged m_TagString: Untagged
@ -85,6 +86,21 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1116618855275128} m_GameObject: {fileID: 1116618855275128}
m_Mesh: {fileID: 4300000, guid: 63cf58fd2474f0e498c599433ea47a80, type: 3} m_Mesh: {fileID: 4300000, guid: 63cf58fd2474f0e498c599433ea47a80, type: 3}
--- !u!54 &54606795516042544
Rigidbody:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1116618855275128}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &65470407959044724 --- !u!65 &65470407959044724
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 16
- 0
Assets/VeggieSpots/pumpkin.prefab View File

@ -23,6 +23,7 @@ GameObject:
- component: {fileID: 23233777779250244} - component: {fileID: 23233777779250244}
- component: {fileID: 65564087199631914} - component: {fileID: 65564087199631914}
- component: {fileID: 114991623911943832} - component: {fileID: 114991623911943832}
- component: {fileID: 54061168205415448}
m_Layer: 0 m_Layer: 0
m_Name: pumpkin m_Name: pumpkin
m_TagString: Untagged m_TagString: Untagged
@ -87,6 +88,21 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1420467368236124} m_GameObject: {fileID: 1420467368236124}
m_Mesh: {fileID: 4300000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} m_Mesh: {fileID: 4300000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3}
--- !u!54 &54061168205415448
Rigidbody:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1420467368236124}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &65564087199631914 --- !u!65 &65564087199631914
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

+ 0
- 8
Assets/WorldAssets/Models.meta View File

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

+ 2
- 2
Assets/post/soup.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e874e2278202b632c95c83f72248410f7280a9691ce9bc9d63ada7d594cf9dcd
size 3970
oid sha256:6a4112c34ce9441806c6f3f6d3e64d12adcffb572c3ee3e112e9dd855fe4de47
size 3967

Loading…
Cancel
Save