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

商队任务开启

Browse Source
This commit is contained in:
meixiongfeng 2023-07-03 15:24:44 +08:00
parent f4989d0d36
commit 1526401578
10 changed files with 1440 additions and 565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
bin/json/game_buriedcondi.json
View File

@ -19839,9 +19839,9 @@
"text": "本周竞技场挑战10次"
},
"type": 130,
"valid": 10,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 10,
"filter": [],
"filter2": []
},
@ -19856,9 +19856,9 @@
"text": "本周竞技场挑战30次"
},
"type": 130,
"valid": 30,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 30,
"filter": [],
"filter2": []
},
@ -19873,9 +19873,9 @@
"text": "本周竞技场挑战50次"
},
"type": 130,
"valid": 50,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 50,
"filter": [],
"filter2": []
},
@ -19890,9 +19890,9 @@
"text": "本周竞技场胜利10次"
},
"type": 130,
"valid": 10,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 10,
"filter": [],
"filter2": []
},
@ -19907,9 +19907,9 @@
"text": "本周竞技场胜利20次"
},
"type": 130,
"valid": 20,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 20,
"filter": [],
"filter2": []
},
@ -19924,9 +19924,9 @@
"text": "本周竞技场胜利30次"
},
"type": 130,
"valid": 30,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 30,
"filter": [],
"filter2": []
},
@ -19941,9 +19941,9 @@
"text": "本周累计经验副本消耗300体力"
},
"type": 130,
"valid": 300,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 300,
"filter": [],
"filter2": []
},
@ -19958,9 +19958,9 @@
"text": "本周累计经验副本消耗600体力"
},
"type": 130,
"valid": 600,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 600,
"filter": [],
"filter2": []
},
@ -19975,9 +19975,9 @@
"text": "本周累计经验副本消耗1000体力"
},
"type": 130,
"valid": 1000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 1000,
"filter": [],
"filter2": []
},
@ -19992,9 +19992,9 @@
"text": "本周累计消耗3000000点金币"
},
"type": 130,
"valid": 3000000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 3000000,
"filter": [],
"filter2": []
},
@ -20009,9 +20009,9 @@
"text": "本周累计消耗6000000点金币"
},
"type": 130,
"valid": 6000000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 6000000,
"filter": [],
"filter2": []
},
@ -20026,9 +20026,9 @@
"text": "本周累计消耗10000000点金币"
},
"type": 130,
"valid": 10000000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 10000000,
"filter": [],
"filter2": []
},
@ -20043,9 +20043,9 @@
"text": "本周累计装备副本消耗300体力"
},
"type": 130,
"valid": 300,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 300,
"filter": [],
"filter2": []
},
@ -20060,9 +20060,9 @@
"text": "本周累计装备副本消耗600体力"
},
"type": 130,
"valid": 600,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 600,
"filter": [],
"filter2": []
},
@ -20077,9 +20077,9 @@
"text": "本周累计装备副本消耗1000体力"
},
"type": 130,
"valid": 1000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 1000,
"filter": [],
"filter2": []
},
@ -20094,9 +20094,9 @@
"text": "本周累计回响副本消耗300体力"
},
"type": 130,
"valid": 300,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 300,
"filter": [],
"filter2": []
},
@ -20111,9 +20111,9 @@
"text": "本周累计回响副本消耗600体力"
},
"type": 130,
"valid": 600,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 600,
"filter": [],
"filter2": []
},
@ -20128,12 +20128,109 @@
"text": "本周累计回响副本消耗1000体力"
},
"type": 130,
"valid": 1000,
"valid": 0,
"NPC": 0,
"value": 0,
"value": 1000,
"filter": [],
"filter2": []
},
{
"id": 15000001,
"rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_864",
"text": "任意1装备+3"
},
"type": 43,
"valid": 0,
"NPC": -102,
"value": 1,
"filter": [
3
],
"filter2": []
},
{
"id": 15000002,
"rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_865",
"text": "任意2装备+3"
},
"type": 43,
"valid": 0,
"NPC": -102,
"value": 2,
"filter": [
3
],
"filter2": []
},
{
"id": 15000003,
"rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_866",
"text": "任意3装备+3"
},
"type": 43,
"valid": 0,
"NPC": -102,
"value": 3,
"filter": [
3
],
"filter2": []
},
{
"id": 15000004,
"rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_867",
"text": "火焰泰坦难度1"
},
"type": 73,
"valid": 0,
"NPC": 104,
"value": 1,
"filter": [
1,
1
],
"filter2": []
},
{
"id": 15000005,
"rtype": 2,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_868",
"text": "火焰泰坦难度2"
},
"type": 73,
"valid": 0,
"NPC": 104,
"value": 1,
"filter": [
1,
2
],
"filter2": []
},
{
"id": 50000001,
"rtype": 2,
@ -20141,7 +20238,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_864",
"key": "buried_buried_condi_tasktxt_869",
"text": "使用好友助战守护者1次"
},
"type": 12,
@ -20158,7 +20255,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_865",
"key": "buried_buried_condi_tasktxt_870",
"text": "进行3次普通招募"
},
"type": 18,
@ -20175,7 +20272,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_866",
"key": "buried_buried_condi_tasktxt_871",
"text": "为任意守护者提升5级"
},
"type": 24,
@ -20192,7 +20289,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_867",
"key": "buried_buried_condi_tasktxt_872",
"text": "强化任意装备成功6次"
},
"type": 47,
@ -20209,7 +20306,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_868",
"key": "buried_buried_condi_tasktxt_873",
"text": "消费500000金币"
},
"type": 68,
@ -20226,7 +20323,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_869",
"key": "buried_buried_condi_tasktxt_874",
"text": "消费300钻石"
},
"type": 104,
@ -20243,7 +20340,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_870",
"key": "buried_buried_condi_tasktxt_875",
"text": "完成1次功夫陪练任务"
},
"type": 186,
@ -20260,7 +20357,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_871",
"key": "buried_buried_condi_tasktxt_876",
"text": "挑战3次竞技场"
},
"type": 130,
@ -20277,7 +20374,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_872",
"key": "buried_buried_condi_tasktxt_877",
"text": "挑战3次“维京远征”副本"
},
"type": 172,
@ -20294,7 +20391,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_873",
"key": "buried_buried_condi_tasktxt_878",
"text": "挑战3次“狩猎”副本"
},
"type": 200,

76
bin/json/game_caravanevent.json
View File

@ -3,22 +3,22 @@
"id": 1001,
"eventtype": 1,
"mustdo": 1,
"citystory": 601,
"citynormal": 102,
"cityabnormal": 103,
"worldtask": 90010,
"citystory": 50002010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 500,
"traintips": {
"key": "caravan_caravan_event_traintips_1",
"text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。"
},
"trainstory": 500,
"trainstorybad": 500,
"trainstorygood": 500,
"trainstory": 50010110,
"trainstorybad": 50010120,
"trainstorygood": 50010130,
"reword": [
{
"a": "item",
"t": "141001",
"n": 10
"a": "attr",
"t": "glod",
"n": 1000
}
],
"exreword": [
@ -26,5 +26,61 @@
],
"unreword": [],
"eventtime": 500
},
{
"id": 1002,
"eventtype": 1,
"mustdo": 2,
"citystory": 50002010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 510,
"traintips": {
"key": "caravan_caravan_event_traintips_2",
"text": "这个事情看上去有回旋的余地，但我建议先处理掉这个事情。"
},
"trainstory": 50010110,
"trainstorybad": 50010120,
"trainstorygood": 50010130,
"reword": [
{
"a": "attr",
"t": "glod",
"n": 1001
}
],
"exreword": [
10002
],
"unreword": [],
"eventtime": 500
},
{
"id": 1003,
"eventtype": 1,
"mustdo": 1,
"citystory": 50002010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 520,
"traintips": {
"key": "caravan_caravan_event_traintips_3",
"text": "最好先解决这个麻烦，再前往其他地方。"
},
"trainstory": 50010110,
"trainstorybad": 50010120,
"trainstorygood": 50010130,
"reword": [
{
"a": "attr",
"t": "glod",
"n": 1002
}
],
"exreword": [
10003
],
"unreword": [],
"eventtime": 500
}
]

2
bin/json/game_gm.json
View File

@ -236,7 +236,7 @@
"key": "GM_GM_text_25",
"text": "跳到主线关卡XX关（填关卡Id）"
},
"data": "1100101",
"data": "1101001",
"prefix": "bingo:mainline,{0}"
},
{

204
bin/json/game_rdtasknpc.json
View File

@ -5245,5 +5245,209 @@
13010
],
"goto": 0
},
{
"id": 50010,
"heroid": 25001,
"datas": [
"CaravanScene",
"500010_阿宝",
"11001"
],
"event": [
2,
50000010
],
"goto": 0
},
{
"id": 50011,
"heroid": 25001,
"datas": [
"GameMain",
"901"
],
"event": [
0
],
"goto": 0
},
{
"id": 50018,
"heroid": 25001,
"datas": [
"CaravanScene",
"500010_阿宝",
"11001"
],
"event": [
2,
50000020
],
"goto": 0
},
{
"id": 50020,
"heroid": 25001,
"datas": [
"CaravanScene",
"500020_阿宝",
"11001"
],
"event": [
2,
50000030
],
"goto": 0
},
{
"id": 50021,
"heroid": 25001,
"datas": [
"GameMain",
"901"
],
"event": [
0
],
"goto": 0
},
{
"id": 50028,
"heroid": 25001,
"datas": [
"CaravanScene",
"500020_阿宝",
"11001"
],
"event": [
2,
50000040
],
"goto": 0
},
{
"id": 50030,
"heroid": 25001,
"datas": [
"CaravanScene",
"500030_阿宝",
"11001"
],
"event": [
2,
50000050
],
"goto": 0
},
{
"id": 50031,
"heroid": 25001,
"datas": [
"GameMain",
"901"
],
"event": [
0
],
"goto": 0
},
{
"id": 50038,
"heroid": 25001,
"datas": [
"CaravanScene",
"500030_阿宝",
"11001"
],
"event": [
2,
50000060
],
"goto": 0
},
{
"id": 50040,
"heroid": 25001,
"datas": [
"CaravanScene",
"500040_亚丝翠",
"11001"
],
"event": [
2,
50000070
],
"goto": 0
},
{
"id": 50041,
"heroid": 25001,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
10,
167
],
"goto": 0
},
{
"id": 50048,
"heroid": 25001,
"datas": [
"CaravanScene",
"500040_亚丝翠",
"11001"
],
"event": [
2,
50000080
],
"goto": 0
},
{
"id": 50050,
"heroid": 25001,
"datas": [
"CaravanScene",
"500050_亚丝翠",
"11001"
],
"event": [
2,
50000090
],
"goto": 0
},
{
"id": 50051,
"heroid": 25001,
"datas": [
"GameMain",
"功能入口-维京远征",
"901"
],
"event": [
10,
167
],
"goto": 0
},
{
"id": 50058,
"heroid": 25001,
"datas": [
"CaravanScene",
"500050_亚丝翠",
"11001"
],
"event": [
2,
50000100
],
"goto": 0
}
]

658
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

680
bin/json/game_skillpassive.json
View File

File diff suppressed because it is too large Load Diff

180
bin/json/game_worldtask.json
View File

@ -4559,5 +4559,185 @@
}
],
"module": []
},
{
"key": 500010,
"lock": 1,
"lockend": 0,
"ontxe": 0,
"id_after": 500020,
"group": 500,
"des": 5,
"icon": "",
"task_name": {
"key": "worldtask_world_task_task_name_122",
"text": "商队任务1-任意1装备+3"
},
"task_details": {
"key": "worldtask_world_task_task_details_122",
"text": "商队任务1-任意1装备+3"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_122",
"text": "商队任务1-任意1装备+3"
},
"npc": 500010,
"completetask": [
15000001
],
"deliver_npc": 500018,
"auto_accept": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 8200
}
],
"module": []
},
{
"key": 500020,
"lock": 1,
"lockend": 0,
"ontxe": 500010,
"id_after": 500030,
"group": 500,
"des": 5,
"icon": "",
"task_name": {
"key": "worldtask_world_task_task_name_123",
"text": "商队任务1-任意2装备+3"
},
"task_details": {
"key": "worldtask_world_task_task_details_123",
"text": "商队任务1-任意2装备+3"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_123",
"text": "商队任务1-任意2装备+3"
},
"npc": 500020,
"completetask": [
15000002
],
"deliver_npc": 500028,
"auto_accept": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 8200
}
],
"module": []
},
{
"key": 500030,
"lock": 1,
"lockend": 0,
"ontxe": 500020,
"id_after": 500040,
"group": 500,
"des": 5,
"icon": "",
"task_name": {
"key": "worldtask_world_task_task_name_124",
"text": "商队任务1-任意3装备+3"
},
"task_details": {
"key": "worldtask_world_task_task_details_124",
"text": "商队任务1-任意3装备+3"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_124",
"text": "商队任务1-任意3装备+3"
},
"npc": 500030,
"completetask": [
15000003
],
"deliver_npc": 500038,
"auto_accept": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 8200
}
],
"module": []
},
{
"key": 500040,
"lock": 1,
"lockend": 0,
"ontxe": 0,
"id_after": 0,
"group": 510,
"des": 5,
"icon": "",
"task_name": {
"key": "worldtask_world_task_task_name_125",
"text": "商队任务2-维京远征2次"
},
"task_details": {
"key": "worldtask_world_task_task_details_125",
"text": "商队任务2-维京远征2次"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_125",
"text": "商队任务2-维京远征2次"
},
"npc": 500040,
"completetask": [
15000004
],
"deliver_npc": 500048,
"auto_accept": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 8200
}
],
"module": []
},
{
"key": 500050,
"lock": 1,
"lockend": 0,
"ontxe": 0,
"id_after": 0,
"group": 520,
"des": 5,
"icon": "",
"task_name": {
"key": "worldtask_world_task_task_name_126",
"text": "商队任务3-维京远征4次"
},
"task_details": {
"key": "worldtask_world_task_task_details_126",
"text": "商队任务3-维京远征4次"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_126",
"text": "商队任务3-维京远征4次"
},
"npc": 500050,
"completetask": [
15000005
],
"deliver_npc": 500058,
"auto_accept": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 8200
}
],
"module": []
}
]

10
modules/caravan/api_getstory.go
View File

@ -30,7 +30,7 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
}
list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId())
conf, err := this.module.configure.GetCaravanEventById(req.Cid)
conf, err := this.module.configure.GetCaravanEventById(list.Eventid)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@ -39,13 +39,7 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
}
return
}
if list.Eventid != req.Cid {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
if req.Citystory == conf.Citynormal { //接受剧情
module, err := this.service.GetModule(comm.ModuleWorldtask)

2
modules/caravan/api_gotocity.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
bNewTask bool
)
resp = &pb.CaravanGotoCityResp{}
bNewTask = false
bNewTask = true
if errdata = this.GotoCityCheck(session, req); errdata != nil {
return // 参数校验失败直接返回
}

4
sys/configure/structs/game.skillPassiveData.go
View File

@ -21,7 +21,9 @@ type GameSkillPassiveData struct {
AddCon []string
PasPr int32
Type string
MaxEmitTimesInRoundByRole int32
MaxEmitTimes int32
MaxEmitTimesInRound int32
Callback []int32
}
@ -55,7 +57,9 @@ func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PasPr"].(float64); !_ok_ { err = errors.New("PasPr error"); return }; _v.PasPr = int32(_tempNum_) }
{ var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimesInRoundByRole"].(float64); !_ok_ { err = errors.New("MaxEmitTimesInRoundByRole error"); return }; _v.MaxEmitTimesInRoundByRole = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimes"].(float64); !_ok_ { err = errors.New("MaxEmitTimes error"); return }; _v.MaxEmitTimes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxEmitTimesInRound"].(float64); !_ok_ { err = errors.New("MaxEmitTimesInRound error"); return }; _v.MaxEmitTimesInRound = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool