解决冲突

This reverts commit 731b9857c1.

common/constant.go

@@ -328,8 +328,6 @@ const (
 	GainWayGuide2                            = 117 // 竞技馆引导奖励
 	GainWayCompound                          = 118 // 道具合成消耗
 	GainWayCompoundGain                      = 119 // 道具合成获得
-	GainWayPlatformIn                        = 120 // 平台上分
-	GainWayPlatformOut                       = 121 // 平台下分
 )
 
 // 后台选择 金币变化类型 的充值 类型id号起始

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -693,6 +693,7 @@ func (this *SceneBaseStateTienLen) OnPlayerOp(s *base.Scene, p *base.Player, opc
 			// 玩家继续
 			if !playerEx.IsMarkFlag(base.PlayerState_Ready) {
 				playerEx.MarkFlag(base.PlayerState_Ready)
+				playerEx.SyncFlag()
 			}
 			// 扣房费
 			// 房主扣费
@@ -1877,7 +1878,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 						}
 					}
 					losePlayerCoin := losePlayer.GetCoin()
-					if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && losePlayerCoin < gainScore {
+					if !sceneEx.IsMatchScene() && losePlayerCoin < gainScore {
 						gainScore = losePlayerCoin
 					}
 					losePlayerScore = gainScore
@@ -2021,7 +2022,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 								}
 							}
 							lastWinPlayerCoin := lastWinPlayer.GetCoin()
-							if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && lastWinPlayerCoin < astWinGainScore {
+							if !sceneEx.IsMatchScene() && lastWinPlayerCoin < astWinGainScore {
 								astWinGainScore = lastWinPlayerCoin
 							}
 							lastWinPlayerScore = astWinGainScore
@@ -2387,7 +2388,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 						}
 					}
 					losePlayerCoin := playerEx.GetCoin()
-					if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && losePlayerCoin < gainScore {
+					if !sceneEx.IsMatchScene() && losePlayerCoin < gainScore {
 						gainScore = losePlayerCoin
 					}
 					winScore += gainScore
@@ -2928,15 +2929,15 @@ func (this *SceneBilledStateTienLen) OnLeave(s *base.Scene) {
 				continue
 			}
 
-			if player_data.IsAuto() && !player_data.IsRob {
+			//if player_data.IsAuto() && !player_data.IsRob {
-				player_data.LeaveAutoState(s)
+			//	player_data.LeaveAutoState(s)
-
+			//
-				if !(s.IsMatchScene() || s.IsRankMatch()) {
+			//	if !(s.IsMatchScene() || s.IsRankMatch()) {
-					sceneEx.PlayerLeave(player_data.Player, common.PlayerLeaveReason_AutoState, true)
+			//		sceneEx.PlayerLeave(player_data.Player, common.PlayerLeaveReason_AutoState, true)
-					hasLeave = true
+			//		hasLeave = true
-				}
+			//	}
-				continue
+			//	continue
-			}
+			//}
 		}
 
 		if !hasLeave && !sceneEx.IsRobFightGame() && !sceneEx.IsMatchScene() {

protocol/login/login.proto

@@ -64,7 +64,7 @@ message CSLogin {
   int32 InviterId = 8;  //邀请人ID
   int32 ApkVer = 9;    //apk版本号
   int32 ResVer = 10;    //资源版本号
-  int32 LoginType = 11;  //登录类型  0:游客登录  1：帐号登录 2：手机号登录 6：谷歌,facebook 7: 平台token登录
+  int32 LoginType = 11;  //登录类型  0:游客登录  1：帐号登录 2：手机号登录 6：谷歌,facebook
   string PlatformTag = 12;//android包名或者ios标记
   string DeviceOs = 13;  //系统android，ios，windows
   string Promoter = 14;  //推广员

worldsrv/trascate_webapi.go

@@ -2910,8 +2910,7 @@ func init() {
 				return common.ResponseTag_ParamError, jsonDataRsp
 			}
 
-			pack.Data.Url = fmt.Sprintf("%s?login_token=%s", model.GameParamData.PlatformClientAddr, tokenStr)
+			pack.Data.Url = fmt.Sprintf("%s?access_token=%s", model.GameParamData.PlatformClientAddr, tokenStr)
-			logger.Logger.Tracef("/api/platform/createUser pack.Data.Url : %v", pack.Data.Url)
 
 			task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
 				acc, retCode := model.AccountIsExist(AccountInfo.Username, "", "", "1", AccountInfo.Timestamp,