战斗表现

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n7_vuz5" name="loaBg" xy="0,0" size="256,259" url="ui://mfvz4q8kvuz5b8" autoSize="true">
+    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1">
       <gearDisplay controller="c1" pages="0"/>
-    </loader>
+    </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="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="118,63" url="ui://mfvz4q8kvuz5bf" 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">

FGUIProject/assets/Main/components/Component2.xml

@@ -10,5 +10,6 @@
     <graph id="n7_k1kh" name="holder" xy="835,11" pivot="0.5,0.5" size="1,1">
       <relation target="" sidePair="right-right"/>
     </graph>
+    <graph id="n8_ecw3" name="holder1" xy="417,11" pivot="0.5,0.5" size="1,1"/>
   </displayList>
 </component>

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

@@ -8,7 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaBg;
+        public GGraph m_holder2;
         public GGraph m_holder;
         public GGraph m_holder1;
         public GLoader m_loaType;
@@ -64,7 +64,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder2 = (GGraph)comp.GetChild("holder2");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaType = (GLoader)comp.GetChild("loaType");
@@ -76,7 +76,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaBg = null;
+            m_holder2 = null;
             m_holder = null;
             m_holder1 = null;
             m_loaType = null;

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

@@ -10,6 +10,7 @@ namespace UI.Main
         public UI_Component3 m_bar;
         public GImage m_imgAni;
         public GGraph m_holder;
+        public GGraph m_holder1;
         public const string URL = "ui://mfvz4q8kk1khe7";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "Component2";
@@ -60,6 +61,7 @@ namespace UI.Main
             m_bar = (UI_Component3)UI_Component3.Create(comp.GetChild("bar"));
             m_imgAni = (GImage)comp.GetChild("imgAni");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -67,6 +69,7 @@ namespace UI.Main
             m_bar = null;
             m_imgAni = null;
             m_holder = null;
+            m_holder1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -26,6 +26,8 @@ namespace GFGGame
         private GameObject _gameObject1;
         private GameObject _gameObject2;
         private GameObject _gameObject3;
+        private GameObject _gameObject4;
+        private GameObject _gameObject5;
 
         protected override void OnInit()
         {
@@ -144,7 +146,6 @@ namespace GFGGame
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
             {
-                // _ui.m_comClickCircle.m_grpCircle.visible = true;
                 _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
                 CircleResuleEnd();
                 PlayScoreTWEffect();
@@ -152,21 +153,10 @@ namespace GFGGame
             });
             UpdateCircleResult(clickState);
 
-            // _ui.m_comClickCircle.m_t1.ignoreEngineTimeScale = false;
-            // _ui.m_comClickCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
-            // _ui.m_comClickCircle.m_t1.Play(() =>
-            // {
-            //     CircleResuleEnd();
-            // });
-
-
-
-
         }
         private void UpdateCircleResult(int clickState)
         {
             //只显示部件分加基础分
-            // _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
             UI_ComScoreResult comScoreResult = UI_ComScoreResult.Proxy(_ui.m_comClickCircle.m_ComScoreResult.target);
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
@@ -177,9 +167,7 @@ namespace GFGGame
             comScoreResult.m_txtCount1.text = count.ToString();
             comScoreResult.m_txtCount2.text = count.ToString();
 
-            // int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
-            // SetScoreUI();
         }
 
         private void CircleResuleEnd()
@@ -323,10 +311,14 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out GoWrapper _wrapper0);
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
             SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
-            string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath8, out _gameObject2, out GoWrapper _wrapper2, 59);
-            string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
-            SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath8_1, out _gameObject3, out GoWrapper _wrapper3, 59);
+            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 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);
         }
         protected override void OnHide()
         {
@@ -348,6 +340,10 @@ namespace GFGGame
             }
             SceneController.DestroyObjectFromView(_gameObject0);
             SceneController.DestroyObjectFromView(_gameObject1);
+            SceneController.DestroyObjectFromView(_gameObject2);
+            SceneController.DestroyObjectFromView(_gameObject3);
+            SceneController.DestroyObjectFromView(_gameObject4);
+            SceneController.DestroyObjectFromView(_gameObject5);
 
             base.Dispose();
 

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

@@ -112,7 +112,7 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject12, null, _ui.m_ComRoleSkillNpcShield.m_holder, resPath7, out _gameObject12, out GoWrapper _wrapper12, 70);
             string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
             SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 59);
-            string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
+            string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv_sr");
             SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8_1, out _gameObject14, out GoWrapper _wrapper14, 59);
             string resPath9 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
             SceneController.AddObjectToView(_gameObject15, null, _ui.m_holderPartScore, resPath9, out _gameObject15, out GoWrapper _wrapper15);