common/constant.go

@@ -168,10 +168,10 @@ const (
 
 // 房间模式
 const (
-	SceneMode_Public  = 0 //公共房间
-	SceneMode_Private = 2 //私人房间
-	SceneMode_Match   = 3 //赛事房间
-	SceneMode_Thr     = 4 //三方房间
+	SceneMode_Public  = iota //公共房间
+	SceneMode_Private        //私人房间
+	SceneMode_Match          //赛事房间
+	SceneMode_Thr            //三方房间
 )
 
 const (

model/player.go

@@ -1055,13 +1055,6 @@ func GetPlayerDataBySnId(plt string, snid int32, correctData, createIfNotExist b
 		logger.Logger.Tracef("Get %v %v player data error:%v", plt, snid, err)
 		return nil, false
 	}
-
-	// 设置本地时区
-	ret.Pd.UpgradeTime = ret.Pd.UpgradeTime.Local()
-	ret.Pd.CreateTime = ret.Pd.CreateTime.Local()
-	ret.Pd.LastLoginTime = ret.Pd.LastLoginTime.Local()
-	ret.Pd.LastLogoutTime = ret.Pd.LastLogoutTime.Local()
-
 	return ret.Pd, ret.IsNew
 }
 

protocol/gamehall/game.pb.go

@@ -4726,7 +4726,7 @@ type CSQueryRoomInfo struct {
 	GameIds   []int32 `protobuf:"varint,1,rep,packed,name=GameIds,proto3" json:"GameIds,omitempty"`
 	GameSite  int32   `protobuf:"varint,2,opt,name=GameSite,proto3" json:"GameSite,omitempty"`   //1.初级 2.中级 3.高级
 	Id        []int32 `protobuf:"varint,3,rep,packed,name=Id,proto3" json:"Id,omitempty"`        //gamefreeid
-	SceneMode int32   `protobuf:"varint,4,opt,name=SceneMode,proto3" json:"SceneMode,omitempty"` // 0公共房 2私人房
+	SceneMode int32   `protobuf:"varint,4,opt,name=SceneMode,proto3" json:"SceneMode,omitempty"` // 0公共房 1私人房
 }
 
 func (x *CSQueryRoomInfo) Reset() {

protocol/gamehall/game.proto

@@ -615,7 +615,7 @@ message CSQueryRoomInfo{
   repeated int32 GameIds = 1;
   int32 GameSite = 2; //1.初级 2.中级 3.高级
   repeated int32 Id = 3; //gamefreeid
-  int32 SceneMode = 4; // 0公共房 2私人房
+  int32 SceneMode = 4; // 0公共房 1私人房
 }
 
 //个人创建的房间信息

public

@@ -1 +1 @@
-Subproject commit 549a622ad237392dddedae5d13456a06a8328fdd
+Subproject commit 7f2452e10c176dc35fc5ed1ffdb0b4145aec8160