From 161f8a4c20e69e6e682fd987ffb32ac8e1441c6a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 11 Aug 2022 11:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8D=87=E7=BA=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E7=BB=93=E6=9E=84=E5=8F=98=E5=8C=96=20?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=AF=BB=E5=8F=96=E7=A8=8B=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_heroskilllevel.json | 1689 ++++++++++++++--- modules/hero/api_strengthenUpSkill.go | 48 +- modules/hero/configure_comp.go | 15 +- sys/configure/structs/game.heroSkillLevel.go | 2 +- .../structs/game.heroSkillLevelData.go | 27 +- 5 files changed, 1456 insertions(+), 325 deletions(-) diff --git a/bin/json/game_heroskilllevel.json b/bin/json/game_heroskilllevel.json index d22e739bd..c61036780 100644 --- a/bin/json/game_heroskilllevel.json +++ b/bin/json/game_heroskilllevel.json @@ -1,387 +1,1526 @@ [ { - "key": 1, - "hid": "15001", - "skillpos": 1, - "skilllevel": 1, - "probability": 300 + "id": 190011000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 2, - "hid": "15001", - "skillpos": 1, - "skilllevel": 2, - "probability": 255 + "id": 190012000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 3, - "hid": "15001", - "skillpos": 1, - "skilllevel": 3, - "probability": 200 + "id": 190013000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 4, - "hid": "15001", - "skillpos": 1, - "skilllevel": 4, - "probability": 100 + "id": 190014000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 5, - "hid": "15001", - "skillpos": 1, - "skilllevel": 5, - "probability": 0 + "id": 190015000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 6, - "hid": "15001", - "skillpos": 2, - "skilllevel": 1, - "probability": 300 + "id": 190016000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 7, - "hid": "15001", - "skillpos": 2, - "skilllevel": 2, - "probability": 255 + "id": 190017000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 8, - "hid": "15001", - "skillpos": 2, - "skilllevel": 3, - "probability": 200 + "id": 190018000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 9, - "hid": "15001", - "skillpos": 2, - "skilllevel": 4, - "probability": 100 + "id": 190019000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 10, - "hid": "15001", - "skillpos": 2, - "skilllevel": 5, - "probability": 0 + "id": 190020000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 11, - "hid": "15001", - "skillpos": 3, - "skilllevel": 1, - "probability": 300 + "id": 190021000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 12, - "hid": "15001", - "skillpos": 3, - "skilllevel": 2, - "probability": 255 + "id": 190022000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 13, - "hid": "15001", - "skillpos": 3, - "skilllevel": 3, - "probability": 200 + "id": 190023000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 14, - "hid": "15001", - "skillpos": 3, - "skilllevel": 4, - "probability": 100 + "id": 190024000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 15, - "hid": "15001", - "skillpos": 3, - "skilllevel": 5, - "probability": 0 + "id": 190025000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 16, - "hid": "25001", - "skillpos": 1, - "skilllevel": 1, - "probability": 255 + "id": 190026000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 17, - "hid": "25001", - "skillpos": 1, - "skilllevel": 2, - "probability": 200 + "id": 190027000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 18, - "hid": "25001", - "skillpos": 1, - "skilllevel": 3, - "probability": 100 + "id": 190028000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 19, - "hid": "25001", - "skillpos": 1, - "skilllevel": 4, - "probability": 0 + "id": 190029000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 20, - "hid": "25001", - "skillpos": 2, - "skilllevel": 1, - "probability": 300 + "id": 190030000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 21, - "hid": "25001", - "skillpos": 2, - "skilllevel": 2, - "probability": 255 + "id": 190031000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 22, - "hid": "25001", - "skillpos": 2, - "skilllevel": 3, - "probability": 200 + "id": 190032000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 23, - "hid": "25001", - "skillpos": 2, - "skilllevel": 4, - "probability": 100 + "id": 190033000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 24, - "hid": "25001", - "skillpos": 2, - "skilllevel": 5, - "probability": 50 + "id": 190034000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 25, - "hid": "25001", - "skillpos": 2, - "skilllevel": 6, - "probability": 0 + "id": 190035000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 26, - "hid": "25001", - "skillpos": 3, - "skilllevel": 1, - "probability": 255 + "id": 190036000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 27, - "hid": "25001", - "skillpos": 3, - "skilllevel": 2, - "probability": 200 + "id": 190037000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 28, - "hid": "25001", - "skillpos": 3, - "skilllevel": 3, - "probability": 100 + "id": 190038000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 29, - "hid": "25001", - "skillpos": 3, - "skilllevel": 4, - "probability": 50 + "id": 190039000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 30, - "hid": "25001", - "skillpos": 3, - "skilllevel": 5, - "probability": 0 + "id": 190040000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 31, - "hid": "35001", - "skillpos": 1, - "skilllevel": 1, - "probability": 255 + "id": 190041000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 32, - "hid": "35001", - "skillpos": 1, - "skilllevel": 2, - "probability": 200 + "id": 190042000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 33, - "hid": "35001", - "skillpos": 1, - "skilllevel": 3, - "probability": 100 + "id": 190043000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 34, - "hid": "35001", - "skillpos": 1, - "skilllevel": 4, - "probability": 0 + "id": 190044000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 35, - "hid": "35001", - "skillpos": 2, - "skilllevel": 1, - "probability": 0 + "id": 190045000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 36, - "hid": "35001", - "skillpos": 3, - "skilllevel": 1, - "probability": 300 + "id": 190046000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 37, - "hid": "35001", - "skillpos": 3, - "skilllevel": 2, - "probability": 255 + "id": 190047000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 38, - "hid": "35001", - "skillpos": 3, - "skilllevel": 3, - "probability": 200 + "id": 190048000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 39, - "hid": "35001", - "skillpos": 3, - "skilllevel": 4, - "probability": 100 + "id": 190049000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 40, - "hid": "35001", - "skillpos": 3, - "skilllevel": 5, - "probability": 0 + "id": 190050000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 41, - "hid": "44001", - "skillpos": 1, - "skilllevel": 1, - "probability": 300 + "id": 190051000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 42, - "hid": "44001", - "skillpos": 1, - "skilllevel": 2, - "probability": 255 + "id": 190052000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 43, - "hid": "44001", - "skillpos": 1, - "skilllevel": 3, - "probability": 200 + "id": 190053000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 44, - "hid": "44001", - "skillpos": 1, - "skilllevel": 4, - "probability": 0 + "id": 190054000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 45, - "hid": "44001", - "skillpos": 2, - "skilllevel": 1, - "probability": 300 + "id": 190055000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 46, - "hid": "44001", - "skillpos": 2, - "skilllevel": 2, - "probability": 255 + "id": 190056000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 47, - "hid": "44001", - "skillpos": 2, - "skilllevel": 3, - "probability": 200 + "id": 190057000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 48, - "hid": "44001", - "skillpos": 2, - "skilllevel": 4, - "probability": 100 + "id": 190058000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 49, - "hid": "44001", - "skillpos": 2, - "skilllevel": 5, - "probability": 50 + "id": 190059000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 50, - "hid": "44001", - "skillpos": 2, - "skilllevel": 6, - "probability": 0 + "id": 190060000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 51, - "hid": "44001", - "skillpos": 3, - "skilllevel": 1, - "probability": 300 + "id": 190061000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 52, - "hid": "44001", - "skillpos": 3, - "skilllevel": 2, - "probability": 255 + "id": 190062000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 53, - "hid": "44001", - "skillpos": 3, - "skilllevel": 3, - "probability": 200 + "id": 190063000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 54, - "hid": "44001", - "skillpos": 3, - "skilllevel": 4, - "probability": 100 + "id": 190064000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] }, { - "key": 55, - "hid": "44001", - "skillpos": 3, - "skilllevel": 5, - "probability": 0 + "id": 190065000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190066000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190067000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190068000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190069000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190070000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190071000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190072000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190073000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190074000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190075000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190076000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190077000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190078000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190079000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190080000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190081000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190082000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190083000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190084000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190085000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190086000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100012100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100022100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100092100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100102100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100162100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100191100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100192100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100193100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100622100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 100626100, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190087000, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190087001, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190087002, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190087003, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 190087004, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110010, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110011, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110012, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110013, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110031, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110032, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110033, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110171, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110172, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110173, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110181, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110182, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110183, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110091, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110092, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110093, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110111, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110112, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110113, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 440051, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 440052, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 440053, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110081, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110082, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 110083, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 150051, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 150052, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 150053, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 125004011, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 125004111, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 125004211, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 125004311, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 135002011, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 135002111, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 135002211, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] + }, + { + "id": 135002311, + "probability": [ + 300, + 255, + 200, + 100, + 0, + 0, + 0 + ] } ] \ No newline at end of file diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index fdb8920a6..477a18163 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -22,12 +22,9 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H /// 英雄技能升级 func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { var ( - tmpUpSkillID map[int32]*pb.SkillData // 即将要升级的技能id - probability map[int32]int32 // 即将升级技能的权重 - upSkillPos int32 // 升级的技能位置 - totalprobability int32 // 所有技能总权重 - tmpValue int32 // 临时对象 存放累加权重 - tagColor int32 // 目标卡品质 + probability map[int32]int32 // 即将升级技能的权重 + upSkillPos int32 // 升级的技能位置 + totalprobability int32 // 所有技能总权重 _hero *pb.DBHero // 操作的英雄 ChangeList []*pb.DBHero // 推送 改变的英雄 @@ -39,7 +36,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt mapCostHero = make(map[string]int32, 0) mapCostObj = make(map[string]*pb.DBHero, 0) ChangeList = make([]*pb.DBHero, 0) - tmpUpSkillID = make(map[int32]*pb.SkillData, 0) code = this.StrengthenUpSkillCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -55,7 +51,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt code = pb.ErrorCode_HeroNoExist return } - tagColor = heroCfg.Color + for _, v := range req.CostCardObj { // 数组转 map mapCostHero[v]++ } @@ -74,7 +70,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt return } tmp := this.module.configure.GetHero(costHero.HeroID) // 星级校验 - if tmp.Color != tagColor { + if tmp.Color != heroCfg.Color { code = pb.ErrorCode_HeroColorErr return } @@ -99,33 +95,27 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt return } + tmpUpSkillID := make(map[int32]bool, 0) for i := 0; i < int(lvUpCount); i++ { // 升级技能 - config, err1 := this.module.configure.GetHeroSkillUpConfig() - if err1 != nil { - code = pb.ErrorCode_ConfigNoFound - return - } - + probability = make(map[int32]int32, 0) for index, skill := range _hero.NormalSkill { skillMaxLv := this.module.configure.GetHeroSkillMaxLvConfig(uint32(skill.SkillID)) if skill.SkillLv < skillMaxLv { // 找到没有满级的技能id - tmpUpSkillID[int32(index)] = skill + tmpUpSkillID[int32(index)] = true + skillData := this.module.configure.GetHeroSkillUpConfig(skill.SkillID) + if skillData == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + + probability[skill.SkillID] = skillData.Probability[skill.SkillLv] // 获取权重 } } if len(tmpUpSkillID) == 0 { code = pb.ErrorCode_HeroMaxSkillLv return } - probability = make(map[int32]int32, 0) - // 获取权重 - for k, v := range tmpUpSkillID { - for _, v2 := range config.GetDataList() { // 需要优化配置表 - if v2.Hid == _hero.HeroID && (k+1) == v2.Skillpos && v.SkillLv == v2.Skilllevel { - probability[k] = v2.Probability // 设置权重 - break - } - } - } + totalprobability = 0 // 根据权重升级对应的技能 for _, v := range probability { @@ -136,10 +126,10 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt return } n, _ := rand.Int(rand.Reader, big.NewInt(int64(totalprobability))) - tmpValue = 0 + tmp := 0 for k, v := range probability { - tmpValue += v - if int32(n.Int64()) < tmpValue { // 找到了 + tmp += int(v) + if int32(n.Int64()) < v { // 找到了 upSkillPos = k break } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index e965155f6..dfab12956 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -270,18 +270,13 @@ func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.Game_heroLevelgrowD } // 获取英雄技能升级相关信息 -func (this *configureComp) GetHeroSkillUpConfig() (configure *cfg.Game_heroSkillLevel, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(hero_skillup); err == nil { - if configure, ok = v.(*cfg.Game_heroSkillLevel); !ok { - err = fmt.Errorf("%T no is *cfg.Game_hero", v) +func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.Game_heroSkillLevelData) { + + if v, err := this.GetConfigure(hero_skillup); err == nil { + if conf, ok := v.(*cfg.Game_heroSkillLevel); ok { + data = conf.Get(skillid) return } - } else { - err = fmt.Errorf("%T no is *cfg.Game_hero", v) } return diff --git a/sys/configure/structs/game.heroSkillLevel.go b/sys/configure/structs/game.heroSkillLevel.go index f72c2b50b..b14aadbe3 100644 --- a/sys/configure/structs/game.heroSkillLevel.go +++ b/sys/configure/structs/game.heroSkillLevel.go @@ -21,7 +21,7 @@ func NewGame_heroSkillLevel(_buf []map[string]interface{}) (*Game_heroSkillLevel return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v + dataMap[_v.Id] = _v } } return &Game_heroSkillLevel{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.heroSkillLevelData.go b/sys/configure/structs/game.heroSkillLevelData.go index 5f6d3b746..6122c4c6e 100644 --- a/sys/configure/structs/game.heroSkillLevelData.go +++ b/sys/configure/structs/game.heroSkillLevelData.go @@ -11,11 +11,8 @@ package cfg import "errors" type Game_heroSkillLevelData struct { - Key int32 - Hid string - Skillpos int32 - Skilllevel int32 - Probability int32 + Id int32 + Probability []int32 } func (Game_heroSkillLevelData) GetTypeId() int { @@ -24,10 +21,20 @@ func (Game_heroSkillLevelData) GetTypeId() int { func NewGame_heroSkillLevelData(_buf map[string]interface{}) (_v *Game_heroSkillLevelData, err error) { _v = &Game_heroSkillLevelData{} - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } - { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillpos"].(float64); !_ok_ { err = errors.New("skillpos error"); return }; _v.Skillpos = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilllevel"].(float64); !_ok_ { err = errors.New("skilllevel error"); return }; _v.Skilllevel = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["probability"].([]interface{}); !_ok_ { err = errors.New("probability error"); return } + + _v.Probability = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Probability = append(_v.Probability, _list_v_) + } + } + return }