beiguoxia 3 éve
szülő
commit
ba50643eba
55 módosított fájl, 168 hozzáadás és 59 törlés
  1. 3 3
      FGUIProject/assets/ClothingSynthetic/components/Component3.xml
  2. 1 1
      FGUIProject/assets/ClothingSynthetic/package.xml
  3. 1 1
      FGUIProject/assets/CommonGame/BuyCountUI.xml
  4. BIN
      FGUIProject/assets/CommonGame/bgimg/ejzjm_bj.jpg
  5. 0 0
      FGUIProject/assets/CommonGame/bgimg/gzs_bjbj.png
  6. 0 0
      FGUIProject/assets/CommonGame/bgimg/zjm_bj_1.jpg
  7. 3 0
      FGUIProject/assets/CommonGame/package.xml
  8. 1 1
      FGUIProject/assets/Loading/LoadingView.xml
  9. 3 3
      FGUIProject/assets/Main/RoleInfoUI.xml
  10. 3 1
      FGUIProject/assets/Main/StoryLevelInfoUI.xml
  11. 1 1
      FGUIProject/assets/Studio/StudioEctypeUI.xml
  12. 13 13
      FGUIProject/assets/Studio/StudioUI.xml
  13. 3 6
      FGUIProject/assets/Studio/components/ComEctype.xml
  14. BIN
      FGUIProject/assets/Studio/images/ejzjm_1.png
  15. BIN
      FGUIProject/assets/Studio/images/ejzjm_2.png
  16. BIN
      FGUIProject/assets/Studio/images/ejzjm_3.png
  17. BIN
      FGUIProject/assets/Studio/images/ejzjm_4.png
  18. BIN
      FGUIProject/assets/Studio/images/ejzjm_gbzt.png
  19. BIN
      FGUIProject/assets/Studio/images/zjm_anhui.png
  20. BIN
      FGUIProject/assets/Studio/images/zjm_rk_10.png
  21. BIN
      FGUIProject/assets/Studio/images/zjm_rk_11.png
  22. BIN
      FGUIProject/assets/Studio/images/zjm_rk_8.png
  23. BIN
      FGUIProject/assets/Studio/images/zjm_rk_9.png
  24. 5 7
      FGUIProject/assets/Studio/package.xml
  25. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzd.png
  26. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzfj.png
  27. BIN
      FGUIProject/assets/XiuFang/images/tzhc_fzsj.png
  28. BIN
      FGUIProject/assets/XiuFang/images/tzhc_tzhc.png
  29. 1 1
      GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs
  30. 0 8
      GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs
  31. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Component3.cs
  32. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs
  33. 5 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs
  34. 21 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs
  35. 2 2
      GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs
  36. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  37. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  38. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes
  39. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png
  40. 1 1
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png.meta
  41. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png
  42. 1 1
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png.meta
  43. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png
  44. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png.meta
  45. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  46. BIN
      GameClient/Assets/ResIn/UI/Loading/Loading_fui.bytes
  47. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  48. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png
  49. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png
  50. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes
  51. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png
  52. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png
  53. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png
  54. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png
  55. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes

+ 3 - 3
FGUIProject/assets/ClothingSynthetic/components/Component3.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="101,34">
   <displayList>
-    <image id="n34_ja9w" name="n34" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,3"/>
-    <text id="n35_ja9w" name="txtProgess" xy="12,0" size="48,34" fontSize="24" color="#e5ded7" text="0/0"/>
-    <image id="n36_ja9w" name="loaderPlus" src="ja9w1i" fileName="images/jiahao.png" xy="69,7"/>
+    <image id="n34_ja9w" name="n34" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="-8,3" size="118,28"/>
+    <image id="n36_ja9w" name="loaderPlus" src="ja9w1i" fileName="images/jiahao.png" xy="84,7"/>
+    <text id="n35_ja9w" name="txtProgess" xy="2,0" pivot="0.5,0.5" size="88,34" fontSize="24" color="#e5ded7" letterSpacing="-1" text="100/10"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/ClothingSynthetic/package.xml

@@ -40,7 +40,7 @@
     <image id="ja9w1g" name="hc_kuang_2.png" path="/images/"/>
     <image id="ja9w1h" name="hc_xiant_2.png" path="/images/"/>
     <image id="ja9w1i" name="jiahao.png" path="/images/"/>
-    <image id="ja9w1j" name="hc_kuang_6.png" path="/images/"/>
+    <image id="ja9w1j" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="25,7,50,14"/>
     <component id="lwri1k" name="Component3.xml" path="/components/"/>
     <image id="842s1l" name="hc_bj_1.jpg" path="/images/"/>
     <image id="f5bl1m" name="hc_kuang_3.png" path="/images/"/>

+ 1 - 1
FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -24,7 +24,7 @@
     <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354">
       <Button title="取消"/>
     </component>
-    <text id="n24_ai2z" name="txtBuyTips" xy="314,471" pivot="0.5,0" size="308,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10缴销"/>
+    <text id="n24_ai2z" name="txtBuyTips" xy="301,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10马蹄金"/>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

BIN
FGUIProject/assets/CommonGame/bgimg/ejzjm_bj.jpg


+ 0 - 0
FGUIProject/assets/Studio/images/gzs_bjbj.png → FGUIProject/assets/CommonGame/bgimg/gzs_bjbj.png


+ 0 - 0
FGUIProject/assets/Studio/images/zjm_bj_1.jpg → FGUIProject/assets/CommonGame/bgimg/zjm_bj_1.jpg


+ 3 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -196,6 +196,9 @@
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
+    <image id="kqhdp" name="gzs_bjbj.png" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="es2qti0" name="ejzjm_bj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/bgimg/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Loading/LoadingView.xml

@@ -15,7 +15,7 @@
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
     <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>
-    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" strokeColor="#333333" text="启动中...">
+    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n8_hibu" name="n8" xy="90,1722" size="900,44" advanced="true">

+ 3 - 3
FGUIProject/assets/Main/RoleInfoUI.xml

@@ -3,8 +3,8 @@
   <displayList>
     <loader id="n0_d4iw" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://mfvz4q8kmhyhd5"/>
     <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="214,313"/>
-    <text id="n2_d4iw" name="txtTitle" xy="20,22" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
-    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="304,86"/>
+    <text id="n2_d4iw" name="txtTitle" xy="-13,22" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
+    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="288,127" pivot="0.5,0.5" scale="1.6,1.6"/>
     <text id="n5_d4iw" name="txtRoleName" xy="273,313" pivot="0.5,0" size="186,61" fontSize="46" color="#a37349" align="center" text="角色名五"/>
     <text id="n6_d4iw" name="n6" xy="57,440" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
     <text id="n7_d4iw" name="n7" xy="57,500" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
@@ -29,6 +29,6 @@
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <loader id="n24_mhyh" name="loaChangeName" xy="513,331" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true"/>
-    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="263,86"/>
+    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="247,86" visible="false"/>
   </displayList>
 </component>

+ 3 - 1
FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -26,7 +26,9 @@
     <loader id="n16_t8o1" name="loaderHead" xy="210,2" pivot="0.5,0" anchor="true" size="332,558" url="ui://mfvz4q8kj48o96" autoSize="true" clearOnPublish="true"/>
     <loader id="n47_m1l9" name="loaCost" xy="812,1101" size="60,60" visible="false" url="ui://eg2y0ldpq08x4" autoSize="true"/>
     <text id="n18_t8o1" name="txtPowerDesc" xy="806,1110" size="161,39" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力:{power=5}"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,426"/>
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,426">
+      <relation target="" sidePair="top-top"/>
+    </image>
     <text id="n21_t8o1" name="txtTargetName" xy="26,167" pivot="0.5,0" size="32,395" fontSize="32" color="#dcc7b3" align="center" leading="0" autoSize="height" text="挑战对手·巴拉巴拉">
       <relation target="n34_pal5" sidePair="top-top"/>
     </text>

+ 1 - 1
FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240">
+    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240" pkg="eg2y0ldp">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n25_kqhd" name="n25" src="kqhdz" fileName="images/gzsxian_2.png" xy="61,162">

+ 13 - 13
FGUIProject/assets/Studio/StudioUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n6_fa5e" name="n6" src="kqhd1a" fileName="images/zjm_bj_1.jpg" xy="0,-240">
+    <image id="n6_fa5e" name="n6" src="es2qti0" fileName="bgimg/ejzjm_bj.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="840,910">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd17"/>
+    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
+      <relation target="" sidePair="left-left,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>
     </component>
-    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1064">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd19"/>
+    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="128,450">
+      <relation target="" sidePair="left-left,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1g"/>
     </component>
-    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1345">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd18"/>
+    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="876,191">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="820,1497">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd16"/>
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>
   </displayList>
 </component>

+ 3 - 6
FGUIProject/assets/Studio/components/ComEctype.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="198,198">
+<component size="84,403">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_n3xh" name="icon" xy="-23,-9" size="236,218" url="ui://xz8kxreckqhd19" autoSize="true"/>
-    <image id="n3_n3xh" name="img" src="mnxr1c" fileName="images/zjm_anhui.png" xy="0,0">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n2_rbxq" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="63,80">
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="84,403" url="ui://xz8kxreces2q1e" autoSize="true"/>
+    <image id="n3_n3xh" name="img" src="es2q1h" fileName="images/ejzjm_gbzt.png" xy="0,4">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

BIN
FGUIProject/assets/Studio/images/ejzjm_1.png


BIN
FGUIProject/assets/Studio/images/ejzjm_2.png


BIN
FGUIProject/assets/Studio/images/ejzjm_3.png


BIN
FGUIProject/assets/Studio/images/ejzjm_4.png


BIN
FGUIProject/assets/Studio/images/ejzjm_gbzt.png


BIN
FGUIProject/assets/Studio/images/zjm_anhui.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_10.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_11.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_8.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_9.png


+ 5 - 7
FGUIProject/assets/Studio/package.xml

@@ -11,7 +11,6 @@
     <component id="n3xhi" name="Button12.xml" path="/components/"/>
     <component id="n3xhn" name="ListPropertyItem.xml" path="/components/"/>
     <image id="kqhdo" name="zpsxian_1.png" path="/images/"/>
-    <image id="kqhdp" name="gzs_bjbj.png" path="/images/" atlas="alone_npot"/>
     <image id="kqhdq" name="gzsatb_1.png" path="/images/" exported="true"/>
     <image id="kqhdr" name="gzsatb_2.png" path="/images/" exported="true"/>
     <image id="kqhds" name="gzsdi_1.png" path="/images/"/>
@@ -28,12 +27,11 @@
     <image id="kqhd13" name="gzswtb_2.png" path="/images/" exported="true"/>
     <image id="kqhd14" name="gzswtb_3.png" path="/images/" exported="true"/>
     <image id="kqhd15" name="gzswtb_4.png" path="/images/" exported="true"/>
-    <image id="kqhd16" name="zjm_rk_11.png" path="/images/"/>
-    <image id="kqhd17" name="zjm_rk_8.png" path="/images/"/>
-    <image id="kqhd18" name="zjm_rk_9.png" path="/images/"/>
-    <image id="kqhd19" name="zjm_rk_10.png" path="/images/"/>
-    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/images/" atlas="alone_npot"/>
-    <image id="mnxr1c" name="zjm_anhui.png" path="/images/"/>
+    <image id="es2q1d" name="ejzjm_4.png" path="/images/"/>
+    <image id="es2q1e" name="ejzjm_1.png" path="/images/"/>
+    <image id="es2q1f" name="ejzjm_2.png" path="/images/"/>
+    <image id="es2q1g" name="ejzjm_3.png" path="/images/"/>
+    <image id="es2q1h" name="ejzjm_gbzt.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

BIN
FGUIProject/assets/XiuFang/images/tzhc_fzd.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_fzfj.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_fzsj.png


BIN
FGUIProject/assets/XiuFang/images/tzhc_tzhc.png


+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -17,7 +17,7 @@ namespace GFGGame
             set { _dailyLoginId = value; }
         }
 
-        private int _bonusStatus = 1;
+        private int _bonusStatus = 0;
         /// <summary>
         /// 七日登录 当前奖励状态
         /// </summary>

+ 0 - 8
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -53,14 +53,6 @@ namespace GFGGame
         public bool GetMailRed()
         {
             if (MailDataManager.Instance.UnreadCount > 0) return true;
-            // Dictionary<long, MailInfo> mailInfoDic = MailDataManager.Instance.MailInfoDic;
-            // foreach (MailInfo mailInfo in mailInfoDic.Values)
-            // {
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 1) return false;//数据已排序,第一个已读,则所没有含奖邮件
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 3) return false;//数据已排序,第一个已领,则所有奖励已领
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 2) return true;//数据已排序,有奖励未领
-
-            // }
 
             return false;
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Component3.cs

@@ -7,8 +7,8 @@ namespace UI.ClothingSynthetic
     public partial class UI_Component3
     {
         public GComponent target;
-        public GTextField m_txtProgess;
         public GImage m_loaderPlus;
+        public GTextField m_txtProgess;
         public const string URL = "ui://4f294tdklwri1k";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "Component3";
@@ -56,13 +56,13 @@ namespace UI.ClothingSynthetic
 
         private void Init(GComponent comp)
         {
-            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
             m_loaderPlus = (GImage)comp.GetChild("loaderPlus");
+            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtProgess = null;
             m_loaderPlus = null;
+            m_txtProgess = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,6 @@ namespace UI.Studio
         public Controller m_c1;
         public GLoader m_icon;
         public GImage m_img;
-        public GImage m_imgLock;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComEctype";
@@ -61,14 +60,12 @@ namespace UI.Studio
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_img = (GImage)comp.GetChild("img");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_icon = null;
             m_img = null;
-            m_imgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -249,7 +249,11 @@ namespace GFGGame
         {
             DecomposeCfg cfg = DecomposeCfgArray.Instance.GetCfg(_curRarity);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.consumeId);
-
+            if (_decomposeCount <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未选择分解服装");
+                return;
+            }
             int consumeCount = cfg.consumeCount * _decomposeCount;
             if (consumeCount > ItemDataManager.GetItemNum(cfg.consumeId))
             {

+ 21 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -72,11 +72,30 @@ namespace GFGGame
         {
             // obj.data = _listItemDatas[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
+            string name = "";
+            string iconRes = "";
+            string ext = "png";
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
-            item.m_comRewardItem.m_txtName.text = itemCfg.name;
+
+            if (suitCfg != null)
+            {
+                name = suitCfg.name;
+                iconRes = suitCfg.res;
+            }
+            else
+            {
+                name = itemCfg.name;
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+                iconRes = itemCfg.res;
+            }
+
+            item.m_comRewardItem.m_txtName.text = name;
             // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
             item.m_comRewardItem.m_txtCount.text = string.Format("x{0}", _listItemDatas[index].num);
-            item.m_comRewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_comRewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
+
             item.m_comRewardItem.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zl");
             int childIndex = _ui.m_comListReward.m_listReward.ItemIndexToChildIndex(index);

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -38,10 +38,10 @@ namespace GFGGame
             base.OnShown();
             ViewManager.SetMaskAlpha(0.8f);
 
-            _cfgs = DailyLoginCfgArray.Instance.GetCfgs("1");
+            _cfgs = DailyLoginCfgArray.Instance.GetCfgs((int)ConstBonusType.Item);
             _ui.m_list.numItems = _cfgs.Count;
             _ui.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_7";
-            _ui.m_loaIcon.data = DailyLoginCfgArray.Instance.GetCfgs("2")[0];
+            _ui.m_loaIcon.data = DailyLoginCfgArray.Instance.GetCfgs((int)ConstBonusType.Suit)[0];
         }
 
         protected override void OnHide()

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -112,6 +112,7 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
             _ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
+            _ui.m_txtRecommendCount.SetVar("v2", GlobalCfgArray.globalCfg.recommendCount.ToString()).FlushVars();
             _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = EquipDataCache.cacher.autoPlay;

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


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4bcfcfc65ecec984eb30826cfc6b9140
+guid: 845e52a898fcf7c4a8798884dfe5e770
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ef20342acda61e4d92c4cbceb81f8a8
+guid: ff995218236889445a810799ed2c14ae
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9674e399a3d101e49a2c50eb874ad3b4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


BIN
GameClient/Assets/ResIn/UI/Loading/Loading_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes