Merge branch 'develop' into sprechtl
This commit is contained in:
commit
8608ffd2eb
2 changed files with 5 additions and 7 deletions
|
|
@ -10,8 +10,8 @@ public class TileBehaviour : MonoBehaviour
|
|||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
_hoverIndicatorSpriteRenderer = gameObject.transform.GetChild(0).GetComponent<SpriteRenderer>();
|
||||
SetHoverIndicatorVisibility(false);
|
||||
//_hoverIndicatorSpriteRenderer = gameObject.transform.GetChild(0).GetComponent<SpriteRenderer>();
|
||||
//SetHoverIndicatorVisibility(false);
|
||||
SetTile(new GrassTile());
|
||||
|
||||
HouseController.NewDayEvent.AddListener(_tile.DayLightStep);
|
||||
|
|
@ -49,14 +49,12 @@ public class TileBehaviour : MonoBehaviour
|
|||
|
||||
private void OnMouseEnter()
|
||||
{
|
||||
Debug.Log("rein");
|
||||
SetHoverIndicatorVisibility(true);
|
||||
//SetHoverIndicatorVisibility(true);
|
||||
}
|
||||
|
||||
private void OnMouseExit()
|
||||
{
|
||||
Debug.Log("raus");
|
||||
SetHoverIndicatorVisibility(false);
|
||||
//SetHoverIndicatorVisibility(false);
|
||||
}
|
||||
|
||||
private void SetHoverIndicatorVisibility(bool visible)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace Tiles
|
|||
|
||||
static protected Sprite GenerateSpriteFromFile(String pathToImageFile)
|
||||
{
|
||||
byte[] data = System.IO.File.ReadAllBytes(pathToImageFile);
|
||||
byte[] data = File.ReadAllBytes(pathToImageFile);
|
||||
Texture2D texture = new Texture2D(32, 32, TextureFormat.ARGB32, false);
|
||||
texture.LoadImage(data);
|
||||
Sprite sprite = Sprite.Create(texture, new Rect(0.0f, 0.0f, texture.width, texture.height), new Vector2(0.5f, 0.5f), 32);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue