From 45d2e9b88fa0004d4036a93702186ff62a0bad89 Mon Sep 17 00:00:00 2001
From: yajunlu <luyajun@trgame.cn>
Date: Wed, 29 Sep 2021 13:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E8=A1=A8=E6=83=85?=
 =?UTF-8?q?=E8=A1=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_chat_emoji.json | 91 ++++++++++++++++---
 .../jsons/dic_zyz_chat_emoji_group.json       | 10 +-
 2 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_chat_emoji.json b/shared/resource/jsons/dic_zyz_chat_emoji.json
index ef73f5cdc..5cfd17992 100644
--- a/shared/resource/jsons/dic_zyz_chat_emoji.json
+++ b/shared/resource/jsons/dic_zyz_chat_emoji.json
@@ -1,32 +1,93 @@
 [
     {
         "id": 1,
-        "name": "大笑",
-        "gifUrl": "emoji_1",
-        "index": 1
+        "name": "夏侯花痴",
+        "animation": "xiahou_huachi",
+        "index": 1,
+        "imgNum": 2
     },
     {
         "id": 2,
-        "name": "大哭",
-        "gifUrl": "emoji_2",
-        "index": 2
+        "name": "夏侯坏笑",
+        "animation": "xiahou_huaixiao",
+        "index": 2,
+        "imgNum": 2
     },
     {
         "id": 3,
-        "name": "哭1",
-        "gifUrl": "emoji_3",
-        "index": 3
+        "name": "夏侯滑稽",
+        "animation": "xiahou_huaji",
+        "index": 3,
+        "imgNum": 2
     },
     {
         "id": 4,
-        "name": "哭2",
-        "gifUrl": "emoji_4",
-        "index": 4
+        "name": "夏侯困",
+        "animation": "xiahou_kun",
+        "index": 4,
+        "imgNum": 3
     },
     {
         "id": 5,
-        "name": "哭3",
-        "gifUrl": "emoji_5",
-        "index": 5
+        "name": "夏侯喷",
+        "animation": "xiahou_pen",
+        "index": 5,
+        "imgNum": 3
+    },
+    {
+        "id": 6,
+        "name": "夏侯伤心哭",
+        "animation": "xiahou_shangxinku",
+        "index": 6,
+        "imgNum": 2
+    },
+    {
+        "id": 7,
+        "name": "夏侯震惊",
+        "animation": "xiahou_zhenjing",
+        "index": 7,
+        "imgNum": 3
+    },
+    {
+        "id": 8,
+        "name": "赵云抠鼻",
+        "animation": "zhaoyun_koubi",
+        "index": 1,
+        "imgNum": 2
+    },
+    {
+        "id": 9,
+        "name": "赵云探头",
+        "animation": "zhaoyun_tantou",
+        "index": 2,
+        "imgNum": 3
+    },
+    {
+        "id": 10,
+        "name": "赵云无语",
+        "animation": "zhaoyun_wuyu",
+        "index": 3,
+        "imgNum": 3
+    },
+    {
+        "id": 11,
+        "name": "赵云笑哭",
+        "animation": "zhaoyun_xiaoku",
+        "index": 4,
+        "imgNum": 2
+    },
+    {
+        "id": 12,
+        "name": "赵云疑惑",
+        "animation": "zhaoyun_yihuo",
+        "index": 5,
+        "imgNum": 3
+    },
+    {
+        "id": 13,
+        "name": "赵云晕",
+        "animation": "zhaoyun_yun",
+        "index": 6,
+        "imgNum": 3
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_chat_emoji_group.json b/shared/resource/jsons/dic_zyz_chat_emoji_group.json
index abe96156e..a33fbc4ec 100644
--- a/shared/resource/jsons/dic_zyz_chat_emoji_group.json
+++ b/shared/resource/jsons/dic_zyz_chat_emoji_group.json
@@ -1,8 +1,14 @@
 [
     {
         "id": 1,
-        "groupName": "sb",
+        "groupName": "xiahou",
         "groupIndex": 1,
-        "emojiList": "1&2&3&4&5"
+        "emojiList": "1&2&3&4&5&6&7"
+    },
+    {
+        "id": 2,
+        "groupName": "zhaoyun",
+        "groupIndex": 2,
+        "emojiList": "8&9&10&11&12&13"
     }
 ]
\ No newline at end of file