diff --git a/.gitignore b/.gitignore index 6725ff61..9f922228 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,9 @@ d_pic/*.png d_pic/*.webp d_pic/uploaded_image +*/dist_js/* +*/dist_css/* + d_setting/*.php */d_setting/*.php */d_setting/templates/*.php diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index 9e2efb34..757a152f 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -30,8 +30,8 @@ $templates = new \League\Plates\Engine(__DIR__.'/templates'); - - + + @@ -73,7 +73,7 @@ $types = [ } $v['nationName'] = '???'; $v['pictureFullPath'] = GetImageURL(0)."/default.jpg"; - $v['name'] = '???'; + $v['name'] = '???'; $v['ownerName'] = null; $v['bgColor'] = GameConst::$basecolor4; $v['fgColor'] = newColor($v['bgColor']); @@ -122,9 +122,9 @@ $types = [ $v['value'] = 0; } else{ - $v['value'] = $v['ttw']/max(1, $totalCnt); + $v['value'] = $v['ttw']/max(1, $totalCnt); } - return $v; + return $v; }], ["통 솔 전 승 률", "percent", function($v){ $totalCnt = $v['tlw']+$v['tld']+$v['tll']; @@ -134,7 +134,7 @@ $types = [ else{ $v['value'] = $v['tlw']/max(1, $totalCnt); } - return $v; + return $v; }], ["일 기 토 승 률", "percent", function($v){ $totalCnt = $v['tsw']+$v['tsd']+$v['tsl']; @@ -154,7 +154,7 @@ $types = [ else{ $v['value'] = $v['tiw']/max(1, $totalCnt); } - + return $v; }], ["베 팅 투 자 액", "int", function($v){$v['value'] = $v['betgold']; return $v; }], @@ -173,17 +173,17 @@ $types = [ $generals = []; foreach($db->query( - "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr, + "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr, experience, dedication, - dex1, dex2, dex3, dex4, dex5, - horse, weapon, book, item + dex1, dex2, dex3, dex4, dex5, + horse, weapon, book, item FROM general WHERE %l", $btn == "NPC 보기"?"npc>=2":"npc<2") as $general ){ $generalID = $general['no']; $general['bgColor'] = $nationColor[$general['nation']]??GameConst::$basecolor4; $general['fgColor'] = newColor($general['bgColor']); $general['nationName'] = $nationName[$general['nation']]; - + if(key_exists('picture', $general)){ $imageTemp = GetImageURL($general['imgsvr']); $general['pictureFullPath'] = "$imageTemp/{$general['picture']}"; @@ -264,7 +264,7 @@ foreach($generals as $general){ else{ $itemOwners[$itemClassName] = [$general]; } - + } } @@ -279,7 +279,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){ continue; } $itemClass = buildItemClass($itemClassName); - + if($itemClass->isBuyable()){ continue; } @@ -287,7 +287,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){ $info = $itemClass->getInfo(); $name = $itemClass->getName(); - + if($info){ $name = $templates->render('tooltip', [ 'text'=>$name, @@ -322,7 +322,7 @@ foreach(GameConst::$allItems as $itemType=>$itemList){ $itemRanker[] = $card; } } - + echo $templates->render('hallOfFrame', [ 'typeName'=>$itemNameType, 'generals'=>$itemRanker @@ -336,4 +336,3 @@ foreach(GameConst::$allItems as $itemType=>$itemList){ - diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php index e2605728..1b196e21 100644 --- a/hwe/a_emperior.php +++ b/hwe/a_emperior.php @@ -17,8 +17,8 @@ increaseRefresh("왕조일람", 1); <?=UniqueConst::$serverName?>: 왕조일람 - - + + @@ -70,9 +70,9 @@ foreach($emperiors as $emperior){ - + - + diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 585e3450..f992468f 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -47,8 +47,8 @@ if($gameStor->isunited){ - - + + @@ -148,7 +148,7 @@ foreach($generalList as $general){ $intel = "{$general['intel']}"; } - + if ($general['npc'] >= 2) { $name = "{$general['name']}"; @@ -166,8 +166,8 @@ foreach($generalList as $general){ $imageTemp = GetImageURL($general['imgsvr']); echo " - - - + + @@ -63,14 +63,14 @@ else{ 시나리오 검색 : @@ -503,7 +503,7 @@ foreach($db->query('SELECT city,name,level,region,officer_set from city where na    - (년) 【name?>】 diff --git a/hwe/b_myCityInfo.php b/hwe/b_myCityInfo.php index d19e73ee..c6f67f91 100644 --- a/hwe/b_myCityInfo.php +++ b/hwe/b_myCityInfo.php @@ -40,8 +40,8 @@ $sel = [$type => "selected"]; - - + + @@ -129,10 +129,10 @@ foreach($cityList as $city){ ]; $cityOfficerList = $officerList[$cityID]??[]; - foreach($cityOfficerList as $cityOfficer){ + foreach($cityOfficerList as $cityOfficer){ $officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']); } - + if ($type == 10 && $city['region'] != $region) { echo "
"; $region = $city['region']; @@ -209,4 +209,3 @@ foreach($cityList as $city){ - diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php index 95e0729a..37bb6417 100644 --- a/hwe/b_myGenInfo.php +++ b/hwe/b_myGenInfo.php @@ -48,8 +48,8 @@ if($gameStor->isunited){ - - + + @@ -183,4 +183,3 @@ foreach($generalList as $general){ - diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php index 9d6e7f96..ba273c3c 100644 --- a/hwe/b_myKingdomInfo.php +++ b/hwe/b_myKingdomInfo.php @@ -28,8 +28,8 @@ if($nationID == 0) { <?=UniqueConst::$serverName?>: 세력정보 - - + + @@ -158,4 +158,3 @@ if ($budgetricediff > 0) { - diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 8e1a1fc6..31718416 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -52,9 +52,9 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn')??1; var availableDieImmediately = ; - - - + + + @@ -162,4 +162,3 @@ var availableDieImmediately = ; - diff --git a/hwe/b_npc_control.php b/hwe/b_npc_control.php index a48eb63f..421cfb71 100644 --- a/hwe/b_npc_control.php +++ b/hwe/b_npc_control.php @@ -128,10 +128,10 @@ $zeroPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['optio '내정워프': '도시에서 더이상 내정을 수행할 수 없는 경우,
일정확률로 내정이 부족한 다른 도시로 이동합니다.', }; - + - - + + diff --git a/hwe/b_processing.php b/hwe/b_processing.php index 2a9b6036..7c9e79cd 100644 --- a/hwe/b_processing.php +++ b/hwe/b_processing.php @@ -76,11 +76,11 @@ $cssList = $commandObj->getCSSFiles(); - - + + - + @@ -209,7 +209,6 @@ foreach ($troops as $troopNo=>$troop) { - + - diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php index 4ece98bd..c7aaadf0 100644 --- a/hwe/battle_simulator.php +++ b/hwe/battle_simulator.php @@ -50,13 +50,13 @@ else{ - + - +
diff --git a/hwe/css/inheritPoint.css b/hwe/css/inheritPoint.css deleted file mode 100644 index 58ad3c5d..00000000 --- a/hwe/css/inheritPoint.css +++ /dev/null @@ -1,3 +0,0 @@ -#inheritance_list{display:flex;flex-wrap:wrap}.inherit_padding{width:33%;padding:10px 2px}.inherit_item{width:33%;padding:10px 2px}.col-form-label{text-align:right;padding-right:2ch}.inherit_value{text-align:right} - -/*# sourceMappingURL=inheritPoint.css.map*/ \ No newline at end of file diff --git a/hwe/css/inheritPoint.css.map b/hwe/css/inheritPoint.css.map deleted file mode 100644 index 52cb62cb..00000000 --- a/hwe/css/inheritPoint.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"../css/inheritPoint.css","mappings":"AAAA,kBACI,aACA,eAGJ,iBACI,UACA,iBAGJ,cACI,UACA,iBAGJ,gBACI,iBACA,kBAGJ,eACI,iB","sources":["webpack://hidche_lib/./hwe/scss/inheritPoint.scss"],"sourcesContent":["#inheritance_list{\n display: flex;\n flex-wrap: wrap;\n}\n\n.inherit_padding{\n width: 33%;\n padding: 10px 2px;\n}\n\n.inherit_item{\n width: 33%;\n padding: 10px 2px;\n}\n\n.col-form-label{\n text-align:right;\n padding-right:2ch;\n}\n\n.inherit_value{\n text-align: right;\n}"],"names":[],"sourceRoot":""} \ No newline at end of file diff --git a/hwe/css/troop.css b/hwe/css/troop.css deleted file mode 100644 index c37359b3..00000000 --- a/hwe/css/troop.css +++ /dev/null @@ -1,3 +0,0 @@ -#troop_list .cityText{display:none}#troop_list .diffCity .cityText{display:inline}#troop_list .diffCity{color:red}#troop_list .leader{color:#90ee90}#troop_list .leader::before{content:"*"}#troop_list .leader::after{content:"*"} - -/*# sourceMappingURL=troop.css.map*/ \ No newline at end of file diff --git a/hwe/css/troop.css.map b/hwe/css/troop.css.map deleted file mode 100644 index 84174445..00000000 --- a/hwe/css/troop.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"../css/troop.css","mappings":"AAEA,sBACI,aAGJ,gCACI,eAGJ,sBACI,UAGJ,oBACI,cAGJ,4BACI,YAGJ,2BACI,Y","sources":["webpack://hidche_lib/./hwe/scss/troop.scss"],"sourcesContent":["@charset \"UTF-8\";\n\n#troop_list .cityText{\n display:none;\n}\n\n#troop_list .diffCity .cityText{\n display:inline;\n}\n\n#troop_list .diffCity {\n color:red;\n}\n\n#troop_list .leader{\n color:lightgreen;\n}\n\n#troop_list .leader::before{\n content:'*';\n}\n\n#troop_list .leader::after{\n content:'*';\n}"],"names":[],"sourceRoot":""} \ No newline at end of file diff --git a/hwe/index.php b/hwe/index.php index a70fa2a1..4609bb36 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -98,15 +98,15 @@ $serverCnt = $gameStor->server_cnt; - - + + - + - + - + diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php index 41f978b8..78ae55cd 100644 --- a/hwe/sammo/Command/General/che_강행.php +++ b/hwe/sammo/Command/General/che_강행.php @@ -169,7 +169,7 @@ class che_강행 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/General/che_건국.php b/hwe/sammo/Command/General/che_건국.php index 16c98b94..f482b27e 100644 --- a/hwe/sammo/Command/General/che_건국.php +++ b/hwe/sammo/Command/General/che_건국.php @@ -199,7 +199,7 @@ class che_건국 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/colorSelect.js' + 'dist_js/colorSelect.js' ]; } @@ -216,14 +216,14 @@ class che_건국 extends Command\GeneralCommand foreach(GetNationColors() as $color){ $colorUsed[$color] = 0; } - + foreach(getAllNationStaticInfo() as $nation){ if($nation['level'] <= 0){ continue; } $colorUsed[$nation['color']]++; } - + $colorUsedCnt = 0; foreach($colorUsed as $color=>$used){ if($used){ @@ -231,7 +231,7 @@ class che_건국 extends Command\GeneralCommand } $colorUsedCnt += 1; } - + //색깔이 다 쓰였으면 그냥 모두 허용 if($colorUsedCnt === count($colorUsed)){ foreach(array_keys($colorUsed) as $color){ diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php index 218b444e..f8f76c91 100644 --- a/hwe/sammo/Command/General/che_이동.php +++ b/hwe/sammo/Command/General/che_이동.php @@ -177,7 +177,7 @@ class che_이동 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php index 1e536802..152dafe1 100644 --- a/hwe/sammo/Command/General/che_징병.php +++ b/hwe/sammo/Command/General/che_징병.php @@ -234,7 +234,7 @@ class che_징병 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/recruitCrewForm.js' + 'dist_js/recruitCrewForm.js' ]; } diff --git a/hwe/sammo/Command/General/che_첩보.php b/hwe/sammo/Command/General/che_첩보.php index 8b709a29..6a78889b 100644 --- a/hwe/sammo/Command/General/che_첩보.php +++ b/hwe/sammo/Command/General/che_첩보.php @@ -225,7 +225,7 @@ class che_첩보 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php index 573f8f3e..5e19b67f 100644 --- a/hwe/sammo/Command/General/che_출병.php +++ b/hwe/sammo/Command/General/che_출병.php @@ -60,7 +60,7 @@ class che_출병 extends Command\GeneralCommand ConstraintHelper::ReqGeneralRice($reqRice), ]; - + } protected function initWithArg() @@ -199,7 +199,7 @@ class che_출병 extends Command\GeneralCommand else{ $logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. {$defenderCityName}{$josaRo} 이동합니다. <1>$date"); } - + $this->alternative = new che_이동($general, $this->env, ['destCityID' => $defenderCityID]); return false; } @@ -239,7 +239,7 @@ class che_출병 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php index 27050671..de136441 100644 --- a/hwe/sammo/Command/General/che_화계.php +++ b/hwe/sammo/Command/General/che_화계.php @@ -106,7 +106,7 @@ class che_화계 extends Command\GeneralCommand $general = $this->generalObj; $this->setCity(); - + [$reqGold, $reqRice] = $this->getCost(); @@ -118,7 +118,7 @@ class che_화계 extends Command\GeneralCommand ConstraintHelper::ReqGeneralRice($reqRice), ]; - + } protected function initWithArg() @@ -335,7 +335,7 @@ class che_화계 extends Command\GeneralCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_국기변경.php b/hwe/sammo/Command/Nation/che_국기변경.php index c3e66939..f9ae1445 100644 --- a/hwe/sammo/Command/Nation/che_국기변경.php +++ b/hwe/sammo/Command/Nation/che_국기변경.php @@ -82,7 +82,7 @@ class che_국기변경 extends Command\NationCommand public function getCost(): array { - + return [0, 0]; } @@ -154,7 +154,7 @@ class che_국기변경 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/colorSelect.js' + 'dist_js/colorSelect.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_국호변경.php b/hwe/sammo/Command/Nation/che_국호변경.php index b82906f7..52e8dfd0 100644 --- a/hwe/sammo/Command/Nation/che_국호변경.php +++ b/hwe/sammo/Command/Nation/che_국호변경.php @@ -81,7 +81,7 @@ class che_국호변경 extends Command\NationCommand public function getCost(): array { - + return [0, 0]; } @@ -129,7 +129,7 @@ class che_국호변경 extends Command\NationCommand return false; } - + $josaRo = JosaUtil::pick($newNationName, '로'); $general->addExperience(5 * ($this->getPreReqTurn() + 1)); @@ -160,7 +160,7 @@ class che_국호변경 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/colorSelect.js' + 'dist_js/colorSelect.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_급습.php b/hwe/sammo/Command/Nation/che_급습.php index f15f6161..50eb48e6 100644 --- a/hwe/sammo/Command/Nation/che_급습.php +++ b/hwe/sammo/Command/Nation/che_급습.php @@ -199,7 +199,7 @@ class che_급습 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_물자원조.php b/hwe/sammo/Command/Nation/che_물자원조.php index c6d1990f..6652bcd9 100644 --- a/hwe/sammo/Command/Nation/che_물자원조.php +++ b/hwe/sammo/Command/Nation/che_물자원조.php @@ -102,7 +102,7 @@ class che_물자원조 extends Command\NationCommand{ } $this->fullConditionConstraints=[ - ConstraintHelper::ExistsDestNation(), + ConstraintHelper::ExistsDestNation(), ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::SuppliedCity(), @@ -112,11 +112,11 @@ class che_물자원조 extends Command\NationCommand{ ConstraintHelper::ReqDestNationValue('surlimit', '외교제한', '==', 0, '상대국이 외교제한중입니다.'), ]; } - + public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 0; } @@ -165,33 +165,33 @@ class che_물자원조 extends Command\NationCommand{ [$goldAmount, $riceAmount] = $this->arg['amountList']; - + $goldAmount = Util::valueFit( - $goldAmount, - 0, + $goldAmount, + 0, $nation['gold'] - GameConst::$basegold ); $riceAmount = Util::valueFit( - $riceAmount, - 0, + $riceAmount, + 0, $nation['rice'] - GameConst::$baserice ); - + $goldAmountText = number_format($goldAmount); $riceAmountText = number_format($riceAmount); - + $logger = $general->getLogger(); $year = $this->env['year']; $month = $this->env['month']; - + $josaRo = JosaUtil::pick($destNationName, '로'); - + $broadcastMessage = "{$destNationName}{$josaRo} 금{$goldAmountText} 쌀{$riceAmountText}을 지원했습니다."; @@ -249,11 +249,11 @@ class che_물자원조 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } - + public function getForm(): string { $currentNationLevel = getNationStaticInfo($this->generalObj->getNationID())['level']; @@ -268,8 +268,8 @@ class che_물자원조 extends Command\NationCommand{ 원조할 국가를 목록에서 선택하세요.
+ 병량 +

setCity(); $this->setNation(); - + $this->minConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ]; @@ -63,7 +63,7 @@ class che_발령 extends Command\NationCommand{ protected function initWithArg() { $this->setDestCity($this->arg['destCityID']); - + $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, 1); $this->setDestGeneral($destGeneral); @@ -76,7 +76,7 @@ class che_발령 extends Command\NationCommand{ $this->fullConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ConstraintHelper::ExistsDestGeneral(), @@ -95,11 +95,11 @@ class che_발령 extends Command\NationCommand{ $destGeneralName = $this->destGeneralObj->getName(); return "{$failReason} {$destGeneralName} {$commandName} 실패."; } - + public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 0; } @@ -134,7 +134,7 @@ class che_발령 extends Command\NationCommand{ $destGeneral = $this->destGeneralObj; $destGeneralName = $destGeneral->getName(); - + $logger = $general->getLogger(); $destGeneral->setVar('city', $destCityID); @@ -156,11 +156,11 @@ class che_발령 extends Command\NationCommand{ return true; } - + public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_백성동원.php b/hwe/sammo/Command/Nation/che_백성동원.php index c2ea51b9..099e02d1 100644 --- a/hwe/sammo/Command/Nation/che_백성동원.php +++ b/hwe/sammo/Command/Nation/che_백성동원.php @@ -48,7 +48,7 @@ class che_백성동원 extends Command\NationCommand{ $this->setCity(); $this->setNation(['strategic_cmd_limit']); - + $this->minConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -76,18 +76,18 @@ class che_백성동원 extends Command\NationCommand{ return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn)"; } - + public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 0; } public function getPostReqTurn():int{ $genCount = Util::valueFit($this->nation['gennum'], GameConst::$initialNationGenLimit); - $nextTerm = Util::round(sqrt($genCount*4)*10); + $nextTerm = Util::round(sqrt($genCount*4)*10); $nextTerm = $this->generalObj->onCalcStrategic($this->getName(), 'delay', $nextTerm); return $nextTerm; @@ -144,7 +144,7 @@ class che_백성동원 extends Command\NationCommand{ ], 'city=%i', $destCityID); $josaYiNation = JosaUtil::pick($nationName, '이'); - + $logger->pushGeneralHistoryLog('백성동원을 발동'); $logger->pushNationalHistoryLog("【전략】{$nationName}{$josaYiNation} {$destCityName}에 백성동원을 하였습니다."); @@ -162,7 +162,7 @@ class che_백성동원 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_불가침제의.php b/hwe/sammo/Command/Nation/che_불가침제의.php index cfd7688c..57074894 100644 --- a/hwe/sammo/Command/Nation/che_불가침제의.php +++ b/hwe/sammo/Command/Nation/che_불가침제의.php @@ -74,7 +74,7 @@ class che_불가침제의 extends Command\NationCommand { $general = $this->generalObj; - + $this->setCity(); $this->setNation(); @@ -94,7 +94,7 @@ class che_불가침제의 extends Command\NationCommand $month = $this->arg['month']; $env = $this->env; - + $relYear = $env['year'] - $env['startyear']; $currentMonth = $env['year'] * 12 + $env['month'] - 1; $reqMonth = $year * 12 + $month - 1; @@ -226,7 +226,7 @@ class che_불가침제의 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_불가침파기제의.php b/hwe/sammo/Command/Nation/che_불가침파기제의.php index fddd0109..8c136a72 100644 --- a/hwe/sammo/Command/Nation/che_불가침파기제의.php +++ b/hwe/sammo/Command/Nation/che_불가침파기제의.php @@ -55,11 +55,11 @@ class che_불가침파기제의 extends Command\NationCommand{ $this->setCity(); $this->setNation(); - + $this->minConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ]; @@ -71,7 +71,7 @@ class che_불가침파기제의 extends Command\NationCommand{ $this->fullConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ConstraintHelper::ExistsDestNation(), @@ -86,7 +86,7 @@ class che_불가침파기제의 extends Command\NationCommand{ public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 0; } @@ -129,7 +129,7 @@ class che_불가침파기제의 extends Command\NationCommand{ // 상대에게 발송 $src = new MessageTarget( - $general->getID(), + $general->getID(), $general->getName(), $nationID, $nationName, @@ -173,7 +173,7 @@ class che_불가침파기제의 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } @@ -204,7 +204,7 @@ class che_불가침파기제의 extends Command\NationCommand{ $nationList[] = $destNation; } - ob_start(); + ob_start(); ?>
불가침중인 국가에 조약 파기를 제의합니다.
@@ -213,12 +213,12 @@ class che_불가침파기제의 extends Command\NationCommand{
에게 +에게 setCity(); $this->setNation(['strategic_cmd_limit']); - + $this->minConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -62,7 +62,7 @@ class che_수몰 extends Command\NationCommand{ { $this->setDestCity($this->arg['destCityID']); $this->setDestNation($this->destCity['nation']); - + $this->fullConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -80,18 +80,18 @@ class che_수몰 extends Command\NationCommand{ return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn)"; } - + public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 2; } public function getPostReqTurn():int{ $genCount = Util::valueFit($this->nation['gennum'], GameConst::$initialNationGenLimit); - $nextTerm = Util::round(sqrt($genCount*4)*10); + $nextTerm = Util::round(sqrt($genCount*4)*10); $nextTerm = $this->generalObj->onCalcStrategic($this->getName(), 'delay', $nextTerm); return $nextTerm; @@ -125,7 +125,7 @@ class che_수몰 extends Command\NationCommand{ $destNationID = $destCity['nation']; $destNationName = getNationStaticInfo($destNationID)['name']; - + $nationID = $general->getNationID(); $nationName = $this->nation['name']; @@ -166,7 +166,7 @@ class che_수몰 extends Command\NationCommand{ 'def' => $db->sqleval('def * 0.2'), 'wall' => $db->sqleval('wall * 0.2'), ], 'city=%i', $destCityID); - + $josaYiNation = JosaUtil::pick($nationName, '이'); $logger->pushGeneralHistoryLog("{$destCityName}에 수몰을 발동"); @@ -185,7 +185,7 @@ class che_수몰 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_이호경식.php b/hwe/sammo/Command/Nation/che_이호경식.php index d7b31bcb..14e53b4e 100644 --- a/hwe/sammo/Command/Nation/che_이호경식.php +++ b/hwe/sammo/Command/Nation/che_이호경식.php @@ -202,7 +202,7 @@ class che_이호경식 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_종전제의.php b/hwe/sammo/Command/Nation/che_종전제의.php index 23d2eb61..6e05cab4 100644 --- a/hwe/sammo/Command/Nation/che_종전제의.php +++ b/hwe/sammo/Command/Nation/che_종전제의.php @@ -55,10 +55,10 @@ class che_종전제의 extends Command\NationCommand{ $this->setCity(); $this->setNation(); - + $this->minConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ]; @@ -70,7 +70,7 @@ class che_종전제의 extends Command\NationCommand{ $this->fullConditionConstraints=[ ConstraintHelper::BeChief(), - ConstraintHelper::NotBeNeutral(), + ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), ConstraintHelper::SuppliedCity(), ConstraintHelper::ExistsDestNation(), @@ -84,7 +84,7 @@ class che_종전제의 extends Command\NationCommand{ public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 0; } @@ -127,7 +127,7 @@ class che_종전제의 extends Command\NationCommand{ // 상대에게 발송 $src = new MessageTarget( - $general->getID(), + $general->getID(), $general->getName(), $nationID, $nationName, @@ -171,7 +171,7 @@ class che_종전제의 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } @@ -202,7 +202,7 @@ class che_종전제의 extends Command\NationCommand{ $nationList[] = $destNation; } - ob_start(); + ob_start(); ?>
전쟁중인 국가에 종전을 제의합니다.
@@ -211,12 +211,12 @@ class che_종전제의 extends Command\NationCommand{
에게 +에게 getGeneral(); $nationID = $general->getNationID(); $nationStor = \sammo\KVStorage::getStorage(DB::db(), $nationID, 'nation_env'); - + $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()]; if ($lastTurn->getCommand() != $commandName || $lastTurn->getArg() !== $this->arg) { @@ -232,7 +232,7 @@ class che_천도 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_초토화.php b/hwe/sammo/Command/Nation/che_초토화.php index c456f35e..5060180a 100644 --- a/hwe/sammo/Command/Nation/che_초토화.php +++ b/hwe/sammo/Command/Nation/che_초토화.php @@ -51,7 +51,7 @@ class che_초토화 extends Command\NationCommand{ $this->setCity(); $this->setNation(['surlimit', 'gold', 'rice', 'capital']); - + $this->minConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -63,7 +63,7 @@ class che_초토화 extends Command\NationCommand{ protected function initWithArg() { $this->setDestCity($this->arg['destCityID']); - + $this->fullConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::OccupiedDestCity(), @@ -77,7 +77,7 @@ class che_초토화 extends Command\NationCommand{ ], ), ]; } - + public function getCost():array{ return [0, 0]; } @@ -145,7 +145,7 @@ class che_초토화 extends Command\NationCommand{ $josaUl = JosaUtil::pick($destCityName, '을'); $logger = $general->getLogger(); - + $general->addExperience(-$general->getVar('experience') * 0.1, false); $general->addExperience(5 * ($this->getPreReqTurn() + 1)); @@ -183,7 +183,7 @@ class che_초토화 extends Command\NationCommand{ \sammo\refreshNationStaticInfo(); \sammo\SetNationFront($nationID); - + $logger->pushGeneralActionLog("{$destCityName}{$josaUl} 초토화했습니다. <1>$date"); $logger->pushGeneralHistoryLog("{$destCityName}{$josaUl} 초토화 명령"); $logger->pushNationalHistoryLog("{$generalName}{$josaYi} {$destCityName}{$josaUl} 초토화 명령"); @@ -198,7 +198,7 @@ class che_초토화 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/sammo/Command/Nation/che_피장파장.php b/hwe/sammo/Command/Nation/che_피장파장.php index 45c9961f..9d4b8590 100644 --- a/hwe/sammo/Command/Nation/che_피장파장.php +++ b/hwe/sammo/Command/Nation/che_피장파장.php @@ -49,7 +49,7 @@ class che_피장파장 extends Command\NationCommand{ if(!in_array($commandType, GameConst::$availableChiefCommand['전략'])){ return false; } - + $this->arg = [ 'destNationID'=>$destNationID, @@ -75,7 +75,7 @@ class che_피장파장 extends Command\NationCommand{ protected function initWithArg() { $this->setDestNation($this->arg['destNationID'], null); - + if($this->getNationID() == 0){ $this->fullConditionConstraints=[ ConstraintHelper::OccupiedCity() @@ -84,7 +84,7 @@ class che_피장파장 extends Command\NationCommand{ } $cmd = buildNationCommandClass($this->arg['commandType'], $this->generalObj, $this->env, new LastTurn()); - + $currYearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']); $nextAvailableTurn = $cmd->getNextAvailableTurn(); if($currYearMonth < $nextAvailableTurn){ @@ -93,7 +93,7 @@ class che_피장파장 extends Command\NationCommand{ ]; return; } - + $this->fullConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -115,7 +115,7 @@ class che_피장파장 extends Command\NationCommand{ public function getCost():array{ return [0, 0]; } - + public function getPreReqTurn():int{ return 1; } @@ -126,7 +126,7 @@ class che_피장파장 extends Command\NationCommand{ public function getTargetPostReqTurn():int{ $genCount = Util::valueFit($this->nation['gennum'], GameConst::$initialNationGenLimit); - $nextTerm = Util::round(sqrt($genCount*2)*10); + $nextTerm = Util::round(sqrt($genCount*2)*10); $nextTerm = $this->generalObj->onCalcStrategic($this->getName(), 'delay', $nextTerm); return $nextTerm; @@ -179,7 +179,7 @@ class che_피장파장 extends Command\NationCommand{ $general->addExperience(5 * ($this->getPreReqTurn() + 1)); $general->addDedication(5 * ($this->getPreReqTurn() + 1)); - + $broadcastMessage = "{$generalName}{$josaYi} {$destNationName}에 {$cmd->getName()} 전략의 {$commandName}{$josaUl} 발동하였습니다."; $nationGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND no != %i', $nationID, $generalID); @@ -221,7 +221,7 @@ class che_피장파장 extends Command\NationCommand{ public function getJSFiles(): array { return [ - 'js/defaultSelectNationByMap.js' + 'dist_js/defaultSelectNationByMap.js' ]; } @@ -255,14 +255,14 @@ class che_피장파장 extends Command\NationCommand{ $cmdName = $cmd->getName(); $remainTurn = 0; $nextAvailableTurn = $cmd->getNextAvailableTurn(); - + if($nextAvailableTurn !== null && $currYearMonth < $nextAvailableTurn){ $remainTurn = $nextAvailableTurn - $currYearMonth; } $availableCommandTypeList[$commandType] = [$cmdName, $remainTurn]; } - ob_start(); + ob_start(); ?>
선택된 국가에 피장파장을 발동합니다.
@@ -273,22 +273,22 @@ class che_피장파장 extends Command\NationCommand{ 배경색은 현재 피장파장 불가능 국가는 붉은색으로 표시됩니다.
에 +에 전략을 + 전략을 setCity(); $this->setNation(['strategic_cmd_limit']); - + $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), @@ -208,7 +208,7 @@ class che_허보 extends Command\NationCommand public function getJSFiles(): array { return [ - 'js/defaultSelectCityByMap.js' + 'dist_js/defaultSelectCityByMap.js' ]; } diff --git a/hwe/select_general_from_pool.php b/hwe/select_general_from_pool.php index 2eab713c..7007ef06 100644 --- a/hwe/select_general_from_pool.php +++ b/hwe/select_general_from_pool.php @@ -64,15 +64,15 @@ var validCustomOption = ; - - + + -= $admin['maxgeneral']) { ?> diff --git a/hwe/select_npc.php b/hwe/select_npc.php index bad23d8f..ebda65dd 100644 --- a/hwe/select_npc.php +++ b/hwe/select_npc.php @@ -41,7 +41,7 @@ foreach($scoutMsgs as $nationID=>$scoutMsg){ - - - + + + -= $maxgeneral) { ?> diff --git a/hwe/t_board.php b/hwe/t_board.php index bbf12399..e5af3659 100644 --- a/hwe/t_board.php +++ b/hwe/t_board.php @@ -54,8 +54,8 @@ $boardName = $isSecretBoard?'기밀실':'회의실'; var isSecretBoard = ; // - - + + diff --git a/hwe/t_diplomacy.php b/hwe/t_diplomacy.php index 4223572d..ce69ab3d 100644 --- a/hwe/t_diplomacy.php +++ b/hwe/t_diplomacy.php @@ -48,8 +48,8 @@ if ($permission < 1) { var permissionLevel = ; // - - + + diff --git a/webpack.config.js b/webpack.config.js index f2b27e43..84f3ca9e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -40,7 +40,7 @@ module.exports = (env) => { }, output: { filename: '[name].js', - path: resolve(__dirname, `${target}/js`) + path: resolve(__dirname, `${target}/dist_js`) }, mode: 'production', devtool: 'source-map', @@ -97,7 +97,7 @@ module.exports = (env) => { plugins: [ new VueLoaderPlugin(), new MiniCssExtractPlugin({ - filename: '../css/[name].css' + filename: '../dist_css/[name].css' }), //new BundleAnalyzerPlugin() ],