From 803700c43ca44379c403e53423cf75aebb85911f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 28 Jun 2023 13:58:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_opencond.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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, 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 2/4] =?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) } } From 5b0e69c440eb5ed237095d860f071cdb4c05ea33 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 28 Jun 2023 15:21:28 +0800 Subject: [PATCH 3/4] updateps --- modules/user/module.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/modules/user/module.go b/modules/user/module.go index 29c563519..59582ebe1 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -536,23 +536,13 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha } return } - //体力消耗，增加玩家经验 - // exp := int32(math.Abs(float64(add))) * ggd.FightPs - // user.Exp += int64(exp) - } - - if change.Ps >= ggd.PsUl { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_UserVitLimit, - Title: pb.ErrorCode_UserVitLimit.ToString(), + } else { + change.Ps += add + if change.Ps > ggd.PsUl { + change.Ps = ggd.PsUl } + } - return - } - change.Ps += add - if change.Ps > ggd.PsUl { - change.Ps = ggd.PsUl - } case comm.Talent1: if add < 0 { if user.Talent1+add < 0 { From 0465ffb11445d8138d6090f0d7894cabd1e7b857 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 28 Jun 2023 15:52:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/modelEquipment.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index 65b439e22..a584c747c 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -132,7 +132,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma } } } else { - err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k) + //err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k) // 太多地方配置无效装备 这地方暂时只打印错误日志 + this.module.Errorf("cfg.Game_equipment not found equip id %s", k) } }