合成替换

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -12,11 +12,13 @@
     <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,774">
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
-    <component id="n21_j539" name="btnProduction" src="j53918" fileName="components/Button3.xml" xy="406,1361"/>
-    <text id="n27_j539" name="txtProgress" xy="420,1522" size="246,36" fontSize="26" color="#8c6e61" ubb="true" vars="true" text="套装制作进度：[color=#ff9966]{v1=8}[/color]/{v2=10}">
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="355,1435">
+      <Button title="制作"/>
+    </component>
+    <text id="n27_j539" name="txtProgress" xy="688,1313" size="246,36" fontSize="26" color="#8c6e61" ubb="true" vars="true" text="套装制作进度：[color=#ff9966]{v1=8}[/color]/{v2=10}">
       <relation target="" sidePair="center-center"/>
     </text>
-    <list id="n30_j539" name="listClothing" xy="74,1590" pivot="0.5,0" size="945,275" layout="flow_hz" overflow="scroll" lineGap="30" colGap="50" defaultItem="ui://4f294tdkj5391a" align="center" autoClearItems="true">
+    <list id="n30_j539" name="listClothing" xy="0,1590" pivot="0.5,0" size="1080,275" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -32,9 +34,8 @@
       <item/>
     </list>
     <text id="n38_ja9w" name="n38" xy="194,1278" size="691,41" visible="false" fontSize="30" color="#917960" text="* 系统默认保留一件衣服，余下的才能作为合成材料*"/>
-    <image id="n39_ja9w" name="n39" src="j53911" fileName="images/hc_xiant_1.png" xy="91,1487"/>
-    <image id="n41_ja9w" name="n41" src="j539t" fileName="images/hc_kuang_3.png" pkg="eg2y0ldp" xy="623,1333"/>
-    <text id="n42_ja9w" name="txtCost" xy="630,1336" size="160,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
+    <image id="n41_ja9w" name="n41" src="j539t" fileName="images/hc_kuang_3.png" pkg="eg2y0ldp" xy="441,1310"/>
+    <text id="n42_ja9w" name="txtCost" xy="448,1313" size="160,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
       <relation target="n41_ja9w" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n3_j539" name="n3" src="vek81n" fileName="images/hc_btkuang.png" xy="146,343" group="n46_v95q"/>
@@ -42,5 +43,6 @@
       <relation target="n3_j539" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
+    <component id="n48_v95q" name="n48" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1367"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/components/Button5.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="270,321" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
-  <displayList>
-    <image id="n3_v95q" name="n3" src="j539s" fileName="images/hc_kuang_1.png" xy="16,17">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
-    <image id="n8_v95q" name="n8" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,0"/>
-    <loader id="n4_v95q" name="loaderIcon" xy="81,60" size="73,73" fill="scale" shrinkOnly="true"/>
-    <text id="n5_v95q" name="txtName" xy="69,173" pivot="0.5,0" size="132,44" fontSize="32" color="#c8807b" text="材料名称">
-      <gearColor controller="button" default="#c8807b,#000000"/>
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <text id="n7_v95q" name="txtProgess" xy="73,239" pivot="0.5,0.5" size="123,46" fontSize="34" color="#b26b65" letterSpacing="-1" text="100/10">
-      <gearColor controller="button" default="#b26b65,#000000"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

FGUIProject/assets/ClothingSynthetic/components/ClothingListItem.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="186,242">
+<component size="280,280" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
   <displayList>
-    <image id="n29_j539" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="0,0" size="186,186"/>
-    <loader id="n24_j539" name="loaderIcon" xy="18,18" size="150,150" fill="scale" shrinkOnly="true"/>
-    <image id="n25_j539" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="-27,73"/>
-    <text id="n26_j539" name="txtName" xy="31,200" pivot="0.5,0" size="122,41" fontSize="30" color="#5e5b5a" text="服装名称"/>
+    <image id="n3_v95q" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="15,16"/>
+    <image id="n7_v95q" name="n7" src="v95q29" fileName="images/hc_kuang_4.png" xy="0,1">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n4_v95q" name="loaderIcon" xy="65,47" size="150,150" fill="scale" shrinkOnly="true"/>
+    <image id="n5_v95q" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="20,117"/>
+    <text id="n6_v95q" name="txtName" xy="74,205" pivot="0.5,0" size="132,44" fontSize="32" color="#c98988" text="服装名称">
+      <gearColor controller="button" pages="1" values="#c98988,#000000" default="#a58654,#000000"/>
+    </text>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/ClothingSynthetic/components/MateriasListItem.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="238,291">
+<component size="270,321" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n31_ja9w" name="n31" src="j539s" fileName="images/hc_kuang_1.png" xy="0,0"/>
-    <loader id="n32_ja9w" name="loaderIcon" xy="58,64" size="73,73" fill="scale" shrinkOnly="true"/>
-    <text id="n33_ja9w" name="txtName" xy="65,0" size="106,36" fontSize="26" color="#85756d" text="材料名称">
+    <image id="n3_v95q" name="n3" src="j539s" fileName="images/hc_kuang_1.png" xy="16,17">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n8_v95q" name="n8" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,0"/>
+    <loader id="n4_v95q" name="loaderIcon" xy="81,60" size="73,73" fill="scale" shrinkOnly="true"/>
+    <text id="n5_v95q" name="txtName" xy="69,173" pivot="0.5,0" size="132,44" fontSize="32" color="#c8807b" text="材料名称">
+      <gearColor controller="button" default="#c8807b,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <component id="n34_ja9w" name="groupCount" src="lwri1k" fileName="components/Component3.xml" xy="61,235"/>
+    <text id="n7_v95q" name="txtProgess" xy="73,239" pivot="0.5,0.5" size="123,46" fontSize="34" color="#b26b65" letterSpacing="-1" text="100/10">
+      <gearColor controller="button" default="#b26b65,#000000"/>
+    </text>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -32,8 +32,6 @@
     <image id="j53912" name="hc_yyy.png" path="/images/"/>
     <component id="j53918" name="Button3.xml" path="/components/"/>
     <component id="j53919" name="ProgressBar2.xml" path="/components/"/>
-    <component id="j5391a" name="ClothingListItem.xml" path="/components/"/>
-    <component id="ja9w1b" name="MateriasListItem.xml" path="/components/"/>
     <component id="ja9w1c" name="Component1.xml" path="/components/"/>
     <component id="ja9w1d" name="Component2.xml" path="/components/"/>
     <component id="ja9w1f" name="CompItemInfo.xml" path="/components/"/>
@@ -50,11 +48,12 @@
     <component id="kqeb25" name="Button4.xml" path="/components/"/>
     <image id="j83026" name="jbhc_btzi_6.png" path="/images/"/>
     <image id="j83027" name="jbhc_btzi_5.png" path="/images/"/>
-    <component id="v95q28" name="Button5.xml" path="/components/"/>
+    <component id="v95q28" name="MateriasListItem.xml" path="/components/"/>
     <image id="v95q29" name="hc_kuang_4.png" path="/images/"/>
     <image id="v95q2a" name="hc_sxkuang.png" path="/images/"/>
     <image id="v95q2b" name="hc_xtxtx.png" path="/images/"/>
     <image id="v95q2c" name="hc_zzjsdi.png" path="/images/"/>
+    <component id="v95q2e" name="ClothingListItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/VO/RoleInfoData.cs

@@ -19,7 +19,7 @@ namespace GFGGame
         public string slogan;//个性签名
         public CustomSuitData customSuitData; //当前搭配套装
         public int RoleLvl = 1; //玩家等级
-        public int RoleExp = 1; //玩家经验
+        public long RoleExp = 1; //玩家经验
         public string SuitCollectPer = "0%"; //套装收集度
         public List<PoemPhotoData> showPhotoList = new List<PoemPhotoData>();//会返回固定四个图片信息，未展示则为null
     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingListItem.cs

@@ -6,12 +6,12 @@ namespace UI.ClothingSynthetic
 {
     public partial class UI_ClothingListItem
     {
-        public GComponent target;
+        public GButton target;
         public GImage m_bg;
         public GLoader m_loaderIcon;
         public GImage m_imgOwned;
         public GTextField m_txtName;
-        public const string URL = "ui://4f294tdkj5391a";
+        public const string URL = "ui://4f294tdkv95q2e";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "ClothingListItem";
         private static UI_ClothingListItem _proxy;
@@ -20,9 +20,9 @@ namespace UI.ClothingSynthetic
         {
             var ui = new UI_ClothingListItem();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -35,9 +35,9 @@ namespace UI.ClothingSynthetic
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Button5.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_MateriasListItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.ClothingSynthetic
 {
-    public partial class UI_Button5
+    public partial class UI_MateriasListItem
     {
         public GButton target;
         public GLoader m_loaderIcon;
@@ -12,12 +12,12 @@ namespace UI.ClothingSynthetic
         public GTextField m_txtProgess;
         public const string URL = "ui://4f294tdkv95q28";
         public const string PACKAGE_NAME = "ClothingSynthetic";
-        public const string RES_NAME = "Button5";
-        private static UI_Button5 _proxy;
+        public const string RES_NAME = "MateriasListItem";
+        private static UI_MateriasListItem _proxy;
 
-        public static UI_Button5 Create(GObject gObject = null)
+        public static UI_MateriasListItem Create(GObject gObject = null)
         {
-            var ui = new UI_Button5();
+            var ui = new UI_MateriasListItem();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.ClothingSynthetic
             return ui;
         }
 
-        public static UI_Button5 Proxy(GObject gObject = null)
+        public static UI_MateriasListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button5();
+                _proxy = new UI_MateriasListItem();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Button5.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_MateriasListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2ecae0a6eb67c0c43a601ce4d5e82fa8
+guid: 5c824c5a6d3f9f645b1b0d80b633585e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -111,8 +111,8 @@ namespace GFGGame
         //修改角色头像
         public static async ETTask<bool> ReqModifyRoleHead(int headId)
         {
-            S2C_AuHeadPortrait response = null;
-            response = (S2C_AuHeadPortrait)await MessageHelper.SendToServer(new C2S_AuHeadPortrait() { HeadItemId = headId });
+            S2C_AuHead response = null;
+            response = (S2C_AuHead)await MessageHelper.SendToServer(new C2S_AuHead() { HeadItemId = headId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -127,8 +127,8 @@ namespace GFGGame
         //修改角色头像框
         public static async ETTask<bool> ReqModifyRoleHeadBorder(int HeadBorder)
         {
-            S2C_AuHeadPortraitBox response = null;
-            response = (S2C_AuHeadPortraitBox)await MessageHelper.SendToServer(new C2S_AuHeadPortraitBox() { HeadBorderItemId = HeadBorder });
+            S2C_AuHeadBorder response = null;
+            response = (S2C_AuHeadBorder)await MessageHelper.SendToServer(new C2S_AuHeadBorder() { HeadBorderItemId = HeadBorder });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
         private GComponent _selectedListItem;
         private List<ItemData> _materiarsOfSelectedItem;
 
-        private UI_Button5 listTypeItem_CloSynthetic;
+        private UI_MateriasListItem listTypeItem_CloSynthetic;
 
 
         public override void Dispose()
@@ -344,7 +344,7 @@ namespace GFGGame
             int count = _ui.m_listMaterias.numChildren;
             for (int i = 0; i < count; i++)
             {
-                UI_Button5 listItem = UI_Button5.Proxy(_ui.m_listMaterias.GetChildAt(i));
+                UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(i));
                 if (i < _materiarsOfSelectedItem.Count)
                 {
                     ItemData itemData = _materiarsOfSelectedItem[i];
@@ -369,7 +369,7 @@ namespace GFGGame
                     listItem.m_loaderIcon.visible = false;
                     listItem.m_txtProgess.visible = false;
                 }
-                UI_Button5.ProxyEnd();
+                UI_MateriasListItem.ProxyEnd();
             }
             _ui.m_btnProduction.grayed = ItemDataManager.GetItemNum(_selectedItemId) > 0;
         }
@@ -382,7 +382,7 @@ namespace GFGGame
                 return;
             }
             // UI_Component3 groupCount = UI_Component3.Proxy(context.sender as GObject);
-            UI_Button5 listItem = UI_Button5.Proxy(context.sender as GObject);
+            UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(context.sender as GObject);
             ItemData itemData = listItem.target.data as ItemData;
             // int num = ItemDataManager.GetItemNum(itemData.id);
             // int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
@@ -390,7 +390,7 @@ namespace GFGGame
             object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num };
             GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
             // UI_Component3.ProxyEnd();
-            UI_Button5.ProxyEnd();
+            UI_MateriasListItem.ProxyEnd();
         }
 
         private void OnItemNumChanged()
@@ -455,13 +455,13 @@ namespace GFGGame
 
             if (_ui.m_listMaterias.numChildren > 0)
             {
-                listTypeItem_CloSynthetic = UI_Button5.Proxy(_ui.m_listMaterias.GetChildAt(0));
+                listTypeItem_CloSynthetic = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(0));
 
             }
             if (listTypeItem_CloSynthetic != null)
             {
                 GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料，和材料的获取途径。");
-                UI_Button5.ProxyEnd();
+                UI_MateriasListItem.ProxyEnd();
             }
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得必需品啦，继续通关主线剧情吧。", -1, true, 180);