zhaoyang 2 lat temu
rodzic
commit
64c15155d7

+ 4 - 7
FGUIProject/assets/DressUp/components/Button15.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="119,119" extention="Button">
+<component size="105,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
+    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="-7,-7" group="n2_vols"/>
+    <loader id="n1_ygap" name="icon" xy="5,5" size="95,95" group="n2_vols" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree"/>
+    <group id="n2_vols" name="n2" xy="-7,-7" size="119,119" advanced="true"/>
   </displayList>
   <Button/>
 </component>

+ 3 - 3
FGUIProject/assets/DressUp/components/ComActionSelect.xml

@@ -2,8 +2,8 @@
 <component size="228,192">
   <displayList>
     <image id="n12_ygap" name="n12" src="ygapen" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
-    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
-    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
-    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="-2,66" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="126,66" size="147,119" group="n18_ygap"/>
+    <group id="n18_ygap" name="n18" xy="-2,66" size="275,119" advanced="true" layout="hz" colGap="23"/>
   </displayList>
 </component>

+ 3 - 3
FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,12 +8,12 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="147,160" pivot="0.5,0" size="61,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
-    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,42" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
     <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
-    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="4,0" visible="false"/>
+    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="2,0" visible="false"/>
   </displayList>
 </component>

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -1055,12 +1055,13 @@ namespace GFGGame
                 }
             }
             if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里,可以查看集齐成套的服饰,点击一键换上。");
+            if (_ui.m_partsList.m_list.numItems <= 0) return;
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "", 0);
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
-            GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnNormal, ConstGuideId.FREEDOM_DRESS, 3, "选择普通动作并穿上。");
+            GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
             UI_PartsListItem.ProxyEnd();
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰,可以保存到主界面显示。");
-            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 6, "辛苦搭配完,去拍个照片留念呀~~");
+            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 6, "搭配好的服饰,可以保存到主界面显示。");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 7, "辛苦搭配完,去拍个照片留念呀~~");
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 2, "");
 

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -124,8 +124,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
 
         }
         protected override void TryCompleteGuide()
@@ -133,8 +133,8 @@ namespace GFGGame
             base.TryCompleteGuide();
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
-            GuideController.TryCompleteGuideIndex(cfg.id, 9);
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryCompleteGuideIndex(cfg.id, 10);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
         }
     }
 }

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

@@ -618,8 +618,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
+            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 8, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 9, "来记录下这一刻吧。");
             // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");

BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes