浏览代码

Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

guodong 3 年之前
父节点
当前提交
a2283e46b4
共有 44 个文件被更改,包括 317 次插入109 次删除
  1. 2 2
      FGUIProject/assets/Card/components/ComFosterBottom.xml
  2. 20 48
      FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml
  3. 4 4
      FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml
  4. 2 0
      FGUIProject/assets/Friend/FriendAddUI.xml
  5. 7 0
      FGUIProject/assets/Friend/FriendUI.xml
  6. 19 0
      FGUIProject/assets/Friend/components/Button1.xml
  7. 9 0
      FGUIProject/assets/Friend/package.xml
  8. 15 4
      FGUIProject/assets/Main/components/ComAllCircle.xml
  9. 11 2
      FGUIProject/assets/Main/components/ComAllScoreResult.xml
  10. 7 0
      GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs
  11. 1 1
      GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs.meta
  12. 4 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs
  13. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs
  14. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend.meta
  15. 13 13
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs.meta
  17. 9 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllCircle.cs
  18. 25 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/FriendSProxy.cs
  19. 11 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/FriendSProxy.cs.meta
  20. 12 6
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  21. 8 0
      GameClient/Assets/Game/HotUpdate/Views/Friend.meta
  22. 63 0
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
  23. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs.meta
  24. 12 11
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  25. 6 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/GMPanelView.cs
  26. 6 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  27. 二进制
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  28. 二进制
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes
  29. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  30. 8 0
      GameClient/Assets/ResIn/UI/Friend.meta
  31. 二进制
      GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes
  32. 7 0
      GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes.meta
  33. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  34. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  35. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  36. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  37. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  38. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  39. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  40. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  41. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  42. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  43. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  44. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 2 - 2
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -58,7 +58,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n14_ojlz" name="ComLvConsumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="415,1506" group="n58_l2by"/>
+    <component id="n14_ojlz" name="ComLvConsumeGold" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="415,1506" group="n58_l2by"/>
     <component id="n24_842s" name="btnAll" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="237,1573" size="270,74" group="n58_l2by">
       <Button title="自动选择"/>
     </component>
@@ -81,7 +81,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="395,1506" size="289,42" group="n57_l2by"/>
+    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="395,1506" size="289,42" group="n57_l2by"/>
     <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="405,1573" size="270,74" group="n57_l2by">
       <Button title="升星"/>
     </component>

+ 20 - 48
FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -9,56 +9,28 @@
     <image id="n6_l4ui" name="n6" src="bd1c1w" fileName="images/fzyc_wcyh_3.png" xy="115,1138" pivot="0.5,0" group="n8_l4ui"/>
     <text id="n3_bd1c" name="txtRenewTips" xy="376,1140" pivot="0.5,0" size="328,49" group="n8_l4ui" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
     <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
-    <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,756" size="72,56" fillMethod="vt" fillAmount=""/>
-    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
-    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
-    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
-    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
-    <group id="n20_l4ui" name="grpProperty" xy="155,635" size="600,58" visible="false" advanced="true"/>
-    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
-    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
-    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
-    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
-    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="600,58" visible="false" advanced="true"/>
+    <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,724" size="72,56" fillMethod="vt"/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="155,592" size="770,58" visible="false" advanced="true"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="770,58" visible="false" advanced="true"/>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Scale" target="n10_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Scale" target="n11_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Scale" target="n12_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Scale" target="n9_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="0" type="Size" target="n10_l4ui" value="0,58"/>
-    <item time="0" type="Size" target="n11_l4ui" value="0,58"/>
-    <item time="0" type="Size" target="n12_l4ui" value="0,58"/>
-    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="4" type="Scale" target="n9_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="8" type="Scale" target="n10_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
-    <item time="8" type="Size" target="n10_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="7" ease="Linear"/>
-    <item time="11" type="Scale" target="n10_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="15" type="Scale" target="n11_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="15" type="Size" target="n11_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="19" type="Scale" target="n11_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="23" type="Scale" target="n12_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="23" type="Size" target="n12_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="27" type="Scale" target="n12_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+  <transition name="t0" autoPlay="true">
+    <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n11_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n12_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Scale" target="n14_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="0" type="Scale" target="n15_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Scale" target="n16_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Scale" target="n17_l4ui" value="1.2,1.2"/>
-    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n15_l4ui" value="0,58"/>
-    <item time="0" type="Size" target="n16_l4ui" value="0,58"/>
-    <item time="0" type="Size" target="n17_l4ui" value="0,58"/>
-    <item time="4" type="Scale" target="n14_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="8" type="Scale" target="n15_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
-    <item time="8" type="Size" target="n15_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="7" ease="Linear"/>
-    <item time="11" type="Scale" target="n15_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="15" type="Scale" target="n16_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="15" type="Size" target="n16_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="19" type="Scale" target="n16_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
-    <item time="23" type="Scale" target="n17_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
-    <item time="23" type="Size" target="n17_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="27" type="Scale" target="n17_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
+    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n15_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n16_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n17_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
   </transition>
 </component>

+ 4 - 4
FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml

@@ -4,9 +4,9 @@
     <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
     <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
     <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n6_j5a5" name="txtNeed" xy="142,1" size="73,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
-    <text id="n8_j5a5" name="txtLine" xy="215,1" size="21,39" group="n9_l4ui" fontSize="28" color="#ffffff" text="/"/>
-    <text id="n7_j5a5" name="txtHas" xy="236,1" size="39,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="99"/>
-    <group id="n9_l4ui" name="n9" xy="142,1" size="133,39" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n7_j5a5" name="txtHas" xy="142,0" size="39,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="99"/>
+    <text id="n8_j5a5" name="txtLine" xy="181,1" size="21,39" group="n9_l4ui" fontSize="28" color="#ffffff" text="/"/>
+    <text id="n6_j5a5" name="txtNeed" xy="202,1" size="73,39" group="n9_l4ui" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
+    <group id="n9_l4ui" name="n9" xy="142,0" size="133,40" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
 </component>

+ 2 - 0
FGUIProject/assets/Friend/FriendAddUI.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920"/>

+ 7 - 0
FGUIProject/assets/Friend/FriendUI.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_jdju" name="btnAdd" src="jdju1" fileName="components/Button1.xml" xy="120,1686"/>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/Friend/components/Button1.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,100" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_jdju" name="n0" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n1_jdju" name="n1" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n2_jdju" name="n2" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button/>
+</component>

+ 9 - 0
FGUIProject/assets/Friend/package.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="wez2ujnn">
+  <resources>
+    <component id="jdju0" name="FriendUI.xml" path="/" exported="true"/>
+    <component id="jdju1" name="Button1.xml" path="/components/"/>
+    <component id="jdju2" name="FriendAddUI.xml" path="/" exported="true"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true"/>
+</packageDescription>

+ 15 - 4
FGUIProject/assets/Main/components/ComAllCircle.xml

@@ -5,7 +5,10 @@
     <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" aspect="true"/>
     <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138"/>
     <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" aspect="true" scale="1.5,1.5"/>
-    <component id="n34_vuz5" name="comAllScoreResult" src="vuz5bu" fileName="components/ComAllScoreResult.xml" xy="-7,-364" pivot="0.5,0.5" alpha="0"/>
+    <graph id="n36_qgxy" name="holder" xy="181,-236" size="1,1" group="n39_qgxy"/>
+    <image id="n37_qgxy" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="65,-308" group="n39_qgxy"/>
+    <text id="n38_qgxy" name="txtCount" xy="64,-215" pivot="0.5,0" size="234,69" group="n39_qgxy" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
+    <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.2,1.2" endValue="1,1" duration="18" ease="Linear"/>
@@ -13,6 +16,7 @@
     <item time="0" type="Visible" target="n32_cn27" value="true"/>
     <item time="0" type="Visible" target="n33_cn27" value="true"/>
     <item time="0" type="Visible" target="n35_oixc" value="true"/>
+    <item time="0" type="Visible" target="n39_qgxy" value="false"/>
     <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
     <item time="18" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
     <item time="18" type="Visible" target="n33_cn27" value="false"/>
@@ -22,8 +26,15 @@
     <item time="66" type="Visible" target="n35_oixc" value="false"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n34_vuz5" value="1"/>
-    <item time="0" type="Scale" target="n34_vuz5" tween="true" startValue="0.4,0.4" endValue="1.4,1.4" duration="14" ease="Linear"/>
-    <item time="10" type="Alpha" target="n34_vuz5" tween="true" startValue="1" endValue="0" duration="4" ease="Linear"/>
+    <item time="0" type="Visible" target="n36_qgxy" value="true"/>
+    <item time="0" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n39_qgxy" value="true"/>
+    <item time="9" type="Visible" target="n37_qgxy" value="true"/>
+    <item time="9" type="Visible" target="n38_qgxy" value="true"/>
+    <item time="66" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="66" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n36_qgxy" value="true"/>
+    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
   </transition>
 </component>

+ 11 - 2
FGUIProject/assets/Main/components/ComAllScoreResult.xml

@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="360,360">
   <displayList>
-    <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0"/>
-    <image id="n35_vuz5" name="n35" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
+    <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0" visible="false"/>
+    <graph id="n37_qgxy" name="holder" xy="179,179" size="1,1" visible="false"/>
+    <image id="n35_vuz5" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
     <text id="n36_vuz5" name="txtCount" xy="62,200" pivot="0.5,0" size="234,69" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
+    <image id="n40_qgxy" name="n40" src="oq7r99" fileName="imagesStory/zx_gka_baoxiang_1.png" xy="69,109"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Visible" target="n35_vuz5" value="true"/>
+    <item time="0" type="Visible" target="n36_vuz5" value="true"/>
+    <item time="0" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="48" type="Visible" target="n34_vuz5" value="false"/>
+    <item time="48" type="Visible" target="n37_qgxy" value="true"/>
+  </transition>
 </component>

+ 7 - 0
GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs

@@ -0,0 +1,7 @@
+namespace GFGGame
+{
+    public class FriendDataManager : SingletonBase<FriendDataManager>
+    {
+
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllScoreResult.cs.meta → GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a1cc7f618d2447f4e8070e0e2e07d774
+guid: 461322fbbf493fa4f960b73268bacd4b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -24,13 +24,13 @@ namespace UI.Card
         public GTextField m_txtCurExp;
         public GTextField m_txtMaxExp;
         public GList m_listLvConsume;
-        public UI_ComConsumeCurrency m_ComLvConsumeGold;
+        public GComponent m_ComLvConsumeGold;
         public GButton m_btnAll;
         public GButton m_btnUpLv;
         public GGroup m_grpLv;
         public UI_ComBigStar m_comStar;
         public GList m_listStarConsume;
-        public UI_ComConsumeCurrency m_comStarCousumeGold;
+        public GComponent m_comStarCousumeGold;
         public GButton m_btnUpStar;
         public GComponent m_comTips;
         public GList m_listShowCard;
@@ -100,13 +100,13 @@ namespace UI.Card
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
             m_listLvConsume = (GList)comp.GetChild("listLvConsume");
-            m_ComLvConsumeGold = (UI_ComConsumeCurrency)UI_ComConsumeCurrency.Create(comp.GetChild("ComLvConsumeGold"));
+            m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
             m_comStar = (UI_ComBigStar)UI_ComBigStar.Create(comp.GetChild("comStar"));
             m_listStarConsume = (GList)comp.GetChild("listStarConsume");
-            m_comStarCousumeGold = (UI_ComConsumeCurrency)UI_ComConsumeCurrency.Create(comp.GetChild("comStarCousumeGold"));
+            m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
             m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
             m_comTips = (GComponent)comp.GetChild("comTips");
             m_listShowCard = (GList)comp.GetChild("listShowCard");
@@ -132,7 +132,6 @@ namespace UI.Card
             m_txtCurExp = null;
             m_txtMaxExp = null;
             m_listLvConsume = null;
-            m_ComLvConsumeGold.Dispose();
             m_ComLvConsumeGold = null;
             m_btnAll = null;
             m_btnUpLv = null;
@@ -140,7 +139,6 @@ namespace UI.Card
             m_comStar.Dispose();
             m_comStar = null;
             m_listStarConsume = null;
-            m_comStarCousumeGold.Dispose();
             m_comStarCousumeGold = null;
             m_btnUpStar = null;
             m_comTips = null;

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs

@@ -8,9 +8,9 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GTextField m_txtNeed;
-        public GTextField m_txtLine;
         public GTextField m_txtHas;
+        public GTextField m_txtLine;
+        public GTextField m_txtNeed;
         public const string URL = "ui://eg2y0ldpojlz61";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComCostCurrencyWithHas";
@@ -59,16 +59,16 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
-            m_txtLine = (GTextField)comp.GetChild("txtLine");
             m_txtHas = (GTextField)comp.GetChild("txtHas");
+            m_txtLine = (GTextField)comp.GetChild("txtLine");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_txtNeed = null;
-            m_txtLine = null;
             m_txtHas = null;
+            m_txtLine = null;
+            m_txtNeed = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 569efbfc140aa5b4786f7ef20fdf0d4f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 13 - 13
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllScoreResult.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -2,20 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.Friend
 {
-    public partial class UI_ComAllScoreResult
+    public partial class UI_FriendUI
     {
         public GComponent target;
-        public GTextField m_txtCount;
-        public const string URL = "ui://mfvz4q8kvuz5bu";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComAllScoreResult";
-        private static UI_ComAllScoreResult _proxy;
+        public GButton m_btnBack;
+        public const string URL = "ui://wez2ujnnjdju0";
+        public const string PACKAGE_NAME = "Friend";
+        public const string RES_NAME = "FriendUI";
+        private static UI_FriendUI _proxy;
 
-        public static UI_ComAllScoreResult Create(GObject gObject = null)
+        public static UI_FriendUI Create(GObject gObject = null)
         {
-            var ui = new UI_ComAllScoreResult();
+            var ui = new UI_FriendUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComAllScoreResult Proxy(GObject gObject = null)
+        public static UI_FriendUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComAllScoreResult();
+                _proxy = new UI_FriendUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtCount = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs.meta

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

+ 9 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllCircle.cs

@@ -8,7 +8,9 @@ namespace UI.Main
     {
         public GComponent target;
         public GImage m_imgCircle;
-        public UI_ComAllScoreResult m_comAllScoreResult;
+        public GGraph m_holder;
+        public GImage m_img;
+        public GTextField m_txtCount;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://mfvz4q8kcn279k";
@@ -59,15 +61,18 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_imgCircle = (GImage)comp.GetChild("imgCircle");
-            m_comAllScoreResult = (UI_ComAllScoreResult)UI_ComAllScoreResult.Create(comp.GetChild("comAllScoreResult"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_img = (GImage)comp.GetChild("img");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_imgCircle = null;
-            m_comAllScoreResult.Dispose();
-            m_comAllScoreResult = null;
+            m_holder = null;
+            m_img = null;
+            m_txtCount = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

+ 25 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/FriendSProxy.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+
+namespace GFGGame
+{
+    public static class FriendSProxy
+    {
+        public static async ETTask<bool> ClothingDecompose(List<int> itemIds, List<int> itemNums)
+        {
+            M2C_ClothingDecompose response = null;
+            response = (M2C_ClothingDecompose)await MessageHelper.SendToServer(new C2M_ClothingDecompose() { itemIds = itemIds, itemNums = itemNums });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/FriendSProxy.cs.meta

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

+ 12 - 6
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -16,6 +16,8 @@ namespace GFGGame
         private UI_CardFosterUI _ui;
         private UI_ComFosterBottom _comFosterBottom;
         private ValueBarController _valueBarController;
+        private UI_ComCostCurrency _comLvConsumeGold;
+        private UI_ComCostCurrencyWithHas _comStarCousumeGold;
         private CardData _cardData = new CardData();
         private int _selectTab = 0;
 
@@ -99,6 +101,9 @@ namespace GFGGame
 
             EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
             // EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
+            _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
+            _comStarCousumeGold = UI_ComCostCurrencyWithHas.Proxy(_comFosterBottom.m_comStarCousumeGold);
+
         }
 
 
@@ -144,7 +149,7 @@ namespace GFGGame
         private void UpdateCommon()
         {
             _comFosterBottom.m_listProperty.numItems = _cardData.scores.Count;
-            _comFosterBottom.m_ComLvConsumeGold.m_txtCount.text = "0";
+            _comLvConsumeGold.m_txtNeed.text = "0";
 
         }
         private void UpdateCardRes()
@@ -215,8 +220,8 @@ namespace GFGGame
             _comFosterBottom.m_txtCurLv.text = StringUtil.GetColorText(_showLv.ToString(), _showLv < maxLv ? "#D27869" : "#7D6956");
             _comFosterBottom.m_txtMaxExp.text = cardLvCfg.needExp.ToString();
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
-
-            _comFosterBottom.m_btnUpLv.grayed = _comFosterBottom.m_ComLvConsumeGold.m_txtCount.text == "0" ? true : false;
+            //    = "0";
+            _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
 
             _comFosterBottom.m_ctrlFullLv.selectedIndex = CardDataManager.isFullLv(_cardData.id, _cardData.lv, false) ? 1 : 0;
 
@@ -378,7 +383,7 @@ namespace GFGGame
                 hasExp += itemCfg.cardUpLvExp * itemsCount[i];
 
             }
-            _comFosterBottom.m_ComLvConsumeGold.m_txtCount.text = count.ToString();
+            _comLvConsumeGold.m_txtNeed.text = count.ToString();
 
             int previewLv = 0;
             int previewExp = 0;
@@ -403,7 +408,7 @@ namespace GFGGame
         private void OnClickBtnUpLv()
         {
             int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldArr[0];
-            int itemMoneyNum = int.Parse(_comFosterBottom.m_ComLvConsumeGold.m_txtCount.text);
+            int itemMoneyNum = int.Parse(_comLvConsumeGold.m_txtNeed.text);
             if (itemMoneyNum > ItemDataManager.GetItemNum(itemMoneyId))
             {
                 ItemUtil.AddGold(itemMoneyNum - ItemDataManager.GetItemNum(itemMoneyId), UpLv);
@@ -471,7 +476,8 @@ namespace GFGGame
 
                 int costHas = ItemDataManager.GetItemNum(cardStarCfg.costID);
                 int costNeed = cardStarCfg.costNum;
-                _comFosterBottom.m_comStarCousumeGold.m_txtCount.text = string.Format("{0}/{1}", costNeed, costHas);
+                _comStarCousumeGold.m_txtHas.text = costHas.ToString();
+                _comStarCousumeGold.m_txtNeed.text = costNeed.ToString();
 
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b6db34311359ed46961a7be5a4d9e4d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 63 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -0,0 +1,63 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Friend;
+
+namespace GFGGame
+{
+    public class FriendView : BaseView
+    {
+        private UI_FriendUI _ui;
+
+        private GameObject _scenePrefab;
+        private GameObject _sceneObject;
+
+        public override void Dispose()
+        {
+            if (_scenePrefab != null)
+            {
+                GameObject.Destroy(_scenePrefab);
+                _scenePrefab = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_FriendUI.PACKAGE_NAME;
+            _ui = UI_FriendUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFriend"));
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui.m_btnBack.onClick.Add(OnHide);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                EquipDataCache.cacher.setSceneObj(_sceneObject);
+            }
+            EquipDataCache.cacher.PutOnCurrentSuitSaved();
+
+        }
+
+        protected override void OnHide()
+        {
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            ViewManager.GoBackFrom(typeof(FriendView).Name);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs.meta

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

+ 12 - 11
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -20,7 +20,7 @@ namespace GFGGame
         private const int _range = 100;//圆圈随机范围
         private float _time = 0;// 登峰造极按住的时间
 
-        private float _playTime = 2f;
+        private float _playTime = 2.3f;
 
         private GameObject _gameObject0;
         private GameObject _gameObject1;
@@ -30,6 +30,7 @@ namespace GFGGame
         private GameObject _gameObject5;
         private GameObject _gameObject6;
         private GameObject _gameObject7;
+        private GameObject _gameObject8;
         private GoWrapper _wrapper6;
         private GoWrapper _wrapper7;
 
@@ -222,13 +223,18 @@ namespace GFGGame
             _ui.m_comAllCircle.m_t0.Play(() =>
             {
                 AllCircleScoreStart();
+                _ui.m_comAllCircle.m_t1.Play(() =>
+                {
+                    PlayScoreTWEffect();
+                    Timers.inst.Add(1f, 1, Skip);
+                });
+
             });
         }
         private void OnComAllCircleClickBegin()
         {
             if (_ui.m_comAllCircle.m_imgCircle.visible == false)
             {
-                // AllCircleScoreStart();
                 Timers.inst.Remove(ComAllCirclePressTime);
             }
             else
@@ -254,18 +260,11 @@ namespace GFGGame
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
 
-            _ui.m_comAllCircle.m_comAllScoreResult.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
+            _ui.m_comAllCircle.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
 
             _time = 0;
             _score += allCircleScore;
-            // SetScoreUI();
-            _ui.m_comAllCircle.m_t1.ignoreEngineTimeScale = false;
-            _ui.m_comAllCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
-            _ui.m_comAllCircle.m_t1.Play(() =>
-            {
-                PlayScoreTWEffect();
-                Timers.inst.Add(1f, 1, Skip);
-            });
+
 
         }
 
@@ -344,6 +343,8 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
             string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
             SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
+            string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
+            SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out GoWrapper _wrapper8, 70);
         }
         protected override void OnHide()
         {

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/GMPanelView.cs

@@ -118,8 +118,13 @@ namespace GFGGame
 
 
         }
-        private void OnClickBtnAll()
+        private async void OnClickBtnAll()
         {
+            bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_SKIP_GUIDE, 1);
+            if (result)
+            {
+                GameGlobal.skipGuide = true;
+            }
             OnClickBtnGetAllDressUpItem();
             OnClickBtnGetAllCardItem();
             _ui.m_ComBtn.m_txtRoleLv.text = "99";

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -97,7 +97,7 @@ namespace GFGGame
             _btnJInShu = _ui.m_list.GetChild("btnJInShu").asButton;
 
             _btnGongGao.visible = false;
-            _btnHaoYou.visible = false;
+            // _btnHaoYou.visible = false;
             _btnRenWu.visible = false;
             _btnPengYouQuan.visible = false;
             _btnJInShu.visible = false;
@@ -114,6 +114,7 @@ namespace GFGGame
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
             _btnYouJian.onClick.Add(OnClickBtnYouJian);
+            _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
 
 
             AddEffect();
@@ -269,6 +270,10 @@ namespace GFGGame
         {
             ViewManager.Show<MailView>();
         }
+        private void OnClickBtnHaoYou()
+        {
+            ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+        }
         private void OnClickHeadBar()
         {
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);

二进制
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


二进制
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


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


+ 8 - 0
GameClient/Assets/ResIn/UI/Friend.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c307ffbe1ae9c74db6261a301776b96
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cc831997ac1bc324691d95824d16611d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


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