From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/PlayerDead/PlayerDeadModel.cs | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index a812359..902e652 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -7,11 +7,11 @@
using System.Text;
[XLua.LuaCallCSharp]
- public class PlayerDeadModel : Model, IBeforePlayerDataInitialize,IPlayerLoginOk
+public class PlayerDeadModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
- public int[]dungeonKillArray { get; private set; }
- public int deadBuffId { get; private set;}
- public int maxDeadBuffLV { get; private set;}
+ public int[] dungeonKillArray { get; private set; }
+ public int deadBuffId { get; private set; }
+ public int maxDeadBuffLV { get; private set; }
public override void Init()
{
@@ -67,11 +67,10 @@
public bool isBossKill = false;
public float duplicatesRebornTime = 0;
private Dictionary<int, int> duplicatesRebornDict;
- public bool playerIsDie
- {
+ public bool playerIsDie {
get {
- if(PlayerDatas.Instance.hero != null)
+ if (PlayerDatas.Instance.hero != null)
{
return PlayerDatas.Instance.hero.ActorInfo.serverDie;
}
@@ -99,7 +98,7 @@
private DungeonOpenTimeConfig _dungeonOpenTimeModel;
public bool IsCanReborn { get; private set; }
- public bool localBossState { get; private set;}
+ public bool localBossState { get; private set; }
public string killerName { get; private set; }
public bool isKillByPlayer { get; private set; }
public int npcRealmLv { get; private set; }
@@ -117,16 +116,16 @@
}
break;
case "GeRen_chenxin_279029":
- if(infolist.Count > 0)
+ if (infolist.Count > 0)
{
WorldBossConfig bossConfig = Config.Instance.Get<WorldBossConfig>(int.Parse(infolist[0].ToString()));
NPCConfig nPCConfig = Config.Instance.Get<NPCConfig>(int.Parse(infolist[0].ToString()));
- if(nPCConfig != null)
+ if (nPCConfig != null)
{
killerName = nPCConfig.charName;
npcRealmLv = nPCConfig.Realm;
}
- if(bossConfig != null)
+ if (bossConfig != null)
{
localBossState = true;
}
@@ -135,13 +134,13 @@
break;
case "RobotKill_1":
if (infolist.Count > 1)
- {
+ {
int objId = int.Parse(infolist[0].ToString());
int npcId = int.Parse(infolist[1].ToString());
- killerName = activityModel.GetAncientRobotName(objId,npcId);
+ killerName = activityModel.GetAncientRobotName(objId, npcId);
isKillByPlayer = false;
}
-
+
break;
}
}
@@ -149,7 +148,7 @@
public bool CheckIsRealmSuppress(out StringBuilder builder)
{
builder = new StringBuilder();
- if(npcRealmLv > PlayerDatas.Instance.baseData.realmLevel)
+ if (npcRealmLv > PlayerDatas.Instance.baseData.realmLevel)
{
var curRealmConfig = Config.Instance.Get<RealmConfig>(npcRealmLv);
builder.AppendFormat("<Img img={0}/>", curRealmConfig.Img);
@@ -187,7 +186,7 @@
autoRebornTime = RebornConditions[3];
}
- if(!WindowCenter.Instance.IsOpen<RebornWin>())
+ if (!WindowCenter.Instance.IsOpen<RebornWin>())
{
WindowCenter.Instance.Open<RebornWin>();
}
@@ -213,12 +212,12 @@
TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.DuplicatesReborn, this.duplicatesRebornTime, RefreshDuplicatesRebornCD);
- switch(PlayerDatas.Instance.baseData.MapID)
+ switch (PlayerDatas.Instance.baseData.MapID)
{
case 31150:
if (dungeonModel.mission.score >= 100)
{
- if(!WindowCenter.Instance.IsOpen<ElderGodAreaExitWin>())
+ if (!WindowCenter.Instance.IsOpen<ElderGodAreaExitWin>())
{
WindowCenter.Instance.Open<ElderGodAreaExitWin>();
}
@@ -232,7 +231,7 @@
}
break;
case 31110:
- if(dungeonModel.mission.leaderID != playerId)
+ if (dungeonModel.mission.leaderID != playerId)
{
if (!WindowCenter.Instance.IsOpen<ReliveWin>())
{
--
Gitblit v1.8.0