From 5385c292b443713ac5606863247f7d2939abe3a3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 26 Sep 2022 11:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_awaken.go | 1 + modules/hero/api_strengthenUpSkill.go | 12 ++++++++++++ modules/hero/api_strengthenUpStar.go | 1 + modules/hunting/api_challengeover.go | 2 +- modules/mainline/api_challengeover.go | 10 ++++++---- modules/pagoda/api_challengeover.go | 4 ++-- modules/viking/api_challengeover.go | 2 +- 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 0bf3e617b..f7c6f05d5 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -62,6 +62,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c if _hero.SameCount > 1 { //有堆叠的情况 // 克隆一个新的 _hero.SameCount -= 1 + _hero.JuexingLv = 0 newHero := this.module.modelHero.CloneNewHero(_hero) chanegCard = append(chanegCard, newHero) _heroMap["isOverlying"] = false diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 65be36d90..3ef87333c 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -132,9 +132,20 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt // 堆叠情况 if _hero.SameCount > 1 { _hero.SameCount -= 1 + sz := make([]*pb.SkillData, 0) + + for _, v := range _hero.NormalSkill { + sz = append(sz, &pb.SkillData{ + SkillID: v.SkillID, + SkillLv: v.SkillLv, + }) + v.SkillLv = 1 + } newHero := this.module.modelHero.CloneNewHero(_hero) ChangeList = append(ChangeList, newHero) + _hero.NormalSkill = sz } + _heroMap := map[string]interface{}{ "normalSkill": _hero.NormalSkill, "isOverlying": false, @@ -147,6 +158,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt code = pb.ErrorCode_DBError return } + ///// this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 ChangeList = append(ChangeList, _hero) session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 89a6980b8..0bfa92fa2 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -131,6 +131,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr if _hero.SameCount > 1 { //有堆叠的情况 // 克隆一个新的 _hero.SameCount -= 1 + newHero := this.module.modelHero.CloneNewHero(_hero) chanegCard = append(chanegCard, newHero) } diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index e389d4d14..e39e0391f 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -64,7 +64,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha hunting.Boss[req.BossType] += 1 mapData["boss"] = hunting.Boss mapData["challengeTime"] = hunting.BossTime - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { sz := make([]*pb.LineUp, 5) for i, v := range req.Report.Info.Redflist[0].Team { if v != nil { diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index c4e8e6f1d..61497194e 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -102,10 +102,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh this.module.Debugf("DispenseRes err:+%v", res) } // 加经验 - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { - for _, v := range req.Report.Info.Redflist[0].Team { - if node.Exp > 0 { - this.module.ModuleHero.AddHeroExp(session, v.Oid, node.Exp) + if node.Episodetype != 5 && node.Episodetype != 7 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { + for _, v := range req.Report.Info.Redflist[0].Team { + if node.Exp > 0 { + this.module.ModuleHero.AddHeroExp(session, v.Oid, node.Exp) + } } } } diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 0e1cc30f4..cc2748c2c 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -109,7 +109,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal } } else { // 记录爬塔明细数据 - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { sz := make([]*pb.LineUp, 5) for i, v := range req.Report.Info.Redflist[0].Team { if v != nil { @@ -129,7 +129,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal session.SendMsg(string(this.module.GetType()), PagodaChallengeOverResp, &pb.PagodaChallengeOverResp{Data: pagoda}) } // 加经验 - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { for _, v := range req.Report.Info.Redflist[0].Team { if conf.Exp > 0 { this.module.ModuleHero.AddHeroExp(session, v.Oid, conf.Exp) diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 2a4471677..a28a7d572 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -65,7 +65,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal viking.Boss[req.BossType] += 1 mapData["boss"] = viking.Boss - if req.Report != nil && len(req.Report.Info.Redflist) > 0 { + if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { sz := make([]*pb.LineUp, 5) for i, v := range req.Report.Info.Redflist[0].Team { if v != nil {