Browse Source

Bernards changes?

master
MB 5 years ago
parent
commit
2306de26a3
5 changed files with 47 additions and 6 deletions
  1. +2
    -2
      Assets/Scenes/ClientScene.unity
  2. +34
    -2
      Assets/Scenes/MainScene.unity
  3. +1
    -0
      Assets/Scipts/GameMode.cs
  4. +8
    -0
      Assets/Scipts/Recipe.cs
  5. +2
    -2
      ProjectSettings/EditorBuildSettings.asset

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

@ -142,11 +142,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SetSingletonOnAwake: 1 SetSingletonOnAwake: 1
isPersistant: 1 isPersistant: 1
ServerAddress: 127.0.0.1
ServerAddress: 10.17.38.221
Port: 4444 Port: 4444
ConnectOnStart: 0 ConnectOnStart: 0
GameSceneName: TestScene GameSceneName: TestScene
Name: The Black Burrito
Name: The most nardish of players
IsConnected: 0 IsConnected: 0
ID: 0 ID: 0
--- !u!4 &914867462 --- !u!4 &914867462

+ 34
- 2
Assets/Scenes/MainScene.unity View File

@ -1008,6 +1008,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 340012150} - component: {fileID: 340012150}
- component: {fileID: 340012153}
- component: {fileID: 340012149} - component: {fileID: 340012149}
- component: {fileID: 340012151} - component: {fileID: 340012151}
- component: {fileID: 340012152} - component: {fileID: 340012152}
@ -1078,7 +1079,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cf47a9574c702c045b82225844d9b3c4, type: 3} m_Script: {fileID: 11500000, guid: cf47a9574c702c045b82225844d9b3c4, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
PlayerCount: 0
localPlayer: {fileID: 0}
Veggies: Veggies:
- Name: Asparagus - Name: Asparagus
Image: {fileID: 0} Image: {fileID: 0}
@ -1098,7 +1099,22 @@ MonoBehaviour:
- VegetableSpot: {fileID: 73397754} - VegetableSpot: {fileID: 73397754}
Qty: {fileID: 2038484979} Qty: {fileID: 2038484979}
Qtys: 00000000000000000000000000000000 Qtys: 00000000000000000000000000000000
RecipeCanvas: {fileID: 0}
RecipeCanvas: {fileID: 892339023}
Inventory: {fileID: 1039419385}
--- !u!114 &340012153
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 340012148}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 553b7b4f739e7334b9e1055b3688e5e3, type: 3}
m_Name:
m_EditorClassIdentifier:
recipe: {fileID: 0}
LocalPlayer: {fileID: 0}
DistanceToWin: 0
--- !u!1 &426060142 --- !u!1 &426060142
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2850,6 +2866,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1492969500} - component: {fileID: 1492969500}
- component: {fileID: 1492969499} - component: {fileID: 1492969499}
- component: {fileID: 1492969501}
m_Layer: 0 m_Layer: 0
m_Name: Player m_Name: Player
m_TagString: Untagged m_TagString: Untagged
@ -2884,6 +2901,21 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1492969501
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1492969498}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ef36bf4b6c639b943a4f10e7e56d237b, type: 3}
m_Name:
m_EditorClassIdentifier:
dummies: []
heldVeggie:
Name:
Image: {fileID: 0}
--- !u!1 &1584314061 --- !u!1 &1584314061
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -49,6 +49,7 @@ public class GameMode : MonoBehaviour {
void CheckIngredients() void CheckIngredients()
{ {
foreach(GameObject gamePlayer in Players) foreach(GameObject gamePlayer in Players)
{ {

+ 8
- 0
Assets/Scipts/Recipe.cs View File

@ -56,6 +56,14 @@ public class Recipe : MonoBehaviour {
localPlayer.heldVeggie = null; localPlayer.heldVeggie = null;
Inventory.gameObject.SetActive(false); Inventory.gameObject.SetActive(false);
} }
public void CheckInventory(List<GameObject> Players)
{
foreach(GameObject player in Players)
{
Player PS = player.GetComponent<Player>();
}
}
} }

+ 2
- 2
ProjectSettings/EditorBuildSettings.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:a5078242978199c48412c8b49c4122d160ff8177882f9137c6bd1dddef8b6f9b
size 268
oid sha256:f182faa74c5ed42826273c1aa3fa86e317c6b7e71f9d22f4ea0a329d03f90c21
size 355

Loading…
Cancel
Save