优化
This commit is contained in:
parent
9562d35c70
commit
f4c0ecea3a
@ -10,7 +10,7 @@ import (
|
||||
|
||||
//参数校验
|
||||
func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode) {
|
||||
if req.HeroCoinfigID == "" {
|
||||
if req.HeroCoinfigID == "" && req.Star <= 6 && req.Lv <= 6*comm.HeroStarLvRatio {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
return
|
||||
}
|
||||
@ -18,7 +18,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe
|
||||
return
|
||||
}
|
||||
|
||||
/// 英雄锁定
|
||||
/// 获取指定星级或等级的英雄 GM 协议
|
||||
func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data proto.Message) {
|
||||
|
||||
code = this.GetSpecifiedCheck(session, req) // check
|
||||
@ -26,10 +26,11 @@ func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpec
|
||||
return
|
||||
}
|
||||
hero, err := this.module.modelHero.createOneHero(session.GetUserId(), req.HeroCoinfigID)
|
||||
if err != nil {
|
||||
hero.Lv = req.Lv
|
||||
hero.Star = req.Star
|
||||
if err == nil {
|
||||
code = pb.ErrorCode_HeroNoExist
|
||||
}
|
||||
hero.Lv = req.Lv
|
||||
hero.Star = req.Star
|
||||
_heroMap := map[string]interface{}{
|
||||
"lv": hero.Lv,
|
||||
"star": hero.Star,
|
||||
|
||||
@ -98,6 +98,7 @@ func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBH
|
||||
return
|
||||
}
|
||||
|
||||
// 克隆一个英雄
|
||||
func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) {
|
||||
temp := *hero
|
||||
newHero = &temp
|
||||
@ -133,7 +134,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
|
||||
return
|
||||
}
|
||||
|
||||
//叠加英雄 count叠加数量
|
||||
// 该方法适用创建初始英雄 叠加英雄 count叠加数量
|
||||
func (this *ModelHero) createHeroOverlying(uid string, heroCfgId string, count int32) (hero *pb.DBHero, err error) {
|
||||
heroes := this.moduleHero.modelHero.getHeroList(uid)
|
||||
if len(heroes) == 0 {
|
||||
@ -208,7 +209,7 @@ func (this *ModelHero) createMultiHero(uid string, heroCfgIds ...string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
//获取一个英雄
|
||||
//获取一个英雄(参数唯一objID)
|
||||
func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
|
||||
hero := &pb.DBHero{}
|
||||
err := this.moduleHero.modelHero.GetListObj(uid, heroId, hero)
|
||||
@ -248,14 +249,6 @@ func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero, count int32)
|
||||
return
|
||||
}
|
||||
|
||||
//更新英雄数据
|
||||
// func (this *ModelHero) modifyHeroData(uid, heroId string, data map[string]interface{}) error {
|
||||
// if len(data) == 0 {
|
||||
// return fmt.Errorf("params len is 0")
|
||||
// }
|
||||
// return this.moduleHero.modelHero.ChangeList(uid, heroId, data)
|
||||
// }
|
||||
|
||||
//获取玩家的英雄列表
|
||||
func (this *ModelHero) getHeroList(uid string) []*pb.DBHero {
|
||||
heroes := make([]*pb.DBHero, 0)
|
||||
@ -309,42 +302,26 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er
|
||||
if len(hero.EquipID) == 0 {
|
||||
return
|
||||
}
|
||||
var (
|
||||
curSameCount int32
|
||||
)
|
||||
|
||||
update := make(map[string]interface{})
|
||||
if hero.IsOverlying && hero.SameCount > 1 {
|
||||
curSameCount = hero.SameCount - 1
|
||||
// 克隆一个新的
|
||||
hero.SameCount -= 1
|
||||
newHero = this.CloneNewHero(hero)
|
||||
|
||||
hero.SameCount = 1
|
||||
hero.IsOverlying = false
|
||||
update["suiteId"] = hero.SuiteId
|
||||
update["suiteExtId"] = hero.SuiteExtId
|
||||
update["equipID"] = hero.EquipID
|
||||
update["isoverlying"] = false
|
||||
|
||||
update["sameCount"] = 1
|
||||
if err = this.ChangeList(hero.Uid, hero.Id, update); err != nil {
|
||||
this.moduleHero.Errorf("%v", err)
|
||||
return
|
||||
}
|
||||
//创建新卡
|
||||
}
|
||||
// 修改装备属性 并更新
|
||||
update["suiteId"] = hero.SuiteId
|
||||
update["suiteExtId"] = hero.SuiteExtId
|
||||
update["equipID"] = hero.EquipID
|
||||
|
||||
newHero = this.CloneNewHero(hero)
|
||||
newHero.EquipID = make([]string, 6)
|
||||
newHero.IsOverlying = true
|
||||
newHero.SameCount = curSameCount
|
||||
update1 := make(map[string]interface{})
|
||||
update["equipID"] = newHero.EquipID
|
||||
update1["sameCount"] = curSameCount
|
||||
update1["isoverlying"] = true
|
||||
|
||||
this.ChangeList(newHero.Uid, newHero.Id, update1)
|
||||
} else {
|
||||
update["equipID"] = hero.EquipID
|
||||
update["isoverlying"] = false
|
||||
update["suiteId"] = hero.SuiteId
|
||||
update["suiteExtId"] = hero.SuiteExtId
|
||||
this.ChangeList(hero.Uid, hero.Id, update)
|
||||
if err = this.ChangeList(hero.Uid, hero.Id, update); err != nil {
|
||||
this.moduleHero.Errorf("%v", err)
|
||||
return
|
||||
}
|
||||
// 打印
|
||||
for _, v := range hero.EquipID {
|
||||
@ -353,12 +330,16 @@ func (this *ModelHero) setEquipment(hero *pb.DBHero) (newHero *pb.DBHero, err er
|
||||
return
|
||||
}
|
||||
|
||||
//合并属性即属性值累加
|
||||
//合并属性即属性值累加 (data 额外加的属性)
|
||||
func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) {
|
||||
for k, v := range hero.Property {
|
||||
if v1, ok := data[k]; ok {
|
||||
v += v1
|
||||
}
|
||||
}
|
||||
|
||||
hero.Property = data
|
||||
if err = this.ChangeList(uid, hero.Id, map[string]interface{}{
|
||||
"property": data,
|
||||
"property": hero.Property,
|
||||
}); err != nil {
|
||||
this.moduleHero.Errorf("mergeMainProperty err %v", err)
|
||||
}
|
||||
@ -457,7 +438,6 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
|
||||
comm.Atk: int32(math.Floor(atk)),
|
||||
comm.Def: int32(math.Floor(def)),
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//重新计算英雄属性
|
||||
@ -525,18 +505,9 @@ func (this *ModelHero) AddCardExp(uid string, hero *pb.DBHero, exp int32) (newhe
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
curCount := hero.SameCount - 1
|
||||
if curCount != 0 { // 有叠加的情况
|
||||
// 克隆一个英雄
|
||||
newhero = this.CloneNewHero(hero)
|
||||
update := map[string]interface{}{
|
||||
"sameCount": curCount,
|
||||
}
|
||||
newhero.SameCount = curCount
|
||||
if err := this.ChangeList(uid, newhero.Id, update); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
}
|
||||
if hero.SameCount > 1 { //有堆叠的情况
|
||||
hero.SameCount -= 1
|
||||
newhero = this.CloneNewHero(hero) // 克隆一个新的
|
||||
}
|
||||
|
||||
update["lv"] = curLv
|
||||
@ -552,9 +523,6 @@ func (this *ModelHero) AddCardExp(uid string, hero *pb.DBHero, exp int32) (newhe
|
||||
if err := this.ChangeList(uid, hero.Id, update); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
}
|
||||
} else {
|
||||
code = pb.ErrorCode_HeroNoExist
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -91,9 +91,7 @@ func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, eq
|
||||
|
||||
//英雄列表
|
||||
func (this *Hero) GetHeroList(uid string) []*pb.DBHero {
|
||||
heroes := this.modelHero.getHeroList(uid)
|
||||
|
||||
return heroes
|
||||
return this.modelHero.getHeroList(uid)
|
||||
}
|
||||
|
||||
//查询英雄数量
|
||||
@ -109,10 +107,7 @@ func (this *Hero) QueryHeroAmount(uId string, heroCfgId string) (amount uint32)
|
||||
|
||||
// 删除指定卡牌
|
||||
func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (code pb.ErrorCode) {
|
||||
var (
|
||||
err error
|
||||
)
|
||||
err = this.modelHero.consumeHeroCard(udi, hero, amount)
|
||||
err := this.modelHero.consumeHeroCard(udi, hero, amount)
|
||||
if err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
|
||||
@ -83,6 +83,8 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int32) {
|
||||
return user.Gold
|
||||
case comm.ResExp:
|
||||
return user.Exp
|
||||
case comm.ResDiamond:
|
||||
return user.Diamond
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -148,29 +150,10 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add
|
||||
log.Errorf("AddAttributeValue err:%v", err)
|
||||
code = pb.ErrorCode_DBError
|
||||
}
|
||||
data := &pb.UserResChangePush{}
|
||||
var _cache = &pb.CacheUser{}
|
||||
err := this.modelUser.MCompModel.Get(session.GetUserId(), _cache)
|
||||
if err != nil {
|
||||
this.SendMsgToUser(string(this.GetType()), "reschange", data, _cache)
|
||||
|
||||
if bPush { //推送玩家账号信息变化消息
|
||||
session.SendMsg(string(this.GetType()), "reschange", _change)
|
||||
}
|
||||
if bPush {
|
||||
this.UserChangePush(session, _change) // 推送玩家数据变化
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
//推送玩家账号信息变化消息
|
||||
func (this *User) UserChangePush(session comm.IUserSession, resChange *pb.UserResChangePush) (err error) {
|
||||
|
||||
session.SendMsg(string(this.GetType()), "reschange", resChange)
|
||||
return
|
||||
}
|
||||
|
||||
// 设置record
|
||||
func (this *User) GetUserRecordData(uid string, typeValue int32, parmare int32) (value int32, err error) {
|
||||
//pb.DBUserRecord
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user