-
npcmode!=0)?>
+
npcmode==1)?>
| 삼국지 모의전투 HiDCHe 기 () |
@@ -341,7 +343,7 @@ else if($session->userGrade == 4){
내용 없이 '서신전달&갱신'을 누르면 메세지창이 갱신됩니다.
-npcmode!=0)?>
+npcmode==1)?>
@@ -361,7 +363,7 @@ else if($session->userGrade == 4){
npcmode!=0)?>
+npcmode==1)?>
userGrade < 5 && !$allowReset){
+
+
diff --git a/hwe/j_autoreset.php b/hwe/j_autoreset.php
index 63fede2c..000f1588 100644
--- a/hwe/j_autoreset.php
+++ b/hwe/j_autoreset.php
@@ -85,6 +85,7 @@ $result = ResetHelper::buildScenario(
$options['scenario'],
$options['fiction'],
$options['extend'],
+ $options['block_general_create'],
$options['npcmode'],
$options['show_img_level'],
$options['tournament_trig'],
diff --git a/hwe/j_get_select_npc_token.php b/hwe/j_get_select_npc_token.php
index 4a8ceced..03c6398c 100644
--- a/hwe/j_get_select_npc_token.php
+++ b/hwe/j_get_select_npc_token.php
@@ -37,7 +37,7 @@ list(
$npcmode
) = $gameStor->getValuesAsArray(['maxgeneral', 'turnterm', 'npcmode']);
-if(!$npcmode){
+if($npcmode!=1){
Json::die([
'result'=>false,
'reason'=>'빙의 가능한 서버가 아닙니다'
diff --git a/hwe/j_get_select_pool.php b/hwe/j_get_select_pool.php
new file mode 100644
index 00000000..c57d15e7
--- /dev/null
+++ b/hwe/j_get_select_pool.php
@@ -0,0 +1,90 @@
+array_sum($rhs['dex']);
+ });
+}
+
+function putInfoText(&$info){
+ if(key_exists('specialDomestic', $info)){
+ $class = buildGeneralSpecialDomesticClass($info['specialDomestic']);
+ $info['specialDomesticName'] = $class->getName();
+ $info['specialDomesticInfo'] = $class->getInfo();
+ }
+
+ if(key_exists('specialWar', $info)){
+ $class = buildGeneralSpecialDomesticClass($info['specialWar']);
+ $info['specialWarName'] = $class->getName();
+ $info['specialWarInfo'] = $class->getInfo();
+ }
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$oNow = new \DateTimeImmutable();
+
+$now = $oNow->format('Y-m-d H:i:s');
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$npcmode = $gameStor->getValue('npcmode');
+if($npcmode!=2){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'선택 가능한 서버가 아닙니다'
+ ]);
+}
+
+$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
+if($rawGeneral){
+ $generalAux = Json::decode($rawGeneral['aux']);
+ if(key_exists('next_change', $generalAux)&& $generalAux['next_change'] > $now){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'아직 다시 고를 수 없습니다'
+ ]);
+ }
+}
+
+$tokens = $db->query('SELECT unique_name, reserved_until, info FROM `select_pool` WHERE `owner`=%i AND `reserved_until`>=%s', $userID, $now);
+
+if($tokens){
+ $pick = [];
+ $valid_until = null;
+ $specialInfo = [];
+ foreach($tokens as $token){
+ $valid_until = $token['reserved_until'];
+ $info = Json::decode($token['info']);
+ putInfoText($info);
+ $info['uniqueName'] = $token['unique_name'];
+ $pick[] = $info;
+ }
+ sortTokens($pick);//좀 무식하지만..
+ Json::die([
+ 'result'=>true,
+ 'pick'=>$pick,
+ 'validUntil'=>$valid_until
+ ]);
+}
+
+$pick = [];
+$valid_until = null;
+foreach(pickGeneralFromPool($db, $userID, 5) as $pickObj){
+ $valid_until = $pickObj->getValidUntil();
+ $info = $pickObj->getInfo();
+ putInfoText($info);
+ $pick[] = $info;
+}
+sortTokens($pick);//좀 무식하지만..
+Json::die([
+ 'result'=>true,
+ 'pick'=>$pick,
+ 'validUntil'=>$valid_until
+]);
\ No newline at end of file
diff --git a/hwe/j_install.php b/hwe/j_install.php
index e69aaaaf..4a7c1317 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -57,6 +57,7 @@ $v->rule('required', [
'scenario',
'fiction',
'extend',
+ 'block_general_create',
'join_mode',
'npcmode',
'show_img_level',
@@ -67,6 +68,7 @@ $v->rule('required', [
'scenario',
'fiction',
'extend',
+ 'block_general_create',
'npcmode',
'show_img_level',
'tournament_trig',
@@ -109,11 +111,13 @@ $scenario = (int)$_POST['scenario'];
$fiction = (int)$_POST['fiction'];
$extend = (int)$_POST['extend'];
$npcmode = (int)$_POST['npcmode'];
+$block_general_create = (bool)$_POST['block_general_create'];
$show_img_level = (int)$_POST['show_img_level'];
$tournament_trig = (int)$_POST['tournament_trig'];
$join_mode = $_POST['join_mode'];
$autorun_user_minutes = (int)$_POST['autorun_user_minutes'];
$autorun_user_options = [];
+
foreach(Util::getPost('autorun_user', 'array_string', []) as $autorun_option){
$autorun_user_options[$autorun_option] = 1;
}
@@ -165,6 +169,7 @@ if($reserve_open){
'scenarioName'=>$scenarioObj->getTitle(),
'fiction'=>$fiction,
'extend'=>$extend,
+ 'block_general_create'=>$block_general_create,
'npcmode'=>$npcmode,
'show_img_level'=>$show_img_level,
'tournament_trig'=>$tournament_trig,
@@ -200,6 +205,7 @@ Json::die(ResetHelper::buildScenario(
$scenario,
$fiction,
$extend,
+ $block_general_create,
$npcmode,
$show_img_level,
$tournament_trig,
diff --git a/hwe/j_select_npc.php b/hwe/j_select_npc.php
index a1c44b63..d8a2f176 100644
--- a/hwe/j_select_npc.php
+++ b/hwe/j_select_npc.php
@@ -59,7 +59,7 @@ list(
$npcmode
) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
-if(!$npcmode){
+if($npcmode!=1){
Json::die([
'result'=>false,
'reason'=>'빙의 가능한 서버가 아닙니다'
diff --git a/hwe/j_select_picked_general.php b/hwe/j_select_picked_general.php
new file mode 100644
index 00000000..cfa864a4
--- /dev/null
+++ b/hwe/j_select_picked_general.php
@@ -0,0 +1,167 @@
+false,
+ 'reason'=>'장수를 선택하지 않았습니다'
+ ]);
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$rootDB = RootDB::db();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');
+
+$hasGeneralID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
+if($hasGeneralID){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'이미 장수를 생성했습니다.'
+ ]);
+}
+
+$env = $gameStor->getValues(['startyear', 'year', 'month', 'maxgeneral', 'npcmode', 'show_img_level', 'icon_path', 'turnterm', 'turntime']);
+$env['fiction'] = false;
+
+$npcmode = $env['npcmode'];
+$maxgeneral = $env['maxgeneral'];
+
+if($npcmode!=2){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'선택 가능한 서버가 아닙니다'
+ ]);
+}
+
+$selectInfo = $db->queryFirstField('SELECT info FROM select_pool WHERE `owner` = %i AND `reserved_until`>=%s AND `unique_name`=%s', $userID, $now, $pick);
+if(!$selectInfo){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'유효한 장수 목록이 없습니다.'
+ ]);
+}
+$selectInfo = Json::decode($selectInfo);
+
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+if(!$ownerInfo){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'멤버 정보를 가져오지 못했습니다.'
+ ]);
+}
+
+
+$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
+
+if ($gencount >= $maxgeneral) {
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'더 이상 등록 할 수 없습니다.'
+ ]);
+}
+
+$poolClass = getGeneralPoolClass(GameConst::$targetGeneralPool);
+/** @var AbsGeneralPool */
+$pickedGeneral = new $poolClass($db, $selectInfo, $now);
+
+$builder = $pickedGeneral->getGeneralBuilder();
+
+foreach(GameConst::$generalPoolAllowOption as $allowOption){
+ if($allowOption == 'stat'){
+ $leadership = Util::valueFit($leadership, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+ $strength = Util::valueFit($strength, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+ $intel = Util::valueFit($intel, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+
+ if($leadership + $strength + $intel > GameConst::$defaultStatTotal){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'스탯의 총 합이 올바르지 않습니다.'
+ ]);
+ }
+ $builder->setStat($leadership, $strength, $intel);
+ }
+ else if($allowOption == 'picture' && $use_own_picture){
+ $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
+ }
+ else if($allowOption == 'ego'){
+ if(!$personal || $personal == 'Random'){
+ $personal = Util::choiceRandom(GameConst::$availablePersonality);
+ }
+ if(!array_search($personal, GameConst::$availablePersonality)){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'올바르지 않은 성격입니다.'
+ ]);
+ }
+ $builder->setEgo($personal);
+ }
+}
+
+$builder->setOwner($userID);
+$builder->setKillturn(5);
+$builder->setNPCType(0);
+$builder->setAuxVar('next_change', TimeUtil::nowAddDays(1));
+$builder->fillRemainSpecAsZero($env);
+$builder->build($env);
+$generalID = $builder->getGeneralID();
+if(!$generalID){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'장수 등록에 실패했습니다.'
+ ]);
+}
+$pickedGeneral->occupyGeneralName();
+
+$db->update('select_pool',[
+ 'owner'=>null,
+ 'reserved_until'=>null,
+], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
+
+$userNick = $ownerInfo['name'];
+$josaYi = JosaUtil::pick($userNick, '이');
+$generalName = $builder->getGeneralName();
+$josaRo = JosaUtil::pick($generalName, '로');
+
+$cityName = CityConst::byID($builder->getCityID())->name;
+
+$logger = new ActionLogger($generalID, 0, $env['year'], $env['month']);
+$logger->pushGeneralHistoryLog("{$generalName}, {$cityName}에서 등장");
+$logger->pushGlobalActionLog("{$cityName}에서 {$userNick}{$josaYi} {$generalName}{$josaRo} 등장합니다.");
+$logger->flush();
+
+pushAdminLog(["가입 : {$userID} // {$session->userName} // {$pick} // ".getenv("REMOTE_ADDR")]);
+
+$rootDB->insert('member_log', [
+ 'member_no' => $userID,
+ 'date'=>TimeUtil::now(),
+ 'action_type'=>'make_general',
+ 'action'=>Json::encode([
+ 'server'=>DB::prefix(),
+ 'type'=>'select',
+ 'generalID'=>$generalID,
+ 'generalName'=>$generalName
+ ])
+]);
+
+Json::die([
+ 'result'=>true,
+ 'reason'=>'success'
+]);
\ No newline at end of file
diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 7e04d937..334d8f67 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -91,7 +91,8 @@ if(file_exists(__DIR__.'/.htaccess')){
'scenarioName'=>$options['scenarioName'],
'turnterm'=>$options['turnterm'],
'fictionMode'=>($options['fiction']?'가상':'사실'),
- 'npcMode'=>($options['npcmode']?'가능':'불가'),
+ 'block_general_create'=>(!!$options['block_general_create']),
+ 'npcMode'=>([0=>'불가',1=>'가능',2=>'선택 생성'][$options['npcmode']]),
'openDatetime'=>$reserved['date'],
'starttime'=>$options['starttime'],
'gameConf'=>$options['gameConf'],
@@ -104,7 +105,7 @@ if(file_exists(__DIR__.'/.htaccess')){
//TODO: 천통시에도 예약 오픈 알림이 필요..?
-$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'autorun_user']);
+$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'block_general_create', 'autorun_user']);
$admin['maxUserCnt'] = $admin['maxgeneral'];
$admin['npcMode'] = $admin['npcmode'];
$admin['turnTerm'] = $admin['turnterm'];
@@ -124,8 +125,8 @@ $admin['scenario'] = $admin['scenario_text'];
$admin['userCnt'] = $genCnt;
$admin['npcCnt'] = $npcCnt;
$admin['nationCnt'] = $nationCnt;
-
-$admin['npcMode'] = $admin['npcMode']?'가능':'불가';
+$admin['block_general_create'] = !!$admin['block_general_create'];
+$admin['npcMode'] = [0=>'불가',1=>'가능',2=>'선택 생성'][$admin['npcMode']];
$admin['fictionMode'] = $admin['fiction']?'가상':'사실';
$otherTextInfo = [];
diff --git a/hwe/j_update_picked_general.php b/hwe/j_update_picked_general.php
new file mode 100644
index 00000000..0df07f1c
--- /dev/null
+++ b/hwe/j_update_picked_general.php
@@ -0,0 +1,149 @@
+false,
+ 'reason'=>'장수를 선택하지 않았습니다'
+ ]);
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$rootDB = RootDB::db();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');
+
+$generalID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
+if(!$generalID){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'장수가 생성하지 않았습니다. 이미 사망하지 않았는지 확인해보세요.'
+ ]);
+}
+
+list(
+ $year,
+ $month,
+ $maxgeneral,
+ $npcmode
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
+
+if($npcmode!=2){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'선택 가능한 서버가 아닙니다'
+ ]);
+}
+
+$info = $db->queryFirstField('SELECT info FROM select_pool WHERE `owner` = %i AND `reserved_until`>=%s AND `unique_name`=%s', $userID, $now, $pick);
+if(!$info){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'유효한 장수 목록이 없습니다.'
+ ]);
+}
+
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+if(!$ownerInfo){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'멤버 정보를 가져오지 못했습니다.'
+ ]);
+}
+
+$info = Json::decode($info);
+
+
+$generalObj = General::createGeneralObjFromDB($generalID);
+$oldGeneralName = $generalObj->getName();
+$db->update('select_pool', [
+ 'general_id'=>-$generalID,
+ 'owner'=>null,
+ 'reserved_until'=>null
+], 'unique_name=%s AND `reserved_until` IS NOT NULL AND owner = %i', $info['uniqueName'], $userID);
+
+if($db->affectedRows()==0){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'동시성 제어에 문제가 발생했습니다. 버그 제보를 부탁드립니다.'
+ ]);
+}
+
+$db->update('select_pool', [
+ 'general_id'=>null,
+ 'owner'=>null,
+ 'reserved_until'=>null,
+], 'unique_name != %s AND general_id = %i', $info['uniqueName'], $generalID);
+
+$db->update('select_pool', [
+ 'general_id'=>$generalID,
+], 'general_id=%i', -$generalID);
+if($db->affectedRows()==0){
+ Json::die([
+ 'result'=>false,
+ 'reason'=>'장수 선택 과정에 문제가 발생했습니다.. 버그 제보를 부탁드립니다.'
+ ]);
+}
+$db->update('select_pool',[
+ 'owner'=>null,
+ 'reserved_until'=>null,
+], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
+
+if(key_exists('leadership', $info)){
+ $generalObj->updateVar('leadership', $info['leadership']);
+ $generalObj->updateVar('strength', $info['strength']);
+ $generalObj->updateVar('intel', $info['intel']);
+}
+if(key_exists('picture', $info)){
+ $generalObj->updateVar('imgsvr', $info['imgsvr']);
+ $generalObj->updateVar('picture', $info['picture']);
+}
+if(key_exists('generalName', $info)){
+ $generalObj->updateVar('name', $info['generalName']);
+}
+if(key_exists('dex', $info)){
+ $generalObj->updateVar('dex1', $info['dex'][0]);
+ $generalObj->updateVar('dex2', $info['dex'][1]);
+ $generalObj->updateVar('dex3', $info['dex'][2]);
+ $generalObj->updateVar('dex4', $info['dex'][3]);
+ $generalObj->updateVar('dex5', $info['dex'][4]);
+}
+if(key_exists('ego', $info)){
+ $generalObj->updateVar('personal', $info['ego']);
+}
+if(key_exists('specialDomestic', $info)){
+ $generalObj->updateVar('special', $info['specialDomestic']);
+}
+if(key_exists('specialWar', $info)){
+ $generalObj->updateVar('special2', $info['specialWar']);
+}
+$generalObj->setAuxVar('next_change', TimeUtil::nowAddDays(1));
+
+$userNick = $ownerInfo['name'];
+$josaYi = JosaUtil::pick($userNick, '이');
+
+$generalName = $info['generalName'];
+$josaRo = JosaUtil::pick($generalName, '로');
+
+
+$logger = $generalObj->getLogger();
+$logger->pushGeneralHistoryLog("장수를 {$oldGeneralName}에서 {$generalName}{$josaRo} 변경");
+$logger->pushGlobalActionLog("{$userNick}{$josaYi} 장수를 {$oldGeneralName}에서 {$generalName}{$josaRo} 변경합니다.");
+$generalObj->applyDB($db);
+
+
+Json::die([
+ 'result'=>true,
+ 'reason'=>'success'
+]);
\ No newline at end of file
diff --git a/hwe/join.php b/hwe/join.php
index 5189c265..5273ac80 100644
--- a/hwe/join.php
+++ b/hwe/join.php
@@ -24,7 +24,12 @@ if (!$member) {
$db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env');
-
+$admin = $gameStor->getValues(['block_general_create','show_img_level','maxgeneral']);
+if($admin['block_general_create']){
+ MessageBox("잘못된 접근입니다!!!");
+ echo "";
+ exit(1);
+}
?>
@@ -66,7 +71,6 @@ echo Json::encode((object)$charInfoText);
|
getValues(['show_img_level','maxgeneral']);
$gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
diff --git a/hwe/js/common.js b/hwe/js/common.js
index 8665bb3b..e66a5b94 100644
--- a/hwe/js/common.js
+++ b/hwe/js/common.js
@@ -372,4 +372,46 @@ function getNpcColor(npcType) {
return 'skyblue';
}
return null;
+}
+
+function initTooltip($obj) {
+ if ($obj === undefined) {
+ $obj = $('.obj_tooltip');
+ } else if (!$obj.hasClass('obj_tooltip')) {
+ $obj = $obj.find('.obj_tooltip');
+ }
+ console.log($obj);
+
+ $obj.each(function() {
+ $target = $(this);
+
+ if ($target.data('installHandler')) {
+ return true;
+ }
+ $target.data('installHandler', true);
+
+ $target.mouseover(function() {
+ var $objTooltip = $(this);
+ if ($objTooltip.data('setObjTooltip')) {
+ return true;
+ }
+
+ var tooltipClassText = $objTooltip.data('tooltip-class');
+ if (!tooltipClassText) {
+ tooltipClassText = '';
+ }
+ var template = '
'
+ .format(tooltipClassText);
+
+ $objTooltip.tooltip({
+ title: function() {
+ return $.trim($(this).find('.tooltiptext').html());
+ },
+ template: template,
+ html: true
+ }).tooltip('show');
+
+ $objTooltip.data('setObjTooltip', true);
+ });
+ });
}
\ No newline at end of file
diff --git a/hwe/js/install.js b/hwe/js/install.js
index 762017b7..293b7bd5 100644
--- a/hwe/js/install.js
+++ b/hwe/js/install.js
@@ -1,4 +1,3 @@
-
/*
function showCityGeneral(cityIdx){
@@ -21,13 +20,13 @@ function loadScenarioPreview(scenarioIdx){
-function loadScenarios(){
+function loadScenarios() {
$.ajax({
- method:'post',
- url:'j_load_scenarios.php',
- dataType:'json'
- }).then(function(result){
- if(!result.result){
+ method: 'post',
+ url: 'j_load_scenarios.php',
+ dataType: 'json'
+ }).then(function(result) {
+ if (!result.result) {
var deferred = $.Deferred();
deferred.reject('fail');
return deferred.promise();
@@ -37,18 +36,18 @@ function loadScenarios(){
var list = {};
- $.each(result.scenario, function(idx, value){
+ $.each(result.scenario, function(idx, value) {
var title = value.title || "-";
var pat = /【(.*?)[0-9\-_\.a-zA-Z]*】/;
var category = pat.exec(title);
- category = category?category[1]:'-';
+ category = category ? category[1] : '-';
value.title = title;
value.category = category;
value.idx = idx;
value.year = value.year || 180;
- if(!(category in list)){
+ if (!(category in list)) {
list[category] = {};
}
@@ -56,12 +55,12 @@ function loadScenarios(){
});
var $select = $('#scenario_sel');
- $.each(list, function(category, items){
+ $.each(list, function(category, items) {
var $optgroup = $('