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

yyl

2026-04-03 fb0570bdb7e73e7d4dca211f365ee67b43628240

 Main/Config/Configs/ActHeroAppearArtConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           YYL
//    [  Date ]:           2026年3月26日
//    [  Date ]:           Tuesday, March 31, 2026
//--------------------------------------------------------

using System.Collections.Generic;
@@ -19,23 +19,11 @@
    public int HeroID;
   public int[][] HeroNameColor;
   public int[][] CallBubbleItems;
   public string EntryBgImage;
   public string EntryTitleText;
   public string PopBgImage;
   public string PopTitleBgImage;
   public string PopTitleImage;
   public string PopInfoBgImage;
   public int PopInfoBgUIEffectId;
   public string PopInfoText;
   public int[] PopInfoColor;
   public string MainBgImage;
   public string MainTitleImage;
   public int MainSkinID;
   public string StarUpHeroImage;
   public string GiftBgImage;
   public string GiftHeroImage;
   public string RankAwardHeroImage;
   public string CheckInBgImage;

    public override int LoadKey(string _key)
    {
@@ -53,29 +41,19 @@

         CallBubbleItems = JsonMapper.ToObject<int[][]>(tables[2].Replace("(", "[").Replace(")", "]")); 

         EntryBgImage = tables[3];
         EntryTitleText = tables[3];

         EntryTitleText = tables[4];
         int.TryParse(tables[4],out PopInfoBgUIEffectId); 

         PopBgImage = tables[5];
         PopInfoText = tables[5];

         PopTitleBgImage = tables[6];

         PopTitleImage = tables[7];

         PopInfoBgImage = tables[8];

         int.TryParse(tables[9],out PopInfoBgUIEffectId); 

         PopInfoText = tables[10];

         if (tables[11].Contains("["))
         if (tables[6].Contains("["))
         {
            PopInfoColor = JsonMapper.ToObject<int[]>(tables[11]);
            PopInfoColor = JsonMapper.ToObject<int[]>(tables[6]);
         }
         else
         {
            string[] PopInfoColorStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] PopInfoColorStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            PopInfoColor = new int[PopInfoColorStringArray.Length];
            for (int i=0;i<PopInfoColorStringArray.Length;i++)
            {
@@ -83,21 +61,7 @@
            }
         }

         MainBgImage = tables[12];

         MainTitleImage = tables[13];

         int.TryParse(tables[14],out MainSkinID); 

         StarUpHeroImage = tables[15];

         GiftBgImage = tables[16];

         GiftHeroImage = tables[17];

         RankAwardHeroImage = tables[18];

         CheckInBgImage = tables[19];
         int.TryParse(tables[7],out MainSkinID); 
        }
        catch (Exception exception)
        {