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

wip: 버그 수정중

Browse Source
This commit is contained in:
Hide_D
2023-08-01 16:28:27 +00:00
parent d72c3e4c41
commit e960446638
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_currentCity.php
+1 -2
View File
@@ -327,8 +327,7 @@ $templates = new \League\Plates\Engine('templates');
if ($ourGeneral && !$isNPC) { if ($ourGeneral && !$isNPC) {
$turnText = []; $turnText = [];
$generalObj = new General($general, null, null, null, null, null, null, false); foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
$turnIdx = $turnRawIdx + 1; $turnIdx = $turnRawIdx + 1;
$turnText[] = "{$turnIdx} : $turn"; $turnText[] = "{$turnIdx} : $turn";
} }
hwe/sammo/General.php
+8 -8
View File
@@ -15,14 +15,14 @@ class General extends GeneralLite implements iAction
protected $rawCity = null; protected $rawCity = null;
/** @var Map<RankColumn,int|float> */ /** @var Map<RankColumn,int> */
protected Map $rankVarRead; protected Map $rankVarRead;
/** @var Map<RankColumn,int|float> */ /** @var Map<RankColumn,int> */
protected Map $rankVarIncrease; protected Map $rankVarIncrease;
/** @var Map<RankColumn,int|float> */ /** @var Map<RankColumn,int> */
protected Map $rankVarSet; protected Map $rankVarSet;
/** @var Map<GeneralAccessLogColumn,int|float> */ /** @var Map<GeneralAccessLogColumn,int|float|string> */
protected ?Map $accessLogRead; protected ?Map $accessLogRead;
/** @var \sammo\ActionLogger */ /** @var \sammo\ActionLogger */
@@ -59,8 +59,8 @@ class General extends GeneralLite implements iAction
* @param null|Map<RankColumn,int|float> $rawRank * @param null|Map<RankColumn,int|float> $rawRank
* @param null|Map<GeneralAccessLogColumn,int> $rawAccessLog * @param null|Map<GeneralAccessLogColumn,int> $rawAccessLog
* @param null|array $city DB city 테이블의 row값 * @param null|array $city DB city 테이블의 row값
* @param int|null $year 게임 연도 * @param int $year 게임 연도
* @param int|null $month 게임 월 * @param int $month 게임 월
*/ */
public function __construct(array $raw, ?Map $rawRank, ?Map $rawAccessLog, ?array $city, ?array $nation, int $year, int $month) public function __construct(array $raw, ?Map $rawRank, ?Map $rawAccessLog, ?array $city, ?array $nation, int $year, int $month)
{ {
@@ -931,7 +931,7 @@ class General extends GeneralLite implements iAction
} }
if($queryMode < GeneralQueryMode::Full){ if($queryMode < GeneralQueryMode::Full){
throw new \InvalidArgumentException('충분하지 않은 queryMode:' . $queryMode); throw new \InvalidArgumentException('충분하지 않은 queryMode:' . $queryMode->name);
} }
$db = DB::db(); $db = DB::db();
@@ -1013,7 +1013,7 @@ class General extends GeneralLite implements iAction
static public function createGeneralObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self static public function createGeneralObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self
{ {
if($queryMode < GeneralQueryMode::Full){ if($queryMode < GeneralQueryMode::Full){
throw new \InvalidArgumentException('충분하지 않은 queryMode:' . $queryMode); throw new \InvalidArgumentException('충분하지 않은 queryMode:' . $queryMode->name);
} }
$db = DB::db(); $db = DB::db();
hwe/sammo/GeneralLite.php
+3 -3
View File
@@ -274,7 +274,7 @@ class GeneralLite
* @param ?int[] $generalIDList * @param ?int[] $generalIDList
* @param null|array<string|RankColumn> $column * @param null|array<string|RankColumn> $column
* @param GeneralQueryMode $queryMode * @param GeneralQueryMode $queryMode
* @return \sammo\Generalite[] * @return \sammo\GeneralLite[]
* @throws MustNotBeReachedException * @throws MustNotBeReachedException
*/ */
static public function createGeneralLiteObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::FullWithoutIAction): array static public function createGeneralLiteObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::FullWithoutIAction): array
@@ -284,7 +284,7 @@ class GeneralLite
} }
if($queryMode > GeneralQueryMode::FullWithoutIAction){ if($queryMode > GeneralQueryMode::FullWithoutIAction){
throw new \InvalidArgumentException('지원하지 않는 queryMode:' . $queryMode); throw new \InvalidArgumentException('지원하지 않는 queryMode:' . $queryMode->name);
} }
$db = DB::db(); $db = DB::db();
@@ -371,7 +371,7 @@ class GeneralLite
static public function createGeneralLiteObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::FullWithoutIAction): self static public function createGeneralLiteObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::FullWithoutIAction): self
{ {
if($queryMode > GeneralQueryMode::FullWithoutIAction){ if($queryMode > GeneralQueryMode::FullWithoutIAction){
throw new \InvalidArgumentException('지원하지 않는 queryMode:' . $queryMode); throw new \InvalidArgumentException('지원하지 않는 queryMode:' . $queryMode->name);
} }
$db = DB::db(); $db = DB::db();