战斗表现

FGUIProject/assets/Main/components/ComAllCircle.xml

@@ -5,7 +5,10 @@
     <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" aspect="true"/>
     <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138"/>
     <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" aspect="true" scale="1.5,1.5"/>
-    <component id="n34_vuz5" name="comAllScoreResult" src="vuz5bu" fileName="components/ComAllScoreResult.xml" xy="-7,-364" pivot="0.5,0.5" alpha="0"/>
+    <graph id="n36_qgxy" name="holder" xy="181,-236" size="1,1" group="n39_qgxy"/>
+    <image id="n37_qgxy" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="65,-308" group="n39_qgxy"/>
+    <text id="n38_qgxy" name="txtCount" xy="64,-215" pivot="0.5,0" size="234,69" group="n39_qgxy" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
+    <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.2,1.2" endValue="1,1" duration="18" ease="Linear"/>
@@ -13,6 +16,7 @@
     <item time="0" type="Visible" target="n32_cn27" value="true"/>
     <item time="0" type="Visible" target="n33_cn27" value="true"/>
     <item time="0" type="Visible" target="n35_oixc" value="true"/>
+    <item time="0" type="Visible" target="n39_qgxy" value="false"/>
     <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
     <item time="18" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
     <item time="18" type="Visible" target="n33_cn27" value="false"/>
@@ -22,8 +26,15 @@
     <item time="66" type="Visible" target="n35_oixc" value="false"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n34_vuz5" value="1"/>
-    <item time="0" type="Scale" target="n34_vuz5" tween="true" startValue="0.4,0.4" endValue="1.4,1.4" duration="14" ease="Linear"/>
-    <item time="10" type="Alpha" target="n34_vuz5" tween="true" startValue="1" endValue="0" duration="4" ease="Linear"/>
+    <item time="0" type="Visible" target="n36_qgxy" value="true"/>
+    <item time="0" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n39_qgxy" value="true"/>
+    <item time="9" type="Visible" target="n37_qgxy" value="true"/>
+    <item time="9" type="Visible" target="n38_qgxy" value="true"/>
+    <item time="66" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="66" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n36_qgxy" value="true"/>
+    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ComAllScoreResult.xml

@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="360,360">
   <displayList>
-    <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0"/>
-    <image id="n35_vuz5" name="n35" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
+    <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0" visible="false"/>
+    <graph id="n37_qgxy" name="holder" xy="179,179" size="1,1" visible="false"/>
+    <image id="n35_vuz5" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
     <text id="n36_vuz5" name="txtCount" xy="62,200" pivot="0.5,0" size="234,69" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
+    <image id="n40_qgxy" name="n40" src="oq7r99" fileName="imagesStory/zx_gka_baoxiang_1.png" xy="69,109"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Visible" target="n35_vuz5" value="true"/>
+    <item time="0" type="Visible" target="n36_vuz5" value="true"/>
+    <item time="0" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="48" type="Visible" target="n34_vuz5" value="false"/>
+    <item time="48" type="Visible" target="n37_qgxy" value="true"/>
+  </transition>
 </component>

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

@@ -8,7 +8,9 @@ namespace UI.Main
     {
         public GComponent target;
         public GImage m_imgCircle;
-        public UI_ComAllScoreResult m_comAllScoreResult;
+        public GGraph m_holder;
+        public GImage m_img;
+        public GTextField m_txtCount;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://mfvz4q8kcn279k";
@@ -59,15 +61,18 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_imgCircle = (GImage)comp.GetChild("imgCircle");
-            m_comAllScoreResult = (UI_ComAllScoreResult)UI_ComAllScoreResult.Create(comp.GetChild("comAllScoreResult"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_img = (GImage)comp.GetChild("img");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_imgCircle = null;
-            m_comAllScoreResult.Dispose();
-            m_comAllScoreResult = null;
+            m_holder = null;
+            m_img = null;
+            m_txtCount = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComAllScoreResult
-    {
-        public GComponent target;
-        public GTextField m_txtCount;
-        public const string URL = "ui://mfvz4q8kvuz5bu";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComAllScoreResult";
-        private static UI_ComAllScoreResult _proxy;
-
-        public static UI_ComAllScoreResult Create(GObject gObject = null)
-        {
-            var ui = new UI_ComAllScoreResult();
-            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_ComAllScoreResult Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComAllScoreResult();
-            }
-            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_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -20,7 +20,7 @@ namespace GFGGame
         private const int _range = 100;//圆圈随机范围
         private float _time = 0;// 登峰造极按住的时间
 
-        private float _playTime = 2f;
+        private float _playTime = 2.3f;
 
         private GameObject _gameObject0;
         private GameObject _gameObject1;
@@ -30,6 +30,7 @@ namespace GFGGame
         private GameObject _gameObject5;
         private GameObject _gameObject6;
         private GameObject _gameObject7;
+        private GameObject _gameObject8;
         private GoWrapper _wrapper6;
         private GoWrapper _wrapper7;
 
@@ -194,9 +195,9 @@ namespace GFGGame
         private void CircleResuleEnd()
         {
             _index++;
-            if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
+            if (_index >= 0)// FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_prefectCount == FightScoreCfgArray.Instance.dataArray.Length)
+                if (_prefectCount >= 0) // == FightScoreCfgArray.Instance.dataArray.Length)
                 {
                     AllCirclePlayStart();//完美八连击
                 }
@@ -222,13 +223,18 @@ namespace GFGGame
             _ui.m_comAllCircle.m_t0.Play(() =>
             {
                 AllCircleScoreStart();
+                _ui.m_comAllCircle.m_t1.Play(() =>
+                {
+                    PlayScoreTWEffect();
+                    Timers.inst.Add(1f, 1, Skip);
+                });
+
             });
         }
         private void OnComAllCircleClickBegin()
         {
             if (_ui.m_comAllCircle.m_imgCircle.visible == false)
             {
-                // AllCircleScoreStart();
                 Timers.inst.Remove(ComAllCirclePressTime);
             }
             else
@@ -254,18 +260,11 @@ namespace GFGGame
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
 
-            _ui.m_comAllCircle.m_comAllScoreResult.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
+            _ui.m_comAllCircle.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
 
             _time = 0;
             _score += allCircleScore;
-            // SetScoreUI();
-            _ui.m_comAllCircle.m_t1.ignoreEngineTimeScale = false;
-            _ui.m_comAllCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
-            _ui.m_comAllCircle.m_t1.Play(() =>
-            {
-                PlayScoreTWEffect();
-                Timers.inst.Add(1f, 1, Skip);
-            });
+
 
         }
 
@@ -344,6 +343,8 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
             string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
             SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
+            string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
+            SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out GoWrapper _wrapper8, 70);
         }
         protected override void OnHide()
         {