Merge branch 'master' of http://10.108.64.190:3000/gfg/Client

* 'master' of http://10.108.64.190:3000/gfg/Client:
  美术资源工具
  修复bug
  修复限时礼包icon点击事件bug

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -55,7 +55,7 @@ namespace GFGEditor
         public static string PicSMd5FileSaveName = "PicSMd5";
 
 
-        public static string[] BgSrcPaths { get { return new string[] { ResRootPathDressUp + "scene/" }; } }
+        public static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
         public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string BgMd5FileSaveName = "BgMd5";
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -157,8 +157,8 @@ namespace GFGGame
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
-            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag1);
-            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
@@ -721,12 +721,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag1.target.visible = false;
+                _ui.m_btnGiftBag2.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag1.target.visible = true;
+                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag2.target.visible = true;
             }
         }
 
@@ -739,12 +739,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag2.target.visible = false;
+                _ui.m_btnGiftBag1.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag2.target.visible = true;
+                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag1.target.visible = true;
             }
         }