战斗表现

FGUIProject/assets/Main/ArenaFightResultUI.xml

@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n11_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
     <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601">
-      <relation target="n10_wono" sidePair="top-top"/>
-    </component>
-    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,200" pivot="0.5,0.5" scale="1.1,1.1" touchable="false">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="0" type="XY" target="n10_wono" tween="true" startValue="175,200" endValue="129,200" duration="6" ease="Linear"/>
     <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
   </transition>
-  <transition name="t0">
-    <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="0" type="XY" target="n10_wono" value="175,200"/>
-  </transition>
 </component>

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n11_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
     <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601">
-      <relation target="n10_wono" sidePair="top-top"/>
-    </component>
-    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,200" pivot="0.5,0.5" scale="1.1,1.1" touchable="false">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601"/>
     <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673" alpha="0">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
@@ -20,13 +12,7 @@
   <transition name="t1">
     <item time="0" type="Alpha" target="n2_8xpg" value="0"/>
     <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="0" type="XY" target="n10_wono" tween="true" startValue="175,200" endValue="129,200" duration="6" ease="Linear"/>
     <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
     <item time="18" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
   </transition>
-  <transition name="t0">
-    <item time="0" type="Alpha" target="n2_8xpg" value="0"/>
-    <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="0" type="XY" target="n10_wono" value="175,200"/>
-  </transition>
 </component>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kmza1c0">
   <displayList>
-    <loader id="n63_psph" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <image id="n62_psph" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </image>
     <component id="n50_psph" name="comClick" src="psphj5" fileName="components/ComClick.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n38_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="943,1546">
@@ -29,19 +23,7 @@
     <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
     <component id="n56_psph" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="367,963"/>
-    <loader id="n57_psph" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <component id="n58_psph" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="540,937" pivot="0.5,0.5" anchor="true" scale="0,0" touchable="false">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Alpha" target="n57_psph" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-    <item time="0" type="Scale" target="n58_psph" tween="true" startValue="0,0" endValue="1.1,1.1" duration="12" ease="Linear"/>
-    <item time="0" type="Skew" target="n58_psph" tween="true" startValue="0,-180" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="0" type="Visible" target="n57_psph" value="true"/>
-  </transition>
   <transition name="t1">
     <item time="0" type="Scale" target="n54_psph" value="1,1"/>
     <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,540" endValue="995,540" duration="6" ease="Linear"/>

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

@@ -101,7 +101,7 @@ namespace GFGGame
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("CommonGame"));
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("Main"));
 
-            LeagueSproxy.ReqGetLeagueInfo().Coroutine();
+            // LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             await ItemProxy.GetItemInfos();
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();

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

@@ -24,7 +24,7 @@ namespace GFGGame
         public List<ArenaHistoryData> HistoryDatas = new List<ArenaHistoryData>();//获取竞技场历史记录
 
         /*************************************************************************************************************************************/
-        public Dictionary<int, Texture2D> TextureDic = new Dictionary<int, Texture2D>();
+        // public Dictionary<int, Texture2D> TextureDic = new Dictionary<int, Texture2D>();
         public List<int> roundTime = new List<int>();
         public List<int> targetRoundTime = new List<int>();
         //Dictionary<回合下标, Dictionary<partId, Dictionary<战斗节点, List<PassivitySkillLvlCfg>>>>
@@ -71,7 +71,7 @@ namespace GFGGame
             Targets.Clear();
             RankDatasDic.Clear();
             HistoryDatas.Clear();
-            TextureDic.Clear();
+            // TextureDic.Clear();
             myScore.Clear();
             targetScore.Clear();
             myFightScore.Clear();

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

@@ -21,6 +21,7 @@ namespace GFGGame
         }
         public void UpdateNumeric(LeagueData LeagueData, int type, long value)
         {
+
             switch (type)
             {
                 case LeagueNumericType.HallLevel:

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

@@ -177,8 +177,8 @@ namespace GFGGame
             }
             else
             {
-                AddSpriteObj(res, "png", BODY_SPRITE_NAME, parentObj, 0, needSetMask); 
-                if(removeBodyAni)
+                AddSpriteObj(res, "png", BODY_SPRITE_NAME, parentObj, 0, needSetMask);
+                if (removeBodyAni)
                 {
                     parentObj.transform.SetPositionAndRotation(new Vector3(), new Quaternion());
                 }
@@ -366,7 +366,7 @@ namespace GFGGame
             var prefab = GFGAsset.Load<GameObject>(resPath);
             var gameObj = GameObject.Instantiate(prefab);
             AddAssetReleaser(gameObj, resPath);
-            if(objName == BODY_ANIMATION_NAME)
+            if (objName == BODY_ANIMATION_NAME)
             {
                 //如果是动作动画，就根据动画位置及角度信息设置给Role对象
                 parentObj.transform.SetPositionAndRotation(gameObj.transform.localPosition, gameObj.transform.localRotation);
@@ -433,7 +433,7 @@ namespace GFGGame
             GameObject effPre = GFGAsset.Load<GameObject>(resPath);
             var gameObj = GameObject.Instantiate(effPre);
             AddAssetReleaser(gameObj, resPath);
-            gameObj.transform.SetParent(parentObj.transform);
+            gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
             var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();
             if (sortingGroup == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ArenaFightResultUI.cs

@@ -7,12 +7,9 @@ namespace UI.Main
     public partial class UI_ArenaFightResultUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
         public GGraph m_btnClose;
         public UI_ComResult m_comResult;
-        public UI_ComRoleResult m_comRoleResult;
         public Transition m_t1;
-        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kjcejj6";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ArenaFightResultUI";
@@ -60,23 +57,16 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
-            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_t1 = comp.GetTransition("t1");
-            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
             m_btnClose = null;
             m_comResult.Dispose();
             m_comResult = null;
-            m_comRoleResult.Dispose();
-            m_comRoleResult = null;
             m_t1 = null;
-            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComRole
-    {
-        public GComponent target;
-        public GLoader m_loaBg;
-        public GImage m_imgRole;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kwonogm";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRole";
-        private static UI_ComRole _proxy;
-
-        public static UI_ComRole Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRole();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComRole Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRole();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_imgRole = (GImage)comp.GetChild("imgRole");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            m_imgRole = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e25b986b31e808046b5f8351f178fc06
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleResult.cs

@@ -1,87 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComRoleResult
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public UI_ComRole m_comRole;
-        public Transition m_t3;
-        public Transition m_t2;
-        public Transition m_t1;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kwonogk";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRoleResult";
-        private static UI_ComRoleResult _proxy;
-
-        public static UI_ComRoleResult Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRoleResult();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComRoleResult Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRoleResult();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_comRole = (UI_ComRole)UI_ComRole.Create(comp.GetChild("comRole"));
-            m_t3 = comp.GetTransition("t3");
-            m_t2 = comp.GetTransition("t2");
-            m_t1 = comp.GetTransition("t1");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_comRole.Dispose();
-            m_comRole = null;
-            m_t3 = null;
-            m_t2 = null;
-            m_t1 = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleResult.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4cb004de40fd91644bdab3c5827f35d6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightResultUI.cs

@@ -7,13 +7,10 @@ namespace UI.Main
     public partial class UI_StoryFightResultUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
         public GGraph m_btnClose;
         public UI_ComResult m_comResult;
-        public UI_ComRoleResult m_comRoleResult;
         public UI_CompFightExpBar m_comExpBar;
         public Transition m_t1;
-        public Transition m_t0;
         public const string URL = "ui://mfvz4q8k8xpg3y";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightResultUI";
@@ -61,26 +58,19 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
-            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_comExpBar = (UI_CompFightExpBar)UI_CompFightExpBar.Create(comp.GetChild("comExpBar"));
             m_t1 = comp.GetTransition("t1");
-            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
             m_btnClose = null;
             m_comResult.Dispose();
             m_comResult = null;
-            m_comRoleResult.Dispose();
-            m_comRoleResult = null;
             m_comExpBar.Dispose();
             m_comExpBar = null;
             m_t1 = null;
-            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -7,8 +7,6 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public GImage m_imgRole;
         public UI_ComClick m_comClick;
         public GButton m_btnBack;
         public GButton m_btnSpeedUp;
@@ -19,9 +17,6 @@ namespace UI.Main
         public UI_ComTargetCard m_comTargetCard;
         public UI_ComDeduction m_comDeduction;
         public UI_ComAllPerfect m_comAllPerfect;
-        public GLoader m_LoaMask;
-        public UI_ComRoleResult m_comRoleResult;
-        public Transition m_t0;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8k8xpg3w";
@@ -71,8 +66,6 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_imgRole = (GImage)comp.GetChild("imgRole");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
@@ -83,16 +76,11 @@ namespace UI.Main
             m_comTargetCard = (UI_ComTargetCard)UI_ComTargetCard.Create(comp.GetChild("comTargetCard"));
             m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_comAllPerfect = (UI_ComAllPerfect)UI_ComAllPerfect.Create(comp.GetChild("comAllPerfect"));
-            m_LoaMask = (GLoader)comp.GetChild("LoaMask");
-            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
-            m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_imgRole = null;
             m_comClick.Dispose();
             m_comClick = null;
             m_btnBack = null;
@@ -108,10 +96,6 @@ namespace UI.Main
             m_comDeduction = null;
             m_comAllPerfect.Dispose();
             m_comAllPerfect = null;
-            m_LoaMask = null;
-            m_comRoleResult.Dispose();
-            m_comRoleResult = null;
-            m_t0 = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

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

@@ -111,20 +111,7 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
-            GameObject sceneCopyObject = _sceneObject.transform.Find("CopyRole").gameObject;
-            if (_copyDressUpObj == null)
-            {
-                _copyDressUpObj = new DressUpObj();
-                _copyDressUpObj.setSceneObj(sceneCopyObject, false, false, null, false);
-            }
-            sceneCopyObject.SetActive(true);
-            for (int i = 0; i < _dataManager.ThemeList.Count; i++)
-            {
-                Timers.inst.StartCoroutine(ScreenShotTex(i));
-            }
-            sceneCopyObject.SetActive(false);
 
-            // UpdateRole();
             UpdateNormal();
             UpdateValue();
             UpdateRole();
@@ -140,9 +127,9 @@ namespace GFGGame
                 _sceneObject = null;
             }
             _targetDressUpObj.TakeOffAll();
-            _copyDressUpObj.TakeOffAll();
-            _copyDressUpObj.Dispose();
-            _copyDressUpObj = null;
+            // _copyDressUpObj.TakeOffAll();
+            // _copyDressUpObj.Dispose();
+            // _copyDressUpObj = null;
             _valueBarController.OnHide();
         }
 
@@ -369,8 +356,6 @@ namespace GFGGame
             GameObject myRole = _sceneObject.transform.Find("MyRole").Find("Role").gameObject;
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, myRole, false);
             MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
-            Vector3 pos = myRole.transform.localPosition;
-            myRole.transform.localPosition = new Vector3(0, pos.y, pos.z);
 
             GameObject targetRole = _sceneObject.transform.Find("TargetRole").Find("Role").gameObject;
             targetRole.SetActive(false);
@@ -457,17 +442,5 @@ namespace GFGGame
             ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
 
-        private IEnumerator ScreenShotTex(int index)
-        {
-
-            _copyDressUpObj.TakeOffAll();
-            _copyDressUpObj.PutOnItemList(_dataManager.DressupList[index].itemList);
-
-            GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
-            Camera camera = gameObject.GetComponent<Camera>();
-            _dataManager.TextureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
-
-            yield return new WaitForEndOfFrame();
-        }
     }
 }

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

@@ -11,6 +11,8 @@ namespace GFGGame
     public class ArenaFightResultView : BaseView
     {
         private UI_ArenaFightResultUI _ui;
+        private GameObject _scenePrefab;
+        private GameObject _sceneObject;
 
         public override void Dispose()
         {
@@ -38,43 +40,31 @@ namespace GFGGame
             base.OnInit();
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightResult"));
 
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            FightData roleData = ArenaDataManager.Instance.DressupList[ArenaDataManager.Instance.CurFightIndex];
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+            }
+            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
 
             long myScore = ArenaDataManager.Instance.myScore[ArenaDataManager.Instance.CurFightIndex];
             long targetScore = ArenaDataManager.Instance.targetScore[ArenaDataManager.Instance.CurFightIndex];
-
-            bool isWin = myScore > targetScore;
-            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;
-            _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 1;
-
-            _ui.m_comResult.m_c1.selectedIndex = isWin ? 3 : 0;
+            _ui.m_comResult.m_c1.selectedIndex = myScore > targetScore ? 3 : 0;
             _ui.m_comResult.m_txtScore.text = myScore.ToString();
             _ui.m_comResult.m_grpStar.visible = false;
 
             _ui.m_btnClose.enabled = false;
-            _ui.m_t0.Play();//播放重置动画
-            _ui.m_comRoleResult.m_t0.Play();//播放重置动画
-            _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
-            {
-                if (isWin)
-                {
-                    _ui.m_comRoleResult.m_t3.Play(ShowResultView);
-                }
-                else
-                {
-                    _ui.m_comRoleResult.m_t0.Play(ShowResultView);
-                }
-            });
 
+            ShowResultView();
         }
         private void ShowResultView()
         {
@@ -89,14 +79,19 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
 
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
 
             _ui.m_comResult.target.height = 0;
             _ui.m_t1.Stop(true, false);
-            _ui.m_t0.Stop(true, false);
-            _ui.m_comRoleResult.m_t3.Stop(true, false);
-            _ui.m_comRoleResult.m_t0.Stop(true, false);
+            // _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);

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

@@ -15,6 +15,8 @@ namespace GFGGame
         // private int targetType = ArenaFightTargetType.ROBOT;
         private FightData roleData;
         private FightData targetData;
+        private GameObject _scenePrefab;
+        private GameObject _sceneObject;
         // private FightRoleData targetRoleData;
         // private FightRobotData targetRobotData;
 
@@ -74,8 +76,9 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
-            _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
+            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            // _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_comClick.target.onClick.Add(PartScoreEnd);
@@ -106,20 +109,16 @@ namespace GFGGame
         {
             base.OnShown();
 
-            // targetType = (int)(this.viewData as object[])[0];
             roleData = (this.viewData as object[])[0] as FightData;
             targetData = (this.viewData as object[])[1] as FightData;
-            // targetRobotData = (this.viewData as object[])[3] as FightRobotData;
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
-            {
-                _nTexture = new NTexture(ArenaDataManager.Instance.TextureDic[ArenaDataManager.Instance.CurFightIndex]);
-            }
-            else
+
+            if (_sceneObject == null)
             {
-                _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
             }
-            _ui.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
-            _ui.m_imgRole.texture = _nTexture;
+            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+
 
             _ui.m_btnBack.visible = true;
             _isAutoPlay = FightDataManager.Instance.autoPlay;
@@ -135,7 +134,7 @@ namespace GFGGame
             _ui.m_btnSpeedUp.visible = _isAutoPlay;
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
             _ui.m_comAllPerfect.target.visible = false;
-            _ui.m_LoaMask.visible = false;
+            // _ui.m_LoaMask.visible = false;
             _ui.m_proScore.m_comBar.target.width = 0;
             _ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
 
@@ -479,7 +478,8 @@ namespace GFGGame
                 }
                 else
                 {
-                    Timers.inst.Add(0.5f, 1, FightEnd);//评分结束
+                    Timers.inst.Add(0.3f, 1, Skip);
+                    // Timers.inst.Add(0.5f, 1, FightEnd);//评分结束
                 }
             }
             else
@@ -488,18 +488,18 @@ namespace GFGGame
             }
         }
 
-        private void FightEnd(object param = null)
-        {
-            _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
-            _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
-            _ui.m_comRoleResult.m_c1.selectedIndex = 0;
+        // private void FightEnd(object param = null)
+        // {
+        //     _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
+        //     _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
+        //     _ui.m_comRoleResult.m_c1.selectedIndex = 0;
 
-            _ui.m_comRoleResult.m_t0.Play();
-            _ui.m_t0.Play(() =>
-            {
-                Timers.inst.Add(0.3f, 1, Skip);
-            });
-        }
+        //     _ui.m_comRoleResult.m_t0.Play();
+        //     _ui.m_t0.Play(() =>
+        //     {
+        //         Timers.inst.Add(0.3f, 1, Skip);
+        //     });
+        // }
 
         private void AllCirclePlayStart()
         {
@@ -578,12 +578,11 @@ namespace GFGGame
         {
             base.OnHide();
             Reset();
-            // if (_sceneObject != null)
-            // {
-            //     GameObject.Destroy(_sceneObject);
-            //     _sceneObject = null;
-            // }
-            // _npcSkillDic.Clear();
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
 
             Timers.inst.Remove(CheckGuide);
         }
@@ -592,7 +591,7 @@ namespace GFGGame
         {
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
-                ViewManager.Show<ArenaFightResultView>(new object[] { _score, _targetScore });
+                ViewManager.Show<ArenaFightResultView>(new object[] { _score, _targetScore }, null, true);
             }
             else
             {
@@ -613,13 +612,13 @@ namespace GFGGame
 
             _ui.m_t1.Stop(true, false);
 
-            _ui.m_comRoleResult.m_t0.Stop(true, false);
-            _ui.m_comRoleResult.m_t1.Stop(true, false);
-            _ui.m_comRoleResult.m_t2.Stop(true, false);
-            _ui.m_comRoleResult.m_t3.Stop(true, false);
-            _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
-            _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 0;
-            _ui.m_comRoleResult.target.SetScale(0, 0);
+            // _ui.m_comRoleResult.m_t0.Stop(true, false);
+            // _ui.m_comRoleResult.m_t1.Stop(true, false);
+            // _ui.m_comRoleResult.m_t2.Stop(true, false);
+            // _ui.m_comRoleResult.m_t3.Stop(true, false);
+            // _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
+            // _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 0;
+            // _ui.m_comRoleResult.target.SetScale(0, 0);
 
             _ui.m_comAllPerfect.m_t0.Stop(true, false);
             _ui.m_comAllPerfect.m_t1.Stop(true, false);

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

@@ -43,7 +43,7 @@ namespace GFGGame
             _ui.m_btnClose.enabled = false;
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
+            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightResult"));
         }
 
@@ -55,19 +55,13 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             InstanceZonesDataManager.isResultFighting = true;
 
-
-            NTexture nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
-            _ui.m_comRoleResult.m_c1.selectedIndex = _resultData.Star;
-            _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
-            _ui.m_comRoleResult.m_comRole.m_imgRole.texture = nTexture;
-            _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 1;
-            // FightData roleData = InstanceZonesDataManager.roleData;
-            // if (_sceneObject == null)
-            // {
-            //     _sceneObject = GameObject.Instantiate(_scenePrefab);
-            //     MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-            // }
-            // MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+            FightData roleData = InstanceZonesDataManager.roleData;
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+            }
+            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
@@ -95,34 +89,10 @@ namespace GFGGame
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
 
-            GetCurStar(out Transition transition);
-            _ui.m_t0.Play();//播放重置动画
-            _ui.m_comRoleResult.m_t0.Play();//播放重置动画
-            _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
-            {
-                transition.Play(() =>
-                {
-                    _ui.m_t1.Play(AddExp);
-                });
-            });
+            _ui.m_t1.Play(AddExp);
 
         }
-        private void GetCurStar(out Transition transition)
-        {
-            transition = _ui.m_comRoleResult.m_t0;
-            if (_resultData.Star == 1)
-            {
-                transition = _ui.m_comRoleResult.m_t1;
-            }
-            else if (_resultData.Star == 2)
-            {
-                transition = _ui.m_comRoleResult.m_t2;
-            }
-            else if (_resultData.Star == 3)
-            {
-                transition = _ui.m_comRoleResult.m_t3;
-            }
-        }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -132,7 +102,6 @@ namespace GFGGame
                 _sceneObject = null;
             }
             InstanceZonesDataManager.isResultFighting = false;
-            // Timers.inst.Remove(AddExp);
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _ui.m_comResult.target.height = 0;
             _ui.m_comExpBar.target.alpha = 0;

GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -454,7 +454,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &931907437286195507
 Transform:
   m_ObjectHideFlags: 0

GameClient/Assets/ResIn/Prefab/SceneFightResult.prefab

@@ -92,7 +92,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8934048990737965464}
   m_Layer: 0
-  m_Name: SceneFightSingle
+  m_Name: SceneFightResult
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -127,11 +127,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
@@ -139,7 +139,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.z

GameClient/Assets/ResIn/Prefab/SceneFightSingleScore.prefab

@@ -135,7 +135,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.22
+      value: 0.35
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y

GameClient/Assets/ResIn/Prefab/SceneFightTarget.prefab

@@ -432,8 +432,8 @@ Transform:
   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_LocalPosition: {x: 2.98, y: -2.03, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
   m_Children:
   - {fileID: 2983526374946979172}
   m_Father: {fileID: 8934048990737965464}
@@ -587,11 +587,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.z
@@ -599,11 +599,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.25
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -2.03
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.z

GameClient/Assets/ResIn/UI/Main/Main_atlas_v482fx.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c2e560a623538564fa0910e86a31c1f7
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: