浏览代码

换装时若该部位未获得任何服装无法点击进入且有提示语“未获得此类部件”

zhaoyang 3 年之前
父节点
当前提交
e4789bdf2c

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

@@ -6,7 +6,7 @@
     <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
       <relation target="" sidePair="center-center"/>
     </image>
-    <list id="n6_m9wm" name="listReward" xy="95,730" size="889,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true" align="center">
+    <list id="n6_m9wm" name="listReward" xy="144,730" size="791,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true" align="center">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>

+ 2 - 2
FGUIProject/assets/DressUp/PhotographUI.xml

@@ -7,8 +7,8 @@
     <loader id="n11_o139" name="loaGuide" xy="148,153" size="783,972">
       <relation target="" sidePair="bottom-bottom"/>
     </loader>
-    <loader id="n12_o139" name="loaGuide1" xy="148,185" size="783,1397">
-      <relation target="" sidePair="bottom-bottom"/>
+    <loader id="n12_o139" name="loaGuide1" xy="148,154" size="783,1580">
+      <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
     </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>

+ 1 - 1
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,7 +7,7 @@
     </component>
     <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="212,855" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n31_cn27" name="comAllCircle" src="cn279k" fileName="components/ComAllCircle.xml" xy="382,1182" visible="false"/>
-    <graph id="n30_uo1t" name="grh_0" xy="360,271" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n30_uo1t" name="grh_0" xy="318,349" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n23_uo1t" name="grh_1" xy="824,739" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n24_uo1t" name="grh_2" xy="817,1303" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n25_uo1t" name="grh_3" xy="208,542" pivot="0.5,0.5" size="25,25" aspect="true"/>

+ 1 - 1
FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n5_rlp9" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,9"/>
-    <text id="n2_vuz5" name="txtCount" xy="32,3" size="94,36" font="ui://eg2y0ldpk1kha2" fontSize="26" color="#fff6ee" vAlign="middle" text="总分:0"/>
+    <text id="n2_vuz5" name="txtCount" xy="10,50" size="116,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="middle" strokeColor="#796135" strokeSize="2" text="总分:0"/>
     <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="-12,-4"/>
   </displayList>
   <ProgressBar titleType="value"/>

+ 4 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/ClothingSyntheticSProxy.cs

@@ -8,7 +8,7 @@ namespace GFGGame
 {
     public class ClothingSyntheticSProxy
     {
-        public static async ETTask ClothtingSynthetic(int itemId)
+        public static async ETTask<bool> ClothtingSynthetic(int itemId)
         {
             var response = (M2C_ClothingSynthetic)await MessageHelper.SendToServer(new C2M_ClothingSynthetic() { ItemId = itemId });
             if (response != null)
@@ -16,8 +16,11 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     GetSuitItemController.TryShow(itemId);
+                    return true;
                 }
             }
+            return true;
+
         }
     }
 }

+ 8 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -141,7 +141,7 @@ namespace GFGGame
             UpdateSelectedItemInfo(context.data as GComponent, true);
         }
 
-        private void OnClickBtnProcuction()
+        private async void OnClickBtnProcuction()
         {
             if (ItemDataManager.GetItemNum(_selectedItemId) > 0)
             {
@@ -171,7 +171,13 @@ namespace GFGGame
                 }
             }
 
-            ClothingSyntheticSProxy.ClothtingSynthetic(_selectedItemId).Coroutine();
+            bool result = await ClothingSyntheticSProxy.ClothtingSynthetic(_selectedItemId);
+            if (result)
+            {
+                _selectedItemId = 0;
+                UpdateClothingList(true);
+
+            }
 
         }
 

+ 22 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -223,6 +223,12 @@ namespace GFGGame
             }
             else
             {
+                if (!CheckListCount(item1.type))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                    return;
+                }
+                this.showListParts(item1.type);
                 this.showListParts(item1.type);
 
             }
@@ -236,7 +242,11 @@ namespace GFGGame
             GObject typeItem = context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[order - 1];
-
+            if (!CheckListCount(item2.type))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                return;
+            }
             this.showListParts(item2.type);
             this.hideListType2();
         }
@@ -784,7 +794,17 @@ namespace GFGGame
             item.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tag[0]);
             item.m_txtTag.text = tag[1];
         }
-
+        private bool CheckListCount(int type)
+        {
+            if (type == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                return DressUpMenuSuitDataManager.GetSuitIDList().Count > 0;
+            }
+            else
+            {
+                return DressUpMenuItemDataManager.getItemDatasByType(type).Count > 0;
+            }
+        }
         protected override void UpdateToCheckGuide(object param)
         {
 

+ 22 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -149,12 +149,18 @@ namespace GFGGame
             GObject typeItem = (GObject)context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[order - 1];
+
             if (item1.subMenusArr.Length > 0)
             {
                 this.showListType2(item1.subMenusArr);
             }
             else
             {
+                if (!CheckListCount(item1.type))
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                    return;
+                }
                 this.showListParts(item1.type);
             }
             this.hideListType1();
@@ -167,7 +173,11 @@ namespace GFGGame
             GObject typeItem = (GObject)context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[order - 1];
-
+            if (!CheckListCount(item2.type))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                return;
+            }
             this.showListParts(item2.type);
             this.hideListType2();
 
@@ -691,7 +701,17 @@ namespace GFGGame
             _ui.m_btnShow.enabled = false;
             GTween.To(1, 0, 0.3f).SetTarget(_ui.m_btnShow, TweenPropType.Alpha);
         }
-
+        private bool CheckListCount(int type)
+        {
+            if (type == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                return DressUpMenuSuitDataManager.GetSuitIDList().Count > 0;
+            }
+            else
+            {
+                return DressUpMenuItemDataManager.getItemDatasByType(type).Count > 0;
+            }
+        }
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -573,8 +573,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn2, ConstGuideId.PHOTOGRAPH, 4, "可以自由添加已有道具");
-            GuideController.TryGuide(_ui.m_loaGuide, ConstGuideId.PHOTOGRAPH, 5, "点击空白处查看整体效果");
-            GuideController.TryGuide(_ui.m_loaGuide1, ConstGuideId.PHOTOGRAPH, 6, "双指可控制放大缩小,或点击边框上的按键控制");
+            GuideController.TryGuide(_ui.m_loaGuide, ConstGuideId.PHOTOGRAPH, 5, "点击空白处查看整体效果", -1, true, (int)(_ui.m_loaGuide.y + _ui.m_loaGuide.height - 250));
+            GuideController.TryGuide(_ui.m_loaGuide1, ConstGuideId.PHOTOGRAPH, 6, "双指可控制放大缩小,或点击边框上的按键控制", -1, true, (int)(_ui.m_loaGuide1.y + _ui.m_loaGuide1.height - 250));
             GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 7, "点击拍照,可以记录和分享美照啦");
             GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 7);
         }

二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes


二进制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes