zhaoyang 2 år sedan
förälder
incheckning
076bde7a12

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

@@ -10,8 +10,8 @@
     <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="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"/>
+    <graph id="n13_c2um" name="holder1" xy="127,129" size="1,1" group="n22_f2bf" visible="false"/>
+    <graph id="n14_ecw3" name="holder2" xy="127,129" 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">
       <gearDisplay controller="c1" pages="0"/>
     </text>
@@ -30,8 +30,8 @@
     <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="26" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
     <item time="26" type="Visible" target="n27_qkjs" value="true"/>
+    <item time="28" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
     <item time="42" type="Visible" target="n21_f2bf" value="false"/>
   </transition>
   <transition name="t1">

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

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -73,6 +73,7 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject9, _wrapper9);
             SceneController.DestroyObjectFromView(_gameObject10, _wrapper10);
             SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
+            SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
 
             if (_ui != null)
             {

+ 45 - 6
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -21,13 +21,27 @@ namespace GFGGame
         // private FightRobotData targetRobotData;
 
 
+        private GameObject _gameObject1;
         private GameObject _gameObject2;
-        private GoWrapper _wrapper2;
+        private GameObject _gameObject5;
+        private GameObject _gameObject6;
+        private GameObject _gameObject7;
+        private GameObject _gameObject8;
+        private GameObject _gameObject9;
+        private GameObject _gameObject10;
+        private GameObject _gameObject11;
+        private GameObject _gameObject12;
 
-        private GameObject _gameObject1;
+        private GoWrapper _wrapper2;
         private GoWrapper _wrapper1;
-        private GameObject _gameObject5;
         private GoWrapper _wrapper5;
+        private GoWrapper _wrapper6;
+        private GoWrapper _wrapper7;
+        private GoWrapper _wrapper8;
+        private GoWrapper _wrapper9;
+        private GoWrapper _wrapper10;
+        private GoWrapper _wrapper11;
+        private GoWrapper _wrapper12;
         private NTexture _nTexture;
         private bool _isAutoPlay = false;
         // private float _speed = 1;
@@ -51,6 +65,13 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
+            SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
+            SceneController.DestroyObjectFromView(_gameObject9, _wrapper9);
+            SceneController.DestroyObjectFromView(_gameObject10, _wrapper10);
+            SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
+            SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
 
             if (_ui != null)
             {
@@ -61,12 +82,27 @@ namespace GFGGame
         }
         private void AddEffect()
         {
-            string resPath10 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_holder1, resPath10, out _gameObject1, out _wrapper1);
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
+            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_holder1, resPath3, out _gameObject1, out _wrapper1);
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
             SceneController.AddObjectToView(_gameObject2, null, _ui.m_proScore.m_holder, resPath4, out _gameObject2, out _wrapper2);
             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
             SceneController.AddObjectToView(null, null, _ui.m_comAllPerfect.m_holder, resPath5, out _gameObject5, out _wrapper5);
+
+            string resPath6 = ResPathUtil.GetViewEffectPath("ui_fight_new", "bottom_appear");
+            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", "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);
         }
 
         protected override void OnInit()
@@ -367,6 +403,7 @@ namespace GFGGame
             x = pos.x;
             y = pos.y;
             _ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
+            _ui.m_comClick.m_comResult.target.visible = true;
             // _ui.m_comClick.m_comResult.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
             _ui.m_comClick.m_comResult.target.SetXY(x, y);
 
@@ -420,7 +457,6 @@ namespace GFGGame
             _score += _partScore;
             _targetScore += _targetPartScore;
             Debug.Log("_targetScore:" + _targetScore);
-            _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
             switch (clickType)
             {
                 case ClickType.MISS_CLICK:
@@ -436,6 +472,9 @@ namespace GFGGame
             }
 
             PartScoreResultEnd();
+            _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
+            _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
+
         }
         private void PartScoreResultEnd()
         {

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