瀏覽代碼

Merge branch 'master' of http://10.108.64.190:3000/gfg/client

guodong 2 年之前
父節點
當前提交
b27212cc63
共有 32 個文件被更改,包括 381 次插入212 次删除
  1. 5 5
      FGUIProject/assets/Arena/components/BtnLook.xml
  2. 4 2
      FGUIProject/assets/Arena/components/ListPartsItem.xml
  3. 2 2
      FGUIProject/assets/Arena/components/ListRankItem.xml
  4. 二進制
      FGUIProject/assets/Arena/images/huanzhuang_sz_db.png
  5. 1 0
      FGUIProject/assets/Arena/package.xml
  6. 43 40
      FGUIProject/assets/CommonGame/ItemExchangeUI.xml
  7. 2 0
      FGUIProject/assets/CommonGame/package.xml
  8. 2 46
      FGUIProject/assets/DressUp/DressFilterUI.xml
  9. 51 0
      FGUIProject/assets/DressUp/components/ComSearch.xml
  10. 1 0
      FGUIProject/assets/DressUp/package.xml
  11. 4 4
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  12. 23 33
      GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs
  13. 5 5
      GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs
  14. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListPartsItem.cs
  15. 12 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs
  16. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSearch.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSearch.cs.meta
  18. 4 18
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressFilterUI.cs
  19. 7 3
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs
  20. 13 13
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs
  21. 16 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs
  22. 23 16
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressFilterView.cs
  23. 24 9
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  24. 19 4
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  25. 7 7
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  26. 7 0
      GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs
  27. 二進制
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png
  28. 二進制
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png
  29. 二進制
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1.png
  30. 二進制
      GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes
  31. 二進制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  32. 二進制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 5 - 5
FGUIProject/assets/Arena/components/BtnLook.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="58,59" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="100,100" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_jcej" src="jcej1y" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_jcej" name="n0" src="jcej1y" fileName="images/bpjly_fdfd.png" xy="21,20">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button/>
 </component>

+ 4 - 2
FGUIProject/assets/Arena/components/ListPartsItem.xml

@@ -7,9 +7,11 @@
     </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"/>
     <image id="n2_k6he" name="n2" src="v4614u" fileName="components/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"/>
+    <image id="n12_ozul" name="n12" src="ozul5t" fileName="images/huanzhuang_sz_db.png" xy="136,160" group="n14_ozul"/>
+    <text id="n13_ozul" name="txtScore" xy="144,152" pivot="0.5,0" size="66,44" group="n14_ozul" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
+    <group id="n14_ozul" name="grpScore" xy="136,152" size="80,44" advanced="true"/>
   </displayList>
 </component>

+ 2 - 2
FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -6,10 +6,10 @@
     <image id="n16_jcej" name="n16" src="jcej46" fileName="images/phbphb_xxt.png" xy="9,283"/>
     <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117" controller="c2,4"/>
     <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="185,207"/>
-    <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
+    <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" touchable="false" url="ui://4lc5fhlbjcej3m" autoSize="true">
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
-    <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
+    <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="140,58" scale="0.9,0.9" touchable="false"/>
     <loader id="n12_jcej" name="loaDanIcon" xy="92,354" pivot="0.5,0.5" size="73,73" aspect="true" url="ui://4lc5fhlbe0505n" fill="scale"/>
     <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
     <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名:1"/>

二進制
FGUIProject/assets/Arena/images/huanzhuang_sz_db.png


+ 1 - 0
FGUIProject/assets/Arena/package.xml

@@ -187,6 +187,7 @@
     <component id="ofwu5q" name="ComDanIcon.xml" path="/components/"/>
     <image id="ofwu5r" name="dwjs_yz_db.png" path="/images/"/>
     <image id="ofwu5s" name="dwjs_jiantou.png" path="/images/"/>
+    <image id="ozul5t" name="huanzhuang_sz_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 43 - 40
FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1250" opaque="false">
   <displayList>
-    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1250">
+    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,145" size="1080,960">
       <relation target="n33_l500" sidePair="height-height"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,192" size="575,230" group="n12_si5z"/>
-    <text id="n6_si5z" name="txtOwned" xy="840,146" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <text id="n11_si5z" name="txtDesc" xy="439,214" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="64,124" size="346,336" group="n55_ofwu" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="117,193" size="44,94" group="n55_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="238,291" pivot="0.5,0.5" anchor="true" size="200,200" group="n55_ofwu" aspect="true" align="center" vAlign="middle" fill="scaleMatchHeight"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="315,349" pivot="1,0" size="56,49" group="n55_ofwu" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
-    <group id="n55_ofwu" name="n55" xy="64,124" size="346,336" group="n12_si5z"/>
-    <group id="n12_si5z" name="n12" xy="64,124" size="914,336" group="n33_l500" advanced="true"/>
-    <image id="n45_ofwu" name="n45" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="142,480" size="50,50" group="n53_ofwu"/>
-    <image id="n46_ofwu" name="n46" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="367,480" size="50,50" group="n53_ofwu"/>
-    <image id="n47_ofwu" name="n47" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="592,480" size="50,50" group="n53_ofwu"/>
-    <image id="n48_ofwu" name="n48" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="817,480" size="50,50" group="n53_ofwu"/>
-    <text id="n49_ofwu" name="txtGong" xy="202,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n50_ofwu" name="txtShang" xy="427,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n51_ofwu" name="txtJue" xy="652,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n52_ofwu" name="txtZhi" xy="877,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <group id="n53_ofwu" name="grpScore" xy="142,480" size="796,50" group="n33_l500" advanced="true"/>
-    <list id="n54_ofwu" name="listTag" xy="138,550" size="377,41" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,337" size="575,230" group="n12_si5z"/>
+    <text id="n6_si5z" name="txtOwned" xy="840,291" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n11_si5z" name="txtDesc" xy="439,359" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="64,269" size="346,336" group="n55_ofwu" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="117,338" size="44,94" group="n55_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="238,436" pivot="0.5,0.5" anchor="true" size="200,200" group="n55_ofwu" aspect="true" align="center" vAlign="middle" fill="scaleMatchHeight"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="315,494" pivot="1,0" size="56,49" group="n55_ofwu" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <group id="n55_ofwu" name="n55" xy="64,269" size="346,336" group="n12_si5z"/>
+    <group id="n12_si5z" name="n12" xy="64,269" size="914,336" group="n33_l500" advanced="true"/>
+    <image id="n45_ofwu" name="n45" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="142,625" size="50,50" group="n53_ofwu"/>
+    <image id="n46_ofwu" name="n46" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="367,625" size="50,50" group="n53_ofwu"/>
+    <image id="n47_ofwu" name="n47" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="592,625" size="50,50" group="n53_ofwu"/>
+    <image id="n48_ofwu" name="n48" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="817,625" size="50,50" group="n53_ofwu"/>
+    <text id="n49_ofwu" name="txtGong" xy="202,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n50_ofwu" name="txtShang" xy="427,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n51_ofwu" name="txtJue" xy="652,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n52_ofwu" name="txtZhi" xy="877,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n53_ofwu" name="grpScore" xy="142,625" size="796,50" group="n33_l500" advanced="true"/>
+    <list id="n54_ofwu" name="listTag" xy="138,695" size="377,41" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n32_l500" name="listItem" xy="127,611" pivot="0.5,0" size="841,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <list id="n32_l500" name="listItem" xy="127,756" pivot="0.5,0" size="841,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -36,33 +36,36 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,788" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="435,780" pivot="0.5,0" size="210,47" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
-    <graph id="n44_ofwu" name="n44" xy="530,762" size="20,20" group="n4_si5z"/>
-    <group id="n4_si5z" name="n4" xy="176,762" size="727,67" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,857" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,855" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,933" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="435,925" pivot="0.5,0" size="210,47" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
+    <graph id="n44_ofwu" name="n44" xy="530,907" size="20,20" group="n4_si5z"/>
+    <group id="n4_si5z" name="n4" xy="176,907" size="727,67" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,1002" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,1000" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,856" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,854" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,1001" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,999" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="402,862" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="234,854" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="377,944" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具?"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,1024" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="509,1026" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="376,944" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,1093" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="402,1007" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="234,999" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="377,1089" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具?"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,1169" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="509,1171" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="376,1089" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,1238" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,1093" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,1238" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="183,1093" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="176,762" size="727,420" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="64,124" size="914,1058" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
+    <group id="n20_si5z" name="bgpBtn" xy="183,1238" size="714,89" group="n34_l500" advanced="true"/>
+    <group id="n34_l500" name="grpBtn" xy="176,907" size="727,420" group="n33_l500" visible="false" advanced="true"/>
+    <image id="n60_ozul" name="n60" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" xy="217,936" size="645,71" group="n63_ozul"/>
+    <text id="n59_ozul" name="txtLock" xy="548,907" pivot="0.5,0" anchor="true" size="594,130" group="n63_ozul" fontSize="36" color="#b08d5c" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁"/>
+    <group id="n63_ozul" name="grpLock" xy="217,907" size="645,130" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="64,269" size="914,768" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="n37_qdaz" sidePair="top-top"/>
     </group>
   </displayList>

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

@@ -375,6 +375,8 @@
     <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
     <image id="o4m7tog" name="home.png" path="/imagesNew/"/>
     <image id="volstbs" name="zx_jindu_bg.png" path="/imagesNew/" exported="true"/>
+    <image id="ozultoh" name="sc_yk_zz.png" path="/imagesNew/"/>
+    <image id="ozultoi" name="sc_yk_jsdb.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 46
FGUIProject/assets/DressUp/DressFilterUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1092">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1092"/>
     <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="97,68" size="644,66"/>
@@ -13,50 +13,6 @@
     <component id="n14_ih75" name="btnReset" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,941">
       <Button title="重置"/>
     </component>
-    <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,204" group="n6_ih75">
-      <property target="txtName" propertyId="0" value="品质筛选"/>
-    </component>
-    <list id="n3_ih75" name="listRarity" xy="72,262" size="833,142" group="n6_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753i">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n6_ih75" name="grpRarity" xy="68,204" size="837,200" group="n19_n0js" advanced="true"/>
-    <component id="n8_ih75" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,449" group="n10_ih75">
-      <property target="txtName" propertyId="0" value="属性筛选"/>
-    </component>
-    <list id="n7_ih75" name="listScore" xy="72,507" size="842,142" group="n10_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753j">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n10_ih75" name="grpScore" xy="68,449" size="846,200" group="n19_n0js" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,449" group="n12_ih75">
-      <property target="txtName" propertyId="0" value="风格筛选"/>
-    </component>
-    <list id="n11_ih75" name="listTag" xy="72,507" size="854,272" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
-      <gearSize controller="c1" pages="0" values="854,124,1,1" default="854,272,1,1"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n12_ih75" name="grpTags" xy="68,449" size="858,330" group="n19_n0js" advanced="true"/>
-    <group id="n19_n0js" name="n19" xy="68,204" size="858,575" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
+    <component id="n5_ih75" name="comSearch" src="ozulfb" fileName="components/ComSearch.xml" xy="68,167" size="858,730"/>
   </displayList>
 </component>

+ 51 - 0
FGUIProject/assets/DressUp/components/ComSearch.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="858,730" overflow="scroll">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="0,0" group="n6_ih75">
+      <property target="txtName" propertyId="0" value="品质筛选"/>
+    </component>
+    <list id="n3_ih75" name="listRarity" xy="4,58" size="833,142" group="n6_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753i">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n6_ih75" name="grpRarity" xy="0,0" size="837,200" group="n19_n0js" advanced="true"/>
+    <component id="n8_ih75" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="0,245" group="n10_ih75">
+      <property target="txtName" propertyId="0" value="属性筛选"/>
+    </component>
+    <list id="n7_ih75" name="listScore" xy="4,303" size="842,142" group="n10_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753j">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n10_ih75" name="grpScore" xy="0,245" size="846,200" group="n19_n0js" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="0,490" group="n12_ih75">
+      <property target="txtName" propertyId="0" value="风格筛选"/>
+    </component>
+    <list id="n11_ih75" name="listTag" xy="4,548" size="854,172" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
+      <gearSize controller="c1" pages="0" values="854,172,1,1" default="854,272,1,1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n12_ih75" name="grpTags" xy="0,490" size="858,230" group="n19_n0js" advanced="true"/>
+    <group id="n19_n0js" name="n19" xy="0,0" size="858,720" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
+  </displayList>
+</component>

+ 1 - 0
FGUIProject/assets/DressUp/package.xml

@@ -200,6 +200,7 @@
     <image id="ofwuf8" name="huanzhuang_sz_db.png" path="/images/"/>
     <image id="o4m7f9" name="hz_tsdz.png" path="/imagesNew/"/>
     <component id="o4m7fa" name="Button16.xml" path="/components/"/>
+    <component id="ozulfb" name="ComSearch.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -73,10 +73,10 @@ namespace GFGGame
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             if (cfg == null || GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
-            if (guideKey == ConstGuideId.ARENA_OPEN)
-            {
-                return false;//临时屏蔽
-            }
+            // if (guideKey == ConstGuideId.ARENA_OPEN)
+            // {
+            //     return false;//临时屏蔽
+            // }
             if (guideKey == ConstGuideId.ARENA_OPEN && (isPass || ArenaDataManager.Instance.IsArenaClearing))
             {
                 return false;//竞技场结算中或已通关指定开启关卡,不引导

+ 23 - 33
GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -157,6 +157,7 @@ namespace GFGGame
             Dictionary<int, List<int>> itemListDic = new Dictionary<int, List<int>>();
             Dictionary<int, List<int>> itemDatasDic = DressUpMenuItemDataManager.ItemDatasBySubTypeDic;
 
+
             foreach (int subType in itemDatasDic.Keys)
             {
                 int key = subType;
@@ -175,55 +176,44 @@ namespace GFGGame
                 }
                 itemListDic[key].AddRange(dressList.GetRange(0, max));
             }
-            if (itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) &&
-            (!itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) ||
-            !itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) ||
-            !itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA)))
+
+            bool isHasLYQ = itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN);
+            bool isHasSY = itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI);
+            bool isHasXZ = itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG);
+            bool isHasND = itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA);
+
+            int countTagLYQ = isHasLYQ && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], tags) ? 1 : 0;
+            int countTagSY = isHasSY && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.SHANG_YI][0], tags) ? 1 : 0;
+            int countTagXZ = isHasXZ && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], tags) ? 1 : 0;
+            int countTagND = isHasND && ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.NEI_DA][0], tags) ? 1 : 0;
+
+            if (countTagLYQ > countTagSY + countTagXZ + countTagND)
             {
+                itemListDic.Remove(ConstDressUpItemType.NEI_DA);
                 itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
                 itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
-                itemListDic.Remove(ConstDressUpItemType.NEI_DA);
             }
-            else if (!itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) &&
-            (itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) &&
-            itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) &&
-            itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA)))
+            else if (countTagLYQ < countTagSY + countTagXZ + countTagND)
             {
                 itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
             }
-            if (itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA))
+            else
             {
-                bool hasTagLYQ = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], tags);
-                bool hasTagSY = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.SHANG_YI][0], tags);
-                bool hasTagXZ = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], tags);
-                bool hasTagND = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.NEI_DA][0], tags);
-                if (hasTagLYQ && !hasTagSY && !hasTagXZ)
+                int scoreLYQ = !isHasLYQ ? 0 : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], scoreType, tags);
+                int scoreSY = !isHasSY ? 0 : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.SHANG_YI][0], scoreType, tags);
+                int scoreXZ = !isHasXZ ? 0 : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], scoreType, tags);
+                int scoreND = !isHasND ? 0 : ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.NEI_DA][0], scoreType, tags);
+                if (scoreLYQ > scoreSY + scoreXZ + scoreND)
                 {
                     itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
                     itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
                     itemListDic.Remove(ConstDressUpItemType.NEI_DA);
                 }
-                else if (!hasTagLYQ && (hasTagSY || hasTagXZ))
-                {
-                    itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
-                }
                 else
                 {
-                    int scoreLYQ = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], scoreType, tags);
-                    int scoreSY = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.SHANG_YI][0], scoreType, tags);
-                    int scoreXZ = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], scoreType, tags);
-                    int scoreND = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.NEI_DA][0], scoreType, tags);
-                    if (scoreLYQ > scoreSY + scoreXZ + scoreND)
-                    {
-                        itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
-                        itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
-                        itemListDic.Remove(ConstDressUpItemType.NEI_DA);
-                    }
-                    else
-                    {
-                        itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
-                    }
+                    itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
                 }
+
             }
             List<int> itemList = new List<int>();
             foreach (int subType in itemListDic.Keys)

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs

@@ -131,11 +131,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
                 return;
             }
-            if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
-            {
-                PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
-                return;
-            }
+            // if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
+            //     return;
+            // }
 
             if (cfg.costType == CostType.FREE)
             {

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListPartsItem.cs

@@ -11,8 +11,9 @@ namespace UI.Arena
         public GLoader m_icon;
         public GLoader m_rarity;
         public GLoader m_ScoreType;
-        public GTextField m_txtScore;
         public GTextField m_txtTitle;
+        public GTextField m_txtScore;
+        public GGroup m_grpScore;
         public const string URL = "ui://4lc5fhlbv4614r";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListPartsItem";
@@ -64,8 +65,9 @@ namespace UI.Arena
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,8 +75,9 @@ namespace UI.Arena
             m_icon = null;
             m_rarity = null;
             m_ScoreType = null;
-            m_txtScore = null;
             m_txtTitle = null;
+            m_txtScore = null;
+            m_grpScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs

@@ -30,6 +30,10 @@ namespace UI.CommonGame
         public GTextField m_txtRmbCost;
         public GButton m_btnCancle;
         public GButton m_btnConfirm;
+        public GGroup m_bgpBtn;
+        public GGroup m_grpBtn;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://eg2y0ldps5s9tik";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ItemExchangeUI";
@@ -100,6 +104,10 @@ namespace UI.CommonGame
             m_txtRmbCost = (GTextField)comp.GetChild("txtRmbCost");
             m_btnCancle = (GButton)comp.GetChild("btnCancle");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_bgpBtn = (GGroup)comp.GetChild("bgpBtn");
+            m_grpBtn = (GGroup)comp.GetChild("grpBtn");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -131,6 +139,10 @@ namespace UI.CommonGame
             m_txtRmbCost = null;
             m_btnCancle = null;
             m_btnConfirm = null;
+            m_bgpBtn = null;
+            m_grpBtn = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSearch.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ComSearch
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_listRarity;
+        public GGroup m_grpRarity;
+        public GList m_listScore;
+        public GGroup m_grpScore;
+        public GList m_listTag;
+        public GGroup m_grpTags;
+        public const string URL = "ui://mbo439wbozulfb";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComSearch";
+        private static UI_ComSearch _proxy;
+
+        public static UI_ComSearch Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSearch();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComSearch Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSearch();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_listRarity = (GList)comp.GetChild("listRarity");
+            m_grpRarity = (GGroup)comp.GetChild("grpRarity");
+            m_listScore = (GList)comp.GetChild("listScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
+            m_listTag = (GList)comp.GetChild("listTag");
+            m_grpTags = (GGroup)comp.GetChild("grpTags");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_listRarity = null;
+            m_grpRarity = null;
+            m_listScore = null;
+            m_grpScore = null;
+            m_listTag = null;
+            m_grpTags = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComSearch.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 06277665f778d094289c510b4356e981
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 18
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressFilterUI.cs

@@ -13,12 +13,7 @@ namespace UI.DressUp
         public GButton m_btnClose;
         public GButton m_btnConfirm;
         public GButton m_btnReset;
-        public GList m_listRarity;
-        public GGroup m_grpRarity;
-        public GList m_listScore;
-        public GGroup m_grpScore;
-        public GList m_listTag;
-        public GGroup m_grpTags;
+        public UI_ComSearch m_comSearch;
         public const string URL = "ui://mbo439wbih7532";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "DressFilterUI";
@@ -72,12 +67,7 @@ namespace UI.DressUp
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
             m_btnReset = (GButton)comp.GetChild("btnReset");
-            m_listRarity = (GList)comp.GetChild("listRarity");
-            m_grpRarity = (GGroup)comp.GetChild("grpRarity");
-            m_listScore = (GList)comp.GetChild("listScore");
-            m_grpScore = (GGroup)comp.GetChild("grpScore");
-            m_listTag = (GList)comp.GetChild("listTag");
-            m_grpTags = (GGroup)comp.GetChild("grpTags");
+            m_comSearch = (UI_ComSearch)UI_ComSearch.Create(comp.GetChild("comSearch"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,12 +77,8 @@ namespace UI.DressUp
             m_btnClose = null;
             m_btnConfirm = null;
             m_btnReset = null;
-            m_listRarity = null;
-            m_grpRarity = null;
-            m_listScore = null;
-            m_grpScore = null;
-            m_listTag = null;
-            m_grpTags = null;
+            m_comSearch.Dispose();
+            m_comSearch = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 7 - 3
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -265,12 +265,12 @@ namespace GFGGame
                 }
             }
             item.m_btnLook.visible = _rankType != ArenaRankType.LAST_SEASON;
-            if (item.m_btnLook.data == null)
+            if (item.m_comHead.data == null)
             {
-                item.m_btnLook.onClick.Add(OnBtnLookClick);
+                // item.m_btnLook.onClick.Add(OnBtnLookClick);
                 item.m_comHead.onClick.Add(OnBtnLookClick);
             }
-            item.m_btnLook.data = arenaData;
+            // item.m_btnLook.data = arenaData;
             item.m_comHead.data = arenaData;
             UI_ListRankItem.ProxyEnd();
         }
@@ -331,6 +331,10 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;
             }
+            if (_rankType != ArenaRankType.LAST_SEASON)
+            {
+                return;
+            }
             bool result = await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
             if (result)
             {

+ 13 - 13
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -244,19 +244,19 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("挑战次数不足");
                 return;
             }
-            for (int i = 0; i < _dataManager.DressupList.Count; i++)
-            {
-                if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
-                {
-                    AlertUI.Show("全部主题穿戴完整才能开始战斗哦!").
-                    SetLeftButton(true, "取消").
-                    SetRightButton(true, "去换装", (object param) =>
-                    {
-                        OnBtnDressClick();
-                    });
-                    return;
-                }
-            }
+            // for (int i = 0; i < _dataManager.DressupList.Count; i++)
+            // {
+            //     if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
+            //     {
+            //         AlertUI.Show("全部主题穿戴完整才能开始战斗哦!").
+            //         SetLeftButton(true, "取消").
+            //         SetRightButton(true, "去换装", (object param) =>
+            //         {
+            //             OnBtnDressClick();
+            //         });
+            //         return;
+            //     }
+            // }
 
             bool result = await GetFightResult();
             if (!result) return;

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

@@ -129,6 +129,7 @@ namespace GFGGame
             _ui.m_comListType2.target.x = _ui.target.width;
             _ui.m_partsList.target.x = _ui.target.width;
             _ui.m_partsList2.target.x = _ui.target.width;
+            _ui.m_partsListSearch.target.x = _ui.target.width;
             this.showListType1();
             if (_sceneObject == null)
             {
@@ -914,12 +915,25 @@ namespace GFGGame
         }
         private void UpdateListPartsSelected()
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
                 {

+ 23 - 16
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressFilterView.cs

@@ -46,13 +46,13 @@ namespace GFGGame
             _ui.m_btnReset.onClick.Add(OnClickBtnReset);
             _ui.m_btnClose.onClick.Add(this.OnHide);
 
-            _ui.m_listRarity.itemRenderer = RenderListRarityItem;
-            _ui.m_listScore.itemRenderer = RenderListScoreItem;
-            _ui.m_listTag.itemRenderer = RenderListTagItem;
+            _ui.m_comSearch.m_listRarity.itemRenderer = RenderListRarityItem;
+            _ui.m_comSearch.m_listScore.itemRenderer = RenderListScoreItem;
+            _ui.m_comSearch.m_listTag.itemRenderer = RenderListTagItem;
 
-            _ui.m_listRarity.onClickItem.Add(OnClickListRarityItem);
-            _ui.m_listScore.onClickItem.Add(OnClickListScoreItem);
-            _ui.m_listTag.onClickItem.Add(OnClickListTagItem);
+            _ui.m_comSearch.m_listRarity.onClickItem.Add(OnClickListRarityItem);
+            _ui.m_comSearch.m_listScore.onClickItem.Add(OnClickListScoreItem);
+            _ui.m_comSearch.m_listTag.onClickItem.Add(OnClickListTagItem);
         }
 
         protected override void OnShown()
@@ -67,9 +67,10 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            _ui.m_listRarity.numItems = ConstDressRarity.DressRarityList().Count;
-            _ui.m_listScore.numItems = ConstDressUpScoreType.scoreTypeList().Count;
-            _ui.m_listTag.numItems = TagCfgArray.Instance.dataArray.Length;//  ConstDressTag.DressTagList().Count;
+            _ui.m_comSearch.m_listRarity.numItems = ConstDressRarity.DressRarityList().Count;
+            _ui.m_comSearch.m_listScore.numItems = ConstDressUpScoreType.scoreTypeList().Count;
+            _ui.m_comSearch.m_listTag.numItems = TagCfgArray.Instance.dataArray.Length;//  ConstDressTag.DressTagList().Count;
+            _ui.m_comSearch.m_listTag.ResizeToFit();
         }
 
         private void RenderListRarityItem(int index, GObject obj)
@@ -177,11 +178,17 @@ namespace GFGGame
         }
         private void OnClickBtnConfirm()
         {
-            ViewManager.Show<ModalStatusView>("搜索中...");
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.Filter;
             DressUpMenuItemDataManager.selectRarityList = _selectRarityList;
             DressUpMenuItemDataManager.selectScoreList = _selectScoreList;
             DressUpMenuItemDataManager.selectTagList = _selectTagList;
+            if (_selectRarityList.Count == 0 && _selectScoreList.Count == 0 && _selectTagList.Count == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未选择要搜索的类型");
+                return;
+            }
+            ViewManager.Show<ModalStatusView>("搜索中...");
+
             EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER, ConstMessage.DRESS_FILTER);
             ResetSearch();
             this.OnHide();
@@ -201,9 +208,9 @@ namespace GFGGame
             DressUpMenuItemDataManager.selectRarityList.Clear();
             DressUpMenuItemDataManager.selectScoreList.Clear();
             DressUpMenuItemDataManager.selectTagList.Clear();
-            _ui.m_listRarity.SelectNone();
-            _ui.m_listScore.SelectNone();
-            _ui.m_listTag.SelectNone();
+            _ui.m_comSearch.m_listRarity.SelectNone();
+            _ui.m_comSearch.m_listScore.SelectNone();
+            _ui.m_comSearch.m_listTag.SelectNone();
         }
         private void ResetSearch()
         {
@@ -213,9 +220,9 @@ namespace GFGGame
         {
             base.OnHide();
             this.Hide();
-            _ui.m_listRarity.SelectNone();
-            _ui.m_listScore.SelectNone();
-            _ui.m_listTag.SelectNone();
+            _ui.m_comSearch.m_listRarity.SelectNone();
+            _ui.m_comSearch.m_listScore.SelectNone();
+            _ui.m_comSearch.m_listTag.SelectNone();
         }
     }
 }

+ 24 - 9
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -191,6 +191,7 @@ namespace GFGGame
             _ui.m_comListType2.target.x = _ui.target.width;
             _ui.m_partsList.target.x = _ui.target.width;
             _ui.m_partsList2.target.x = _ui.target.width;
+            _ui.m_partsListSearch.target.x = _ui.target.width;
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + _fightCfg.scoreType;
             this.showListType1();
             if (_sceneObject == null)
@@ -358,7 +359,8 @@ namespace GFGGame
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
 
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制:{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateSearchListPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateSearchListPartsSelected();
 
             UpdateScore();
         }
@@ -502,12 +504,12 @@ namespace GFGGame
 
         private void OnClickBtnNext()
         {
-            if (!MyDressUpHelper.CheckPutOnFinish())
-            {
-                AlertUI.Show("只有换好衣服才能出门哦!")
-                    .SetRightButton(true, "好的");
-                return;
-            }
+            // if (!MyDressUpHelper.CheckPutOnFinish())
+            // {
+            //     AlertUI.Show("只有换好衣服才能出门哦!")
+            //         .SetRightButton(true, "好的");
+            //     return;
+            // }
 
             if (!CheckHasNeed())
             {
@@ -1052,12 +1054,25 @@ namespace GFGGame
         }
         private void UpdateListPartsSelected()
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
                 {

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

@@ -151,6 +151,7 @@ namespace GFGGame
             _ui.m_comListType2.target.x = _ui.target.width;
             _ui.m_partsList.target.x = _ui.target.width;
             _ui.m_partsList2.target.x = _ui.target.width;
+            _ui.m_partsListSearch.target.x = _ui.target.width;
             this.showListType1();
 
             if (_sceneObject == null)
@@ -189,8 +190,8 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
@@ -845,14 +846,28 @@ namespace GFGGame
             UI_PartsListItem.ProxyEnd();
 
         }
+
         private void UpdateListPartsSelected(int selectSuitId = 0)
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
                 {

+ 7 - 7
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -166,16 +166,16 @@ namespace GFGGame
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
             {
                 Timers.inst.Remove(OnClickBtnClose);
-                // if (RoleDataManager.power < _curCfg.needPower)
-                // {
-                //     PromptController.Instance.ShowFloatTextPrompt("体力不足");
-                //     return;
-                // }
+
                 FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId);
-                if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.num || RoleDataManager.power < fieldCfg.needPower)
+                int needPower = 0;
+                for (int i = 0; i < FieldDataManager.Instance.currFightLv + 1; i++)
+                {
+                    needPower += fieldCfg.needPower;
+                }
+                if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.num || RoleDataManager.power < needPower)
                 {
                     ViewManager.Show<FieldView>();
-                    if (FieldDataManager.Instance.currFightLv <= 1) return;
                     bool result = await FieldSProxy.ReqFieldInstanceResult();
                     if (result)
                     {

+ 7 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -106,6 +106,13 @@ namespace GFGGame
             }
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemsArr.Length > 0;
+            bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(_shopCfg.id);
+            _ui.m_grpBtn.visible = isUnLock;
+            _ui.m_grpLock.visible = !isUnLock;
+            if (!isUnLock)
+            {
+                _ui.m_txtLock.text = ShopDataManager.Instance.GetShopGoodsStateTips(_shopCfg.id);
+            }
         }
         private void RenderListTagItem(int index, GObject obj)
         {

二進制
GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png


二進制
GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes


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


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