devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(game-ui): iPhone Safari 확인 조작을 안정화

Browse Source
This commit is contained in:
Hide_D
2026-08-28 12:25:57 +00:00
parent b45fe5ba39
commit ddbfa0afa9
11 changed files with 233 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-frontend/src/views/NationPersonnelView.vue
+7 -6
View File
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, onMounted, ref, watch } from 'vue';
import { computed, nextTick, onMounted, ref, watch } from 'vue';
import { useRouter } from 'vue-router';
import { JosaUtil } from '@sammo-ts/common/util/JosaUtil';
@@ -39,7 +39,7 @@ const kickTargetId = ref(0);
const ambassadorSelection = ref<number[]>([]);
const auditorSelection = ref<number[]>([]);
const router = useRouter();
const { success: showSuccessToast, error: showErrorToast } = useGameFeedback();
const { success: showSuccessToast, error: showErrorToast, confirm: showConfirm } = useGameFeedback();
const resolveErrorMessage = (value: unknown): string =>
value instanceof Error ? value.message : typeof value === 'string' ? value : 'unknown_error';
@@ -135,7 +135,7 @@ const appointChief = async (level: number, targetId: number) => {
const prompt = target
? `${JosaUtil.put(target.name, '을')} ${office}직에 임명하시겠습니까?`
: `${office}직을 비우시겠습니까?`;
if (!window.confirm(prompt)) return;
if (!(await showConfirm(prompt))) return;
await runMutation(
() => trpc.nation.appoint.mutate({ destGeneralId: targetId, destCityId: 0, officerLevel: level }),
target ? `${JosaUtil.put(target.name, '을')} 임명했습니다.` : '관직을 비웠습니다.'
@@ -148,7 +148,7 @@ const appointCityOfficer = async (level: OfficerLevel, cityId: number, targetId:
const prompt = target
? `${JosaUtil.put(target.name, '을')} ${city?.name ?? ''} ${officerLabels[level]}직에 임명하시겠습니까?`
: `${city?.name ?? ''} ${officerLabels[level]}직을 비우시겠습니까?`;
if (!window.confirm(prompt)) return;
if (!(await showConfirm(prompt))) return;
await runMutation(
() =>
trpc.nation.appoint.mutate({
@@ -248,6 +248,7 @@ const applySelection = async (id: number): Promise<void> => {
const context = selectionContext.value;
if (!context) return;
selectionContext.value = null;
await nextTick();
if (context.kind === 'chief-general') await appointChief(context.level, id);
else await appointCityOfficer(context.level, context.cityId, id);
};
@@ -258,7 +259,7 @@ const reportPermissionLimit = () => {
const changePermissions = async (isAmbassador: boolean) => {
const selection = isAmbassador ? ambassadorSelection.value : auditorSelection.value;
if (!window.confirm(`${isAmbassador ? '외교권자' : '조언자'}를 변경할까요?`)) return;
if (!(await showConfirm(`${isAmbassador ? '외교권자' : '조언자'}를 변경할까요?`))) return;
await runMutation(
() => trpc.nation.changePermission.mutate({ isAmbassador, targetGeneralIds: selection }),
'권한을 변경했습니다.'
@@ -267,7 +268,7 @@ const changePermissions = async (isAmbassador: boolean) => {
const kickGeneral = async () => {
const target = generalMap.value.get(kickTargetId.value);
if (!target || !window.confirm(`${JosaUtil.put(target.name, '을')} 추방하시겠습니까?`)) return;
if (!target || !(await showConfirm(`${JosaUtil.put(target.name, '을')} 추방하시겠습니까?`))) return;
await runMutation(
() => trpc.nation.kick.mutate({ destGeneralId: target.id }),
`${JosaUtil.put(target.name, '을')} 추방했습니다.`
app/game-frontend/src/views/NpcControlView.vue
+16 -11
View File
@@ -45,7 +45,12 @@ const nationPriority = ref<PriorityListState | null>(null);
const generalPriority = ref<PriorityListState | null>(null);
const lastSavedNationPriority = ref<string[]>([]);
const lastSavedGeneralPriority = ref<string[]>([]);
const { success: showSuccessToast, error: showErrorToast, info: showInfoToast } = useGameFeedback();
const {
success: showSuccessToast,
error: showErrorToast,
info: showInfoToast,
confirm: showConfirm,
} = useGameFeedback();
const canManagePolicy = computed(() => (data.value?.permissionLevel ?? -1) >= 3);
const resolveErrorMessage = (value: unknown): string => {
@@ -282,20 +287,20 @@ const priorityPanels = computed<PriorityPanel[]>(() => {
];
});
const resetPolicy = () => {
if (!canManagePolicy.value || !data.value || !window.confirm('초기 설정으로 되돌릴까요?')) return;
const resetPolicy = async () => {
if (!canManagePolicy.value || !data.value || !(await showConfirm('초기 설정으로 되돌릴까요?'))) return;
policyDraft.value = clonePolicy(data.value.defaultNationPolicy);
showInfoToast('서버 초깃값을 적용했습니다. 설정 버튼을 누르면 반영됩니다.');
};
const rollbackPolicy = () => {
if (!canManagePolicy.value || !lastSavedPolicy.value || !window.confirm('이전 설정으로 되돌릴까요?')) return;
const rollbackPolicy = async () => {
if (!canManagePolicy.value || !lastSavedPolicy.value || !(await showConfirm('이전 설정으로 되돌릴까요?'))) return;
policyDraft.value = clonePolicy(lastSavedPolicy.value);
showInfoToast('이전 설정으로 되돌렸습니다.');
};
const submitPolicy = async () => {
if (!canManagePolicy.value || !policyDraft.value || !window.confirm('저장할까요?')) return;
if (!canManagePolicy.value || !policyDraft.value || !(await showConfirm('저장할까요?'))) return;
try {
await trpc.npc.setNationPolicy.mutate(policyDraft.value);
lastSavedPolicy.value = clonePolicy(policyDraft.value);
@@ -305,8 +310,8 @@ const submitPolicy = async () => {
}
};
const resetPriority = (section: PrioritySectionKey) => {
if (!canManagePolicy.value || !data.value || !window.confirm('초기 설정으로 되돌릴까요?')) return;
const resetPriority = async (section: PrioritySectionKey) => {
if (!canManagePolicy.value || !data.value || !(await showConfirm('초기 설정으로 되돌릴까요?'))) return;
if (section === 'nation') {
nationPriority.value = assignPriorityState(
data.value.defaultNationPriority,
@@ -321,8 +326,8 @@ const resetPriority = (section: PrioritySectionKey) => {
showInfoToast('서버 초깃값을 적용했습니다. 설정 버튼을 누르면 반영됩니다.');
};
const rollbackPriority = (section: PrioritySectionKey) => {
if (!canManagePolicy.value || !data.value || !window.confirm('이전 설정으로 되돌릴까요?')) return;
const rollbackPriority = async (section: PrioritySectionKey) => {
if (!canManagePolicy.value || !data.value || !(await showConfirm('이전 설정으로 되돌릴까요?'))) return;
if (section === 'nation') {
nationPriority.value = assignPriorityState(
lastSavedNationPriority.value,
@@ -339,7 +344,7 @@ const rollbackPriority = (section: PrioritySectionKey) => {
const submitPriority = async (section: PrioritySectionKey) => {
const state = section === 'nation' ? nationPriority.value : generalPriority.value;
if (!canManagePolicy.value || !state || !window.confirm('저장할까요?')) return;
if (!canManagePolicy.value || !state || !(await showConfirm('저장할까요?'))) return;
try {
if (section === 'nation') {
await trpc.npc.setNationPriority.mutate(state.active);
app/game-frontend/src/views/TroopView.vue
+4 -4
View File
@@ -25,7 +25,7 @@ const dialogTroopId = ref(0);
const popupMember = ref<Member | null>(null);
const popupTop = ref(0);
const router = useRouter();
const { success: showSuccessToast, error: showErrorToast } = useGameFeedback();
const { success: showSuccessToast, error: showErrorToast, confirm: showConfirm } = useGameFeedback();
const me = computed(() => data.value?.me ?? null);
@@ -92,7 +92,7 @@ const joinTroop = async (troop: Troop) => {
const exitTroop = async (troop: Troop) => {
const isLeader = me.value?.id === troop.id;
const prompt = isLeader ? `${troop.name} 부대를 해산하겠습니까?` : `${troop.name} 부대에서 탈퇴하겠습니까?`;
if (!window.confirm(prompt)) {
if (!(await showConfirm(prompt))) {
return;
}
await runAction(async () => {
@@ -130,7 +130,7 @@ const hasFinalConsonant = (value: string): boolean => {
const renameTroop = async (troop: Troop) => {
const troopName = editName.value;
const particle = hasFinalConsonant(troopName) ? '으로' : '로';
if (!window.confirm(`${troop.name} 부대의 이름을 ${troopName}${particle} 바꾸시겠습니까?`)) {
if (!(await showConfirm(`${troop.name} 부대의 이름을 ${troopName}${particle} 바꾸시겠습니까?`))) {
return;
}
await runAction(async () => {
@@ -147,7 +147,7 @@ const kickMember = async (troop: Troop) => {
return;
}
const particle = hasFinalConsonant(member.name) ? '을' : '를';
if (!window.confirm(`${troop.name} 부대에서 ${member.name}${particle} 추방하시겠습니까?`)) {
if (!(await showConfirm(`${troop.name} 부대에서 ${member.name}${particle} 추방하시겠습니까?`))) {
return;
}
await runAction(async () => {