Merge branch 'master' of http://10.108.64.190:3000/gfg/Client

* 'master' of http://10.108.64.190:3000/gfg/Client:
  七日签到替换资源
  替换资源
  七日签到替换资源
  田野调查自动登封造极

FGUIProject/assets/DailyWelfare/components/ListItem.xml

@@ -3,8 +3,8 @@
   <displayList>
     <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://t8nwuj7iox5ba" autoSize="true"/>
     <loader id="n3_ox5b" name="loaIcon" xy="60,98" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleMatchHeight"/>
-    <text id="n6_ox5b" name="txtNum" xy="171,220" size="67,44" fontSize="32" color="#be675e" text="X88"/>
+    <text id="n6_ox5b" name="txtNum" xy="171,220" size="59,44" fontSize="32" color="#be675e" text="X88"/>
     <text id="n5_ox5b" name="txtName" xy="99,281" pivot="0.5,0" size="71,46" fontSize="34" color="#91a08b" text="名字"/>
-    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0"/>
+    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0" pivot="0.5,0.5"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,6 +1,6 @@
 <?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>
     <graph id="n28_qkjs" name="holderResult" xy="130,130" pivot="0.5,0.5" anchor="true" size="30,30" type="rect"/>
     <image id="n18_f2bf" name="n18" src="qkjsli" fileName="imagesNew/font_zdqp_dikuang.png" xy="122,126" pivot="0.48,0.48" anchor="true" visible="false"/>
@@ -31,7 +31,7 @@
     <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="n27_qkjs" value="true"/>
-    <item time="28" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
+    <item time="30" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
     <item time="42" type="Visible" target="n21_f2bf" value="false"/>
   </transition>
   <transition name="t1">

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

@@ -567,11 +567,11 @@ namespace GFGGame
         {
             //登峰造极评分开始
             _isAllPerfect = true;
-            _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
+            _ui.m_comClick.target.touchable = !_isAutoPlay;
             _ui.m_comClick.m_comAllPerfect.target.visible = true;
-            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = FightDataManager.Instance.autoPlay ? 1 : 0;
+            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = _isAutoPlay ? 1 : 0;
             _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
-            if (FightDataManager.Instance.autoPlay)
+            if (_isAutoPlay)
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play(OnComAllCircleClickBegin);
             }
@@ -602,7 +602,7 @@ namespace GFGGame
             Timers.inst.Remove(ComAllCirclePressTime);
 
             int allCircleScore = 0;
-            if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || FightDataManager.Instance.autoPlay)
+            if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || _isAutoPlay)
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
@@ -683,6 +683,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Stop(true, false);
 
             _isAllPerfect = false;
+            _prefectCount = 0;
 
             _ui.m_proScore.m_txtNpcScore.text = "";
             _ui.m_proScore.m_txtMineScore.text = "";