Merge branch 'main' of github.com:LeGall29/GGJ2024

This commit is contained in:
Marine 2024-01-28 00:07:08 +01:00
commit 7d5f106320
11 changed files with 100 additions and 11 deletions

8
Assets/Music.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 23eaa774a3a7d434183a4c336d52891f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Music/Ending.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: e1135788bf319bd42b6ca512976f9028
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Music/Menu.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 7ac3efdb5c840704aafbf19188b3e61e
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Music/Taking picture.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 0e86c0433979a2d4c884b368808d3cdf
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.18018535, g: 0.22559482, b: 0.30677685, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -1376,8 +1376,8 @@ MonoBehaviour:
- {fileID: 2137991537}
- {fileID: 340074661}
promptList: {fileID: 0}
explanationPage: {fileID: 0}
counter: {fileID: 0}
explanationPage: {fileID: 45150984}
counter: {fileID: 1798182259}
waitingForPropositionsPage: {fileID: 1730465902}
waitingForPropositionsLabels:
- {fileID: 972471162}

View File

@ -20,7 +20,7 @@ public Room(string _code)
players = new Dictionary<string, Player>();
questions = new Dictionary<string, Question>();
currentQuestion = 0;
currentState = 0;
currentState = 1; //default by PC
}
public List<Player> GetPlayerList()

View File

@ -133,7 +133,7 @@ public void PlayerValidateNameAndServerRoom(string _name, string _code)
currentPlayer
};
UpdateDisplayedListUser(list) ;
UpdateDisplayedListUser(list);
});
}
});
@ -216,7 +216,7 @@ public void StartGame()
Debug.LogException(ex);
}
}
/// <summary>
@ -314,7 +314,7 @@ private void UpdateDisplayedListUser(List<Player> players)
listPlayersUI.text += "\n" + players[i].name;
}
}
private void CheckIfIAmTheFirst(List<Player> players)
{
bool isFirst = false;
@ -367,8 +367,7 @@ public enum GameState
PropositionsSent = 4,
MakeVote = 5,
VoteSent = 6,
Score = 7,
Ending = 8
Score = 7
}

View File

@ -57,6 +57,10 @@ private void Awake()
private void Start()
{
explanationPage.SetActive(false);
waitingForPropositionsPage.SetActive(false);
waitingForPlayersPage.SetActive(true);
propositionCurrentTime = propositionTime;
votingCurrentTime = votingTime;
ResetAllPlayerLabels();
@ -70,7 +74,7 @@ private void Update()
if (myRoom.currentState == (int)GameState.Explanation && endOfExplanationDate != DateTime.MinValue)
{
TimeSpan duration = endOfExplanationDate - DateTime.Now;
counter.text = duration.TotalSeconds.ToString("D1");
counter.text = ((int)duration.TotalSeconds).ToString("D1");
if (duration.TotalMilliseconds <= 0)
{
@ -335,7 +339,7 @@ private void OnRoomUpdate(object sender, ValueChangedEventArgs value)
case (int)GameState.Explanation:
waitingForPlayersPage.SetActive(false);
explanationPage.SetActive(true);
endOfExplanationDate = DateTime.Now.AddSeconds(30);
endOfExplanationDate = DateTime.Now.AddSeconds(3);
break;
case (int)GameState.MakeProposition:
HostStartGame();