From d41378285e840f3af8f3642632c8ae1cfa0b12b2 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 11 Oct 2023 17:46:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=AB=9E=E6=8A=80?=
 =?UTF-8?q?=E5=9C=BAnpc=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/arena/api_plot.go | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/modules/arena/api_plot.go b/modules/arena/api_plot.go
index 257cc6237..c3dcde375 100644
--- a/modules/arena/api_plot.go
+++ b/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,

From 3200484b8e9c88795f90ce19f1ce5ff41a143dd9 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 11 Oct 2023 18:18:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/mainline/model_mainline.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go
index 3aa2145ce..c60e8f082 100644
--- a/modules/mainline/model_mainline.go
+++ b/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)
 	}