Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideUI.cs

@@ -14,6 +14,7 @@ namespace UI.FieldGuide
         public GList m_suitTypeList;
         public UI_SuitTypeItems m_suitTypeItems;
         public GList m_suitType2Items;
+        public Transition m_t0;
         public const string URL = "ui://vqq9h9h4z3os0";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitGuideUI";
@@ -68,6 +69,7 @@ namespace UI.FieldGuide
             m_suitTypeList = (GList)comp.GetChild("suitTypeList");
             m_suitTypeItems = (UI_SuitTypeItems)UI_SuitTypeItems.Create(comp.GetChild("suitTypeItems"));
             m_suitType2Items = (GList)comp.GetChild("suitType2Items");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,6 +81,7 @@ namespace UI.FieldGuide
             m_suitTypeItems.Dispose();
             m_suitTypeItems = null;
             m_suitType2Items = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIconMask.cs

@@ -4,18 +4,19 @@ using FairyGUI;
 
 namespace UI.RoleInfo
 {
-    public partial class UI_ComIcon
+    public partial class UI_ComIconMask
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GLoader m_loaIcon;
-        public const string URL = "ui://374k3dwvr9ri1q";
+        public const string URL = "ui://374k3dwvhiis9g04";
         public const string PACKAGE_NAME = "RoleInfo";
-        public const string RES_NAME = "ComIcon";
-        private static UI_ComIcon _proxy;
+        public const string RES_NAME = "ComIconMask";
+        private static UI_ComIconMask _proxy;
 
-        public static UI_ComIcon Create(GObject gObject = null)
+        public static UI_ComIconMask Create(GObject gObject = null)
         {
-            var ui = new UI_ComIcon();
+            var ui = new UI_ComIconMask();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +25,11 @@ namespace UI.RoleInfo
             return ui;
         }
 
-        public static UI_ComIcon Proxy(GObject gObject = null)
+        public static UI_ComIconMask Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComIcon();
+                _proxy = new UI_ComIconMask();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,10 +56,12 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_loaIcon = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIconMask.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5027751638a41d4cacd916723ac9714
+guid: 714cfec26a2afd64a84de66b38addc30
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItemDetail.cs

@@ -4,21 +4,21 @@ using FairyGUI;
 
 namespace UI.RoleInfo
 {
-    public partial class UI_ListPhotoItem1
+    public partial class UI_ListPhotoItemDetail
     {
         public GComponent target;
-        public UI_ComIcon m_comIcon;
+        public Controller m_c1;
+        public UI_ComIconMask m_comIcon;
         public GTextField m_txtTime;
-        public GImage m_imgOtherSelect;
-        public GImage m_imgSelect;
-        public const string URL = "ui://374k3dwvr9ri1v";
+        public GImage m_imgSelectMask;
+        public const string URL = "ui://374k3dwvhiis9g02";
         public const string PACKAGE_NAME = "RoleInfo";
-        public const string RES_NAME = "ListPhotoItem1";
-        private static UI_ListPhotoItem1 _proxy;
+        public const string RES_NAME = "ListPhotoItemDetail";
+        private static UI_ListPhotoItemDetail _proxy;
 
-        public static UI_ListPhotoItem1 Create(GObject gObject = null)
+        public static UI_ListPhotoItemDetail Create(GObject gObject = null)
         {
-            var ui = new UI_ListPhotoItem1();
+            var ui = new UI_ListPhotoItemDetail();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.RoleInfo
             return ui;
         }
 
-        public static UI_ListPhotoItem1 Proxy(GObject gObject = null)
+        public static UI_ListPhotoItemDetail Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListPhotoItem1();
+                _proxy = new UI_ListPhotoItemDetail();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,18 +58,18 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
-            m_comIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("comIcon"));
+            m_c1 = comp.GetController("c1");
+            m_comIcon = (UI_ComIconMask)UI_ComIconMask.Create(comp.GetChild("comIcon"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_imgOtherSelect = (GImage)comp.GetChild("imgOtherSelect");
-            m_imgSelect = (GImage)comp.GetChild("imgSelect");
+            m_imgSelectMask = (GImage)comp.GetChild("imgSelectMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comIcon.Dispose();
             m_comIcon = null;
             m_txtTime = null;
-            m_imgOtherSelect = null;
-            m_imgSelect = null;
+            m_imgSelectMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItemDetail.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6977722ce64835b4e9f1337d3a4c3ceb
+guid: f4f5d5a06c349324f81f3055590adb71
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs

@@ -25,7 +25,7 @@ namespace UI.RoleInfo
         public UI_Button19 m_btnLogout;
         public UI_Button20 m_btnGiftCode;
         public GButton m_btnExchange;
-        public Transition m_t0;
+        public Transition m_suit;
         public const string URL = "ui://374k3dwvr9ri1";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "SettingUI";
@@ -91,7 +91,7 @@ namespace UI.RoleInfo
             m_btnLogout = (UI_Button19)UI_Button19.Create(comp.GetChild("btnLogout"));
             m_btnGiftCode = (UI_Button20)UI_Button20.Create(comp.GetChild("btnGiftCode"));
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
-            m_t0 = comp.GetTransition("t0");
+            m_suit = comp.GetTransition("suit");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -118,7 +118,7 @@ namespace UI.RoleInfo
             m_btnGiftCode.Dispose();
             m_btnGiftCode = null;
             m_btnExchange = null;
-            m_t0 = null;
+            m_suit = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,13 +7,12 @@ namespace UI.Poem
     public partial class UI_ListPhotoItem
     {
         public GComponent target;
+        public Controller m_c1;
         public UI_ComIcon m_comIcon;
         public GTextField m_txtTime;
-        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,26 +60,24 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("comIcon"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            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_c1 = null;
             m_comIcon.Dispose();
             m_comIcon = null;
             m_txtTime = 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

@@ -16,9 +16,9 @@ namespace UI.Poem
         public GLoader m_icon;
         public GList m_typeList;
         public UI_Button7 m_btnConfirmDelete;
+        public GButton m_btnRule;
         public GButton m_btnDelete;
         public GTextField m_txtCount;
-        public GButton m_btnRule;
         public const string URL = "ui://iyz778gkv4825";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoUI";
@@ -75,9 +75,9 @@ namespace UI.Poem
             m_icon = (GLoader)comp.GetChild("icon");
             m_typeList = (GList)comp.GetChild("typeList");
             m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -91,9 +91,9 @@ namespace UI.Poem
             m_typeList = null;
             m_btnConfirmDelete.Dispose();
             m_btnConfirmDelete = null;
+            m_btnRule = null;
             m_btnDelete = null;
             m_txtCount = null;
-            m_btnRule = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -85,10 +85,10 @@ namespace GFGGame
         /// 将时间戳转换成yyyy-mm-dd hh-mm-ss格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
-        public static string FormattingTime1(long timeMsec)
+        public static string FormattingTime1(long timeMsec, char split = '-')
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
-            string str = date.ToString("yyyy-MM-dd HH:mm:ss");
+            string str = date.ToString(string.Format("yyyy{0}MM{0}dd HH:mm:ss", split));
 
             return str;
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -55,6 +55,8 @@ namespace GFGGame
             if (_needRefresh)
             {
                 _needRefresh = false;
+                // 让滑块直接置于最左边
+                _ui.m_t0.Play();
                 UpdateItemsByType(1);
             }
             UpdateListSuitTypeRedDots();
@@ -211,7 +213,6 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             _needRefresh = true;
-            _ui.m_c1.SetSelectedIndex(0);
             _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
             Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -175,7 +175,7 @@ namespace GFGGame
             if (guideTarget != null)
             {
                 Vector2 pos = guideTarget.LocalToGlobal(Vector2.zero);
-                Vector2 logicScreenPos = GRoot.inst.GlobalToLocal(pos);
+                Vector2 logicScreenPos = _ui.target.GlobalToLocal(pos);
                 // pos = _ui.m_mask.target.GlobalToLocal(pos);
                 logicScreenPos.x = logicScreenPos.x + guideTarget.width / 2;
                 logicScreenPos.y = logicScreenPos.y + guideTarget.height / 2;

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

@@ -145,7 +145,14 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
-            item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
+            if (_ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0)
+            {
+                item.m_c1.SetSelectedIndex(1);
+            }
+            else
+            {
+                item.m_c1.SetSelectedIndex(0);
+            }
             GLoader loaIcon = item.m_comIcon.m_loaIcon;
             loaIcon.visible = true;
             if (_photoInfos[index].Ntexture == null)
@@ -154,9 +161,8 @@ namespace GFGGame
             }
             loaIcon.texture = _photoInfos[index].Ntexture;
 
-            string[] timeStr = TimeUtil.FormattingTime1(_photoInfos[index].CreationTime).Split(' ');
+            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;
@@ -242,8 +248,9 @@ namespace GFGGame
                     return;
                 }
                 UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj.parent);
-                item.m_imgSelect.visible = !item.m_imgSelect.visible;
-                if (item.m_imgSelect.visible)
+
+                item.m_c1.selectedIndex ^= 1;
+                if (item.m_c1.selectedIndex == 1)
                 {
                     _listDelete.Add(photoData.PictureId);
                 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/MainBgChooseView.cs

@@ -188,6 +188,7 @@ namespace GFGGame
                         {
                             RoleInfoSProxy.ReqSaveChangeGearSwitch(1);
                             ViewManager.Show<DressUpView>(null, true);
+                            ViewManager.DeleteViewStackCountDown("MainUIView");
                         });
                 }
                 else

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs

@@ -35,7 +35,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
         }
 
         protected override void OnShown()
@@ -58,15 +58,28 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             PoemPhotoData photoData = PoemPhotoDataManager.Instance.PersonalPhotoInfos[index];
-            UI_ListPhotoItem1 item = UI_ListPhotoItem1.Proxy(obj);
+            UI_ListPhotoItemDetail item = UI_ListPhotoItemDetail.Proxy(obj);
             item.m_comIcon.m_loaIcon.texture = photoData.Ntexture;
             bool curSelect = photoData.PictureId == _showPictureId;
             bool otherSelect = !curSelect && RoleDataManager.photoDatas.IndexOf(photoData.PictureId) >= 0;
-            item.m_imgSelect.visible = curSelect;
-            item.m_imgOtherSelect.visible = otherSelect;
-            item.m_txtTime.text = TimeUtil.FormattingTime1(photoData.CreationTime);
+            if (curSelect)
+            {
+                item.m_c1.SetSelectedIndex(2);
+            }
+            else if (otherSelect)
+            {
+                item.m_c1.SetSelectedIndex(1);
+            }
+            else
+            {
+                item.m_c1.SetSelectedIndex(0);
+            }
+
+            string[] timeStr = TimeUtil.FormattingTime1(photoData.CreationTime, '/').Split(' ');
+            item.m_txtTime.text = timeStr[0];
+
             item.target.data = photoData.PictureId;
-            UI_ListPhotoItem1.ProxyEnd();
+            UI_ListPhotoItemDetail.ProxyEnd();
 
         }
         private async void OnListItemClick(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -238,6 +238,7 @@ namespace GFGGame
 
         private void OnBtnSettingClick()
         {
+            SettingView.refresh = true;
             ViewManager.Show<SettingView>();
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -10,6 +10,14 @@ namespace GFGGame
         private UI_SettingUI _ui;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
+        private static bool _refresh;
+        public static bool refresh
+        {
+            set
+            {
+                _refresh = value;
+            }
+        }
 
 
         public override void Dispose()
@@ -60,6 +68,12 @@ namespace GFGGame
         {
             base.OnShown();
             InitVolumnSetting();
+            if (_refresh)
+            {
+                _refresh = false;
+                _ui.m_suit.Play();
+                _ui.m_c1.SetSelectedIndex(0);
+            }
         }
 
         protected override void OnHide()
@@ -69,7 +83,6 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            _ui.m_c1.SetSelectedIndex(0);
             Hide();
             //AlertSystem.Show("确认返回登录页吗？")
             //    .SetLeftButton(true)
@@ -215,5 +228,7 @@ namespace GFGGame
         {
             FullScreenTextController.Show("event:c");
         }
+
+
     }
 }

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e03eb36f31e33404d8dc258147eec833
+guid: b517f578f586fe847b61443cf9e8353c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 01be678f3b6ea554e911ec21daed72f2
+guid: 5194f05d469a3ff4ea1e913a81cfd0e4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}