From d10eb06e8d935a453ad85dc359eab2d8401b2ba9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 06 十二月 2018 10:31:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonAssistModel.cs | 195 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 59 deletions(-)
diff --git a/System/Dungeon/DungeonAssistModel.cs b/System/Dungeon/DungeonAssistModel.cs
index 0a8fdbe..47f9709 100644
--- a/System/Dungeon/DungeonAssistModel.cs
+++ b/System/Dungeon/DungeonAssistModel.cs
@@ -594,6 +594,7 @@
assistResult.addXianyuanCoins = recordInfo.XianyuanCoinAdd;
assistResult.relatedToPlayer = (RelatedToPlayer)recordInfo.Relation;
assistResult.vipLv = recordInfo.VIPLV;
+ assistResult.isSweep = false;
assistResult.createTime = recordInfo.HelpTime;
assistResult.noGetReason = 2;
assistResult.SetNotifyResult();
@@ -613,6 +614,7 @@
assistResult.relatedToPlayer = (RelatedToPlayer)msg.Relation;
assistResult.addCoins = msg.RelationCoinAdd;
assistResult.vipLv = PlayerDatas.Instance.baseData.VIPLv;
+ assistResult.isSweep = msg.IsSweep == 1;
assistResult.createTime = TimeUtility.ServerNow.ToString("yyyy-MM-dd HH:mm:ss");
assistResult.noGetReason = msg.Reason;
assistResult.SetNotifyResult();
@@ -692,6 +694,7 @@
public int addXianyuanCoinsTheory; // 鐞嗚澧炲姞鐨勪粰缂樺竵
public RelatedToPlayer relatedToPlayer;
public int vipLv;
+ public bool isSweep;
public string createTime;
public ResultType resultType;
public string info;
@@ -835,6 +838,39 @@
case ResultType.TeamAssistGetExtraScore:
info = Language.Get("DungeonAssist109", callPlayerName, callPlayerId, fbName, addXianyuanCoins,sumAddStr);
break;
+ case ResultType.SweepingGetScore:
+ isSelf = true;
+ info = Language.Get("DungeonAssist148", fbName, addXianyuanCoins);
+ break;
+ case ResultType.SweepingGetPartScore:
+ isSelf = true;
+ info = Language.Get("DungeonAssist151", fbName, addXianyuanCoins);
+ break;
+ case ResultType.SweepingNoGetScoreReason2:
+ isSelf = true;
+ info = Language.Get("DungeonAssist149", fbName);
+ break;
+ case ResultType.SweepingNoGetScoreReason1:
+ isSelf = true;
+ info = Language.Get("DungeonAssist152", fbName);
+ break;
+ case ResultType.SweepingGetExtraScore:
+ isSelf = true;
+ string sweepGetExtra = string.Empty;
+ if (addCoins > 0)
+ {
+ sweepGetExtra = Language.Get("DungeonAssist115", addCoins);
+ if (!string.IsNullOrEmpty(sumAddStr))
+ {
+ sweepGetExtra = StringUtility.Contact(sweepGetExtra, ",", sumAddStr);
+ }
+ }
+ else
+ {
+ sweepGetExtra = sumAddStr;
+ }
+ info = Language.Get("DungeonAssist150", fbName, addXianyuanCoins, sweepGetExtra);
+ break;
}
assistModel.SetHelpInfoLocalSave(createTime,info,isNew,isSelf);
@@ -882,99 +918,135 @@
public ResultType GetResultType()
{
- if(assistType == 1)
+ if(isSweep)
{
- if(IsAssistOther)
+ if (IsGetAllAssistCoins)
{
- if(IsGetAllAssistCoins)
+ if (IsVipAddRatio || addCoins > 0)
{
- switch (relatedToPlayer)
- {
- case RelatedToPlayer.None:
- return IsVipAddRatio ? ResultType.TeamAssistGetExtraScore : ResultType.TeamAssistGetScore;
- case RelatedToPlayer.Friend:
- case RelatedToPlayer.Ally:
- return ResultType.TeamAssistGetExtraScore;
- }
+ return ResultType.SweepingGetExtraScore;
}
else
{
- if(addXianyuanCoins > 0)
- {
- return ResultType.TeamAssistGetPartScore;
- }
- else
- {
- switch (noGetReason)
- {
- case 0:
- case 2:
- return ResultType.TeamAssistNoGetScoreReason2;
- case 1:
- return ResultType.TeamAssistNoGetScoreReason1;
- }
- }
-
+ return ResultType.SweepingGetScore;
}
}
else
{
- if(IsGetAllAssistCoins)
+ if (addXianyuanCoins > 0)
{
- if(IsVipAddRatio || addCoins > 0)
- {
- return ResultType.SelfGetExtraScore;
- }
- else
- {
- return ResultType.SelfGetScore;
- }
+ return ResultType.SweepingGetPartScore;
}
else
{
- if (addXianyuanCoins > 0)
+ switch (noGetReason)
{
- return ResultType.SelfGetPartScore;
- }
- else
- {
- switch (noGetReason)
- {
- case 0:
- case 2:
- return ResultType.SelfNoGetScoreReason2;
- case 1:
- return ResultType.SelfNoGetScoreReason1;
- }
+ case 0:
+ case 2:
+ return ResultType.SweepingNoGetScoreReason2;
+ case 1:
+ return ResultType.SweepingNoGetScoreReason1;
}
}
}
}
else
{
- if(IsGetAllAssistCoins)
+ if (assistType == 1)
{
- switch (relatedToPlayer)
+ if (IsAssistOther)
{
- case RelatedToPlayer.None:
- return IsVipAddRatio ? ResultType.AssistGetExtraScore : ResultType.AssistGetScore;
- case RelatedToPlayer.Friend:
- case RelatedToPlayer.Ally:
- return ResultType.AssistGetExtraScore;
+ if (IsGetAllAssistCoins)
+ {
+ switch (relatedToPlayer)
+ {
+ case RelatedToPlayer.None:
+ return IsVipAddRatio ? ResultType.TeamAssistGetExtraScore : ResultType.TeamAssistGetScore;
+ case RelatedToPlayer.Friend:
+ case RelatedToPlayer.Ally:
+ return ResultType.TeamAssistGetExtraScore;
+ }
+ }
+ else
+ {
+ if (addXianyuanCoins > 0)
+ {
+ return ResultType.TeamAssistGetPartScore;
+ }
+ else
+ {
+ switch (noGetReason)
+ {
+ case 0:
+ case 2:
+ return ResultType.TeamAssistNoGetScoreReason2;
+ case 1:
+ return ResultType.TeamAssistNoGetScoreReason1;
+ }
+ }
+
+ }
+ }
+ else
+ {
+ if (IsGetAllAssistCoins)
+ {
+ if (IsVipAddRatio || addCoins > 0)
+ {
+ return ResultType.SelfGetExtraScore;
+ }
+ else
+ {
+ return ResultType.SelfGetScore;
+ }
+ }
+ else
+ {
+ if (addXianyuanCoins > 0)
+ {
+ return ResultType.SelfGetPartScore;
+ }
+ else
+ {
+ switch (noGetReason)
+ {
+ case 0:
+ case 2:
+ return ResultType.SelfNoGetScoreReason2;
+ case 1:
+ return ResultType.SelfNoGetScoreReason1;
+ }
+ }
+ }
}
}
else
{
- if(addXianyuanCoins > 0)
+ if (IsGetAllAssistCoins)
{
- return ResultType.AssistGetPartScore;
+ switch (relatedToPlayer)
+ {
+ case RelatedToPlayer.None:
+ return IsVipAddRatio ? ResultType.AssistGetExtraScore : ResultType.AssistGetScore;
+ case RelatedToPlayer.Friend:
+ case RelatedToPlayer.Ally:
+ return ResultType.AssistGetExtraScore;
+ }
}
else
{
- return ResultType.AssistNoGetScoreReason2;
+ if (addXianyuanCoins > 0)
+ {
+ return ResultType.AssistGetPartScore;
+ }
+ else
+ {
+ return ResultType.AssistNoGetScoreReason2;
+ }
}
}
}
+
return ResultType.None;
}
@@ -1016,6 +1088,11 @@
TeamAssistNoGetScoreReason1,
TeamAssistNoGetScoreReason2,
TeamAssistGetExtraScore,
+ SweepingGetScore,
+ SweepingGetPartScore,
+ SweepingNoGetScoreReason1,
+ SweepingNoGetScoreReason2,
+ SweepingGetExtraScore,
}
}
--
Gitblit v1.8.0