xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-13 06:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source 
Conflicts:
	GameEngine/Lang/en.php
This commit is contained in:
Shadow
2014-05-12 08:45:37 +03:00
parent e337ac2b4d a8a79eb6ef
commit 8e6a39a900
20 changed files with 908 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/5.tpl
+1 -1
View File
@@ -34,4 +34,4 @@ include("next.tpl");
<?php
include("upgrade.tpl");
?>
</p></div>
</p></div>
Templates/Build/6.tpl
+1 -1
View File
@@ -34,4 +34,4 @@ include("next.tpl");
<?php
include("upgrade.tpl");
?>
</p></div>
</p></div>
Templates/Build/7.tpl
+1 -1
View File
@@ -34,4 +34,4 @@ include("next.tpl");
<?php
include("upgrade.tpl");
?>
</p></div>
</p></div>
Templates/Build/8.tpl
+1 -1
View File
@@ -34,4 +34,4 @@ include("next.tpl");
<?php
include("upgrade.tpl");
?>
</p></div>
</p></div>
Templates/Build/9.tpl
+1 -1
View File
@@ -34,4 +34,4 @@ include("next.tpl");
<?php
include("upgrade.tpl");
?>
</p></div>
</p></div>
Templates/Profile/medal.php
+2
View File
@@ -33,6 +33,8 @@ $remainingDay = floor($secondsDiff/60/60/24);
$remainingHour = floor(($secondsDiff-($remainingDay*60*60))/3600);
$remainingMinutes = floor(($secondsDiff-($remainingDay*60*60)-($remainingHour*60*60))/60);
$remainingSeconds = floor(($secondsDiff-($remainingDay*60*60)-($remainingHour*60*60))-($remainingMinutes*60));
$nul1 = $nul2 = $nul3 = "0";
if(strlen($remainingSeconds) <= 1){
$nul1 = "0";}
if(strlen($remainingMinutes) <= 1){