画廊

FGUIProject/assets/poem/componentsGallery/ComFavorites.xml

@@ -10,17 +10,20 @@
       <Button icon="ui://iyz778gkr9ri12v" selectedIcon="ui://iyz778gkr9ri12y" controller="c1" page="1"/>
     </component>
     <group id="n27_r9ri" name="grpTab" xy="244,210" size="592,83"/>
-    <list id="n28_r9ri" name="listFavorite" xy="24,400" size="1032,936" layout="flow_hz" overflow="scroll" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
+    <list id="n28_r9ri" name="listFavorite" xy="24,400" size="1032,936" visible="false" layout="flow_hz" overflow="scroll" ptrRes=",ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
     </list>
-    <list id="n29_r9ri" name="listMySelf" xy="24,400" size="1032,936" layout="flow_hz" overflow="scroll" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
+    <list id="n29_r9ri" name="listMySelf" xy="24,400" size="1032,936" visible="false" layout="flow_hz" overflow="scroll" ptrRes=",ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
     </list>
+    <component id="n30_r9ri" name="comScroll" src="r9ri139" fileName="componentsGallery/ComScroll.xml" xy="24,400" size="1032,936">
+      <relation target="" sidePair="height-height"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/ComFooter.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="160,79">
+  <displayList>
+    <image id="n35_r9ri" name="n35" src="r9ri12t" fileName="imagesGallery/hl_jzhjz.png" xy="1,16" pivot="0.5,0.5" group="n37_r9ri"/>
+    <image id="n36_r9ri" name="n36" src="r9ri12s" fileName="imagesGallery/hl_jzhjz_1.png" xy="65,23" group="n37_r9ri"/>
+    <group id="n37_r9ri" name="n37" xy="1,16" size="159,46" advanced="true">
+      <relation target="" sidePair="center-center,top-top"/>
+    </group>
+  </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Rotation" target="n35_r9ri" tween="true" startValue="0" endValue="360" duration="18" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1619" overflow="hidden" opaque="false">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n11_r9ri" name="btnShop" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="900,56" size="180,113">
       <gearDisplay controller="c1" pages="0,1"/>
@@ -12,19 +12,19 @@
     </component>
     <image id="n5_r9ri" name="n5" src="r9ri12w" fileName="imagesGallery/hl_sczpxzdik.png" xy="135,206" size="810,76" group="n8_r9ri"/>
     <component id="n6_r9ri" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="120,204" group="n8_r9ri">
-      <Button icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
+      <Button checked="true" icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
     </component>
     <component id="n7_r9ri" name="btnTab1" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="400,204" group="n8_r9ri">
       <Button icon="ui://iyz778gkr9ri11o" selectedIcon="ui://iyz778gkr9ri11g" controller="c1" page="1"/>
     </component>
     <component id="n9_r9ri" name="btnTab2" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="680,204" group="n8_r9ri">
-      <Button checked="true" icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
+      <Button icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
     </component>
     <group id="n8_r9ri" name="grpTab" xy="120,204" size="840,83"/>
     <image id="n25_r9ri" name="n25" src="r9ri11e" fileName="imagesGallery/hl_xzbtzt.png" xy="310,309" group="n26_r9ri"/>
     <text id="n22_r9ri" name="txtTheme" xy="355,315" pivot="0.5,0" size="364,54" group="n26_r9ri" fontSize="40" color="#b08a5d" text="本期主题：风花雪月"/>
     <group id="n26_r9ri" name="n26" xy="310,309" size="499,81"/>
-    <list id="n14_r9ri" name="listRecommend" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkr9ri12p," lineGap="17" colGap="28" lineItemCount="2" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
+    <list id="n14_r9ri" name="listRecommend" xy="24,483" size="1032,1136" visible="false" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" lineItemCount="2" defaultItem="ui://iyz778gkr9ri10w" autoItemSize="true" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
@@ -34,7 +34,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n21_r9ri" name="listFriend" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
+    <list id="n21_r9ri" name="listFriend" xy="24,483" size="1032,1136" visible="false" layout="flow_hz" overflow="scroll" ptrRes=",ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
@@ -42,7 +42,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n23_r9ri" name="listRank" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center" autoClearItems="true">
+    <list id="n23_r9ri" name="listRank" xy="24,483" size="1032,1136" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
@@ -69,5 +69,8 @@
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
+    <component id="n36_r9ri" name="comScroll" src="r9ri139" fileName="componentsGallery/ComScroll.xml" xy="24,483">
+      <relation target="" sidePair="height-height"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/ComScroll.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1032,1136" overflow="scroll" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137">
+  <displayList>
+    <list id="n0_r9ri" name="listRecommend" xy="10,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n1_r9ri" name="listRecommend1" xy="524,0" size="500,1136" ptrRes="ui://iyz778gkr9ri12p,ui://iyz778gkr9ri137" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri138" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="500,630">
+<component size="500,761">
   <displayList>
-    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,550" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleFree"/>
-    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,633">
+    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,681" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleFree"/>
+    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,764">
       <relation target="n15_r9ri" sidePair="height-height"/>
     </image>
-    <text id="n16_r9ri" name="txtName" xy="20,568" size="187,41" group="n22_r9ri" font="ui://eg2y0ldpkst18" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
-    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="276,574" group="n22_r9ri">
+    <text id="n16_r9ri" name="txtName" xy="20,699" size="187,41" group="n22_r9ri" font="ui://eg2y0ldpkst18" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="276,705" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>
-    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,574" group="n22_r9ri">
+    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,705" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
-    <group id="n22_r9ri" name="n22" xy="20,568" size="398,42" advanced="true">
+    <group id="n22_r9ri" name="n22" xy="20,699" size="398,42" advanced="true">
       <relation target="n15_r9ri" sidePair="top-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/poem/componentsGallery/ListItem1.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="500,602">
+  <displayList>
+    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,522" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleFree"/>
+    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,605">
+      <relation target="n15_r9ri" sidePair="height-height"/>
+    </image>
+    <text id="n16_r9ri" name="txtName" xy="20,540" size="187,41" group="n22_r9ri" font="ui://eg2y0ldpkst18" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="276,546" group="n22_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
+    </component>
+    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,546" group="n22_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
+    </component>
+    <group id="n22_r9ri" name="n22" xy="20,540" size="398,42" advanced="true">
+      <relation target="n15_r9ri" sidePair="top-bottom"/>
+    </group>
+  </displayList>
+  <relation target="n15_r9ri" sidePair="height-height"/>
+</component>

FGUIProject/assets/poem/package.xml

@@ -52,7 +52,7 @@
     <component id="wono10t" name="ComPostcard.xml" path="/componentsPhoto/"/>
     <component id="r9ri10u" name="PoemGalleryUI.xml" path="/" exported="true"/>
     <component id="r9ri10v" name="Button9.xml" path="/componentsGallery/"/>
-    <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/"/>
+    <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/" exported="true"/>
     <component id="r9ri10x" name="ComRank.xml" path="/componentsGallery/"/>
     <component id="r9ri10y" name="ListRankItem.xml" path="/componentsGallery/"/>
     <component id="r9ri114" name="ComNormal.xml" path="/componentsGallery/"/>
@@ -128,6 +128,9 @@
     <image id="r9ri135" name="hl_phjlk_1.png" path="/imagesPhoto/"/>
     <component id="r9ritjn" name="PoemGalleryRuleUI.xml" path="/" exported="true"/>
     <image id="r9ri136" name="hl_phjltsts.png" path="/imagesGallery/"/>
+    <component id="r9ri137" name="ComFooter.xml" path="/componentsGallery/"/>
+    <component id="r9ri138" name="ListItem1.xml" path="/componentsGallery/" exported="true"/>
+    <component id="r9ri139" name="ComScroll.xml" path="/componentsGallery/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFavorites.cs

@@ -12,6 +12,7 @@ namespace UI.Poem
         public GButton m_btnTab1;
         public GList m_listFavorite;
         public GList m_listMySelf;
+        public UI_ComScroll m_comScroll;
         public const string URL = "ui://iyz778gkr9ri115";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComFavorites";
@@ -64,6 +65,7 @@ namespace UI.Poem
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_listFavorite = (GList)comp.GetChild("listFavorite");
             m_listMySelf = (GList)comp.GetChild("listMySelf");
+            m_comScroll = (UI_ComScroll)UI_ComScroll.Create(comp.GetChild("comScroll"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,8 @@ namespace UI.Poem
             m_btnTab1 = null;
             m_listFavorite = null;
             m_listMySelf = null;
+            m_comScroll.Dispose();
+            m_comScroll = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFooter.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComFooter
+    {
+        public GComponent target;
+        public Transition m_t0;
+        public const string URL = "ui://iyz778gkr9ri137";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComFooter";
+        private static UI_ComFooter _proxy;
+
+        public static UI_ComFooter Create(GObject gObject = null)
+        {
+            var ui = new UI_ComFooter();
+            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_ComFooter Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComFooter();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFooter.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComNormal.cs

@@ -22,6 +22,7 @@ namespace UI.Poem
         public GTextField m_txtRewardCount;
         public GTextField m_txtRank;
         public GGroup m_grpResult;
+        public UI_ComScroll m_comScroll;
         public const string URL = "ui://iyz778gkr9ri114";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComNormal";
@@ -84,6 +85,7 @@ namespace UI.Poem
             m_txtRewardCount = (GTextField)comp.GetChild("txtRewardCount");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_grpResult = (GGroup)comp.GetChild("grpResult");
+            m_comScroll = (UI_ComScroll)UI_ComScroll.Create(comp.GetChild("comScroll"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -102,6 +104,8 @@ namespace UI.Poem
             m_txtRewardCount = null;
             m_txtRank = null;
             m_grpResult = null;
+            m_comScroll.Dispose();
+            m_comScroll = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComScroll.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComScroll
+    {
+        public GComponent target;
+        public GList m_listRecommend;
+        public GList m_listRecommend1;
+        public const string URL = "ui://iyz778gkr9ri139";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComScroll";
+        private static UI_ComScroll _proxy;
+
+        public static UI_ComScroll Create(GObject gObject = null)
+        {
+            var ui = new UI_ComScroll();
+            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_ComScroll Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComScroll();
+            }
+            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_listRecommend = (GList)comp.GetChild("listRecommend");
+            m_listRecommend1 = (GList)comp.GetChild("listRecommend1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listRecommend = null;
+            m_listRecommend1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComScroll.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem1.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ListItem1
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtName;
+        public GButton m_btnCollect;
+        public GButton m_btnVote;
+        public const string URL = "ui://iyz778gkr9ri138";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ListItem1";
+        private static UI_ListItem1 _proxy;
+
+        public static UI_ListItem1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ListItem1();
+            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_ListItem1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListItem1();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnCollect = (GButton)comp.GetChild("btnCollect");
+            m_btnVote = (GButton)comp.GetChild("btnVote");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtName = null;
+            m_btnCollect = null;
+            m_btnVote = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem1.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemComScroll.cs

@@ -0,0 +1,18 @@
+namespace GFGGame
+{
+    public class PoemComScroll
+    {
+        private int _numItems;
+        public int numItems
+        {
+            get
+            {
+                return _numItems;
+            }
+            set
+            {
+
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemComScroll.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -53,6 +53,8 @@ namespace GFGGame
     {
         private UI_PoemGalleryUI _ui;
         private GList _list;
+        private GList _list1;
+        private GComponent _comScroll;
         // private List<PoemGalleryData> _galleryDatas = new List<PoemGalleryData>();
         private List<long> _galleryDatas = new List<long>();
         private int _sortType = 0;//由GallerySortType定义
@@ -85,36 +87,27 @@ namespace GFGGame
             _ui.m_btnJoin.onClick.Add(OnBtnJoinClick);
             _ui.m_btnFavorites.onClick.Add(OnBtnFavoritesClick);
 
-            _ui.m_comNormal.m_listRecommend.itemRenderer = RenderListItem;
-            _ui.m_comNormal.m_listRecommend.SetVirtual();
-            _ui.m_comNormal.m_listRecommend.scrollPane.onPullDownRelease.Add(onPullDownRelease);
-            _ui.m_comNormal.m_listRecommend.scrollPane.onScroll.Add(onScroll);
+            _ui.m_comNormal.m_comScroll.target.scrollPane.onPullDownRelease.Add(onPullDownRelease);
+            _ui.m_comNormal.m_comScroll.target.scrollPane.onPullUpRelease.Add(OnPullUpToRefresh);
+            _ui.m_comNormal.m_comScroll.target.scrollPane.onScrollEnd.Add(onScrollEnd);
+            _ui.m_comFavorites.m_comScroll.target.scrollPane.onPullDownRelease.Add(onPullDownRelease);
+            _ui.m_comFavorites.m_comScroll.target.scrollPane.onPullUpRelease.Add(OnPullUpToRefresh);
+            _ui.m_comFavorites.m_comScroll.target.scrollPane.onScrollEnd.Add(onScrollEnd);
 
-            _ui.m_comNormal.m_listFriend.itemRenderer = RenderListItem;
-            _ui.m_comNormal.m_listFriend.SetVirtual();
-            _ui.m_comNormal.m_listFriend.scrollPane.onScroll.Add(onScroll);
+            _ui.m_comNormal.m_comScroll.m_listRecommend.itemRenderer = RenderListItem;
+            _ui.m_comNormal.m_comScroll.m_listRecommend1.itemRenderer = RenderListItem1;
+            _ui.m_comFavorites.m_comScroll.m_listRecommend.itemRenderer = RenderListItem;
+            _ui.m_comFavorites.m_comScroll.m_listRecommend1.itemRenderer = RenderListItem1;
 
             _ui.m_comNormal.m_listRank.itemRenderer = RenderListRankItem;
             _ui.m_comNormal.m_listRank.SetVirtual();
-            _ui.m_comNormal.m_listRank.scrollPane.onScroll.Add(onScroll);
-
-            _ui.m_comFavorites.m_listFavorite.itemRenderer = RenderListItem;
-            _ui.m_comFavorites.m_listFavorite.SetVirtual();
-            _ui.m_comFavorites.m_listFavorite.scrollPane.onScroll.Add(onScroll);
-
-            _ui.m_comFavorites.m_listMySelf.itemRenderer = RenderListItem;
-            _ui.m_comFavorites.m_listMySelf.SetVirtual();
-            _ui.m_comFavorites.m_listMySelf.scrollPane.onScroll.Add(onScroll);
-
 
             _ui.m_comNormal.m_btnShop.onClick.Add(OnBtnShopClick);
             _ui.m_comNormal.m_btnReward.onClick.Add(OnBtnRewardClick);
 
-            // _ui.m_c1.onChanged.Add(OnTabChange);
             _ui.m_comNormal.m_c1.onChanged.Add(OnNormalTabChange);
             _ui.m_comFavorites.m_c1.onChanged.Add(OnFavoritesTabChange);
 
-
         }
         protected override void AddEventListener()
         {
@@ -136,6 +129,7 @@ namespace GFGGame
                 _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
                 _ui.m_comFavorites.m_c1.selectedIndex = _subtabIndex;
                 _list.RefreshVirtualList();
+                _list1.RefreshVirtualList();
             }
             else
             {
@@ -144,27 +138,41 @@ namespace GFGGame
                 _ui.m_comNormal.m_comBoBox.selectedIndex = 0;
                 _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
                 _ui.m_comFavorites.m_c1.selectedIndex = _subtabIndex;
-                if (_ui.m_comNormal.m_listRecommend.numItems > 0) _ui.m_comNormal.m_listRecommend.ScrollToView(0);
-                if (_ui.m_comNormal.m_listFriend.numItems > 0) _ui.m_comNormal.m_listFriend.ScrollToView(0);
-                if (_ui.m_comNormal.m_listRank.numItems > 0) _ui.m_comNormal.m_listRank.ScrollToView(0);
-                if (_ui.m_comFavorites.m_listFavorite.numItems > 0) _ui.m_comFavorites.m_listFavorite.ScrollToView(0);
-                if (_ui.m_comFavorites.m_listMySelf.numItems > 0) _ui.m_comFavorites.m_listMySelf.ScrollToView(0);
+                _comScroll = _ui.m_comNormal.m_comScroll.target;
+
+                // if (_ui.m_comNormal.m_listRecommend.numItems > 0) _ui.m_comNormal.m_listRecommend.ScrollToView(0);
+                // if (_ui.m_comNormal.m_listFriend.numItems > 0) _ui.m_comNormal.m_listFriend.ScrollToView(0);
+                // if (_ui.m_comNormal.m_listRank.numItems > 0) _ui.m_comNormal.m_listRank.ScrollToView(0);
+                // if (_ui.m_comFavorites.m_listFavorite.numItems > 0) _ui.m_comFavorites.m_listFavorite.ScrollToView(0);
+                // if (_ui.m_comFavorites.m_listMySelf.numItems > 0) _ui.m_comFavorites.m_listMySelf.ScrollToView(0);
+
+                if (_ui.m_comNormal.m_comScroll.m_listRecommend.numItems > 0) _ui.m_comNormal.m_comScroll.m_listRecommend.ScrollToView(0);
+                if (_ui.m_comNormal.m_comScroll.m_listRecommend1.numItems > 0) _ui.m_comNormal.m_comScroll.m_listRecommend1.ScrollToView(0);
+
+                if (_ui.m_comFavorites.m_comScroll.m_listRecommend.numItems > 0) _ui.m_comFavorites.m_comScroll.m_listRecommend.ScrollToView(0);
+                if (_ui.m_comFavorites.m_comScroll.m_listRecommend1.numItems > 0) _ui.m_comFavorites.m_comScroll.m_listRecommend1.ScrollToView(0);
+
                 OnNormalTabChange();
             }
 
             _ui.m_c1.selectedIndex = _tabIndex;
 
-            _ui.m_comNormal.m_listRecommend.numItems = 15;
-            _ui.m_comNormal.m_listFriend.numItems = 15;
-            _ui.m_comNormal.m_listRank.numItems = 15;
-            _ui.m_comFavorites.m_listFavorite.numItems = 15;
-            _ui.m_comFavorites.m_listMySelf.numItems = 15;
-
-            _list = _ui.m_comNormal.m_listRecommend;
-            _list.numItems = 10;
+            // _ui.m_comNormal.m_listRecommend.numItems = 15;
+            // _ui.m_comNormal.m_listFriend.numItems = 15;
+            // _ui.m_comNormal.m_listRank.numItems = 15;
+            // _ui.m_comFavorites.m_listFavorite.numItems = 15;
+            // _ui.m_comFavorites.m_listMySelf.numItems = 15;
 
+            // _list = _ui.m_comNormal.m_listRecommend;
+            // _list.numItems = 10;
+            // _list.ResizeToFit();
 
             // _list.RefreshVirtualList();
+            _ui.m_comNormal.m_comScroll.m_listRecommend.numItems = 7;
+            _ui.m_comNormal.m_comScroll.m_listRecommend.ResizeToFit();
+            _ui.m_comNormal.m_comScroll.m_listRecommend1.numItems = 6;
+            _ui.m_comNormal.m_comScroll.m_listRecommend1.ResizeToFit();
+
             UpdateView();
         }
 
@@ -172,6 +180,7 @@ namespace GFGGame
         {
             base.OnHide();
             ResetPullDownRelease();
+            ResetPullUpRelease();
             _ui.m_comNormal.m_comBoBox.selectedIndex = 0;
         }
 
@@ -222,7 +231,7 @@ namespace GFGGame
                 _ui.m_comNormal.m_c1.selectedIndex = RecommendType.RECOMMEND;
             }
             _tabIndex = _ui.m_c1.selectedIndex;
-
+            _comScroll = _ui.m_comNormal.m_comScroll.target;
         }
 
         /// <summary>
@@ -242,11 +251,13 @@ namespace GFGGame
         private void OnBtnFavoritesClick()
         {
             _tabIndex = _ui.m_c1.selectedIndex;
+            _comScroll = _ui.m_comFavorites.m_comScroll.target;
             if (_ui.m_comFavorites.m_c1.selectedIndex != FavoritesType.FAVORITE)
             {
                 _ui.m_comFavorites.m_c1.selectedIndex = FavoritesType.FAVORITE;
             }
             ResetPullDownRelease();
+            ResetPullUpRelease();
         }
 
         /// <summary>
@@ -255,7 +266,7 @@ namespace GFGGame
         private void OnNormalTabChange()
         {
             ResetPullDownRelease();
-
+            ResetPullUpRelease();
             _subtabIndex = _ui.m_comNormal.m_c1.selectedIndex;
             if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RANK)//排行榜
             {
@@ -277,16 +288,18 @@ namespace GFGGame
                         _sortType = (int)GallerySortType.Newest;
                         _galleryDatas = PoemGalleryDataManager.Instance.NewestDatas;
                     }
-                    _list = _ui.m_comNormal.m_listRecommend;
+                    // _list = _ui.m_comNormal.m_listRecommend;
                 }
                 else if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.FRIEND)//好友
                 {
                     _sortType = (int)GallerySortType.Friend;
                     _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
-                    _list = _ui.m_comNormal.m_listFriend;
+                    // _list = _ui.m_comNormal.m_listFriend;
                 }
-
+                _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
+                _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
                 if (_list.numItems > 0) _list.ScrollToView(0);
+                if (_list1.numItems > 0) _list.ScrollToView(0);
 
                 ReqGalleryList(0);
             }
@@ -302,15 +315,18 @@ namespace GFGGame
             {
                 _sortType = (int)GallerySortType.MyCollect;
                 _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
-                _list = _ui.m_comFavorites.m_listFavorite;
+                // _list = _ui.m_comFavorites.m_listFavorite;
             }
             else if (_ui.m_comFavorites.m_c1.selectedIndex == FavoritesType.MY_SELF)//我的作品
             {
                 _sortType = (int)GallerySortType.MyWorks;
                 _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
-                _list = _ui.m_comFavorites.m_listMySelf;
+                // _list = _ui.m_comFavorites.m_listMySelf;
             }
+            _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
+            _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
             if (_list.numItems > 0) _list.ScrollToView(0);
+            if (_list1.numItems > 0) _list.ScrollToView(0);
             ReqGalleryList(0);
 
         }
@@ -318,17 +334,31 @@ namespace GFGGame
         /********************************************************请求更新列表*************************************************/
 
         //分页刷新
-        private void onScroll()
+        // private void onScroll()
+        // {
+        //     if (_list == null) return;
+        //     int index = _list.ItemIndexToChildIndex(_list.numItems);
+        //     int itemIndex = _list.ChildIndexToItemIndex(0);
+        //     int startIndex = itemIndex + 1;
+        //     if (startIndex >= _list.numItems && startIndex % _pageCount == 0)
+        //     {
+        //         ReqGalleryList(startIndex);
+        //     }
+        // }
+
+        private void onScrollEnd()
         {
-            if (_list == null) return;
-            int itemIndex = _list.ChildIndexToItemIndex(0);
-            int startIndex = itemIndex + 1;
-            if (startIndex >= _list.numItems && startIndex % _pageCount == 0)
+            // int index = _list.ItemIndexToChildIndex(_list.numItems);
+            // if (index <= _list.numChildren)
+            // {
+
+            // }
+            if (_comScroll.scrollPane.percY == 1)
             {
-                ReqGalleryList(startIndex);
+                ReqGalleryList(_list.numItems);
             }
+            // GObject obj = _list.GetChildAt(index);
         }
-
         //请求刷新
         private void ReqGalleryList(int startIndex)
         {
@@ -337,6 +367,16 @@ namespace GFGGame
         private void UpdateGalleryList()
         {
             _list.numItems = _galleryDatas.Count;
+            if (_galleryDatas.Count % 2 == 0)
+            {
+                _list.numItems = _galleryDatas.Count / 2;
+                _list1.numItems = _galleryDatas.Count / 2;
+            }
+            else
+            {
+                _list.numItems = (_galleryDatas.Count + 1) / 2;
+                _list1.numItems = (_galleryDatas.Count - 1) / 2;
+            }
             UpdateView();
         }
 
@@ -360,6 +400,7 @@ namespace GFGGame
             else
             {
                 _list.RefreshVirtualList();
+                _list1.RefreshVirtualList();
             }
             UpdateView();
         }
@@ -375,18 +416,36 @@ namespace GFGGame
             _ui.m_comNormal.m_txtTime.text = PoemGalleryDataManager.Instance.GetThemeTime();
             _ui.m_comNormal.m_grpResult.visible = PoemGalleryDataManager.Instance.IsResulting();
         }
+        string GetListItemResource(int index)
+        {
+
+            if (index % 2 == 0)
+                return "ui://Poem/ListItem";
+            else
+                return "ui://Poem/ListItem1";
+        }
 
         private void RenderListItem(int index, GObject obj)
         {
-            // long workId = _galleryDatas[index];
+            // long workId = _galleryDatas[index * 2];
+            // PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
+            // UpdateListItem(data, obj);
+            UpdateListItem(null, obj);
+        }
+        private void RenderListItem1(int index, GObject obj)
+        {
+            // long workId = _galleryDatas[index * 1];
             // PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
+            // UpdateListItem(data, obj);
+            UpdateListItem(null, obj);
+        }
+
+        private void UpdateListItem(PoemGalleryData data, GObject obj)
+        {
             UI_ListItem item = UI_ListItem.Proxy(obj);
-            // item.m_loaIcon.height = 550 + Random.Range(40, 100);
-            // if (index > 1)
-            // {
-            //     item.target.y=
-            // }
-            // item.target.height = item.m_loaIcon.height + 80;
+
+            item.m_loaIcon.SetSize(item.m_loaIcon.width, 550 + Random.Range(1, 5) * 30);
+
             // item.m_loaIcon.texture = data.Ntexture;
             // item.m_txtName.text = data.AuthorName;
             // item.m_btnCollect.title = data.CollectCount.ToString();
@@ -410,15 +469,13 @@ namespace GFGGame
             // }
             // item.m_btnVote.data = workId;
             UI_ListItem.ProxyEnd();
-
         }
 
-
         private void RenderListRankItem(int index, GObject obj)
         {
             // long workId = _galleryDatas[index];
             // PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
-            // UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
+            UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
             // item.m_loaIcon.height = 550 + Random.Range(40, 100);
 
             // item.target.height = item.m_loaIcon.height + 80;
@@ -445,7 +502,7 @@ namespace GFGGame
             //     item.m_btnVote.onClick.Add(OnBtnVoteClick);
             // }
             // item.m_btnVote.data = workId;
-            // UI_ListRankItem.ProxyEnd();
+            UI_ListRankItem.ProxyEnd();
         }
 
 
@@ -529,11 +586,15 @@ namespace GFGGame
 
 
         /********************************************************下拉刷新*************************************************/
+        //自动下拉
         private void PullDown()
         {
-            if (_ui.m_comNormal.m_listRecommend.numItems > 0) _ui.m_comNormal.m_listRecommend.ScrollToView(0);
-            GComponent header = _ui.m_comNormal.m_listRecommend.scrollPane.header;
+            // if (_ui.m_comNormal.m_listRecommend.numItems > 0) _ui.m_comNormal.m_listRecommend.ScrollToView(0);
+            _list.ScrollToView(0);
+            // _comScroll.scrollPane.posY = 0;
+            GComponent header = _comScroll.scrollPane.header;
             header.height = header.sourceHeight;
+            // _comScroll.scrollPane.LockHeader(header.sourceHeight);
         }
 
         //下拉刷新
@@ -541,31 +602,61 @@ namespace GFGGame
         {
             // ReqGalleryList(0);
 
-            GComponent header = _ui.m_comNormal.m_listRecommend.scrollPane.header;
+            GComponent header = _comScroll.scrollPane.header;
             if (header.height < header.sourceHeight) return;
-            // Transition transition = header.GetTransition("t0");
-            // transition.Play();
-            // controller.selectedIndex = 1;
-            _ui.m_comNormal.m_listRecommend.scrollPane.LockHeader(header.sourceHeight);
-            Timers.inst.Add(2, 1, OnTimeComplete);
-        }
 
-        private void OnTimeComplete(object param)
+            _comScroll.scrollPane.LockHeader(header.sourceHeight);
+            Timers.inst.Add(2, 1, OnPullDownTimeComplete);
+        }
+        private void OnPullDownTimeComplete(object param)
         {
-            GComponent header = _ui.m_comNormal.m_listRecommend.scrollPane.header;
+            GComponent header = _comScroll.scrollPane.header;
             Transition transition = header.GetTransition("t0");
             transition.Stop();
             // header.GetController("c1").selectedIndex = 2;
-            _ui.m_comNormal.m_listRecommend.scrollPane.LockHeader(0);
+            _comScroll.scrollPane.LockHeader(0);
         }
-
         /// <summary>
         /// 重置下拉刷新状态
         /// </summary>
         private void ResetPullDownRelease()
         {
-            Timers.inst.Remove(OnTimeComplete);
-            OnTimeComplete(null);
+            Timers.inst.Remove(OnPullDownTimeComplete);
+            OnPullDownTimeComplete(null);
         }
+
+
+        //上拉刷新
+        private void OnPullUpToRefresh()
+        {
+            GComponent footer = _comScroll.scrollPane.footer;
+            if (footer.height < footer.sourceHeight) return;
+
+            _comScroll.scrollPane.LockFooter(footer.sourceHeight + 10);
+            Timers.inst.Add(2, 1, OnPullUpTimeComplete);
+        }
+
+        private void OnPullUpTimeComplete(object param)
+        {
+            GComponent footer = _comScroll.scrollPane.footer;
+            Transition transition = footer.GetTransition("t0");
+            transition.Stop();
+            // header.GetController("c1").selectedIndex = 2;
+            _comScroll.scrollPane.LockFooter(0);
+        }
+
+        /// <summary>
+        /// 重置上拉刷新状态
+        /// </summary>
+        private void ResetPullUpRelease()
+        {
+            Timers.inst.Remove(OnPullUpTimeComplete);
+            OnPullUpTimeComplete(null);
+        }
+
+        /********************************************************滚动容器*************************************************/
+
+
+
     }
 }