Merge branch 'dhain' into develop
This commit is contained in:
commit
f01a969ddf
4 changed files with 37 additions and 12 deletions
|
|
@ -10,6 +10,7 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2510115116361252819}
|
- component: {fileID: 2510115116361252819}
|
||||||
- component: {fileID: 2510115116361252816}
|
- component: {fileID: 2510115116361252816}
|
||||||
|
- component: {fileID: 123187747779251107}
|
||||||
- component: {fileID: 2510115116361252818}
|
- component: {fileID: 2510115116361252818}
|
||||||
- component: {fileID: 4094795090309576525}
|
- component: {fileID: 4094795090309576525}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
|
|
@ -86,6 +87,27 @@ SpriteRenderer:
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 1
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
m_SpriteSortPoint: 0
|
m_SpriteSortPoint: 0
|
||||||
|
--- !u!50 &123187747779251107
|
||||||
|
Rigidbody2D:
|
||||||
|
serializedVersion: 4
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2510115116361252817}
|
||||||
|
m_BodyType: 0
|
||||||
|
m_Simulated: 1
|
||||||
|
m_UseFullKinematicContacts: 0
|
||||||
|
m_UseAutoMass: 0
|
||||||
|
m_Mass: 1
|
||||||
|
m_LinearDrag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_GravityScale: 0
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_SleepingMode: 1
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
m_Constraints: 0
|
||||||
--- !u!60 &2510115116361252818
|
--- !u!60 &2510115116361252818
|
||||||
PolygonCollider2D:
|
PolygonCollider2D:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,25 @@
|
||||||
|
using System;
|
||||||
using DefaultNamespace;
|
using DefaultNamespace;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
public class Animal : MonoBehaviour {
|
public class Animal : MonoBehaviour {
|
||||||
protected Sprite animalSprite;
|
protected Sprite animalSprite;
|
||||||
private Item producedItem;
|
private Item _producedItem;
|
||||||
|
private Rigidbody2D _rigidbody;
|
||||||
|
public Item ProducedItem => _producedItem;
|
||||||
|
|
||||||
protected Animal(Item producedItem) {
|
private void Start() {
|
||||||
this.producedItem = producedItem;
|
_rigidbody = gameObject.GetComponent<Rigidbody2D>();
|
||||||
|
_rigidbody.velocity = new Vector2(Random.Range(1, 10),
|
||||||
|
Random.Range(1, 10));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Movement
|
private void Update() {
|
||||||
|
_rigidbody.velocity = new Vector2(_rigidbody.velocity.x * Random.Range(0, 10),
|
||||||
|
_rigidbody.velocity.y * Random.Range(0, 10));// TODO: wer?
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Animations
|
// TODO: Animations
|
||||||
|
|
||||||
private void OnMouseDown() {
|
private void OnMouseDown() {
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
public interface IPurchasable {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: b4a4f63f7f474fa18f9b72f6ac175e7f
|
|
||||||
timeCreated: 1654844062
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue