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

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="500,900" overflow="hidden" opaque="false">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n24_pac9" name="n24" src="pac9tjx" fileName="imagesGallery/hl_cjkuangdiban.png" xy="4,1" size="493,889" group="n23_pac9">
       <relation target="" sidePair="height-height"/>
@@ -9,7 +9,7 @@
     <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903" group="n23_pac9">
       <relation target="n15_r9ri" sidePair="height-height"/>
     </image>
-    <text id="n16_r9ri" name="txtName" xy="20,838" size="187,42" group="n22_r9ri" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <text id="n16_r9ri" name="txtName" xy="20,838" size="211,42" group="n22_r9ri" fontSize="30" color="#ac9370" leading="0" text="名字名字名字啊"/>
     <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="273,841" size="80,42" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>

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

@@ -704,6 +704,7 @@ namespace GFGGame
 
             _ui.m_comClick.m_comResult.m_t1.Stop(true, false);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
+            _ui.m_comClick.m_comResult.target.visible = false;
         }
         private void CheckGuide(object param)
         {

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

@@ -62,7 +62,7 @@ namespace GFGGame
                 PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfg(skillId);
                 _ui.m_comSkillShow.m_txtName.text = skillCfg.name;
                 _ui.m_comSkillShow.m_ComSkillScore.m_txtCount.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
-                _ui.m_comSkillShow.m_ComSkillScore.m_txtCount1.SetVar("value", skillScoreDic[skillId].ToString()).FlushVars();
+                _ui.m_comSkillShow.m_ComSkillScore.m_txtCount1.SetVar("value", Math.Abs(skillScoreDic[skillId]).ToString()).FlushVars();
                 _ui.m_comSkillShow.m_ComSkillScore.m_c1.selectedIndex = skillScoreDic[skillId] >= 0 ? 0 : 1;
                 string res = skillCfg.res;
                 if (string.IsNullOrEmpty(skillCfg.res))
@@ -106,6 +106,9 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_comSkillShow.m_t0.Stop(true, false);
+            _ui.m_comSkillShow.m_t1.Stop(true, false);
+            _ui.m_t1.Stop(true, false);
             EventAgent.DispatchEvent(ConstMessage.SHOW_CARD_SKILL_END);
         }
     }