-
-
-
+
+
|
diff --git a/hwe/j_get_reserved_command.php b/hwe/j_get_reserved_command.php
index bc8cc5ae..d966088a 100644
--- a/hwe/j_get_reserved_command.php
+++ b/hwe/j_get_reserved_command.php
@@ -9,15 +9,38 @@ $session = Session::requireGameLogin([])->setReadOnly();
$db = DB::db();
$commandList = [];
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
$generalID = $session->generalID;
-$rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC');
-foreach($rawTurn as [$turn_idx, $action, $arg]){
+$rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
+foreach($rawTurn as [$turn_idx, $action, $arg, $brief]){
$commandList[$turn_idx] = [
'action'=>$action,
+ 'brief'=>$brief,
'arg'=>Json::decode($arg)
];
}
-Json::die($commandList);
\ No newline at end of file
+[$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
+
+$turnTime = $db->queryFirstField('SELECT turntime FROM general WHERE no=%i', $generalID);
+
+if(cutTurn($turnTime, $turnTerm) > cutTurn($lastExecute, $turnTerm)){
+ //이미 이번달에 실행된 턴이다.
+ $month++;
+ if($month >= 13){
+ $month -= 12;
+ $year += 1;
+ }
+}
+
+
+Json::die([
+ 'result'=>true,
+ 'turnTime'=>$turnTime,
+ 'turnTerm'=>$turnTerm,
+ 'year'=>$year,
+ 'month'=>$month,
+ 'date'=>TimeUtil::now(true),
+ 'turn'=>$commandList
+]);
\ No newline at end of file
diff --git a/hwe/join_post.php b/hwe/join_post.php
index fcab5c3e..c7e05b83 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -262,6 +262,7 @@ foreach(range(0, GameConst::$maxTurn - 1) as $turnIdx){
'turn_idx'=>$turnIdx,
'action'=>'휴식',
'arg'=>null,
+ 'brief'=>'휴식'
];
}
$db->insert('general_turn', $turnRows);
diff --git a/hwe/js/main.js b/hwe/js/main.js
index 88e6cdc9..c97d9544 100644
--- a/hwe/js/main.js
+++ b/hwe/js/main.js
@@ -1,7 +1,73 @@
jQuery(function($){
- $('#do_refresh').click(function(){
- document.location.reload();
- return false;
+$('#do_refresh').click(function(){
+ document.location.reload();
+ return false;
+});
+
+
+function reloadCommandList(){
+ $.get({
+ url:'j_get_reserved_command.php',
+ dataType:'json',
+ cache: false,
+ }).then(function(data){
+ if(!data){
+ return;
+ }
+ if(!data.result){
+ return;
+ }
+ var game_clock = moment(data.date);
+ var now_clock = moment();
+ var $clock = $('#clock');
+ $clock.data('time-diff', game_clock.diff(now_clock));
+ $clock.val(game_clock.format('YYYY-MM-DD HH:mm:ss'));
+
+ var turnTime = moment(data.turnTime);
+ var nextTurnTime = turnTime.clone();
+
+ var year = data.year;
+ var month = data.month;
+
+ $.each(data.turn, function(turnIdx, turnInfo){
+ var $tr = $('#command_{0}'.format(turnIdx));
+
+ $tr.find('.time_pad').text(nextTurnTime.format('HH:mm'));
+ $tr.find('.month_pad').text('{0}年 {1}月'.format(year, month));
+ $tr.find('.turn_pad').text(turnInfo.brief);
+ nextTurnTime.add(data.turnTerm, 'minutes');
+ month+=1;
+ if(month >= 13){
+ year += 1;
+ month -= 12;
+ }
+ });
+ console.log(data);
});
+}
+
+function myclock() {
+
+ var $clock = $('#clock');
+ var now_clock = moment();
+
+ if($clock.data('time-diff') == null){
+ return;
+ }
+
+ /*
+ if(!$clock.attr('data-time-diff')){
+ var base_clock = moment($clock.attr('data-server-time'));
+ $clock.attr('data-time-diff', base_clock.diff(now_clock));
+ }
+ */
+
+ var game_clock = now_clock.add(parseInt($clock.data('time-diff')), 'milliseconds');
+
+ $('#clock').val(game_clock.format('YYYY-MM-DD HH:mm:ss'));
+}
+
+setInterval(myclock, 500);
+reloadCommandList();
});
\ No newline at end of file
diff --git a/hwe/sammo/Command/BaseCommand.php b/hwe/sammo/Command/BaseCommand.php
index ed656f60..66bad84b 100644
--- a/hwe/sammo/Command/BaseCommand.php
+++ b/hwe/sammo/Command/BaseCommand.php
@@ -215,6 +215,10 @@ abstract class BaseCommand{
return static::getName();
}
+ public function getRawClassName():string{
+ return static::class;
+ }
+
public function getCompensationStyle():?int{
//1 : Positive
//0 : Neutral
diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php
index dd2212da..cd69a699 100644
--- a/hwe/sammo/Command/General/che_거병.php
+++ b/hwe/sammo/Command/General/che_거병.php
@@ -139,6 +139,7 @@ class che_거병 extends Command\GeneralCommand{
'turn_idx'=>$turnIdx,
'action'=>'휴식',
'arg'=>null,
+ 'brief'=>'휴식',
];
}
diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index c588d8ae..7e19f9fb 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -1177,7 +1177,8 @@ class GeneralAI{
//NOTE: 부대 편성에 보여야 하므로 이것만 DB에 직접 접근함.
$db->update('general_turn', [
'action'=>'che_집합',
- 'arg'=>'{}'
+ 'arg'=>'{}',
+ 'brief'=>'집합'
], 'general_ID=%i AND turn_idx < 6', $general->getID());
}
@@ -1402,6 +1403,7 @@ class GeneralAI{
$sumLeadershipInCity = $db->queryFirstField('SELECT sum(leadership) FROM general WHERE nation = %i AND city = %i AND leadership > 40', $nationID, $cityID);
if(
+ $sumLeadershipInCity > 0 &&
$city['pop'] > 30000 + $general->getLeadership(false) * 100 * 1.3 &&
Util::randBool(($city['pop'] - 30000) / $sumLeadershipInCity * 100)
){
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index 588b22e6..845522ff 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -278,6 +278,7 @@ class ResetHelper{
'turn_idx'=>$turnIdx,
'action'=>'휴식',
'arg'=>null,
+ 'brief'=>'휴식'
];
}
$db->insert('general_turn', $turnRows);
diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 819afe73..6fdd3a2b 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -346,6 +346,7 @@ class NPC{
'turn_idx'=>$turnIdx,
'action'=>'휴식',
'arg'=>null,
+ 'brief'=>'휴식',
];
}
$db->insert('general_turn', $turnRows);
diff --git a/hwe/sammo/Scenario/Nation.php b/hwe/sammo/Scenario/Nation.php
index ae3e0767..9e3ce105 100644
--- a/hwe/sammo/Scenario/Nation.php
+++ b/hwe/sammo/Scenario/Nation.php
@@ -158,6 +158,7 @@ class Nation{
'turn_idx'=>$turnIdx,
'action'=>'휴식',
'arg'=>'{}',
+ 'brief'=>'휴식',
];
}
}
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index cae95be5..53b8fc07 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -144,6 +144,7 @@ CREATE TABLE `general_turn` (
`turn_idx` INT(4) NOT NULL,
`action` VARCHAR(16) NOT NULL,
`arg` TEXT NULL DEFAULT NULL,
+ `brief` TEXT NULL DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE INDEX `general_id` (`general_id`, `turn_idx`),
INDEX `action` (`action`, `turn_idx`, `general_id`)
@@ -204,6 +205,7 @@ CREATE TABLE `nation_turn` (
`turn_idx` INT(4) NOT NULL,
`action` VARCHAR(16) NOT NULL,
`arg` TEXT NULL DEFAULT NULL,
+ `brief` TEXT NULL DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE INDEX `nation` (`nation_id`, `level`, `turn_idx`),
INDEX `action` (`action`, `turn_idx`, `nation_id`, `level`)