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

上传任务修复

Browse Source
This commit is contained in:
liwei1dao 2023-05-25 17:11:36 +08:00
parent 5ded8e1488
commit ff3cc52b3a
17 changed files with 1812 additions and 1623 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_combatbox.json
View File

@ -79,6 +79,10 @@
"id": 10302,
"drop": 1002
},
{
"id": 10303,
"drop": 1003
},
{
"id": 10401,
"drop": 1001

14
bin/json/game_combatlevel.json
View File

@ -4,10 +4,10 @@
"scene": "leveldemo_fcamer_1_1",
"levelname": "Look For Blast Air",
"maintask": [
11187001
11187021
],
"subtask": [
11187002
11187022
],
"award": [
{
@ -33,7 +33,7 @@
"n": 1
}
],
"debrisitemid": "16001001",
"debrisitemid": "16004002",
"scenemusic": "scenemusic_leveldemo_fcamer_1_1",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_1"
},
@ -270,10 +270,10 @@
"scene": "leveldemo_fcamer_1_8",
"levelname": "Save the holy tree",
"maintask": [
11187015
11187001
],
"subtask": [
11187016
11187002
],
"award": [
{
@ -299,7 +299,7 @@
"n": 1
}
],
"debrisitemid": "16003002",
"debrisitemid": "16001001",
"scenemusic": "scenemusic_leveldemo_fcamer_1_8",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_8"
},
@ -375,7 +375,7 @@
"n": 1
}
],
"debrisitemid": "",
"debrisitemid": "16004001",
"scenemusic": "scenemusic_leveldemo_fcamer_1_10",
"atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
}

10
bin/json/game_drop.json
View File

@ -216,11 +216,11 @@
"prize": [
{
"a": "item",
"t": "90002",
"n": 1
"t": "16001001",
"n": 4
}
],
"star": 2,
"star": 1,
"p": 333
},
{
@ -234,7 +234,7 @@
"n": 1
}
],
"star": 2,
"star": 1,
"p": 333
},
{
@ -248,7 +248,7 @@
"n": 1
}
],
"star": 2,
"star": 1,
"p": 333
},
{

16
bin/json/game_herolevelgrow.json
View File

@ -2173,7 +2173,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 2000,
"speedgrow": 0
},
@ -2195,7 +2195,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 1500,
"speedgrow": 0
},
@ -2217,7 +2217,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2250,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 1500,
"speedgrow": 0
},
@ -2239,7 +2239,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 2000,
"speedgrow": 0
},
@ -2261,7 +2261,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 1500,
"speedgrow": 0
},
@ -2283,7 +2283,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2250,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 1500,
"speedgrow": 0
},
@ -2305,7 +2305,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1250,
"atkgrow": 1000,
"atkgrow": 4200,
"defgrow": 1250,
"speedgrow": 0
},
@ -2327,7 +2327,7 @@
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1000,
"atkgrow": 1300,
"atkgrow": 4200,
"defgrow": 1250,
"speedgrow": 0
},

398
bin/json/game_herolevelup.json
View File

File diff suppressed because it is too large Load Diff

724
bin/json/game_rdtaskcondi.json
View File

File diff suppressed because it is too large Load Diff

127
bin/json/game_skillafteratk.json
View File

@ -17255,8 +17255,7 @@
"FollowSK": [],
"SucFollowSK": [
244004213,
244004214,
244004215
244004214
],
"FailFollowSK": [],
"MustHit": false,
@ -17296,9 +17295,9 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Type": 2,
"Argu": [
390001216,
444004211,
1000,
1,
-1
@ -17346,7 +17345,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001217,
390001216,
1000,
1,
2
@ -17365,6 +17364,53 @@
{
"Id": 244004313,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
2,
2,
500
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244004314,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001105,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244004315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
@ -21206,7 +21252,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
255005112
@ -21348,7 +21394,7 @@
"Argu": [
1,
4,
4000
8000
],
"FollowSK": [
255005312
@ -21375,7 +21421,7 @@
"Argu": [
1,
4,
8000
12000
],
"FollowSK": [
255005313
@ -21424,7 +21470,7 @@
"Argu": [
1,
4,
2000
4000
],
"FollowSK": [
255006112
@ -21522,7 +21568,7 @@
"Argu": [
1,
4,
2000
4000
],
"FollowSK": [
255006214
@ -21558,6 +21604,50 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006215,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 41,
"Argu": [
1
],
"FollowSK": [],
"SucFollowSK": [
255006216
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006216,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 40,
"Argu": [
10
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006311,
"EmitPR": 1000,
@ -21714,7 +21804,7 @@
"Argu": [
1,
4,
2000
4000
],
"FollowSK": [
255007112
@ -21817,10 +21907,7 @@
1,
1
],
"FollowSK": [
255007212,
255007213
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -21864,7 +21951,7 @@
"Argu": [
1,
4,
2000
6000
],
"FollowSK": [],
"SucFollowSK": [],
@ -21889,9 +21976,7 @@
1,
1
],
"FollowSK": [
255007215
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -21938,9 +22023,7 @@
1,
1
],
"FollowSK": [
255007312
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,

1415
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

618
bin/json/game_skillbuff.json
View File

File diff suppressed because it is too large Load Diff

63
bin/json/game_skillpassive.json
View File

@ -1690,15 +1690,13 @@
},
{
"Id": 455007312,
"When": 12,
"When": 4,
"FromCheck": "",
"TargetCheck": "Target=3",
"TargetCheck": "Target=3，NoBuff=390001415",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [
"Hpproless=330"
],
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -1709,14 +1707,12 @@
{
"Id": 455007313,
"When": 5,
"FromCheck": "Target=3",
"FromCheck": "Target=3,HasBuff=0",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [
"Hasbuff=1"
],
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -2480,5 +2476,54 @@
"Callback": [
255001212
]
},
{
"Id": 444004211,
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "DetonateBuff",
"MaxEmitTimes": 1,
"Callback": [
390001216,
99
]
},
{
"Id": 455007411,
"When": 16,
"FromCheck": "Target=3,HasBuff=0",
"TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255007114
]
},
{
"Id": 455007412,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255007116
]
}
]

4
comm/const.go
View File

@ -523,8 +523,8 @@ const (
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等级的装备
Rtype41 TaskType = 41 //任意一名英雄穿戴xx件xx星级的装备
Rtype42 TaskType = 42 //任意一名英雄穿戴xx件xx等级的装备
Rtype43 TaskType = 43 //将xx件装备强化至xx级
Rtype44 TaskType = 44 //任意装备强化到xx级
Rtype45 TaskType = 45 //将xx件xx星【xx】套装装备强化至xx级

1
modules/combat/api_askpass.go
View File

@ -56,7 +56,6 @@ func (this *apiComp) AskPass(session comm.IUserSession, req *pb.CombatAskPassReq
resp.Passmaintask = mtaskid
resp.Mainaward = atns
level.Pass = 1
}
}

2
modules/pagoda/api_challengeover.go
View File

@ -144,6 +144,6 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
return
}
// 任务相关
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype168, conf.Tab, pagoda.Data[conf.Tab]))
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab))
return
}

1
modules/practice/module.go
View File

@ -374,6 +374,7 @@ func (this *Practice) RPC_ModulePracticeUnLockPillar(ctx context.Context, args *
this.atlas.CheckActivatePandaAtlasCollect(args.Param1, "100001")
break
}
go this.ModuleRtask.TriggerTask(args.Param1, comm.GettaskParam(comm.Rtype152, 1))
// for _, v := range configure {
// if v.UnlockCondition == int32(taskid) {
// switch v.Id {

10
modules/rtask/module.go
View File

@ -284,9 +284,9 @@ func (this *ModuleRtask) processOneTask(session comm.IUserSession, rtaskType com
}
if !ok {
this.Debug("验证失败", log.Field{Key: "uid", Value: uid},
log.Field{Key: "params", Value: params},
log.Field{Key: "conf", Value: conf})
// this.Debug("验证失败", log.Field{Key: "uid", Value: uid},
// log.Field{Key: "params", Value: params},
// log.Field{Key: "conf", Value: conf})
continue
}
if handle.update != nil {
@ -312,7 +312,9 @@ func (this *ModuleRtask) processOneTask(session comm.IUserSession, rtaskType com
}
for _, condId := range condIds {
if code = this.CheckCondi(uid, condId, params...); code == pb.ErrorCode_Success {
r, _ := record.Vals[condId]
conf, _ := this.configure.getRtaskTypeById(condId)
if r.Data[0] >= conf.Data1 {
module, err := this.service.GetModule(comm.ModuleWorldtask)
if err == nil {
//世界任务

24
modules/rtask/verifyHandle.go
View File

@ -167,25 +167,25 @@ func (this *ModelRtaskRecord) verifyThirdGreatEqualParam(uid string, record *pb.
// two params (first-Equal second-Equal)
func (this *ModelRtaskRecord) veriftyEqualParam(uid string, record *pb.DBRtaskRecord, cfg *cfg.GameRdtaskCondiData, params ...int32) (ok bool, count int32, err error) {
if len(params) == 0 {
if len(params) != 2 {
err = errors.New("玩家参数数据缺失")
return
}
var paramLen int
if paramLen, err = lenParam(cfg, params...); err == nil {
// var paramLen int
if _, err = lenParam(cfg, params...); err == nil {
//参数比较,默认第一个参数soGreateEqual,其它soEqual
switch paramLen {
case 1:
ok, err = soGreat(params[0], cfg.Data1)
return
case 2:
if ok, err = soGreat(params[0], cfg.Data1); !ok {
return
}
// switch paramLen {
// case 1:
// ok, err = soGreat(params[0], cfg.Data1)
// return
// case 2:
// if ok, err = soGreat(params[0], cfg.Data1); !ok {
// return
// }
if ok, err = soEqual(params[1], cfg.Data2); !ok {
return
}
}
// }
}
return
}

2
modules/viking/module.go
View File

@ -320,7 +320,7 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR
// this.ModuleRtask.SendToRtask(session, comm.Rtype73, difficulty, bossId, 1)
// this.ModuleRtask.SendToRtask(session, comm.Rtype74, difficulty, bossId)
// this.ModuleRtask.SendToRtask(session, comm.Rtype78, difficulty, bossId, Report.Costtime)
tasks = append(tasks, comm.GettaskParam(comm.Rtype73, difficulty, bossId, 1))
tasks = append(tasks, comm.GettaskParam(comm.Rtype73, 1, bossId, difficulty))
tasks = append(tasks, comm.GettaskParam(comm.Rtype74, difficulty, bossId))
tasks = append(tasks, comm.GettaskParam(comm.Rtype78, difficulty, bossId, Report.Costtime))
if Report != nil && Report.Info != nil && len(Report.Info.Redflist) > 0 {