From 4fce36968095cf1494801e9a28c9c840b518888c Mon Sep 17 00:00:00 2001
From: jingyushiwo <751360932@qq.com>
Date: Fri, 2 Jul 2021 16:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=EF=BC=9A=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_chat_system.json | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_chat_system.json b/shared/resource/jsons/dic_zyz_chat_system.json
index c35357817..70c8ab489 100644
--- a/shared/resource/jsons/dic_zyz_chat_system.json
+++ b/shared/resource/jsons/dic_zyz_chat_system.json
@@ -20,7 +20,7 @@
         "name": "TEAM_ROLE",
         "mean": "玩家发送组队消息",
         "type": "5&",
-        "template": "<color=#c08834>%d</color><color=#a49a48>发起组队邀请，诚邀您加入寻宝队伍，</color><color=#2f9b00><on click=%d>加入</on></color>",
+        "template": "<color=#a49a48>%d</color>",
         "comments": "1:%d(发出组队邀请的玩家名)；2:%d(跳转链接)"
     },
     {
@@ -36,7 +36,7 @@
         "name": "COMPOSE_ORANGE_HERO",
         "mean": "玩家获得传奇武将（橙）",
         "type": "1&",
-        "template": "<color=#a49a48>恭喜</color><color=#c08834>%d</color><color=#a49a48>时来运转，获得神话武将</color>%d",
+        "template": "<color=#a49a48>恭喜</color><color=#c08834>%d</color><color=#a49a48>时来运转，获得传奇武将</color>%d",
         "comments": "1:%d(玩家名)；2:%d(武将名)"
     },
     {
@@ -108,7 +108,7 @@
         "name": "JEWEL_COMPOSE",
         "mean": "宝石合成7阶及其以上",
         "type": "1&",
-        "template": "<color=#a49a48>恭喜</color><color=#c08834>%d</color><color=#a49a48>，合成出</color>%d<color=#a49a48>阶</color>的%d",
+        "template": "<color=#a49a48>恭喜</color><color=#c08834>%d</color><color=#a49a48>，合成出%d",
         "comments": "1:%d(玩家名)；2:%d(宝石阶数)；3.%d(宝石名)"
     },
     {
@@ -153,7 +153,7 @@
     },
     {
         "id": 19,
-        "name": "HERO_WAKE_UP",
+        "name": "HERO_WAKEUP",
         "mean": "武将觉醒",
         "type": "1&",
         "template": "<color=#a49a48>恭喜</color><color=#c08834>%d</color><color=#c08834>，成功将</color><color=#f03420>%d</color><color=#c08834>觉醒</color>",
@@ -182,5 +182,13 @@
         "type": "1&",
         "template": "<color=#c08834>%d</color><color=#a49a48>赠送给</color><colorr=#c08834>%d</color><color=#fc879b>%d</color>",
         "comments": "1:%d(赠送的玩家名)；2:%d(赠送的玩家名)；3.%d(赠送的道具)"
+    },
+    {
+        "id": 23,
+        "name": "SEND_MARQUEE",
+        "mean": "跑马灯内容",
+        "type": "1&",
+        "template": "%d",
+        "comments": "&"
     }
 ]
\ No newline at end of file