Human interactor inside hall
This commit is contained in:
@@ -24,9 +24,16 @@ public class WorldItemSelector : MonoBehaviour
|
||||
// //Selector.selectBuilding(null);
|
||||
// }
|
||||
Selector.selectBuilding(selectedB);
|
||||
|
||||
if(Selector.insideHall){
|
||||
HumanInteractor interactor = hit.collider.GetComponent<HumanInteractor>();
|
||||
Selector.selectHuman(interactor);
|
||||
}
|
||||
}else{
|
||||
Selector.selectBuilding(null);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public Vector3? GetTouchingWorldPoint(Vector2 screenPoint){
|
||||
@@ -109,17 +116,26 @@ public class WorldItemSelector : MonoBehaviour
|
||||
}
|
||||
|
||||
public static class Selector{
|
||||
public static bool enabled=true;
|
||||
//public static bool enabled=true;
|
||||
public static bool insideHall = false;
|
||||
public static bool movingPointValid;
|
||||
public static Building movingBuilding;
|
||||
public static bool isMovingBuilding => movingBuilding!=null;
|
||||
public static Building selectedBuilding;
|
||||
public static BuildingData selectedData => selectedBuilding.buildingData;
|
||||
|
||||
public static HumanInteractor selectedHuman;
|
||||
public static UnityEvent OnSelectedChanged = new UnityEvent();
|
||||
|
||||
public static void selectBuilding(Building e){
|
||||
selectedBuilding = e;
|
||||
if(!enabled){selectedBuilding=null;}
|
||||
if(insideHall){selectedBuilding=null;}
|
||||
OnSelectedChanged.Invoke();
|
||||
}
|
||||
|
||||
public static void selectHuman(HumanInteractor e){
|
||||
selectedHuman = e;
|
||||
if(!insideHall){selectedHuman=null;}
|
||||
OnSelectedChanged.Invoke();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user