{/*배정 포드*/}
{/* setResultData({ ...resultData, reward_group_id: e.target.value })} disabled={!isView('reward')} width="200px">*/}
@@ -434,7 +477,8 @@ export const initData = {
hot_time: 1,
game_mode_id: 1,
event_start_dt: '',
- event_end_dt: ''
+ event_end_dt: '',
+ event_operation_time: 10
}
export default BattleEventModal;
diff --git a/src/components/searchBar/BattleEventSearchBar.js b/src/components/searchBar/BattleEventSearchBar.js
index 6b12b9a..a88db01 100644
--- a/src/components/searchBar/BattleEventSearchBar.js
+++ b/src/components/searchBar/BattleEventSearchBar.js
@@ -186,17 +186,17 @@ const BattleEventSearchBar = ({ searchParams, onSearch, onReset, configData, rew
))}
- 라운드 수
-
- onSearch({ roundCount: e.target.value })}>
-
- {battleEventRoundCount.map((data, index) => (
-
- ))}
-
-
+ {/*라운드 수*/}
+ {/**/}
+ {/* onSearch({ roundCount: e.target.value })}>*/}
+ {/* */}
+ {/* {battleEventRoundCount.map((data, index) => (*/}
+ {/* */}
+ {/* ))}*/}
+ {/* */}
+ {/**/}
>
];
diff --git a/src/i18n.js b/src/i18n.js
index b81697c..cff9e65 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -127,6 +127,7 @@ const resources = {
//전투시스템
BATTLE_EVENT_MODAL_START_DT_WARNING: "시작 시간은 현재 시간으로부터 10분 이후부터 가능합니다.",
BATTLE_EVENT_MODAL_TIME_CHECK_WARNING :"해당 시간에 속하는 이벤트가 존재합니다.",
+ BATTLE_EVENT_MODAL_OPERATION_TIME_MIN_CHECK_WARNING :"진행시간은 최소 10분 이상이여야 합니다.",
BATTLE_EVENT_REGIST_CONFIRM: "이벤트를 등록하시겠습니까?",
BATTLE_EVENT_UPDATE_CONFIRM: "이벤트를 수정하시겠습니까?",
BATTLE_EVENT_SELECT_DELETE: "선택된 이벤트를 삭제하시겠습니까?",
diff --git a/src/pages/ServiceManage/BattleEvent.js b/src/pages/ServiceManage/BattleEvent.js
index a120019..74e5dee 100644
--- a/src/pages/ServiceManage/BattleEvent.js
+++ b/src/pages/ServiceManage/BattleEvent.js
@@ -30,7 +30,11 @@ import {
} from '../../components/common';
import { convertKTC, convertKTCDate, convertUTC, timeDiffMinute } from '../../utils';
import { BattleEventModal } from '../../components/ServiceManage';
-import { INITIAL_PAGE_SIZE, INITIAL_PAGE_LIMIT } from '../../assets/data/adminConstants';
+import {
+ INITIAL_PAGE_SIZE,
+ INITIAL_PAGE_LIMIT,
+ BATTLE_EVENT_OPERATION_TIME_WAIT_SECONDS,
+} from '../../assets/data/adminConstants';
import { useDataFetch, useModal, useTable, withAuth } from '../../hooks/hook';
import { StatusWapper, StatusLabel } from '../../styles/ModuleComponents';
import { battleEventStatus, battleRepeatType } from '../../assets/data/options';
@@ -98,7 +102,7 @@ const BattleEvent = () => {
const endTime = (start_dt, operation_time) =>{
const startDate = new Date(start_dt);
- startDate.setSeconds(startDate.getSeconds() + operation_time);
+ startDate.setSeconds(startDate.getSeconds() + operation_time + BATTLE_EVENT_OPERATION_TIME_WAIT_SECONDS);
return startDate;
}
@@ -295,16 +299,16 @@ const BattleEvent = () => {
| 그룹 |
이벤트 ID |
이벤트명 |
+ 게임모드 |
반복 |
기간 시작일(KST) |
기간 종료일(KST) |
이벤트 시작시간(KST) |
이벤트 종료시간(KST) |
이벤트 상태 |
- 게임모드 |
{/*라운드 시간 | */}
{/*배정포드 | */}
- 라운드 수 |
+ {/*라운드 수 | */}
핫타임 |
확인 / 수정 |
히스토리 |
@@ -321,6 +325,7 @@ const BattleEvent = () => {
{battle.group_id} |
{battle.id} |
{battle.event_name} |
+ {battle.game_mode_id} |
{battleRepeatType.find(data => data.value === battle.repeat_type).name}
@@ -335,10 +340,9 @@ const BattleEvent = () => {
{battleEventStatus.find(data => data.value === battle.status).name}
- {battle.game_mode_id} |
{/*{secondToMinutes(battle.round_time)}분 | */}
{/*{battle.reward_group_id} | */}
- {battle.round_count} |
+ {/*{battle.round_count} | */}
{battle.hot_time} |
|