diff --git a/bin/json/game_itembox.json b/bin/json/game_itembox.json deleted file mode 100644 index a58c3e876..000000000 --- a/bin/json/game_itembox.json +++ /dev/null @@ -1,286 +0,0 @@ -[ - { - "heroid": "13001", - "itemid": "513001" - }, - { - "heroid": "13002", - "itemid": "513002" - }, - { - "heroid": "13003", - "itemid": "513003" - }, - { - "heroid": "13004", - "itemid": "513004" - }, - { - "heroid": "13005", - "itemid": "513005" - }, - { - "heroid": "14001", - "itemid": "514001" - }, - { - "heroid": "14002", - "itemid": "514002" - }, - { - "heroid": "14003", - "itemid": "514003" - }, - { - "heroid": "14004", - "itemid": "514004" - }, - { - "heroid": "14005", - "itemid": "514005" - }, - { - "heroid": "14006", - "itemid": "514006" - }, - { - "heroid": "14007", - "itemid": "514007" - }, - { - "heroid": "15001", - "itemid": "515001" - }, - { - "heroid": "15002", - "itemid": "515002" - }, - { - "heroid": "15003", - "itemid": "515003" - }, - { - "heroid": "15004", - "itemid": "515004" - }, - { - "heroid": "23001", - "itemid": "523001" - }, - { - "heroid": "23002", - "itemid": "523002" - }, - { - "heroid": "23003", - "itemid": "523003" - }, - { - "heroid": "23004", - "itemid": "523004" - }, - { - "heroid": "24001", - "itemid": "524001" - }, - { - "heroid": "24002", - "itemid": "524002" - }, - { - "heroid": "24003", - "itemid": "524003" - }, - { - "heroid": "24004", - "itemid": "524004" - }, - { - "heroid": "24005", - "itemid": "524005" - }, - { - "heroid": "24006", - "itemid": "524006" - }, - { - "heroid": "24007", - "itemid": "524007" - }, - { - "heroid": "24008", - "itemid": "524008" - }, - { - "heroid": "24009", - "itemid": "524009" - }, - { - "heroid": "25001", - "itemid": "525001" - }, - { - "heroid": "25002", - "itemid": "525002" - }, - { - "heroid": "25003", - "itemid": "525003" - }, - { - "heroid": "25004", - "itemid": "525004" - }, - { - "heroid": "33001", - "itemid": "533001" - }, - { - "heroid": "33002", - "itemid": "533002" - }, - { - "heroid": "33003", - "itemid": "533003" - }, - { - "heroid": "33004", - "itemid": "533004" - }, - { - "heroid": "33005", - "itemid": "533005" - }, - { - "heroid": "33006", - "itemid": "533006" - }, - { - "heroid": "34001", - "itemid": "534001" - }, - { - "heroid": "34002", - "itemid": "534002" - }, - { - "heroid": "34003", - "itemid": "534003" - }, - { - "heroid": "34004", - "itemid": "534004" - }, - { - "heroid": "34005", - "itemid": "534005" - }, - { - "heroid": "34006", - "itemid": "534006" - }, - { - "heroid": "34007", - "itemid": "534007" - }, - { - "heroid": "34008", - "itemid": "534008" - }, - { - "heroid": "35001", - "itemid": "535001" - }, - { - "heroid": "35002", - "itemid": "535002" - }, - { - "heroid": "35003", - "itemid": "535003" - }, - { - "heroid": "35004", - "itemid": "535004" - }, - { - "heroid": "35005", - "itemid": "535005" - }, - { - "heroid": "35006", - "itemid": "535006" - }, - { - "heroid": "43001", - "itemid": "543001" - }, - { - "heroid": "43002", - "itemid": "543002" - }, - { - "heroid": "43003", - "itemid": "543003" - }, - { - "heroid": "43004", - "itemid": "543004" - }, - { - "heroid": "43005", - "itemid": "543005" - }, - { - "heroid": "43006", - "itemid": "543006" - }, - { - "heroid": "43007", - "itemid": "543007" - }, - { - "heroid": "44001", - "itemid": "544001" - }, - { - "heroid": "44002", - "itemid": "544002" - }, - { - "heroid": "44003", - "itemid": "544003" - }, - { - "heroid": "44004", - "itemid": "544004" - }, - { - "heroid": "44006", - "itemid": "544006" - }, - { - "heroid": "45001", - "itemid": "545001" - }, - { - "heroid": "45002", - "itemid": "545002" - }, - { - "heroid": "45003", - "itemid": "545003" - }, - { - "heroid": "45004", - "itemid": "545004" - }, - { - "heroid": "44005", - "itemid": "544005" - }, - { - "heroid": "15005", - "itemid": "515005" - } -] \ No newline at end of file diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index cdc6bc1b4..a843fda7a 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -28,7 +28,7 @@ const ( hero_drawcost = "game_drawcost.json" // 抽卡消耗 hero_fusion = "game_herofusion.json" // 卡牌融合 hero_talent = "game_herotalent.json" // 天赋详细数据 - hero_itembox = "game_itembox.json" // 天赋详细数据 + hero_talentbox = "game_talentbox.json" // 天赋详细数据 game_shopitem = "game_shopitem.json" hero_skill = "game_heroskill.json" ) @@ -60,7 +60,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_drawcard: cfg.NewGameDrawCard, hero_fusion: cfg.NewGameHerofusion, hero_talent: cfg.NewGameHeroTalent, - hero_itembox: cfg.NewGameItemBox, + hero_talentbox: cfg.NewGameTalentBox, game_shopitem: cfg.NewGameShopitem, hero_skill: cfg.NewGameHeroSkill, }) @@ -295,8 +295,8 @@ func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData // 天赋指定消耗 func (this *configureComp) GetHeroTalentBoxItem(heroid string) (itemid string) { - if v, err := this.GetConfigure(hero_itembox); err == nil { - if configure, ok := v.(*cfg.GameItemBox); ok { + if v, err := this.GetConfigure(hero_talentbox); err == nil { + if configure, ok := v.(*cfg.GameTalentBox); ok { itemid = configure.Get(heroid).Itemid return }