Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi

This commit is contained in:
Michel Roux 2024-01-28 17:54:05 +01:00
commit c25d8192df
2 changed files with 19 additions and 1 deletions

View File

@ -1789,6 +1789,7 @@ GameObject:
- component: {fileID: 375256413} - component: {fileID: 375256413}
- component: {fileID: 375256412} - component: {fileID: 375256412}
- component: {fileID: 375256415} - component: {fileID: 375256415}
- component: {fileID: 375256416}
m_Layer: 0 m_Layer: 0
m_Name: '[Managers]' m_Name: '[Managers]'
m_TagString: Untagged m_TagString: Untagged
@ -1890,6 +1891,23 @@ MonoBehaviour:
clip: {fileID: 8300000, guid: d782d7e00ee5a0d40a3c005d87c15b3a, type: 3} clip: {fileID: 8300000, guid: d782d7e00ee5a0d40a3c005d87c15b3a, type: 3}
- title: 3 - title: 3
clip: {fileID: 8300000, guid: e1135788bf319bd42b6ca512976f9028, type: 3} clip: {fileID: 8300000, guid: e1135788bf319bd42b6ca512976f9028, type: 3}
--- !u!114 &375256416
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 375256411}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0735c225bee4c490bbef74cb455fa748, type: 3}
m_Name:
m_EditorClassIdentifier:
promptList: {fileID: 11400000, guid: 21907abc84e40403ca34c4fb9ab30b06, type: 2}
addPrompt:
<id>k__BackingField:
<fr>k__BackingField:
<en>k__BackingField:
--- !u!1 &411140634 --- !u!1 &411140634
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -40,7 +40,7 @@ private void Update()
if (DateTime.Now < endOfTimer) if (DateTime.Now < endOfTimer)
{ {
timerLabel.text = (DateTime.Now - endOfTimer).TotalSeconds.ToString("D2"); timerLabel.text = (endOfTimer - DateTime.Now).TotalSeconds.ToString("D2");
} }
else else
{ {