竞技场

FGUIProject/assets/Arena/components/ListRecordItem.xml

@@ -3,13 +3,13 @@
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej24" fileName="images/bpjl_bpdi.png" xy="0,0"/>
     <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="145,54" size="76,56" fontSize="42" color="#b07c7c" align="right" autoClearText="true" text="999"/>
+    <text id="n2_psph" name="txtMyScore" xy="123,54" pivot="0.5,0" size="100,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
     <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="363,44"/>
     <text id="n11_jcej" name="n11" xy="465,60" size="36,44" fontSize="32" color="#b07c7c" text="vs"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="527,44"/>
     <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="747,54" size="76,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
+    <text id="n8_psph" name="txtTargetScore" xy="765,54" pivot="0.5,0" size="76,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
     <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
     <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="628,33"/>
   </displayList>

FGUIProject/assets/Arena/components/ListResultItem.xml

@@ -6,7 +6,7 @@
     <text id="n2_psph" name="txtMyScore" xy="108,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
     <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="360,44"/>
-    <text id="n11_jcej" name="n11" xy="458,60" size="118,44" fontSize="32" color="#b07c7c" letterSpacing="-2" text="Round 1"/>
+    <text id="n11_jcej" name="txtRound" xy="458,60" size="118,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="595,44"/>
     <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
     <text id="n8_psph" name="txtTargetScore" xy="795,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>

FGUIProject/assets/Arena/package.xml

@@ -6,7 +6,7 @@
     <component id="psph3" name="ArenaFightRecordUI.xml" path="/" exported="true"/>
     <component id="psph4" name="ArenaDanRewardUI.xml" path="/" exported="true"/>
     <component id="psph5" name="ArenaRankUI.xml" path="/" exported="true"/>
-    <component id="psph6" name="ArenaResultUI.xml" path="/" exported="true"/>
+    <component id="psph6" name="ArenaRoundResultUI.xml" path="/" exported="true"/>
     <component id="psph7" name="ArenaRankUpUI.xml" path="/" exported="true"/>
     <component id="psph8" name="ArenaDanUpUI.xml" path="/" exported="true"/>
     <image id="psph9" name="主界面.png" path="/Designs/"/>

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -15,13 +15,14 @@
   <transition name="t0">
     <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="24" ease="Linear"/>
     <item time="0" type="Visible" target="n31_cn27" value="true"/>
-    <item time="0" type="Visible" target="n32_cn27" value="true"/>
+    <item time="0" type="Visible" target="n32_cn27" value="false"/>
     <item time="0" type="Visible" target="n33_cn27" value="true"/>
     <item time="0" type="Visible" target="n35_oixc" value="true"/>
     <item time="0" type="Visible" target="n39_qgxy" value="false"/>
     <item time="0" type="Visible" target="n40_psph" value="true"/>
     <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
     <item time="24" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
+    <item time="24" type="Visible" target="n32_cn27" value="true"/>
     <item time="24" type="Visible" target="n33_cn27" value="false"/>
     <item time="24" type="XY" target="n32_cn27" tween="true" startValue="512,-55" endValue="111,173" duration="48" ease="Quad.In" path="2,0,0,-104,-572,-1143,-217,1,2,-401,228,342.8462,674.1072,0,0,1"/>
     <item time="72" type="Visible" target="n31_cn27" value="false"/>

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using ET;
+using UnityEngine;
 using FairyGUI;
 
 namespace GFGGame
@@ -21,10 +22,12 @@ namespace GFGGame
         public List<ArenaHistoryData> HistoryDatas = new List<ArenaHistoryData>();//获取竞技场历史记录
 
         /*************************************************************************************************************************************/
+        public Dictionary<int, Texture2D> TextureDic = new Dictionary<int, Texture2D>();
         public List<int> roundTime = new List<int>();
         public List<int> targetRoundTime = new List<int>();
-        public Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>> vaildSkills = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
-        public Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>> targetVaildSkills = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
+        //Dictionary<回合下标, Dictionary<partId, Dictionary<战斗节点, List<PassivitySkillLvlCfg>>>>
+        public Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>> vaildSkills = new Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>>();
+        public Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>> targetVaildSkills = new Dictionary<int, Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>>();
         public int SelectThemeIndex = 0;//当前选中换装主题（ThemeList）的下标
         public int SelectTargetIndex = -1;//当前选中挑战对象的下标
         public int CurFightIndex = 0;//当前挑战场次下标
@@ -65,6 +68,7 @@ namespace GFGGame
             RankDatasDic.Clear();
             HistoryDatas.Clear();
             HistoryDatas = null;
+            TextureDic.Clear();
         }
 
         /// <summary>

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

@@ -8,11 +8,10 @@ namespace GFGGame
 {
     public class ArenaViewManager : SingletonBase<ArenaViewManager>
     {
-        public Dictionary<int, Texture2D> textureDic = new Dictionary<int, Texture2D>();
+
 
         public void Clear()
         {
-            textureDic.Clear();
         }
 
         /// <summary>
@@ -57,7 +56,10 @@ namespace GFGGame
             }
 
             UI_ListResultItem item = UI_ListResultItem.Proxy(obj);
-
+            if (item.target.GetChild("txtRound") != null)
+            {
+                item.m_txtRound.SetVar("value", (index + 1).ToString()).FlushVars();
+            }
             item.m_loaScore.url = ResPathUtil.GetScorePath(scoreType);
             item.m_txtMyScore.text = myScore.ToString();
             item.m_txtTargetScore.text = targetScore.ToString();

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

@@ -342,7 +342,7 @@ namespace GFGGame
         /// <param name="targetRobotData"></param>
         /// <param name="_score"></param>
         /// <param name="_targetScore"></param>
-        public void GetQuickFightResult(FightRoleData myRoleData, int targetType, FightRoleData targetRoleData, FightRobotData targetRobotData, out int _score, out int _targetScore)
+        public void GetQuickFightResult(int roundIndex, FightRoleData myRoleData, int targetType, FightRoleData targetRoleData, FightRobotData targetRobotData, out long _score, out long _targetScore)
         {
             double score = 0;
             double targetScore = 0;
@@ -375,21 +375,22 @@ namespace GFGGame
             {
                 ArenaDataManager.Instance.roundTime = roundTime;
                 ArenaDataManager.Instance.targetRoundTime = targetRoundTime;
-                ArenaDataManager.Instance.vaildSkills.Clear();
-                ArenaDataManager.Instance.targetVaildSkills.Clear();
+                if (!ArenaDataManager.Instance.vaildSkills.ContainsKey(roundIndex)) ArenaDataManager.Instance.vaildSkills[roundIndex] = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
+                if (!ArenaDataManager.Instance.targetVaildSkills.ContainsKey(roundIndex)) ArenaDataManager.Instance.targetVaildSkills[roundIndex] = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
             }
+
             int partId = 0;
             int currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
-            GetSkillScore(FightRoleType.MINE, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-            GetSkillScore(FightRoleType.TAEGET, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+            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);
 
             for (int i = 0; i < FightScoreCfgArray.Instance.dataArray.Length; i++)
             {
                 partId++;
 
                 currentTime = BeginTime.PART_FIGHT_BEGIN;
-                GetSkillScore(FightRoleType.MINE, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                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 (targetType == ArenaFightTargetType.PLAYER)
                 {
@@ -400,38 +401,41 @@ namespace GFGGame
                     targetScore += ScoreSystemData.Instance.GetRobotPartScore(targetRobotData, partId, ClickType.PREFACT_CLICK, 0);
                 }
                 currentTime = BeginTime.PART_PREFACT_CLICK;
-                GetSkillScore(FightRoleType.MINE, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                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);
                 currentTime = BeginTime.PART_FIGHT_END;
-                GetSkillScore(FightRoleType.MINE, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
-                GetSkillScore(FightRoleType.TAEGET, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
+                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.GetAllCircleAddScore(mainScore);
             targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(targetMainScore);
             _score = Mathf.CeilToInt((float)score);
             _targetScore = Mathf.CeilToInt((float)targetScore);
+
         }
 
-        private void GetSkillScore(int roleType, int currentTime, int partId, double mainScore, int cardId, List<int> skillLvs, List<int> roundTime, ref double score, double targetMainScore, int targetCardId, List<int> targetSkillLvs, List<int> targetRoundTime, ref double targetScore)
+        private void GetSkillScore(int roleType, int roundIndex, int currentTime, int partId, double mainScore, int cardId, List<int> skillLvs, List<int> roundTime, ref double score, double targetMainScore, int targetCardId, List<int> targetSkillLvs, List<int> targetRoundTime, ref double targetScore)
         {
             List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(currentTime, partId, cardId, skillLvs, targetCardId, targetSkillLvs, roundTime, targetRoundTime);
             ScoreSystemData.Instance.GetPartItemSkillScore(vaildSkills, mainScore, targetMainScore, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic);
+
             score += skillScore;
-            targetMainScore += targetSkillScore;
+            targetScore += targetSkillScore;
 
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 ArenaDataManager dataManager = ArenaDataManager.Instance;
                 if (roleType == FightRoleType.MINE)
                 {
-                    if (!dataManager.vaildSkills.ContainsKey(partId)) dataManager.vaildSkills[partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
-                    dataManager.vaildSkills[partId][currentTime] = vaildSkills;
+                    if (!dataManager.vaildSkills[roundIndex].ContainsKey(partId)) dataManager.vaildSkills[roundIndex][partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
+                    dataManager.vaildSkills[roundIndex][partId][currentTime] = vaildSkills;
 
                 }
                 else
                 {
-                    if (!dataManager.targetVaildSkills.ContainsKey(partId)) dataManager.targetVaildSkills[partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
-                    dataManager.targetVaildSkills[partId][currentTime] = vaildSkills;
+                    if (!dataManager.targetVaildSkills[roundIndex].ContainsKey(partId)) dataManager.targetVaildSkills[roundIndex][partId] = new Dictionary<int, List<PassivitySkillLvlCfg>>();
+                    dataManager.targetVaildSkills[roundIndex][partId][currentTime] = vaildSkills;
                 }
             }
 

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

@@ -235,7 +235,7 @@ namespace GFGGame
             if (showAni)
             {
                 var aniObj = AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
-                if(aniObj != null && spriteObj != null)
+                if (aniObj != null && spriteObj != null)
                 {
                     Timers.inst.Add(0.03f, 1, (obj) =>
                     {
@@ -270,7 +270,7 @@ namespace GFGGame
         private static GameObject AddSpriteObj(string res, string ext, string objName, GameObject parentObj, int sortingOrder, bool needSetMask)
         {
             string resPath = ResPathUtil.GetDressUpPath(res, ext);
-            if(!VEngine.Versions.Contains(resPath))
+            if (!VEngine.Versions.Contains(resPath))
             {
                 return null;
             }
@@ -297,6 +297,14 @@ namespace GFGGame
             if (needSetMask)
             {
                 spr.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
+                if (parentObj.transform.parent.name == "targetRole")
+                {
+                    spr.maskInteraction = SpriteMaskInteraction.VisibleOutsideMask;
+                }
+                else
+                {
+                    spr.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
+                }
             }
             else
             {
@@ -445,7 +453,7 @@ namespace GFGGame
 
         public static void SetParticleSortingOrder(GameObject gameObj, int sortingOrder, bool isAdd = false)
         {
-            
+
             ParticleSystem[] particles = gameObj.transform.GetComponentsInChildren<ParticleSystem>();
             for (int i = 0; i < particles.Length; i++)
             {

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

@@ -30,10 +30,18 @@ namespace GFGGame
         /// 检测是否穿戴完整（穿着连衣裙或同时穿着上装下装）
         /// </summary>
         /// <returns></returns>
-        public static bool CheckPutOnFinish()
+        public static bool CheckPutOnFinish(List<int> itemList = null)
         {
-            if (MyDressUpHelper.dressUpObj.suitId > 0) return true;
-            List<int> equipDatas = MyDressUpHelper.dressUpObj.itemList;
+            List<int> equipDatas;
+            if (itemList == null)
+            {
+                if (MyDressUpHelper.dressUpObj.suitId > 0) return true;
+                equipDatas = MyDressUpHelper.dressUpObj.itemList;
+            }
+            else
+            {
+                equipDatas = itemList;
+            }
             bool isLianYiQun = false;
             bool isShangYi = false;
             bool isXiaZhuang = false;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRoundResultUI.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Arena
 {
-    public partial class UI_ArenaResultUI
+    public partial class UI_ArenaRoundResultUI
     {
         public GComponent target;
         public GList m_list;
         public UI_ComAllScoreResult m_ComResult;
         public const string URL = "ui://4lc5fhlbpsph6";
         public const string PACKAGE_NAME = "Arena";
-        public const string RES_NAME = "ArenaResultUI";
-        private static UI_ArenaResultUI _proxy;
+        public const string RES_NAME = "ArenaRoundResultUI";
+        private static UI_ArenaRoundResultUI _proxy;
 
-        public static UI_ArenaResultUI Create(GObject gObject = null)
+        public static UI_ArenaRoundResultUI Create(GObject gObject = null)
         {
-            var ui = new UI_ArenaResultUI();
+            var ui = new UI_ArenaRoundResultUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Arena
             return ui;
         }
 
-        public static UI_ArenaResultUI Proxy(GObject gObject = null)
+        public static UI_ArenaRoundResultUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ArenaResultUI();
+                _proxy = new UI_ArenaRoundResultUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRoundResultUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79bf68c8fab1fc243aa72fc17e499f70
+guid: f47c0c333a3f42c4f95f606826226745
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListResultItem.cs

@@ -11,6 +11,7 @@ namespace UI.Arena
         public GTextField m_txtMyScore;
         public GComponent m_comMyHead;
         public UI_ComCardRecord m_loaMyCard;
+        public GTextField m_txtRound;
         public UI_ComCardRecord m_loaTargetCard;
         public GComponent m_comTargetHead;
         public GTextField m_txtTargetScore;
@@ -65,6 +66,7 @@ namespace UI.Arena
             m_txtMyScore = (GTextField)comp.GetChild("txtMyScore");
             m_comMyHead = (GComponent)comp.GetChild("comMyHead");
             m_loaMyCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaMyCard"));
+            m_txtRound = (GTextField)comp.GetChild("txtRound");
             m_loaTargetCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaTargetCard"));
             m_comTargetHead = (GComponent)comp.GetChild("comTargetHead");
             m_txtTargetScore = (GTextField)comp.GetChild("txtTargetScore");
@@ -76,6 +78,7 @@ namespace UI.Arena
             m_comMyHead = null;
             m_loaMyCard.Dispose();
             m_loaMyCard = null;
+            m_txtRound = null;
             m_loaTargetCard.Dispose();
             m_loaTargetCard = null;
             m_comTargetHead = null;

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

@@ -120,29 +120,29 @@ namespace GFGGame
                 }
             }
         }
-        //检测顽疾是否能战斗
-        public static async ETTask<bool> ReqCheckArenaFight()
-        {
-            S2C_ArenaFight response = null;
-            response = (S2C_ArenaFight)await MessageHelper.SendToServer(new C2S_ArenaFight() { });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    return true;
-                }
-                else
-                {
-                    ArenaDataManager.Instance.Targets.Clear();
-                    for (int i = 0; i < response.targets.Count; i++)
-                    {
-                        ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
-                    }
-                    PromptController.Instance.ShowFloatTextPrompt("该玩家排名已经发生变化，请重新选择");
-                }
-            }
-            return false;
-        }
+        // //检测顽疾是否能战斗
+        // public static async ETTask<bool> ReqCheckArenaFight()
+        // {
+        //     S2C_ArenaFight response = null;
+        //     response = (S2C_ArenaFight)await MessageHelper.SendToServer(new C2S_ArenaFight() { });
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             return true;
+        //         }
+        //         else
+        //         {
+        //             ArenaDataManager.Instance.Targets.Clear();
+        //             for (int i = 0; i < response.targets.Count; i++)
+        //             {
+        //                 ArenaDataManager.Instance.Targets.Add(GetArenaTargetData(response.targets[i]));
+        //             }
+        //             PromptController.Instance.ShowFloatTextPrompt("该玩家排名已经发生变化，请重新选择");
+        //         }
+        //     }
+        //     return false;
+        // }
 
         //挑战
         public static async ETTask<bool> ReqArenaFight(bool isWin, ArenaTargetData targetData, List<long> selfFightPower, List<long> targetFightPower, List<long> myScore, List<long> targetScore)

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

@@ -147,7 +147,7 @@ namespace GFGGame
 
             GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
             Camera camera = gameObject.GetComponent<Camera>();
-            ArenaViewManager.Instance.textureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
+            ArenaDataManager.Instance.TextureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
 
             yield return new WaitForEndOfFrame();
         }

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

@@ -57,7 +57,7 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateNpcHead(_ui.m_comTargetHead, _targetData.RoleInfo.headRes);
             }
             _ui.m_list.numItems = ArenaDataManager.Instance.myScore.Count;
-            ArenaViewManager.Instance.UpdateAllScore(_ui.m_comResult.target, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore);
+            ArenaViewManager.Instance.UpdateAllScoreResult(_ui.m_comResult.target, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore);
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultView.cs → GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRoundResultView.cs

@@ -6,9 +6,9 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ArenaResultView : BaseWindow
+    public class ArenaRoundResultView : BaseWindow
     {
-        private UI_ArenaResultUI _ui;
+        private UI_ArenaRoundResultUI _ui;
         private ArenaDataManager _dataManager;
         private int winCount = 0;
         private bool isFinallyFight = false;//是否最后一场战斗
@@ -26,7 +26,7 @@ namespace GFGGame
         {
             base.OnInit();
             packageName = UI_ArenaUI.PACKAGE_NAME;
-            _ui = UI_ArenaResultUI.Create();
+            _ui = UI_ArenaRoundResultUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
@@ -46,7 +46,7 @@ namespace GFGGame
             winCount = 0;
             _dataManager = ArenaDataManager.Instance;
 
-            _ui.m_list.numItems = _dataManager.CurFightIndex + 1;
+            _ui.m_list.numItems = _dataManager.CurFightIndex;
 
             isFinallyFight = _ui.m_list.numItems == 3;
             _ui.m_ComResult.target.visible = isFinallyFight;
@@ -87,15 +87,14 @@ namespace GFGGame
 
         private void StartNextRound(object param)
         {
-            _dataManager.CurFightIndex++;
             ArenaTargetData targetData = _dataManager.Targets[_dataManager.SelectTargetIndex];
             if (targetData.Type == ArenaFightTargetType.PLAYER)
             {
-                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, targetData.RoleDressupList[_dataManager.CurFightIndex], null }, null, true);
+                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, _dataManager.DressupList[_dataManager.CurFightIndex], targetData.RoleDressupList[_dataManager.CurFightIndex], null }, null, true);
             }
             else
             {
-                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, null, targetData.RobotDressupList[_dataManager.CurFightIndex] }, null, true);
+                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, _dataManager.DressupList[_dataManager.CurFightIndex], null, targetData.RobotDressupList[_dataManager.CurFightIndex] }, null, true);
             }
         }
         private void FinishFight()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultUI.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRoundResultView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: adbdfae16e3707b4a90f5484925a913d
+guid: 151f456e7b0d3d445846773e97117988
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -14,7 +14,7 @@ namespace GFGGame
         private GameObject _sceneObject;
         private DressUpObj _targetDressUpObj;
         private ValueBarController _valueBarController;
-
+        private ArenaDataManager _dataManager;
         private ArenaTargetData _targetData;
         private ArenaOpenCfg _arenaCfg;
 
@@ -67,7 +67,8 @@ namespace GFGGame
             _ui.m_listTarget.itemRenderer = RenderListTargetItem;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
-            ArenaDataManager.Instance.SetTestInfo();
+            _dataManager = ArenaDataManager.Instance;
+            _dataManager.SetTestInfo();
         }
         protected override void AddEventListener()
         {
@@ -78,29 +79,28 @@ namespace GFGGame
         protected override async void OnShown()
         {
             base.OnShown();
-            _targetData = this.viewData == null ? null : (this.viewData as object[])[0] as ArenaTargetData;
-
-            _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(ArenaDataManager.Instance.SeasonId);
-
+            _targetData = this.viewData == null ? null : this.viewData as ArenaTargetData;
+            _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(_dataManager.SeasonId);
             _valueBarController.OnShown();
-            for (int i = 0; i < ArenaDataManager.Instance.Targets.Count; i++)
-            {
-                ArenaTargetData targetData = ArenaDataManager.Instance.Targets[i];
-                if (targetData.Type == ArenaFightTargetType.PLAYER)
-                {
-                    await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.RoleDressupList);
-                }
-            }
+
+            // for (int i = 0; i < _dataManager.Targets.Count; i++)
+            // {
+            //     ArenaTargetData targetData = _dataManager.Targets[i];
+            //     if (targetData.Type == ArenaFightTargetType.PLAYER)
+            //     {
+            //         await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.RoleDressupList);
+            //     }
+            // }
 
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.Arena;
             if (_targetData == null)
             {
-                ArenaDataManager.Instance.SelectTargetIndex = -1;
-                ArenaDataManager.Instance.CurFightIndex = 0;
-                ArenaDataManager.Instance.myScore.Clear();
-                ArenaDataManager.Instance.targetScore.Clear();
-                ArenaDataManager.Instance.myFightScore.Clear();
-                ArenaDataManager.Instance.targetFightScore.Clear();
+                _dataManager.SelectTargetIndex = -1;
+                _dataManager.CurFightIndex = 0;
+                _dataManager.myScore.Clear();
+                _dataManager.targetScore.Clear();
+                _dataManager.myFightScore.Clear();
+                _dataManager.targetFightScore.Clear();
 
                 UpdateTargetList();
             }
@@ -111,6 +111,7 @@ namespace GFGGame
             UpdateNormal();
             UpdateValue();
             UpdateRole();
+            // GetFightResult();
         }
 
         protected override void OnHide()
@@ -179,12 +180,12 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, null }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList, null }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
         }
 
         private void OnBtnQuickFightClick()
         {
-            ArenaDataManager.Instance.QuickFight = _ui.m_btnQuickFight.selected;
+            _dataManager.QuickFight = _ui.m_btnQuickFight.selected;
         }
         private void OnBtnReSelectClick()
         {
@@ -196,58 +197,57 @@ namespace GFGGame
 
         private async void OnBtnFightClick()
         {
-            // bool result = await ArenaSproxy.ReqCheckArenaFight();
-            // if (!result)
-            // {
-            //     UpdateView();
-            //     return;
-            // }
+            for (int i = 0; i < _dataManager.DressupList.Count; i++)
+            {
+                if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
+                {
+                    AlertUI.Show("全部主题穿戴完整才能开始战斗哦！").SetRightButton(true, "好的");
+                    return;
+                }
+            }
 
-            List<long> selfFightPower = ArenaDataManager.Instance.GetFightScoreList(ArenaFightTargetType.PLAYER, ArenaDataManager.Instance.DressupList, null);
-            List<long> targetFightPower = ArenaDataManager.Instance.GetFightScoreList(_targetData.Type, _targetData.RoleDressupList, _targetData.RobotDressupList);
 
 
+            GetFightResult();
+            if (_ui.m_btnQuickFight.selected)
+            {
+                ViewManager.Show<ArenaResultQuickView>();
+            }
+            else
+            {
+                ViewManager.Show<StoryFightTargetView>(null, null, true);
+            }
+        }
+        private void GetFightResult()
+        {
+            _dataManager.myScore.Clear();
+            _dataManager.targetScore.Clear();
+            _dataManager.myFightScore.Clear();
+            _dataManager.targetFightScore.Clear();
+
             int winCount = 0;
 
-            List<long> myScores = new List<long>();
-            List<long> targetScores = new List<long>();
-            for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
+            for (int i = 0; i < _dataManager.ThemeList.Count; i++)
             {
-                int score = 0;
-                int targetScore = 0;
+                long score = 0;
+                long targetScore = 0;
+
                 if (_targetData.Type == ArenaFightTargetType.PLAYER)
                 {
-                    FightDataManager.Instance.GetQuickFightResult(FightDataManager.Instance.roleData, _targetData.Type, _targetData.RoleDressupList[i], null, out score, out targetScore);
+                    FightDataManager.Instance.GetQuickFightResult(i, ArenaDataManager.Instance.DressupList[i], _targetData.Type, _targetData.RoleDressupList[i], null, out score, out targetScore);
                 }
                 else
                 {
-                    FightDataManager.Instance.GetQuickFightResult(FightDataManager.Instance.roleData, _targetData.Type, null, _targetData.RobotDressupList[i], out score, out targetScore);
+                    FightDataManager.Instance.GetQuickFightResult(i, ArenaDataManager.Instance.DressupList[i], _targetData.Type, null, _targetData.RobotDressupList[i], out score, out targetScore);
                 }
-                myScores.Add(score);
-                targetScores.Add(targetScore);
+                _dataManager.myScore.Add(score);
+                _dataManager.targetScore.Add(targetScore);
                 if (score > targetScore) winCount++;
             }
-            ArenaDataManager.Instance.myFightScore = selfFightPower;
-            ArenaDataManager.Instance.targetFightScore = targetFightPower;
 
-            bool result = await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, selfFightPower, targetFightPower, myScores, targetScores);
-            if (result)
-            {
-                if (_ui.m_btnQuickFight.selected)
-                {
-                    ViewManager.Show<ArenaResultQuickView>();
-                }
-                else
-                {
-                    ViewManager.Show<StoryFightTargetView>();
-                }
-            }
-            else
-            {
-                UpdateView();
-            }
+            _dataManager.myFightScore = _dataManager.GetFightScoreList(ArenaFightTargetType.PLAYER, _dataManager.DressupList, null); ;
+            _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.Type, _targetData.RoleDressupList, _targetData.RobotDressupList); ;
         }
-
         private void UpdateView()
         {
             UpdateNormal();
@@ -257,20 +257,20 @@ namespace GFGGame
 
         private void UpdateNormal()
         {
-            ItemUtil.UpdateTag(_ui.m_comTag, ArenaDataManager.Instance.Tag);
-            _ui.m_loaScore0.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[0]);
-            _ui.m_loaScore1.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[1]);
-            _ui.m_loaScore2.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[2]);
+            ItemUtil.UpdateTag(_ui.m_comTag, _dataManager.Tag);
+            _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
+            _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
+            _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
             string openTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.openTime));
             string endTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.endTime));
             _ui.m_txtTime.text = string.Format("{0}/{1}", openTime, endTime);
             _ui.m_txtName.text = RoleDataManager.roleName;
-            _ui.m_txtRank.text = string.Format("段位排名：{0}", ArenaDataManager.Instance.Rank);
-            _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(ArenaDataManager.Instance.Grade).gradeName;
-            long fightScore = ArenaDataManager.Instance.GetAllFightScore(ArenaFightTargetType.PLAYER, ArenaDataManager.Instance.DressupList, null);
+            _ui.m_txtRank.text = string.Format("段位排名：{0}", _dataManager.Rank);
+            _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).gradeName;
+            long fightScore = _dataManager.GetAllFightScore(ArenaFightTargetType.PLAYER, _dataManager.DressupList, null);
             _ui.m_txtFightScore.text = string.Format("竞技场战力：{0}", fightScore);
-            _ui.m_btnQuickFight.selected = ArenaDataManager.Instance.QuickFight;
-            ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, ArenaDataManager.Instance.DressupList);
+            _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
+            ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, _dataManager.DressupList);
         }
 
 
@@ -306,7 +306,7 @@ namespace GFGGame
                 targetSceneObj.SetActive(false);
                 _targetDressUpObj.setSceneObj(targetSceneObj, false, false);
             }
-            MyDressUpHelper.dressUpObj.PutOnItemList(ArenaDataManager.Instance.DressupList[0].itemList);
+            MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
             if (_ui.m_c1.selectedIndex == 1)
             {
                 GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
@@ -325,11 +325,11 @@ namespace GFGGame
         private void UpdateTargetList()
         {
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_listTarget.numItems = ArenaDataManager.Instance.Targets.Count;
+            _ui.m_listTarget.numItems = _dataManager.Targets.Count;
         }
         private void RenderListTargetItem(int index, GObject obj)
         {
-            ArenaTargetData targetData = ArenaDataManager.Instance.Targets[index];
+            ArenaTargetData targetData = _dataManager.Targets[index];
             ArenaRankCfg rankCfg = ArenaRankCfgArray.Instance.GetCfg(targetData.Grade);
 
             UI_ListTargetItem item = UI_ListTargetItem.Proxy(obj);
@@ -347,7 +347,7 @@ namespace GFGGame
             item.m_txtDanTitle.text = rankCfg.gradeName;
             item.m_comLv.GetChild("txtLvl").asTextField.text = targetData.RoleInfo.roleLv.ToString();
 
-            long fightScore = ArenaDataManager.Instance.GetAllFightScore(targetData.Type, targetData.RoleDressupList, targetData.RobotDressupList);
+            long fightScore = _dataManager.GetAllFightScore(targetData.Type, targetData.RoleDressupList, targetData.RobotDressupList);
             item.m_txtFightScore.text = string.Format("竞技场战力:{0}", fightScore);
             item.m_txtRank.text = string.Format("段位排名:{0}", targetData.RankInGrade);
 
@@ -369,8 +369,8 @@ namespace GFGGame
         private void OnSelectRoleClick(EventContext context)
         {
             int index = (int)(context.sender as GObject).data;
-            _targetData = ArenaDataManager.Instance.Targets[index];
-            ArenaDataManager.Instance.SelectTargetIndex = index;
+            _targetData = _dataManager.Targets[index];
+            _dataManager.SelectTargetIndex = index;
 
             _ui.m_c1.selectedIndex = 1;
             UpdateRole();

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -364,7 +364,7 @@ namespace GFGGame
             _dressUpData.PutOnItemList(MyDressUpHelper.dressUpObj.itemList);
 
             Camera camera = _sceneObject.transform.Find("FightCamera").gameObject.GetComponent<Camera>();
-            ArenaViewManager.Instance.textureDic[_dataManager.SelectThemeIndex] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
+            ArenaDataManager.Instance.TextureDic[_dataManager.SelectThemeIndex] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
 
             yield return new WaitForEndOfFrame();
 

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

@@ -52,15 +52,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            int myScore = (int)(this.viewData as object[])[0];
-            int targetScore = (int)(this.viewData as object[])[0];
-            ArenaDataManager.Instance.myScore.Add(myScore);
-            ArenaDataManager.Instance.targetFightScore.Add(targetScore);
-
-            _ui.m_btnClose.enabled = false;
+            Debug.Log("CurFightIndex:" + ArenaDataManager.Instance.CurFightIndex);
+            Debug.Log("Count:" + ArenaDataManager.Instance.myScore.Count);
+            long myScore = ArenaDataManager.Instance.myScore[ArenaDataManager.Instance.CurFightIndex];
+            long targetScore = ArenaDataManager.Instance.targetFightScore[ArenaDataManager.Instance.CurFightIndex];
 
             bool isWin = myScore > targetScore;
-            NTexture nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
+            NTexture nTexture = new NTexture(ArenaDataManager.Instance.TextureDic[ArenaDataManager.Instance.CurFightIndex]);
             _ui.m_comRoleResult.m_c1.selectedIndex = isWin ? 3 : 0;
             _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
             _ui.m_comRoleResult.m_comRole.m_imgRole.texture = nTexture;
@@ -88,18 +86,26 @@ namespace GFGGame
         }
         private void ShowResultView()
         {
-            ViewManager.Show<ArenaResultView>();
-            _ui.m_btnClose.enabled = true;
+            ArenaDataManager.Instance.CurFightIndex++;
+
+            _ui.m_t1.Play(() =>
+            {
+                ViewManager.Show<ArenaRoundResultView>();
+                _ui.m_btnClose.enabled = true;
+            });
         }
         protected override void OnHide()
         {
             base.OnHide();
 
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
+
             _ui.m_comResult.target.height = 0;
             _ui.m_t1.Stop(true, false);
-
-            if (ArenaDataManager.Instance.CurFightIndex == 2)
+            _ui.m_t0.Stop(true, false);
+            _ui.m_comRoleResult.m_t3.Stop(true, false);
+            _ui.m_comRoleResult.m_t0.Stop(true, false);
+            if (ArenaDataManager.Instance.CurFightIndex > 2)
             {
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(ArenaView).FullName);
                 ViewManager.Show<ArenaView>(null, goBackDatas, true);
@@ -111,6 +117,5 @@ namespace GFGGame
             this.Hide();
 
         }
-
     }
 }

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

@@ -83,6 +83,7 @@ namespace GFGGame
             _ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
             _ui.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
+            _ui.m_comAllPerfect.m_t1.ignoreEngineTimeScale = false;
             _ui.m_t1.ignoreEngineTimeScale = false;
             _ui.m_t2.ignoreEngineTimeScale = false;
 
@@ -107,10 +108,17 @@ namespace GFGGame
             roleData = (this.viewData as object[])[1] as FightRoleData;
             targetRoleData = (this.viewData as object[])[2] as FightRoleData;
             targetRobotData = (this.viewData as object[])[3] as FightRobotData;
-
-            _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                _nTexture = new NTexture(ArenaDataManager.Instance.TextureDic[ArenaDataManager.Instance.CurFightIndex]);
+            }
+            else
+            {
+                _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
+            }
             _ui.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
             _ui.m_imgRole.texture = _nTexture;
+
             _ui.m_btnBack.visible = true;
             _isAutoPlay = FightDataManager.Instance.autoPlay;
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field || InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
@@ -154,7 +162,7 @@ namespace GFGGame
                 _targetRoundTimes = ArenaDataManager.Instance.targetRoundTime;
             }
 
-            _partId = 1;
+            _partId = 0;
             _score = 0;
             _targetScore = 0;
             if (!_isAutoPlay)
@@ -185,7 +193,7 @@ namespace GFGGame
             {
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
-                    vaildSkills = ArenaDataManager.Instance.vaildSkills[_partId][_currentTime];
+                    vaildSkills = ArenaDataManager.Instance.vaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
                 }
                 else
                 {
@@ -198,7 +206,7 @@ namespace GFGGame
             {
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
-                    vaildSkills = ArenaDataManager.Instance.targetVaildSkills[_partId][_currentTime];
+                    vaildSkills = ArenaDataManager.Instance.targetVaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
                 }
                 else
                 {
@@ -326,6 +334,7 @@ namespace GFGGame
             switch (_currentTime)
             {
                 case BeginTime.PART_ALL_FIGHT_BEGIN:
+                    _partId++;
                     UpdateProgress(CheckPartFightBeginSkill);
                     break;
                 case BeginTime.PART_FIGHT_BEGIN:
@@ -399,8 +408,6 @@ namespace GFGGame
 
             _ui.m_comClick.target.touchable = false;
 
-            // ET.Log.Debug("zoya    _score:" + _score);
-            // ET.Log.Debug("zoya    _targetScore:" + _targetScore);
             int _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _skillScore);
             int _targetPartScore;
             if (targetType == ArenaFightTargetType.PLAYER)
@@ -411,12 +418,10 @@ namespace GFGGame
             {
                 _targetPartScore = ScoreSystemData.Instance.GetRobotPartScore(targetRobotData, _partId, ClickType.PREFACT_CLICK, _targetSkillScore);
             }
-            ET.Log.Debug("zoya    _partScore:" + _partScore);
-            ET.Log.Debug("zoya    _targetPartScore:" + _targetPartScore);
+            // Debug.Log("partId:" + _partId + "    skillScore:" + _partScore);
+            // Debug.Log("partId:" + _partId + "   targetSkillScore: " + _targetPartScore);
             _score += _partScore;
             _targetScore += _targetPartScore;
-            ET.Log.Debug("zoya    score:" + _score);
-            ET.Log.Debug("zoya    targetScore:" + _targetScore);
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
             switch (clickType)
             {
@@ -475,8 +480,6 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                _targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(_targetMainScore);
-
                 if (_prefectCount > 0)
                 {
                     _ui.m_comAllPerfect.target.visible = true;
@@ -539,6 +542,8 @@ namespace GFGGame
             _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
             _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
 
+            _targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(_targetMainScore);
+
             int allCircleScore = 0;
             if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || _isAutoPlay)
             {
@@ -548,6 +553,7 @@ namespace GFGGame
 
             _time = 0;
             _score += allCircleScore;
+            _ui.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
             _ui.m_comAllPerfect.m_t1.Play(() =>
                 {
                     _prefectCount = 0;

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

@@ -9,7 +9,9 @@ namespace GFGGame
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
         private GameObject _sceneTargetObject;
-        private GameObject _sceneTargetPrefab;
+        private GameObject _sceneTargetObj;
+        private GameObject _sceneNpcObj;
+        private DressUpObj _targetDressUpObj;
 
         public override void Dispose()
         {
@@ -20,9 +22,13 @@ namespace GFGGame
             }
             if (_sceneTargetObject != null)
             {
-                GameObject.Destroy(_sceneTargetObject);
                 _sceneTargetObject = null;
             }
+            if (_targetDressUpObj != null)
+            {
+                _targetDressUpObj.Dispose();
+                _targetDressUpObj = null;
+            }
 
             if (_ui != null)
             {
@@ -40,7 +46,6 @@ namespace GFGGame
             isfullScreen = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTarget"));
-            _sceneTargetPrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTargetRole"));
         }
 
         protected override void OnInit()
@@ -55,9 +60,16 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
+                _sceneTargetObj = _sceneObject.transform.Find("targetRole").gameObject;
+                _sceneNpcObj = _sceneObject.transform.Find("Npc").gameObject;
+
+                _targetDressUpObj = new DressUpObj();
             }
+            _sceneTargetObj.SetActive(false);
+            _sceneNpcObj.SetActive(true);
+
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, true);
-            MyDressUpHelper.dressUpObj.UpdateRoleView();
+
 
             FightRoleData roleData = FightDataManager.Instance.roleData;
 
@@ -67,28 +79,29 @@ namespace GFGGame
             int fightType;
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
+                roleData = ArenaDataManager.Instance.DressupList[ArenaDataManager.Instance.CurFightIndex];
+                MyDressUpHelper.dressUpObj.PutOnItemList(ArenaDataManager.Instance.DressupList[ArenaDataManager.Instance.CurFightIndex].itemList);
                 ArenaTargetData arenaTarget = ArenaDataManager.Instance.Targets[ArenaDataManager.Instance.SelectTargetIndex];
                 if (arenaTarget.Type == ArenaFightTargetType.ROBOT)
                 {
+                    _sceneTargetObj.SetActive(false);
+                    _sceneNpcObj.SetActive(true);
                     fightType = ArenaFightTargetType.ROBOT;
                     targetRobotData = ArenaDataManager.Instance.GetArenaRobotData(0, arenaTarget);
                     _ui.m_targetName.m_txtName.text = targetRobotData.name;
+
                     SceneController.UpdateFightTarget(targetRobotData.res, _sceneObject);
                 }
                 else
                 {
+                    _sceneTargetObj.SetActive(true);
+                    _sceneNpcObj.SetActive(false);
+
                     fightType = ArenaFightTargetType.PLAYER;
                     targetRoleData = ArenaDataManager.Instance.GetArenaRoleData(0, arenaTarget);
-                    DressUpObj dressUpObj = new DressUpObj();
-                    if (_sceneTargetObject == null)
-                    {
-                        _sceneTargetObject = GameObject.Instantiate(_sceneTargetPrefab);
-                    }
-
-                    dressUpObj.setSceneObj(_sceneTargetPrefab, true);
-                    dressUpObj.UpdateRoleView();
-                    _sceneTargetObject.transform.SetParent(_sceneObject.transform);
-                    _sceneTargetObject.transform.SetSiblingIndex(2);
+                    _targetDressUpObj.setSceneObj(_sceneTargetObj, true, false);
+                    _targetDressUpObj.PutOnItemList(arenaTarget.RoleDressupList[ArenaDataManager.Instance.CurFightIndex].itemList);
+
                     _ui.m_targetName.m_txtName.text = targetRoleData.name;
 
                 }
@@ -100,6 +113,11 @@ namespace GFGGame
             }
             else
             {
+                MyDressUpHelper.dressUpObj.UpdateRoleView();
+
+                _sceneTargetObj.SetActive(false);
+                _sceneNpcObj.SetActive(true);
+
                 fightType = ArenaFightTargetType.ROBOT;
                 targetRobotData = FightDataManager.Instance.GetFightRobotData();
                 StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
@@ -108,6 +126,7 @@ namespace GFGGame
                 {
                     MusicManager.Instance.Play(ResPathUtil.GetMusicPath(fightCfg.music, "mp3"));
                 }
+
                 SceneController.UpdateFightTarget(targetRobotData.res, _sceneObject);
                 _ui.m_targetName.m_txtName.text = targetRobotData.name;
             }

GameClient/Assets/ResIn/Prefab/SceneFightTarget.prefab

@@ -111,7 +111,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &9161226812778529165
 SpriteRenderer:
@@ -193,7 +193,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!331 &507977126574659152
 SpriteMask:
@@ -274,7 +274,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!331 &4105743218907232887
 SpriteMask:
@@ -322,8 +322,8 @@ SpriteMask:
   m_BackSortingLayerID: 1628392575
   m_FrontSortingLayer: 1
   m_BackSortingLayer: 1
-  m_FrontSortingOrder: 1
-  m_BackSortingOrder: -1
+  m_FrontSortingOrder: 9999
+  m_BackSortingOrder: -998
   m_IsCustomRangeActive: 1
   m_SpriteSortPoint: 0
 --- !u!1 &5013777570792012677
@@ -355,7 +355,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &2918547737979533810
 SpriteRenderer:
@@ -408,6 +408,37 @@ SpriteRenderer:
   m_WasSpriteAssigned: 0
   m_MaskInteraction: 1
   m_SpriteSortPoint: 0
+--- !u!1 &7603821910887336240
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4497625519222981310}
+  m_Layer: 0
+  m_Name: targetRole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4497625519222981310
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7603821910887336240}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.8, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2983526374946979172}
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8934048990737965465
 GameObject:
   m_ObjectHideFlags: 0
@@ -437,6 +468,7 @@ Transform:
   m_Children:
   - {fileID: 8815338108581059719}
   - {fileID: 8934048988926551774}
+  - {fileID: 4497625519222981310}
   - {fileID: 3800048586795993966}
   - {fileID: 5887010865235330484}
   - {fileID: 1185925457834203870}
@@ -523,6 +555,10 @@ PrefabInstance:
       propertyPath: m_MaskInteraction
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931758, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
 --- !u!4 &8934048988926551774 stripped
@@ -530,3 +566,97 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
   m_PrefabInstance: {fileID: 905284814300497488}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6776708975966641642
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4497625519222981310}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.03
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_SortingLayerID
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_MaskInteraction
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &2983526374946979172 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 6776708975966641642}
+  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneFightTargetRole.prefab

@@ -1,202 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &335338840456633889
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8437551959295942084}
-  - component: {fileID: 1562249310728173514}
-  m_Layer: 0
-  m_Name: Bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8437551959295942084
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 335338840456633889}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8408912890099392731}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1562249310728173514
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 335338840456633889}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: d5e3578f9df618f42a579b7e10d9feec, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 10.8046875, y: 24}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
---- !u!1 &8408912890099392730
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8408912890099392731}
-  m_Layer: 0
-  m_Name: SceneFightTargetRole
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8408912890099392731
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8408912890099392730}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 8437551959295942084}
-  - {fileID: 8408912890973382557}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &278761649704503059
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8408912890099392731}
-    m_Modifications:
-    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: faxing
-      objectReference: {fileID: 0}
-    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: lianyiqun
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.03
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: Role
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645814931756, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_MaskInteraction
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
---- !u!4 &8408912890973382557 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-  m_PrefabInstance: {fileID: 278761649704503059}
-  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneFightTargetRole.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7d30f624c2bbbc742aa4d7c04d29625d
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: