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

버그 1차 수정

Browse Source
This commit is contained in:
Hide_D
2018-11-26 00:03:11 +09:00
parent 130d079c90
commit 0813f48fce
21 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/ActionItem/che_의술_청낭서.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_의술_청낭서 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_의술_태평청령.php
+2
View File
@@ -2,6 +2,8 @@
namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_의술_태평청령 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_도소연명.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_도소연명 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_무후행군.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_무후행군 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_오석산.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_오석산 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_정력견혈.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_정력견혈 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_칠엽청점.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_칠엽청점 extends \sammo\BaseItem{
hwe/sammo/ActionItem/che_치료_환약.php
+1
View File
@@ -3,6 +3,7 @@ namespace sammo\ActionNationType;
use \sammo\iAction;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_치료_환약 extends \sammo\BaseItem{
hwe/sammo/ActionSpecialDomestic/che_거상.php
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace sammo\ActionSpecialDomestic;
use \sammo\iAction;
use \sammo\General;
use \sammo\SpecialityConst;
class che_거상 implements iAction{
use \sammo\DefaultAction;
static $id = 999;
static $name = '거상';
static $info = '<비활성화>';
static $selectWeightType = SpecialityConst::WEIGHT_NORM;
static $selectWeight = 0;
static $type = [];
}
hwe/sammo/ActionSpecialDomestic/che_인덕.php
+1 -1
View File
@@ -4,7 +4,7 @@ use \sammo\iAction;
use \sammo\General;
use \sammo\SpecialityConst;
class che_통찰 implements iAction{
class che_인덕 implements iAction{
use \sammo\DefaultAction;
static $id = 20;
hwe/sammo/ActionSpecialWar/che_반계.php
+1 -1
View File
@@ -4,7 +4,7 @@ use \sammo\iAction;
use \sammo\General;
use \sammo\SpecialityConst;
class che_신중 implements iAction{
class che_반계 implements iAction{
use \sammo\DefaultAction;
static $id = 45;
hwe/sammo/ActionSpecialWar/che_의술.php
+4 -2
View File
@@ -1,9 +1,11 @@
<?php
namespace sammo\ActionSpecialWar;
use \sammo\iAction;
use sammo\BaseGeneralTrigger;
use sammo\SpecialityConst;
use sammo\GeneralTriggerCaller;
use sammo\GeneralTrigger;
use \sammo\General;
use \sammo\GeneralTrigger;
use \sammo\GeneralTriggerCaller;
class che_의술 implements iAction{
use \sammo\DefaultAction;
hwe/sammo/General.php
+7 -2
View File
@@ -422,6 +422,11 @@ class General implements iAction{
return $value;
}
public function onCalcStat(General $general, string $stat, $value){
//xxx: $general?
return $value;
}
public function onCalcStrategic(string $turnType, string $varType, $value){
foreach(array_merge([
$this->nationType,
@@ -477,7 +482,7 @@ class General implements iAction{
}
return [$att, $def];
}
public function getBattleInitSkillTriggerList(WarUnit $unit):array{
public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
$caller = new WarUnitTriggerCaller();
foreach(array_merge([
$this->nationType,
@@ -498,7 +503,7 @@ class General implements iAction{
}
return $caller;
}
public function getBattlePhaseSkillTriggerList(WarUnit $unit):array{
public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
$caller = new WarUnitTriggerCaller();
foreach(array_merge([
$this->nationType,
hwe/sammo/ResetHelper.php
+2 -1
View File
@@ -161,7 +161,8 @@ class ResetHelper{
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
$db->insert('plock', [
'plock'=>1
'plock'=>1,
'locktime'=>TimeUtil::now(true)
]);
CityConst::build();
hwe/sammo/Scenario/NPC.php
+3 -9
View File
@@ -112,7 +112,7 @@ class NPC{
$this->charDomestic = SpecialityConst::pickSpecialDomestic($general);
}
}
else if($char !== null){
else if($char === null){
}
else{
//TODO: 내특, 전특 구분 필요
@@ -121,9 +121,9 @@ class NPC{
$domesticClass = \sammo\getGeneralSpecialDomesticClass($char);
$this->charDomestic = Util::getClassName($domesticClass);
}
catch (Exception $e) {
catch (\Exception $e) {
$warClass = \sammo\getGeneralSpecialWarClass($char);
$this->charWar = Util::getClassName($domesticClass);
$this->charWar = Util::getClassName($warClass);
}
}
}
@@ -230,12 +230,6 @@ class NPC{
if($duplicateCnt > 1){
$name = "{$name}($duplicateCnt}";
}
$this->realName = $name;
$query = "select no from general where name like '{$name}%'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$count++;
$this->realName = $name;