Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -126,8 +126,9 @@ namespace GFGGame
             item.m_loaTitle.visible = true;
             if (ActivityDataManager.Instance.actLimitChargeId > 0)
             {
-                item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
-                item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+                string path  = "xslc_" + openCfg.res;
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(path);//"ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                //item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
                 item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)