added dgnum, fixed bugs
This commit is contained in:
parent
2b10ab5342
commit
7f0b9a517c
6 changed files with 18 additions and 3 deletions
|
@ -67,6 +67,9 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
|
<input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
|
||||||
|
<br/>
|
||||||
|
<a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
|
||||||
|
<span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
BIN
static/dgnum-logo.png
Normal file
BIN
static/dgnum-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9 KiB |
|
@ -33,6 +33,10 @@
|
||||||
<div id="map"></div><br/>
|
<div id="map"></div><br/>
|
||||||
|
|
||||||
<div id="codes"></div>
|
<div id="codes"></div>
|
||||||
|
<div id="thanks">
|
||||||
|
<a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
|
||||||
|
<span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -8,5 +8,9 @@
|
||||||
<body>
|
<body>
|
||||||
<h1> Équipe %ID inconnue ! </h1>
|
<h1> Équipe %ID inconnue ! </h1>
|
||||||
Utilise bien les urls qu'on te donne petit conscrit.
|
Utilise bien les urls qu'on te donne petit conscrit.
|
||||||
|
|
||||||
|
<br/><br/>
|
||||||
|
<a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
|
||||||
|
<span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -60,7 +60,11 @@
|
||||||
<label for="npc8"><img src="/icons/10.png" height=15px></label>
|
<label for="npc8"><img src="/icons/10.png" height=15px></label>
|
||||||
<input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
|
<input type="radio" id="npc9" name="npc" value=9 checked onclick='sendState()' />
|
||||||
<label for="npc9"><img src="/icons/11.png" height=15px></label>
|
<label for="npc9"><img src="/icons/11.png" height=15px></label>
|
||||||
</form>
|
</form><br/>
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
<a href="https://dgnum.eu"><img src="/dgnum-logo.png" height=20px /></a><br/>
|
||||||
|
<span style="font-size: 0.8em">Merci à la <a href="https://dgnum.eu">Délégation Générale NUMérique de l'ENS</a>, qui héberge ce site.</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
@ -267,7 +267,7 @@ function send_update(team){
|
||||||
else if(team.state.mallette)
|
else if(team.state.mallette)
|
||||||
io.to(team.id).emit('moving', apparent_info_mallette(equipes[other_id]));
|
io.to(team.id).emit('moving', apparent_info_mallette(equipes[other_id]));
|
||||||
else if(team.state.npc != 0)
|
else if(team.state.npc != 0)
|
||||||
io.to(team.id).emit('moving', {"id": team_id, "color": admin_color(equipe), "position": equipe.pos});
|
io.to(team.id).emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
|
||||||
else
|
else
|
||||||
io.to(team.id).emit('moving', apparent_info_agent(equipes[other_id]));
|
io.to(team.id).emit('moving', apparent_info_agent(equipes[other_id]));
|
||||||
}
|
}
|
||||||
|
@ -284,7 +284,7 @@ function team_join(team, socket){
|
||||||
else if(team.state.mallette)
|
else if(team.state.mallette)
|
||||||
socket.emit('moving', apparent_info_mallette(equipes[other_id]));
|
socket.emit('moving', apparent_info_mallette(equipes[other_id]));
|
||||||
else if(team.state.npc != 0)
|
else if(team.state.npc != 0)
|
||||||
socket.emit('moving', {"id": team_id, "color": admin_color(equipe), "position": equipe.pos});
|
socket.emit('moving', {"id": other_id, "color": admin_color(equipes[other_id]), "position": equipes[other_id].pos});
|
||||||
else
|
else
|
||||||
socket.emit('moving', apparent_info_agent(equipes[other_id]));
|
socket.emit('moving', apparent_info_agent(equipes[other_id]));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue