单人战斗优化

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1">
-      <gearDisplay controller="c1" pages="0"/>
-    </graph>
-    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1">
-      <gearDisplay controller="c1" pages="1"/>
-    </graph>
-    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1">
-      <gearDisplay controller="c1" pages="2"/>
-    </graph>
-    <loader id="n8_vuz5" name="loaType" xy="69,54" size="118,63" url="ui://mfvz4q8kvuz5bf" autoSize="true">
+    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1" visible="false"/>
+    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1"/>
+    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1" visible="false"/>
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5bf|ui://mfvz4q8kvuz5bd" default="ui://mfvz4q8kvuz5be"/>
     </loader>
     <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b4" fontSize="51" align="center" text="666666">

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

@@ -58,6 +58,7 @@ namespace GFGGame
             SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
             EventAgent.AddEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
 
+            _gameObject2.SetActive(false);
             _ui.m_comClickCircle.target.onClick.Add(CircleScoreEnd);
             _ui.m_comAllCircle.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             _ui.m_comAllCircle.target.onTouchEnd.Add(AllCircleScoreStart);
@@ -156,7 +157,7 @@ namespace GFGGame
             }
 
         }
-
+        private string[] paths = { "zd_df_sb", "zd_df_lv", "zd_df_cheng" };
         private void CircleScoreEnd()
         {
             _ui.m_comClickCircle.target.onClick.Remove(CircleScoreEnd);
@@ -168,12 +169,17 @@ namespace GFGGame
             }
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             _ui.m_comClickCircle.m_grpCircle.visible = false;
+            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
+            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out GoWrapper _wrapper2, 59);
+            _gameObject2.SetActive(true);
+
             _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
             _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
             {
+                _gameObject2.SetActive(false);
                 _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
                 CircleResuleEnd();
                 PlayScoreTWEffect();
@@ -320,7 +326,9 @@ namespace GFGGame
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             // _ui.m_comClickCircle.m_t1.Stop(true, false);
             _ui.m_proScore.target.value = 0;
-            _ui.m_proScore.m_txtCount.text = "总分：0";
+            _ui.m_proScore.m_txtCount.text = "总分 0";
+            _gameObject2.SetActive(false);
+
         }
 
         private void PlayScoreTWEffect()
@@ -344,10 +352,10 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
             SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out GoWrapper _wrapper2, 59);
-            string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
-            SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
-            string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
-            SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
+            // string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
+            // SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
+            // string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
+            // SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
             SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out GoWrapper _wrapper5);
             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");

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

@@ -209,8 +209,8 @@ namespace GFGGame
 
             // _ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
             // _ui.m_targetName.m_txtName.text = fightCfg.targetName;
-            _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + "0";
-            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + "0";
+            _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + " 0";
+            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
             _ui.m_btnBack.visible = true;
 
             _speed = EquipDataCache.cacher.fightSpeed;
@@ -317,8 +317,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)_targetScore);
+            _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)_score);
             // _ui.m_proScore.m_comBar.m_imgAni.visible = true;
 
             double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;