From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/Config/Configs/ActTaskConfig.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Main/Config/Configs/ActTaskConfig.cs b/Main/Config/Configs/ActTaskConfig.cs
index 196da59..43d5d60 100644
--- a/Main/Config/Configs/ActTaskConfig.cs
+++ b/Main/Config/Configs/ActTaskConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           YYL
-//    [  Date ]:           Tuesday, April 28, 2026
+//    [  Date ]:           Wednesday, April 29, 2026
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -20,6 +20,7 @@
 	public int IsDayReset;
 	public int TemplateID;
 	public int ActScoreItemID;
+	public int ActShopTypeEx;
 	public string ActScoreAwardInfo;
 
     public override int LoadKey(string _key)
@@ -40,7 +41,9 @@
 
 			int.TryParse(tables[3],out ActScoreItemID); 
 
-			ActScoreAwardInfo = tables[4];
+			int.TryParse(tables[4],out ActShopTypeEx); 
+
+			ActScoreAwardInfo = tables[5];
         }
         catch (Exception exception)
         {

--
Gitblit v1.8.0