配置优化

modules/hero/configure_comp.go

@@ -161,57 +161,6 @@ func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GameD
 	return this.drawCardCfg[poosType]
 }
 
-// 获取英雄强化增加属性配置数据
-func (this *configureComp) GetHeroStargrowConfig() (configure *cfg.GameHeroStargrow, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_stargrow); err == nil {
-		if configure, ok = v.(*cfg.GameHeroStargrow); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHero", v)
-			return
-		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHero", v)
-	}
-
-	return
-}
-
-// 获取英雄升级属性变化相关配置数据
-func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.GameHeroLevelgrow, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_levelgrow); err == nil {
-		if configure, ok = v.(*cfg.GameHeroLevelgrow); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHeroLevelgrow", v)
-			return
-		}
-
-	}
-	return
-}
-
-// 获取英雄升级相关配置数据
-func (this *configureComp) GetHeroLevelUpConfig() (configure *cfg.GameHeroLevelup, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_levelup); err == nil {
-		if configure, ok = v.(*cfg.GameHeroLevelup); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHeroLevelup", v)
-			return
-		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHeroLevelup", v)
-	}
-	return
-}
-
 func (this *configureComp) GetHeroExpConfig() (configure *cfg.GameHeroExp, err error) {
 	var (
 		v  interface{}
@@ -242,40 +191,6 @@ func (this *configureComp) GetHeroExp(hid string) *cfg.GameHeroExpData {
 	return nil
 }
 
-//英雄等级基础属性
-func (this *configureComp) GetHeroLevelup() (configure *cfg.GameHeroLevelup, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_levelup); err != nil {
-		return
-	} else {
-		if configure, ok = v.(*cfg.GameHeroLevelup); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHeroLevelup", v)
-			return
-		}
-	}
-	return
-}
-
-//英雄品质系数
-func (this *configureComp) GetHeroStargrow() (configure *cfg.GameHeroStargrow, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_stargrow); err != nil {
-		return
-	} else {
-		if configure, ok = v.(*cfg.GameHeroStargrow); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHeroStargrow", v)
-			return
-		}
-	}
-	return
-}
-
 //获取英雄配置
 func (this *configureComp) GetHeroConfig(heroCfgId string) *cfg.GameHeroData {
 	if v, err := this.GetConfigure(new_hero); err == nil {
@@ -286,61 +201,44 @@ func (this *configureComp) GetHeroConfig(heroCfgId string) *cfg.GameHeroData {
 			}
 		}
 	}
-	this.module.Errorf("config no is *cfg.GameHero")
+	this.module.Errorf("config no is *cfg.GameHero heroid :%s", heroCfgId)
 	return nil
 }
 
 //获取英雄星级配置
 func (this *configureComp) GetHeroStar(star int32) *cfg.GameHeroStargrowData {
-	cfg, err := this.GetHeroStargrow()
-	if err != nil {
-		return nil
-	}
 
-	if v, ok := cfg.GetDataMap()[star]; ok {
+	if v, err := this.GetConfigure(hero_stargrow); err == nil {
-		return v
+
+		if configure, ok := v.(*cfg.GameHeroStargrow); ok {
+			return configure.Get(star)
+		}
 	}
+	this.module.Errorf(" GetHeroStar err : lv:%d", star)
 	return nil
 }
 
 //获取英雄等级配置
 func (this *configureComp) GetHeroLv(lv int32) *cfg.GameHeroLevelupData {
-	cfg, err := this.GetHeroLevelup()
+	if v, err := this.GetConfigure(hero_levelup); err == nil {
-	if err != nil {
+		if configure, ok := v.(*cfg.GameHeroLevelup); ok {
-		return nil
+			return configure.Get(lv)
-	}
-	if v, ok := cfg.GetDataMap()[lv]; ok {
-		return v
-	}
-	return nil
-}
-
-// 英雄成长系数
-func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameHeroLevelgrow, err error) {
-	var (
-		v  interface{}
-		ok bool
-	)
-	if v, err = this.GetConfigure(hero_levelgrow); err != nil {
-		return
-	} else {
-		if configure, ok = v.(*cfg.GameHeroLevelgrow); !ok {
-			err = fmt.Errorf("%T no is *cfg.GameHeroLevelgrow", v)
-			return
 		}
 	}
-	return
+
+	this.module.Errorf(" GetHeroLv err : lv:%d", lv)
+
+	return nil
 }
 
 //英雄成长配置
 func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.GameHeroLevelgrowData {
-	cfg, err := this.GetHeroLevelgrow()
+	if v, err := this.GetConfigure(hero_levelgrow); err == nil {
-	if err != nil {
+		if configure, ok := v.(*cfg.GameHeroLevelgrow); ok {
-		return nil
+			return configure.Get(heroId)
-	}
+		}
-	if v, ok := cfg.GetDataMap()[heroId]; ok {
-		return v
 	}
+
 	return nil
 }
 
@@ -494,9 +392,8 @@ func (this *configureComp) GetHeroSkillCost(star int32) (cost []*cfg.Gameatn) {
 		if configure, ok := v.(*cfg.GameHeroSkill); ok {
 			return configure.Get(star).Needgold
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHeroExp", v)
 	}
+	this.module.Errorf(" GetHeroSkillCost err : star:%d", star)
 	return
 }
 
@@ -507,9 +404,8 @@ func (this *configureComp) GetHeroMaxLv(star int32) int32 {
 		if configure, ok := v.(*cfg.GameHeroStargrow); ok {
 			return configure.Get(star).Maxlevel
 		}
-	} else {
-		err = fmt.Errorf("%T no is *cfg.GameHero", v)
 	}
+	this.module.Errorf(" GetHeroMaxLv err : star:%d", star)
 
 	return 1
 }