战斗选卡名字

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,9 +2,10 @@
 <component size="1080,831" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
-  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
+    <loader id="n116_o4m7" name="n116" xy="0,127" size="1080,704" group="n115_o9gh"/>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
     <loader id="n101_qkjs" name="loaRarity" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
@@ -88,13 +89,13 @@
       <item/>
       <item/>
     </list>
-    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="280,520" group="n112_o9gh">
+    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="540,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="2,3"/>
     </image>
-    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="610,520" group="n112_o9gh">
+    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="870,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="3"/>
     </image>
-    <group id="n112_o9gh" name="n112" xy="280,520" size="520,40" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
+    <group id="n112_o9gh" name="n112" xy="540,520" size="0,0" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n114_o9gh" name="btnUpSkillLv" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n113_o9gh">
@@ -104,7 +105,7 @@
       <gearDisplay controller="ctrlTab" pages="2"/>
     </group>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="75,331" size="290,70" group="n22_842s">
-      <Button controller="ctrlTab" page="0"/>
+      <Button checked="true" controller="ctrlTab" page="0"/>
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="395,331" size="290,70" group="n22_842s">
@@ -112,7 +113,7 @@
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="715,331" size="290,70" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="2"/>
+      <Button controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="75,331" size="930,70" group="n115_o9gh" advanced="true" layout="hz" colGap="30" excludeInvisibles="true"/>
@@ -122,6 +123,6 @@
       <item/>
       <item/>
     </list>
-    <group id="n115_o9gh" name="n115" xy="0,-212" size="1080,1039"/>
+    <group id="n115_o9gh" name="n115" xy="0,-212" size="1080,1043"/>
   </displayList>
 </component>

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

@@ -84,7 +84,7 @@ namespace GFGGame
 
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
-            _ui.m_txtName.text = cfg.name;
+            _ui.m_txtName.text = cardList[index].itemCfg.name;
 
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             _ui.m_listSkill.data = skillCfgs;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -75,11 +75,11 @@ namespace GFGGame
             StudioCfg cfg = StudioDataManager.Instance.FilingDatas[index];
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
-            item.m_ComIcon.m_loaIcon.url = isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_imgLock.visible = !isPass;
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
+            item.m_imgLock.visible = true;
             item.m_txtName.text = cfg.name;
             item.m_txtName.visible = isPass;
-            item.m_txtNone.visible = !isPass;
+            item.m_txtNone.visible = false;
             item.target.data = cfg;
             if (cfg.id == StudioDataManager.Instance.filingChapterId)
             {