zhaoyang преди 2 години
родител
ревизия
49472de6f5

BIN
FGUIProject/assets/Main/images/zjm_e_6.png


+ 4 - 6
GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -361,10 +361,6 @@ namespace GFGGame
             arenaTarget.FightScores = arenaTargetProto.FightPower;
             if (arenaTarget.Type == FightTargetType.PLAYER)
             {
-                // arenaTarget.RoleInfo.roleId = arenaTargetProto.RoleInfo.RoleId;
-                // arenaTarget.RoleInfo.roleName = arenaTargetProto.RoleInfo.RoleName;
-                // arenaTarget.RoleInfo.roleLv = arenaTargetProto.RoleInfo.RoleLvl;
-                // arenaTarget.RoleInfo.headId = arenaTargetProto.RoleInfo.HeadItemId;
                 arenaTarget.RoleInfo = RoleDataManager.GetOtherRoleInfoData(arenaTargetProto.RoleInfo);
             }
             else
@@ -424,14 +420,16 @@ namespace GFGGame
                 fightData.tagAddition = robotCfg.tagAddition;
             }
             fightData.itemScoreList.Clear();
+            double randoms = robotProto.Randoms.Count >= robotCfg.partsScoreArr.Length ? (double)robotProto.Randoms[index] / 10000d : 1;
+
             for (int i = 0; i < robotCfg.partsScoreArr.Length; i++)
             {
-                double score = (double)robotCfg.partsScoreArr[i] * (double)robotProto.Randoms[index] / 10000d;
+                double score = (double)robotCfg.partsScoreArr[i] * randoms;
                 fightData.itemScoreList.Add((int)Math.Ceiling(score));
             }
             fightData.type = FightTargetType.ROBOT;
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
-            double cardScore = (double)robotCfg.cardScore * (double)robotProto.Randoms[index] / 10000d;
+            double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
             fightData.skillLvs.Add(robotCfg.skillLvs);
             fightData.showSuitId = robotProto.SuitList.Count <= index ? 0 : robotProto.SuitList[index];//上赛季没有穿戴数据

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -154,7 +154,7 @@ namespace GFGGame
         }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM }, new object[] { typeof(ArenaView).FullName, this.viewData });
         }
         private void OnBtnRewardClick()
         {

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png