Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/arena/api_plot.go

@@ -3,9 +3,7 @@ package arena
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"time"
 )
 
 // 参数校验
@@ -47,17 +45,17 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd
 		return
 	}
 
-	if info.Npc[req.Pid] != nil {
-		ndata := info.Npc[req.Pid]
-		if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_ArenaTicketNpcInCd,
-				Title: pb.ErrorCode_ArenaTicketNpcInCd.ToString(),
-			}
-			return
-		}
-		index = ndata.Index
-	}
+	// if info.Npc[req.Pid] != nil {
+	// 	ndata := info.Npc[req.Pid]
+	// 	if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间
+	// 		errdata = &pb.ErrorData{
+	// 			Code:  pb.ErrorCode_ArenaTicketNpcInCd,
+	// 			Title: pb.ErrorCode_ArenaTicketNpcInCd.ToString(),
+	// 		}
+	// 		return
+	// 	}
+	// 	index = ndata.Index
+	// }
 	if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
 		Rulesid: npc.BattleReadyID,
 		Ptype:   pb.PlayType_arena,

modules/mainline/model_mainline.go

@@ -50,6 +50,7 @@ func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err
 			Groupaward:   make(map[int32]*pb.DBMainlineAward),
 			Ps:           make(map[int32]int32),
 			Chapterboos:  make(map[int32]int32),
+			Stategroup:   make(map[int32]int32),
 		}
 		err = this.Add(uid, results)
 	}