浏览代码

查阅建档

zhaoyang 2 年之前
父节点
当前提交
b80ef86a50

+ 3 - 1
FGUIProject/assets/Studio/components/ComIcon.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="247,741" overflow="hidden">
   <displayList>
-    <loader id="n2_hbio" name="loaIcon" xy="123,371" pivot="0.5,0.5" anchor="true" size="1625,2232" scale="0.33,0.33" url="ui://xz8kxrecpu552a" fill="scaleMatchHeight" autoSize="true"/>
+    <loader id="n2_hbio" name="loaIcon" xy="-176,-159" size="600,900" aspect="true" url="ui://xz8kxrecpu552a" align="center" vAlign="bottom" fill="scaleMatchHeight">
+      <relation target="" sidePair="bottom-bottom"/>
+    </loader>
   </displayList>
 </component>

+ 2 - 1
FGUIProject/assets/Studio/components/ListNpcItem.xml

@@ -4,7 +4,8 @@
     <image id="n4_orst" name="n4" src="orst1x" fileName="images/dndn_dik.png" xy="26,0"/>
     <component id="n2_hbio" name="ComIcon" src="pu5526" fileName="components/ComIcon.xml" xy="30,145"/>
     <image id="n5_orst" name="n5" src="orst1y" fileName="images/dndn_mzk.png" xy="36,637"/>
-    <text id="n3_hbio" name="txtName" xy="23,671" pivot="0.5,0.5" size="78,151" font="ui://eg2y0ldpj48o97" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="height" strokeColor="#7d6847" strokeSize="2" text="杨贵妃"/>
+    <text id="n3_hbio" name="txtName" xy="27,671" pivot="0.5,0.5" size="70,151" font="ui://eg2y0ldpj48o97" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="height" strokeColor="#7d6847" strokeSize="2" text="杨贵妃"/>
+    <text id="n7_wono" name="txtNone" xy="51,671" pivot="0.5,0.5" size="22,151" font="ui://eg2y0ldpj48o97" fontSize="40" color="#f5eed7" align="center" vAlign="middle" leading="0" autoSize="none" strokeColor="#7d6847" strokeSize="2" text="???"/>
     <image id="n6_orst" name="imgLock" src="orst1w" fileName="images/dndn_dih.png" xy="26,0"/>
   </displayList>
 </component>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListNpcItem.cs

@@ -9,6 +9,7 @@ namespace UI.Studio
         public GComponent target;
         public UI_ComIcon m_ComIcon;
         public GTextField m_txtName;
+        public GTextField m_txtNone;
         public GImage m_imgLock;
         public const string URL = "ui://xz8kxrechbio1u";
         public const string PACKAGE_NAME = "Studio";
@@ -59,6 +60,7 @@ namespace UI.Studio
         {
             m_ComIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("ComIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtNone = (GTextField)comp.GetChild("txtNone");
             m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
@@ -66,6 +68,7 @@ namespace UI.Studio
             m_ComIcon.Dispose();
             m_ComIcon = null;
             m_txtName = null;
+            m_txtNone = null;
             m_imgLock = null;
             if(disposeTarget && target != null)
             {

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -74,10 +74,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 = ResPathUtil.GetNpcPicFPath(cfg.res);
-            // item.m_ComIcon.m_loaIcon.width = item.m_ComIcon.m_loaIcon.image.width;
+            item.m_ComIcon.m_loaIcon.url = isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
+            item.m_txtName.visible = isPass;
+            item.m_txtNone.visible = !isPass;
             item.target.data = cfg;
             if (cfg.id == StudioDataManager.Instance.filingChapterId)
             {

二进制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


二进制
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes