mirror of
https://github.com/ConjureETS/Human-Farm-Tycoon.git
synced 2026-03-26 03:11:07 +00:00
Modification of the UI and HungerPanel work.
This commit is contained in:
parent
3d02ac7f7f
commit
4abd161d59
@ -6317,19 +6317,19 @@ Prefab:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
propertyPath: m_AnchoredPosition.x
|
propertyPath: m_AnchoredPosition.x
|
||||||
value: 50
|
value: 26.8999996
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: -2
|
value: 2.20000005
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 100
|
value: 53.7999992
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
propertyPath: m_SizeDelta.y
|
propertyPath: m_SizeDelta.y
|
||||||
value: 180
|
value: 188.399994
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
- target: {fileID: 22441466, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
propertyPath: m_AnchorMin.x
|
propertyPath: m_AnchorMin.x
|
||||||
@ -6399,6 +6399,110 @@ Prefab:
|
|||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -17
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: -15.75
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22462250, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 15.75
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22451974, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -17
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: -10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22432526, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 80
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 22421352, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 80
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 144592, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ZombieText
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 137340, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: HumanText
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_ParentPrefab: {fileID: 100100000, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
m_ParentPrefab: {fileID: 100100000, guid: 9c8af9d7f0303b04a8dcb191b8695862, type: 2}
|
||||||
m_IsPrefabParent: 0
|
m_IsPrefabParent: 0
|
||||||
@ -9238,7 +9342,29 @@ MonoBehaviour:
|
|||||||
m_TargetGraphic: {fileID: 893219178}
|
m_TargetGraphic: {fileID: 893219178}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1725622850}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 1
|
||||||
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 876236261}
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!114 &893219178
|
--- !u!114 &893219178
|
||||||
@ -10853,10 +10979,10 @@ RectTransform:
|
|||||||
- {fileID: 1848076642}
|
- {fileID: 1848076642}
|
||||||
m_Father: {fileID: 1660519659}
|
m_Father: {fileID: 1660519659}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 500, y: 225}
|
m_SizeDelta: {x: -100, y: -60}
|
||||||
m_Pivot: {x: .5, y: .5}
|
m_Pivot: {x: .5, y: .5}
|
||||||
--- !u!114 &1108311138
|
--- !u!114 &1108311138
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -10920,7 +11046,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1128782427
|
--- !u!224 &1128782427
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -14361,10 +14487,10 @@ RectTransform:
|
|||||||
- {fileID: 1519905739}
|
- {fileID: 1519905739}
|
||||||
m_Father: {fileID: 1660519659}
|
m_Father: {fileID: 1660519659}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_AnchorMin: {x: .5, y: .5}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: .5, y: .5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 500, y: 225}
|
m_SizeDelta: {x: -100, y: -60}
|
||||||
m_Pivot: {x: .5, y: .5}
|
m_Pivot: {x: .5, y: .5}
|
||||||
--- !u!114 &1529662982
|
--- !u!114 &1529662982
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|||||||
@ -35,6 +35,6 @@ public class ConfirmStatsScript : MonoBehaviour {
|
|||||||
public void ModifieStats()
|
public void ModifieStats()
|
||||||
{
|
{
|
||||||
|
|
||||||
descrEvent.text = stats.UpdateStats();
|
descrEvent.text = stats.endTurn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -298,12 +298,20 @@ public class Stats : MonoBehaviour
|
|||||||
AmountOfZHunger = MaxHungerZombies;
|
AmountOfZHunger = MaxHungerZombies;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void applyStatModifications()
|
private string applyStatModifications()
|
||||||
{
|
{
|
||||||
AmountOfCorpse += (NbZombieAssigneCorpse * NbOfCorpseByZombie);
|
|
||||||
|
Evenement evenement = new Evenement();
|
||||||
|
evenement.GetEventForThisRound(NbTurns);
|
||||||
|
|
||||||
|
AmountOfCorpse += (NbZombieAssigneCorpse * NbOfCorpseByZombie)* evenement.MultiCorps / 10;
|
||||||
//AmountOfMeat += (NbZombieAssigneMeat * NbOfMeatByZombie);
|
//AmountOfMeat += (NbZombieAssigneMeat * NbOfMeatByZombie);
|
||||||
AmountOfRock += (NbZombieAssigneRock * NbOfRockByZombie);
|
AmountOfRock += (NbZombieAssigneRock * NbOfRockByZombie)* evenement.MutliRock / 10;
|
||||||
AmountOfWood += (NbZombieAssigneWood * NbOfWoodByZombie);
|
AmountOfWood += (NbZombieAssigneWood * NbOfWoodByZombie)* evenement.MultiWood / 10;
|
||||||
|
|
||||||
|
ResetZombieAssigne();
|
||||||
|
|
||||||
|
return evenement.descriptionEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void advanceTurn()
|
private void advanceTurn()
|
||||||
@ -329,21 +337,28 @@ public class Stats : MonoBehaviour
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void endTurn()
|
public string endTurn()
|
||||||
{
|
{
|
||||||
if (!isHumanMaxCapacity())
|
|
||||||
|
|
||||||
|
//if (!isHumanMaxCapacity())
|
||||||
//AmountOfHumans += (HUMANS_PER_HOUSE * AmountHumanHouse);
|
//AmountOfHumans += (HUMANS_PER_HOUSE * AmountHumanHouse);
|
||||||
if (isZombieMaxCapacity())
|
//if (isZombieMaxCapacity())
|
||||||
//AmountOfZombies -= AmountOfZombies % (AmountZombieHouse * HOUSE_SUPPLY_CAP);
|
//AmountOfZombies -= AmountOfZombies % (AmountZombieHouse * HOUSE_SUPPLY_CAP);
|
||||||
applyStatModifications();
|
string descEvent = applyStatModifications();
|
||||||
calculateHunger();
|
calculateHunger();
|
||||||
advanceTurn();
|
advanceTurn();
|
||||||
|
|
||||||
|
return descEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void calculateHunger()
|
private void calculateHunger()
|
||||||
{
|
{
|
||||||
AmountOfHHunger -= HUNGER_DEDUCT_PER_DAY_H * AmountOfHumans;
|
AmountOfHHunger -= HUNGER_DEDUCT_PER_DAY_H * AmountOfHumans;
|
||||||
AmountOfZHunger -= HUNGER_DEDUCT_PER_DAY_Z * AmountOfZombies;
|
AmountOfZHunger -= HUNGER_DEDUCT_PER_DAY_Z * AmountOfZombies;
|
||||||
|
|
||||||
|
setMaxHungerHumans();
|
||||||
|
setMaxHungerZombies();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setMaxHungerHumans()
|
private void setMaxHungerHumans()
|
||||||
@ -413,6 +428,10 @@ public class Stats : MonoBehaviour
|
|||||||
AmountOfRock = AmountOfRock + NbZombieAssigneRock * NbOfRockByZombie * evenement.MutliRock/10;
|
AmountOfRock = AmountOfRock + NbZombieAssigneRock * NbOfRockByZombie * evenement.MutliRock/10;
|
||||||
AmountOfCorpse = AmountOfCorpse + NbZombieAssigneCorpse * NbOfCorpseByZombie * evenement.MultiCorps/10;
|
AmountOfCorpse = AmountOfCorpse + NbZombieAssigneCorpse * NbOfCorpseByZombie * evenement.MultiCorps/10;
|
||||||
|
|
||||||
|
|
||||||
|
setMaxHungerHumans();
|
||||||
|
setMaxHungerZombies();
|
||||||
|
|
||||||
ResetZombieAssigne();
|
ResetZombieAssigne();
|
||||||
NbTurns++;
|
NbTurns++;
|
||||||
return evenement.descriptionEvent;
|
return evenement.descriptionEvent;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user