公用机提交

FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="221,280" overflow="hidden">
+<component size="221,222" overflow="hidden">
   <displayList>
-    <image id="n11_ehs9" name="n11" src="j48o99" fileName="images/kp_sjsj_di_3.png" xy="16,0" group="n21_qr4e"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="112,97" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
-    <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
-    <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
-    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="21,80" group="n21_qr4e"/>
-    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="21,80" group="n21_qr4e"/>
-    <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" group="n21_qr4e" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <image id="n25_pu55" name="n25" src="orsttit" fileName="images/wpbb_di.png" xy="0,0" group="n21_qr4e"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="109,115" pivot="0.5,0.5" anchor="true" size="140,140" group="n21_qr4e" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" visible="false" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
+    <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" group="n21_qr4e" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" group="n21_qr4e" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <loader id="n19_tc53" name="loaShouTongReward" xy="32,81" size="160,40" group="n21_qr4e" url="ui://eg2y0ldptc539z" autoSize="true"/>
-    <image id="n13_ehs9" name="n13" src="j48o9a" fileName="images/kp_sjsj_di_4.png" xy="32,162" group="n20_ox5b"/>
-    <text id="n15_ehs9" name="txtCount" xy="111,159" pivot="0.5,0" anchor="true" size="32,34" group="n20_ox5b" fontSize="24" color="#fff8ea" vars="true" text="x{count=0}"/>
-    <group id="n20_ox5b" name="grpCount" xy="32,159" size="160,34" group="n21_qr4e" advanced="true"/>
+    <text id="n15_ehs9" name="txtCount" xy="204,178" pivot="1,0" anchor="true" size="50,36" group="n21_qr4e" fontSize="26" color="#fbf6eb" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=20}"/>
+    <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="21,91" group="n29_pu55"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="21,91" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="21,91" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="30,91" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="21,91" size="178,40" group="n21_qr4e"/>
     <group id="n21_qr4e" name="n21" xy="-3,0" size="228,279"/>
+    <image id="n24_pu55" name="n24" src="pu55tiw" fileName="images/pfjl_and.png" xy="0,1" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="68,86" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="0,1" size="221,220" visible="false" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -222,6 +222,9 @@
     <component id="si5ztin" name="Button2.xml" path="/components/"/>
     <component id="si5ztio" name="Button3.xml" path="/components/"/>
     <component id="si5ztip" name="Button16.xml" path="/components/"/>
+    <image id="orsttis" name="pfjl_ywc.png" path="/images/"/>
+    <image id="orsttit" name="wpbb_di.png" path="/images/"/>
+    <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/StudioFilingNpcUI.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,1000">
+<component size="1080,1920">
   <displayList>
-    <image id="n5_hbio" name="n5" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="800,1000"/>
-    <list id="n1_hbio" name="list" xy="0,0" size="800,1000" layout="flow_hz" overflow="scroll" defaultItem="ui://xz8kxrechbio1u">
+    <component id="n6_orst" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n8_orst">
+      <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://eg2y0ldpsi5zti5"/>
+    </component>
+    <image id="n7_orst" name="n7" src="orst1z" fileName="images/dndn_zi.png" xy="189,216" group="n8_orst"/>
+    <group id="n8_orst" name="n8" xy="40,196" size="257,95"/>
+    <list id="n1_hbio" name="list" xy="0,500" size="1080,919" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://xz8kxrechbio1u">
+      <relation target="" sidePair="middle-middle"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Studio/StudioFilingRewardUI.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="824,993">
+<component size="1008,1182">
   <displayList>
-    <image id="n0_rqo4" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="824,993"/>
-    <text id="n1_rqo4" name="txtScore" xy="248,132" pivot="0.5,0" size="328,54" fontSize="40" text="本章评分：99999"/>
-    <list id="n4_rqo4" name="list" xy="67,250" size="690,575" overflow="scroll" defaultItem="ui://xz8kxrecrqo41p">
+    <image id="n0_rqo4" name="n0" src="orst22" fileName="images/pfjl_dik.png" xy="0,0"/>
+    <text id="n1_rqo4" name="txtScore" xy="672,160" pivot="1,0" size="276,46" fontSize="34" color="#6f6553" text="本章评分：99999"/>
+    <list id="n4_rqo4" name="list" xy="53,212" size="902,782" overflow="scroll" lineGap="30" defaultItem="ui://xz8kxrecrqo41p" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n6_rqo4" name="btnGet" src="rqo41q" fileName="components/Button5.xml" xy="340,870" size="148,62"/>
+    <component id="n6_rqo4" name="btnGet" src="rqo41q" fileName="components/Button5.xml" xy="347,1038"/>
+    <image id="n7_orst" name="n7" src="orst21" fileName="images/pfjl_btbt.png" xy="388,97"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/Button5.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="314,89" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_rqo4" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_rqo4" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_rqo4" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_orst" name="n3" src="orst20" fileName="images/pfjl_anniu.png" xy="0,0"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/Studio/components/ComIcon.xml

@@ -0,0 +1,6 @@
+<?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"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/components/ComNpcItemSelect.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="136,136">
+<component size="321,919">
   <displayList>
-    <image id="n4_hbio" name="n4" src="kqhdt" fileName="images/gzsdi_2.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n5_pu55" name="n5" src="pu5525" fileName="components/dndn_xzk.png" xy="0,87"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/ListNpcItem.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="300,500">
+<component size="321,919" overflow="hidden">
   <displayList>
-    <loader id="n2_hbio" name="loaIcon" xy="0,0" size="300,450" aspect="true" fill="scaleMatchHeight"/>
-    <text id="n3_hbio" name="txtName" xy="145,446" pivot="0.5,0" size="10,54" fontSize="40" text=""/>
+    <image id="n4_orst" name="n4" src="orst1x" fileName="images/dndn_dik.png" xy="26,0"/>
+    <image id="n5_orst" name="n5" src="orst1y" fileName="images/dndn_mzk.png" xy="36,637"/>
+    <component id="n2_hbio" name="ComIcon" src="pu5526" fileName="components/ComIcon.xml" xy="30,145"/>
+    <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="杨贵妃"/>
+    <image id="n6_orst" name="imgLock" src="orst1w" fileName="images/dndn_dih.png" xy="26,0"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/ListRewardItem.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="806,142">
+<component size="902,151">
   <displayList>
-    <text id="n2_rqo4" name="txtDesc" xy="0,31" size="328,54" fontSize="40" text="总评分达到99999"/>
-    <list id="n3_rqo4" name="listReward" xy="413,2" size="442,202" scale="0.6,0.6" layout="row" colGap="20" defaultItem="ui://eg2y0ldpj48o98">
+    <image id="n4_orst" name="n4" src="orst23" fileName="images/pfjl_xiaodik.png" xy="0,0"/>
+    <text id="n2_rqo4" name="txtDesc" xy="67,49" size="296,49" fontSize="36" color="#7d6446" text="总评分达到99999"/>
+    <list id="n3_rqo4" name="listReward" xy="343,-39" pivot="1,0.5" size="523,229" scale="0.6,0.6" layout="row" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="right">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Studio/package.xml

@@ -45,6 +45,18 @@
     <component id="rqo41t" name="ListLevel.xml" path="/components/"/>
     <component id="hbio1u" name="ListNpcItem.xml" path="/components/"/>
     <component id="hbio1v" name="ComNpcItemSelect.xml" path="/components/" exported="true"/>
+    <image id="orst1w" name="dndn_dih.png" path="/images/"/>
+    <image id="orst1x" name="dndn_dik.png" path="/images/"/>
+    <image id="orst1y" name="dndn_mzk.png" path="/images/"/>
+    <image id="orst1z" name="dndn_zi.png" path="/images/"/>
+    <image id="orst20" name="pfjl_anniu.png" path="/images/"/>
+    <image id="orst21" name="pfjl_btbt.png" path="/images/"/>
+    <image id="orst22" name="pfjl_dik.png" path="/images/"/>
+    <image id="orst23" name="pfjl_xiaodik.png" path="/images/"/>
+    <image id="orst24" name="wpbb_zi.png" path="/images/"/>
+    <image id="pu5525" name="dndn_xzk.png" path="/components/"/>
+    <component id="pu5526" name="ComIcon.xml" path="/components/"/>
+    <image id="ng0i27" name="xunxiang.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -9,14 +9,14 @@ namespace UI.CommonGame
         public GComponent target;
         public GLoader m_loaIcon;
         public GTextField m_txtName;
-        public GImage m_imgGot;
-        public GImage m_imgHas;
-        public GImage m_imgNotHas;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
-        public GLoader m_loaShouTongReward;
         public GTextField m_txtCount;
-        public GGroup m_grpCount;
+        public GImage m_imgGot;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComItem";
@@ -66,27 +66,27 @@ namespace UI.CommonGame
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_imgGot = (GImage)comp.GetChild("imgGot");
-            m_imgHas = (GImage)comp.GetChild("imgHas");
-            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_loaShouTongReward = (GLoader)comp.GetChild("loaShouTongReward");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_grpCount = (GGroup)comp.GetChild("grpCount");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_txtName = null;
-            m_imgGot = null;
-            m_imgHas = null;
-            m_imgNotHas = null;
             m_txtHasCount = null;
             m_loaRarity = null;
-            m_loaShouTongReward = null;
             m_txtCount = null;
-            m_grpCount = null;
+            m_imgGot = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComIcon.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ComIcon
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://xz8kxrecpu5526";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ComIcon";
+        private static UI_ComIcon _proxy;
+
+        public static UI_ComIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComIcon.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f3bb9b5185518b14c835d18c37e232c4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListNpcItem.cs

@@ -7,8 +7,9 @@ namespace UI.Studio
     public partial class UI_ListNpcItem
     {
         public GComponent target;
-        public GLoader m_loaIcon;
+        public UI_ComIcon m_ComIcon;
         public GTextField m_txtName;
+        public GImage m_imgLock;
         public const string URL = "ui://xz8kxrechbio1u";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListNpcItem";
@@ -56,13 +57,16 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_ComIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("ComIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaIcon = null;
+            m_ComIcon.Dispose();
+            m_ComIcon = null;
             m_txtName = null;
+            m_imgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingNpcUI.cs

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_StudioFilingNpcUI
     {
         public GComponent target;
+        public GButton m_btnback;
         public GList m_list;
         public const string URL = "ui://xz8kxrecrqo41j";
         public const string PACKAGE_NAME = "Studio";
@@ -55,10 +56,12 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_btnback = (GButton)comp.GetChild("btnback");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnback = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -12,8 +12,8 @@ namespace GFGGame
         private GImage _imgGot;
         private GImage _imgNotHas;
         private GImage _imgHas;
-        private GLoader _loaShouTongRewardVisble;
-        private GGroup _grpCount;
+        private GImage _imgShouTong;
+        // private GGroup _grpCount;
         private bool _showTips = true;
 
 
@@ -30,8 +30,8 @@ namespace GFGGame
             _imgGot = obj.GetChild("imgGot") as GImage;
             _imgNotHas = obj.GetChild("imgNotHas") as GImage;
             _imgHas = obj.GetChild("imgHas") as GImage;
-            _loaShouTongRewardVisble = obj.GetChild("loaShouTongReward") as GLoader;
-            _grpCount = obj.GetChild("grpCount") as GGroup;
+            _imgShouTong = obj.GetChild("imgShowTong") as GImage;
+            // _grpCount = obj.GetChild("grpCount") as GGroup;
             // AddClickListener();
             _obj.onClick.Remove(AddClickListener);
             _obj.onClick.Add(AddClickListener);
@@ -60,8 +60,8 @@ namespace GFGGame
             _imgGot.visible = false;
             _imgNotHas.visible = false;
             _imgHas.visible = false;
-            _loaShouTongRewardVisble.visible = false;
-            _grpCount.visible = true;
+            _imgShouTong.visible = false;
+            // _grpCount.visible = true;
             _showTips = true;
 
             _txtName.text = itemCfg.name;
@@ -122,39 +122,39 @@ namespace GFGGame
             }
         }
         /// <summary>
-
-
         /// <summary>
-        /// 显示拥有数量
+        /// "首通奖励"显示状态
         /// </summary>
         /// <value></value>
-        public bool ShowHasCount
+        public bool ImgShouTongVisable
         {
             get
             {
-                return _txtHasCount.visible;
+                return _imgShouTong.visible;
             }
             set
             {
-                _txtHasCount.visible = value;
+                _imgShouTong.visible = value;
             }
         }
 
         /// <summary>
-        /// 显示首通奖励标志
+        /// 显示拥有数量
         /// </summary>
         /// <value></value>
-        public bool ShowShouTongSign
+        public bool ShowHasCount
         {
             get
             {
-                return _loaShouTongRewardVisble.visible;
+                return _txtHasCount.visible;
             }
             set
             {
-                _loaShouTongRewardVisble.visible = value;
+                _txtHasCount.visible = value;
             }
         }
+
+
         /// <summary>
         /// 显示名字
         /// </summary>
@@ -177,17 +177,17 @@ namespace GFGGame
                 _loaRarity.visible = value;
             }
         }
-        /// <summary>
-        /// 显示数量
-        /// </summary>
-        /// <value></value>
-        public bool ShowCount
-        {
-            set
-            {
-                _grpCount.visible = value;
-            }
-        }
+        // /// <summary>
+        // /// 显示数量
+        // /// </summary>
+        // /// <value></value>
+        // public bool ShowCount
+        // {
+        //     set
+        //     {
+        //         _grpCount.visible = value;
+        //     }
+        // }
         /// <summary>
         /// 展示详情tips
         /// </summary>

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

@@ -170,7 +170,7 @@ namespace GFGGame
             }
             (item.data as ItemView).SetData(itemData);
             List<ItemData> bonusOnceData = StoryBonusDataCache.GetBonusData(_levelID).bonusOnce;
-            (item.data as ItemView).ShowShouTongSign = !InstanceZonesDataManager.CheckLevelPass(_levelID) && index < bonusOnceData.Count;
+            (item.data as ItemView).ImgShouTongVisable = !InstanceZonesDataManager.CheckLevelPass(_levelID) && index < bonusOnceData.Count;
             UI_ComItem.ProxyEnd();
         }
 

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

@@ -31,9 +31,11 @@ namespace GFGGame
             packageName = UI_StudioFilingNpcUI.PACKAGE_NAME;
             _ui = UI_StudioFilingNpcUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
+            isfullScreen = true;
+            // this.viewCom.Center();
             this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            viewAnimationType = EnumViewAnimationType.None;
+            this.clickBlankToClose = false;
 
             _comSelect = new GComponent();
             _comSelect = UIPackage.CreateObject(UI_StudioFilingNpcUI.PACKAGE_NAME, "ComNpcItemSelect").asCom;
@@ -41,7 +43,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
-
+            _ui.m_btnback.onClick.Add(this.Hide);
 
         }
         protected override void AddEventListener()
@@ -72,8 +74,9 @@ namespace GFGGame
             StudioCfg cfg = StudioDataManager.Instance.FilingDatas[index];
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
-            string res = isPass ? cfg.res : cfg.res1;
-            item.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(res);
+            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_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.target.data = cfg;
             if (cfg.id == StudioDataManager.Instance.filingChapterId)

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

@@ -1,7 +1,9 @@
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
+using UI_ListRewardItem = UI.Studio.UI_ListRewardItem;
 
 namespace GFGGame
 {
@@ -59,12 +61,23 @@ namespace GFGGame
             FilingRewardCfg cfg = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             item.m_txtDesc.text = string.Format("总评分达到{0}", cfg.score);
+            item.m_listReward.data = cfg.itemsArr;
             item.m_listReward.itemRenderer = RenderListRewardItem;
+            item.m_listReward.numItems = cfg.itemsArr.Length;
             UI_ListRewardItem.ProxyEnd();
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
+            int[][] rewards = (int[][])obj.parent.data;
+            UI_ComItem item = UI_ComItem.Proxy(obj);
+            ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
 
+            UI_ComItem.ClearProxy();
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -37,6 +37,8 @@ namespace GFGGame
             FontManager.RegisterFont(new DynamicFont("SIMKAI", afont2));
             Font afont3 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SHUANGYUJUTI"));
             FontManager.RegisterFont(new DynamicFont("SHUANGYUJUTI", afont3));
+            // Font afont4 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("WDDYKJT"));
+            // FontManager.RegisterFont(new DynamicFont("WDDYKJT", afont4));
             _viewDic = new Dictionary<string, UIView>();
             //��ʼ����ͼ������
             _bottomLayer = CreateLayer("BottomLayer");