diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 57d3bb9..f309e15 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -50,6 +50,7 @@ "vue": "catalog:", "vue-router": "catalog:", "vue3-pixi": "1.0.0-beta.3", - "vxe-table": "^4.6.25" + "vxe-pc-ui": "4.10.18", + "vxe-table": "^4.17.11" } } diff --git a/apps/web-antd/public/cat_bg.png b/apps/web-antd/public/cat_bg.png new file mode 100644 index 0000000..2034cf4 Binary files /dev/null and b/apps/web-antd/public/cat_bg.png differ diff --git a/apps/web-antd/public/merge/Launcher_sub_R_LV6.png b/apps/web-antd/public/merge/Launcher_sub_R_LV6.png index 1ae44e0..e002fb2 100644 Binary files a/apps/web-antd/public/merge/Launcher_sub_R_LV6.png and b/apps/web-antd/public/merge/Launcher_sub_R_LV6.png differ diff --git a/apps/web-antd/public/merge/Launcher_sub_R_LV7.png b/apps/web-antd/public/merge/Launcher_sub_R_LV7.png index d88c911..105e919 100644 Binary files a/apps/web-antd/public/merge/Launcher_sub_R_LV7.png and b/apps/web-antd/public/merge/Launcher_sub_R_LV7.png differ diff --git a/apps/web-antd/public/merge/Launcher_sub_R_LV8.png b/apps/web-antd/public/merge/Launcher_sub_R_LV8.png index a59ff01..aa6f1e7 100644 Binary files a/apps/web-antd/public/merge/Launcher_sub_R_LV8.png and b/apps/web-antd/public/merge/Launcher_sub_R_LV8.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv1.png b/apps/web-antd/public/merge/Production_Q2_lv1.png index f5f3657..6535eed 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv1.png and b/apps/web-antd/public/merge/Production_Q2_lv1.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv10.png b/apps/web-antd/public/merge/Production_Q2_lv10.png index 236db8b..ece8199 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv10.png and b/apps/web-antd/public/merge/Production_Q2_lv10.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv2.png b/apps/web-antd/public/merge/Production_Q2_lv2.png index 5d99973..fa70d22 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv2.png and b/apps/web-antd/public/merge/Production_Q2_lv2.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv3.png b/apps/web-antd/public/merge/Production_Q2_lv3.png index aa659f0..a3c4310 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv3.png and b/apps/web-antd/public/merge/Production_Q2_lv3.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv4.png b/apps/web-antd/public/merge/Production_Q2_lv4.png index 7daf869..8658a4f 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv4.png and b/apps/web-antd/public/merge/Production_Q2_lv4.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv5.png b/apps/web-antd/public/merge/Production_Q2_lv5.png index 7f3d3fb..3da51c6 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv5.png and b/apps/web-antd/public/merge/Production_Q2_lv5.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv6.png b/apps/web-antd/public/merge/Production_Q2_lv6.png index 0675961..96f6ad3 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv6.png and b/apps/web-antd/public/merge/Production_Q2_lv6.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv7.png b/apps/web-antd/public/merge/Production_Q2_lv7.png index f6833f1..c50f3fa 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv7.png and b/apps/web-antd/public/merge/Production_Q2_lv7.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv8.png b/apps/web-antd/public/merge/Production_Q2_lv8.png index 6c9c031..b367f5a 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv8.png and b/apps/web-antd/public/merge/Production_Q2_lv8.png differ diff --git a/apps/web-antd/public/merge/Production_Q2_lv9.png b/apps/web-antd/public/merge/Production_Q2_lv9.png index 5888bf9..8c2b46c 100644 Binary files a/apps/web-antd/public/merge/Production_Q2_lv9.png and b/apps/web-antd/public/merge/Production_Q2_lv9.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv1.png b/apps/web-antd/public/merge/Production_R2_lv1.png new file mode 100644 index 0000000..6bd9e2f Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv1.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv2.png b/apps/web-antd/public/merge/Production_R2_lv2.png new file mode 100644 index 0000000..5e129a2 Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv2.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv3.png b/apps/web-antd/public/merge/Production_R2_lv3.png new file mode 100644 index 0000000..754ef1d Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv3.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv4.png b/apps/web-antd/public/merge/Production_R2_lv4.png new file mode 100644 index 0000000..167fb6e Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv4.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv5.png b/apps/web-antd/public/merge/Production_R2_lv5.png new file mode 100644 index 0000000..f4efe6c Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv5.png differ diff --git a/apps/web-antd/public/merge/Production_R2_lv6.png b/apps/web-antd/public/merge/Production_R2_lv6.png new file mode 100644 index 0000000..0d6ec3d Binary files /dev/null and b/apps/web-antd/public/merge/Production_R2_lv6.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv1.png b/apps/web-antd/public/merge/Production_S2_lv1.png new file mode 100644 index 0000000..e2f8148 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv1.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv2.png b/apps/web-antd/public/merge/Production_S2_lv2.png new file mode 100644 index 0000000..06f6843 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv2.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv3.png b/apps/web-antd/public/merge/Production_S2_lv3.png new file mode 100644 index 0000000..b3031c7 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv3.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv4.png b/apps/web-antd/public/merge/Production_S2_lv4.png new file mode 100644 index 0000000..1fc09ee Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv4.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv5.png b/apps/web-antd/public/merge/Production_S2_lv5.png new file mode 100644 index 0000000..20b6867 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv5.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv6.png b/apps/web-antd/public/merge/Production_S2_lv6.png new file mode 100644 index 0000000..06c748c Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv6.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv7.png b/apps/web-antd/public/merge/Production_S2_lv7.png new file mode 100644 index 0000000..cd25572 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv7.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv8.png b/apps/web-antd/public/merge/Production_S2_lv8.png new file mode 100644 index 0000000..cd9d86a Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv8.png differ diff --git a/apps/web-antd/public/merge/Production_S2_lv9.png b/apps/web-antd/public/merge/Production_S2_lv9.png new file mode 100644 index 0000000..d3c2076 Binary files /dev/null and b/apps/web-antd/public/merge/Production_S2_lv9.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv1.png b/apps/web-antd/public/merge/Production_T2_lv1.png index 6504ac9..36e6bf8 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv1.png and b/apps/web-antd/public/merge/Production_T2_lv1.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv2.png b/apps/web-antd/public/merge/Production_T2_lv2.png index b0d5a69..70dea3b 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv2.png and b/apps/web-antd/public/merge/Production_T2_lv2.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv3.png b/apps/web-antd/public/merge/Production_T2_lv3.png index dff496e..ef674d0 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv3.png and b/apps/web-antd/public/merge/Production_T2_lv3.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv4.png b/apps/web-antd/public/merge/Production_T2_lv4.png index 5aecbb7..318e3be 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv4.png and b/apps/web-antd/public/merge/Production_T2_lv4.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv5.png b/apps/web-antd/public/merge/Production_T2_lv5.png index c17a531..fa30175 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv5.png and b/apps/web-antd/public/merge/Production_T2_lv5.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv6.png b/apps/web-antd/public/merge/Production_T2_lv6.png index 8cc0f45..4a2c5fe 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv6.png and b/apps/web-antd/public/merge/Production_T2_lv6.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv7.png b/apps/web-antd/public/merge/Production_T2_lv7.png index 2783094..7607c24 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv7.png and b/apps/web-antd/public/merge/Production_T2_lv7.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv8.png b/apps/web-antd/public/merge/Production_T2_lv8.png index b539c98..56467ad 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv8.png and b/apps/web-antd/public/merge/Production_T2_lv8.png differ diff --git a/apps/web-antd/public/merge/Production_T2_lv9.png b/apps/web-antd/public/merge/Production_T2_lv9.png index b36ad86..5d46611 100644 Binary files a/apps/web-antd/public/merge/Production_T2_lv9.png and b/apps/web-antd/public/merge/Production_T2_lv9.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv1.png b/apps/web-antd/public/merge/Production_U2_lv1.png index 78707da..9297120 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv1.png and b/apps/web-antd/public/merge/Production_U2_lv1.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv2.png b/apps/web-antd/public/merge/Production_U2_lv2.png index f20cee3..5a8f892 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv2.png and b/apps/web-antd/public/merge/Production_U2_lv2.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv3.png b/apps/web-antd/public/merge/Production_U2_lv3.png index 33efb11..0d03c6b 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv3.png and b/apps/web-antd/public/merge/Production_U2_lv3.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv4.png b/apps/web-antd/public/merge/Production_U2_lv4.png index 0fe8106..cec2a40 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv4.png and b/apps/web-antd/public/merge/Production_U2_lv4.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv5.png b/apps/web-antd/public/merge/Production_U2_lv5.png index 9c013aa..5fbf7a4 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv5.png and b/apps/web-antd/public/merge/Production_U2_lv5.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv6.png b/apps/web-antd/public/merge/Production_U2_lv6.png index 425b506..71cb505 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv6.png and b/apps/web-antd/public/merge/Production_U2_lv6.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv7.png b/apps/web-antd/public/merge/Production_U2_lv7.png index 387ce94..9a7736c 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv7.png and b/apps/web-antd/public/merge/Production_U2_lv7.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv8.png b/apps/web-antd/public/merge/Production_U2_lv8.png index fdb1559..99671d5 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv8.png and b/apps/web-antd/public/merge/Production_U2_lv8.png differ diff --git a/apps/web-antd/public/merge/Production_U2_lv9.png b/apps/web-antd/public/merge/Production_U2_lv9.png index f0d5b03..4bf3210 100644 Binary files a/apps/web-antd/public/merge/Production_U2_lv9.png and b/apps/web-antd/public/merge/Production_U2_lv9.png differ diff --git a/apps/web-antd/src/api/core/log.ts b/apps/web-antd/src/api/core/log.ts index a294d0a..e82ea7c 100644 --- a/apps/web-antd/src/api/core/log.ts +++ b/apps/web-antd/src/api/core/log.ts @@ -52,7 +52,7 @@ export interface UserLogInfo { } export interface actlog { - Time: number; + Time: number; Type: number; Param: string; } diff --git a/apps/web-antd/src/bootstrap.ts b/apps/web-antd/src/bootstrap.ts index f5bf09a..a4f4c3d 100644 --- a/apps/web-antd/src/bootstrap.ts +++ b/apps/web-antd/src/bootstrap.ts @@ -4,7 +4,6 @@ import { registerAccessDirective } from '@vben/access'; import { preferences } from '@vben/preferences'; import { initStores } from '@vben/stores'; import '@vben/styles'; -import '@vben/styles/antd'; import { useTitle } from '@vueuse/core'; import { $t, setupI18n } from '#/locales'; diff --git a/apps/web-antd/src/component/modal/orderComponent.vue b/apps/web-antd/src/component/modal/orderComponent.vue index b71d9af..52a3c92 100644 --- a/apps/web-antd/src/component/modal/orderComponent.vue +++ b/apps/web-antd/src/component/modal/orderComponent.vue @@ -6,8 +6,10 @@ import { CardHeader, CardTitle, VbenIcon, + VbenPopover } from '../../../../../packages/@core/ui-kit/shadcn-ui'; import type { Order } from '#/model/type'; +import { computed, toRefs } from 'vue'; interface Props { items: Order[]; title: string; @@ -17,9 +19,10 @@ defineOptions({ name: 'WorkbenchProject', }); -withDefaults(defineProps(), { +const props = withDefaults(defineProps(), { items: () => [], }); +const { items, title } = toRefs(props); function getTagColor(diff: number): string { if (diff === 1) { return 'green'; @@ -32,13 +35,69 @@ function getTagColor(diff: number): string { } return 'red'; } +const orderTypeMeta: Record = { + 1: { name: '普通订单', desc: '自动生成的基础订单。' }, + 2: { name: '额外订单(弃用)', desc: '历史类型,当前已弃用。' }, + 3: { name: '超级订单', desc: '奖励更高,难度更大的订单类型。' }, + 4: { name: '预热订单', desc: '用于活动或阶段开始前的预热内容。' }, + 5: { name: '触发订单', desc: '由特定事件或条件触发生成。' }, + 6: { name: '退役发射器清理订单', desc: '用于清理退役发射器相关棋子。' }, + 7: { name: '清理无法生成订单的棋子', desc: '处理异常或失效的棋子。' }, + 8: { name: '棋盘空格不足清理订单', desc: '当空间不足时清理低优先级棋子。' }, + 9: { name: '安慰订单', desc: '与安慰或情绪相关的特殊订单。' }, + 10: { name: '引导订单', desc: '用于新手或阶段引导流程。' }, + 11: { name: '消耗品订单', desc: '与宠物系统相关的订单。' }, + 12: { name: '预览订单', desc: '提前展示后续内容的预览类订单。' }, + 13: { name: '预设订单', desc: '新手过程从配置中生成的订单!' }, + 14: { name: 'Playroom装饰物订单', desc: '生成与Playroom装饰物相关的订单。' }, + 15: { name: '零件订单', desc: '用于收集或合成零件的订单。' }, +}; +const popoverTypes = computed(() => { + const types = new Set(); + (items.value || []).forEach(it => { + const t = Number((it as any).group); + if (!isNaN(t)) types.add(t); + }); + return Array.from(types.values()).sort((a, b) => a - b).map(id => ({ + id, + ...orderTypeMeta[id], + })); +}); + + defineEmits(['click']);