smyalygames/monopoly
1
0
Fork 0
mirror of https://github.com/smyalygames/monopoly.git synced 2025-05-18 14:24:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

psuh

Browse Source
This commit is contained in:
Anthony Berg 2020-06-19 17:40:42 +01:00
parent 6eb9a8ab38
commit 89c0cee1ce
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/board.cs
View File

@ -1,10 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
<<<<<<< HEAD
using static properties; using static properties;
=======
>>>>>>> cf686d8cd1e8be24b600a6d66e72755a749da53b
public class board : MonoBehaviour public class board : MonoBehaviour
{ {
@ -13,12 +10,8 @@ public class board : MonoBehaviour
{ {
public int houses; //Initialising houses public int houses; //Initialising houses
public int hotels; //Initialising hotels public int hotels; //Initialising hotels
<<<<<<< HEAD
// List<properties.Property> cards = new List<properties.Property>; // List<properties.Property> cards = new List<properties.Property>;
Property cards = new Property("test", "test", 200, 400); Property cards = new Property("test", "test", 200, 400);
=======
List<Property> cards = new List<Property>();
>>>>>>> cf686d8cd1e8be24b600a6d66e72755a749da53b
public Board() public Board()
{ {