diff --git a/modules/mainline/module.go b/modules/mainline/module.go index 33a698d79..e1d151c54 100644 --- a/modules/mainline/module.go +++ b/modules/mainline/module.go @@ -133,7 +133,7 @@ func (this *Mainline) CheckPoint(uid string) bool { func (this *Mainline) ModifyMainlineDataByNanduID(uid string, nandu, id int32) (code pb.ErrorCode) { conf := this.configure.GetMainlineConfigData(id, nandu) - if conf != nil { + if conf == nil { code = pb.ErrorCode_ConfigNoFound // 找不到配置 return } @@ -142,17 +142,19 @@ func (this *Mainline) ModifyMainlineDataByNanduID(uid string, nandu, id int32) ( // 获取当前的章节数据 jumpCap := conf.Chapter // 先加所有难度小于1 的章节 - for ndIndex := 1; ndIndex < int(nandu)-1; ndIndex++ { + for ndIndex := 1; ndIndex <= int(nandu)-1; ndIndex++ { max := this.configure.GetMaxMainlineChapter() for i := 1; i <= int(max); i++ { + confCap := this.configure.GetMainlineChapter(int32(i)) + //_conf := this.configure.GetMainlineConfigData(int32(i), int32(ndIndex)) _data := &pb.DBMainline{} _data.Id = primitive.NewObjectID().Hex() - _data.ChapterId = conf.Chapter - _data.MainlineId = conf.Id + _data.ChapterId = int32(i) + _data.MainlineId = confCap.Id _mData := make(map[string]interface{}, 0) _data.Uid = uid _data.Intensity = int32(ndIndex) // 难度1 - confCap := this.configure.GetMainlineChapter(int32(i)) + for _, v := range confCap.Episode { _data.BranchID = append(_data.BranchID, v) } @@ -163,12 +165,12 @@ func (this *Mainline) ModifyMainlineDataByNanduID(uid string, nandu, id int32) ( } } // 加当前难度 的章节数据 - for i := 1; i < int(jumpCap-1); i++ { + for i := 1; i <= int(jumpCap-1); i++ { confCap := this.configure.GetMainlineChapter(int32(i)) _data := &pb.DBMainline{} _data.Id = primitive.NewObjectID().Hex() - _data.ChapterId = conf.Chapter - _data.MainlineId = conf.Id + _data.ChapterId = int32(i) + _data.MainlineId = confCap.Id _mData := make(map[string]interface{}, 0) _data.Uid = uid _data.Intensity = int32(nandu) // 难度1 @@ -186,9 +188,12 @@ func (this *Mainline) ModifyMainlineDataByNanduID(uid string, nandu, id int32) ( _mData := make(map[string]interface{}, 0) _data.Uid = uid _data.Intensity = int32(nandu) // 难度1 - // for _, v := range confCap.Episode { - // _data.BranchID = append(_data.BranchID, v) - // } + confCap := this.configure.GetMainlineChapter(int32(conf.Chapter)) + for _, v := range confCap.Episode { + if v <= id { + _data.BranchID = append(_data.BranchID, v) + } + } _mData[_data.Id] = _data this.modelMainline.addNewChapter(uid, _mData)