Skip to content
Snippets Groups Projects
Commit 4d929d11 authored by william's avatar william
Browse files

ajustes no timer

parent b2692fce
No related branches found
No related tags found
No related merge requests found
......@@ -227,6 +227,7 @@ MonoBehaviour:
- {fileID: 1766585343}
- {fileID: 1679847566}
- {fileID: 1368919583}
timer: {fileID: 1663595592}
--- !u!4 &273380710
Transform:
m_ObjectHideFlags: 0
......@@ -358,6 +359,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 890439930}
- {fileID: 1663595595}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -403,10 +405,10 @@ RectTransform:
m_Father: {fileID: 605630436}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 188.1, y: 114.9}
m_SizeDelta: {x: 160, y: 20}
m_AnchorMin: {x: 0.614, y: 0.7071989}
m_AnchorMax: {x: 0.865691, y: 0.7631989}
m_AnchoredPosition: {x: 0.1000061, y: -0.19999695}
m_SizeDelta: {x: 0, y: -0.10000992}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &890439931
MonoBehaviour:
......@@ -773,6 +775,104 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1562179826}
--- !u!1 &1663595591
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1663595595}
- component: {fileID: 1663595594}
- component: {fileID: 1663595592}
- component: {fileID: 1663595593}
m_Layer: 5
m_Name: Timer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1663595592
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1663595591}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.85294116, g: 0.050173007, b: 0.050173007, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 27a04418a55c7c8478a0d05260a2ed43, type: 3}
m_FontSize: 60
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 300
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!132 &1663595593
GUIText:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1663595591}
m_Enabled: 1
serializedVersion: 3
m_Text:
m_Anchor: 0
m_Alignment: 0
m_PixelOffset: {x: 0, y: 0}
m_LineSpacing: 1
m_TabSize: 4
m_Font: {fileID: 12800000, guid: 8dbbc9cb2d3a43e4490edb7bf93d426e, type: 3}
m_Material: {fileID: 0}
m_FontSize: 0
m_FontStyle: 0
m_Color:
serializedVersion: 2
rgba: 4294967295
m_PixelCorrect: 1
m_RichText: 1
--- !u!222 &1663595594
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1663595591}
--- !u!224 &1663595595
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1663595591}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 605630436}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.41642272, y: 0.7071989}
m_AnchorMax: {x: 0.5581545, y: 0.7351989}
m_AnchoredPosition: {x: -0.049999237, y: 5.880005}
m_SizeDelta: {x: -1.4699993, y: 51.46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1677349524
GameObject:
m_ObjectHideFlags: 0
......
......@@ -40,10 +40,10 @@ public class GameManager : MonoBehaviour
private void Update()
{
timer.text = System.Math.Round(turnDuration - currentTime, 1).ToString();
if (inTurn)
{
currentTime += Time.deltaTime;
timer.text = (turnDuration - currentTime).ToString();
}
}
......@@ -57,7 +57,6 @@ public class GameManager : MonoBehaviour
private IEnumerator endTurn()
{
timer.text = "Setting up";
inTurn = false;
currentTime = 0;
npcController.enabled = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment