From 5dcea3a8b15515a77e0432869b5d30b0207162e2 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 17 Oct 2023 11:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E9=BE=99=E9=97=A8=E7=A5=A8=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E6=81=A2=E5=A4=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_global.json       | 15 ++++++++++-----
 bin/json/game_item.json         |  2 +-
 modules/items/module.go         |  9 +++++++++
 sys/configure/structs/Tables.go |  7 -------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 25b119672..8080c5115 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -807,16 +807,21 @@
     },
     "guildboss_kill_Preview": [
       {
-        "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "a": "item",
+        "t": "22100001",
+        "n": 1
       }
     ],
     "guildboss_challenge_preview": [
+      {
+        "a": "item",
+        "t": "13000005",
+        "n": 1
+      },
       {
         "a": "attr",
-        "t": "gold",
-        "n": 1000
+        "t": "guildcoin",
+        "n": 1
       }
     ],
     "compass_distansces": [
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index f8bfa2d1f..22b69588f 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -20241,7 +20241,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "",
+    "img": "wp_icon_jjcq",
     "intr": {
       "key": "item_item_intr_410",
       "text": ""
diff --git a/modules/items/module.go b/modules/items/module.go
index d321a4744..d36f6174d 100644
--- a/modules/items/module.go
+++ b/modules/items/module.go
@@ -427,5 +427,14 @@ func (this *Items) InitItemBagData(session comm.IUserSession) (errdata *pb.Error
 	if curNum < maxNum {
 		this.AddItem(session, dragonItemNum, maxNum-curNum, true)
 	}
+
+	// 接龙小游戏道具恢复
+	jielongMaxNum := this.ModuleTools.GetGlobalConf().FastplayInteraction
+	jielongItemId := this.ModuleTools.GetGlobalConf().FastplayItem
+	curNum = int32(this.QueryItemAmount(session.GetUserId(), jielongItemId))
+
+	if curNum < jielongMaxNum {
+		this.AddItem(session, dragonItemNum, jielongMaxNum-curNum, true)
+	}
 	return
 }
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index a83fdb180..efee8931a 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -273,7 +273,6 @@ type Tables struct {
     ConsumeHero *GameConsumeHero
     PlayerSkill *GamePlayerSkill
     ConsumeBox *GameConsumeBox
-    BukashiAi *GameBukashiAi
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1853,11 +1852,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.ConsumeBox, err = NewGameConsumeBox(buf) ; err != nil {
         return nil, err
     }
-    if buf, err = loader("game_bukashiai") ; err != nil {
-        return nil, err
-    }
-    if tables.BukashiAi, err = NewGameBukashiAi(buf) ; err != nil {
-        return nil, err
-    }
     return tables, nil
 }