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:
meixiongfeng 2024-01-03 11:30:43 +08:00
commit ff4f7bc196
2 changed files with 89 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
bin/json/game_mainstage.json
View File

@ -30272,12 +30272,12 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_desc_251",
"text": "果酱教授再次现身， 抓捕行动前所未有的顺利，一切似乎都在朝最好的方向发展……"
},
"exp": 0,
"hero_exp": 400,
@ -30401,8 +30401,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -30530,8 +30530,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -30659,8 +30659,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -30788,8 +30788,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -30917,8 +30917,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -31046,8 +31046,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -31175,8 +31175,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_249",
"text": "国王的新装"
},
"desc": {
"key": "",
@ -31304,8 +31304,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -31433,8 +31433,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -31562,8 +31562,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -31691,8 +31691,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -31820,8 +31820,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -31949,8 +31949,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -32078,8 +32078,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -32207,8 +32207,8 @@
"text": ""
},
"title": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_title_250",
"text": "魂之挽歌"
},
"desc": {
"key": "",
@ -32336,7 +32336,7 @@
"text": "6-7"
},
"title": {
"key": "mainchapter_main_stage_title_231",
"key": "mainchapter_main_stage_title_251",
"text": "机灵的学徒"
},
"desc": {
@ -32465,7 +32465,7 @@
"text": "6-8"
},
"title": {
"key": "mainchapter_main_stage_title_232",
"key": "mainchapter_main_stage_title_252",
"text": "天空放晴"
},
"desc": {
@ -32594,7 +32594,7 @@
"text": "7-1"
},
"title": {
"key": "mainchapter_main_stage_title_233",
"key": "mainchapter_main_stage_title_253",
"text": "魔发精灵"
},
"desc": {
@ -32723,7 +32723,7 @@
"text": "7-2"
},
"title": {
"key": "mainchapter_main_stage_title_234",
"key": "mainchapter_main_stage_title_254",
"text": "精灵大变身"
},
"desc": {
@ -32852,7 +32852,7 @@
"text": "7-3"
},
"title": {
"key": "mainchapter_main_stage_title_235",
"key": "mainchapter_main_stage_title_255",
"text": "涌动的大海"
},
"desc": {
@ -32981,7 +32981,7 @@
"text": "7-4"
},
"title": {
"key": "mainchapter_main_stage_title_236",
"key": "mainchapter_main_stage_title_256",
"text": "神秘的歌声"
},
"desc": {
@ -33110,7 +33110,7 @@
"text": "7-5"
},
"title": {
"key": "mainchapter_main_stage_title_237",
"key": "mainchapter_main_stage_title_257",
"text": "惊现海女巫"
},
"desc": {
@ -33239,7 +33239,7 @@
"text": "7-6"
},
"title": {
"key": "mainchapter_main_stage_title_238",
"key": "mainchapter_main_stage_title_258",
"text": "多年前的恩怨"
},
"desc": {
@ -33368,7 +33368,7 @@
"text": "7-7"
},
"title": {
"key": "mainchapter_main_stage_title_239",
"key": "mainchapter_main_stage_title_259",
"text": "多年前的恩怨"
},
"desc": {
@ -33497,7 +33497,7 @@
"text": "7-8"
},
"title": {
"key": "mainchapter_main_stage_title_240",
"key": "mainchapter_main_stage_title_260",
"text": "古墓残影"
},
"desc": {
@ -33626,7 +33626,7 @@
"text": "8-1"
},
"title": {
"key": "mainchapter_main_stage_title_241",
"key": "mainchapter_main_stage_title_261",
"text": "有人在监视"
},
"desc": {
@ -33755,7 +33755,7 @@
"text": "8-2"
},
"title": {
"key": "mainchapter_main_stage_title_242",
"key": "mainchapter_main_stage_title_262",
"text": "你要勇敢"
},
"desc": {
@ -33884,7 +33884,7 @@
"text": "8-3"
},
"title": {
"key": "mainchapter_main_stage_title_243",
"key": "mainchapter_main_stage_title_263",
"text": "森林漫步"
},
"desc": {
@ -34013,7 +34013,7 @@
"text": "8-4"
},
"title": {
"key": "mainchapter_main_stage_title_244",
"key": "mainchapter_main_stage_title_264",
"text": "突如其来的变故"
},
"desc": {
@ -34142,7 +34142,7 @@
"text": "8-5"
},
"title": {
"key": "mainchapter_main_stage_title_245",
"key": "mainchapter_main_stage_title_265",
"text": "陌生人的信"
},
"desc": {
@ -34271,7 +34271,7 @@
"text": "8-6"
},
"title": {
"key": "mainchapter_main_stage_title_246",
"key": "mainchapter_main_stage_title_266",
"text": "难以忍受的噪音"
},
"desc": {
@ -34400,7 +34400,7 @@
"text": "8-7"
},
"title": {
"key": "mainchapter_main_stage_title_247",
"key": "mainchapter_main_stage_title_267",
"text": "幻境奇遇"
},
"desc": {
@ -34529,7 +34529,7 @@
"text": "8-8"
},
"title": {
"key": "mainchapter_main_stage_title_248",
"key": "mainchapter_main_stage_title_268",
"text": "旅途尾声"
},
"desc": {
@ -34658,7 +34658,7 @@
"text": "9-1"
},
"title": {
"key": "mainchapter_main_stage_title_249",
"key": "mainchapter_main_stage_title_269",
"text": "云上工厂"
},
"desc": {
@ -34787,7 +34787,7 @@
"text": "9-2"
},
"title": {
"key": "mainchapter_main_stage_title_250",
"key": "mainchapter_main_stage_title_270",
"text": "小屁孩的慰问"
},
"desc": {
@ -34916,7 +34916,7 @@
"text": "9-3"
},
"title": {
"key": "mainchapter_main_stage_title_251",
"key": "mainchapter_main_stage_title_271",
"text": "智力大测试"
},
"desc": {
@ -35045,7 +35045,7 @@
"text": "9-4"
},
"title": {
"key": "mainchapter_main_stage_title_252",
"key": "mainchapter_main_stage_title_272",
"text": "沦为工厂员工"
},
"desc": {
@ -35174,7 +35174,7 @@
"text": "9-5"
},
"title": {
"key": "mainchapter_main_stage_title_253",
"key": "mainchapter_main_stage_title_273",
"text": "忍者俱乐部"
},
"desc": {
@ -35303,7 +35303,7 @@
"text": "9-6"
},
"title": {
"key": "mainchapter_main_stage_title_254",
"key": "mainchapter_main_stage_title_274",
"text": "狡猾的大老板"
},
"desc": {
@ -35432,7 +35432,7 @@
"text": "9-7"
},
"title": {
"key": "mainchapter_main_stage_title_255",
"key": "mainchapter_main_stage_title_275",
"text": "最尴尬的重逢"
},
"desc": {
@ -35561,7 +35561,7 @@
"text": "9-8"
},
"title": {
"key": "mainchapter_main_stage_title_256",
"key": "mainchapter_main_stage_title_276",
"text": "再会"
},
"desc": {
@ -35690,7 +35690,7 @@
"text": "10-1"
},
"title": {
"key": "mainchapter_main_stage_title_257",
"key": "mainchapter_main_stage_title_277",
"text": "神圣殿堂"
},
"desc": {
@ -35819,7 +35819,7 @@
"text": "10-2"
},
"title": {
"key": "mainchapter_main_stage_title_258",
"key": "mainchapter_main_stage_title_278",
"text": "眼花缭乱的魔术"
},
"desc": {
@ -35948,7 +35948,7 @@
"text": "10-3"
},
"title": {
"key": "mainchapter_main_stage_title_259",
"key": "mainchapter_main_stage_title_279",
"text": "收集钥匙"
},
"desc": {
@ -36077,7 +36077,7 @@
"text": "10-4"
},
"title": {
"key": "mainchapter_main_stage_title_260",
"key": "mainchapter_main_stage_title_280",
"text": "船长的惊人发现"
},
"desc": {
@ -36206,7 +36206,7 @@
"text": "10-5"
},
"title": {
"key": "mainchapter_main_stage_title_261",
"key": "mainchapter_main_stage_title_281",
"text": "分道扬镳"
},
"desc": {
@ -36335,7 +36335,7 @@
"text": "10-6"
},
"title": {
"key": "mainchapter_main_stage_title_262",
"key": "mainchapter_main_stage_title_282",
"text": "守护者的责任"
},
"desc": {
@ -36464,7 +36464,7 @@
"text": "10-7"
},
"title": {
"key": "mainchapter_main_stage_title_263",
"key": "mainchapter_main_stage_title_283",
"text": "月光暗淡"
},
"desc": {
@ -36593,7 +36593,7 @@
"text": "10-8"
},
"title": {
"key": "mainchapter_main_stage_title_264",
"key": "mainchapter_main_stage_title_284",
"text": "穿越高塔"
},
"desc": {
@ -36722,7 +36722,7 @@
"text": "11-1"
},
"title": {
"key": "mainchapter_main_stage_title_265",
"key": "mainchapter_main_stage_title_285",
"text": "神秘线索"
},
"desc": {
@ -36851,7 +36851,7 @@
"text": "11-2"
},
"title": {
"key": "mainchapter_main_stage_title_266",
"key": "mainchapter_main_stage_title_286",
"text": "幻境药水"
},
"desc": {
@ -36980,7 +36980,7 @@
"text": "11-3"
},
"title": {
"key": "mainchapter_main_stage_title_267",
"key": "mainchapter_main_stage_title_287",
"text": "我是谁？"
},
"desc": {
@ -37109,7 +37109,7 @@
"text": "11-4"
},
"title": {
"key": "mainchapter_main_stage_title_268",
"key": "mainchapter_main_stage_title_288",
"text": "意志的考验"
},
"desc": {
@ -37238,7 +37238,7 @@
"text": "11-5"
},
"title": {
"key": "mainchapter_main_stage_title_269",
"key": "mainchapter_main_stage_title_289",
"text": "合二为一"
},
"desc": {
@ -37367,7 +37367,7 @@
"text": "11-6"
},
"title": {
"key": "mainchapter_main_stage_title_270",
"key": "mainchapter_main_stage_title_290",
"text": "共同的愿望"
},
"desc": {
@ -37496,7 +37496,7 @@
"text": "11-7"
},
"title": {
"key": "mainchapter_main_stage_title_271",
"key": "mainchapter_main_stage_title_291",
"text": "永夜将至"
},
"desc": {
@ -37625,7 +37625,7 @@
"text": "11-8"
},
"title": {
"key": "mainchapter_main_stage_title_272",
"key": "mainchapter_main_stage_title_292",
"text": "打破僵局"
},
"desc": {
@ -37754,7 +37754,7 @@
"text": "12-1"
},
"title": {
"key": "mainchapter_main_stage_title_273",
"key": "mainchapter_main_stage_title_293",
"text": "正面挑衅"
},
"desc": {
@ -37883,7 +37883,7 @@
"text": "12-2"
},
"title": {
"key": "mainchapter_main_stage_title_274",
"key": "mainchapter_main_stage_title_294",
"text": "紧急召回"
},
"desc": {
@ -38012,7 +38012,7 @@
"text": "12-3"
},
"title": {
"key": "mainchapter_main_stage_title_275",
"key": "mainchapter_main_stage_title_295",
"text": "一本无字书"
},
"desc": {
@ -38141,7 +38141,7 @@
"text": "12-4"
},
"title": {
"key": "mainchapter_main_stage_title_276",
"key": "mainchapter_main_stage_title_296",
"text": "回到过去"
},
"desc": {
@ -38270,7 +38270,7 @@
"text": "12-5"
},
"title": {
"key": "mainchapter_main_stage_title_277",
"key": "mainchapter_main_stage_title_297",
"text": "全员大集合"
},
"desc": {
@ -38399,7 +38399,7 @@
"text": "12-6"
},
"title": {
"key": "mainchapter_main_stage_title_278",
"key": "mainchapter_main_stage_title_298",
"text": "深入峡谷腹地"
},
"desc": {
@ -38528,7 +38528,7 @@
"text": "12-7"
},
"title": {
"key": "mainchapter_main_stage_title_279",
"key": "mainchapter_main_stage_title_299",
"text": "远古的魔法"
},
"desc": {

9
modules/mainline/module.go
View File

@ -103,9 +103,10 @@ func (this *Mainline) CheckPoint(uid string) bool {
// 跳转主线管卡
func (this *Mainline) BingoJumpLevel(session comm.IUserSession, level int32) (errdata *pb.ErrorData) {
var (
info *pb.DBMainline
confs []*cfg.GameMainStageData
err error
info *pb.DBMainline
confs []*cfg.GameMainStageData
aeward []*cfg.Gameatn = make([]*cfg.Gameatn, 0)
err error
)
if confs, err = this.configure.GetMainStageConfs(); err != nil {
@ -133,6 +134,7 @@ func (this *Mainline) BingoJumpLevel(session comm.IUserSession, level int32) (er
for _, v := range confs {
if v.Id <= level {
info.Level[v.Id] = 7
aeward = append(aeward, v.Firstaward...)
}
}
this.modelMline.updateprogress(info)
@ -144,6 +146,7 @@ func (this *Mainline) BingoJumpLevel(session comm.IUserSession, level int32) (er
}
return
}
errdata, _ = this.DispenseAtno(session, aeward, true)
return
}