Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/hero/api_heroResonance.go

@@ -135,6 +135,9 @@ func (this *apiComp) Resonance(session comm.IUserSession, agrs map[string]interf
 			}
 		}
 	}
-
+	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }

modules/hero/api_heroResonanceReset.go

@@ -88,6 +88,9 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, agrs map[string]i
 	if err != nil {
 		log.Errorf("update hero skill failed:%v", err)
 	}
-
+	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }

modules/hero/api_heroResonanceSelect.go

@@ -53,5 +53,9 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, agrs map[stri
 		log.Errorf("update hero skill failed:%v", err)
 	}
 
+	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }

modules/hero/api_heroSkillUp.go

@@ -139,5 +139,9 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[strin
 		code = pb.ErrorCode_DBError
 		return
 	}
+	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }

modules/hero/api_heroStarUp.go

@@ -151,5 +151,9 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string
 		code = pb.ErrorCode_DBError
 		log.Errorf("update hero skill failed:%v", err)
 	}
+	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }

modules/hero/api_heroStrengthen.go

@@ -101,6 +101,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero
 		"curExp":   curExp,
 		"curLv":    curLv,
 		"addExp":   addExp,
+		"heroObj":  _hero,
 		//"atn":      atn,
 	}
 	return
@@ -115,15 +116,21 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]i
 		addExp   int32 // 需要增加的经验
 		//atn      = map[string]interface{}{}
 	)
-	defer func() {
+
-		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{})
-		}
-	}()
 	costGold = agrs["costGold"].(int32)
 	curLv = agrs["curLv"].(int32)
 	curExp = agrs["curExp"].(int32)
 	addExp = agrs["addExp"].(int32)
+	_hero := agrs["heroObj"].(*pb.DBHero)
+	if _hero == nil {
+		code = pb.ErrorCode_HeroNoExist
+		return
+	}
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.moduleHero.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero})
+		}
+	}()
 	log.Debugf("升级后当前等级: %d,经验: %d,需要消耗的金币: %d,增加的经验: %d", curLv, curExp, costGold, addExp)
 	// 执行升级逻辑
 	code = this.moduleHero.modelHero.moduleHero.AddCardExp(session.GetUserId(), req.HeroObjID, addExp) // 加经验
@@ -140,6 +147,9 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]i
 	if code != pb.ErrorCode_Success {
 		return
 	}
-
+	err := this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err != nil {
+		log.Errorf("PushHeroProperty err!")
+	}
 	return
 }