Browse Source

战斗表现

zhaoyang 2 years ago
parent
commit
ff15c13c55

+ 8 - 8
FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -9,7 +9,7 @@
     <graph id="n27_qkjs" name="holderHigh" xy="127,129" pivot="0.5,0.5" anchor="true" size="1,1" group="n21_f2bf"/>
     <graph id="n26_qkjs" name="holderCircle" xy="127,129" pivot="0.5,0.5" anchor="true" size="1,1" group="n21_f2bf"/>
     <group id="n21_f2bf" name="grpClick" xy="80,78" size="88,100" visible="false" advanced="true"/>
-    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1" group="n22_f2bf" visible="false"/>
+    <graph id="n12_c2um" name="holder0" xy="127,129" size="1,1" group="n22_f2bf" visible="false"/>
     <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1" group="n22_f2bf" visible="false"/>
     <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1" group="n22_f2bf" visible="false"/>
     <text id="n9_vuz5" name="txtCount0" xy="75,116" pivot="0.5,0" size="106,32" group="n22_f2bf" font="ui://mfvz4q8kqkjsnu" fontSize="51" align="center" text="666666">
@@ -24,15 +24,15 @@
     <group id="n22_f2bf" name="grpResult" xy="66,116" size="124,32" visible="false" advanced="true"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n26_qkjs" tween="true" startValue="1,1" endValue="0,0" duration="36" ease="Linear"/>
+    <item time="0" type="Scale" target="n26_qkjs" tween="true" startValue="1,1" endValue="0,0" duration="42" ease="Linear"/>
     <item time="0" type="Visible" target="n18_f2bf" value="true"/>
     <item time="0" type="Visible" target="n21_f2bf" value="true"/>
     <item time="0" type="Visible" target="n22_f2bf" value="false"/>
     <item time="0" type="Visible" target="n27_qkjs" value="false"/>
     <item time="0" type="Visible" target="n28_qkjs" value="false"/>
-    <item time="15" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
-    <item time="15" type="Visible" target="n27_qkjs" value="true"/>
-    <item time="36" type="Visible" target="n21_f2bf" value="false"/>
+    <item time="26" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
+    <item time="26" type="Visible" target="n27_qkjs" value="true"/>
+    <item time="42" type="Visible" target="n21_f2bf" value="false"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Visible" target="n10_vuz5" value="false"/>
@@ -53,12 +53,12 @@
     <item time="30" type="Visible" target="n12_c2um" value="false"/>
     <item time="30" type="Visible" target="n13_c2um" value="false"/>
     <item time="30" type="Visible" target="n14_ecw3" value="false"/>
+    <item time="30" type="Visible" target="n18_f2bf" value="false"/>
     <item time="30" type="Visible" target="n21_f2bf" value="false"/>
     <item time="30" type="Visible" target="n22_f2bf" value="false"/>
     <item time="30" type="Visible" target="n28_qkjs" value="true"/>
     <item time="30" type="Visible" target="n9_vuz5" value="false"/>
-    <item time="30" type="XY" target="n28_qkjs" label="start" tween="true" startValue="130,130" endValue="-75,-500" duration="12" label2="end" ease="Circ.Out"/>
-    <item time="42" type="Visible" target="n18_f2bf" value="false"/>
-    <item time="42" type="Visible" target="n28_qkjs" value="false"/>
+    <item time="30" type="XY" target="n28_qkjs" label="start" tween="true" startValue="130,130" endValue="-75,-500" duration="18" label2="end" ease="Circ.Out"/>
+    <item time="48" type="Visible" target="n28_qkjs" value="false"/>
   </transition>
 </component>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -198,11 +198,11 @@ namespace GFGGame
             {
                 return ClickType.PREFACT_CLICK;
             }
-            if (scale <= 0.866f && scale > 0.65f)
+            if (scale <= 0.45f && scale > 0.33f)
             {
                 clickType = ClickType.PREFACT_CLICK;
             }
-            else if (scale <= 0.216f)
+            else if (scale <= 0.1f)
             {
                 clickType = ClickType.MISS_CLICK;
             }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs

@@ -14,7 +14,7 @@ namespace UI.Main
         public GGraph m_holderHigh;
         public GGraph m_holderCircle;
         public GGroup m_grpClick;
-        public GGraph m_holder;
+        public GGraph m_holder0;
         public GGraph m_holder1;
         public GGraph m_holder2;
         public GTextField m_txtCount0;
@@ -77,7 +77,7 @@ namespace UI.Main
             m_holderHigh = (GGraph)comp.GetChild("holderHigh");
             m_holderCircle = (GGraph)comp.GetChild("holderCircle");
             m_grpClick = (GGroup)comp.GetChild("grpClick");
-            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder0 = (GGraph)comp.GetChild("holder0");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_holder2 = (GGraph)comp.GetChild("holder2");
             m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
@@ -96,7 +96,7 @@ namespace UI.Main
             m_holderHigh = null;
             m_holderCircle = null;
             m_grpClick = null;
-            m_holder = null;
+            m_holder0 = null;
             m_holder1 = null;
             m_holder2 = null;
             m_txtCount0 = null;

+ 7 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -37,6 +37,7 @@ namespace GFGGame
         private GameObject _gameObject9;
         private GameObject _gameObject10;
         private GameObject _gameObject11;
+        private GameObject _gameObject12;
 
         private GoWrapper _wrapper0;
         private GoWrapper _wrapper1;
@@ -50,6 +51,7 @@ namespace GFGGame
         private GoWrapper _wrapper9;
         private GoWrapper _wrapper10;
         private GoWrapper _wrapper11;
+        private GoWrapper _wrapper12;
 
 
         public override void Dispose()
@@ -118,14 +120,16 @@ namespace GFGGame
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderNormal, resPath6, out _gameObject6, out _wrapper6);
             string resPath7 = ResPathUtil.GetViewEffectPath("ui_fight_new", "circle");
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderCircle, resPath7, out _gameObject7, out _wrapper7);
-            string resPath8 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Perfect_animation");
-            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holder, resPath8, out _gameObject8, out _wrapper8);
-            string resPath9 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Perfect_animation");
+            string resPath8 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Lose_animation");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holder0, resPath8, out _gameObject8, out _wrapper8);
+            string resPath9 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Good_animation");
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holder1, resPath9, out _gameObject9, out _wrapper9);
             string resPath10 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Perfect_animation");
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holder2, resPath10, out _gameObject10, out _wrapper10);
             string resPath11 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Tail");
             SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderResult, resPath11, out _gameObject11, out _wrapper11);
+            string resPath12 = ResPathUtil.GetViewEffectPath("ui_fight_new", "botton_Highlight");
+            SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderHigh, resPath12, out _gameObject12, out _wrapper12);
 
 
         }

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes