画廊

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -8,7 +8,9 @@
     <remark page="4" value="我的作品"/>
   </controller>
   <displayList>
-    <loader id="n1_r9ri" name="loaPicture" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n1_r9ri" name="loaPicture" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="height-height,center-center,middle-middle"/>
+    </loader>
     <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>

FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -5,9 +5,10 @@
     <loader id="n0_r9ri" 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="n1_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
+      <property target="loaTitle" propertyId="1" value="ui://iyz778gkr9ri12i"/>
     </component>
     <component id="n11_r9ri" name="comNormal" src="r9ri114" fileName="componentsGallery/ComNormal.xml" xy="0,0" size="1080,1736">
       <gearDisplay controller="c1" pages="1"/>

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="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
   <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,10 +12,10 @@
     </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 checked="true" icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
+      <Button 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"/>
+      <Button checked="true" 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 icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
@@ -23,7 +23,18 @@
     <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"/>
+    <group id="n26_r9ri" name="grpTheme" xy="310,309" size="499,81"/>
+    <text id="n27_r9ri" name="txtTime" xy="381,430" size="317,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="截止日期:11/01至11/2 "/>
+    <text id="n33_r9ri" name="txtRewardCount" xy="718,430" size="211,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="奖励次数:10/30">
+      <gearDisplay controller="c1" pages="0,1"/>
+    </text>
+    <group id="n34_r9ri" name="grpTime" xy="381,430" size="317,39" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <component id="n37_r9ri" name="comBoBox" src="r9ri13a" fileName="componentsGallery/ComboBox.xml" xy="763,409">
+      <gearDisplay controller="c1" pages="0"/>
+      <ComboBox visibleItemCount="10"/>
+    </component>
     <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"/>
@@ -49,13 +60,6 @@
       <item/>
       <item/>
     </list>
-    <text id="n27_r9ri" name="txtTime" xy="381,430" size="317,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="截止日期:11/01至11/2 "/>
-    <text id="n33_r9ri" name="txtRewardCount" xy="718,430" size="211,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="奖励次数:10/30">
-      <gearDisplay controller="c1" pages="0,1"/>
-    </text>
-    <group id="n34_r9ri" name="n34" xy="381,430" size="317,39" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
     <text id="n29_r9ri" name="txtRank" xy="830,427" pivot="1,0" size="169,41" fontSize="30" color="#c58383" text="我的排名:20">
       <gearDisplay controller="c1" pages="2"/>
     </text>
@@ -68,9 +72,5 @@
     <component id="n36_r9ri" name="comScroll" src="r9ri139" fileName="componentsGallery/ComScroll.xml" xy="24,483">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n37_r9ri" name="comBoBox" src="r9ri13a" fileName="componentsGallery/ComboBox.xml" xy="763,409">
-      <gearDisplay controller="c1" pages="0,1"/>
-      <ComboBox visibleItemCount="10"/>
-    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/ListRankItem.xml

@@ -24,6 +24,9 @@
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n3_r9ri" sidePair="height-height"/>
     </image>
+    <image id="n15_r9ri" name="n15" src="r9ri13f" fileName="imagesGallery/hl_phb_4.png" xy="0,-2" size="996,1009">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
     <text id="n7_r9ri" name="txtRank" xy="21,56" size="63,41" fontSize="30" text="第六"/>
     <text id="n4_r9ri" name="txtName" xy="37,928" size="211,41" group="n14_r9ri" fontSize="30" color="#ac806f" text="名字名字名字啊"/>
     <component id="n5_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="740,936" size="32,30" group="n14_r9ri">

FGUIProject/assets/poem/package.xml

@@ -132,6 +132,7 @@
     <component id="r9ri13c" name="ComboBox_popup.xml" path="/componentsGallery/"/>
     <component id="r9ri13d" name="ComboBox_item.xml" path="/componentsGallery/"/>
     <component id="r9ri13e" name="PoemGalleryRewardGetUI.xml" path="/" exported="true"/>
+    <image id="r9ri13f" name="hl_phb_4.png" path="/imagesGallery/" scale="9grid" scale9grid="249,23,498,1120"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/VO/RoleInfoData.cs

@@ -11,7 +11,8 @@ namespace GFGGame
 
     public class RoleInfoDetailData
     {
-        public string slogan;
-        public CustomSuitData customSuitData;
+        public string slogan;//个性签名
+        public CustomSuitData customSuitData; //当前搭配套装
+        public int RoleLvl = 1; //玩家等级
     }
 }

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

@@ -14,15 +14,16 @@ namespace UI.Poem
         public GButton m_btnTab1;
         public GButton m_btnTab2;
         public GTextField m_txtTheme;
+        public GTextField m_txtTime;
+        public GTextField m_txtRewardCount;
+        public GGroup m_grpTime;
+        public GComboBox m_comBoBox;
         public GList m_listRecommend;
         public GList m_listFriend;
         public GList m_listRank;
-        public GTextField m_txtTime;
-        public GTextField m_txtRewardCount;
         public GTextField m_txtRank;
         public GGroup m_grpResult;
         public UI_ComScroll m_comScroll;
-        public GComboBox m_comBoBox;
         public const string URL = "ui://iyz778gkr9ri114";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComNormal";
@@ -77,15 +78,16 @@ namespace UI.Poem
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_btnTab2 = (GButton)comp.GetChild("btnTab2");
             m_txtTheme = (GTextField)comp.GetChild("txtTheme");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtRewardCount = (GTextField)comp.GetChild("txtRewardCount");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_comBoBox = (GComboBox)comp.GetChild("comBoBox");
             m_listRecommend = (GList)comp.GetChild("listRecommend");
             m_listFriend = (GList)comp.GetChild("listFriend");
             m_listRank = (GList)comp.GetChild("listRank");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            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"));
-            m_comBoBox = (GComboBox)comp.GetChild("comBoBox");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,16 +98,17 @@ namespace UI.Poem
             m_btnTab1 = null;
             m_btnTab2 = null;
             m_txtTheme = null;
+            m_txtTime = null;
+            m_txtRewardCount = null;
+            m_grpTime = null;
+            m_comBoBox = null;
             m_listRecommend = null;
             m_listFriend = null;
             m_listRank = null;
-            m_txtTime = null;
-            m_txtRewardCount = null;
             m_txtRank = null;
             m_grpResult = null;
             m_comScroll.Dispose();
             m_comScroll = null;
-            m_comBoBox = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -26,7 +26,7 @@ namespace GFGGame
         private const int INIT_COUNT = 1;
         private int _scoreType;
         private int _storeId = 1;
-        private GObject _selectedListItem;
+        private GButton _selectedListItem;
 
         private int _selectedItemId;//打开界面时选中的物品id
         private int _selectedType = 0;//打开界面时选中的物品类型
@@ -244,8 +244,9 @@ namespace GFGGame
 
         private void UpdateSelectedItemInfo(GComponent listItem, bool tween)
         {
-            _selectedListItem = listItem;
-
+            if (_selectedListItem != null) _selectedListItem.selected = false;
+            _selectedListItem = listItem.asButton;
+            _selectedListItem.selected = true;
             ShopCfg cfg = listItem.data as ShopCfg;
             _cfgSelected = cfg;
             UpdateRole(tween);

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

@@ -47,9 +47,10 @@ namespace GFGGame
             long workId = (int)(this.viewData as object[])[1];
             _galleryData = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
 
+            UpdateView();
         }
 
-        private void UpdateView()
+        private async void UpdateView()
         {
             _ui.m_c1.selectedIndex = _sortType;
             _ui.m_txtName.text = _galleryData.AuthorName;
@@ -63,6 +64,12 @@ namespace GFGGame
             _ui.m_btnVote.selected = _galleryData.VoteOrNot;
             _ui.m_btnVote.title = _galleryData.VoteCount.ToString();
             _ui.m_btnAddFriend.visible = FriendDataManager.Instance.GetFriendDataById(_galleryData.AuthorId) == null;
+
+            RoleInfoDetailData roleInfo = await FriendSProxy.ReqOtherRoleDetailInfo(_galleryData.AuthorId);
+            if (roleInfo != null)
+            {
+                _ui.m_comHead.m_txtLvl.text = roleInfo.RoleLvl.ToString();
+            }
         }
 
         protected override void OnHide()

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

@@ -231,6 +231,8 @@ namespace GFGGame
         /// </summary>
         private void OnBtnFavoritesClick()
         {
+            ResetPullRelease();
+
             _tabIndex = _ui.m_c1.selectedIndex;
             _comScroll = _ui.m_comFavorites.m_comScroll.target;
             if (_ui.m_comFavorites.m_c1.selectedIndex != FavoritesType.FAVORITE)
@@ -238,7 +240,6 @@ namespace GFGGame
                 _ui.m_comFavorites.m_c1.selectedIndex = FavoritesType.FAVORITE;
             }
             _subtabIndex = _ui.m_comFavorites.m_c1.selectedIndex;
-            ResetPullRelease();
         }
 
         /// <summary>

GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 35a1cefc88abc5345bcea64a7c835291
+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: