From cc656a5bbcc96a87bb64ca3beff26bd0cb46baef Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Thu, 4 Jul 2024 13:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E5=AD=A3=E9=80=9A=E8=A1=8C=E8=AF=81?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/DB_PropExchange.dat   | Bin 384 -> 384 bytes
 data/DB_Task.dat           | Bin 2452 -> 2452 bytes
 dbproxy/svc/u_gamedata.go  |  10 +++++++
 model/gamedata.go          |  17 ++++++++++++
 ranksrv/rank/rankpermit.go |   5 +++-
 worldsrv/etcd.go           |  54 +++++++++++++++++++++----------------
 worldsrv/permitmgr.go      |   3 +++
 worldsrv/tournament.go     |   6 +++--
 8 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat
index 8a642d9f94507e11054528bdafbea5d70f35a163..a89e39fc2d2a43bd6cb340ab99fc605bb1806f67 100644
GIT binary patch
literal 384
zcmd-w<6snElw#w!*2WB`uS4m}Q2Gj#z6zq1I5-yevI!h$vE|a^U;?YZ4VAwErEfy%
zTWIRTIUweP%>mj6vj?URW)I9ADCPjw!|VaOONkTgj)t|5Sh!+2SilZ}IT&UE%wSvw
Z-GMq3-D0rAl-M~I0X_PKnTvt85CCN|JT(9S

literal 384
zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUwev+XK^&q7UdEto8%N!S*O|g5A-u_7MwLEC&nm9sn8uvk<F;f%1324rk|B
N1oY?^W-bQWLI7eSJT(9S

diff --git a/data/DB_Task.dat b/data/DB_Task.dat
index 1271acc7fdcf7859c674d8224a9f8631d505030e..a8e54c059e848c8feadfed2294ca63e992c76dcd 100644
GIT binary patch
delta 190
zcmbOtJVkiIOhGn|CB19{a#kE13xV{4Ubc;^&N7>^aV!Gzn4zK%mJ2yBaw&5xnZqa`
zBEhP_sxiUOfYAz~h!v*wklf_8EMF$4u?zA6RjY7pd&MZA2vp57`5}w!<h!iKlY>~q
uCabZX5`@@wU=|P52&T=9?2?Q?r+_R)Hcy+w6e=nLwWXo6YI7lnG9v)wlrgUW

delta 199
zcmbOtJVkiIOhFEgg}rP73wqhC*f^E|S#ld!on@XJ#ww<;WDcW%hy<$wtHuOB14b*T
z!b5UEg^Pd+StqY$`63Ttb3tVfwAeZ@a;b1^d&MZA2-M0l`5}w!<h!iKf)I5~Fm<zd
lCM&X?#}wVn$S%nUa}$zP+8m}((T2_{r~^bc7jh^w0st4zG;sg`

diff --git a/dbproxy/svc/u_gamedata.go b/dbproxy/svc/u_gamedata.go
index c3fe78e..7d5e286 100644
--- a/dbproxy/svc/u_gamedata.go
+++ b/dbproxy/svc/u_gamedata.go
@@ -53,6 +53,16 @@ func (svc *GameKVDataSvc) UptGameKVData(args *model.GameKVData, ret *bool) error
 	return nil
 }
 
+func (svc *GameKVDataSvc) GetGameKVData(args *model.GameKVData, ret *model.GameKVData) error {
+	c := GameKVDatasCollection()
+	if c != nil {
+		err := c.Find(bson.M{"key": args.Key}).One(ret)
+		logger.Logger.Tracef("GetGameKVData: %#v %v", ret, err)
+		return err
+	}
+	return nil
+}
+
 var _GameKVDataSvc = &GameKVDataSvc{}
 
 func init() {
diff --git a/model/gamedata.go b/model/gamedata.go
index 020f8e7..09d626b 100644
--- a/model/gamedata.go
+++ b/model/gamedata.go
@@ -63,6 +63,23 @@ func GetStrKVGameData(key string) string {
 	return ""
 }
 
+func GetStrKVGameDataDB(key string) (string, error) {
+	if rpcCli == nil {
+		logger.Logger.Error("model.GetStrKVGameDataDB rpcCli == nil")
+		return "", ErrRPClientNoConn
+	}
+	req := &GameKVData{
+		Key: key,
+	}
+	ret := &GameKVData{}
+	err := rpcCli.CallWithTimeout("GameKVDataSvc.GetGameKVData", req, ret, time.Second*30)
+	if err != nil {
+		logger.Logger.Error("model.GetStrKVGameDataDB err:", err, key)
+		return "", err
+	}
+	return ret.StrVal, err
+}
+
 func GetFloatKVGameData(key string) float64 {
 	if val, exist := gameKVDatas.Load(key); exist {
 		if data, ok := val.(*GameKVData); ok {
diff --git a/ranksrv/rank/rankpermit.go b/ranksrv/rank/rankpermit.go
index 121e4a7..aa4db47 100644
--- a/ranksrv/rank/rankpermit.go
+++ b/ranksrv/rank/rankpermit.go
@@ -16,7 +16,10 @@ var RankPermitMgrInstance = com.NewListMgr[*model.PermitScore](
 	func(platform string, index int32) ([]*model.PermitScore, error) {
 		logger.Logger.Tracef("load rank permit platform:%s rankType:%d", platform, index)
 		se := new(model.PermitStartTs)
-		b := model.GetStrKVGameData(common.PermitStartTsKey + platform)
+		b, err := model.GetStrKVGameDataDB(common.PermitStartTsKey + platform)
+		if err != nil {
+			return nil, err
+		}
 		json.Unmarshal([]byte(b), se)
 		seasonList, err := model.FindPlayerPermitList(&model.FindPlayerPermitListArgs{
 			Platform: platform,
diff --git a/worldsrv/etcd.go b/worldsrv/etcd.go
index 4490274..d1c267a 100644
--- a/worldsrv/etcd.go
+++ b/worldsrv/etcd.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"strconv"
 	"strings"
+	"time"
 
 	"go.etcd.io/etcd/client/v3"
 	"mongo.games.com/goserver/core/basic"
@@ -230,30 +231,37 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 			PlatformMgrSingleton.GetConfig(config.Platform).PermitStartTs = startTs
 			PlatformMgrSingleton.GetConfig(config.Platform).PermitEndTs = endTs
 		}
-		task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-			if st.StartTs <= 0 || st.EndTs <= 0 {
-				return nil
-			}
-			b, err := json.Marshal(st)
-			if err != nil {
-				logger.Logger.Errorf("permit startts save error: %v", err)
-			} else {
-				logger.Logger.Infof("update permit startts: %v %v", st.StartTs, st.EndTs)
-				err := model.UptStrKVGameData(common.PermitStartTsKey+config.Platform, string(b))
-				if err != nil {
-					logger.Logger.Errorf("permit startts update error:%v", err)
+		f := func() {
+			task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+				if st.StartTs <= 0 || st.EndTs <= 0 {
+					return nil
 				}
-			}
-			return nil
-		}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
-			if st.StartTs > 0 {
-				LogChannelSingleton.WriteLog(&model.BackendPermitCycle{
-					Platform: config.Platform,
-					StartTs:  st.StartTs,
-					EndTs:    st.EndTs,
-				})
-			}
-		})).StartByExecutor("permit_start_ts")
+				b, err := json.Marshal(st)
+				if err != nil {
+					logger.Logger.Errorf("permit startts save error: %v", err)
+				} else {
+					logger.Logger.Infof("update permit startts: %v %v", st.StartTs, st.EndTs)
+					err := model.UptStrKVGameData(common.PermitStartTsKey+config.Platform, string(b))
+					if err != nil {
+						logger.Logger.Errorf("permit startts update error:%v", err)
+					}
+				}
+				return nil
+			}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
+				if st.StartTs > 0 {
+					LogChannelSingleton.WriteLog(&model.BackendPermitCycle{
+						Platform: config.Platform,
+						StartTs:  st.StartTs,
+						EndTs:    st.EndTs,
+					})
+				}
+			})).StartByExecutor("permit_start_ts")
+		}
+		if isInit {
+			time.AfterFunc(time.Second*5, f) //todo 优化
+		} else {
+			f()
+		}
 
 	default:
 		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
diff --git a/worldsrv/permitmgr.go b/worldsrv/permitmgr.go
index ee6ebbb..e72db39 100644
--- a/worldsrv/permitmgr.go
+++ b/worldsrv/permitmgr.go
@@ -155,6 +155,9 @@ func (r *PermitMgr) OnDayTimer() {
 			}
 			PlatformMgrSingleton.GetConfig(platform).PermitStartTs = se.StartTs
 			PlatformMgrSingleton.GetConfig(platform).PermitEndTs = se.EndTs
+			for _, v := range PlayerMgrSington.playerOfPlatform[platform] {
+				v.ResetPermit()
+			}
 			b, err := json.Marshal(se)
 			if err != nil {
 				logger.Logger.Errorf("(this *PermitMgr) OnDayTimer json.Marshal err:%v", err)
diff --git a/worldsrv/tournament.go b/worldsrv/tournament.go
index 773633d..425a989 100644
--- a/worldsrv/tournament.go
+++ b/worldsrv/tournament.go
@@ -1548,8 +1548,10 @@ func (this *Tournament) MakeMatchLog(platform string, tmId int32, sortId int64)
 		})
 		if rankId >= 1 && rankId <= 10 {
 			TaskSubjectSingleton.Touch(common.TaskTypeMatchRank10, &TaskData{
-				SnId: v.p.SnId,
-				Num:  1,
+				GameID:     int(v.tm.dbGameFree.GetGameId()),
+				GameFreeID: v.tm.dbGameFree.GetId(),
+				SnId:       v.p.SnId,
+				Num:        1,
 			})
 		}
 	}