双人战斗

FGUIProject/assets/Main/MainUI.xml

@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080" designImageOffsetY="-240">
   <displayList>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
-    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
-      <relation target="" sidePair="right-right,top-top"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
-    </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
-      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
-    </component>
-    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1002" group="n52_qqat"/>
     <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
     <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
@@ -78,6 +60,24 @@
       <relation target="" sidePair="middle-middle"/>
     </group>
     <group id="n59_oju1" name="grpMove" xy="0,-240" size="2092,2400" advanced="true"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
+    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
+      <relation target="" sidePair="right-right,top-top"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
+    </list>
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
+      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
+    </component>
+    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
   </displayList>
   <transition name="t1">

FGUIProject/assets/Main/components/ComRole.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="585,1317" overflow="hidden" mask="n14_wono">
+<component size="585,1317" overflow="hidden" opaque="false" mask="n14_wono">
   <displayList>
     <image id="n14_wono" name="n14" src="wonogw" fileName="imagesFight/jz_yjd_dd.png" xy="1,0"/>
     <loader id="n16_wono" name="loaBg" xy="1,0" size="583,1317" url="ui://mfvz4q8kwonogw" fill="scaleMatchWidth" autoSize="true">

FGUIProject/assets/Main/components/ComRoleResult0.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="721,243" overflow="hidden">
+<component size="721,243" overflow="hidden" opaque="false">
   <displayList>
     <image id="n16_wono" name="n16" src="wonoh5" fileName="imagesFight/jz_shan_1.png" xy="0,0" size="721,243" fillMethod="vt" fillOrigin="1">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="491,334" overflow="hidden">
+<component size="491,334" overflow="hidden" opaque="false">
   <displayList>
     <image id="n17_wono" name="n17" src="wonoh6" fileName="imagesFight/jz_shan_2.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="158,333" overflow="hidden">
+<component size="158,333" overflow="hidden" opaque="false">
   <displayList>
     <image id="n18_wono" name="n18" src="wonoh7" fileName="imagesFight/jz_shan_3.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="273,244" overflow="hidden">
+<component size="273,244" overflow="hidden" opaque="false">
   <displayList>
     <image id="n19_wono" name="n19" src="wonoh8" fileName="imagesFight/jz_yzi_1.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult4.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="163,360" overflow="hidden">
+<component size="163,360" overflow="hidden" opaque="false">
   <displayList>
     <image id="n20_wono" name="n20" src="wonoh9" fileName="imagesFight/jz_yzi_2.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

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

@@ -7,10 +7,6 @@ namespace UI.Main
     public partial class UI_MainUI
     {
         public GComponent target;
-        public GComponent m_valueBar;
-        public GList m_list;
-        public UI_ButtonChange m_btnChange;
-        public GGroup m_grpList;
         public UI_ComponentHeadBar m_headBar;
         public UI_Button2 m_btnDailyLogin;
         public UI_ButtonModle1 m_btnMain;
@@ -25,6 +21,10 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnTravel;
         public GGroup m_grpRight;
         public GGroup m_grpMove;
+        public GComponent m_valueBar;
+        public GList m_list;
+        public UI_ButtonChange m_btnChange;
+        public GGroup m_grpList;
         public GLoader m_loaGuidestudio;
         public Transition m_t1;
         public Transition m_t2;
@@ -75,10 +75,6 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_list = (GList)comp.GetChild("list");
-            m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_grpList = (GGroup)comp.GetChild("grpList");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
@@ -93,17 +89,16 @@ namespace UI.Main
             m_btnTravel = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnTravel"));
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_list = (GList)comp.GetChild("list");
+            m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
+            m_grpList = (GGroup)comp.GetChild("grpList");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_valueBar = null;
-            m_list = null;
-            m_btnChange.Dispose();
-            m_btnChange = null;
-            m_grpList = null;
             m_headBar.Dispose();
             m_headBar = null;
             m_btnDailyLogin.Dispose();
@@ -129,6 +124,11 @@ namespace UI.Main
             m_btnTravel = null;
             m_grpRight = null;
             m_grpMove = null;
+            m_valueBar = null;
+            m_list = null;
+            m_btnChange.Dispose();
+            m_btnChange = null;
+            m_grpList = null;
             m_loaGuidestudio = null;
             m_t1 = null;
             m_t2 = null;

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

@@ -359,8 +359,8 @@ namespace GFGGame
         private void UpdateProgressBar()
         {
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0} {1}", fightCfg.targetName, (int)_targetScore);
-            _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)_score);
+            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0} {1}", fightCfg.targetName, (int)Math.Round(_targetScore));
+            _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)Math.Round(_score));
             // _ui.m_proScore.m_comBar.m_imgAni.visible = true;
 
             double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;
@@ -545,10 +545,6 @@ namespace GFGGame
                     Vector3 targetPos = role == SkillDataManager.MINE ? _ui.m_proScore.target.position : _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0);
                     PlayScoreTWEffect(graph, comRoleSkillScore.target.position, targetPos);
                 });
-
-            // UpdateProgressBar();
-            // _ui.m_comTargetCircle.m_t1.Play(() => { PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0)); });
-
         }
 
         //荆钗效果
@@ -648,18 +644,9 @@ namespace GFGGame
         }
         private void OnBtnSpeedUp()
         {
-            // if (_levelCfg.type == ConstInstanceZonesType.Field)
-            // {
-            //     EquipDataCache.cacher.fieldFightSpeed = EquipDataCache.cacher.fieldFightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
-            //     _speed = EquipDataCache.cacher.fieldFightSpeed;
-            // }
-            // else
-            // {
-
             EquipDataCache.cacher.fightSpeed = EquipDataCache.cacher.fightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
             _speed = EquipDataCache.cacher.fightSpeed;
 
-            // }
             _ui.m_btnSpeedUp.title = "x" + _speed;
         }
 
@@ -691,6 +678,9 @@ namespace GFGGame
         }
         private void Skip(object param = null)
         {
+            Reset();
+            EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
+            EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
             InstanceZonesController.CheckStoryFightResult().Coroutine();
         }
         private void Reset()