竞技场

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -244,7 +244,7 @@ namespace GFGGame
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
-            // ArenaSproxy.GetArenaInfos().Coroutine();
+            ArenaSproxy.GetArenaInfos().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -320,7 +320,7 @@ namespace GFGGame
             long skillScore = 0;
             for (int i = 0; i < ThemeList.Count; i++)
             {
-                if (fightDatas[i].type == ArenaFightTargetType.PLAYER)
+                if (fightDatas[i].type == FightTargetType.PLAYER)
                 {
                     itemSum += GetItemScoreSum(fightDatas[i].itemScoreList);
                     clickScore += GetPerfectClickScore(fightDatas[i]) / (long)ConstScoreSystem.PART_SCORE;
@@ -382,33 +382,33 @@ namespace GFGGame
             Targets[0].FightDatas[0].cardId = 2000009;
             Targets[0].FightDatas[0].cardScore = 100;
             Targets[0].FightDatas[0].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[0].FightDatas[0].type = ArenaFightTargetType.PLAYER;
+            Targets[0].FightDatas[0].type = FightTargetType.PLAYER;
             Targets[0].FightDatas[0].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets[0].FightDatas[1].cardId = 2000009;
             Targets[0].FightDatas[1].cardScore = 100;
             Targets[0].FightDatas[1].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[0].FightDatas[1].type = ArenaFightTargetType.PLAYER;
+            Targets[0].FightDatas[1].type = FightTargetType.PLAYER;
             Targets[0].FightDatas[1].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets[0].FightDatas[2].cardId = 2000009;
             Targets[0].FightDatas[2].cardScore = 100;
             Targets[0].FightDatas[2].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[0].FightDatas[2].type = ArenaFightTargetType.PLAYER;
+            Targets[0].FightDatas[2].type = FightTargetType.PLAYER;
             Targets[0].FightDatas[2].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets.Add(ArenaSproxy.GetArenaTargetData(GetArenaTargetProto()));
             Targets[1].FightDatas[0].cardId = 2000009;
             Targets[1].FightDatas[0].cardScore = 100;
             Targets[1].FightDatas[0].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[1].FightDatas[0].type = ArenaFightTargetType.PLAYER;
+            Targets[1].FightDatas[0].type = FightTargetType.PLAYER;
             Targets[1].FightDatas[0].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets[1].FightDatas[1].cardId = 2000009;
             Targets[1].FightDatas[1].cardScore = 100;
             Targets[1].FightDatas[1].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[1].FightDatas[1].type = ArenaFightTargetType.PLAYER;
+            Targets[1].FightDatas[1].type = FightTargetType.PLAYER;
             Targets[1].FightDatas[1].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets[1].FightDatas[2].cardId = 2000009;
             Targets[1].FightDatas[2].cardScore = 100;
             Targets[1].FightDatas[2].skillLvs = new List<int>() { 1, 1, 1 };
-            Targets[1].FightDatas[2].type = ArenaFightTargetType.PLAYER;
+            Targets[1].FightDatas[2].type = FightTargetType.PLAYER;
             Targets[1].FightDatas[2].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
             Targets.Add(ArenaSproxy.GetArenaTargetData(GetArenaTargetProto1()));
 
@@ -418,11 +418,11 @@ namespace GFGGame
 
             DressupList.Add(new FightData());
             DressupList[0].tags = new string[] { Tag };
-            DressupList[0].type = ArenaFightTargetType.PLAYER;
+            DressupList[0].type = FightTargetType.PLAYER;
             DressupList.Add(new FightData());
-            DressupList[1].type = ArenaFightTargetType.PLAYER;
+            DressupList[1].type = FightTargetType.PLAYER;
             DressupList.Add(new FightData());
-            DressupList[2].type = ArenaFightTargetType.PLAYER;
+            DressupList[2].type = FightTargetType.PLAYER;
             // DressupList[0].skillLvs = new List<int>() { 1, 1, 1 };
             // DressupList[1].skillLvs = new List<int>() { 1, 1, 1 };
             // DressupList[2].skillLvs = new List<int>() { 1, 1, 1 };
@@ -433,7 +433,7 @@ namespace GFGGame
             ArenaTargetProto proto = new ArenaTargetProto();
             proto.Grade = 1;
             proto.RankInGrade = 10000;
-            proto.Type = ArenaFightTargetType.PLAYER;
+            proto.Type = FightTargetType.PLAYER;
             proto.RoleInfo = new OtherRoleInfoProto();
             proto.RoleInfo.RoleName = "玩家";
             proto.RoleInfo.HeadItemId = 5000002;
@@ -457,7 +457,7 @@ namespace GFGGame
             ArenaTargetProto proto = new ArenaTargetProto();
             proto.Grade = 1;
             proto.RankInGrade = 10000;
-            proto.Type = ArenaFightTargetType.ROBOT;
+            proto.Type = FightTargetType.ROBOT;
             proto.RoleInfo = new OtherRoleInfoProto();
             proto.RoleInfo.RoleName = "机器人";
             ArenaRobotProto robotProto = new ArenaRobotProto();

GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             int targetCardId = targetData.FightDatas[index].cardId;
             int targetHeadId = 0;
             string res = "";
-            if (targetData.Type == ArenaFightTargetType.PLAYER)
+            if (targetData.Type == FightTargetType.PLAYER)
             {
                 targetHeadId = targetData.FightDatas[index].headId;
             }

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -293,7 +293,7 @@ namespace GFGGame
             targetSkillLvs = targetRoleData.skillLvs;
             targetRoundTime = ScoreSystemData.Instance.GetRoundTime(targetRoleData.cardId, targetRoleData.skillLvs);
 
-            if (targetRoleData.type == ArenaFightTargetType.PLAYER)
+            if (targetRoleData.type == FightTargetType.PLAYER)
             {
                 targetMainScore = ScoreSystemData.Instance.GetMainScore(targetRoleData);
             }
@@ -322,7 +322,7 @@ namespace GFGGame
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
                 score += ScoreSystemData.Instance.GetPartScore(myRoleData, partId, ClickType.PREFACT_CLICK, 0);
-                if (targetRoleData.type == ArenaFightTargetType.PLAYER)
+                if (targetRoleData.type == FightTargetType.PLAYER)
                 {
                     targetScore += ScoreSystemData.Instance.GetPartScore(targetRoleData, partId, ClickType.PREFACT_CLICK, 0);
                 }

GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -100,7 +100,7 @@ namespace GFGGame
             {
                 _roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(_roleData.cardId);
             }
-            _roleData.type = ArenaFightTargetType.PLAYER;
+            _roleData.type = FightTargetType.PLAYER;
 
             _roleData.headId = RoleDataManager.headId;
             _roleData.itemList = MyDressUpHelper.dressUpObj.itemList;
@@ -124,7 +124,7 @@ namespace GFGGame
             _targetData.tags = fightCfg.needTagsArr;
             _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
             _targetData.itemScoreList = new List<int>(fightCfg.targetPartsScoreArr);
-            _targetData.type = ArenaFightTargetType.ROBOT;
+            _targetData.type = FightTargetType.ROBOT;
             _targetData.res = fightCfg.targetRes;
             return _targetData;
         }

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -257,7 +257,7 @@ namespace GFGGame
             arenaTarget.Grade = arenaTargetProto.Grade;
             arenaTarget.RankInGrade = arenaTargetProto.RankInGrade;
             arenaTarget.Type = arenaTargetProto.Type;
-            if (arenaTarget.Type == ArenaFightTargetType.PLAYER)
+            if (arenaTarget.Type == FightTargetType.PLAYER)
             {
                 arenaTarget.RoleInfo.roleId = arenaTargetProto.RoleInfo.RoleId;
                 arenaTarget.RoleInfo.roleName = arenaTargetProto.RoleInfo.RoleName;
@@ -276,12 +276,12 @@ namespace GFGGame
             arenaTarget.FightDatas.Clear();
             for (int j = 0; j < ArenaDataManager.Instance.ThemeList.Count; j++)
             {
-                if (arenaTarget.Type == ArenaFightTargetType.PLAYER)
+                if (arenaTarget.Type == FightTargetType.PLAYER)
                 {
                     FightData roleData = GetFightRoleData(arenaTargetProto.PlayerDressupList[j], arenaTarget.RoleInfo, j);
                     arenaTarget.FightDatas.Add(roleData);
                 }
-                else if (arenaTarget.Type == ArenaFightTargetType.ROBOT)
+                else if (arenaTarget.Type == FightTargetType.ROBOT)
                 {
                     FightData robotData = GetFightRobotData(arenaTargetProto.RobotDressupInfo, j);
                     arenaTarget.FightDatas.Add(robotData);
@@ -299,7 +299,7 @@ namespace GFGGame
             fightData.cardId = dressupProto.CardId;
             if (index == 0) fightData.tags = new string[1] { ArenaDataManager.Instance.Tag };
 
-            fightData.type = ArenaFightTargetType.PLAYER;
+            fightData.type = FightTargetType.PLAYER;
             fightData.headId = roleInfo.headId;
             fightData.itemList = dressupProto.EquipIds;
 
@@ -321,7 +321,7 @@ namespace GFGGame
             }
             fightData.itemScoreList = new List<int>(robotCfg.partsScoreArr);
 
-            fightData.type = ArenaFightTargetType.ROBOT;
+            fightData.type = FightTargetType.ROBOT;
             fightData.res = robotCfg.targetRes;
             double cardScore = (double)robotCfg.cardScore * (double)robotProto.Random / 10000 * 100;
             fightData.cardScore = (int)Math.Ceiling(cardScore);

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaFightRecordView.cs

@@ -93,7 +93,7 @@ namespace GFGGame
 
             ArenaHistoryData historyData = (context.sender as GObject).data as ArenaHistoryData;
             ArenaTargetData targetData = historyData.targetData;
-            if (targetData.Type == ArenaFightTargetType.ROBOT)
+            if (targetData.Type == FightTargetType.ROBOT)
             {
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -181,7 +181,7 @@ namespace GFGGame
                 item.m_txtDanRank.text = string.Format("段位排行：{0}", arenaData.Grade);
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
-                if (arenaData.Type == ArenaFightTargetType.PLAYER)
+                if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
                 }
@@ -224,7 +224,7 @@ namespace GFGGame
                 item.m_txtDanRank.text = arenaData.Grade.ToString();
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
-                if (arenaData.Type == ArenaFightTargetType.PLAYER)
+                if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, 0);
                 }
@@ -246,7 +246,7 @@ namespace GFGGame
         private void OnBtnLookClick(EventContext context)
         {
             ArenaTargetData targetData = (context.sender as GObject).data as ArenaTargetData;
-            if (targetData == null || targetData.Type == ArenaFightTargetType.ROBOT)
+            if (targetData == null || targetData.Type == FightTargetType.ROBOT)
             {
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
             _ui.m_txtTargetRank.text = _targetData.RankInGrade.ToString();
             ArenaRankCfg rankCfg = ArenaRankCfgArray.Instance.GetCfg(_targetData.Grade);
             _ui.m_txtDantitle.text = rankCfg.gradeName;
-            if (_targetData.Type == ArenaFightTargetType.PLAYER)
+            if (_targetData.Type == FightTargetType.PLAYER)
             {
                 RoleInfoManager.Instance.UpdateHead(_ui.m_comTargetHead, _targetData.RoleInfo.headId, 0);
             }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -68,7 +68,7 @@ namespace GFGGame
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
             _dataManager = ArenaDataManager.Instance;
-            _dataManager.SetTestInfo();
+            // _dataManager.SetTestInfo();
         }
         protected override void AddEventListener()
         {
@@ -88,7 +88,7 @@ namespace GFGGame
             //     ArenaTargetData targetData = _dataManager.Targets[i];
             //     if (targetData.Type == ArenaFightTargetType.PLAYER)
             //     {
-            //         await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.RoleDressupList);
+            //         await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
             //     }
             // }
 
@@ -111,7 +111,7 @@ namespace GFGGame
             UpdateNormal();
             UpdateValue();
             UpdateRole();
-            GetFightResult();
+            // GetFightResult();
         }
 
         protected override void OnHide()
@@ -221,7 +221,7 @@ namespace GFGGame
                 }
             }
 
-            // GetFightResult();
+            GetFightResult();
             if (_ui.m_btnQuickFight.selected)
             {
                 ViewManager.Show<ArenaResultQuickView>();
@@ -245,14 +245,9 @@ namespace GFGGame
                 long score = 0;
                 long targetScore = 0;
 
-                // if (_targetData.Type == ArenaFightTargetType.PLAYER)
-                // {
+
                 FightDataManager.Instance.GetQuickFightResult(i, ArenaDataManager.Instance.DressupList[i], _targetData.FightDatas[i], out score, out targetScore);
-                // }
-                // else
-                // {
-                //     FightDataManager.Instance.GetQuickFightResult(i, ArenaDataManager.Instance.DressupList[i], _targetData.Type, null, _targetData.RobotDressupList[i], out score, out targetScore);
-                // }
+
                 _dataManager.myScore.Add(score);
                 _dataManager.targetScore.Add(targetScore);
                 if (score > targetScore) winCount++;
@@ -324,7 +319,7 @@ namespace GFGGame
             {
                 GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
                 targetSceneObj.SetActive(true);
-                if (_targetData.Type == ArenaFightTargetType.PLAYER)
+                if (_targetData.Type == FightTargetType.PLAYER)
                 {
                     _targetDressUpObj.PutOnItemList(_targetData.FightDatas[0].itemList);
                 }
@@ -347,7 +342,7 @@ namespace GFGGame
 
             UI_ListTargetItem item = UI_ListTargetItem.Proxy(obj);
 
-            if (targetData.Type == ArenaFightTargetType.PLAYER)
+            if (targetData.Type == FightTargetType.PLAYER)
             {
                 RoleInfoManager.Instance.UpdateHead(item.m_comHead, targetData.RoleInfo.headId, 0);
             }
@@ -392,7 +387,7 @@ namespace GFGGame
         private void OnBtnLookClick(EventContext context)
         {
             ArenaTargetData targetData = (context.sender as GObject).data as ArenaTargetData;
-            if (targetData.Type == ArenaFightTargetType.ROBOT)
+            if (targetData.Type == FightTargetType.ROBOT)
             {
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -134,12 +134,12 @@ namespace GFGGame
             _ui.m_proScore.m_comBar.target.width = 0;
 
 
-            if (targetData.type == ArenaFightTargetType.PLAYER)
+            if (targetData.type == FightTargetType.PLAYER)
             {
                 RoleInfoManager.Instance.UpdateHead(_ui.m_targetHead, targetData.headId, 0);
                 _targetMainScore = ScoreSystemData.Instance.GetMainScore(targetData);
             }
-            else if (targetData.type == ArenaFightTargetType.ROBOT)
+            else if (targetData.type == FightTargetType.ROBOT)
             {
                 RoleInfoManager.Instance.UpdateNpcHead(_ui.m_targetHead, targetData.res);
                 _targetMainScore = ScoreSystemData.Instance.GetRobotMainScore(targetData);
@@ -402,7 +402,7 @@ namespace GFGGame
 
             int _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _skillScore);
             int _targetPartScore;
-            if (targetData.type == ArenaFightTargetType.PLAYER)
+            if (targetData.type == FightTargetType.PLAYER)
             {
                 _targetPartScore = ScoreSystemData.Instance.GetPartScore(targetData, _partId, ClickType.PREFACT_CLICK, _targetSkillScore);
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetView.cs

@@ -82,7 +82,7 @@ namespace GFGGame
                 targetFightData = ArenaDataManager.Instance.Targets[ArenaDataManager.Instance.SelectTargetIndex].FightDatas[0];
                 _ui.m_targetName.m_txtName.text = targetFightData.name;
 
-                if (targetFightData.type == ArenaFightTargetType.ROBOT)
+                if (targetFightData.type == FightTargetType.ROBOT)
                 {
                     _sceneTargetObj.SetActive(false);
                     _sceneNpcObj.SetActive(true);