修改相册UI

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button6.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_Button6
+    {
+        public GButton target;
+        public GTextField m_title1;
+        public const string URL = "ui://iyz778gkis13tk6";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
+
+        public static UI_Button6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button6();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button6();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_title1 = (GTextField)comp.GetChild("title1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -10,7 +10,8 @@ namespace UI.Poem
         public UI_ComTravel m_comTravel;
         public UI_Button1 m_btnLock;
         public UI_Button2 m_btnUp;
-        public GImage m_imgSelect;
+        public GImage m_imgSelectMask;
+        public GGroup m_imgSelect;
         public const string URL = "ui://iyz778gkwono10g";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComPhotoPostcard";
@@ -61,7 +62,8 @@ namespace UI.Poem
             m_comTravel = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comTravel"));
             m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
             m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
-            m_imgSelect = (GImage)comp.GetChild("imgSelect");
+            m_imgSelectMask = (GImage)comp.GetChild("imgSelectMask");
+            m_imgSelect = (GGroup)comp.GetChild("imgSelect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,6 +73,7 @@ namespace UI.Poem
             m_btnLock = null;
             m_btnUp.Dispose();
             m_btnUp = null;
+            m_imgSelectMask = null;
             m_imgSelect = null;
             if(disposeTarget && target != null)
             {

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

@@ -9,9 +9,11 @@ namespace UI.Poem
         public GComponent target;
         public UI_ComIcon m_comIcon;
         public GTextField m_txtTime;
-        public GImage m_imgSelect;
+        public GTextField m_txtTimeDetail;
         public UI_Button1 m_btnLock;
         public UI_Button2 m_btnUp;
+        public GImage m_imgSelectMask;
+        public GGroup m_imgSelect;
         public const string URL = "ui://iyz778gkv4828";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ListPhotoItem";
@@ -61,20 +63,24 @@ namespace UI.Poem
         {
             m_comIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("comIcon"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_imgSelect = (GImage)comp.GetChild("imgSelect");
+            m_txtTimeDetail = (GTextField)comp.GetChild("txtTimeDetail");
             m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
             m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
+            m_imgSelectMask = (GImage)comp.GetChild("imgSelectMask");
+            m_imgSelect = (GGroup)comp.GetChild("imgSelect");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comIcon.Dispose();
             m_comIcon = null;
             m_txtTime = null;
-            m_imgSelect = null;
+            m_txtTimeDetail = null;
             m_btnLock.Dispose();
             m_btnLock = null;
             m_btnUp.Dispose();
             m_btnUp = null;
+            m_imgSelectMask = null;
+            m_imgSelect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,10 +11,10 @@ namespace UI.Poem
         public Controller m_c2;
         public GLoader m_loaBg;
         public GButton m_btnback;
-        public GButton m_btnTab0;
-        public GButton m_btnTab1;
         public GList m_list;
         public GList m_listTravel;
+        public GLoader m_icon;
+        public GList m_typeList;
         public UI_Button7 m_btnConfirmDelete;
         public GButton m_btnDelete;
         public GTextField m_txtCount;
@@ -70,10 +70,10 @@ namespace UI.Poem
             m_c2 = comp.GetController("c2");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_btnTab0 = (GButton)comp.GetChild("btnTab0");
-            m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_list = (GList)comp.GetChild("list");
             m_listTravel = (GList)comp.GetChild("listTravel");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_typeList = (GList)comp.GetChild("typeList");
             m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
@@ -85,10 +85,10 @@ namespace UI.Poem
             m_c2 = null;
             m_loaBg = null;
             m_btnback = null;
-            m_btnTab0 = null;
-            m_btnTab1 = null;
             m_list = null;
             m_listTravel = null;
+            m_icon = null;
+            m_typeList = null;
             m_btnConfirmDelete.Dispose();
             m_btnConfirmDelete = null;
             m_btnDelete = null;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs

@@ -29,6 +29,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
         }
         protected override void OnShown()

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

@@ -31,7 +31,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
@@ -45,7 +45,7 @@ namespace GFGGame
             _ui.m_btnConfirmDelete.target.onClick.Add(OnBtnConfirmDeleteClick);
             _ui.m_c1.onChanged.Add(OnBtnTabChange);
 
-
+            InitTypeList();
         }
         protected override void AddEventListener()
         {
@@ -56,7 +56,11 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_c1.selectedIndex = (this.viewData == null) ? (int)PictureSourceType.PersonalAlbum : (int)this.viewData;
+            if(this.viewData != null)
+            {
+                _ui.m_c1.selectedIndex = (int)this.viewData;
+            }
+            //_ui.m_c1.selectedIndex = (this.viewData == null) ? (int)PictureSourceType.PersonalAlbum : (int)this.viewData;
             OnBtnTabChange();
             // UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
@@ -150,8 +154,11 @@ namespace GFGGame
             }
             loaIcon.texture = _photoInfos[index].Ntexture;
 
-            item.m_txtTime.text = TimeUtil.FormattingTime1(_photoInfos[index].CreationTime);
-            item.m_txtTime.visible = false;
+            string[] timeStr = TimeUtil.FormattingTime1(_photoInfos[index].CreationTime).Split(' ');
+            item.m_txtTime.text = timeStr[0];
+            item.m_txtTimeDetail.text = timeStr[1];
+
+            //item.m_txtTime.visible = false;
             item.m_btnLock.m_c1.selectedIndex = _photoInfos[index].LockingStatus ? 1 : 0;
             item.m_btnUp.m_c1.selectedIndex = _photoInfos[index].ToppingStatus ? 1 : 0;
             if (item.m_btnLock.target.data == null)
@@ -343,5 +350,18 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_btnback, ConstGuideId.POEM, 2, "");
         }
+
+        /// <summary>
+        /// 初始化分类菜单文本，点击和未点击是两种样式，需要统一文字
+        /// </summary>
+        private void InitTypeList()
+        {
+            for(int i = 0; i < _ui.m_typeList.numChildren; i++)
+            {
+                UI_Button6 button6 = UI_Button6.Proxy(_ui.m_typeList.GetChildAt(i));
+                button6.m_title1.text = button6.target.title;
+                UI_Button6.ProxyEnd();
+            }
+        }
     }
 }

GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_5!a.png.meta

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

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

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