|
@@ -2,7 +2,6 @@ using System;
|
|
|
using System.Collections.Generic;
|
|
|
using Comp;
|
|
|
using HttpApi;
|
|
|
-using JetBrains.Annotations;
|
|
|
using Ragdoll;
|
|
|
using UnityEngine;
|
|
|
|
|
@@ -67,8 +66,8 @@ namespace Game
|
|
|
battleState = new GameBattleState(this);
|
|
|
liftState = new GameLiftState(this);
|
|
|
endState = new GameEndState(this);
|
|
|
-
|
|
|
- this.liftTimes = 2;
|
|
|
+ // 举J次数限制
|
|
|
+ liftTimes = 2;
|
|
|
|
|
|
this.localPlayer = localPlayer;
|
|
|
this.antiPlayer = antiPlayer;
|
|
@@ -77,13 +76,9 @@ namespace Game
|
|
|
this.camera = camera;
|
|
|
this.resultPanel = resultPanel;
|
|
|
|
|
|
- localPlayer.cockId = 2;
|
|
|
-
|
|
|
cockDict = new Dictionary<int, CockActionComp>();
|
|
|
masterDict = new Dictionary<int, MasterActionComp>();
|
|
|
|
|
|
- // var battleDetailList = JsonConvert.DeserializeObject<BattleDetailListObj>(jsonLogs);
|
|
|
-
|
|
|
var battleDetailList = jsonLogs;
|
|
|
winPlayerId = battleDetailList.winPlayer;
|
|
|
diamond = battleDetailList.diamond;
|