zhaoyang 2 жил өмнө
parent
commit
0e2de2b0df

+ 2 - 4
FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -2,9 +2,7 @@
 <component size="221,222" overflow="hidden">
   <displayList>
     <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>
+    <loader id="n12_ehs9" name="loaIcon" xy="110,111" pivot="0.5,0.5" anchor="true" size="140,140" group="n21_qr4e" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
     <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"/>
@@ -13,7 +11,7 @@
     <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="n29_pu55" name="n29" xy="21,91" size="178,40" group="n21_qr4e" advanced="true"/>
     <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"/>

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

@@ -2,8 +2,8 @@
 <component size="321,919" overflow="hidden">
   <displayList>
     <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"/>
+    <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="杨贵妃"/>
     <image id="n6_orst" name="imgLock" src="orst1w" fileName="images/dndn_dih.png" xy="26,0"/>
   </displayList>

+ 2 - 2
FGUIProject/assets/Studio/components/ListRewardItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="902,151">
+<component size="902,151" overflow="hidden">
   <displayList>
     <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">
+    <list id="n3_rqo4" name="listReward" xy="343,-39" pivot="1,0.5" size="523,229" layout="row" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="right">
       <item/>
       <item/>
     </list>

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -64,6 +64,8 @@ namespace GFGGame
             item.m_listReward.data = cfg.itemsArr;
             item.m_listReward.itemRenderer = RenderListRewardItem;
             item.m_listReward.numItems = cfg.itemsArr.Length;
+            item.m_listReward.SetScale(0.6f, 0.6f);
+
             UI_ListRewardItem.ProxyEnd();
         }
         private void RenderListRewardItem(int index, GObject obj)

+ 8 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -108,7 +108,14 @@ namespace GFGGame
             }
 
             MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;
-            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel);
+            if (!string.IsNullOrEmpty(storyLevelCfg.storyStartID))
+            {
+                StoryController.ShowFilingStoryDialog(storyLevelCfg);
+            }
+            else
+            {
+                InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel);
+            }
         }
         private void OnBtnChangeClick()
         {

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes