11

RO_Server_Trunk-branch_0.1.39/rocommon/util/timer.go

@@ -30,7 +30,7 @@ var gameLoc *time.Location = nil
 
 func GetLoc() *time.Location {
 	if gameLoc == nil {
-		loc, err := time.LoadLocation("Asia/Shanghai")
+		loc, err := time.LoadLocation("UTC")
 		if err != nil {
 			gameLoc = time.Local
 		} else {

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/config_csv.go

@@ -4016,3 +4016,25 @@ func TowerWjRankCfgLoad(path string) {
 		TowerWjRankCfgLoader[row.Id] = row
 	}
 }
+
+type CdkCfg struct {
+	Id   int32  `csv:"Id"`   //禮包Id
+	Name string `csv:"Name"` //cdk名字
+	//Type      int32    `csv:"Type"`      //类型 1 全服 ,2 个人
+	Cdk    string   `csv:"Cdk"`    //兑换码
+	Reward []string `csv:"Reward"` //道具
+	//UserId    []string `csv:"UserId"`    //个人uid
+	StartTime string `csv:"StartTime"` //开始時间
+	EndTime   string `csv:"EndTime"`   //结束時间
+	Total     int32  `csv:"Total"`     //总数
+}
+
+func CdkCfgLoad(path string) {
+	cfg := []*CdkCfg{}
+	CdkCfgLoader = map[int32]*CdkCfg{}
+	loadCsvCfg(path+"CdkCfg.csv", &cfg)
+	for _, row := range cfg {
+		CdkCfgLoader[row.Id] = row
+	}
+	//util.InfoF("cdk:%v", CdkCfgLoader)
+}