From 25a5ef9dc1bc47bfccd21fe3a0c60ca7612aaa37 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 28 Jun 2023 14:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_item.json             | 6 +++---
 bin/json/game_opencond.json         | 6 +++---
 bin/json/game_pandamasjs.json       | 6 +++---
 modules/equipment/modelEquipment.go | 2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 1dcd289cb..7b8adede8 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -10854,7 +10854,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111960,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],
@@ -10887,7 +10887,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111860,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],
@@ -10920,7 +10920,7 @@
     "reddottype": 0,
     "effects": "effect_ui_bagwindow_2",
     "modelName": "",
-    "box_id": 17111860,
+    "box_id": 17111040,
     "synthetize_num": 0,
     "synthetize_deplete": [],
     "synthetize_get": [],
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 5ebcbced2..6965b18e0 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -606,7 +606,7 @@
     "main": [
       {
         "key": 1,
-        "param": 1
+        "param": 9999
       }
     ],
     "wkqbx": 2,
@@ -1532,7 +1532,7 @@
     "main": [
       {
         "key": 1,
-        "param": 10
+        "param": 6
       }
     ],
     "wkqbx": 0,
@@ -1557,7 +1557,7 @@
     "main": [
       {
         "key": 1,
-        "param": 20
+        "param": 10
       }
     ],
     "wkqbx": 0,
diff --git a/bin/json/game_pandamasjs.json b/bin/json/game_pandamasjs.json
index c34358f4b..205a89520 100644
--- a/bin/json/game_pandamasjs.json
+++ b/bin/json/game_pandamasjs.json
@@ -4,7 +4,7 @@
     "unlock_condition": 20010,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_1",
-      "text": "完成主线任务“这是哪里”后解锁"
+      "text": "等级1解锁"
     }
   },
   {
@@ -12,7 +12,7 @@
     "unlock_condition": 20010,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_2",
-      "text": "完成主线任务“初来乍到”后解锁"
+      "text": "等级6解锁"
     }
   },
   {
@@ -20,7 +20,7 @@
     "unlock_condition": 20020,
     "unlock_conditiondes": {
       "key": "pandamas_pandamas_js_unlock_conditiondes_3",
-      "text": "完成主线任务“事件开端”后解锁"
+      "text": "等级10解锁"
     }
   }
 ]
\ No newline at end of file
diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index 9fc6ec7d4..65b439e22 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -131,6 +131,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
 					change = append(change, equipment)
 				}
 			}
+		} else {
+			err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k)
 		}
 	}