Browse Source

Squashed commit of the following:

commit aa6251609bff29d88776da3c1b733da010df11f7
Author: zhangyuqian <2974606464@qq.com>
Date:   Tue Aug 6 17:27:43 2024 +0800

    修改活动图标路径
hexiaojie 1 year ago
parent
commit
fec84fbc18

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -223,7 +223,7 @@ namespace GFGGame
         {
         {
             return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";
             return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";
         }
         }
-        public static string GetActivityPath(string res, string extName = "jpg")
+        public static string GetActivityPath(string res, string extName = "png")
         {
         {
             return $"{TEXTURE_DIR_PATH}/Activity/Activity/{res}.{extName}";
             return $"{TEXTURE_DIR_PATH}/Activity/Activity/{res}.{extName}";
         }
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -748,7 +748,7 @@ namespace GFGGame
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
                 string path = "zjm_icon_" + activityOpenCfg.res.Split('_')[1];
                 string path = "zjm_icon_" + activityOpenCfg.res.Split('_')[1];
-                _ui.m_btnActivityLuckyBox.target.icon = ResPathUtil.GetActivityPath(path); //"ui://Main/zjm_icon_" + activityOpenCfg.res.Split('_')[1];
+                _ui.m_btnActivityLuckyBox.target.icon = ResPathUtil.GetActivityPath(path,"png"); //"ui://Main/zjm_icon_" + activityOpenCfg.res.Split('_')[1];
                 //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
                 //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs

@@ -117,7 +117,7 @@ namespace GFGGame
                 item.m_loaItem.visible = false;
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
                 item.m_loaIcon.visible = true;
                 item.m_flow.visible = false;
                 item.m_flow.visible = false;
-                item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(_studioCfg.res,"png");
             }
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
             item.m_comFlower.target.visible = false;//.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
             item.m_comFlower.target.visible = false;//.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);

BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes