misc: 턴 선택기 버튼 글씨 색 변경

css/entrance.css

@@ -36,16 +36,21 @@ body {
     height: 130px;
 }
 
-#user_info button {
+#user_info .btn {
     width: 200px;
-    height: 50px;
     margin: 10px 50px;
+    padding: 10px;
 }
 
 .center_ordered_items {
     text-align: center;
 }
 
+.server-action{
+    padding-top: 16px;
+    padding-bottom: 16px;
+}
+
 .Entrance_ServerList {
     width: 800px;
     height: 64px;

hwe/sammo/API/General/DropItem.php

@@ -49,8 +49,10 @@ class DropItem extends \sammo\BaseAPI
     $generalName = $me->getName();
     $josaYi = JosaUtil::pick($generalName, '이');
 
+
     $itemName = $item->getName();
-    $josaUl = JosaUtil::pick($itemName, '을');
+    $itemRawName = $item->getRawName();
+    $josaUl = JosaUtil::pick($itemRawName, '을');
     $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 버렸습니다.");
 
     $nationName = $me->getStaticNation()['name'];

hwe/sammo/Betting.php

@@ -143,7 +143,7 @@ class Betting
             }
         } else {
             $remainPoint = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $generalID) ?? 0;
-            if ($remainPoint < GameConst::$generalMinimumGold + $amount) {
+            if ($remainPoint < GameConst::$minGoldRequiredWhenBetting + $amount) {
                 throw new \RuntimeException('금이 부족합니다.');
             }
         }

hwe/sammo/GameConstBase.php

@@ -205,6 +205,8 @@ class GameConstBase
     public static $maxAvailableWarSettingCnt = 10;
     public static $incAvailableWarSettingCnt = 2;
 
+    public static $minGoldRequiredWhenBetting = 500;
+
     public static $minMonthToAllowInheritItem = 4;
     public static $inheritBornSpecialPoint = 6000;
     public static $inheritBornTurntimePoint = 3000;

hwe/ts/PartialReservedCommand.vue

@@ -76,7 +76,7 @@
       </div>
 
       <div class="col-5 d-grid">
-        <BDropdown left variant="info" text="선택한 턴을">
+        <BDropdown left variant="light" :style="{ color: 'black' }" text="선택한 턴을">
           <BDropdownItem @click="clipboardCut"> <i class="bi bi-scissors" />&nbsp;잘라내기 </BDropdownItem>
           <BDropdownItem @click="clipboardCopy"> <i class="bi bi-files" />&nbsp;복사하기 </BDropdownItem>
           <BDropdownItem @click="clipboardPaste"> <i class="bi bi-clipboard-fill" />&nbsp;붙여넣기 </BDropdownItem>
@@ -96,7 +96,7 @@
       </div>
 
       <div class="col-7 d-grid">
-        <BButton variant="light" :style="{ color: 'black' }" @click="toggleForm($event)"> 명령 선택 ▾ </BButton>
+        <BButton variant="info" @click="toggleForm($event)"> 명령 선택 ▾ </BButton>
       </div>
     </div>
     <CommandSelectForm

hwe/ts/components/ChiefReservedCommand.vue

@@ -218,7 +218,7 @@
 
           <div v-if="isEditMode" class="row gx-0">
             <div class="col-5 col-md-6 d-grid">
-              <BDropdown left variant="info" text="선택한 턴을">
+              <BDropdown left variant="light" :style="{ color: 'black' }" text="선택한 턴을">
                 <BDropdownItem @click="clipboardCut"> <i class="bi bi-scissors" />&nbsp;잘라내기 </BDropdownItem>
                 <BDropdownItem @click="clipboardCopy"> <i class="bi bi-files" />&nbsp;복사하기 </BDropdownItem>
                 <BDropdownItem @click="clipboardPaste">
@@ -244,7 +244,7 @@
             </div>
 
             <div class="col-7 col-md-6 d-grid">
-              <BButton variant="light" :style="{ color: 'black' }" @click="toggleForm($event)"> 명령 선택 ▾ </BButton>
+              <BButton variant="info" @click="toggleForm($event)"> 명령 선택 ▾ </BButton>
             </div>
           </div>
         </div>

hwe/ts/gateway/entrance.ts

@@ -44,54 +44,28 @@ const serverFullTemplate = "\
 <td colspan='4' class='server_full'>- 장수 등록 마감 -</td>\
 ";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const serverSelectPoolTemplate = "\
-<td colspan='2' class='not_registered'>- 미 등 록 -</td>\
-<td class='ignore_border'>\
-<a href='<%serverPath%>/select_general_from_pool.php'><button type='button' class='general_select with_skin'>장수선택</button></a>\
-</td>\
-";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const serverLoginBtn = "<a href='<%serverPath%>/' class='item'\
-><button type='button' class='fill_box with_skin'>입장</button\
-></a>";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const serverCreateBtn = "<a href='<%serverPath%>/v_join.php' class='item'\
-><button type='button' class='fill_box with_skin'>장수생성</button\
-></a>";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const serverSelectNPCBtn = "<a href='<%serverPath%>/select_npc.php' class='item'\
-><button type='button' class='fill_box with_skin'>장수빙의</button\
-></a>";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const serverSelectPoolBtn = "<a href='<%serverPath%>/select_general_from_pool.php' class='item'\
-><button type='button' class='fill_box with_skin'>장수선택</button\
-></a>";
-
 const serverCreateTemplate = "\
-<td colspan='2' class='not_registered'>- 미 등 록 -</div>\
-<td class='ignore_border vertical_flex BtnPlate'>\
+<td colspan='2' class='not_registered'>- 미 등 록 -\
+<td class='ignore_border'>\
+<div class='d-grid'>\
 <%if(canCreate) {%>\
-<a href='<%serverPath%>/v_join.php' class='item'><button type='button' class='fill_box with_skin'>장수생성</button></a>\
+<a class='btn btn-secondary server-action' href='<%serverPath%>/v_join.php'>장수생성</a>\
 <%}%>\
 <%if(canSelectNPC) {%>\
-<a href='<%serverPath%>/select_npc.php' class='item'><button type='button' class='fill_box with_skin'>장수빙의</button></a>\
+<a class='btn btn-secondary server-action' href='<%serverPath%>/select_npc.php'>장수빙의</a>\
 <%}%>\
 <%if(canSelectPool) {%>\
-<a href='<%serverPath%>/select_general_from_pool.php' class='item'><button type='button' class='fill_box with_skin'>장수선택</button></a>\
+<a class='btn btn-secondary server-action' href='<%serverPath%>/select_general_from_pool.php'>장수선택</a>\
 <%}%>\
-</td>";
+</div></td>";
 
 const serverLoginTemplate = "\
 <td style='background:url(\"<%picture%>\");background-size: 64px 64px;'></td>\
 <td><%name%></td>\
-<td class='ignore_border vertical_flex BtnPlate'>\
-<a href='<%serverPath%>/' class='item'><button type='button' class='fill_box with_skin'>입장</button></a>\
-</td>\
+<td class='ignore_border'>\
+<div class='d-grid'>\
+<a href='<%serverPath%>/' class='btn btn-secondary server-action'>입장</a>\
+</div></td>\
 ";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

i_entrance/entrance.php

@@ -103,8 +103,8 @@ $acl = $session->acl;
         <div id="user_info">
             <div class="bg2 section_title with_border">계 정 관 리</div>
             <div class="center_ordered_items with_border bg0">
-                <a href="user_info.php"><button type="button" id="btn_user_manage" class="with_skin">비밀번호 &amp; 전콘 &amp; 탈퇴</button></a>
-                <button type="button" id="btn_logout" class="with_skin">로 그 아 웃</button>
+                <a class="btn btn-dark" href="user_info.php" id="btn_user_manage">비밀번호 &amp; 전콘 &amp; 탈퇴</a>
+                <button type="button" id="btn_logout"class="btn btn-dark">로 그 아 웃</button>
             </div>
         </div>