From 8b20ec9f53578cbb022d3299bed35ffc40bea67f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 20:37:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=96=E7=95=8C=E4=BB=BB=E5=8A=A1bingo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/worldtask/module.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index aaae7885d..0b8c58f47 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -163,6 +163,7 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId if err != nil { return err } + mytask.Uid = uid // 更新数据 update := map[string]interface{}{} @@ -181,15 +182,14 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId if taskConf.Ontxe != 0 && taskConf.IdAfter != 0 { for _, v := range this.worldtaskConf.GetDataList() { if v.Group == groupId && v.Key <= taskId { - mytask.LastTaskIds[groupId] = &pb.Worldtask{ + wt := &pb.Worldtask{ TaskId: v.Key, TaskType: v.Des, } - mytask.TaskList = append(mytask.TaskList, &pb.Worldtask{ - TaskId: v.Key, - }) + mytask.LastTaskIds[groupId] = wt + mytask.TaskList = append(mytask.TaskList, wt) } - break + } } else { wt := &pb.Worldtask{ From 3fe6f8d115430ae08dcc7f7f2c3d9180f80cdfa3 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 21:56:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/task/api_activereceive.go | 141 +++++++++++++++++------------- 1 file changed, 78 insertions(+), 63 deletions(-) diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 6aee401c6..0b63ce9aa 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -2,7 +2,9 @@ package task import ( "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) @@ -21,76 +23,89 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive if code = this.ActiveReceiveCheck(session, req); code != pb.ErrorCode_Success { return } + uid := session.GetUserId() + + // ua := this.moduleTask.modelTaskActive.getUserActive(uid, req.Id, comm.TaskTag(req.TaskTag)) + // if ua == nil { + // code = pb.ErrorCode_TaskActiveNofound + // return + // } + + //判断是否已领取 + // if ua.Received == 1 { + // code = pb.ErrorCode_TaskReceived + // return + // } + + var rewards []*cfg.Gameatn + // 玩家的 + activeList := this.moduleTask.modelTaskActive.getActiveListByTag(uid, comm.TaskTag(req.TaskTag)) + for _, v := range activeList { + if v.Received != 1 { //未领取 + conf := this.moduleTask.configure.getTaskActiveById(v.RId) + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + + // get user expand + ue, err := this.moduleTask.ModuleUser.GetUserExpand(uid) + if err != nil { + code = pb.ErrorCode_DBError + return + } + + if ue == nil { + code = pb.ErrorCode_UserExpandNull + return + } + + update := make(map[string]interface{}) + if req.TaskTag == int32(comm.TASK_DAILY) { + if ue.Activeday >= conf.Active { + update["received"] = 1 + } else { + code = pb.ErrorCode_TaskActiveNoenough + return + } + } else if req.TaskTag == int32(comm.TASK_WEEKLY) { + if ue.Activeweek >= conf.Active { + update["received"] = 1 + } else { + code = pb.ErrorCode_TaskActiveNoenough + return + } + } + if len(update) > 0 { + if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(), + v.Id, + comm.TaskTag(req.TaskTag), + update); err != nil { + this.moduleTask.Errorf("updateReceive err %v", err) + code = pb.ErrorCode_DBError + return + } + } + rewards = append(rewards, conf.Reword...) + } + } + + if len(rewards) > 0 { + //派发奖励 + if code = this.moduleTask.DispenseRes(session, rewards, true); code != pb.ErrorCode_Success { + this.moduleTask.Error("活跃度奖励", log.Fields{"uid": uid, "rewards": rewards, "code": code}) + } + } + resp := &pb.TaskActiveReceiveResp{ TaskTag: req.TaskTag, Id: req.Id, } - defer func() { - err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp) - if err != nil { - code = pb.ErrorCode_SystemError - } - }() - - ua := this.moduleTask.modelTaskActive.getUserActive(session.GetUserId(), req.Id, comm.TaskTag(req.TaskTag)) - if ua == nil { - code = pb.ErrorCode_TaskActiveNofound - return - } - - //判断是否已领取 - if ua.Received == 1 { - code = pb.ErrorCode_TaskReceived - return - } - - conf := this.moduleTask.configure.getTaskActiveById(ua.RId) - if conf == nil { - code = pb.ErrorCode_ConfigNoFound - return - } - - // get user expand - ue, err := this.moduleTask.ModuleUser.GetUserExpand(session.GetUserId()) + err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp) if err != nil { - code = pb.ErrorCode_DBError - return + code = pb.ErrorCode_SystemError } - if ue == nil { - code = pb.ErrorCode_UserExpandNull - return - } - - update := make(map[string]interface{}) - if req.TaskTag == int32(comm.TASK_DAILY) { - if ue.Activeday >= conf.Active { - update["received"] = 1 - } else { - code = pb.ErrorCode_TaskActiveNoenough - return - } - } else if req.TaskTag == int32(comm.TASK_WEEKLY) { - if ue.Activeweek >= conf.Active { - update["received"] = 1 - } else { - code = pb.ErrorCode_TaskActiveNoenough - return - } - } - if len(update) > 0 { - if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(), - ua.Id, - comm.TaskTag(req.TaskTag), - update); err != nil { - this.moduleTask.Errorf("updateReceive err %v", err) - code = pb.ErrorCode_DBError - return - } - } - - //派发奖励 - code = this.moduleTask.DispenseRes(session, conf.Reword, true) return } From 532b38915b1cdc680e021a08e4ff2c56d9ab22f6 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 22:00:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_rdtaskcondi.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 93317d447..91f898737 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -873,7 +873,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 102, "data3": 0, "data4": 0, "data5": 0 @@ -884,7 +884,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 103, "data3": 0, "data4": 0, "data5": 0 @@ -895,7 +895,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 104, "data3": 0, "data4": 0, "data5": 0 @@ -906,7 +906,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 105, "data3": 0, "data4": 0, "data5": 0 @@ -917,7 +917,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 106, "data3": 0, "data4": 0, "data5": 0 @@ -928,7 +928,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 107, "data3": 0, "data4": 0, "data5": 0 @@ -939,7 +939,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 108, "data3": 0, "data4": 0, "data5": 0 @@ -950,7 +950,7 @@ "type": 70, "inited": [], "data1": 1, - "data2": 101, + "data2": 109, "data3": 0, "data4": 0, "data5": 0 From ddc356cad0c6323bafab2924110bba86375a11c0 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 22:40:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/condiFindHandle.go | 20 ++++++++++---------- modules/rtask/module.go | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/rtask/condiFindHandle.go b/modules/rtask/condiFindHandle.go index 5c52fb04e..8e2c784e8 100644 --- a/modules/rtask/condiFindHandle.go +++ b/modules/rtask/condiFindHandle.go @@ -54,7 +54,7 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -63,11 +63,11 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -76,15 +76,15 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { + if ok, err1 := soEqual(vals[3], cfg.Data4); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -93,19 +93,19 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { + if ok, err1 := soEqual(vals[3], cfg.Data4); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok { + if ok, err1 := soEqual(vals[4], cfg.Data5); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index cfb03ca44..c9869f074 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -260,7 +260,7 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T } if condiId, err = v.find(v.cfg, params...); condiId == 0 { if err != nil { - this.Warnln(errors.WithMessage(err, uid).Error()) + this.Warn(errors.WithMessage(err, uid).Error(),log.Fields{}) } } else { condis = append(condis, v) From ba29beb85f0498b2a1dc1d7b7431bea52e730a16 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 23:09:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/updateHandle.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go index daefae308..ec93731ef 100644 --- a/modules/rtask/updateHandle.go +++ b/modules/rtask/updateHandle.go @@ -20,11 +20,9 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond } record := &pb.DBRtaskRecord{} - if err2 := this.Get(uid, record); err2 != nil { - if err2 != mongo.ErrNoDocuments { + if err := this.Get(uid, record); err != nil { + if err != mongo.ErrNoDocuments { return errors.Wrapf(err, "获取玩家任务记录 err: %v rtype[%v]", uid, cfg.Id) - } else { - err = err2 } } @@ -34,11 +32,15 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond if v, ok := record.Vals[cfg.Id]; ok { m := hasUpdateData(paramLen, v, vals...) + v.Data = m if len(m) > 0 { update := map[string]interface{}{ - "vals": m, + "vals": v, } - err = this.Change(uid, update) + if err = this.Change(uid, update); err != nil { + return + } + } } else { data := &pb.RtaskData{ @@ -51,7 +53,9 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond update := map[string]interface{}{ "vals": record.Vals, } - err = this.Change(uid, update) + if err = this.Change(uid, update); err != nil { + return + } } this.listenTask(uid, cfg.Id) From 43d7003d7e9c807cfc3375399240d6de560cde39 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Fri, 18 Nov 2022 23:24:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=98=E6=96=97?= =?UTF-8?q?=E6=97=A0=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1ID=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/rtask/updateHandle.go | 5 ++--- modules/worldtask/api_battlefinish.go | 31 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go index ec93731ef..0ffe5466e 100644 --- a/modules/rtask/updateHandle.go +++ b/modules/rtask/updateHandle.go @@ -31,9 +31,8 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond } if v, ok := record.Vals[cfg.Id]; ok { - m := hasUpdateData(paramLen, v, vals...) - v.Data = m - if len(m) > 0 { + v.Data = hasUpdateData(paramLen, v, vals...) + if len(v.Data) > 0 { update := map[string]interface{}{ "vals": v, } diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 12ba9bf12..4438d359b 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -22,16 +22,47 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa return } + uid := session.GetUserId() taskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || taskConf == nil { code = pb.ErrorCode_ConfigNoFound return } + // 当前玩家世界任务 + userTask, err := this.module.modelWorldtask.getWorldtask(uid) + if err != nil { + code = pb.ErrorCode_DBError + return + } + rsp := &pb.WorldtaskBattleFinishResp{ TaskId: req.TaskId, } + if taskConf.Completetask == 0 { + if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil { + code = pb.ErrorCode_DBError + this.module.Error("世界任务战斗结果", log.Fields{"uid": uid, "err": err.Error()}) + return + } + + if err := session.SendMsg(string(this.module.GetType()), WorldtaskBattleFinish, rsp); err != nil { + code = pb.ErrorCode_SystemError + return + } + + if taskConf.IdAfter != 0 { + if err := session.SendMsg(string(this.module.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{ + NextTaskId: taskConf.IdAfter, + }); err != nil { + log.Error("任务条件达成推送", log.Fields{"uid": uid, "err": err}) + return + } + } + + } + battleModule, err := this.module.service.GetModule(comm.ModuleBattle) if err != nil { code = pb.ErrorCode_SystemError From 8fb8130c8590204c71453147945d02e8af0ecac5 Mon Sep 17 00:00:00 2001 From: liwei Date: Sat, 19 Nov 2022 00:43:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_combatbox.json | 122 +++++++++++++++---------------- bin/json/game_combatlevel.json | 68 ++++++++--------- bin/json/game_combatmanster.json | 9 +-- 3 files changed, 99 insertions(+), 100 deletions(-) diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index 271370c95..a06f3545c 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -1,62 +1,62 @@ -[ - { - "id": 10001, - "drop": 1001 - }, - { - "id": 10002, - "drop": 1001 - }, - { - "id": 10003, - "drop": 1001 - }, - { - "id": 10004, - "drop": 1001 - }, - { - "id": 10005, - "drop": 1001 - }, - { - "id": 10006, - "drop": 1001 - }, - { - "id": 10007, - "drop": 1001 - }, - { - "id": 10008, - "drop": 1001 - }, - { - "id": 10009, - "drop": 1001 - }, - { - "id": 10010, - "drop": 1001 - }, - { - "id": 10011, - "drop": 1001 - }, - { - "id": 10012, - "drop": 1001 - }, - { - "id": 10013, - "drop": 1001 - }, - { - "id": 10014, - "drop": 1001 - }, - { - "id": 10015, - "drop": 1001 - } +[ + { + "id": 10001, + "drop": 1001 + }, + { + "id": 10002, + "drop": 1001 + }, + { + "id": 10003, + "drop": 1001 + }, + { + "id": 10004, + "drop": 1001 + }, + { + "id": 10005, + "drop": 1001 + }, + { + "id": 10006, + "drop": 1001 + }, + { + "id": 10007, + "drop": 1001 + }, + { + "id": 10008, + "drop": 1001 + }, + { + "id": 10009, + "drop": 1001 + }, + { + "id": 10010, + "drop": 1001 + }, + { + "id": 10011, + "drop": 1001 + }, + { + "id": 10012, + "drop": 1001 + }, + { + "id": 10013, + "drop": 1001 + }, + { + "id": 10014, + "drop": 1001 + }, + { + "id": 10015, + "drop": 1001 + } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index dda19f25f..faf789660 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -1,18 +1,18 @@ [ { "id": 10001, - "scene": "LevelDemo", + "scene": "LevelDemo_Fcamer 1", "formatList": [ - 110211, - 110212 + 101011, + 101021 ], "droplist": [ - 1001, - 1002 + 10001, + 10002 ], "passformatList": [], "passdroplist": [ - 1002 + 10001 ], "award": [ { @@ -30,11 +30,11 @@ 110213 ], "droplist": [ - 1001 + 10002 ], "passformatList": [], "passdroplist": [ - 1001 + 10002 ], "award": [ { @@ -52,11 +52,11 @@ 110214 ], "droplist": [ - 1001 + 10003 ], "passformatList": [], "passdroplist": [ - 1001 + 10003 ], "award": [ { @@ -74,11 +74,11 @@ 110215 ], "droplist": [ - 1001 + 10004 ], "passformatList": [], "passdroplist": [ - 1001 + 10004 ], "award": [ { @@ -96,11 +96,11 @@ 110216 ], "droplist": [ - 1001 + 10005 ], "passformatList": [], "passdroplist": [ - 1001 + 10005 ], "award": [ { @@ -118,11 +118,11 @@ 120031 ], "droplist": [ - 1001 + 10006 ], "passformatList": [], "passdroplist": [ - 1001 + 10006 ], "award": [ { @@ -140,11 +140,11 @@ 120032 ], "droplist": [ - 1001 + 10007 ], "passformatList": [], "passdroplist": [ - 1001 + 10007 ], "award": [ { @@ -162,11 +162,11 @@ 120033 ], "droplist": [ - 1001 + 10008 ], "passformatList": [], "passdroplist": [ - 1001 + 10008 ], "award": [ { @@ -184,11 +184,11 @@ 120034 ], "droplist": [ - 1001 + 10009 ], "passformatList": [], "passdroplist": [ - 1001 + 10009 ], "award": [ { @@ -206,11 +206,11 @@ 120035 ], "droplist": [ - 1001 + 10010 ], "passformatList": [], "passdroplist": [ - 1001 + 10010 ], "award": [ { @@ -227,11 +227,11 @@ 120035 ], "droplist": [ - 1001 + 10011 ], "passformatList": [], "passdroplist": [ - 1001 + 10011 ], "award": [ { @@ -248,11 +248,11 @@ 120036 ], "droplist": [ - 1001 + 10012 ], "passformatList": [], "passdroplist": [ - 1001 + 10012 ], "award": [ { @@ -269,11 +269,11 @@ 130011 ], "droplist": [ - 1001 + 10013 ], "passformatList": [], "passdroplist": [ - 1001 + 10013 ], "award": [ { @@ -290,11 +290,11 @@ 130012 ], "droplist": [ - 1001 + 10014 ], "passformatList": [], "passdroplist": [ - 1001 + 10014 ], "award": [ { @@ -311,11 +311,11 @@ 130013 ], "droplist": [ - 1001 + 10015 ], "passformatList": [], "passdroplist": [ - 1001 + 10015 ], "award": [ { diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index 0a126c08a..1cda05891 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -1,9 +1,8 @@ [ { - "id": 110211, + "id": 101011, "formatList": [ - 101071, - 101072 + 101011 ], "award": [ { @@ -14,9 +13,9 @@ ] }, { - "id": 110212, + "id": 101021, "formatList": [ - 101072 + 101021 ], "award": [ {