zhaoyang 2 жил өмнө
parent
commit
541de3dc68
59 өөрчлөгдсөн 605 нэмэгдсэн , 28 устгасан
  1. BIN
      FGUIProject/assets/CommonGame/imagesNew/tb_suo.png
  2. 1 0
      FGUIProject/assets/CommonGame/package.xml
  3. 10 0
      FGUIProject/assets/League/Button124.xml
  4. 6 2
      FGUIProject/assets/League/LeagueSkillUI.xml
  5. 15 4
      FGUIProject/assets/League/LeagueSkillUpUI.xml
  6. 11 0
      FGUIProject/assets/League/ListSkillScore.xml
  7. 16 7
      FGUIProject/assets/League/components/ListSkillItem.xml
  8. 2 3
      FGUIProject/assets/League/components/ListSkillLayerItem.xml
  9. 9 4
      FGUIProject/assets/League/components/ListSkillTypeItem.xml
  10. BIN
      FGUIProject/assets/League/images/card_jn_db.png
  11. BIN
      FGUIProject/assets/League/images/card_sz_db.png
  12. BIN
      FGUIProject/assets/League/images/ch_jn_db.png
  13. BIN
      FGUIProject/assets/League/images/lm_ch_btk.png
  14. BIN
      FGUIProject/assets/League/images/lm_ch_dbzz.png
  15. BIN
      FGUIProject/assets/League/images/lm_ch_dldb.png
  16. BIN
      FGUIProject/assets/League/images/lm_ch_fy_an.png
  17. BIN
      FGUIProject/assets/League/images/lm_ch_jdk.png
  18. BIN
      FGUIProject/assets/League/images/lm_ch_jndb.png
  19. BIN
      FGUIProject/assets/League/images/lm_ch_mcdb.png
  20. BIN
      FGUIProject/assets/League/images/lm_ch_szdk.png
  21. BIN
      FGUIProject/assets/League/images/lm_ch_wdl_zz.png
  22. BIN
      FGUIProject/assets/League/images/lm_ch_wjs.png
  23. BIN
      FGUIProject/assets/League/images/lm_ch_zsx.png
  24. BIN
      FGUIProject/assets/League/images/lm_ch_zz.png
  25. BIN
      FGUIProject/assets/League/images/lm_hdgz_zsx.png
  26. BIN
      FGUIProject/assets/League/imagesNew/dikuang_sx.png
  27. 19 0
      FGUIProject/assets/League/package.xml
  28. 12 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs
  29. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs
  30. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillScore.cs
  31. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillScore.cs.meta
  32. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillTypeItem.cs
  33. 26 4
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs
  34. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  35. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  37. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  38. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  39. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_10!a.png
  40. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_10!a.png.meta
  41. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_10.png
  42. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_10.png.meta
  43. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  44. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  45. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  46. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  47. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  48. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  49. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png
  50. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png
  51. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  52. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png
  53. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png
  54. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png
  55. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png
  56. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png.meta
  57. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_9.png
  58. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_9.png.meta
  59. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

BIN
FGUIProject/assets/CommonGame/imagesNew/tb_suo.png


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

@@ -280,6 +280,7 @@
     <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
     <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
+    <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 10 - 0
FGUIProject/assets/League/Button124.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="133,159" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_miy3" src="miy37m" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 6 - 2
FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,17 +4,21 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
+    <image id="n9_miy3" name="n9" src="miy37l" fileName="images/lm_ch_jndb.png" xy="0,20">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n4_pvb4" name="listScore" xy="105,301" size="868,58" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <list id="n4_pvb4" name="listScore" xy="106,140" size="868,109" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n8_pvb4" name="list" xy="26,513" size="1027,1281" overflow="scroll" defaultItem="ui://tw70qm9dpvb45b" autoClearItems="true">
+    <list id="n8_pvb4" name="list" xy="56,276" size="931,1445" overflow="scroll" lineGap="15" defaultItem="ui://tw70qm9dpvb45b" align="center" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

+ 15 - 4
FGUIProject/assets/League/LeagueSkillUpUI.xml

@@ -4,18 +4,25 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,12"/>
+    <image id="n16_miy3" name="n16" src="miy37p" fileName="images/lm_ch_btk.png" xy="143,246"/>
+    <image id="n17_miy3" name="n17" src="miy37q" fileName="images/ch_jn_db.png" xy="0,314"/>
+    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n4_pvb4" name="listScore" xy="105,301" size="868,58" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <list id="n4_pvb4" name="listScore" xy="106,1498" size="868,104" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n9_pvb4" name="comSkillType" src="pvb45b" fileName="components/ListSkillTypeItem.xml" xy="0,387"/>
-    <list id="n13_pvb4" name="list" xy="66,860" size="947,1002" overflow="scroll" lineGap="35" defaultItem="ui://tw70qm9dpvb45f" align="center">
+    <list id="n13_pvb4" name="list" xy="170,517" size="740,676" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="136" lineItemCount2="4" defaultItem="ui://tw70qm9dpvb45f" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -23,5 +30,9 @@
       <item/>
       <item/>
     </list>
+    <text id="n14_miy3" name="txtTitle" xy="448,251" pivot="0.5,0.5" size="184,56" font="ui://eg2y0ldpa0cftky" fontSize="42" color="#fffefa" align="center" vAlign="middle" leading="-5" autoClearText="true" text="茶艺-选茶"/>
+    <text id="n15_miy3" name="txtProgress" xy="469,324" pivot="0.5,0" size="142,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c3c8d8" align="center" ubb="true" vars="true" text="进度:[color=#FFE59D]{value=0}%[/color]"/>
+    <component id="n18_miy3" name="btnLeft" src="miy37w" fileName="Button124.xml" xy="22,855" pivot="0.5,0.5" scale="-1,1"/>
+    <component id="n19_miy3" name="btnRight" src="miy37w" fileName="Button124.xml" xy="924,852" pivot="0.5,0.5"/>
   </displayList>
 </component>

+ 11 - 0
FGUIProject/assets/League/ListSkillScore.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="120,108">
+  <displayList>
+    <image id="n13_miy3" name="n13" src="miy37d" fileName="images/card_jn_db.png" xy="0,0"/>
+    <loader id="n12_miy3" name="loaIcon" xy="10,10" size="88,88" aspect="true" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <image id="n14_miy3" name="n14" src="miy37r" fileName="images/card_sz_db.png" xy="60,73" pivot="0.5,0" size="38,29">
+      <relation target="n11_miy3" sidePair="width-width"/>
+    </image>
+    <text id="n11_miy3" name="txtProperty" xy="71,66" pivot="0.5,0" size="18,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#936650" align="center" ubb="true" text="0"/>
+  </displayList>
+</component>

+ 16 - 7
FGUIProject/assets/League/components/ListSkillItem.xml

@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="175,123" overflow="hidden">
+<component size="162,162" overflow="hidden">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n16_gfx4" name="n16" src="wm603a" fileName="images/lm_db_4.png" xy="-401,0" pivot="0.5,0" scale="0.3,0.3"/>
-    <loader id="n10_pvb4" name="loaScore" xy="45,33" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
-    <text id="n11_pvb4" name="txtScore" xy="90,34" size="40,42" group="n13_pvb4" fontSize="30" text=""/>
-    <image id="n17_gfx4" name="imgLock" src="wm6037" fileName="images/lm_db_touxiang.png" xy="25,-9" group="n13_pvb4" scale="0.4,0.4"/>
-    <group id="n13_pvb4" name="n13" xy="25,-9" size="316,355"/>
-    <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="23,77" pivot="0.5,0" scale="0.8,0.8" controller="c1,1"/>
+    <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
+    <loader id="n23_miy3" name="loaIcon" xy="25,25" pivot="0.5,0.5" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true">
+      <gearIcon controller="c1" pages="0" values="ui://eg2y0ldpu2u3tkq" default=""/>
+    </loader>
+    <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
+    <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
+    <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>
+    <group id="n13_pvb4" name="n13" xy="28,0" size="105,50"/>
+    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6" group="n22_miy3"/>
+    <image id="n21_miy3" name="n21" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75" group="n22_miy3"/>
+    <group id="n22_miy3" name="n22" xy="-6,-6" size="175,174" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="16,127" pivot="0.5,0" scale="0.75,0.75" controller="c1,1"/>
   </displayList>
 </component>

+ 2 - 3
FGUIProject/assets/League/components/ListSkillLayerItem.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="740,123" overflow="hidden">
+<component size="740,165" overflow="hidden">
   <displayList>
-    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,123" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center">
+    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,165" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
-      <item/>
     </list>
   </displayList>
 </component>

+ 9 - 4
FGUIProject/assets/League/components/ListSkillTypeItem.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1021,413">
+<component size="928,323">
   <displayList>
-    <loader id="n7_pvb4" name="loaBg" xy="0,0" size="1021,411" url="ui://tw70qm9do9gh40" fill="scaleFree"/>
-    <text id="n6_pvb4" name="txtTitle" xy="461,214" pivot="0.5,0" size="140,41" fontSize="30" align="center" autoClearText="true" text="茶艺-选茶"/>
-    <text id="n8_pvb4" name="txtProgress" xy="870,96" size="106,41" fontSize="30" text="进度0%"/>
+    <image id="n9_miy3" name="n9" src="miy37j" fileName="images/lm_ch_mcdb.png" xy="0,0"/>
+    <loader id="n7_pvb4" name="loaBg" xy="0,0" size="1021,411" fill="scaleFree"/>
+    <image id="n10_miy3" name="n10" src="miy37s" fileName="images/lm_ch_jdk.png" xy="181,24"/>
+    <text id="n6_pvb4" name="txtTitle" xy="94,71" pivot="0.5,0.5" size="41,180" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" align="center" vAlign="middle" leading="-5" autoSize="height" autoClearText="true" text="茶艺·选茶"/>
+    <text id="n8_pvb4" name="txtProgress" xy="687,244" pivot="0.5,0" size="119,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#896011" align="center" ubb="true" vars="true" text="进度[color=#B55A23]{value=0}%[/color]"/>
+    <image id="n11_miy3" name="n11" src="miy37o" fileName="images/lm_ch_dbzz.png" xy="0,0" group="n13_miy3"/>
+    <image id="n12_miy3" name="n12" src="miy37g" fileName="images/lm_ch_wjs.png" xy="385,123" group="n13_miy3"/>
+    <group id="n13_miy3" name="grpLock" xy="0,0" size="928,323" advanced="true"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/League/images/card_jn_db.png


BIN
FGUIProject/assets/League/images/card_sz_db.png


BIN
FGUIProject/assets/League/images/ch_jn_db.png


BIN
FGUIProject/assets/League/images/lm_ch_btk.png


BIN
FGUIProject/assets/League/images/lm_ch_dbzz.png


BIN
FGUIProject/assets/League/images/lm_ch_dldb.png


BIN
FGUIProject/assets/League/images/lm_ch_fy_an.png


BIN
FGUIProject/assets/League/images/lm_ch_jdk.png


BIN
FGUIProject/assets/League/images/lm_ch_jndb.png


BIN
FGUIProject/assets/League/images/lm_ch_mcdb.png


BIN
FGUIProject/assets/League/images/lm_ch_szdk.png


BIN
FGUIProject/assets/League/images/lm_ch_wdl_zz.png


BIN
FGUIProject/assets/League/images/lm_ch_wjs.png


BIN
FGUIProject/assets/League/images/lm_ch_zsx.png


BIN
FGUIProject/assets/League/images/lm_ch_zz.png


BIN
FGUIProject/assets/League/images/lm_hdgz_zsx.png


BIN
FGUIProject/assets/League/imagesNew/dikuang_sx.png


+ 19 - 0
FGUIProject/assets/League/package.xml

@@ -201,6 +201,25 @@
     <component id="9jv67a" name="Button122.xml" path="/components/"/>
     <component id="9jv67b" name="ListAnswerRuleItem.xml" path="/"/>
     <component id="9jv67c" name="Button123.xml" path="/components/" exported="true"/>
+    <image id="miy37d" name="card_jn_db.png" path="/images/"/>
+    <image id="miy37e" name="lm_ch_zz.png" path="/images/"/>
+    <image id="miy37f" name="lm_ch_zsx.png" path="/images/"/>
+    <image id="miy37g" name="lm_ch_wjs.png" path="/images/"/>
+    <image id="miy37h" name="lm_ch_wdl_zz.png" path="/images/"/>
+    <image id="miy37i" name="lm_ch_szdk.png" path="/images/"/>
+    <image id="miy37j" name="lm_ch_mcdb.png" path="/images/"/>
+    <image id="miy37k" name="lm_hdgz_zsx.png" path="/images/"/>
+    <image id="miy37l" name="lm_ch_jndb.png" path="/images/"/>
+    <image id="miy37m" name="lm_ch_fy_an.png" path="/images/"/>
+    <image id="miy37n" name="lm_ch_dldb.png" path="/images/"/>
+    <image id="miy37o" name="lm_ch_dbzz.png" path="/images/"/>
+    <image id="miy37p" name="lm_ch_btk.png" path="/images/"/>
+    <image id="miy37q" name="ch_jn_db.png" path="/images/"/>
+    <image id="miy37r" name="card_sz_db.png" path="/images/" scale="9grid" scale9grid="12,7,24,14"/>
+    <image id="miy37s" name="lm_ch_jdk.png" path="/images/"/>
+    <image id="miy37u" name="dikuang_sx.png" path="/imagesNew/"/>
+    <component id="miy37v" name="ListSkillScore.xml" path="/"/>
+    <component id="miy37w" name="Button124.xml" path="/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 12 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs

@@ -11,8 +11,11 @@ namespace UI.League
         public GComponent m_comValue;
         public GButton m_btnBack;
         public GList m_listScore;
-        public UI_ListSkillTypeItem m_comSkillType;
         public GList m_list;
+        public GTextField m_txtTitle;
+        public GTextField m_txtProgress;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
         public const string URL = "ui://tw70qm9dpvb45c";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueSkillUpUI";
@@ -64,8 +67,11 @@ namespace UI.League
             m_comValue = (GComponent)comp.GetChild("comValue");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listScore = (GList)comp.GetChild("listScore");
-            m_comSkillType = (UI_ListSkillTypeItem)UI_ListSkillTypeItem.Create(comp.GetChild("comSkillType"));
             m_list = (GList)comp.GetChild("list");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,9 +79,11 @@ namespace UI.League
             m_comValue = null;
             m_btnBack = null;
             m_listScore = null;
-            m_comSkillType.Dispose();
-            m_comSkillType = null;
             m_list = null;
+            m_txtTitle = null;
+            m_txtProgress = null;
+            m_btnLeft = null;
+            m_btnRight = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -7,6 +7,8 @@ namespace UI.League
     public partial class UI_ListSkillItem
     {
         public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
         public GLoader m_loaScore;
         public GTextField m_txtScore;
         public GImage m_imgLock;
@@ -58,6 +60,8 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_imgLock = (GImage)comp.GetChild("imgLock");
@@ -65,6 +69,8 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_loaIcon = null;
             m_loaScore = null;
             m_txtScore = null;
             m_imgLock = null;

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListSkillScore
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtProperty;
+        public const string URL = "ui://tw70qm9dmiy37v";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListSkillScore";
+        private static UI_ListSkillScore _proxy;
+
+        public static UI_ListSkillScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSkillScore();
+            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_ListSkillScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSkillScore();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtProperty = (GTextField)comp.GetChild("txtProperty");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtProperty = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillScore.cs.meta

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillTypeItem.cs

@@ -10,6 +10,7 @@ namespace UI.League
         public GLoader m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtProgress;
+        public GGroup m_grpLock;
         public const string URL = "ui://tw70qm9dpvb45b";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListSkillTypeItem";
@@ -60,12 +61,14 @@ namespace UI.League
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_txtTitle = null;
             m_txtProgress = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 26 - 4
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -12,6 +13,7 @@ namespace GFGGame
     {
         private UI_LeagueSkillUpUI _ui;
         private ValueBarController _valueBarController;
+        private int _pageCount;
         private int _type;
         public override void Dispose()
         {
@@ -40,6 +42,8 @@ namespace GFGGame
             _ui.m_listScore.itemRenderer = RenderListScoreItem;
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
+            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
+            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
 
             _valueBarController = new ValueBarController(_ui.m_comValue);
 
@@ -60,6 +64,7 @@ namespace GFGGame
             {
                 _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
             }
+            // _pageCount = Math.Ceiling((double)(_ui.m_list.scrollPane.contentWidth / _ui.m_list.scrollPane.viewWidth));
             UpdateView();
         }
 
@@ -79,15 +84,32 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueSkillUpView).FullName);
         }
+        private void OnBtnRightClick()
+        {
+            int index = _ui.m_list.GetFirstChildInView();
+            int curPage = index / _ui.m_list.lineCount;
+            int nextPage = curPage + 1;
+            if (nextPage * _ui.m_list.lineCount > _ui.m_list.numItems) return;
+            _ui.m_list.ScrollToView(nextPage * _ui.m_list.lineCount);
+        }
+        private void OnBtnLeftClick()
+        {
+            int index = _ui.m_list.GetFirstChildInView();
+            int curPage = index / _ui.m_list.lineCount;
+            int lastPage = curPage - 1;
+            if (lastPage * _ui.m_list.lineCount < 0) return;
+            _ui.m_list.ScrollToView(lastPage * _ui.m_list.lineCount);
+        }
         private void UpdateView()
         {
             _ui.m_listScore.numItems = 4;
             _ui.m_list.RefreshVirtualList();
-            _ui.m_comSkillType.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
-            UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(_ui.m_comSkillType.target);
+            _ui.m_txtTitle.text = "茶艺-" + LeagueSkillCountCfgArray.Instance.GetCfg(_type).name;
+            // UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(_ui.m_comSkillType.target);
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(_type);
-            item.m_txtProgress.text = string.Format("进度{0}%", progress);
-            UI_ListSkillTypeItem.ProxyEnd();
+            // _ui.m_txtProgress.text = string.Format("进度{0}%", progress);
+            _ui.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
+            // UI_ListSkillTypeItem.ProxyEnd();
         }
         private void RenderListScoreItem(int index, GObject obj)
         {

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_10!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_10!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: a92b851026bce4249a1e54f43a63f309
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_10.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_10.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dba8c30229aa9354d806753c34a175ba
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_9!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7995c9f0beb000b4b849a516b4928fb9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_9.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_9.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c4beae15429d4d147989297e88c6ea68
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes