diff --git a/apps/web-antd/.vscode/settings.json b/apps/web-antd/.vscode/settings.json
index 0a8ba92..962f8e8 100644
--- a/apps/web-antd/.vscode/settings.json
+++ b/apps/web-antd/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
     "workbench.colorTheme":"One Dark Pro",
-    "editor.fontSize": 14
+    "editor.fontSize": 14,
+    "typescript.experimental.useTsgo": false
 }
\ No newline at end of file
diff --git a/apps/web-antd/.vscode/tasks.json b/apps/web-antd/.vscode/tasks.json
new file mode 100644
index 0000000..2746007
--- /dev/null
+++ b/apps/web-antd/.vscode/tasks.json
@@ -0,0 +1,18 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "pnpm build:antd",
+			"type": "shell",
+			"command": "pnpm",
+			"args": [
+				"build:antd"
+			],
+			"options": {
+				"cwd": "D:\\Github\\admin_web"
+			},
+			"group": "build",
+			"problemMatcher": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/apps/web-antd/public/item/shop_diamond_LV1.png b/apps/web-antd/public/item/shop_diamond_LV1.png
new file mode 100644
index 0000000..36b617d
Binary files /dev/null and b/apps/web-antd/public/item/shop_diamond_LV1.png differ
diff --git a/apps/web-antd/public/item/shop_energy_LV1.png b/apps/web-antd/public/item/shop_energy_LV1.png
new file mode 100644
index 0000000..69c4cb0
Binary files /dev/null and b/apps/web-antd/public/item/shop_energy_LV1.png differ
diff --git a/apps/web-antd/public/merge_pic_expplate2.png b/apps/web-antd/public/merge_pic_expplate2.png
new file mode 100644
index 0000000..b41be46
Binary files /dev/null and b/apps/web-antd/public/merge_pic_expplate2.png differ
diff --git a/apps/web-antd/src/api/core/log.ts b/apps/web-antd/src/api/core/log.ts
index eb6d52e..e5ef5b1 100644
--- a/apps/web-antd/src/api/core/log.ts
+++ b/apps/web-antd/src/api/core/log.ts
@@ -1,4 +1,5 @@
 import { requestClient } from '#/api/request';
+import type { friendRecord } from '#/model/type';
 
 export interface UserData {
   data: object[];
@@ -55,6 +56,8 @@ export interface UserLogInfo {
   ChessMap?:string;
   Heatmap?: heatType[];
   ActLog?:actlog[];
+  MaxCharge?: number;
+  FriendList?: friendRecord[];
 }
 
 export interface actlog {
diff --git a/apps/web-antd/src/api/core/mail.ts b/apps/web-antd/src/api/core/mail.ts
index 2161d30..5e466aa 100644
--- a/apps/web-antd/src/api/core/mail.ts
+++ b/apps/web-antd/src/api/core/mail.ts
@@ -23,6 +23,9 @@ export interface MailData {
     send_type: number;
     to_uids :string;
     create_time?: number;
+    title_es_latam?: string;
+    subTitle_es_latam?: string;
+    content_es_latam?: string;
 }
 
 export interface MailListParam {
diff --git a/apps/web-antd/src/api/core/server.ts b/apps/web-antd/src/api/core/server.ts
index 0aff971..2c5cc82 100644
--- a/apps/web-antd/src/api/core/server.ts
+++ b/apps/web-antd/src/api/core/server.ts
@@ -28,6 +28,7 @@ export interface ServerData {
   MemUsage?: number;
   ClientVersion?: string;
   Tags?: string[];
+  Latency?: number;
 }
 
 export interface editServerParam {
diff --git a/apps/web-antd/src/component/index.ts b/apps/web-antd/src/component/index.ts
index 000393e..439293b 100644
--- a/apps/web-antd/src/component/index.ts
+++ b/apps/web-antd/src/component/index.ts
@@ -5,5 +5,6 @@ import assetModal from "./modal/asset.vue";
 import orderComponent from "./modal/orderComponent.vue";
 import chessComponent from "./modal/chessComponent.vue";
 import type {dataType} from "./calendar/index.vue";
-export { eventTable, calendar, eventModal, assetModal, orderComponent, chessComponent };
+import friendComponent from "./user/friend/index.vue";
+export { eventTable, calendar, eventModal, assetModal, orderComponent, chessComponent, friendComponent };
 export type { dataType };
diff --git a/apps/web-antd/src/component/modal/chessComponent.vue b/apps/web-antd/src/component/modal/chessComponent.vue
index 1784864..2cd5ede 100644
--- a/apps/web-antd/src/component/modal/chessComponent.vue
+++ b/apps/web-antd/src/component/modal/chessComponent.vue
@@ -25,13 +25,14 @@ defineEmits(['click']);
 </script>
 
 <template>
-    <Card>
-        <CardHeader class="py-4 border-border border-b">
+    <Card class="hover:shadow-lg">
+        <CardHeader class="py-4  border-b">
             <CardTitle class="text-lg">{{ title }}</CardTitle>
         </CardHeader>
-        <CardContent class="flex flex-wrap p-0">
+        <CardContent class="flex flex-wrap p-0" style="background-color: rgb(132, 86, 68);">
+            <div class="flex flex-wrap items-center justify-center w-full h-full mt-1 mb-1">
             <template v-for="(item, index) in [...items].sort((a, b) => a.Pos - b.Pos)" :key="index">
-                <div class="border-border group cursor-pointer border-b border-r border-t p-0 transition-all hover:shadow-xl flex-none"
+                <div class=" group cursor-pointer border-b border-r border-t p-0 transition-all hover:shadow-xl flex-none"
                     :style="{ width: '35px', height: '35px', backgroundColor: index % 2 === 1 ? '#ced1ca' : '#dde0d7' }"
                     style="position: relative;" :id="index.toString()">
                     <img v-if="item.Icon" :src="`../../../merge/${item.Icon}.png`"
@@ -41,6 +42,7 @@ defineEmits(['click']);
                 </div>
                 <div v-if="(index + 1) % 7 === 0" class="w-full h-0" :id="(index + 1).toString()"></div>
             </template>
+            </div>
         </CardContent>
     </Card>
 </template>
diff --git a/apps/web-antd/src/component/user/friend/friend_item.vue b/apps/web-antd/src/component/user/friend/friend_item.vue
new file mode 100644
index 0000000..237e7f4
--- /dev/null
+++ b/apps/web-antd/src/component/user/friend/friend_item.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import {Tag} from "ant-design-vue";
+import { VbenAvatar } from '../../../../../../packages/@core/ui-kit/shadcn-ui/src/components';
+import type {friendRecord} from "#/model/type";
+defineProps({
+    // 定义一个名为 "friend" 的 prop，类型为对象，包含好友的相关信息
+    friend: {
+        type: Object as () => friendRecord,
+        required: true, // 这个 prop 是必需的
+    },
+});
+</script>
+
+<template>
+    <div class="flex items-center p-4 border-b border-black pl-12  ml-4 mr-4 mt-2 w-[60%]" style="background: rgb(255, 254, 231);border-radius: 1cm; padding: 1px 10px 1px 10px;justify-content: space-between;">
+         <VbenAvatar :src="'./' + friend.avatarUrl" class="w-12 h-12 rounded-full " />
+         <div class="ml-5 w-full">
+            <div class="flex flex-row items-center w-full">
+             <h2 class="text-sm font-semibold text-black">{{ friend.NickName }}</h2>
+             <Tag class="text-xs ml-2" color="green" v-if="friend.onlineStatus">在线</Tag>
+             <Tag class="text-xs ml-2" color="red" v-else>离线</Tag>
+            </div>
+             <p class="text-xs text-gray-500">uid:{{ friend.Uid }}</p>
+         </div>
+         <div class="ml-40 flex items-center relative">
+            <img src="../../../../public/merge_pic_expplate2.png" />
+            <span class="absolute inset-0 flex items-center justify-center text-white font-bold">Lv.{{ friend.Level }}</span>
+         </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/component/user/friend/index.vue b/apps/web-antd/src/component/user/friend/index.vue
new file mode 100644
index 0000000..1737d34
--- /dev/null
+++ b/apps/web-antd/src/component/user/friend/index.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import firendItem from "./friend_item.vue";
+import { Pagination } from "ant-design-vue";
+import { ref } from "vue";
+import {
+    Card,
+    CardContent,
+    CardHeader,
+    CardTitle,
+} from '../../../../../../packages/@core/ui-kit/shadcn-ui';
+import type { friendRecord } from "../../../model/type";
+import CardFooter from "../../../../../../packages/@core/ui-kit/shadcn-ui/src/ui/card/CardFooter.vue";
+defineProps({
+    Items: {
+        type: Array as () => friendRecord[],
+        required: true
+    },
+    title: {
+        type: String,
+        required: true
+    }
+})
+const currentPage = ref(1);
+</script>
+
+<template>
+    <Card style="background-color: rgb(236, 214, 179);" class="hover:shadow-lg">
+        <CardHeader class="py-4 border-b border-gray-200">
+            <CardTitle class="text-lg">
+                <div class="flex">
+                    <span class="text-center text-black">{{ title }}</span>
+                </div>
+            </CardTitle>
+        </CardHeader>
+        <CardContent class="flex flex-wrap p-0 items-center justify-center ">
+                <template v-if="Items.length === 0">
+                    <div class="flex flex-col items-center justify-center w-full h-full py-10">
+                        <p class="text-gray-500">暂无好友数据</p>
+                    </div>
+                </template>
+            <template v-for="(item, index) in Items.slice((currentPage - 1) * 10, currentPage * 10)" :key="index">
+                <firendItem :friend="item"></firendItem>
+            </template>
+        </CardContent>
+        <CardFooter class="py-4 flex flex-col items-center border-t border-gray-200 mt-2">
+            <Pagination 
+            v-model:current="currentPage"
+            :total="Items.length"
+            :pageSize="10"
+            :showSizeChanger="false"
+            >
+
+            </Pagination>
+        </CardFooter>
+    </Card>
+</template>
\ No newline at end of file
diff --git a/apps/web-antd/src/model/type.ts b/apps/web-antd/src/model/type.ts
index 039589f..e3c33cb 100644
--- a/apps/web-antd/src/model/type.ts
+++ b/apps/web-antd/src/model/type.ts
@@ -84,3 +84,13 @@ export interface scriptsRecord{
     code: number;
     color?: string;
 }
+
+export interface friendRecord{
+    Uid: number;
+    NickName: string;
+    avatarUrl: string;
+    Level: number;
+    LogoutTime?: string;
+    LoginTime: string;
+    onlineStatus?: boolean;
+}
diff --git a/apps/web-antd/src/preferences.ts b/apps/web-antd/src/preferences.ts
index ac9a95d..38927e2 100644
--- a/apps/web-antd/src/preferences.ts
+++ b/apps/web-antd/src/preferences.ts
@@ -16,7 +16,7 @@ export const overridesPreferences = defineOverridesPreferences({
     companySiteLink: 'https://bywaystudios.com',
   },
   footer: {
-    enable: true,
+    enable: false,
   },
   logo: {
     source: import.meta.env.VITE_APP_LOGO || 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-v1.webp',
diff --git a/apps/web-antd/src/store/glossary.json b/apps/web-antd/src/store/glossary.json
index bd46a67..311f8be 100644
--- a/apps/web-antd/src/store/glossary.json
+++ b/apps/web-antd/src/store/glossary.json
@@ -1,792 +1,926 @@
 [
   {
     "no": 1,
-    "inGameGlossary": "Merge",
+    "term": "Merge",
     "introduction": "Core gameplay. Combine two items together, they'll turn into a new higher-level item.",
     "screenshot": "",
-    "zhCN": "合成",
-    "ptBR": "Combinar",
-    "notes": "",
-    "esLATAM": "Combinar"
+    "zh_CN": "合成",
+    "pt_BR": "Combinar",
+    "note": "",
+    "es_LATAM": "Combinar"
   },
   {
     "no": 2,
-    "inGameGlossary": "Pet Coin",
-    "introduction": "Pet Coin is an in-game soft currency earned by completing orders, and it's used to progress the story.",
+    "term": "Pet Coin",
+    "introduction": "Pet Coin is an in-game soft currency earned by completing orders, and it’s used to progress the story.",
     "screenshot": "",
-    "zhCN": "宠物币",
-    "ptBR": "Moeda Pet",
-    "notes": "",
-    "esLATAM": "Moneda de mascota"
+    "zh_CN": "宠物币",
+    "pt_BR": "Moeda Pet",
+    "note": "",
+    "es_LATAM": "Moneda de mascota"
   },
   {
     "no": 3,
-    "inGameGlossary": "Time-limited Event",
+    "term": "Time-limited Event",
     "introduction": "",
     "screenshot": "",
-    "zhCN": "限时事件",
-    "ptBR": "Evento por tempo limitado",
-    "notes": "",
-    "esLATAM": "Evento de duración limitada"
+    "zh_CN": "限时事件",
+    "pt_BR": "Evento por tempo limitado",
+    "note": "",
+    "es_LATAM": "Evento de duración limitada"
   },
   {
     "no": 4,
-    "inGameGlossary": "Meowment",
+    "term": "Meowment",
     "introduction": "Meowment or Meowment: Merge & Makeover is the name of this game. It is created by combining Meow and Moment.",
     "screenshot": "",
-    "zhCN": "喵喵喵之家",
-    "ptBR": "Meowment",
-    "notes": "",
-    "esLATAM": "Meowment"
+    "zh_CN": "喵喵喵之家",
+    "pt_BR": "Meowment",
+    "note": "",
+    "es_LATAM": "Meowment"
   },
   {
     "no": 5,
-    "inGameGlossary": "Energy",
+    "term": "Energy",
     "introduction": "Energy is one of the in-game basic resources. Used to produce products.",
     "screenshot": "",
-    "zhCN": "体力",
-    "ptBR": "Energia",
-    "notes": "",
-    "esLATAM": "Energía"
+    "zh_CN": "体力",
+    "pt_BR": "Energia",
+    "note": "",
+    "es_LATAM": "Energía"
   },
   {
     "no": 6,
-    "inGameGlossary": "Diamond",
+    "term": "Diamond",
     "introduction": "Energy is an in-game soft currency earned by charging or some events.",
     "screenshot": "",
-    "zhCN": "钻石",
-    "ptBR": "Diamante",
-    "notes": "",
-    "esLATAM": "Diamante"
+    "zh_CN": "钻石",
+    "pt_BR": "Diamante",
+    "note": "",
+    "es_LATAM": "Diamante"
   },
   {
     "no": 7,
-    "inGameGlossary": "Scissors",
+    "term": "Scissors",
     "introduction": "Scissorsis a tool to divide one product to two with lower level.",
     "screenshot": "",
-    "zhCN": "分离器",
-    "ptBR": "Tesoura",
-    "notes": "",
-    "esLATAM": "Tijera"
+    "zh_CN": "分离器",
+    "pt_BR": "Tesoura",
+    "note": "",
+    "es_LATAM": "Tijera"
   },
   {
     "no": 8,
-    "inGameGlossary": "Magic Wand",
+    "term": "Magic Wand",
     "introduction": "Magic Wand a tool to upgrade one product to higher level.",
     "screenshot": "",
-    "zhCN": "魔术棒",
-    "ptBR": "Varinha mágica",
-    "notes": "",
-    "esLATAM": "Varita mágica"
+    "zh_CN": "魔术棒",
+    "pt_BR": "Varinha mágica",
+    "note": "",
+    "es_LATAM": "Varita mágica"
   },
   {
     "no": 9,
-    "inGameGlossary": "Piggy Bank",
+    "term": "Piggy Bank",
     "introduction": "Piggy Bank is an item that player can save diamond in it by finishing orders.",
     "screenshot": "",
-    "zhCN": "小猪存钱罐",
-    "ptBR": "Cofrinho",
-    "notes": "Its in-game image is a piggy bank. Can this image be incorporated into the name? (P.S. If adding it makes the name too long, please keep the original name.)",
-    "esLATAM": "Alcancía"
+    "zh_CN": "小猪存钱罐",
+    "pt_BR": "Cofrinho",
+    "note": "Its in-game image is a piggy bank. Can this image be incorporated into the name? (P.S. If adding it makes the name too long, please keep the original name.)",
+    "es_LATAM": "Alcancía"
   },
   {
     "no": 10,
-    "inGameGlossary": "Main Scene",
+    "term": "Main Scene",
     "introduction": "The scene shows entrance to other functions.",
     "screenshot": "",
-    "zhCN": "主场景",
-    "ptBR": "Cena Principal",
-    "notes": "",
-    "esLATAM": "Escena principal"
+    "zh_CN": "主场景",
+    "pt_BR": "Cena Principal",
+    "note": "",
+    "es_LATAM": "Escena principal"
   },
   {
     "no": 11,
-    "inGameGlossary": "Merge Scene",
+    "term": "Merge Scene",
     "introduction": "The scene players merging and finishing orders.",
     "screenshot": "",
-    "zhCN": "合成场景",
-    "ptBR": "Cena de Combinação",
-    "notes": "",
-    "esLATAM": "Escena de combinación"
+    "zh_CN": "合成场景",
+    "pt_BR": "Cena de Combinação",
+    "note": "",
+    "es_LATAM": "Escena de combinación"
   },
   {
     "no": 12,
-    "inGameGlossary": "Story Scene/Decorate Scene",
+    "term": "Story Scene/Decorate Scene",
     "introduction": "Players spend Pet Coins and materrials to finish decoration and unlock story.",
     "screenshot": "",
-    "zhCN": "装饰场景",
-    "ptBR": "Cena de História/Decoração",
-    "notes": "",
-    "esLATAM": "Escena histórica/Escena de decoración"
+    "zh_CN": "装饰场景",
+    "pt_BR": "Cena de História/Decoração",
+    "note": "",
+    "es_LATAM": "Escena histórica/Escena de decoración"
   },
   {
     "no": 13,
-    "inGameGlossary": "Pet Home",
+    "term": "Pet Home",
     "introduction": "The scene players can pet the kitten.",
     "screenshot": "",
-    "zhCN": "宠物室",
-    "ptBR": "Casa dos Pets",
-    "notes": "",
-    "esLATAM": "Casa de las Mascotas"
+    "zh_CN": "宠物室",
+    "pt_BR": "Casa dos Pets",
+    "note": "",
+    "es_LATAM": "Casa de las Mascotas"
   },
   {
     "no": 14,
-    "inGameGlossary": "Pet Playroom",
+    "term": "Pet Playroom",
     "introduction": "The main room in Pet Home where players can play with the kitten.",
     "screenshot": "",
-    "zhCN": "休息室",
-    "ptBR": "Sala de Brincadeiras",
-    "notes": "",
-    "esLATAM": "Sala de Juegos"
+    "zh_CN": "休息室",
+    "pt_BR": "Sala de Brincadeiras",
+    "note": "",
+    "es_LATAM": "Sala de Juegos"
   },
   {
     "no": 15,
-    "inGameGlossary": "Kitchen",
+    "term": "Kitchen",
     "introduction": "The second room in Pet Playroom where players can buy foods and feeding the kitten.",
     "screenshot": "",
-    "zhCN": "厨房",
-    "ptBR": "Cozinha",
-    "notes": "",
-    "esLATAM": "Cocina"
+    "zh_CN": "厨房",
+    "pt_BR": "Cozinha",
+    "note": "",
+    "es_LATAM": "Cocina"
   },
   {
     "no": 16,
-    "inGameGlossary": "Bathroom",
+    "term": "Bathroom",
     "introduction": "The third room in Pet Playroom where players can buy soaps and washing the kitten.",
     "screenshot": "",
-    "zhCN": "浴室",
-    "ptBR": "Banheiro",
-    "notes": "",
-    "esLATAM": "Baño"
+    "zh_CN": "浴室",
+    "pt_BR": "Banheiro",
+    "note": "",
+    "es_LATAM": "Baño"
   },
   {
     "no": 17,
-    "inGameGlossary": "Cloakroom",
+    "term": "Cloakroom",
     "introduction": "The fourth room in Pet Playroom where players can decorate the kitten.",
     "screenshot": "",
-    "zhCN": "试衣间",
-    "ptBR": "Vestiário",
-    "notes": "",
-    "esLATAM": "Guardarropa"
+    "zh_CN": "试衣间",
+    "pt_BR": "Vestiário",
+    "note": "",
+    "es_LATAM": "Guardarropa"
   },
   {
     "no": 18,
-    "inGameGlossary": "Food Shop",
+    "term": "Food Shop",
     "introduction": "The shop in Kitchen where players can by Food.",
     "screenshot": "",
-    "zhCN": "美食屋",
-    "ptBR": "Loja de Alimentos",
-    "notes": "",
-    "esLATAM": "Tienda de Alimentos"
+    "zh_CN": "美食屋",
+    "pt_BR": "Loja de Alimentos",
+    "note": "",
+    "es_LATAM": "Tienda de Alimentos"
   },
   {
     "no": 19,
-    "inGameGlossary": "Soap Shop",
+    "term": "Soap Shop",
     "introduction": "The shop in Bathroom where players can by Soap.",
     "screenshot": "",
-    "zhCN": "香皂铺",
-    "ptBR": "Loja de Sabonetes",
-    "notes": "",
-    "esLATAM": "Tienda de Jabones"
+    "zh_CN": "香皂铺",
+    "pt_BR": "Loja de Sabonetes",
+    "note": "",
+    "es_LATAM": "Tienda de Jabones"
   },
   {
     "no": 20,
-    "inGameGlossary": "Pet Treasure",
+    "term": "Pet Treasure",
     "introduction": "Players can saving Pet Coins into the treasure box by finishing orders after they finished the Pet Home.Once they saved at least 200 Pet Coins and have at least 5 friends, they will be able to play a mini game and get reward.",
     "screenshot": "",
-    "zhCN": "宠物宝藏",
-    "ptBR": "Tesouro dos Pets",
-    "notes": "",
-    "esLATAM": "Tesoro de las Mascotas"
+    "zh_CN": "宠物宝藏",
+    "pt_BR": "Tesouro dos Pets",
+    "note": "",
+    "es_LATAM": "Tesoro de las Mascotas"
   },
   {
     "no": 21,
-    "inGameGlossary": "Visit",
+    "term": "Visit",
     "introduction": "Players can go to visit another player every time they petted the kitten 5 times. They will finish a mini game and get reward.",
     "screenshot": "",
-    "zhCN": "拜访",
-    "ptBR": "Visita",
-    "notes": "",
-    "esLATAM": "Visitar"
+    "zh_CN": "拜访",
+    "pt_BR": "Visita",
+    "note": "",
+    "es_LATAM": "Visitar"
   },
   {
     "no": 22,
-    "inGameGlossary": "CAT TEASER",
+    "term": "CAT TEASER",
     "introduction": "One of the visiting mini games. Try to catch the kitten and get better reward.",
     "screenshot": "",
-    "zhCN": "愿猫上钩",
-    "ptBR": "Pega o Gato",
-    "notes": "The English original refers to a mini-game where players \"try to catch the kitten and get better rewards.\" The current translation \"Brinquedo de Gato\" literally means \"cat toy,\" failing to accurately convey the game's action (teasing or catching).",
-    "esLATAM": "Captura al Gatito"
+    "zh_CN": "愿猫上钩",
+    "pt_BR": "Pega o Gato",
+    "note": "The English original refers to a mini-game where players \"try to catch the kitten and get better rewards.\" The current translation \"Brinquedo de Gato\" literally means \"cat toy,\" failing to accurately convey the game's action (teasing or catching).",
+    "es_LATAM": "Captura al Gatito"
   },
   {
     "no": 23,
-    "inGameGlossary": "CAT TREASURE",
+    "term": "CAT TREASURE",
     "introduction": "One of the visiting mini games. Try to find three same items and get better reward.",
     "screenshot": "",
-    "zhCN": "猫猫秘宝",
-    "ptBR": "Tesouro do Gato",
-    "notes": "",
-    "esLATAM": "Tesoro del Gato"
+    "zh_CN": "猫猫秘宝",
+    "pt_BR": "Tesouro do Gato",
+    "note": "",
+    "es_LATAM": "Tesoro del Gato"
   },
   {
     "no": 24,
-    "inGameGlossary": "HIDE & SEEK",
+    "term": "HIDE & SEEK",
     "introduction": "One of the visiting mini games. Try to find the kitten and get better reward.",
     "screenshot": "",
-    "zhCN": "捉迷藏",
-    "ptBR": "Esconde-esconde",
-    "notes": "",
-    "esLATAM": "Escondidas"
+    "zh_CN": "捉迷藏",
+    "pt_BR": "Esconde-esconde",
+    "note": "",
+    "es_LATAM": "Escondidas"
   },
   {
     "no": 25,
-    "inGameGlossary": "Little Helper",
+    "term": "Little Helper",
     "introduction": "Let the kitten peoduce products when players are offline.",
     "screenshot": "",
-    "zhCN": "小猫打工",
-    "ptBR": "Ajuda Felina",
-    "notes": "The English original means \"let the kitten produce products when players are offline.\" The current translation \"Ajudante\" simply means \"assistant,\" which is too generic and does not highlight the role of the kitten.",
-    "esLATAM": "Gatito Ayudante"
+    "zh_CN": "小猫打工",
+    "pt_BR": "Ajuda Felina",
+    "note": "The English original means \"let the kitten produce products when players are offline.\" The current translation \"Ajudante\" simply means \"assistant,\" which is too generic and does not highlight the role of the kitten.",
+    "es_LATAM": "Gatito Ayudante"
   },
   {
     "no": 26,
-    "inGameGlossary": "Flight Device",
+    "term": "Flight Device",
     "introduction": "A special decoration used when the kitten works.",
     "screenshot": "",
-    "zhCN": "飞行器",
-    "ptBR": "Aparelho de Voo",
-    "notes": "",
-    "esLATAM": "Dispositivo de Vuelo"
+    "zh_CN": "飞行器",
+    "pt_BR": "Aparelho de Voo",
+    "note": "",
+    "es_LATAM": "Dispositivo de Vuelo"
   },
   {
     "no": 27,
-    "inGameGlossary": "Merge",
-    "introduction": "Drag one product to another same product to make them a higer level product.",
+    "term": "Board",
+    "introduction": "The area players can play merging.",
     "screenshot": "",
-    "zhCN": "合成",
-    "ptBR": "Combinar",
-    "notes": "",
-    "esLATAM": "Combinar"
+    "zh_CN": "棋盘",
+    "pt_BR": "Tabuleiro",
+    "note": "",
+    "es_LATAM": "Tablero"
   },
   {
     "no": 28,
-    "inGameGlossary": "Board",
-    "introduction": "The area players can play merging.",
+    "term": "Order",
+    "introduction": "Request specific product. Players can submit requested products to finish one order and get reward such as Pet Coin,Cat Food or Materials.",
     "screenshot": "",
-    "zhCN": "棋盘",
-    "ptBR": "Tabuleiro",
-    "notes": "",
-    "esLATAM": "Tablero"
+    "zh_CN": "订单",
+    "pt_BR": "Pedido",
+    "note": "",
+    "es_LATAM": "Pedido"
   },
   {
     "no": 29,
-    "inGameGlossary": "Order",
-    "introduction": "Request specific product. Players can submit requested products to finish one order and get reward such as Pet Coin,Cat Food or Materials.",
+    "term": "Producer",
+    "introduction": "Click the producer will spend energy and get its products. Different producer can provide different products.",
     "screenshot": "",
-    "zhCN": "订单",
-    "ptBR": "Pedido",
-    "notes": "",
-    "esLATAM": "Pedido"
+    "zh_CN": "发射器",
+    "pt_BR": "Produtor",
+    "note": "The English original refers to \"click the producer to spend energy and get its products.\" The current translation \"Gerador\" means \"generator,\" which may not be accurate in the game context; the Chinese translation \"发射器\" leans more towards an action-oriented term.",
+    "es_LATAM": "Productor"
   },
   {
     "no": 30,
-    "inGameGlossary": "Producer",
-    "introduction": "Click the producer will spend energy and get its products. Different producer can provide different products.",
+    "term": "Product",
+    "introduction": "Items gotten from producers. Products can be merged to upgarde.",
     "screenshot": "",
-    "zhCN": "发射器",
-    "ptBR": "Produtor",
-    "notes": "The English original refers to \"click the producer to spend energy and get its products.\" The current translation \"Gerador\" means \"generator,\" which may not be accurate in the game context; the Chinese translation \"发射器\" leans more towards an action-oriented term.",
-    "esLATAM": "Productor"
+    "zh_CN": "产物",
+    "pt_BR": "Produto",
+    "note": "The English original specifically means \"items obtained from producers.\" The current translation \"Item\" is too generic and does not reflect the \"product\" nature of being produced.",
+    "es_LATAM": "Producto"
   },
   {
     "no": 31,
-    "inGameGlossary": "Product",
-    "introduction": "Items gotten from producers. Products can be merged to upgarde.",
+    "term": "Bubble",
+    "introduction": "Randomly appear when merging products. Player can open the bubble by watching ADs or paying diamonds to get an extra product in the bubble.",
     "screenshot": "",
-    "zhCN": "产物",
-    "ptBR": "Produto",
-    "notes": "The English original specifically means \"items obtained from producers.\" The current translation \"Item\" is too generic and does not reflect the \"product\" nature of being produced.",
-    "esLATAM": "Producto"
+    "zh_CN": "气泡",
+    "pt_BR": "Bolha",
+    "note": "",
+    "es_LATAM": "Burbuja"
   },
   {
     "no": 32,
-    "inGameGlossary": "Bubble",
-    "introduction": "Randomly appear when merging products. Player can open the bubble by watching ADs or paying diamonds to get an extra product in the bubble.",
+    "term": "Material",
+    "introduction": "Can be gotten by finishing orders. Some decorating steps will need to spend materials.",
     "screenshot": "",
-    "zhCN": "气泡",
-    "ptBR": "Bolha",
-    "notes": "",
-    "esLATAM": "Burbuja"
+    "zh_CN": "材料",
+    "pt_BR": "Material",
+    "note": "",
+    "es_LATAM": "Material"
   },
   {
     "no": 33,
-    "inGameGlossary": "Material",
-    "introduction": "Can be gotten by finishing orders. Some decorating steps will need to spend materials.",
+    "term": "Shop",
+    "introduction": "Where players can buy items by cash or diamond.",
     "screenshot": "",
-    "zhCN": "材料",
-    "ptBR": "Material",
-    "notes": "",
-    "esLATAM": "Material"
+    "zh_CN": "商店",
+    "pt_BR": "Loja",
+    "note": "",
+    "es_LATAM": "Tienda"
   },
   {
     "no": 34,
-    "inGameGlossary": "Shop",
-    "introduction": "Where players can buy items by cash or diamond.",
+    "term": "Weekly Gift",
+    "introduction": "Every time players login for the first time that day they will get a gift which loops every 7 days.",
     "screenshot": "",
-    "zhCN": "商店",
-    "ptBR": "Loja",
-    "notes": "",
-    "esLATAM": "Tienda"
+    "zh_CN": "七日签到礼",
+    "pt_BR": "Presente semanal",
+    "note": "",
+    "es_LATAM": "Regalo Semanal"
   },
   {
     "no": 35,
-    "inGameGlossary": "Weekly Gift",
-    "introduction": "Every time players login for the first time that day they will get a gift which loops every 7 days.",
+    "term": "Endless Gift",
+    "introduction": "One special pack that play can buy it endless times everyday.",
     "screenshot": "",
-    "zhCN": "七日签到礼",
-    "ptBR": "Presente semanal",
-    "notes": "",
-    "esLATAM": "Regalo Semanal"
+    "zh_CN": "无尽礼包",
+    "pt_BR": "Presente infinito",
+    "note": "",
+    "es_LATAM": "Regalo Infinito"
   },
   {
     "no": 36,
-    "inGameGlossary": "Endless Gift",
-    "introduction": "One special pack that play can buy it endless times everyday.",
+    "term": "Storage",
+    "introduction": "Where players can save items from board.",
     "screenshot": "",
-    "zhCN": "无尽礼包",
-    "ptBR": "Presente infinito",
-    "notes": "",
-    "esLATAM": "Regalo Infinito"
+    "zh_CN": "仓库",
+    "pt_BR": "Inventário",
+    "note": "",
+    "es_LATAM": "Almacén"
   },
   {
     "no": 37,
-    "inGameGlossary": "Storage",
-    "introduction": "Where players can save items from board.",
+    "term": "Hall of Honor",
+    "introduction": "A special page in Storage that saving retired producers.",
     "screenshot": "",
-    "zhCN": "仓库",
-    "ptBR": "Inventário",
-    "notes": "",
-    "esLATAM": "Almacén"
+    "zh_CN": "荣誉室",
+    "pt_BR": "Salão de Honra",
+    "note": "The English original means \"Hall of Honor.\" The current translation \"Hall da Fama\" means \"Hall of Fame,\" which slightly deviates from the concept of \"honor\" (\"Fama\" emphasizes fame rather than honor).",
+    "es_LATAM": "Salón de Honor"
   },
   {
     "no": 38,
-    "inGameGlossary": "Hall of Honor",
-    "introduction": "A special page in Storage that saving retired producers.",
+    "term": "Level",
+    "introduction": "Players' level. It needs EXP gotten from finishing decorations and petting the kitten,",
     "screenshot": "",
-    "zhCN": "荣誉室",
-    "ptBR": "Salão de Honra",
-    "notes": "The English original means \"Hall of Honor.\" The current translation \"Hall da Fama\" means \"Hall of Fame,\" which slightly deviates from the concept of \"honor\" (\"Fama\" emphasizes fame rather than honor).",
-    "esLATAM": "Salón de Honor"
+    "zh_CN": "等级",
+    "pt_BR": "Nível",
+    "note": "",
+    "es_LATAM": "Nivel; Nv. (Abbreviation)"
   },
   {
     "no": 39,
-    "inGameGlossary": "Level",
-    "introduction": "Players' level. It needs EXP gotten from finishing decorations and petting the kitten,",
+    "term": "Bonding Map",
+    "introduction": "The player's level list.",
     "screenshot": "",
-    "zhCN": "等级",
-    "ptBR": "Nível",
-    "notes": "",
-    "esLATAM": "Nivel\nNv. (Abbreviation)"
+    "zh_CN": "心路历程",
+    "pt_BR": "Caminho do Coração",
+    "note": "The English original refers to \"the player's level list.\" The current translation \"Mapa de Afinidade\" means \"Affinity Map,\" which does not match the concept of a level list; the Chinese translation \"心路历程\" also emphasizes growth.",
+    "es_LATAM": "Mapa de Vínculo"
   },
   {
     "no": 40,
-    "inGameGlossary": "Bonding Map",
-    "introduction": "The player's level list.",
+    "term": "Level Up Reward",
+    "introduction": "The items players can get aftering leveling up.",
     "screenshot": "",
-    "zhCN": "心路历程",
-    "ptBR": "Caminho do Coração",
-    "notes": "The English original refers to \"the player's level list.\" The current translation \"Mapa de Afinidade\" means \"Affinity Map,\" which does not match the concept of a level list; the Chinese translation \"心路历程\" also emphasizes growth.",
-    "esLATAM": "Mapa de Vínculo"
+    "zh_CN": "升级奖励",
+    "pt_BR": "Recompensa de Nível",
+    "note": "",
+    "es_LATAM": "Recompensa de Nivel"
   },
   {
     "no": 41,
-    "inGameGlossary": "Level Up Reward",
-    "introduction": "The items players can get aftering leveling up.",
+    "term": "Collection",
+    "introduction": "Where players can check what items they have collected in game.",
     "screenshot": "",
-    "zhCN": "升级奖励",
-    "ptBR": "Recompensa de Nível",
-    "notes": "",
-    "esLATAM": "Recompensa de Nivel"
+    "zh_CN": "图鉴",
+    "pt_BR": "Coleção",
+    "note": "",
+    "es_LATAM": "Colección"
   },
   {
     "no": 42,
-    "inGameGlossary": "Collection",
-    "introduction": "Where players can check what items they have collected in game.",
+    "term": "Daily Task",
+    "introduction": "Refresh every day for players to finish and get reward.",
     "screenshot": "",
-    "zhCN": "图鉴",
-    "ptBR": "Coleção",
-    "notes": "",
-    "esLATAM": "Colección"
+    "zh_CN": "日常任务",
+    "pt_BR": "Tarefa diária",
+    "note": "",
+    "es_LATAM": "Tarea Diaria"
   },
   {
     "no": 43,
-    "inGameGlossary": "Daily Task",
-    "introduction": "Refresh every day for players to finish and get reward.",
+    "term": "Booster Mode",
+    "introduction": "Activate Booster Mode allows players to spend more energy every click and get higher level products directly.",
     "screenshot": "",
-    "zhCN": "日常任务",
-    "ptBR": "Tarefa diária",
-    "notes": "",
-    "esLATAM": "Tarea Diaria"
+    "zh_CN": "多倍生产",
+    "pt_BR": "Modo Turbo",
+    "note": "",
+    "es_LATAM": "Modo Turbo"
   },
   {
     "no": 44,
-    "inGameGlossary": "Booster Mode",
-    "introduction": "Activate Booster Mode allows players to spend more energy every click and get higher level products directly.",
+    "term": "Friend",
+    "introduction": "One page that makes players able to play with other players.",
     "screenshot": "",
-    "zhCN": "多倍生产",
-    "ptBR": "Modo Turbo",
-    "notes": "",
-    "esLATAM": "Modo Turbo"
+    "zh_CN": "好友",
+    "pt_BR": "Amigo",
+    "note": "",
+    "es_LATAM": "Amigo"
   },
   {
     "no": 45,
-    "inGameGlossary": "Friend",
-    "introduction": "One page that makes players able to play with other players.",
+    "term": "Ranking",
+    "introduction": "A page in Friend for players to check the ranking.",
     "screenshot": "",
-    "zhCN": "好友",
-    "ptBR": "Amigo",
-    "notes": "",
-    "esLATAM": "Amigo"
+    "zh_CN": "排行榜",
+    "pt_BR": "Classificação",
+    "note": "",
+    "es_LATAM": "Clasificación"
   },
   {
     "no": 46,
-    "inGameGlossary": "Ranking",
-    "introduction": "A page in Friend for players to check the ranking.",
+    "term": "Timeline",
+    "introduction": "A page in Friend for players to check the recent events with friends.",
     "screenshot": "",
-    "zhCN": "排行榜",
-    "ptBR": "Classificação",
-    "notes": "",
-    "esLATAM": "Clasificación"
+    "zh_CN": "时间线",
+    "pt_BR": "Linha do Tempo",
+    "note": "",
+    "es_LATAM": "Línea de Tiempo"
   },
   {
     "no": 47,
-    "inGameGlossary": "Timeline",
-    "introduction": "A page in Friend for players to check the recent events with friends.",
+    "term": "Player ID",
+    "introduction": "Player's ID can be checked in menu.",
     "screenshot": "",
-    "zhCN": "时间线",
-    "ptBR": "Linha do Tempo",
-    "notes": "",
-    "esLATAM": "Línea de Tiempo"
+    "zh_CN": "玩家ID",
+    "pt_BR": "ID do Jogador",
+    "note": "",
+    "es_LATAM": "ID de Jugador"
   },
   {
     "no": 48,
-    "inGameGlossary": "Player ID",
-    "introduction": "Player's ID can be checked in menu.",
+    "term": "Device ID",
+    "introduction": "Player's Device ID can be checked in the below of Setting page.",
     "screenshot": "",
-    "zhCN": "玩家ID",
-    "ptBR": "ID do Jogador",
-    "notes": "",
-    "esLATAM": "ID de Jugador"
+    "zh_CN": "设备ID",
+    "pt_BR": "ID do Dispositivo",
+    "note": "",
+    "es_LATAM": "ID de Dispositivo"
   },
   {
     "no": 49,
-    "inGameGlossary": "Device ID",
-    "introduction": "Player's Device ID can be checked in the below of Setting page.",
+    "term": "Friend Code",
+    "introduction": "Player's Friend Code can be checked on Add Friend page.",
     "screenshot": "",
-    "zhCN": "设备ID",
-    "ptBR": "ID do Dispositivo",
-    "notes": "",
-    "esLATAM": "ID de Dispositivo"
+    "zh_CN": "好友码",
+    "pt_BR": "Código de Amigo",
+    "note": "",
+    "es_LATAM": "Clave de Amigo"
   },
   {
     "no": 50,
-    "inGameGlossary": "Friend Code",
-    "introduction": "Player's Friend Code can be checked on Add Friend page.",
+    "term": "Nickname",
+    "introduction": "Can be setted by players.",
     "screenshot": "",
-    "zhCN": "好友码",
-    "ptBR": "Código de Amigo",
-    "notes": "",
-    "esLATAM": "Clave de Amigo"
+    "zh_CN": "玩家昵称",
+    "pt_BR": "Apelido",
+    "note": "",
+    "es_LATAM": "Apodo"
   },
   {
     "no": 51,
-    "inGameGlossary": "Nickname",
+    "term": "Avatar",
     "introduction": "Can be setted by players.",
     "screenshot": "",
-    "zhCN": "玩家昵称",
-    "ptBR": "Apelido",
-    "notes": "",
-    "esLATAM": "Apodo"
+    "zh_CN": "头像",
+    "pt_BR": "Avatar",
+    "note": "",
+    "es_LATAM": "Avatar"
   },
   {
     "no": 52,
-    "inGameGlossary": "Avatar",
+    "term": "Frame",
     "introduction": "Can be setted by players.",
     "screenshot": "",
-    "zhCN": "头像",
-    "ptBR": "Avatar",
-    "notes": "",
-    "esLATAM": "Avatar"
+    "zh_CN": "头像框",
+    "pt_BR": "Moldura",
+    "note": "",
+    "es_LATAM": "Marco"
   },
   {
     "no": 53,
-    "inGameGlossary": "Frame",
-    "introduction": "Can be setted by players.",
+    "term": "Emoji",
+    "introduction": "Can be sent in particular events by players.",
     "screenshot": "",
-    "zhCN": "头像框",
-    "ptBR": "Moldura",
-    "notes": "",
-    "esLATAM": "Marco"
+    "zh_CN": "表情",
+    "pt_BR": "Emoji",
+    "note": "",
+    "es_LATAM": "Emoji"
   },
   {
     "no": 54,
-    "inGameGlossary": "Emoji",
-    "introduction": "Can be sent in particular events by players.",
+    "term": "Card",
+    "introduction": "A collection item in game.",
     "screenshot": "",
-    "zhCN": "表情",
-    "ptBR": "Emoji",
-    "notes": "",
-    "esLATAM": "Emoji"
+    "zh_CN": "卡片",
+    "pt_BR": "Carta",
+    "note": "",
+    "es_LATAM": "Carta"
   },
   {
     "no": 55,
-    "inGameGlossary": "Card",
-    "introduction": "A collection item in game.",
+    "term": "Card Pack",
+    "introduction": "Where players can get random cards.",
     "screenshot": "",
-    "zhCN": "卡片",
-    "ptBR": "Carta",
-    "notes": "",
-    "esLATAM": "Carta"
+    "zh_CN": "卡包",
+    "pt_BR": "Pacote de Cartas",
+    "note": "",
+    "es_LATAM": "Paquete de Cartas"
   },
   {
     "no": 56,
-    "inGameGlossary": "Card Pack",
-    "introduction": "Where players can get random cards.",
+    "term": "Album",
+    "introduction": "One group of cards. Players can get reward when they collected all cards in one Album.",
     "screenshot": "",
-    "zhCN": "卡包",
-    "ptBR": "Pacote de Cartas",
-    "notes": "",
-    "esLATAM": "Paquete de Cartas"
+    "zh_CN": "相册",
+    "pt_BR": "Álbum",
+    "note": "",
+    "es_LATAM": "Álbum"
   },
   {
     "no": 57,
-    "inGameGlossary": "Album",
-    "introduction": "One group of cards. Players can get reward when they collected all cards in one Album.",
+    "term": "Card Rarity",
+    "introduction": "The star mark on the card.",
     "screenshot": "",
-    "zhCN": "相册",
-    "ptBR": "Álbum",
-    "notes": "",
-    "esLATAM": "Álbum"
+    "zh_CN": "卡片稀有度",
+    "pt_BR": "Raridade da Carta",
+    "note": "",
+    "es_LATAM": "Rareza de la Carta"
   },
   {
     "no": 58,
-    "inGameGlossary": "Card Rarity",
-    "introduction": "The star mark on the card.",
+    "term": "Star",
+    "introduction": "Gotten when players get a repeated card,",
     "screenshot": "",
-    "zhCN": "卡片稀有度",
-    "ptBR": "Raridade da Carta",
-    "notes": "",
-    "esLATAM": "Rareza de la Carta"
+    "zh_CN": "星星",
+    "pt_BR": "Estrela",
+    "note": "",
+    "es_LATAM": "Estrella"
   },
   {
     "no": 59,
-    "inGameGlossary": "Star",
-    "introduction": "Gotten when players get a repeated card,",
+    "term": "Star Exchange",
+    "introduction": "Stars can be uesd to exchange Card Packs.",
     "screenshot": "",
-    "zhCN": "星星",
-    "ptBR": "Estrela",
-    "notes": "",
-    "esLATAM": "Estrella"
+    "zh_CN": "星星兑换",
+    "pt_BR": "Troca de Estrelas",
+    "note": "",
+    "es_LATAM": "Cambio de Estrellas"
   },
   {
     "no": 60,
-    "inGameGlossary": "Star Exchange",
-    "introduction": "Stars can be uesd to exchange Card Packs.",
+    "term": "Master Card",
+    "introduction": "Can be exchanged into any no-Golden Card.",
     "screenshot": "",
-    "zhCN": "星星兑换",
-    "ptBR": "Troca de Estrelas",
-    "notes": "",
-    "esLATAM": "Cambio de Estrellas"
+    "zh_CN": "银色万能卡",
+    "pt_BR": "Carta Mestre",
+    "note": "",
+    "es_LATAM": "Carta Maestra"
   },
   {
     "no": 61,
-    "inGameGlossary": "Master Card",
-    "introduction": "Can be exchanged into any no-Golden Card.",
+    "term": "Golden Master Card",
+    "introduction": "Can be exchanged into any Card.",
     "screenshot": "",
-    "zhCN": "银色万能卡",
-    "ptBR": "Carta Mestre",
-    "notes": "",
-    "esLATAM": "Carta Maestra"
+    "zh_CN": "金色万能卡",
+    "pt_BR": "Carta Mestre Dourada",
+    "note": "",
+    "es_LATAM": "Carta Maestra Dorada"
   },
   {
     "no": 62,
-    "inGameGlossary": "Golden Master Card",
-    "introduction": "Can be exchanged into any Card.",
+    "term": "Kitten's Gift",
+    "introduction": "Every time players finish the progress bar the kitten will send a random Time-limited Event.",
     "screenshot": "",
-    "zhCN": "金色万能卡",
-    "ptBR": "Carta Mestre Dourada",
-    "notes": "",
-    "esLATAM": "Carta Maestra Dorada"
+    "zh_CN": "小猫赠礼",
+    "pt_BR": "Presente do Gatinho",
+    "note": "",
+    "es_LATAM": "Regalo del Gatito"
   },
   {
     "no": 63,
-    "inGameGlossary": "Kitten's Gift",
-    "introduction": "Every time players finish the progress bar the kitten will send a random Time-limited Event.",
+    "term": "Chest Rain",
+    "introduction": "One of the Time-limited Events. Players can get a chest after finishing an order.",
     "screenshot": "",
-    "zhCN": "小猫赠礼",
-    "ptBR": "Presente do Gatinho",
-    "notes": "",
-    "esLATAM": "Regalo del Gatito"
+    "zh_CN": "宝箱雨",
+    "pt_BR": "Chuva de Baús",
+    "note": "",
+    "es_LATAM": "Lluvia de Baúles"
   },
   {
     "no": 64,
-    "inGameGlossary": "Chest Rain",
-    "introduction": "One of the Time-limited Events. Players can get a chest after finishing an order.",
+    "term": "Turbo Boost",
+    "introduction": "One of the Time-limited Events. Enable players to use higher level Booster Mode.",
     "screenshot": "",
-    "zhCN": "宝箱雨",
-    "ptBR": "Chuva de Baús",
-    "notes": "",
-    "esLATAM": "Lluvia de Baúles"
+    "zh_CN": "超级加倍",
+    "pt_BR": "Impulso Turbo",
+    "note": "",
+    "es_LATAM": "Impulso Turbo"
   },
   {
     "no": 65,
-    "inGameGlossary": "Turbo Boost",
-    "introduction": "One of the Time-limited Events. Enable players to use higher level Booster Mode.",
+    "term": "Bonus Coins",
+    "introduction": "One of the Time-limited Events. Players can get extra Pet Coins after finishing an order.",
     "screenshot": "",
-    "zhCN": "超级加倍",
-    "ptBR": "Impulso Turbo",
-    "notes": "",
-    "esLATAM": "Impulso Turbo"
+    "zh_CN": "猫币猎手",
+    "pt_BR": "Moedas Bônus",
+    "note": "",
+    "es_LATAM": "Bonificación de Monedas"
   },
   {
     "no": 66,
-    "inGameGlossary": "Bonus Coins",
-    "introduction": "One of the Time-limited Events. Players can get extra Pet Coins after finishing an order.",
+    "term": "Super Producer",
+    "introduction": "One of the Time-limited Events. Producer can produce unlimited times.",
     "screenshot": "",
-    "zhCN": "猫币猎手",
-    "ptBR": "Moedas Bônus",
-    "notes": "",
-    "esLATAM": "Bonificación de Monedas"
+    "zh_CN": "超级发射器",
+    "pt_BR": "Super Produtor",
+    "note": "",
+    "es_LATAM": "Super Productor"
   },
   {
     "no": 67,
-    "inGameGlossary": "Super Producer",
-    "introduction": "One of the Time-limited Events. Producer can produce unlimited times.",
+    "term": "Power Order",
+    "introduction": "One of the Time-limited Events. Players can get an extra order rewarding Card Pack.",
     "screenshot": "",
-    "zhCN": "超级发射器",
-    "ptBR": "Super Produtor",
-    "notes": "",
-    "esLATAM": "Super Productor"
+    "zh_CN": "超级订单",
+    "pt_BR": "Super Pedido",
+    "note": "The English original refers to \"an extra order rewarding Card Pack.\" The current translation \"Pedido de Poder\" means \"Power Order,\" which is too abstract and does not convey the \"super\" or \"enhanced\" meaning.",
+    "es_LATAM": "Super Pedido"
   },
   {
     "no": 68,
-    "inGameGlossary": "Power Order",
-    "introduction": "One of the Time-limited Events. Players can get an extra order rewarding Card Pack.",
+    "term": "Scene Rush",
+    "introduction": "One of the Time-limited Events. Players can get a Wheel of Fortune after finishing a scene,",
     "screenshot": "",
-    "zhCN": "超级订单",
-    "ptBR": "Super Pedido",
-    "notes": "The English original refers to \"an extra order rewarding Card Pack.\" The current translation \"Pedido de Poder\" means \"Power Order,\" which is too abstract and does not convey the \"super\" or \"enhanced\" meaning.",
-    "esLATAM": "Super Pedido"
+    "zh_CN": "场景冲刺",
+    "pt_BR": "Corrida de Cenas",
+    "note": "",
+    "es_LATAM": "Escena Frenética"
   },
   {
     "no": 69,
-    "inGameGlossary": "Scene Rush",
-    "introduction": "One of the Time-limited Events. Players can get a Wheel of Fortune after finishing a scene,",
+    "term": "Pack Boost",
+    "introduction": "One of the Time-limited Events. Players can get extra cards when opening Card Packs.",
     "screenshot": "",
-    "zhCN": "场景冲刺",
-    "ptBR": "Corrida de Cenas",
-    "notes": "",
-    "esLATAM": "Escena Frenética"
+    "zh_CN": "卡包加成",
+    "pt_BR": "Chuva de Cartas",
+    "note": "The English original means \"players can get extra cards when opening Card Packs.\" The current translation \"Pacote de Impulso\" means \"Boost Pack,\" which might be misunderstood as a type of card pack rather than a boost effect.",
+    "es_LATAM": "Potenciador de Paquetes"
   },
   {
     "no": 70,
-    "inGameGlossary": "Pack Boost",
-    "introduction": "One of the Time-limited Events. Players can get extra cards when opening Card Packs.",
+    "term": "Meow Mania",
+    "introduction": "One of the Time-limited Events. Players can get extra reward by finishing a mini game.",
     "screenshot": "",
-    "zhCN": "卡包加成",
-    "ptBR": "Chuva de Cartas",
-    "notes": "The English original means \"players can get extra cards when opening Card Packs.\" The current translation \"Pacote de Impulso\" means \"Boost Pack,\" which might be misunderstood as a type of card pack rather than a boost effect.",
-    "esLATAM": "Potenciador de Paquetes"
+    "zh_CN": "连击快手",
+    "pt_BR": "Meow Mania",
+    "note": "",
+    "es_LATAM": "Miaumanía"
   },
   {
     "no": 71,
-    "inGameGlossary": "Meow Mania",
-    "introduction": "One of the Time-limited Events. Players can get extra reward by finishing a mini game.",
+    "term": "Card-copy Cat",
+    "introduction": "One of the Time-limited Events. Players can get extra card reward when visiting other players.",
     "screenshot": "",
-    "zhCN": "连击快手",
-    "ptBR": "Meow Mania",
-    "notes": "",
-    "esLATAM": "Miaumanía"
+    "zh_CN": "宠物怪盗",
+    "pt_BR": "Gato Copiador",
+    "note": "",
+    "es_LATAM": "Gato Copiador"
   },
   {
     "no": 72,
-    "inGameGlossary": "Card-copy Cat",
-    "introduction": "One of the Time-limited Events. Players can get extra card reward when visiting other players.",
+    "term": "Golden Card Trade",
+    "introduction": "One of the Time-limited Events. Players can trade Specific golden cards.",
     "screenshot": "",
-    "zhCN": "宠物怪盗",
-    "ptBR": "Gato Copiador",
-    "notes": "",
-    "esLATAM": "Gato Copiador"
+    "zh_CN": "金卡交换",
+    "pt_BR": "Troca de Cartas Douradas",
+    "note": "The English original means \"players can trade specific golden cards.\" The current translation \"Troca de Ouro\" means \"Gold Trade,\" which could be misinterpreted as trading gold currency rather than golden cards.",
+    "es_LATAM": "Cambio de Cartas Doradas"
   },
   {
     "no": 73,
-    "inGameGlossary": "Golden Card Trade",
-    "introduction": "One of the Time-limited Events. Players can trade Specific golden cards.",
+    "term": "Mass Merge",
+    "introduction": "One of the Time-limited Events. Players can merge all same products together.",
     "screenshot": "",
-    "zhCN": "金卡交换",
-    "ptBR": "Troca de Cartas Douradas",
-    "notes": "The English original means \"players can trade specific golden cards.\" The current translation \"Troca de Ouro\" means \"Gold Trade,\" which could be misinterpreted as trading gold currency rather than golden cards.",
-    "esLATAM": "Cambio de Cartas Doradas"
+    "zh_CN": "一网打尽",
+    "pt_BR": "Combinação em Massa",
+    "note": "",
+    "es_LATAM": "Combinación Masiva"
   },
   {
     "no": 74,
-    "inGameGlossary": "Mass Merge",
-    "introduction": "One of the Time-limited Events. Players can merge all same products together.",
+    "term": "Maneki",
+    "introduction": "One of the Time-limited Events. Players can get more and more extra Pet Coins by finishing orders quickly.",
     "screenshot": "",
-    "zhCN": "一网打尽",
-    "ptBR": "Combinação em Massa",
-    "notes": "",
-    "esLATAM": "Combinación Masiva"
+    "zh_CN": "招财猫",
+    "pt_BR": "Maneki",
+    "note": "",
+    "es_LATAM": "Maneki"
   },
   {
     "no": 75,
-    "inGameGlossary": "Maneki",
-    "introduction": "One of the Time-limited Events. Players can get more and more extra Pet Coins by finishing orders quickly.",
+    "term": "Lucky Cat",
+    "introduction": "One of the Time-limited Events. Chances for players to get free Bubble when merging.",
     "screenshot": "",
-    "zhCN": "招财猫",
-    "ptBR": "Maneki",
-    "notes": "",
-    "esLATAM": "Maneki"
+    "zh_CN": "好运猫",
+    "pt_BR": "Gato da Sorte",
+    "note": "",
+    "es_LATAM": "Gato de la Suerte"
   },
   {
     "no": 76,
-    "inGameGlossary": "Lucky Cat",
-    "introduction": "One of the Time-limited Events. Chances for players to get free Bubble when merging.",
+    "term": "Recycling Day",
+    "introduction": "One of the Time-limited Events. Players can sell products at a higher price.",
     "screenshot": "",
-    "zhCN": "好运猫",
-    "ptBR": "Gato da Sorte",
-    "notes": "",
-    "esLATAM": "Gato de la Suerte"
+    "zh_CN": "回收日",
+    "pt_BR": "Dia da Reciclagem",
+    "note": "",
+    "es_LATAM": "Día de Reciclaje"
   },
   {
     "no": 77,
-    "inGameGlossary": "Recycling Day",
-    "introduction": "One of the Time-limited Events. Players can sell products at a higher price.",
+    "term": "Wheel of Fortune",
+    "introduction": "Get a random reward from the Wheel.",
     "screenshot": "",
-    "zhCN": "回收日",
-    "ptBR": "Dia da Reciclagem",
-    "notes": "",
-    "esLATAM": "Día de Reciclaje"
+    "zh_CN": "奖励转盘",
+    "pt_BR": "Roda da Fortuna",
+    "note": "",
+    "es_LATAM": "Rueda de la Fortuna"
   },
   {
     "no": 78,
-    "inGameGlossary": "Wheel of Fortune",
-    "introduction": "Get a random reward from the Wheel.",
-    "screenshot": "",
-    "zhCN": "奖励转盘",
-    "ptBR": "Roda da Fortuna",
-    "notes": "",
-    "esLATAM": "Rueda de la Fortuna"
-  },
-  {
-    "no": 79,
-    "inGameGlossary": "Pets' Championship",
+    "term": "Pets' Championship",
     "introduction": "An event opening everyday. Players can get score by finishing orders to get event reward and higher ranking,",
     "screenshot": "",
-    "zhCN": "锦标赛",
-    "ptBR": "Campeonato de Pets",
-    "notes": "",
-    "esLATAM": "Campeonato de Mascotas"
+    "zh_CN": "锦标赛",
+    "pt_BR": "Campeonato de Pets",
+    "note": "",
+    "es_LATAM": "Campeonato de Mascotas"
+  },
+  {
+    "hi": 1,
+    "term": "Lily",
+    "introduction": "Lily, one of the main characters in the game, is a cute 5-year-old girl and Birch's niece.",
+    "screenshot": "",
+    "zh_CN": "丽丽",
+    "pt_BR": "Luna",
+    "es_LATAM": "Lilia"
+  },
+  {
+    "hi": 2,
+    "term": "Birch",
+    "introduction": "Birch, one of the main character in the game, is around 35 years old and Lily's uncle.",
+    "screenshot": "",
+    "zh_CN": "柏奇",
+    "pt_BR": "Beto",
+    "es_LATAM": "Beto"
+  },
+  {
+    "hi": 3,
+    "term": "Timber",
+    "introduction": "Timber, one of the main character in the game, is Birch's dog.",
+    "screenshot": "",
+    "zh_CN": "旺财",
+    "pt_BR": "Toco",
+    "es_LATAM": "Tocón"
+  },
+  {
+    "hi": 4,
+    "term": "/",
+    "introduction": "A kitten, is named by the player. Adopted by Lily and Birch, it is a being that can be possessed by a soul. If you need to call her by her name during dialogue, you can use: #s1",
+    "screenshot": "",
+    "zh_CN": "/",
+    "pt_BR": "/",
+    "es_LATAM": "/"
+  },
+  {
+    "hi": 5,
+    "term": "Mrs Jenkins",
+    "introduction": "Mrs Jenkins, head of the community animal welfare organization, provided initial guidance to Lily and Birch in adopting and caring for the kitten.",
+    "screenshot": "",
+    "zh_CN": "詹奶奶",
+    "pt_BR": "Sra. Pacheco",
+    "es_LATAM": "Sra. Pacheco"
+  },
+  {
+    "hi": 6,
+    "term": "Evelyn",
+    "introduction": "Evelyn, the café owner, has feelings for Birch. She is a key character in chapters 1 and 2 of the story.",
+    "screenshot": "",
+    "zh_CN": "爱芙",
+    "pt_BR": "Eva",
+    "es_LATAM": "Evelin"
+  },
+  {
+    "hi": 7,
+    "term": "Cloudy",
+    "introduction": "Cloudy, Evelyn's pet cat. It makes a brief appearance in Chapter 1 and plays a significant role in Chapter 2.",
+    "screenshot": "",
+    "zh_CN": "乌云",
+    "pt_BR": "Nuvem",
+    "es_LATAM": "Brumito"
+  },
+  {
+    "hi": 8,
+    "term": "Tracy",
+    "introduction": "Tracy is a character in Chapter 1. Evelyn's friend. After being persecuted by her fiancé, her soul possesses the kitten.",
+    "screenshot": "",
+    "zh_CN": "唐知微",
+    "pt_BR": "Tatiana",
+    "es_LATAM": "Teresa"
+  },
+  {
+    "hi": 9,
+    "term": "Luther",
+    "introduction": "Luther is a character in Chapter 1. He is Tracy's husband. He does not actually appear in the story, only in character dialogue and illustrations.",
+    "screenshot": "",
+    "zh_CN": "陆川",
+    "pt_BR": "Lucas",
+    "es_LATAM": "Luís"
+  },
+  {
+    "hi": 10,
+    "term": "Mr Hawthorne",
+    "introduction": "Mr. Hawthorne, Evelyn's father. In Chapter 2, after being deceived by Adrian and falling into a coma, he possesses the kitten.",
+    "screenshot": "",
+    "zh_CN": "霍桑先生",
+    "pt_BR": "Sr. Torres",
+    "es_LATAM": "Sr. Espino"
+  },
+  {
+    "hi": 11,
+    "term": "Adrian",
+    "introduction": "Adrian, Evelyn's fiancé. He deceived and persecuted Mr. Hawthorne for money.",
+    "screenshot": "",
+    "zh_CN": "林辰",
+    "pt_BR": "André",
+    "es_LATAM": "Adrián"
+  },
+  {
+    "hi": 12,
+    "term": "Kevin",
+    "introduction": "Car Mechanic, Andy's father, Sarah's husband, and Birch's longtime friend",
+    "screenshot": "",
+    "zh_CN": "陈凯",
+    "pt_BR": "Kevin",
+    "es_LATAM": "Kevin"
+  },
+  {
+    "hi": 13,
+    "term": "Andy",
+    "introduction": "Kevin and Sarah's son",
+    "screenshot": "",
+    "zh_CN": "陈迪",
+    "pt_BR": "Davi",
+    "es_LATAM": "David"
+  },
+  {
+    "hi": 14,
+    "term": "Mr. Cane",
+    "introduction": "Candy shop owner",
+    "screenshot": "",
+    "zh_CN": "汤先生",
+    "pt_BR": "Sr. Campos",
+    "es_LATAM": "Sr. Campos"
+  },
+  {
+    "hi": 15,
+    "term": "Amanda",
+    "introduction": "Artist, Sarah's sister and Andy's aunt",
+    "screenshot": "",
+    "zh_CN": "安曼",
+    "pt_BR": "Amanda",
+    "es_LATAM": "Amanda"
+  },
+  {
+    "hi": 16,
+    "term": "Sarah",
+    "introduction": "Lawyer, Kevin's wife, Andy's mother, Amanda's sister. Dead some years ago.",
+    "screenshot": "",
+    "zh_CN": "安莎",
+    "pt_BR": "Sara",
+    "es_LATAM": "Sara"
   }
-]
\ No newline at end of file
+]
diff --git a/apps/web-antd/src/store/util.ts b/apps/web-antd/src/store/util.ts
index 0f763cb..0239544 100644
--- a/apps/web-antd/src/store/util.ts
+++ b/apps/web-antd/src/store/util.ts
@@ -1,52 +1,88 @@
-import MergeData from "./MergeData.json";
+import MergeData from './MergeData.json';
+import dayjs from 'dayjs';
 
 export function getImageUrl(key: string): string {
-	if (!key) return "";
+  if (!key) return '';
 
-	// 1. 判断 key 是否为 UI_MergeData_<number> 格式，取出数字；同时支持直接传入数字字符串或数字
-	let id: string | null = null;
-	const m = /^UI_MergeData_(\d+)$/.exec(key);
-	if (m) id = m[1] ?? "";
-	else if (/^\d+$/.test(key)) id = key;
-	else id = String(key);
+  // 1. 判断 key 是否为 UI_MergeData_<number> 格式，取出数字；同时支持直接传入数字字符串或数字
+  let id: string | null = null;
+  const m = /^UI_MergeData_(\d+)$/.exec(key);
+  if (m) id = m[1] ?? '';
+  else if (/^\d+$/.test(key)) id = key;
+  else id = String(key);
 
-	// 2. 从 MergeData 中取出 id 对应的 Icon
-	const item = (MergeData as any)[id];
-	const icon = item && typeof item.Icon === 'string' ? item.Icon : '';
-	if (!icon) return '';
+  // 2. 从 MergeData 中取出 id 对应的 Icon
+  const item = (MergeData as any)[id];
+  const icon = item && typeof item.Icon === 'string' ? item.Icon : '';
+  if (!icon) return '';
 
-	// 3. 在 Node 环境中遍历指定文件夹寻找包含 Icon 名称的文件并返回绝对路径
-	//    如果不在 Node 环境（例如浏览器），则回退返回 icon 字符串
-	try {
-		// @ts-ignore
-		const fs = require('fs');
-		// @ts-ignore
-		const path = require('path');
-		const SEARCH_DIR = 'D:\\Github\\AplusB_Pet_nation\\Assets\\GameMain\\UI\\UISprites\\MergeObj';
+  // 3. 在 Node 环境中遍历指定文件夹寻找包含 Icon 名称的文件并返回绝对路径
+  //    如果不在 Node 环境（例如浏览器），则回退返回 icon 字符串
+  try {
+    // @ts-ignore
+    const fs = require('fs');
+    // @ts-ignore
+    const path = require('path');
+    const SEARCH_DIR =
+      'D:\\Github\\AplusB_Pet_nation\\Assets\\GameMain\\UI\\UISprites\\MergeObj';
 
-		function findFile(dir: string): string | null {
-			let entries: string[] = [];
-			try { entries = fs.readdirSync(dir); } catch (e) { return null; }
-			for (const name of entries) {
-				const full = path.join(dir, name);
-				let stat;
-				try { stat = fs.statSync(full); } catch (e) { continue; }
-				if (stat.isDirectory()) {
-					const res = findFile(full);
-					if (res) return res;
-				} else {
-					if (name.indexOf(icon) !== -1) return path.resolve(full);
-				}
-			}
-			return null;
-		}
+    function findFile(dir: string): string | null {
+      let entries: string[] = [];
+      try {
+        entries = fs.readdirSync(dir);
+      } catch (e) {
+        return null;
+      }
+      for (const name of entries) {
+        const full = path.join(dir, name);
+        let stat;
+        try {
+          stat = fs.statSync(full);
+        } catch (e) {
+          continue;
+        }
+        if (stat.isDirectory()) {
+          const res = findFile(full);
+          if (res) return res;
+        } else {
+          if (name.indexOf(icon) !== -1) return path.resolve(full);
+        }
+      }
+      return null;
+    }
 
-		const found = findFile(SEARCH_DIR);
-		if (found) return found;
-	} catch (e) {
-		// 非 Node 环境或访问失败，忽略并回退
-	}
+    const found = findFile(SEARCH_DIR);
+    if (found) return found;
+  } catch (e) {
+    // 非 Node 环境或访问失败，忽略并回退
+  }
 
-	// 回退：返回 icon 名称（供前端拼接资源路径使用）
-	return icon;
-}
\ No newline at end of file
+  // 回退：返回 icon 名称（供前端拼接资源路径使用）
+  return icon;
+}
+
+export const getUnixTime = (date: any): number => {
+  if (date) {
+    if (typeof date === 'string') {
+      return dayjs(date).unix();
+    } else if (dayjs.isDayjs(date)) {
+      return date.unix();
+    } else if (typeof (date as any).unix === 'function') {
+      return (date as any).unix();
+    } else {
+      return dayjs(date).unix();
+    }
+  }
+  return 0;
+};
+
+export const getItemUrl = (itemId: number): string => {
+  switch (itemId) {
+    case 100001:
+      return './Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Big/shop_energy_LV1.png';
+    case 100003:
+      return './Assets/Art_SubModule/Art_Resource/Art_UISprites/Shop/Big/shop_diamond_LV2.png';
+    default:
+      return '';
+  }
+};
diff --git a/apps/web-antd/src/views/dashboard/serverList/appList.vue b/apps/web-antd/src/views/dashboard/serverList/appList.vue
index 79d5c9e..9d49023 100644
--- a/apps/web-antd/src/views/dashboard/serverList/appList.vue
+++ b/apps/web-antd/src/views/dashboard/serverList/appList.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { Button,  Tag, notification, Modal, Progress } from 'ant-design-vue';
+import { Button, Tag, notification, Modal, Progress } from 'ant-design-vue';
 import type { ServerData } from '#/api/core/server';
-import {restartServer, getServerListApi, reloadServer} from '#/api/core/server';
-import AddServerModal from './addServer.vue' 
+import { restartServer, getServerListApi, reloadServer } from '#/api/core/server';
+import AddServerModal from './addServer.vue'
 import EditServer from './editServer.vue';
-import { useVbenModal } from '@vben/common-ui' 
+import { useVbenModal } from '@vben/common-ui'
 
 defineOptions({
     name: 'AppList',
@@ -13,19 +13,19 @@ interface Props {
     items: ServerData[];
     title: string;
 }
-withDefaults(defineProps<Props>(),{
+withDefaults(defineProps<Props>(), {
     items: () => [],
 })
 const [editServerM, editServerApi] = useVbenModal({
-  connectedComponent: EditServer,
+    connectedComponent: EditServer,
 });
 async function editServer(Server: ServerData) {
     editServerApi.setData(Server);
-   editServerApi.open();
+    editServerApi.open();
 }
 
 function getColor(status: number) {
-    switch (status){
+    switch (status) {
         case 0:
             return 'red';
         case 1:
@@ -49,17 +49,27 @@ function getCpuColor(usage: number) {
     }
 }
 
+function getLatencyColor(latency: number) {
+    if (latency < 100) {
+        return 'green';
+    } else if (latency < 200) {
+        return 'orange';
+    } else {
+        return 'red';
+    }
+}
+
 function formatMemUsage(usage: number) {
     if (usage < 1024) {
         return usage + ' MB';
     }
-    return (usage/1024).toFixed(2) + ' GB';
+    return (usage / 1024).toFixed(2) + ' GB';
 }
 
 
 async function restart(Server: ServerData) {
-    try{
-        Server.Loading = true; 
+    try {
+        Server.Loading = true;
         const AppId = Server.AppId;
         await restartServer(AppId, Server.ServerId, Server.ServerName);
         notification.success({
@@ -68,11 +78,11 @@ async function restart(Server: ServerData) {
             type: 'success',
         });
         Server.Loading = false;
-        const serverResponse = await getServerListApi({AppId:Server.AppId});
+        const serverResponse = await getServerListApi({ AppId: Server.AppId });
         const foundServer = serverResponse.find((item) => item.ServerId == Server.ServerId);
         Server.StartTime = foundServer ? foundServer.StartTime : undefined;
         //console.log('更新成功');
-    }catch(e){
+    } catch (e) {
         notification.error({
             duration: 10,
             message: Server.ServerName + '更新失败',
@@ -83,8 +93,8 @@ async function restart(Server: ServerData) {
 }
 
 async function reload(Server: ServerData) {
-    try{
-        Server.Reload = true; 
+    try {
+        Server.Reload = true;
         const AppId = Server.AppId;
         await reloadServer(AppId, Server.ServerId, Server.ServerName);
         notification.success({
@@ -93,11 +103,11 @@ async function reload(Server: ServerData) {
             type: 'success',
         });
         Server.Reload = false;
-        const serverResponse = await getServerListApi({AppId:Server.AppId});
+        const serverResponse = await getServerListApi({ AppId: Server.AppId });
         const foundServer = serverResponse.find((item) => item.ServerId == Server.ServerId);
         Server.StartTime = foundServer ? foundServer.StartTime : undefined;
         //console.log('更新成功');
-    }catch(e){
+    } catch (e) {
         notification.error({
             duration: 10,
             message: Server.ServerName + '更新失败',
@@ -107,20 +117,20 @@ async function reload(Server: ServerData) {
     }
 }
 function confirmUpdate(Server: ServerData) {
-  Modal.confirm({
-    title: '确认更新',
-    content: `你确定要更新 ${Server.ServerName} 吗？`,
-    onOk() {
-      restart(Server);
-    },
-    onCancel() {
-      //console.log('取消更新');
-    },
-  });
+    Modal.confirm({
+        title: '确认更新',
+        content: `你确定要更新 ${Server.ServerName} 吗？`,
+        onOk() {
+            restart(Server);
+        },
+        onCancel() {
+            //console.log('取消更新');
+        },
+    });
 }
 
 function getStatusName(status: number) {
-    switch (status){
+    switch (status) {
         case 0:
             return 'Inactive';
         case 1:
@@ -167,11 +177,11 @@ function getStatusName(status: number) {
                     </h1>
                 </div>
                 <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
-                    <Progress :percent="item.CpuUsage || 0" :stroke-color="getCpuColor(item.CpuUsage || 0)"/>
+                    <Progress :percent="item.CpuUsage || 0" :stroke-color="getCpuColor(item.CpuUsage || 0)" />
                 </div>
                 <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
                     <h1 class="text-md font-semibold md:text-ml text-center">
-                        <span>{{formatMemUsage(item.MemUsage||0)}}</span>
+                        <span>{{ formatMemUsage(item.MemUsage || 0) }}</span>
                     </h1>
                 </div>
                 <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
@@ -179,6 +189,11 @@ function getStatusName(status: number) {
                         <span>{{ item.ClientVersion }}</span>
                     </h1>
                 </div>
+                <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
+                    <h1 class="text-md font-semibold md:text-ml text-center">
+                        <span :style="{ color: getLatencyColor(item.Latency || 0) }">{{ item.Latency }}ms</span>
+                    </h1>
+                </div>
                 <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
                     <h1 class="text-md font-semibold md:text-ml  text-center">
                         <Button @click=confirmUpdate(item) type="primary" :loading="item.Loading">Restart</Button>
diff --git a/apps/web-antd/src/views/dashboard/serverList/index.vue b/apps/web-antd/src/views/dashboard/serverList/index.vue
index 2639534..be5b78a 100644
--- a/apps/web-antd/src/views/dashboard/serverList/index.vue
+++ b/apps/web-antd/src/views/dashboard/serverList/index.vue
@@ -1,16 +1,16 @@
 <script lang="ts" setup>
 import { Page } from '@vben/common-ui';
-import { Button, Card,  Space, notification, Modal } from 'ant-design-vue';
+import { Button, Card, Space, notification, Modal } from 'ant-design-vue';
 import { useVbenForm } from '#/adapter/form';
 import AppList from './appList.vue';
-import { getServerListApi, getAppListApi, updateAppApi,updateAppReviewApi } from '#/api/core/server';
+import { getServerListApi, getAppListApi, updateAppApi, updateAppReviewApi } from '#/api/core/server';
 import type { AppData, ServerData } from '#/api/core/server';
-import { useVbenModal } from '@vben/common-ui' 
-import { ref,onMounted } from 'vue';
+import { useVbenModal } from '@vben/common-ui'
+import { ref, onMounted } from 'vue';
 import addServerModal from './addServer.vue';
 import dayjs from 'dayjs';
 import { $t } from '#/locales'
-const  appId = ref<number>(1);
+const appId = ref<number>(1);
 const [BaseForm, BaseFormApi] = useVbenForm({
   // 所有表单项共用，可单独在表单内覆盖
   commonConfig: {
@@ -31,17 +31,17 @@ const [BaseForm, BaseFormApi] = useVbenForm({
       defaultValue: 1,
       componentProps: {
         onChange: async (value: number) => {
-          const serverResponse = await getServerListApi({AppId:value});
+          const serverResponse = await getServerListApi({ AppId: value });
           ServerList.value = Array.isArray(serverResponse) ? serverResponse : [];
           const app = appList.value.find((item) => item.AppId === value);
           appId.value = value;
           if (!app) return;
-          const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss') 
+          const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss')
           BaseFormApi.setFieldValue("update", updateTime)
         },
         filterOption: true,
         options: [
-          
+
         ],
         placeholder: '请选择',
         showSearch: true,
@@ -71,7 +71,7 @@ const [addServerM, addServerApi] = useVbenModal({
   connectedComponent: addServerModal,
   onClosed: async () => {
     const Value = await BaseFormApi.getValues();
-    const serverResponse = await getServerListApi({AppId:Value.fieldOptions});
+    const serverResponse = await getServerListApi({ AppId: Value.fieldOptions });
     ServerList.value = Array.isArray(serverResponse) ? serverResponse : [];
     addServerApi.close();
   },
@@ -102,13 +102,13 @@ const appList = ref<AppData[]>([]);
 const ServerList = ref<ServerData[]>([]);
 const reload = ref(false);
 const reloadReview = ref(false);
-onMounted(async() => {
-  try{
+onMounted(async () => {
+  try {
     const response = await getAppListApi();
     appList.value = Array.isArray(response) ? response : [];
     const app = appList.value[0];
     if (!app) return;
-    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss') 
+    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss')
     BaseFormApi.setFieldValue("update", updateTime)
     BaseFormApi.updateSchema([
       {
@@ -120,15 +120,15 @@ onMounted(async() => {
           })),
         },
         fieldName: 'fieldOptions',
-      }, 
+      },
     ]);
-    const serverResponse = await getServerListApi({AppId:app.AppId});
+    const serverResponse = await getServerListApi({ AppId: app.AppId });
     ServerList.value = Array.isArray(serverResponse) ? serverResponse : [];
     setInterval(async () => {
-      const serverResponse = await getServerListApi({AppId:appId.value});
+      const serverResponse = await getServerListApi({ AppId: appId.value });
       ServerList.value = Array.isArray(serverResponse) ? serverResponse : [];
     }, 60000);
-  }catch(e){
+  } catch (e) {
     appList.value = serverList;
     //console.log(e);
   }
@@ -136,7 +136,7 @@ onMounted(async() => {
 
 async function addServer() {
   const Value = await BaseFormApi.getValues();
-  addServerApi.setData({AppId: Value.fieldOptions});
+  addServerApi.setData({ AppId: Value.fieldOptions });
   addServerApi.open();
 }
 
@@ -173,24 +173,24 @@ function confirmUpdateReview() {
 async function update() {
   reload.value = true;
   const Value = await BaseFormApi.getValues();
-  try{
+  try {
     await updateAppApi(Value.fieldOptions);
     reload.value = false;
     notification.info({
-      duration:10,
-      message:"服务器更新成功"
+      duration: 10,
+      message: "服务器更新成功"
     })
     const response = await getAppListApi();
     appList.value = Array.isArray(response) ? response : [];
     const app = appList.value.find((item) => item.AppId === Value.fieldOptions);
     if (!app) return;
-    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss') 
+    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss')
     BaseFormApi.setFieldValue("update", updateTime)
-  }catch(e){
+  } catch (e) {
     reload.value = false;
     notification.error({
-      duration:10,
-      message:"服务器更新失败"
+      duration: 10,
+      message: "服务器更新失败"
     })
   }
 }
@@ -198,32 +198,32 @@ async function update() {
 async function updateReview() {
   reloadReview.value = true;
   const Value = await BaseFormApi.getValues();
-  try{
+  try {
     await updateAppReviewApi(Value.fieldOptions);
     reloadReview.value = false;
     notification.info({
-      duration:10,
-      message:"服务器更新成功"
+      duration: 10,
+      message: "服务器更新成功"
     })
     const response = await getAppListApi();
     appList.value = Array.isArray(response) ? response : [];
     const app = appList.value.find((item) => item.AppId === Value.fieldOptions);
     if (!app) return;
-    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss') 
+    const updateTime = dayjs((app.Update ?? 0) * 1000).format('YYYY-MM-DD HH:mm:ss')
     BaseFormApi.setFieldValue("update", updateTime)
-  }catch(e){
+  } catch (e) {
     reloadReview.value = false;
     notification.error({
-      duration:10,
-      message:"服务器更新失败"
+      duration: 10,
+      message: "服务器更新失败"
     })
   }
 }
 </script>
 <template>
   <Page>
-    <addServerM class="w-[50%]" @hidden="update"/>
-    <editServerM class="w-[50%]" @hidden="update"/>
+    <addServerM class="w-[50%]" @hidden="update" />
+    <editServerM class="w-[50%]" @hidden="update" />
     <Card class="mb-5" title="服务器操作">
       <BaseForm />
       <Space>
@@ -270,13 +270,18 @@ async function updateReview() {
             <span>CLIENT VERSION</span>
           </h1>
         </div>
+        <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
+          <h1 class="text-md font-semibold md:text-ml  text-center">
+            <span>LATENCY</span>
+          </h1>
+        </div>
         <div class="flex flex-col justify-center  md:mt-0 lg:w-1/12">
           <h1 class="text-md font-semibold md:text-ml  text-center">
             <span>RESTART</span>
           </h1>
         </div>
       </div>
-      <AppList :items="ServerList" title="服务器列表"/>
+      <AppList :items="ServerList" title="服务器列表" />
     </div>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/language/language.vue b/apps/web-antd/src/views/language/language.vue
index 418636e..946b824 100644
--- a/apps/web-antd/src/views/language/language.vue
+++ b/apps/web-antd/src/views/language/language.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { VxeGridProps, VxeGridListeners } from '#/adapter/vxe-table';
-import { Button, notification,Image, Popover } from 'ant-design-vue';
+import { Button, notification, Image, Popover } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
 import { getLanguageList, saveLanguageList, deleteLanguageItem } from '#/api/core/statistics';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
@@ -13,6 +13,7 @@ import { $t } from '#/locales'
 import dayjs from 'dayjs';
 import { AccessControl } from '@vben/access';
 import { useAccess } from '@vben/access';
+import GlossaryData from '#/store/glossary.json';
 const { hasAccessByRoles } = useAccess();
 const [AddLanguageModal, AddLanguageModalApi] = useVbenModal({
   connectedComponent: addLanguage,
@@ -108,7 +109,7 @@ const gridOptions: VxeGridProps<languageType> = {
   border: true,
   columns: [
     { title: 'Id', field: 'Id', width: 100 },
-    { editRender: { name: 'input' }, field: 'key', title: 'key', filters: [{ data: "" }], filterRender: { name: "input" }, visible: keyVisible },
+    { editRender: { name: 'input' }, field: 'key', title: 'key', filters: [{ data: "" }], filterRender: { name: "input" }, visible: keyVisible, sortBy: 'key' },
     {
       field: 'imageUrl',
       slots: { default: 'image-url' },
@@ -122,7 +123,7 @@ const gridOptions: VxeGridProps<languageType> = {
       title: 'zh_CN', filters: [{ data: "" }], filterRender: { name: "input" }, visible: chineseVisible
     },
     { editRender: { name: 'input' }, field: 'pt_BR', title: 'pt_BR', filters: [{ data: "" }], filterRender: { name: "input" }, visible: pt_BRVisible },
-    { editRender: { name: 'input' }, field: 'es_LATAM', title: 'es_LATAM', filters: [{ data: "" }], filterRender: { name: "input" }, visible: es_LATAMVisible, slots: { default: 'es_LATAM' } },
+    { editRender: { name: 'input' }, field: 'es_LATAM', title: 'es_LATAM', filters: [{ data: "" }], filterRender: { name: "input" }, visible: es_LATAMVisible },
 
     { slots: { default: 'action' }, title: $t('page.common.action'), width: 150 },
   ],
@@ -253,11 +254,11 @@ const gridOptions: VxeGridProps<languageType> = {
         } else {
           actionVisible = false;
         }
-        
+
         let length = response.data ? response.data.length : 0;
         GridApi.setGridOptions({
           columns: [
-            { editRender: { name: 'input' }, field: 'key', title: 'key', filters: [{ data: "" }], filterRender: { name: "input" }, visible: keyVisible },
+            { editRender: { name: 'input' }, field: 'key', title: 'key', filters: [{ data: "" }], filterRender: { name: "input" }, visible: keyVisible, sortBy: 'key', sortable: true, },
             {
               field: 'imageUrl',
               slots: { default: 'image-url' },
@@ -271,8 +272,8 @@ const gridOptions: VxeGridProps<languageType> = {
               title: 'zh_CN', filters: [{ data: "" }], filterRender: { name: "input" }, visible: chineseVisible
             },
             { editRender: { name: 'input' }, field: 'pt_BR', title: 'pt_BR', filters: [{ data: "" }], filterRender: { name: "input" }, visible: pt_BRVisible },
-            { editRender: { name: 'input' }, field: 'es_LATAM', title: 'es_LATAM', filters: [{ data: "" }], filterRender: { name: "input" }, visible: es_LATAMVisible  },
-
+            { editRender: { name: 'input' }, field: 'es_LATAM', title: 'es_LATAM', filters: [{ data: "" }], filterRender: { name: "input" }, visible: es_LATAMVisible },
+            { slots: { default: 'glossary' }, title: 'Glossary', width: 150 },
             { slots: { default: 'action' }, title: $t('page.common.action'), width: 150, visible: actionVisible },
           ],
           pagerConfig: {
@@ -406,6 +407,45 @@ function deleteRow(row: languageType) {
     GridApi.reload();
   });
 }
+
+function getGlossary(row: languageType) {
+  const glossaryItems: string[] = [];
+  let head = 'en';
+  if (chineseVisible) {
+    head += ' | zh';
+  }
+  if (pt_BRVisible) {
+    head += ' | pt';
+  }
+  if (es_LATAMVisible) {
+    head += ' | es';
+  }
+
+  Object.entries(GlossaryData).forEach(([key, value]: [string, any]) => {
+    const inGameGlossary = value.term || '';
+    if (row.en_US && new RegExp(`\\b${inGameGlossary.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`, 'i').test(row.en_US)) {
+      let content = `${inGameGlossary}`;
+      if (chineseVisible) {
+        const zhCN = value.zh_CN || '';
+        content += ` | ${zhCN}`;
+      }
+      if (pt_BRVisible) {
+        const ptBR = value.pt_BR || '';
+        content += ` | ${ptBR}`;
+      }
+      if (es_LATAMVisible) {
+        const esLATAM = value.es_LATAM || '';
+        content += ` | ${esLATAM}`;
+      }
+      glossaryItems.push(content);
+    }
+  });
+  if (glossaryItems.length > 0) {
+    glossaryItems.unshift(head);
+    return glossaryItems.join('\n');
+  }
+  return '';
+}
 </script>
 
 <style lang="css">
@@ -434,6 +474,9 @@ function deleteRow(row: languageType) {
           <!-- <Image src="./public/merge/Launcher_A_LV1.png" height="50" width="50" /> -->
           <Image v-if="row.url" :src="row.url" height="40" width="40" />
         </template>
+        <template #glossary="{ row }">
+          <span style="font-size: 11px;">{{ getGlossary(row) }} </span>
+        </template>
         <template #action="{ row }">
           <AccessControl :codes="['super', 'admin']" type="role">
             <Button type="primary" @click="deleteRow(row)">删除</Button>
diff --git a/apps/web-antd/src/views/operation/copyUser/copy.vue b/apps/web-antd/src/views/operation/copyUser/copy.vue
index 699d25e..8d6a58b 100644
--- a/apps/web-antd/src/views/operation/copyUser/copy.vue
+++ b/apps/web-antd/src/views/operation/copyUser/copy.vue
@@ -2,6 +2,7 @@
 import { useVbenForm } from '#/adapter/form';
 import { message } from 'ant-design-vue'
 import { copyUser } from '#/api/core/operation';
+import { Page } from '@vben/common-ui';
 import { VbenPopover, VbenIcon } from '../../../../../../packages/@core/ui-kit/shadcn-ui';
 import type { copyUserParam } from '#/model/type';
 const [Form] = useVbenForm({
@@ -9,7 +10,7 @@ const [Form] = useVbenForm({
   commonConfig: {
     // 所有表单项
     componentProps: {
-      class: 'w-full h-full',
+      
     },
   },
   // 使用 tailwindcss grid布局
@@ -23,7 +24,7 @@ const [Form] = useVbenForm({
       fieldName: 'src_app',
       label: '源应用ID',
       rules: 'required',
-      defaultValue: 1,
+      defaultValue: 0,
       componentProps: {
         options: [
           {
@@ -93,6 +94,7 @@ async function onSubmit(values: Record<string, any>) {
 </script>
 
 <template>
+  <Page auto-content-height class="h-[1200px]">
   <VbenPopover class="ml-5" :content-props="{ side: 'top' }">
     <template #trigger>
       <VbenIcon icon="solar:question-circle-bold" class="ml-5" />
@@ -107,8 +109,7 @@ async function onSubmit(values: Record<string, any>) {
       </ul>
     </div>
   </VbenPopover>
-  <Form class="mt-20" >
+  <Form />
     
-  </Form>
-
+  </Page>
 </template>
\ No newline at end of file
diff --git a/apps/web-antd/src/views/operation/mail/mail-detail.vue b/apps/web-antd/src/views/operation/mail/mail-detail.vue
index 4174198..674e9f6 100644
--- a/apps/web-antd/src/views/operation/mail/mail-detail.vue
+++ b/apps/web-antd/src/views/operation/mail/mail-detail.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
+import {Image} from "ant-design-vue";
+import Icon from '../../../../../../packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue';
 
 defineOptions({
   name: 'DetailMailModal',
@@ -64,7 +66,7 @@ const [Form, FormApi] = useVbenForm({
     {
       component: 'Textarea',
       fieldName: 'items',
-      label: '邮件道具',
+      label: '邮件道具11',
       componentProps: {
         placeholder: '{}',
         type: 'textarea',
@@ -230,6 +232,13 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 <template>
   <Modal :width="800" title="邮件详情">
-    <Form />
+    <Form>
+      <template #items>
+        <div class="border-2 border-solid border-x-sky-50 rounded-xl p-1">
+          <Image src="../../../../public/item/mini-gamesWK_icon_yanzhao.png" width="30px" />x20
+        </div>
+        
+      </template>
+    </Form>
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/operation/mail/mail-info.vue b/apps/web-antd/src/views/operation/mail/mail-info.vue
index 70e6799..8efeed1 100644
--- a/apps/web-antd/src/views/operation/mail/mail-info.vue
+++ b/apps/web-antd/src/views/operation/mail/mail-info.vue
@@ -82,12 +82,33 @@ const [Form, FormApi] = useVbenForm({
       },
       rules: 'required',
     },
+    {
+      component: 'Input',
+      fieldName: 'TitleESLatam',
+      label: '西班牙（拉美）邮件标题',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'SubtitleESLatam',
+      label: '西班牙（拉美）邮件副标题',
+    },
+    {
+      component: 'Textarea',
+      fieldName: 'ContentESLatam',
+      label: '西班牙（拉美）邮件内容',
+      componentProps: {
+        type: 'textarea',
+        rows: 8,
+      },
+      rules: 'required',
+    },
     {
       component: 'Textarea',
       fieldName: 'Items',
       label: '邮件道具',
       componentProps: {
-        placeholder: '[{Id:1,Num:1},{Id:2,Num:2}]',
+        placeholder: '[{"Id":1,"Num":1},{"Id":2,"Num":2}]',
         type: 'textarea',
         rows: 3,
       },
@@ -206,6 +227,9 @@ const [Modal, modalApi] = useVbenModal({
       title_ptbr: values.TitlePTBR,
       subTitle_ptbr: values.SubtitlePTBR,
       content_ptbr: values.ContentPTBR,
+      title_es_latam: values.TitleESLatam,
+      subTitle_es_latam: values.SubtitleESLatam,
+      content_es_latam: values.ContentESLatam,
       items: Items,
       to_uids: ToUids,
       start_time: start_time,
diff --git a/apps/web-antd/src/views/operation/mail/mail-table.vue b/apps/web-antd/src/views/operation/mail/mail-table.vue
index 9b0d6dc..fbaab82 100644
--- a/apps/web-antd/src/views/operation/mail/mail-table.vue
+++ b/apps/web-antd/src/views/operation/mail/mail-table.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Page } from '@vben/common-ui';
-import { Button, Card, Space } from 'ant-design-vue';
+import { Button, Card, Space, Image, Tag } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import type { VxeGridListeners, VxeGridProps } from '#/adapter/vxe-table';
 import type { VbenFormProps } from '#/adapter/form';
@@ -12,6 +12,7 @@ import { useVbenModal } from '@vben/common-ui';
 import { onMounted, ref } from 'vue';
 import AddMailModal from './mail-info.vue';
 import DetailMailModal from './mail-detail.vue';
+import { getItemUrl } from '#/store/util';
 const appList = ref<AppData[]>([]);
 const ServerList = ref<ServerData[]>([]);
 
@@ -81,7 +82,13 @@ const gridOptions: VxeGridProps<MailData> = {
     // { field: 'subtitleEN', title: '英文邮件副标题' },
     { field: 'content', title: '邮件内容' },
     // { field: 'content_en', title: '英文邮件内容' },
-    { field: 'items', title: '道具' },
+    { field: 'items', title: '道具', slots: { default: 'items' } },
+     {
+       field: 'start_time',
+       title: '开始时间',
+       formatter: ({ cellValue }) =>
+         cellValue ? new Date(cellValue * 1000).toLocaleString() : '',
+    },
     {
       field: 'mail_type',
       title: '邮件类型',
@@ -203,6 +210,20 @@ async function deleteRow(row: MailData) {
   GridApi.setLoading(false);
   GridApi.query();
 }
+
+function fromatItems(items: string) {
+  try {
+    const itemList = JSON.parse(items);
+    const r =  itemList.map((item: { Id: number; Num: number }) => ({
+      ...item,
+      url: getItemUrl(item.Id),
+    }));
+    return r;
+  } catch (e) {
+    //console.error('Failed to parse items:', e);
+    return [];
+  }
+}
 </script>
 
 <template>
@@ -213,8 +234,23 @@ async function deleteRow(row: MailData) {
       <Space>
         <Button @click="addMail">新增邮件</Button>
       </Space>
-    </Card>
-    <Grid>
+    </Card> 
+    <Grid> 
+      <template #items="{ row }">
+        <div class="flex flex-wrap items-center justify-center">
+          <div v-for="item in fromatItems(row.items)" :key="item.Id" class="flex items-center gap-1">
+            <template v-if="item.url">
+              <Image :src="item.url" width="30px" />
+            </template>
+            <template v-else>
+              <Tag class="w-[45px] h-[30px] flex items-center justify-center text-xs">
+               {{item.Id}}
+              </Tag>
+            </template>
+            <span>x{{ item.Num }}</span>
+          </div>
+        </div>
+      </template>
       <template #action="{ row }">
         <Button type="link" @click="deleteRow(row)" style="color: #cc0000">删除</Button>
       </template>
diff --git a/apps/web-antd/src/views/userlog/userlist/asset-table.vue b/apps/web-antd/src/views/userlog/userlist/asset-table.vue
index 8544307..aeef646 100644
--- a/apps/web-antd/src/views/userlog/userlist/asset-table.vue
+++ b/apps/web-antd/src/views/userlog/userlist/asset-table.vue
@@ -156,7 +156,7 @@ const gridOptions: VxeGridProps<RowType> = {
   ],
   stripe: true,
   round: true,
-  height: 'auto',
+  height: '800px',
   exportConfig: {
     filename: '用户资产日志',
     type: 'csv',
diff --git a/apps/web-antd/src/views/userlog/userlist/user.vue b/apps/web-antd/src/views/userlog/userlist/user.vue
index 5bd4323..da1b55f 100644
--- a/apps/web-antd/src/views/userlog/userlist/user.vue
+++ b/apps/web-antd/src/views/userlog/userlist/user.vue
@@ -11,8 +11,8 @@ import type { dataType } from '#/component/index';
 // 引入 cal-heatmap 样式
 import 'cal-heatmap/cal-heatmap.css';
 import type { WorkbenchProjectItem, WorkbenchTrendItem } from '@vben/common-ui';
-import { orderComponent, chessComponent } from '#/component/index';
-import type { Order, Merge, Chess } from '#/model/type';
+import { orderComponent, chessComponent, friendComponent } from '#/component/index';
+import type { Order, Merge, Chess, friendRecord } from '#/model/type';
 import dayjs from 'dayjs';
 import { WorkbenchDetail } from '@vben/common-ui';
 import UserHeader from './user-header.vue';
@@ -231,6 +231,8 @@ const info = ref<{
   Order: Order[];
   Heatmap: dataType[];
   Chess: Chess[];
+  Friend: friendRecord[];
+  MaxCharge?: number;
 }>({
   Level: 0,
   Star: 0,
@@ -248,6 +250,8 @@ const info = ref<{
   Order: [],
   Heatmap: [],
   Chess: [],
+  Friend: [],
+  MaxCharge: 0,
 });
 let trendItems: WorkbenchTrendItem[] = [
 
@@ -290,6 +294,8 @@ const [Modal, modalApi] = useVbenModal({
         info.value.Name = r.Name;
         info.value.Charge = r.Charge;
         info.value.AreaId = r.AreaId;
+        info.value.MaxCharge = r.MaxCharge;
+        info.value.Friend = r.FriendList || [];
         // 计算封号剩余天数（如果Ban为时间戳且大于当前时间，则计算剩余天数，否则为0或-1）
         if (r.Ban && r.Ban > 0) {
           const now = Math.floor(Date.now() / 1000);
@@ -499,6 +505,7 @@ watch(
               <WorkbenchDetail :items="projectItems" class="mt-5 lg:mt-0" title="玩家详情">
                 <template #areaid> {{ info.AreaId }}</template>
                 <template #charge> <b>$</b>{{ chargeDisplay }}</template>
+                <template #maxCharge> <b>$</b>{{ info.MaxCharge }}</template>
                 <template #RegisterTime> {{ info.RegisterTime }}</template>
                 <template #logintime> {{ info.LoginTime }}</template>
                 <template #Cumulative>{{ info.Cumulative }}</template>
@@ -507,6 +514,7 @@ watch(
                 <template #TodayCumulative>{{ info.TodayCumulative }}</template>
               </WorkbenchDetail>
               <chessComponent :items="info.Chess" title="棋盘" class="mt-6" />
+              <friendComponent :Items="info.Friend" title="好友" class="mt-6" />
               <!-- <WorkbenchTodo :items="todoItems" class="mt-5" title="待办事项" /> -->
             </div>
           </div>
diff --git a/apps/web-antd/src/views/userlog/userlist/userlist.vue b/apps/web-antd/src/views/userlog/userlist/userlist.vue
index a526601..cf78c4b 100644
--- a/apps/web-antd/src/views/userlog/userlist/userlist.vue
+++ b/apps/web-antd/src/views/userlog/userlist/userlist.vue
@@ -146,13 +146,13 @@ const gridOptions: VxeGridProps<RowType> = {
   columns: [
     { field: 'Uid', title: 'id' , sortable: true, sortBy: 'Uid'},
     { field: 'UserName', title: '登录名' },
-    { field: 'Level', title: '等级', formatter: ({ cellValue }) => `${cellValue} 级`, sortable: true, sortBy: 'Level' },
+    { field: 'Level', title: '等级', formatter: ({ cellValue }: { cellValue: string | number }) => `${cellValue} 级`, sortable: true, sortBy: 'Level' },
     { field: 'Node', title: '节点', },
      { field: 'Nickname', title: '昵称',  },
-    { field: 'Diamond', title: '钻石', formatter: ({ cellValue }) => `${cellValue} 💎`, sortable: true, sortBy: 'Diamond' },
-    { field: 'Star', title: '星星', formatter: ({ cellValue }) => `${cellValue} ⭐`, sortable: true, sortBy: 'Star' },
-    { field: 'Energy', title: '能量', formatter: ({ cellValue }) => `${cellValue} ⚡`, sortable: true, sortBy: 'Energy' },
-    { field: 'LoginTime', sortable: true, title: '登录时间', formatter: ({ cellValue }) => dayjs(cellValue * 1000).format('YYYY-MM-DD HH:mm:ss'),sortBy: 'LoginTime' },
+    { field: 'Diamond', title: '钻石', formatter: ({ cellValue }: { cellValue: string | number }) => `${cellValue} 💎`, sortable: true, sortBy: 'Diamond' },
+    { field: 'Star', title: '星星', formatter: ({ cellValue }: { cellValue: string | number }) => `${cellValue} ⭐`, sortable: true, sortBy: 'Star' },
+    { field: 'Energy', title: '能量', formatter: ({ cellValue }: { cellValue: string | number }) => `${cellValue} ⚡`, sortable: true, sortBy: 'Energy' },
+    { field: 'LoginTime', sortable: true, title: '登录时间', formatter: ({ cellValue }: { cellValue: number }) => dayjs(cellValue * 1000).format('YYYY-MM-DD HH:mm:ss'),sortBy: 'LoginTime' },
     { field: 'Online', title: '在线状态', slots: { default: 'online' } , sortable: true, sortBy: 'Online' },
   ],
   height: 'auto',
@@ -172,7 +172,10 @@ const gridOptions: VxeGridProps<RowType> = {
       result: "data"
     },
     ajax: {
-      query: async ({ page }, formValues) => {
+      query: async (
+        { page }: { page: { pageSize: number; currentPage: number } },
+        formValues: Record<string, any>,
+      ) => {
         let Id = parseInt(formValues.AppId, 10);
         let ServerId = 1;
         let Uid = parseInt(formValues.Uid, 10);
diff --git a/config b/config
new file mode 100644
index 0000000..f0030fe
--- /dev/null
+++ b/config
@@ -0,0 +1,11 @@
+{
+    "Energy": {
+        "Value": 100
+    },
+    "Star": {
+        "Value": 0
+    },
+    "Diamond": {
+        "Value": 50
+    }
+}
\ No newline at end of file
diff --git a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue
index 55d8af2..e40c26e 100644
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-detail.vue
@@ -24,16 +24,12 @@ defineEmits(['click']);
       <CardTitle class="text-lg">{{ title }}</CardTitle>
     </CardHeader>
     <CardContent class="flex flex-wrap p-0">
-      <div
-        class="border-border w-full border-b border-r border-t p-5 transition-all hover:shadow-xl"
-      >
+      <div class="border-border w-full border-b border-r border-t p-5 transition-all hover:shadow-xl">
         <div class="flex w-full">
-          <div class="text-foreground/80 leading-2 flex h-4 p-1 md:w-1/2">
+          <div class="text-foreground/80 leading-2  flex h-4 p-1 md:w-1/2">
             <span class="font-bold">总充值金额:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.charge">
                 <slot name="charge"></slot>
@@ -41,14 +37,24 @@ defineEmits(['click']);
             </div>
           </div>
         </div>
+        <div class="flex w-full">
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
+            <span class="font-bold">最大充值金额:</span>
+          </div>
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
+            <div class="Value">
+              <span v-if="$slots.maxCharge">
+                <slot name="maxCharge"></slot>
+              </span>
+            </div>
+          </div>
+        </div>
 
         <div class="flex w-full">
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">场景:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.AreaId">
                 <slot name="AreaId"></slot>
@@ -61,9 +67,7 @@ defineEmits(['click']);
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">注册时间:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.RegisterTime">
                 <slot name="RegisterTime"></slot>
@@ -76,9 +80,7 @@ defineEmits(['click']);
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">最后登录:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.logintime">
                 <slot name="logintime"></slot>
@@ -91,9 +93,7 @@ defineEmits(['click']);
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">累计在线:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.Cumulative">
                 <slot name="Cumulative"></slot>
@@ -106,9 +106,7 @@ defineEmits(['click']);
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">今日累计在线:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.TodayCumulative">
                 <slot name="TodayCumulative"></slot>
@@ -121,9 +119,7 @@ defineEmits(['click']);
           <div class="text-foreground/80 leading-2 mt-3 flex h-4 p-1 md:w-1/2">
             <span class="font-bold">邀请码:</span>
           </div>
-          <div
-            class="text-foreground/80 leading-2 text-shadow mt-3 flex h-4 justify-start p-1 md:w-1/2"
-          >
+          <div class="text-foreground/80 leading-2 text-shadow mt-3 flex h-4 justify-start p-1 md:w-1/2">
             <div class="Value">
               <span v-if="$slots.Code">
                 <slot name="Code"></slot>
diff --git a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
index 358b210..83ce95e 100644
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
@@ -31,7 +31,7 @@ withDefaults(defineProps<Props>(), {
     <CardContent class="flex flex-wrap p-5 pt-0">
       <ul class="divide-border w-full divide-y" role="list">
         <li
-          v-for="item in items"
+          v-for="item in items.slice(0, 10)"
           :key="item.title"
           class="flex justify-between gap-x-6 py-5"
         >