From ffd652292eac80c279f723bdd452d86986b4a3db Mon Sep 17 00:00:00 2001
From: yajunlu <luyajun@trgame.cn>
Date: Thu, 1 Jul 2021 11:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=EF=BC=9A=E7=89=A9=E5=93=81?=
 =?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_goods.json | 60 +---------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index 0dfc93959..8fd990c98 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -59641,7 +59641,7 @@
         "info": "神州探秘宝库道具"
     },
     {
-        "good_id": 40010,
+        "good_id": 400010,
         "name": "荐贤书",
         "lvLimited": 1,
         "quality": 1,
@@ -59681,7 +59681,7 @@
         "condition": 0,
         "timelimit": 0,
         "gift": 0,
-        "info": "天机骰子"
+        "info": "武将宝库道具"
     },
     {
         "good_id": 41001,
@@ -103757,61 +103757,5 @@
         "timelimit": 0,
         "gift": 0,
         "info": "天机骰子"
-    },
-    {
-<<<<<<< Updated upstream
-        "good_id": 72030,
-        "name": "荐贤书",
-        "lvLimited": 1,
-        "quality": 1,
-        "image_id": 72021,
-        "itid": 27,
-=======
-        "good_id": 72031,
-        "name": "主公经验",
-        "lvLimited": 1,
-        "quality": 1,
-        "image_id": 72031,
-        "itid": 58,
->>>>>>> Stashed changes
-        "goodType": 1,
-        "pieces": 0,
-        "pieceId": 0,
-        "composeMaterial": "&",
-        "specialMaterial": "&",
-        "suitId": 0,
-        "decomposeItem": "&",
-        "hole": 0,
-        "randomEffect": "&",
-        "hid": 0,
-        "hp": 0,
-        "atk": 0,
-        "matk": 0,
-        "def": 0,
-        "mdef": 0,
-        "agi": 0,
-        "luk": 0,
-        "hp_up": 0,
-        "atk_up": 0,
-        "matk_up": 0,
-        "def_up": 0,
-        "mdef_up": 0,
-        "agi_up": 0,
-        "luk_up": 0,
-        "damageIncrease": 0,
-        "damageDecrease": 0,
-        "specialAttr": "&",
-        "suitId_1": 0,
-        "getWays": "1&0",
-        "useWays": 0,
-        "value": 0,
-        "condition": 0,
-        "timelimit": 0,
-        "gift": 0,
-<<<<<<< Updated upstream
-        "info": "天机骰子"
-=======
-        "info": "主公经验"
->>>>>>> Stashed changes
     }
 ]
\ No newline at end of file