From bd702168b2867f92fd9f0a8d29f69414a7273d77 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 22 Nov 2022 11:00:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=89=E9=86=92?= =?UTF-8?q?=E6=9D=90=E6=96=99=E5=90=88=E6=88=90=E6=B6=88=E8=80=97=E9=87=91?= =?UTF-8?q?=E5=B8=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/chat/module.go | 5 +++-- modules/items/api_useItem.go | 2 +- modules/moonfantasy/modelDream.go | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/chat/module.go b/modules/chat/module.go index 376d72919..c6f7010f9 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -11,6 +11,7 @@ import ( "go_dreamfactory/lego/utils/codec/json" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" "time" "google.golang.org/protobuf/types/known/anypb" @@ -82,7 +83,7 @@ func (this *Chat) OnInstallComp() { //Event------------------------------------------------------------------------------------------------------------ func (this *Chat) EventUserOffline(session comm.IUserSession) { if err := this.modelChat.removeCrossChannelMember(session); err != nil { - this.Debug("EventUserOffline:", log.Fields{ "uid": session.GetUserId(),"err":err.Error()}) + this.Debug("EventUserOffline:", log.Fields{"uid": session.GetUserId(), "err": err.Error()}) } } @@ -226,7 +227,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter Channel: pb.ChatChannel_System, Ctype: pb.ChatType_Text, Stag: this.service.GetTag(), - Ctime: time.Now().Unix(), + Ctime: configure.Now().Unix(), Content: fmt.Sprintf(st.Text, agrs...), Display: st.Display, } diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 5ae37100c..ac65ed1bb 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -139,7 +139,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) N: v.N * int32(req.Amount), }) } - if code = this.module.ConsumeRes(session, itemcf.SynthetizeDeplete, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success { return } diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 23cbf44ed..370ad77ee 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -127,6 +127,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { Avatar: user.Avatar, Uname: user.Name, Slv: user.Lv, + Ctime: configure.Now().Unix(), Stag: session.GetServiecTag(), Content: mdata.Monster, AppendStr: mdata.Id, From 16e34273bbd341fcc8d0d5fd25eab5dbaf0840a8 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 22 Nov 2022 11:02:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=89=E9=86=92=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index ed33692d0..a3eead735 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -67,6 +67,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c _hero.SameCount = 1 _hero.IsOverlying = false // 加属性 awakenData + if len(awakenData.Phasebonus) != 2 { + code = pb.ErrorCode_ConfigNoFound + return + } _value, ok := strconv.Atoi(awakenData.Phasebonus[0]) if ok == nil { // 升级技能 for pos, v := range _hero.NormalSkill { @@ -81,8 +85,10 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c } else { // 加属性 value, err := strconv.Atoi(awakenData.Phasebonus[1]) if err == nil { - this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value)) - _heroMap["juexProperty"] = _hero.JuexProperty + if value > 0 { + this.module.modelHero.setJuexingProperty(_hero, awakenData.Phasebonus[0], int32(value)) + _heroMap["juexProperty"] = _hero.JuexProperty + } } } _hero.JuexingLv += 1 From c6329afb7e0f99aca139f03874cd533985a15d8f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 22 Nov 2022 11:02:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 288 +++++++++++++++++++------------------- modules/sociaty/module.go | 16 ++- 2 files changed, 159 insertions(+), 145 deletions(-) diff --git a/comm/const.go b/comm/const.go index 4a7d6b1cf..d26163043 100644 --- a/comm/const.go +++ b/comm/const.go @@ -306,10 +306,10 @@ const ( type ReddotType int32 const ( - Reddot1 ReddotType = 10001 //任务----日常活跃宝箱红点 - Reddot2 ReddotType = 10002 //任务----周活跃宝箱红点 + Reddot1 ReddotType = 10001 //任务----日常任务奖励红点 + Reddot2 ReddotType = 10002 //任务----周常任务奖励红点 Reddot3 ReddotType = 10003 //公会----签到红点 - Reddot4 ReddotType = 10004 //任务----成就奖励红点 + Reddot4 ReddotType = 10004 //任务----成就任务奖励红点 Reddot5 ReddotType = 10005 //主线关卡----可挑战红点 Reddot6 ReddotType = 10006 //爬塔----可挑战红点 Reddot7 ReddotType = 10007 //爬塔----奖励红点 @@ -332,9 +332,9 @@ const ( Reddot24 ReddotType = 10024 //熊猫武馆----可升级红点 Reddot25 ReddotType = 10025 //熊猫武馆----可领取奖励红点 Reddot26 ReddotType = 10026 //邮件-----附件红点 - Reddot27 ReddotType = 10027 //公会----任务完成红点 - Reddot28 ReddotType = 10028 //公会----进度奖励红点 - Reddot29 ReddotType = 10029 //任务----周常任务完成红点 + Reddot27 ReddotType = 10027 //任务----日常活跃奖励红点 + Reddot28 ReddotType = 10028 //任务----周常活跃奖励红点 + Reddot29 ReddotType = 10029 //公会----申请红点 Reddot30 ReddotType = 10030 //邮件-----未读邮件红点 ) @@ -359,144 +359,144 @@ const ( // 随机任务类型 const ( - Rtype1 TaskType = 1 //英雄指定 - Rtype2 TaskType = 2 //主线之内触发了剧情Id - Rtype3 TaskType = 3 //每日任务 - Rtype4 TaskType = 4 //指定英雄的等级限制 - Rtype5 TaskType = 5 //指定英雄的装备数量 - Rtype6 TaskType = 6 //指定英雄的星级 - Rtype7 TaskType = 7 //日常登录一次 - Rtype8 TaskType = 8 //累计登陆xx天 - Rtype9 TaskType = 9 //连续登陆xx天 - Rtype10 TaskType = 10 //拥有xx个好友 - Rtype11 TaskType = 11 //赠送X次友情点 - Rtype12 TaskType = 12 //使用好友助战英雄xx次 - Rtype13 TaskType = 13 //更换X次助战英雄 - Rtype14 TaskType = 14 //累计xx次普通招募 - Rtype15 TaskType = 15 //累计xx次阵营招募 - Rtype16 TaskType = 16 //招募获得xx品质英雄xx个 - Rtype17 TaskType = 17 //普通招募十连，获得xx个以上xx星英雄 - Rtype18 TaskType = 18 //xx次普通招募 - Rtype19 TaskType = 19 //xx次阵营招募 - Rtype20 TaskType = 20 //用户等级达到xx级 - Rtype21 TaskType = 21 //英雄合成xx次 - Rtype22 TaskType = 22 //合成xx英雄 - Rtype23 TaskType = 23 //拥有xx个xx星级的xx等级英雄 - Rtype24 TaskType = 24 //为任意英雄提升xx次等级 - Rtype25 TaskType = 25 //xx名xx英雄升至xx星 - Rtype26 TaskType = 26 //xx名英雄从三星升四星 - Rtype27 TaskType = 27 //xx名英雄从四星升五星 - Rtype28 TaskType = 28 //xx名英雄从五星升六星 - Rtype29 TaskType = 29 //拥有xx个xx级及以上的【xx】英雄 - Rtype30 TaskType = 30 //获得xx个品质为xx的英雄 - Rtype31 TaskType = 31 //获得xx个品质为xx以上的英雄 - Rtype32 TaskType = 32 //xx个品质为xx的英雄升到xx级 - Rtype33 TaskType = 33 //xx个品质为xx以及以上英雄升到xx级 - Rtype34 TaskType = 34 //xx个英雄觉醒达到xx阶段 - Rtype35 TaskType = 35 //xx英雄觉醒达到xx阶段 - Rtype36 TaskType = 36 //xx位xx品质xx职业英雄（xx阵营）觉醒达到xx阶段 - Rtype37 TaskType = 37 //xx名xx品质英雄满共鸣、等级、觉醒 - Rtype38 TaskType = 38 //xx英雄满级、共鸣、觉醒至最高状态 - Rtype39 TaskType = 39 //累计英雄共鸣xx次 - Rtype40 TaskType = 40 //xx个英雄共鸣满xx次 - Rtype41 TaskType = 41 //xx名英雄穿戴xx件xx星级的装备 - Rtype42 TaskType = 42 //xx名英雄穿戴xx件xx等级的装备 - Rtype43 TaskType = 43 //将xx件装备强化至xx级 - Rtype44 TaskType = 44 //任意装备强化到xx级 - Rtype45 TaskType = 45 //将xx件xx星【xx】套装装备强化至xx级 - Rtype46 TaskType = 46 //为xx名英雄穿戴完整xx星【xx】套装装备 - Rtype47 TaskType = 47 //累计强化装备成功xx次 - Rtype48 TaskType = 48 //xx次xx星的二件套装备强化至xx并穿戴 - Rtype49 TaskType = 49 //xx次xx星的四件套装备强化至xx并穿戴 - Rtype50 TaskType = 50 //获得xx星以上装备xx件 - Rtype51 TaskType = 51 //在铁匠铺中获得xx件xx星装备 - Rtype52 TaskType = 52 //xx英雄提升xx次技能等级 - Rtype53 TaskType = 53 //技能升级累计xx次 - Rtype54 TaskType = 54 //x名卡牌角色技能全满级 - Rtype55 TaskType = 55 //xx品质英雄提升xx次技能等级 - Rtype56 TaskType = 56 //拥有xx名技能升级xx次的xx职业英雄 - Rtype57 TaskType = 57 //xx名英雄技能满级 - Rtype58 TaskType = 58 //通关任意普通爬塔层数 - Rtype59 TaskType = 59 //通关普通爬塔xx层 - Rtype60 TaskType = 60 //任意主线副本通关1次 - Rtype61 TaskType = 61 //通关主线关卡xx - Rtype62 TaskType = 62 //世界聊天发言xx次 - Rtype63 TaskType = 63 //日常任务活跃度达到xx - Rtype64 TaskType = 64 //任意商品购买xx次 - Rtype65 TaskType = 65 //在商店购买xx商品xx件 - Rtype66 TaskType = 66 //xx商店购买任意商品xx次 - Rtype67 TaskType = 67 //商店购物消耗xx货币xx个 - Rtype68 TaskType = 68 //任意渠道消耗xx金币 - Rtype69 TaskType = 69 //与其他玩家切磋xx次 - Rtype70 TaskType = 70 //通关世界任务XX关卡 - Rtype72 TaskType = 72 //完成一次捏人 - Rtype73 TaskType = 73 //通关难度A维京远征指定BOSSN次（从接到任务开始，只有通关A难度进度才+1） - Rtype74 TaskType = 74 //通关难度A维京远征指定BOSS（检查最高难度记录是否超过了此难度，超过则完成） - Rtype75 TaskType = 75 //自动战斗通关难度A的维京远征指定BOSS（从接到任务开始，若全程无手动操作（不包含变速）且挑战难度大于等于A则判断任务完成） - Rtype76 TaskType = 76 //通关维京远征指定BOSSN次(从创号开始记录，通关任意难度进度都+1) - Rtype77 TaskType = 77 //通关难度A及以上维京远征指定BOSSN次(从接到任务开始，若通关难度大于等于设定难度，则进度+1) - Rtype78 TaskType = 78 //通关难度A维京远征指定BOSS时间达到XX秒以内(检查最高记录是否超过了此难度，超过则完成) - Rtype79 TaskType = 79 //使用好友助战英雄通关A难度的指定维京远征BOSS(从接到任务开始，通关阵营中包含好友助战英雄，难度大于等于A的指定维京远征BOSS时任务完成。) - Rtype80 TaskType = 80 //通关难度A指定狩猎BOOS难度N次(从接到任务开始，只有通关A难度进度才+1) - 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套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。) - Rtype94 TaskType = 94 //装备附魔N次（历史）(从创号开始记录，附魔成功进度+1) - Rtype95 TaskType = 95 //装备洗练N次（历史）(从创号开始记录，洗练成功进度+1) - Rtype96 TaskType = 96 //强化失败N次(从接到任务开始，强化失败进度+1) - Rtype97 TaskType = 97 //获得X星X套装的装备N件（时段）(从接到任务开始，每获得1件X星X套装的装备则进度+1) - Rtype98 TaskType = 98 //穿戴N套强化A级的装备(打开任务时，检查英雄身上的装备的最低等级，当最低等级超过A则任务进度+1。) - Rtype99 TaskType = 99 //获得N个初始属性大于等于A条的B星装备(从接到任务开始，每次获得强化为0级的A星装备时判断属性条目，大于或等于B进度+1) - Rtype100 TaskType = 100 //职业武器强化成功N次（历史）(从创号开始记录，强化成功进度+1) - Rtype101 TaskType = 101 //获得X星职业武器N件（历史）(从创号开始记录，每获得1件X星职业武器则进度+1) - Rtype102 TaskType = 102 //阵营饰品强化成功N次（历史）(从创号开始记录，强化成功进度+1) - Rtype103 TaskType = 103 //获得X星阵营饰品N件（历史）(从创号开始记录，每获得1件X星阵营饰品则进度+1) - Rtype104 TaskType = 104 //消费N个钻石（历史）(从创号开始记录，每次消耗钻石增加消耗额的进度) - Rtype105 TaskType = 105 //商店刷新N次(从接到任务开始，每次刷新商店进度+1) - Rtype106 TaskType = 106 //跨服聊天发言N次(从接到任务开始，每次跨服发言成功进度+1) - Rtype107 TaskType = 107 //赠送N个人好感度(从接到任务开始，每赠送1个好友好感度则进度+1) - Rtype108 TaskType = 108 //助战英雄被使用X次(从接到任务开始，每被使用1次则进度+1) - Rtype109 TaskType = 109 //加入公会(打开任务时，检查是否加入了公会，加入则完成) - Rtype110 TaskType = 110 //激活X个英雄图鉴(打开任务时，检查英雄图鉴激活数量并计入进度，达到了任务所需个数则完成任务。) - Rtype111 TaskType = 111 //拥有N个X级英雄(打开任务时，检查达到X级的英雄数量，达到任务所需个数则完成任务，) - Rtype112 TaskType = 112 //养成N个X级英雄(从接到任务开始，英雄升级时，如果英雄的初始等级 0 { + applyReddot = true + } return } for _, v := range rid { @@ -132,6 +144,8 @@ func (this *Sociaty) Reddot(session comm.IUserSession, rid ...comm.ReddotType) ( if ok := this.modelSociaty.IsSign(session.GetUserId(), sociaty); !ok { reddot[comm.Reddot3] = true } + case comm.Reddot29: + reddot[comm.Reddot29] = applyReddot } } return From 81b413fba4205b1357e66cee396127ad028d006b Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 22 Nov 2022 11:02:51 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=97=A5/=E5=91=A8=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/task/model_active.go | 15 +++++++++++++++ modules/task/module.go | 15 +++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/modules/task/model_active.go b/modules/task/model_active.go index 390e72bfb..046c9bb15 100644 --- a/modules/task/model_active.go +++ b/modules/task/model_active.go @@ -57,6 +57,21 @@ func (this *ModelTaskActive) getActiveListByTag(uid string, taskTag comm.TaskTag return list } +// 查询完成的且未领取的任务 发现未领取返回true +func (this *ModelTaskActive) noReceiveTaskActive(uid string, taskTag comm.TaskTag) (bool, error) { + list := []*pb.DBTaskActive{} + if err := this.GetList(uid, &list); err != nil { + this.moduleTask.Errorf("getUserActiveList err:%v", err) + return false,err + } + for _, v := range list { + if v.Tag == int32(taskTag) && v.Received == 0 { + return true, nil + } + } + return false, nil +} + //获取玩家活跃记录 id 唯一ID func (this *ModelTaskActive) getUserActive(uid, id string, taskTag comm.TaskTag) *pb.DBTaskActive { record := this.getActiveListByTag(uid, taskTag) diff --git a/modules/task/module.go b/modules/task/module.go index b77c2fd57..47e4dc99c 100644 --- a/modules/task/module.go +++ b/modules/task/module.go @@ -23,14 +23,10 @@ type ModuleTask struct { modelTaskActive *ModelTaskActive api *apiComp configure *configureComp - - // taskHandleMap map[int32]taskHandle //任务处理器 } func NewModule() core.IModule { - return &ModuleTask{ - // taskHandleMap: make(map[int32]taskHandle), - } + return &ModuleTask{} } func (this *ModuleTask) GetType() core.M_Modules { @@ -43,7 +39,6 @@ func (this *ModuleTask) GetEventApp() *event_v2.App { func (this *ModuleTask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) - // this.initTaskHandle() return } @@ -163,6 +158,14 @@ func (this *ModuleTask) Reddot(session comm.IUserSession, rid ...comm.ReddotType reddot[comm.Reddot4] = ok break } + case comm.Reddot27: + if ok,_:= this.modelTaskActive.noReceiveTaskActive(session.GetUserId(), comm.TASK_DAILY);ok{ + reddot[comm.Reddot27] = ok + } + case comm.Reddot28: + if ok,_:= this.modelTaskActive.noReceiveTaskActive(session.GetUserId(), comm.TASK_WEEKLY);ok{ + reddot[comm.Reddot28] = ok + } } } return From 298a8f80ffa7d7063465cadebbe942efca041339 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 22 Nov 2022 11:18:15 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=A7=89=E9=86=92=E9=98=B2=E5=BE=A1?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E5=B1=9E=E6=80=A7=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/model_hero.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 714544571..f1645577d 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -264,7 +264,7 @@ func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int case comm.ResonanceAtkPro: hero.JuexProperty[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk]))) case comm.ResonanceDefPro: - hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000)) * float64(hero.Property[comm.Def])) + hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def]))) } } From 5cc78bed916e9bd4543793733e4c347061b240dc Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 22 Nov 2022 11:25:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9C=88=E5=AD=90=E7=A7=98=E5=A2=83=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/moonfantasy/api_battle.go | 1 + modules/moonfantasy/modelDream.go | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go index ab0a6b961..aa05b8eac 100644 --- a/modules/moonfantasy/api_battle.go +++ b/modules/moonfantasy/api_battle.go @@ -47,6 +47,7 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle Buleflist: record.Buleflist, }, }) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype88, 1) } else { session.SendMsg(string(this.module.GetType()), "battle", &pb.MoonfantasyBattleResp{Code: cd}) } diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 370ad77ee..bf01182fc 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -134,6 +134,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { } this.module.modelDream.noticeuserfriend(session, mdata.Id, chat) session.SendMsg(string(this.module.GetType()), "trigger", &pb.MoonfantasyTriggerPush{Issucc: true, Mid: mdata.Id, Monster: mdata.Monster}) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype87, 1) return } From a80998f5582479d2ce2c04a848dd03d9fc08c609 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 22 Nov 2022 11:40:49 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comm/const.go b/comm/const.go index d26163043..9973782a2 100644 --- a/comm/const.go +++ b/comm/const.go @@ -497,7 +497,7 @@ const ( Rtype137 TaskType = 137 //累计铁匠铺锻造X小时（历史）(从创号开始记录，满1小时进度+1) Rtype138 TaskType = 138 //在线N分钟(从接到任务开始，记录玩家在线时间并记入进度) Rtype139 TaskType = 139 //通过融合获得指定英雄(从接到任务开始记录，通过融合获得指定英雄则任务完成) - + Rtype140 TaskType = 140 //关卡编辑器完成条件 ) const (