j_install_db 초기화 코드 정리

사소하게 수정
clearDB에 $db 전달
2024-05-17 18:11:56 +00:00 · 2024-05-17 18:03:20 +00:00 · 2024-05-17 17:59:27 +00:00 · 2024-05-17 17:50:07 +00:00 · 2024-05-17 17:42:34 +00:00 · 2024-05-17 17:36:39 +00:00
7 changed files with 9 additions and 146 deletions
@@ -32,8 +32,10 @@ if ($type <= 0 || $type > 15) {
 }

 $ownerNameList = [];
-foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
-    $ownerNameList[$ownerID] = $ownerName;
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
 }

 ?>
@@ -52,15 +54,6 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', 'common') ?>

-    <style>
-        .hidden {
-            display: none;
-        }
-
-        .generalName:hover > .hidden {
-            display: block;
-        }
-    </style>
 </head>

 <body>
@@ -175,11 +168,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
        $name = formatName($general['name'], $general['npc']);

        if (key_exists($general['owner'], $ownerNameList)) {
-            if ($gameStor->isunited) {
-                $name = $name . '<br><small class=\'userName\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            } else {
-                $name = $name . '<br><small class=\'userName hidden\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            }
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
        }

        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
@@ -196,7 +185,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
        data-npc-type='{$general['npc']}'
    >
        <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
-        <td align=center class='generalName' onclick=''>$name</td>
+        <td align=center>$name</td>
        <td align=center>{$general['age']}세</td>
        <td align=center>" . displayCharInfo($general['personal']) . "</td>
        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
@@ -19,15 +19,7 @@ if(!prepareDir('data/file_cache')){
 	]);
 }

-$absolutePath = realpath('data/file_cache');
-if(!$absolutePath){
-    Json::die([
-        'result'=>false,
-        'reason'=>'cache 불가'
-    ]);
-}
-
-$storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
+$storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
 $cache = new Cache($storage);
 $serverID = UniqueConst::$serverID;

@@ -55,11 +55,7 @@ class GetCachedMap extends \sammo\BaseAPI
      return 'cache 불가';
    }

-    $absolutePath = realpath('data/file_cache');
-    if (!$absolutePath) {
-      return 'cache 불가';
-    }
-    $storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
+    $storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
    $cache = new Cache($storage);

    $now = TimeUtil::nowDateTimeImmutable();
@@ -288,10 +288,6 @@ class GetConst extends \sammo\BaseAPI
        if (!prepareDir($cacheDir)) {
            throw new RuntimeException('cache 폴더 없음');
        }
-        $absolutePath = realpath($cacheDir);
-        if (!$absolutePath) {
-            throw new RuntimeException('cache 폴더 없음');
-        }
        $storage = new \Nette\Caching\Storages\FileStorage($cacheDir);
        $cache = new Cache($storage);

@@ -77,6 +77,7 @@ class ResetHelper{
        ServConfig::getServerList()[$prefix]->closeServer();

        $db = DB::db();
+        $mysqli_obj = $db->get();

        $serverID = $prefix.'_'.date("ymd").'_'.Util::randomStr(4);

@@ -110,7 +111,6 @@ class ResetHelper{
            $servRoot.'/d_setting/GameConst.php',
        );

-        $mysqli_obj = $db->get();
        if($mysqli_obj->multi_query(file_get_contents($servRoot.'/sql/reset.sql'))){
            while(true){
                if (!$mysqli_obj->more_results()) {
@@ -1,110 +0,0 @@
-{
-    "title":"【공백지】 이벤트 클래식",
-    "startYear":180,
-    "history": [
-        "<C>●</>180년 1월:<L><b>【공백지】</b></>예전 지도에서 장비를 많이 가지고 즐겨보는 이벤트 깃수"
-    ],
-    "const": {
-        "joinRuinedNPCProp":0,
-        "npcBanMessageProb":1,
-        "uniqueTrialCoef": 2,
-        "maxUniqueTrialProb": 0.5,
-        "defaultMaxGenius": 9999,
-        "defaultMaxGeneral": 700,
-        "allItems": {
-            "horse" : {
-                "che_명마_01_노기" : 0, "che_명마_02_조랑" : 0, "che_명마_03_노새" : 0,
-                "che_명마_04_나귀" : 0, "che_명마_05_갈색마" : 0, "che_명마_06_흑색마" : 0,
-
-                "che_명마_07_백마" : 8, "che_명마_07_기주마" : 8, "che_명마_07_오환마" : 8, "che_명마_07_백상" : 8,
-                "che_명마_08_양주마" : 8, "che_명마_08_흉노마" : 8, "che_명마_09_과하마" : 8, "che_명마_09_의남백마" : 8,
-                "che_명마_10_대완마" : 8, "che_명마_10_옥추마" : 8, "che_명마_11_서량마" : 8, "che_명마_11_화종마" : 8,
-                "che_명마_12_사륜거" : 8, "che_명마_12_옥란백용구": 8, "che_명마_13_절영" : 8, "che_명마_13_적로" : 8,
-                "che_명마_14_적란마" : 8, "che_명마_14_조황비전" : 8, "che_명마_15_한혈마" : 8, "che_명마_15_적토마" : 8
-            },
-            "weapon" : {
-                "che_무기_01_단도" : 0, "che_무기_02_단궁" : 0, "che_무기_03_단극" : 0,
-                "che_무기_04_목검" : 0, "che_무기_05_죽창" : 0, "che_무기_06_소부" : 0,
-
-                "che_무기_07_동추" : 8, "che_무기_07_철편" : 8, "che_무기_07_철쇄" : 8, "che_무기_07_맥궁" : 8,
-                "che_무기_08_유성추" : 8, "che_무기_08_철질여골" : 8, "che_무기_09_쌍철극" : 8, "che_무기_09_동호비궁" : 8,
-                "che_무기_10_삼첨도" : 8, "che_무기_10_대부" : 8, "che_무기_11_고정도" : 8, "che_무기_11_이광궁" : 8,
-                "che_무기_12_철척사모" : 8, "che_무기_12_칠성검" : 8, "che_무기_13_사모" : 8, "che_무기_13_양유기궁" : 8,
-                "che_무기_14_언월도" : 8, "che_무기_14_방천화극" : 8, "che_무기_15_청홍검" : 8, "che_무기_15_의천검" : 8
-            },
-            "book" : {
-                "che_서적_01_효경전" : 0, "che_서적_02_회남자" : 0, "che_서적_03_변도론" : 0,
-                "che_서적_04_건상역주" : 0, "che_서적_05_여씨춘추" : 0, "che_서적_06_사민월령" : 0,
-
-                "che_서적_07_위료자" : 8, "che_서적_07_사마법" : 8, "che_서적_07_한서" : 8, "che_서적_07_논어" : 8,
-                "che_서적_08_전론" : 8, "che_서적_08_사기" : 8, "che_서적_09_장자" : 8, "che_서적_09_역경" : 8,
-                "che_서적_10_시경" : 8, "che_서적_10_구국론" : 8, "che_서적_11_상군서" : 8, "che_서적_11_춘추전" : 8,
-                "che_서적_12_산해경" : 8, "che_서적_12_맹덕신서" : 8, "che_서적_13_관자" : 8, "che_서적_13_병법24편" : 8,
-                "che_서적_14_한비자" : 8, "che_서적_14_오자병법" : 8, "che_서적_15_노자" : 8, "che_서적_15_손자병법" : 8
-            },
-            "item" : {
-                "che_치료_환약" : 0, "che_저격_수극" : 0, "che_사기_탁주" : 0,
-                "che_훈련_청주" : 0, "che_계략_이추" : 0, "che_계략_향낭" : 0,
-
-                "che_의술_정력견혈산" : 4, "che_의술_청낭서" : 4, "che_의술_태평청령" : 4, "che_의술_상한잡병론" : 4,
-                "che_보물_도기" : 4, "che_조달_주판" : 4,
-                "che_내정_납금박산로" : 4, "che_전략_평만지장도" : 4, "che_숙련_동작" : 4, "che_명성_구석" : 4,
-
-                "che_척사_오악진형도" : 4, "che_격노_구정신단경" : 4, "che_징병_낙주" : 4,
-                "che_저격_매화수전" : 4, "che_저격_비도":4, "che_위압_조목삭" : 4, "che_공성_묵자" : 4,
-                "che_집중_전국책" : 4, "che_환술_논어집해" : 4,
-
-                "che_진압_박혁론" : 4, "che_부적_태현청생부" : 4, "che_저지_삼황내문" : 4,
-                "che_행동_서촉지형도" : 4, "che_간파_노군입산부" : 4, "che_불굴_상편" : 4,
-                "che_약탈_옥벽" : 4,
-
-                "che_농성_주서음부" : 4, "che_농성_위공자병법" : 4,
-                "che_계략_육도" : 4, "che_계략_삼략" : 4,
-
-                "che_상성보정_과실주" : 4,
-                "che_능력치_지력_이강주" : 4, "che_능력치_무력_두강주" : 4, "che_능력치_통솔_보령압주" : 4,
-                "che_훈련_철벽서" : 4, "che_훈련_단결도" : 4, "che_사기_춘화첩" : 4, "che_사기_초선화" : 4,
-                "che_회피_태평요술" : 4, "che_필살_둔갑천서" : 4
-            }
-        }
-    },
-    "events":[
-        [
-            "month", 1000,
-            ["or", ["Date", "==", null, 12], ["Date", "==", null, 6]],
-            ["CreateManyNPC", 10, 10],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 181, 1],
-            ["RaiseNPCNation"],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 999,
-            ["Date", "==", 181, 1],
-            ["OpenNationBetting", 4, 5000],
-            ["OpenNationBetting", 1, 2000],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 999,
-            ["and",
-                ["Date", ">=", 183, 1],
-                ["RemainNation", "<=", 8]
-            ],
-            ["OpenNationBetting", 1, 1000],
-            ["DeleteEvent"]
-        ],
-        [
-            "destroy_nation", 1000,
-            ["and",
-                ["Date", ">=", 183, 1],
-                ["RemainNation", "==", 1]
-            ],
-            ["BlockScoutAction"],
-            ["DeleteEvent"]
-        ]
-    ]
-}
Author	SHA1	Message	Date
Hide_D	84b0b69b67	j_install_db 초기화 코드 정리	2024-05-17 18:11:56 +00:00
Hide_D	47a4144757	사소하게 수정	2024-05-17 18:03:20 +00:00
Hide_D	625cf81f1f	clearDB에 $db 전달	2024-05-17 17:59:27 +00:00
Hide_D	0b8e91efe8	설치 메시지 수정	2024-05-17 17:50:07 +00:00
Hide_D	8db7aa3528	종료 처리	2024-05-17 17:42:34 +00:00
Hide_D	726679c933	db unset	2024-05-17 17:36:39 +00:00
Hide_D	ec9e7be5d8	install_db	2024-05-17 17:32:39 +00:00
Hide_D	43ee0015ea	인스톨 코드 수정	2024-05-17 17:12:58 +00:00
Hide_D	a146735007	APIHelper에 MeekroDBExceptionr에러시 logError	2024-05-17 17:10:43 +00:00
Hide_D	46bf5531d9	dep	2024-05-17 17:02:25 +00:00