竞技场

FGUIProject/assets/Arena/components/ComDanSimpleInfo.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="266,430">
-  <controller name="c1" exported="true" pages="0,,1," selected="0">
+  <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="自己"/>
     <remark page="1" value="对方"/>
   </controller>
   <displayList>
     <loader id="n12_jcej" name="n12" xy="14,144" size="237,286" url="ui://4lc5fhlbjcej1t" autoSize="true">
-      <gearIcon controller="c1" pages="1" values="ui://4lc5fhlbjcej1n" default="ui://4lc5fhlbjcej1t"/>
+      <gearIcon controller="c1" pages="0" values="ui://4lc5fhlbjcej1n" default="ui://4lc5fhlbjcej1t"/>
     </loader>
     <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1"/>
-    <loader id="n10_jcej" name="n10" xy="8,3" size="250,250" url="ui://4lc5fhlbjcej1r" autoSize="true">
+    <loader id="n10_jcej" name="n10" xy="8,3" size="250,250" url="ui://4lc5fhlbjcej1s" autoSize="true">
       <gearIcon controller="c1" pages="1" values="ui://4lc5fhlbjcej1s" default="ui://4lc5fhlbjcej1r"/>
     </loader>
     <text id="n6_psph" name="txtName" xy="67,254" pivot="0.5,0" size="132,44" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#fef7f6" align="center" autoClearText="true" text="名字名字"/>

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

@@ -226,9 +226,11 @@ namespace GFGGame
         {
             List<int> roundTimes = new List<int>();
 
+
             List<PassivitySkillCfg> targetSkillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int i = 0; i < targetSkillCfgs.Count; i++)
             {
+                if (skillLvs.Count <= i) continue;
                 int skillLv = skillLvs[i];
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, targetSkillCfgs[i].skillId);
                 if (skillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && UnityEngine.Random.Range(0, 10000) < skillLvlCfg.probability)
@@ -257,6 +259,7 @@ namespace GFGGame
             List<int> nullifySkillIndex = new List<int>();
             for (int i = 0; i < targetSkillCfgs.Count; i++)
             {
+                if (targetSkillLvs.Count <= i) continue;
                 PassivitySkillLvlCfg targetSkillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(targetSkillLvs[i], targetSkillCfgs[i].skillId);
                 if (CheckIsRightTime(targetSkillLvlCfg, currentTime, partId))
                 {
@@ -270,6 +273,7 @@ namespace GFGGame
 
             for (int i = 0; i < mySkillCfgs.Count; i++)
             {
+                if (skillLvs.Count <= i) continue;
                 PassivitySkillLvlCfg mySkillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[i], mySkillCfgs[i].skillId);
 
                 if (nullifySkillIndex.IndexOf(i + 1) >= 0) continue;//技能被对手失效

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

@@ -9,7 +9,7 @@ namespace GFGGame
         public int roleLv;
         public int headId;//头像
         public int headBorderId;//头像框
-        public string headRes;//头像资源，机器人用
+        public string headRes = "";//头像资源，机器人用
         public long offlineTimeSec;//离线时间戳，单位秒，0表示在线
 
 

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

@@ -33,7 +33,6 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            _copyDressUpObj.Dispose();
             if (_ui != null)
             {
                 _ui.Dispose();

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

@@ -111,6 +111,10 @@ namespace GFGGame
             _ui.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
             _ui.m_imgRole.texture = _nTexture;
 
+            if (!FightDataManager.Instance.autoPlay)
+            {
+                FightDataManager.Instance.fightSpeed = 1;
+            }
             _ui.m_btnSpeedUp.visible = FightDataManager.Instance.autoPlay;
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
 

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

@@ -127,6 +127,10 @@ namespace GFGGame
                 _ui.m_btnBack.visible = false;
                 _isAutoPlay = true;
             }
+            if (!_isAutoPlay)
+            {
+                FightDataManager.Instance.fightSpeed = 1;
+            }
             _ui.m_btnSpeedUp.visible = _isAutoPlay;
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
             _ui.m_comAllPerfect.target.visible = false;