From ee0310f457f477efa3967b487573449d61f55f24 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 22 Nov 2022 21:12:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87=E5=9F=8B?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 20 ++++++++++---------- modules/equipment/api_equip.go | 2 ++ modules/equipment/api_upgrade.go | 5 +++++ modules/equipment/modelEquipment.go | 15 +++++++++++++++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/comm/const.go b/comm/const.go index 0de433217..e6208be00 100644 --- a/comm/const.go +++ b/comm/const.go @@ -441,16 +441,16 @@ const ( Rtype81 TaskType = 81 //通关A难度狩猎BOOS(检查最高难度记录是否达到了此难度，达到则完成) Rtype82 TaskType = 82 //通关狩猎指定BOOSN次（历史）(从创号开始记录登陆天数，通关任意难度进度都+1) //Rtype83 TaskType = 83 //通关难度A及以上指定狩猎BOOSN次(从接到任务开始，若通关难度大于等于设定难度，则进度+1) - Rtype84 TaskType = 84 //普通塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) - Rtype85 TaskType = 85 //赛季塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) - Rtype86 TaskType = 86 //本赛季的赛季塔达到XX层(检查本赛季最高难度记录是否达到了此难度，达到则完成) - Rtype87 TaskType = 87 //发现月之秘境N次(从接到任务开始，发现一次则进度+1) - Rtype88 TaskType = 88 //完成月之秘境N次(从接到任务开始，打完一个月之秘境则进度+1（耗尽BOSS挑战次数）) - Rtype89 TaskType = 89 //任意招募N次(从接到任务开始，普通招募和阵营招募都算，单抽1次，10连抽算10次) - Rtype90 TaskType = 90 //进行N次普通招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) - Rtype91 TaskType = 91 //进行N次阵营招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) - Rtype92 TaskType = 92 //强化装备N次(从接到任务开始，强化任意装备，失败和成功进度都+1) - Rtype93 TaskType = 93 //拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。) + Rtype84 TaskType = 84 //普通塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) + Rtype85 TaskType = 85 //赛季塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) + Rtype86 TaskType = 86 //本赛季的赛季塔达到XX层(检查本赛季最高难度记录是否达到了此难度，达到则完成) + Rtype87 TaskType = 87 //发现月之秘境N次(从接到任务开始，发现一次则进度+1) + Rtype88 TaskType = 88 //完成月之秘境N次(从接到任务开始，打完一个月之秘境则进度+1（耗尽BOSS挑战次数）) + Rtype89 TaskType = 89 //任意招募N次(从接到任务开始，普通招募和阵营招募都算，单抽1次，10连抽算10次) + Rtype90 TaskType = 90 //进行N次普通招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) + Rtype91 TaskType = 91 //进行N次阵营招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) + Rtype92 TaskType = 92 //强化装备N次(从接到任务开始，强化任意装备，失败和成功进度都+1) + // Rtype93 TaskType = 93 //拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。) Rtype94 TaskType = 94 //装备附魔N次（历史）(从创号开始记录，附魔成功进度+1) Rtype95 TaskType = 95 //装备洗练N次（历史）(从创号开始记录，洗练成功进度+1) Rtype96 TaskType = 96 //强化失败N次(从接到任务开始，强化失败进度+1) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 5582831b3..60a013c9b 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -177,9 +177,11 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } if hero.SuiteId != 0 { this.module.ModuleRtask.SendToRtask(session, comm.Rtype49, 1, hero.Suite1Star, hero.Suite1Lv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype98, 1, hero.Suite1Lv) } if hero.SuiteExtId != 0 { this.module.ModuleRtask.SendToRtask(session, comm.Rtype48, 1, hero.Suite2Star, hero.Suite2Lv) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype98, 1, hero.Suite1Lv) } session.SendMsg(string(this.module.GetType()), "equip", &pb.EquipmentEquipResp{Equipments: updatequipment}) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 3c8014dbe..ff0450b17 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -181,6 +181,11 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade this.module.ModuleRtask.SendToRtask(session, comm.Rtype43, 1, equipment.Lv) this.module.ModuleRtask.SendToRtask(session, comm.Rtype44, equipment.Lv) this.module.ModuleRtask.SendToRtask(session, comm.Rtype47, 1) + if conf.Pos == 7 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype102, 1) + } else if conf.Pos == 6 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype100, 1) + } //聊天系统通知 if user = this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // var color *cfg.GameGameColorData diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index 7075139e4..68830a407 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -110,6 +110,21 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma } else { //随机任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype50, 1, c.Star) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype97, 1, c.Suittype, c.Star) + unm := int32(1) + if equipment.AdverbEntry != nil { + unm += int32(len(equipment.AdverbEntry)) + } + if equipment.Adverbskill != nil { + unm += int32(len(equipment.Adverbskill)) + } + this.module.ModuleRtask.SendToRtask(session, comm.Rtype99, 1, unm, c.Star) + if c.Pos == 7 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype103, 1, c.Star) + } else if c.Pos == 6 { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype101, 1, c.Star) + } + add[equipment.Id] = equipment change = append(change, equipment) }