战斗结算

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -22,7 +22,7 @@
       <relation target="n2_qsvd" sidePair="left-left,top-top"/>
     </image>
     <loader id="n24_d4iw" name="scoreType" xy="18,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n14_vxw5" name="txtScore" xy="83,232" size="118,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
+    <text id="n14_vxw5" name="txtScore" xy="77,232" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
       <relation target="n16_8xpg" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n33_j48o" name="n33" xy="18,230" size="208,57" group="n38_8lqj"/>

FGUIProject/assets/DressUp/components/Component1.xml

@@ -6,7 +6,7 @@
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东南飞·绣">
+    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="18,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">

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

@@ -113,7 +113,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, OnClickBtnPhotograph);
+            EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
@@ -212,7 +212,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, OnClickBtnPhotograph);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
@@ -411,15 +411,7 @@ namespace GFGGame
                 AlertUI.Show("未穿戴必需品。").SetRightButton(true, "好的");
                 return;
             }
-            // if (CardDataManager.GetCardListByRarity(0).Count > 0)
-            // {
-
-            //     ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);
-            // }
-            // else
-            // {
-            //     // StartCalculateScore();
-            // }
+
             OnClickBtnPhotograph();
         }
 
@@ -932,36 +924,7 @@ namespace GFGGame
             EquipDataCache.cacher.autoPlay = _ui.m_btnAutoPlay.selected;
         }
 
-        // private void OnClickBtnShow()
-        // {
-        //     Timers.inst.Remove(SetBtnShowVisable);
-        //     _ui.m_c1.selectedIndex = 0;
-        //     _ui.m_btnHide.visible = true;
-        //     _ui.m_loaShow.visible = false;
-        //     _ui.m_btnShow.visible = false;
-        // }
-        // private void OnClickBtnHide()
-        // {
-        //     _ui.m_c1.selectedIndex = 1;
-        //     _ui.m_btnHide.visible = false;
-        //     _ui.m_btnShow.visible = true;
-        //     _ui.m_loaShow.visible = true;
-        //     Timers.inst.Add(2f, 1, SetBtnShowVisable);
-        // }
-        // private void OnClickLoaShow()
-        // {
-        //     Timers.inst.Remove(SetBtnShowVisable);
-        //     _ui.m_btnShow.alpha = 1;
-        //     Timers.inst.Add(2f, 1, SetBtnShowVisable);
-        //     _ui.m_btnShow.enabled = true;
-
-        // }
-
-        // private void SetBtnShowVisable(object param)
-        // {
-        //     _ui.m_btnShow.enabled = false;
-        //     GTween.To(1, 0, 0.3f).SetTarget(_ui.m_btnShow, TweenPropType.Alpha);
-        // }
+
         private void OnClickComNeed()
         {
             if (_fightCfg.needItemId <= 0 && _fightCfg.needSuitId <= 0)

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

@@ -204,14 +204,6 @@ namespace GFGGame
                 _ui.m_t2.Play(() =>
                 {
                     Timers.inst.Add(0.3f, 1, Skip);
-                    // _ui.m_comRoleResult.m_c1.selectedIndex = star;
-                    // _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
-                    // {
-                    //     transition.Play(() =>
-                    //     {
-                    //         Timers.inst.Add(0.3f, 1, Skip);//评分结束});
-                    //     });
-                    // });
                 });
             }
             else

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

@@ -452,7 +452,7 @@ namespace GFGGame
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-                Timers.inst.Add(1f, 1, Skip);
+                Timers.inst.Add(1.5f, 1, Skip);
             }
             else
             {