From 37b691f81fe31a2a3a31f447d5da2ed28649ef86 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 9 Feb 2023 10:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E9=80=9A=E7=94=A8=E5=A4=A9?= =?UTF-8?q?=E8=B5=8B=E7=82=B9=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_extservers.json | 2 +- bin/json/game_global.json | 6 +- bin/json/game_opencond.json | 228 +++++++++++++++++++++++ modules/hero/api_talentlearn.go | 18 +- sys/configure/structs/game.globalData.go | 4 +- 5 files changed, 244 insertions(+), 14 deletions(-) diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json index 957faa2c3..0a8093432 100644 --- a/bin/json/game_extservers.json +++ b/bin/json/game_extservers.json @@ -37,7 +37,7 @@ }, "ips": "10.0.0.238:7891", "debug": true, - "sid": "dfz" + "sid": "dfz01" }, { "index": 5, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index cea3c3d07..43de62f6d 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -539,6 +539,10 @@ 20, 30 ], - "generaltp": "500000" + "generaltp": { + "a": "item", + "t": "500000", + "n": 0 + } } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 2f31504c2..54e480d28 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -9,6 +9,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -31,6 +35,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -53,6 +61,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -75,6 +87,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -97,6 +113,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -119,6 +139,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -141,6 +165,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -163,6 +191,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -185,6 +217,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -207,6 +243,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -229,6 +269,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -251,6 +295,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -273,6 +321,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -295,6 +347,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -317,6 +373,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -339,6 +399,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -361,6 +425,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -383,6 +451,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -405,6 +477,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -427,6 +503,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -449,6 +529,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -471,6 +555,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -493,6 +581,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -515,6 +607,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -537,6 +633,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -559,6 +659,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -581,6 +685,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -603,6 +711,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -647,6 +759,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -669,6 +785,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -691,6 +811,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -713,6 +837,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -735,6 +863,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -757,6 +889,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -779,6 +915,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -801,6 +941,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -823,6 +967,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -845,6 +993,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -867,6 +1019,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -889,6 +1045,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -911,6 +1071,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -933,6 +1097,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -955,6 +1123,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -977,6 +1149,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -999,6 +1175,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1021,6 +1201,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1109,6 +1293,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1131,6 +1319,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1153,6 +1345,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1175,6 +1371,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1197,6 +1397,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1219,6 +1423,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1241,6 +1449,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1263,6 +1475,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1285,6 +1501,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1307,6 +1527,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1329,6 +1553,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index 326d88260..0c21a7f72 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -87,23 +87,21 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe // 消耗指定的天赋点数 t := this.module.configure.GetHeroTalentBoxItem(talent.HeroId) if t != "" && talentConf.Point > 0 { - curItemCount := int32(this.module.ModuleItems.QueryItemAmount(session.GetUserId(), t)) if curItemCount < talentConf.Point { // 如果数量不够 则取找其他物品替代 leftCount := talentConf.Point - curItemCount // 需要其他物品的数量 generaltp := this.module.configure.GetGlobalConf().Generaltp - otherCount := int32(this.module.ModuleItems.QueryItemAmount(session.GetUserId(), generaltp)) - if leftCount <= otherCount { // 其他物品够扣 - point := &cfg.Gameatn{ - A: "item", - T: generaltp, - N: leftCount, - } - res = append(res, point) - } else { // 其他替代的道具也不足 直接返回 + fp := &cfg.Gameatn{ + A: generaltp.A, + T: generaltp.T, + N: leftCount, + } + if code = this.module.CheckRes(session, []*cfg.Gameatn{fp}); code != pb.ErrorCode_Success { code = pb.ErrorCode_ItemsNoEnough return } + res = append(res, fp) + } else { point := &cfg.Gameatn{ A: "item", diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 9dac74d1a..7cc786d52 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -174,7 +174,7 @@ type GameGlobalData struct { RotateAngle float32 RotateDizzyTime float32 Moonshopmoney []int32 - Generaltp string + Generaltp *Gameatn } const TypeId_GameGlobalData = 477542761 @@ -737,7 +737,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } } - { var _ok_ bool; if _v.Generaltp, _ok_ = _buf["generaltp"].(string); !_ok_ { err = errors.New("generaltp error"); return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["generaltp"].(map[string]interface{}); !_ok_ { err = errors.New("generaltp error"); return }; if _v.Generaltp, err = DeserializeGameatn(_x_); err != nil { return } } return }