devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

Merge branch 'ng_turn' of ssh://storage.hided.net:2525/devsam/core into ng_turn

Browse Source
This commit is contained in:
Hide_D
2020-04-14 01:49:46 +09:00
parent 85389c4a60 913289e0ef
commit 95ac7454ae
6 changed files with 554 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+4 -3
View File
@@ -51,7 +51,8 @@ function getNationStaticInfo($nationID, $forceRefresh=false)
'gold'=>0,
'rice'=>2000,
'tech'=>0,
'gennum'=>1
'gennum'=>1,
'power'=>1
];
}
@@ -2105,7 +2106,7 @@ function getRandTurn($term, ?\DateTimeInterface $baseDateTime = null) {
$baseDateTime = new \DateTimeImmutable();
}
else if($baseDateTime instanceof \DateTime){
$baseDateTime = DateTimeImmutable::createFromMutable($baseDateTime);
$baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
}
$randSecond = Util::randRangeInt(0, 60 * $term - 1);
@@ -2120,7 +2121,7 @@ function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null)
$baseDateTime = new \DateTimeImmutable();
}
else if($baseDateTime instanceof \DateTime){
$baseDateTime = DateTimeImmutable::createFromMutable($baseDateTime);
$baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
}
$randSecond = Util::randRangeInt(0, 60 * $term - 1);
$randFraction = Util::randRangeInt(0, 999999) / 1000000;//6자리 소수