Project_SG_scripts.git

			@@ -120,318 +120,6 @@
			}
			}



			// /// <summary>
			// /// 累计充值
			// /// </summary>
			// /// <param name="package"></param>

			// public void UpdateAccumulateRecharge(HAA1D_tagMCActTotalRechargeInfo package)
			// {
			// OperationBase operationBase = null;

			// Operation opreationType = Operation.AccumulateRecharge;
			// if (package.ActNum == 10)
			// {
			// //精彩活动-单日累充
			// opreationType = Operation.AccumulateRecharge;
			// }
			// else if (package.ActNum == 11)
			// {
			// //精彩活动-多日累充
			// opreationType = Operation.DaysAccumulateRecharge;
			// }
			// else if (package.ActNum == 20)
			// {
			// //合服-福利（多日累充1档）
			// opreationType = Operation.default8;
			// }
			// else if (package.ActNum == 30)
			// {
			// //节日-单日累充
			// opreationType = Operation.HolidayAccumulateRecharge;
			// }
			// else if (package.ActNum == 31)
			// {
			// //节日-多日累充
			// opreationType = Operation.HolidayMultiRecharge;
			// }
			// else if (package.ActNum == 34)
			// {
			// // 节日-指定1档充值
			// opreationType = Operation.default20;
			// }
			// else if (package.ActNum == 35)
			// {
			// // 福缘- 长久累充（几个月或更长）
			// opreationType = Operation.default32;
			// }

			// operationDict.TryGetValue(opreationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(opreationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationAccumulateRecharge();
			// operationDict.Add(opreationType, operationBase);
			// }
			// OperationAccumulateRecharge operation = operationBase as OperationAccumulateRecharge;
			// operation.Reset();
			// operation.limitLv = package.LimitLV;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.dayReset = package.IsDayReset == 1;
			// operation.ParseAccumulateRecharge(package);
			// operation.ActNum = package.ActNum;
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(opreationType);
			// }
			// }
			// }



			// public void UpdateCollectWordsPackage(HAA40_tagMCActCollectWordsInfo package)
			// {
			// OperationBase operationBase = null;

			// var opreationType = Operation.CollectWords;

			// switch (package.ActNum)
			// {
			// case 10:
			// opreationType = Operation.CollectWords;
			// break;
			// case 20:
			// opreationType = Operation.default10;
			// break;
			// case 30:
			// opreationType = Operation.HolidayCollectWords;
			// break;
			// }

			// operationDict.TryGetValue(opreationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(opreationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationCollectWords();
			// operationDict.Add(opreationType, operationBase);
			// }
			// OperationCollectWords operation = operationBase as OperationCollectWords;
			// operation.Reset();
			// operation.limitLv = package.LimitLV;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.ActNum = package.ActNum;
			// operation.LastDayOnlyExchange = package.LastDayOnlyExchange;
			// operation.ParseCollectWords(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(opreationType);
			// }
			// }
			// }

			// public void UpdateSingleRechargeInfo(HAA50_tagMCActSingleRechargeInfo package)
			// {
			// OperationBase operationBase = null;

			// var opreationType = Operation.default28;

			// operationDict.TryGetValue(opreationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(opreationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationSingleRecharge();
			// operationDict.Add(opreationType, operationBase);
			// }
			// OperationSingleRecharge operation = operationBase as OperationSingleRecharge;
			// operation.Reset();
			// operation.limitLv = package.LimitLV;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.ActNum = package.ActNum;
			// operation.dayReset = package.IsDayReset == 1;
			// operation.ParseSingleRecharge(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(opreationType);
			// }
			// }
			// }

			// public void UpdateHolidayLogin(HAA42_tagMCFeastLoginInfo package)
			// {
			// OperationBase operationBase = null;
			// operationDict.TryGetValue(Operation.HolidayLogin, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(Operation.HolidayLogin);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationHolidayLogin();
			// operationDict.Add(Operation.HolidayLogin, operationBase);
			// }
			// var operation = operationBase as OperationHolidayLogin;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.limitLv = package.LimitLV;
			// operation.ParsePackage(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(Operation.HolidayLogin);
			// }
			// }
			// }



			// public void UpdateMultiRechargePackage(HAA27_tagMCActRechargePrizeInfo package)
			// {
			// OperationBase operationBase = null;
			// operationDict.TryGetValue(Operation.MultiRecharge, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(Operation.MultiRecharge);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationMultiRecharge();
			// operationDict.Add(Operation.MultiRecharge, operationBase);
			// }
			// OperationMultiRecharge operation = operationBase as OperationMultiRecharge;
			// operation.Reset();
			// operation.limitLv = package.LimitLV;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.dayReset = package.IsDayReset == 1;
			// operation.ParseMultiRecharge(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(Operation.MultiRecharge);
			// }
			// }
			// }

			// /// <summary>
			// /// 限时礼包
			// /// </summary>
			// /// <param name="package"></param>

			// public void UpdateGiftPackage(HAA12_tagMCFlashGiftbagInfo package)
			// {
			// OperationBase operationBase = null;
			// Operation operationType = Operation.GiftPackage;

			// switch (package.ActNum)
			// {
			// case 10:
			// operationType = Operation.GiftPackage;
			// break;
			// case 20:
			// operationType = Operation.default13;
			// break;
			// case 30:
			// operationType = Operation.HolidayGiftPackage;
			// break;
			// }

			// operationDict.TryGetValue(operationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(operationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new GiftPackageClass();
			// operationDict.Add(operationType, operationBase);
			// }
			// GiftPackageClass operation = operationBase as GiftPackageClass;
			// operation.Reset();
			// operation.limitLv = package.LimitLV;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.dayReset = package.IsDayReset == 1;
			// operation.inAdvanceMinute = package.AdvanceMinutes;
			// operation.ActNum = package.ActNum;
			// for (int i = 0; i < package.ActivityTimeCount; i++)
			// {
			// operation.times.Add(ParseOperationTime(package.ActivityTime[i].StartTime,
			// package.ActivityTime[i].EndtTime));
			// }
			// operation.ParsePackage(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(operationType);
			// }
			// }
			// }





			// public void UpdateCrossActLianQiInfo(HAA90_tagMCCrossActLianqiInfo package)
			// {
			// OperationBase operationBase = null;
			// operationDict.TryGetValue(Operation.default51, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(Operation.default51);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationLianQiCross();
			// operationDict.Add(Operation.default51, operationBase);
			// }
			// OperationLianQiCross operation = operationBase as OperationLianQiCross;
			// operation.Reset();
			// operation.m_ServerListStr = UIHelper.GetServers(package.ServerIDRangeInfo);
			// operation.m_GroupValue1 = package.GroupValue1;
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.dayReset = true;
			// operation.limitLv = package.LimitLV;
			// operation.ParseJoinTime(package.JoinStartTime, package.JoinEndTime);
			// operation.ParseCrossActHorsePetTrainInfo(package);
			// //for (int i = 0; i < package.ActivityTimeCount; i++)
			// //{
			// // operation.times.Add(ParseOperationTime(package.ActivityTime[i].StartTime,
			// // package.ActivityTime[i].EndtTime));
			// //}
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(Operation.default51);
			// }
			// }
			// }

			public void UpdateActLunhuidianInfo(HAA88_tagMCActLunhuidianInfo package)
			{
			OperationBase operationBase = null;
			@@ -472,6 +160,8 @@
			case 11:
			opreationType = OperationType.HeroReturn;
			break;
			default:
			return;
			}

			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			@@ -506,6 +196,8 @@
			case 30:
			opreationType = OperationType.FestivalActivity_RechargeTotal;
			break;
			default:
			return;
			}

			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			@@ -547,6 +239,8 @@
			case 30:
			opreationType = OperationType.FestivalActivity_RechargeTotDay;
			break;
			default:
			return;
			}
			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			{
			@@ -581,6 +275,8 @@
			case 30:
			opreationType = OperationType.FestivalActivity;
			break;
			default:
			return;
			}

			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			@@ -617,6 +313,8 @@
			case 30:
			opreationType = OperationType.FestivalActivity_CheckIn;
			break;
			default:
			return;
			}

			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			@@ -653,6 +351,8 @@
			case 30:
			opreationType = OperationType.FestivalActivity_Mission;
			break;
			default:
			return;
			}

			if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			@@ -682,232 +382,6 @@
			operation.dayReset = config.IsDayReset == 1;
			operationTimeUpdateEvent?.Invoke(opreationType);
			}

			// public void UpdateActYunShiInfo(HAA87_tagMCActYunshiInfo package)
			// {
			// Operation operationType = Operation.default48;

			// switch (package.ActNum)
			// {
			// case 10:
			// operationType = Operation.default48;
			// break;
			// }
			// OperationBase operationBase = null;
			// operationDict.TryGetValue(operationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(operationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationYunShi();
			// operationDict.Add(operationType, operationBase);
			// }
			// OperationYunShi operation = operationBase as OperationYunShi;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.resetType = package.ResetType;
			// operation.limitLv = package.LimitLV;
			// operation.treasureType = package.TreasureType;
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(operationType);
			// }
			// }
			// }


			// public void UpdateLoginAct(HAA69_tagMCActLoginNew package)
			// {
			// OperationBase operationBase = null;
			// Operation operationType = Operation.default29;

			// switch (package.ActNum)
			// {
			// case 11:
			// operationType = Operation.default44;
			// break;
			// case 30:
			// operationType = Operation.default29;
			// break;
			// }

			// operationDict.TryGetValue(operationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(operationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationLoginAct();
			// operationDict.Add(operationType, operationBase);
			// }
			// var operation = operationBase as OperationLoginAct;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.limitLv = package.LimitLV;
			// operation.ActNum = package.ActNum;
			// operation.ParsePackage(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(operationType);
			// }
			// }
			// }

			// public void UpdateMissionAct(HAA71_tagMCActTaskInfo package)
			// {
			// OperationBase operationBase = null;

			// var opreationType = Operation.default30;
			// switch (package.ActNum)
			// {
			// case 11:
			// opreationType = Operation.default45;
			// break;
			// case 12:
			// opreationType = Operation.default49;
			// break;
			// case 30:
			// opreationType = Operation.default30;
			// break;
			// }
			// operationDict.TryGetValue(opreationType, out operationBase);

			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(opreationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationMissionAct();
			// operationDict.Add(opreationType, operationBase);
			// }
			// var operation = operationBase as OperationMissionAct;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.limitLv = package.LimitLV;
			// operation.dayReset = package.IsDayReset == 1;
			// operation.resetType = package.ResetType;
			// operation.ActNum = package.ActNum;
			// operation.ParsePackage(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(Operation.default30);
			// }
			// }
			// }

			// public void UpdateRechargeGiftAct(HAA74_tagMCActBuyCountGiftInfo package)
			// {
			// OperationBase operationBase = null;

			// Operation operationType = Operation.default31;

			// switch (package.ActNum)
			// {
			// case 30:
			// operationType = Operation.default31;
			// break;
			// case 10:
			// operationType = Operation.default35;
			// break;
			// case 31:
			// operationType = Operation.default38;
			// break;
			// case 11:
			// operationType = Operation.default46;
			// break;
			// case 12:
			// operationType = Operation.default50;
			// break;
			// case 13:
			// operationType = Operation.default52;
			// break;
			// default:
			// return;
			// }
			// operationDict.TryGetValue(operationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(operationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationRechargeGiftAct();
			// operationDict.Add(operationType, operationBase);
			// }
			// var operation = operationBase as OperationRechargeGiftAct;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.limitLv = package.LimitLV;
			// operation.dayReset = package.IsDayReset == 1;
			// operation.resetType = package.ResetType;
			// operation.ActNum = package.ActNum;
			// operation.ParsePackage(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(operationType);
			// }
			// }
			// }

			// public void UpdateActFamilyCTGAssistInfo(HAA77_tagMCActFamilyCTGAssistInfo package)
			// {
			// OperationBase operationBase = null;

			// Operation operationType = Operation.default34;

			// switch (package.ActNum)
			// {
			// case 30:
			// operationType = Operation.default34;
			// break;
			// case 32:
			// operationType = Operation.default54;
			// break;
			// default:
			// return;
			// }
			// operationDict.TryGetValue(operationType, out operationBase);
			// if (string.IsNullOrEmpty(package.StartDate) \|\| string.IsNullOrEmpty(package.EndtDate))
			// {
			// ForceStopOperation(operationType);
			// }
			// else
			// {
			// if (operationBase == null)
			// {
			// operationBase = new OperationFamilyRechargeConn();
			// operationDict.Add(operationType, operationBase);
			// }
			// var operation = operationBase as OperationFamilyRechargeConn;
			// operation.Reset();
			// operation.startDate = ParseOperationDate(package.StartDate);
			// operation.endDate = ParseOperationDate(package.EndtDate);
			// operation.limitLv = package.LimitLV;
			// operation.dayReset = package.IsDayReset == 1;
			// operation.ActNum = package.ActNum;
			// operation.ParseActFamilyCTGAssistInfo(package);
			// if (operationTimeUpdateEvent != null)
			// {
			// operationTimeUpdateEvent(operationType);
			// }
			// }
			// }

			public void ForceStopOperation(OperationType operationType)
			{

	Main/System/FestivalActivity/FestivalActivityManager.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/OpenServerActivity/OperationTimeHepler.cs	550 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -311,7 +311,8 @@

			List<FestivalActivityGiftItem> res = new List<FestivalActivityGiftItem>();

			var list = StoreModel.Instance.storeTypeDict[config.ActShopType];
			if (!StoreModel.Instance.storeTypeDict.TryGetValue(config.ActShopType, out var list))
			return res;
			if (!list.IsNullOrEmpty())
			{
			for (int i = 0; i < list.Count; i++)