竞技场

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

@@ -9,7 +9,7 @@ namespace GFGGame
     public class ArenaDataManager : SingletonBase<ArenaDataManager>
     {
         public List<int> ThemeList = new List<int>() { 1, 2, 3 };//本周主题列表
-        public string Tag = "未央";//本周标签
+        public string Tag = "异域";//本周标签
         public int SeasonId = 1;// 赛季id
         public int Grade = 1;//本赛季段位
         public int Rank = 10000;//本赛季段位内排名
@@ -249,8 +249,8 @@ namespace GFGGame
             {
                 ItemCfg cfgA = ItemCfgArray.Instance.GetCfg(a);
                 ItemCfg cfgB = ItemCfgArray.Instance.GetCfg(b);
-                if (ItemDataManager.CheckItemTagsRight(a, tags) && !ItemDataManager.CheckItemTagsRight(b, tags)) return -1;
-                if (ItemDataManager.CheckItemTagsRight(b, tags) && !ItemDataManager.CheckItemTagsRight(a, tags)) return 1;
+                if (ItemDataManager.CheckItemTagsRight(a, tags)) return -1;
+                if (ItemDataManager.CheckItemTagsRight(b, tags)) return 1;
                 int scoreA = ItemDataManager.GetItemAdditionScore(a, scoreType, tags);
                 int scoreB = ItemDataManager.GetItemAdditionScore(b, scoreType, tags);
                 return scoreB - scoreA;

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

@@ -77,24 +77,7 @@ namespace GFGGame
                 return GetFightTargetData();
             }
         }
-        //获取副本机器人战斗数据
-        public static FightData GetFightTargetData()
-        {
 
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-            _targetData.name = fightCfg.targetName;
-            _targetData.scoreType = InstanceZonesDataManager.currentScoreType; //本次战斗的主题
-            _targetData.baseScore = fightCfg.targetBaseScore;
-            _targetData.cardId = fightCfg.targetCardId;
-            _targetData.cardScore = fightCfg.targetCardScore;
-            _targetData.tags = fightCfg.needTagsArr;
-            _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
-            _targetData.itemScoreList = new List<int>(fightCfg.targetPartsScoreArr);
-            _targetData.type = ArenaFightTargetType.ROBOT;
-            _targetData.res = fightCfg.targetRes;
-            return _targetData;
-        }
         //获取玩家战斗数据
         private static FightData GetMyFightRoleData()
         {
@@ -103,7 +86,7 @@ namespace GFGGame
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             _roleData.cardId = InstanceZonesDataManager.currentCardId; ;//卡牌id
-            _roleData.cardScore = _roleData.cardId == 0 ? 0 : CardDataManager.GetCardDataById(_roleData.cardId).scores[_roleData.scoreType];//卡牌对应主题的属性分数
+            _roleData.cardScore = _roleData.cardId <= 0 ? 0 : CardDataManager.GetCardDataById(_roleData.cardId).scores[_roleData.scoreType];//卡牌对应主题的属性分数
 
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
@@ -127,6 +110,25 @@ namespace GFGGame
             return _roleData;
         }
 
+        //获取副本机器人战斗数据
+        public static FightData GetFightTargetData()
+        {
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            _targetData.name = fightCfg.targetName;
+            _targetData.scoreType = InstanceZonesDataManager.currentScoreType; //本次战斗的主题
+            _targetData.baseScore = fightCfg.targetBaseScore;
+            _targetData.cardId = fightCfg.targetCardId;
+            _targetData.cardScore = fightCfg.targetCardScore;
+            _targetData.tags = fightCfg.needTagsArr;
+            _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
+            _targetData.itemScoreList = new List<int>(fightCfg.targetPartsScoreArr);
+            _targetData.type = ArenaFightTargetType.ROBOT;
+            _targetData.res = fightCfg.targetRes;
+            return _targetData;
+        }
+
         //副本通关状态,key为CalculateHelper.GenerateInstanceZonesLevelStateKey，值为通到关卡编号
         private static Dictionary<int, int> _passLevelDic = new Dictionary<int, int>();
 

GameClient/Assets/Game/HotUpdate/Data/VO/ArenaData.cs

@@ -9,8 +9,6 @@ namespace GFGGame
         public int Type; //类型，由FightTargetType定义
         public OtherRoleInfoData RoleInfo = new OtherRoleInfoData(); //玩家数据
         public List<FightData> FightDatas = new List<FightData>();//搭配列表，与RobotDressupList只能存在一个，取决于Type
-        // public List<FightRoleData> RoleDressupList = new List<FightRoleData>();//搭配列表，与RobotDressupList只能存在一个，取决于Type
-        // public List<FightRobotData> RobotDressupList = new List<FightRobotData>();//机器人搭配列表，与RoleDressupList只能存在一个，取决于Type
 
     }
 

GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs

@@ -2,39 +2,7 @@ using System.Collections.Generic;
 
 namespace GFGGame
 {
-    // public class FightRoleData
-    // {
 
-    //     // public int fightScene;//玩家自己才会填充数据， 战斗场景，由ConstInstanceZonesType定义
-    //     public string name;//玩家名字
-    //     public int headId;//头像id
-    //     public int scoreType;//本次战斗的主题
-    //     public int baseScore;//角色等级分数
-    //     public int cardId;//卡牌id
-    //     public int cardScore;//卡牌对应主题的属性分数
-    //     public string[] tags = { };////本次战斗要求的标签
-    //     public List<int> skillLvs = new List<int>();
-    //     public Dictionary<int, List<int>> pardListDic = new Dictionary<int, List<int>>();//战斗部位，部件列表,战斗开始时更新
-    //     public Dictionary<int, List<int>> pardScoreListDic = new Dictionary<int, List<int>>();//战斗部位，部件分数列表,战斗开始时更新
-    //     public List<int> itemScoreList = new List<int>();//对应服装当前主题的实际分数
-    //     public List<int> itemList = new List<int>();
-
-    // }
-    // public class FightRobotData
-    // {
-    //     public string name;
-    //     // public int lv;//玩家等级
-    //     public string res;//资源名
-    //     public int scoreType;//本次战斗的主题
-    //     public int baseScore;
-    //     public int cardId;
-    //     public int cardScore;
-    //     public string[] tags = { };////本次战斗要求的标签
-    //     public int tagAddition = 0;//标签加成万分比
-    //     public List<int> skillLvs = new List<int>();
-    //     public List<int> itemScoreList = new List<int>();
-    //     public int showSuitId;//机器人服装，仅展示用
-    // }
     public class FightData
     {
         public string name;//玩家名字

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -297,7 +297,7 @@ namespace GFGGame
             if (needSetMask)
             {
                 spr.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
-                if (parentObj.transform.parent.name == "targetRole")
+                if (parentObj.transform.parent != null && parentObj.transform.parent.name == "targetRole")
                 {
                     spr.maskInteraction = SpriteMaskInteraction.VisibleOutsideMask;
                 }

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

@@ -118,7 +118,7 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, null } }, true);
+            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas } }, true);
         }
         private void OnBtnRecommendClick()
         {