liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
wh_zcy 2023-05-26 15:31:39 +08:00
commit 83a24c9c8c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comm/const.go
View File

@ -664,12 +664,12 @@ const (
//Rtype178 TaskType = 178 //Rtype178 TaskType = 178
Rtype179 TaskType = 179 //解锁X阶段装备新图纸X个 Rtype179 TaskType = 179 //解锁X阶段装备新图纸X个
Rtype180 TaskType = 180 //在X副本内使用好友助战X次 Rtype180 TaskType = 180 //在X副本内使用好友助战X次
Rtype181 TaskType = 181 Rtype181 TaskType = 181 //X维京副本X难度自动战斗X次（接取任务后开始记录，在对应副本的指定难度内，使用自动战斗每有1次，进度便加一）
Rtype182 TaskType = 182 //打赢武馆内踢馆X次（接取任务后开始记录，每赢得一次踢馆战斗的胜利，进度便加一） Rtype182 TaskType = 182 //打赢武馆内踢馆X次（接取任务后开始记录，每赢得一次踢馆战斗的胜利，进度便加一）
Rtype183 TaskType = 183 //去好友武馆踢馆X次（接取任务后开始记录，每次在好友武馆开启一场踢馆，便进度加一） Rtype183 TaskType = 183 //去好友武馆踢馆X次（接取任务后开始记录，每次在好友武馆开启一场踢馆，便进度加一）
Rtype184 TaskType = 184 //使用好友武馆木桩X次(接取任务后，每次使用好友的木桩训练英雄一次，进度便加一) Rtype184 TaskType = 184 //使用好友武馆木桩X次(接取任务后，每次使用好友的木桩训练英雄一次，进度便加一)
Rtype185 TaskType = 185 //完成X次每日1健(接取任务后，每完成1次每日1健，便进度加一) Rtype185 TaskType = 185 //完成X次每日1健(接取任务后，每完成1次每日1健，便进度加一)
Rtype186 TaskType = 186 Rtype186 TaskType = 186 //武馆的派遣悬赏X次(接取任务后开始计算，当玩家的派遣完成1次，进度便加一，不领奖也算一次，只要倒计时结束即可)
Rtype187 TaskType = 187 Rtype187 TaskType = 187
Rtype188 TaskType = 188 //玩家创建1个工会 Rtype188 TaskType = 188 //玩家创建1个工会
) )

2
modules/equipment/api_equip.go
View File

@ -148,6 +148,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
hero.SuiteId = confs[0].Suittype hero.SuiteId = confs[0].Suittype
hero.Suite1Star = suite1Str hero.Suite1Star = suite1Str
hero.Suite1Lv = suite1Lv hero.Suite1Lv = suite1Lv
tasks = append(tasks, comm.GettaskParam(comm.Rtype93, 1, hero.SuiteId, suite1Lv))
} }
} else { } else {
hero.SuiteId = 0 hero.SuiteId = 0
@ -159,6 +160,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
hero.SuiteExtId = confs[4].Suittype hero.SuiteExtId = confs[4].Suittype
hero.Suite2Star = suite2Str hero.Suite2Star = suite2Str
hero.Suite2Lv = suite2Lv hero.Suite2Lv = suite2Lv
tasks = append(tasks, comm.GettaskParam(comm.Rtype93, 1, hero.SuiteExtId, suite2Lv))
} }
} else { } else {
hero.SuiteExtId = 0 hero.SuiteExtId = 0

2
modules/smithy/api_forgeequip.go
View File

@ -250,7 +250,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
} }
// 解锁了新的图纸 // 解锁了新的图纸
this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype177, 1)) this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype177, 1))
this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype179, nextProficiency.Value1, 1)) this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype179, 1, nextProficiency.Value1))
} }
// 是否解锁新套装 // 是否解锁新套装
if nextProficiency.Type == comm.SmithyReelType4 { if nextProficiency.Type == comm.SmithyReelType4 {

2
modules/viking/api_challengeover.go
View File

@ -187,7 +187,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
if req.Auto { if req.Auto {
szTask = append(szTask, comm.GettaskParam(comm.Rtype75, req.BossId, req.Difficulty)) szTask = append(szTask, comm.GettaskParam(comm.Rtype75, req.BossId, req.Difficulty))
szTask = append(szTask, comm.GettaskParam(comm.Rtype172, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype172, 1))
szTask = append(szTask, comm.GettaskParam(comm.Rtype181, req.BossId, req.Difficulty, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype181, 1, req.BossId, req.Difficulty))
} }
szTask = append(szTask, comm.GettaskParam(comm.Rtype76, 1, req.BossId)) szTask = append(szTask, comm.GettaskParam(comm.Rtype76, 1, req.BossId))
if bHelp { if bHelp {