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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-10-05 03:11:44 +09:00
parent 61da4e56c1
commit 01d3e6c03d
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+2 -2
View File
@@ -1223,8 +1223,8 @@ function addAge() {
if($admin['year'] >= $admin['startyear']+3) { if($admin['year'] >= $admin['startyear']+3) {
foreach($db->query('SELECT no,name,nation,leadership,strength,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){ foreach($db->query('SELECT no,name,nation,leadership,strength,intel from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general){
$special = SpecialityConst::pickSpecialDomestic($general); $special = SpecialityConst::pickSpecialDomestic($general);
$specialClass = getGeneralSpecialDomesticClass($special); $specialClass = buildGeneralSpecialDomesticClass($special);
$specialText = $specialClass::$name; $specialText = $specialClass->getName();
$db->update('general', [ $db->update('general', [
'special'=>$special 'special'=>$special
], 'no=%i',$general['no']); ], 'no=%i',$general['no']);
hwe/func_converter.php
+1 -1
View File
@@ -13,7 +13,7 @@ function getCharacterList(){
$infoText = []; $infoText = [];
foreach(GameConst::$allPersonality as $personalityID){ foreach(GameConst::$allPersonality as $personalityID){
$class = buildPersonalityClass($personalityID); $class = buildPersonalityClass($personalityID);
$infoText[$personalityID] = [$class->getName(), $class::$info]; $infoText[$personalityID] = [$class->getName(), $class->getInfo()];
} }
return $infoText; return $infoText;
} }
hwe/func_template.php
+3 -3
View File
@@ -93,9 +93,9 @@ function displaySpecialWarInfo(?string $type):string{
} }
function displaySpecialDomesticInfo(?string $type):string{ function displaySpecialDomesticInfo(?string $type):string{
$class = getGeneralSpecialDomesticClass($type); $class = buildGeneralSpecialDomesticClass($type);
$info = $class::$info; $info = $class->getInfo();
$name = $class::$name; $name = $class->getName();
$templates = new \League\Plates\Engine(__dir__.'/templates'); $templates = new \League\Plates\Engine(__dir__.'/templates');
hwe/sammo/Command/General/che_건국.php
+6 -6
View File
@@ -129,8 +129,8 @@ class che_건국 extends Command\GeneralCommand{
$logger = $general->getLogger(); $logger = $general->getLogger();
$nationTypeClass = getNationTypeClass($nationType); $nationTypeClass = buildNationTypeClass($nationType);
$nationTypeName = $nationTypeClass::$name; $nationTypeName = $nationTypeClass->getName();
$logger->pushGeneralActionLog("<D><b>{$nationName}</></>{$josaUl} 건국하였습니다. <1>$date</>"); $logger->pushGeneralActionLog("<D><b>{$nationName}</></>{$josaUl} 건국하였습니다. <1>$date</>");
@@ -216,9 +216,9 @@ class che_건국 extends Command\GeneralCommand{
$form[] = '현재 도시에서 나라를 세웁니다. 중, 소도시에서만 가능합니다.<br><br>'; $form[] = '현재 도시에서 나라를 세웁니다. 중, 소도시에서만 가능합니다.<br><br>';
foreach(GameConst::$availableNationType as $nationType){ foreach(GameConst::$availableNationType as $nationType){
$nationClass = getNationTypeClass($nationType); $nationClass = buildNationTypeClass($nationType);
[$name, $pros, $cons] = [$nationClass::$name, $nationClass::$pros, $nationClass::$cons]; [$name, $pros, $cons] = [$nationClass->getName(), $nationClass::$pros, $nationClass::$cons];
$form[] = "- $name : <span style='color:cyan;'>{$pros}</span> <span style='color:magenta;'>{$cons}</span><br>"; $form[] = "- $name : <span style='color:cyan;'>{$pros}</span> <span style='color:magenta;'>{$cons}</span><br>";
} }
@@ -240,9 +240,9 @@ EOT;
성향 : <select class='formInput' name='nationType' id='nationType' size='1'> 성향 : <select class='formInput' name='nationType' id='nationType' size='1'>
EOT; EOT;
foreach(GameConst::$availableNationType as $nationType){ foreach(GameConst::$availableNationType as $nationType){
$nationClass = getNationTypeClass($nationType); $nationClass = buildNationTypeClass($nationType);
$name = $nationClass::$name; $name = $nationClass->getName();
$form[] = "<option value='{$nationType}' style=background-color:black;color:white;>{$name}</option>"; $form[] = "<option value='{$nationType}' style=background-color:black;color:white;>{$name}</option>";
} }
hwe/select_npc.php
+3 -3
View File
@@ -38,9 +38,9 @@ var specialInfo =
<?php <?php
$specialAll = []; $specialAll = [];
foreach (GameConst::$availableSpecialDomestic as $id) { foreach (GameConst::$availableSpecialDomestic as $id) {
$domesticClass = getGeneralSpecialDomesticClass($id); $domesticClass = buildGeneralSpecialDomesticClass($id);
$name = $domesticClass::$name; $name = $domesticClass->getName();
$info = $domesticClass::$info; $info = $domesticClass->getInfo();
$specialAll[$name] = $info; $specialAll[$name] = $info;
} }
foreach (SpecialityConst::WAR as $id=>$values) { foreach (SpecialityConst::WAR as $id=>$values) {