From ebb2c55c8da014b375d89cdf74f638a19bb6856d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 四月 2019 10:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeammateBriefInfoBehaviour.cs | 10 +-
System/Treasure/TreasureCollectBriefInfoBehaviour.cs | 12 ++
System/GeneralConfig/GeneralDefine.cs | 2
System/Team/TeamPrepareBehaviour.cs | 5
System/Team/TeamTargetJoinLimitWin.cs | 10 +-
System/Treasure/TreasureChapterWin.cs | 5 +
System/Chat/ChatRecentlyCell.cs | 4
System/Team/MyTeamWin.cs | 10 +-
System/Team/TeamBriefInfoBehaviour.cs | 42 +++-------
System/Team/TeamApplicationBehaviour.cs | 5
System/Team/TeamInvitationBehaviour.cs | 5
System/Team/MyTeammateBehaviour.cs | 10 +-
System/Tip/PlayerDetailWin.cs | 44 +++-------
System/Treasure/ClientTreasureDungeonStage.cs | 27 ++++--
System/Team/TeamModel.cs | 6 -
UI/HUD/PopUpNum.cs | 4 +
System/Team/TeamInviteBehaviour.cs | 5
17 files changed, 92 insertions(+), 114 deletions(-)
diff --git a/System/Chat/ChatRecentlyCell.cs b/System/Chat/ChatRecentlyCell.cs
index 6293e17..9f2eed2 100644
--- a/System/Chat/ChatRecentlyCell.cs
+++ b/System/Chat/ChatRecentlyCell.cs
@@ -43,8 +43,8 @@
}
m_Select.gameObject.SetActive(_playerId == ChatCtrl.Inst.PteChatID);
m_PlayerName.text = _friendPlayer.PlayerName;
- m_LvSign.gameObject.SetActive(_friendPlayer.LV > GeneralDefine.greatMasterStartLV);
- var _lv = _friendPlayer.LV - GeneralDefine.greatMasterStartLV;
+ m_LvSign.gameObject.SetActive(false);
+ var _lv = _friendPlayer.LV ;
m_LvText.text = (_lv > 0 ? _lv : _friendPlayer.LV).ToString();
m_DetailBtn.onClick.RemoveAllListeners();
m_DetailBtn.onClick.AddListener(() =>
diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index 6625b20..d31907d 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -14,7 +14,6 @@
public static int initBagGridCount { get; private set; }
public static int maxBagGridCount { get; private set; }
- public static int greatMasterStartLV { get; private set; }
public static int playerMaxLevel { get; private set; }
public static int[] kylinHomeCollectItems;
public static List<int> dailyQuestOpenTime;
@@ -203,7 +202,6 @@
maxBagGridCount = GetInt("MaxBagCellCount");
CompareEquipPlaces = GetIntArray("EquipUpType");
- greatMasterStartLV = GetInt("GreatMasterStartLV");
playerMaxLevel = GetInt("PlayerMaxLV");
kylinHomeCollectItems = GetIntArray("KirinNpc", 2);
dailyQuestOpenTime = GetTimeArray("ActionTime", 1);
diff --git a/System/Team/MyTeamWin.cs b/System/Team/MyTeamWin.cs
index d16b0d2..b34fbbb 100644
--- a/System/Team/MyTeamWin.cs
+++ b/System/Team/MyTeamWin.cs
@@ -375,12 +375,10 @@
var minLevel = model.myTeam.inTeam ? model.myTeam.levelMin : model.levelMinBuf;
var maxLevel = model.myTeam.inTeam ? model.myTeam.levelMax : model.levelMaxBuf;
- var isMinPickLevel = minLevel >= GeneralDefine.greatMasterStartLV;
- m_LevelMinSign.gameObject.SetActive(isMinPickLevel);
- m_LevelMin.text = (isMinPickLevel ? (minLevel - GeneralDefine.greatMasterStartLV) : minLevel).ToString();
- var isMaxPickLevel = maxLevel >= GeneralDefine.greatMasterStartLV;
- m_LevelMaxSign.gameObject.SetActive(isMaxPickLevel);
- m_LevelMax.text = (isMaxPickLevel ? (maxLevel - GeneralDefine.greatMasterStartLV) : maxLevel).ToString();
+ m_LevelMinSign.gameObject.SetActive(false);
+ m_LevelMin.text =minLevel.ToString();
+ m_LevelMaxSign.gameObject.SetActive(false);
+ m_LevelMax.text = maxLevel.ToString();
}
diff --git a/System/Team/MyTeammateBehaviour.cs b/System/Team/MyTeammateBehaviour.cs
index 4ea49e7..84860bb 100644
--- a/System/Team/MyTeammateBehaviour.cs
+++ b/System/Team/MyTeammateBehaviour.cs
@@ -137,9 +137,8 @@
}
var level = teammate.id == PlayerDatas.Instance.baseData.PlayerID ? PlayerDatas.Instance.baseData.LV : teammate.level;
- var isNirvanaLevel = level > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isNirvanaLevel);
- m_Level.text = isNirvanaLevel ? (level - GeneralDefine.greatMasterStartLV).ToString() : level.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text = level.ToString();
}
private void OnMatchMember()
@@ -210,9 +209,8 @@
m_Job.text = OccupationNameConfig.GetOccupationName(_mate.job, _mate.jobLevel);
var level = _mate.id == PlayerDatas.Instance.baseData.PlayerID ? PlayerDatas.Instance.baseData.LV : _mate.level;
- var isNirvanaLevel = level > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isNirvanaLevel);
- m_Level.text = isNirvanaLevel ? (level - GeneralDefine.greatMasterStartLV).ToString() : level.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text = level.ToString();
var isNearBy = _mate.mapId == PlayerDatas.Instance.baseData.MapID;
m_Position.text = _mate.id == PlayerDatas.Instance.baseData.PlayerID ? "" : isNearBy ? Language.Get("TeamMemberNearby") : Language.Get("TeamMemberFaraway");
diff --git a/System/Team/TeamApplicationBehaviour.cs b/System/Team/TeamApplicationBehaviour.cs
index 527e80b..ada98d0 100644
--- a/System/Team/TeamApplicationBehaviour.cs
+++ b/System/Team/TeamApplicationBehaviour.cs
@@ -54,9 +54,8 @@
}
}
m_Job.text = OccupationNameConfig.GetOccupationName(application.job, application.jobLevel);
- var isNirvanaLevel = application.playerLevel > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isNirvanaLevel);
- m_Level.text = isNirvanaLevel ? (application.playerLevel - GeneralDefine.greatMasterStartLV).ToString() : application.playerLevel.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text = application.playerLevel.ToString();
}
public override void Dispose()
diff --git a/System/Team/TeamBriefInfoBehaviour.cs b/System/Team/TeamBriefInfoBehaviour.cs
index 076f332..f58dee2 100644
--- a/System/Team/TeamBriefInfoBehaviour.cs
+++ b/System/Team/TeamBriefInfoBehaviour.cs
@@ -12,31 +12,17 @@
public class TeamBriefInfoBehaviour : ScrollItem
{
- [SerializeField]
- Image m_Realm;
- [SerializeField]
- Text m_PlayerName;
-
- [SerializeField]
- Text m_MemberCount;
-
- [SerializeField]
- Image m_LevelMinSign;
- [SerializeField]
- Text m_LevelMin;
-
- [SerializeField]
- Image m_LevelMaxSign;
- [SerializeField]
- Text m_LevelMax;
-
- [SerializeField]
- Button m_ApplyFor;
+ [SerializeField] Image m_Realm;
+ [SerializeField] Text m_PlayerName;
+ [SerializeField] Text m_MemberCount;
+ [SerializeField] Image m_LevelMinSign;
+ [SerializeField] Text m_LevelMin;
+ [SerializeField] Image m_LevelMaxSign;
+ [SerializeField] Text m_LevelMax;
+ [SerializeField] Button m_ApplyFor;
TheirTeam teamInfo;
-
- TeamModel m_Model;
- TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
+ TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
public override void Display(object _data)
{
@@ -58,12 +44,10 @@
m_ApplyFor.gameObject.SetActive(!(model.myTeam.inTeam && model.myTeam.GetIndexOfMember(teamInfo.captainer) != -1));
- var isMinPickLevel = teamInfo.levelMin >= GeneralDefine.greatMasterStartLV;
- m_LevelMinSign.gameObject.SetActive(isMinPickLevel);
- m_LevelMin.text = (isMinPickLevel ? (teamInfo.levelMin - GeneralDefine.greatMasterStartLV) : teamInfo.levelMin).ToString();
- var isMaxPickLevel = teamInfo.levelMax >= GeneralDefine.greatMasterStartLV;
- m_LevelMaxSign.gameObject.SetActive(isMaxPickLevel);
- m_LevelMax.text = (isMaxPickLevel ? (teamInfo.levelMax - GeneralDefine.greatMasterStartLV) : teamInfo.levelMax).ToString();
+ m_LevelMinSign.gameObject.SetActive(false);
+ m_LevelMin.text = teamInfo.levelMin.ToString();
+ m_LevelMaxSign.gameObject.SetActive(false);
+ m_LevelMax.text = teamInfo.levelMax.ToString();
}
public override void Dispose()
diff --git a/System/Team/TeamInvitationBehaviour.cs b/System/Team/TeamInvitationBehaviour.cs
index c796173..21c38fd 100644
--- a/System/Team/TeamInvitationBehaviour.cs
+++ b/System/Team/TeamInvitationBehaviour.cs
@@ -39,9 +39,8 @@
m_PlayerName.text = invitation.playerName;
m_Job.text = OccupationNameConfig.GetOccupationName(invitation.job, invitation.jobLevel);
- var isNirvanaLevel = invitation.level > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isNirvanaLevel);
- m_Level.text = isNirvanaLevel ? (invitation.level - GeneralDefine.greatMasterStartLV).ToString() : invitation.level.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text =invitation.level.ToString();
var mission = invitation.mission;
var targetConfig = TeamTargetConfig.Get(mission.mapId);
diff --git a/System/Team/TeamInviteBehaviour.cs b/System/Team/TeamInviteBehaviour.cs
index aa7166c..f2426e8 100644
--- a/System/Team/TeamInviteBehaviour.cs
+++ b/System/Team/TeamInviteBehaviour.cs
@@ -54,9 +54,8 @@
}
}
- var isNirvanaLevel = invite.playerLevel > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isNirvanaLevel);
- m_Level.text = isNirvanaLevel ? (invite.playerLevel - GeneralDefine.greatMasterStartLV).ToString() : invite.playerLevel.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text = invite.playerLevel.ToString();
}
public override void Dispose()
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 2980abd..2b07afc 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -359,15 +359,13 @@
}
var levelRequirement = string.Empty;
- var levelMax = StringUtility.GetLevelString(myTeam.levelMax, GeneralDefine.greatMasterStartLV);
if (myTeam.levelMin == myTeam.levelMax)
{
- levelRequirement = StringUtility.Contact(levelMax);
+ levelRequirement = myTeam.levelMax.ToString();
}
else
{
- var levelMin = StringUtility.GetLevelString(myTeam.levelMin, GeneralDefine.greatMasterStartLV);
- levelRequirement = StringUtility.Contact(levelMin, "--", levelMax);
+ levelRequirement = StringUtility.Contact(myTeam.levelMin, "--", myTeam.levelMax);
}
if (dungeonId != 0)
diff --git a/System/Team/TeamPrepareBehaviour.cs b/System/Team/TeamPrepareBehaviour.cs
index feec43c..fa4f6bb 100644
--- a/System/Team/TeamPrepareBehaviour.cs
+++ b/System/Team/TeamPrepareBehaviour.cs
@@ -59,9 +59,8 @@
}
m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(teammate.job, teammate.jobLevel));
- var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV;
- m_LevelSign.gameObject.SetActive(isPickLevel);
- m_Level.text = isPickLevel ? (teammate.level - GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString();
+ m_LevelSign.gameObject.SetActive(false);
+ m_Level.text = teammate.level.ToString();
m_PlayerName.text = teammate.mateName;
}
else
diff --git a/System/Team/TeamTargetJoinLimitWin.cs b/System/Team/TeamTargetJoinLimitWin.cs
index fab7f46..5828fad 100644
--- a/System/Team/TeamTargetJoinLimitWin.cs
+++ b/System/Team/TeamTargetJoinLimitWin.cs
@@ -218,9 +218,8 @@
m_MinLevel.gameObject.SetActive(minLevelBuf != 0);
if (minLevelBuf != 0)
{
- var isMinPickLevel = minLevelBuf >= GeneralDefine.greatMasterStartLV;
- m_MinLevelSign.gameObject.SetActive(isMinPickLevel);
- m_MinLevel.text = (isMinPickLevel ? (minLevelBuf - GeneralDefine.greatMasterStartLV) : minLevelBuf).ToString();
+ m_MinLevelSign.gameObject.SetActive(false);
+ m_MinLevel.text = minLevelBuf.ToString();
}
}
@@ -231,9 +230,8 @@
if (maxLevelBuf != 0)
{
- var isMaxPickLevel = maxLevelBuf >= GeneralDefine.greatMasterStartLV;
- m_MaxLevelSign.gameObject.SetActive(isMaxPickLevel);
- m_MaxLevel.text = (isMaxPickLevel ? (maxLevelBuf - GeneralDefine.greatMasterStartLV) : maxLevelBuf).ToString();
+ m_MaxLevelSign.gameObject.SetActive(false);
+ m_MaxLevel.text =maxLevelBuf.ToString();
}
}
diff --git a/System/Team/TeammateBriefInfoBehaviour.cs b/System/Team/TeammateBriefInfoBehaviour.cs
index 8a48b44..e0b3927 100644
--- a/System/Team/TeammateBriefInfoBehaviour.cs
+++ b/System/Team/TeammateBriefInfoBehaviour.cs
@@ -35,9 +35,8 @@
m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(teammate.job, 0));
m_Icon.gray = !teammate.online;
- var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV;
- m_LevelBG.SetSprite(isPickLevel ? "keyNirvana" : "UnNirvana");
- m_Level.text = isPickLevel ? (GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString();
+ m_LevelBG.SetSprite("UnNirvana");
+ m_Level.text = teammate.level.ToString();
m_Level.colorType = teammate.id == (int)PlayerDatas.Instance.baseData.PlayerID ? TextColType.Green : TextColType.White;
model.teammateLevelUpEvent += OnTeammateLevelUp;
@@ -69,9 +68,8 @@
return;
}
- var isPickLevel = teammate.level > GeneralDefine.greatMasterStartLV;
- m_LevelBG.SetSprite(isPickLevel ? "keyNirvana" : "UnNirvana");
- m_Level.text = isPickLevel ? (GeneralDefine.greatMasterStartLV).ToString() : teammate.level.ToString();
+ m_LevelBG.SetSprite("UnNirvana");
+ m_Level.text = teammate.level.ToString();
m_Level.colorType = teammate.id == (int)PlayerDatas.Instance.baseData.PlayerID ? TextColType.Green : TextColType.White;
}
diff --git a/System/Tip/PlayerDetailWin.cs b/System/Tip/PlayerDetailWin.cs
index f08bb94..f9639cd 100644
--- a/System/Tip/PlayerDetailWin.cs
+++ b/System/Tip/PlayerDetailWin.cs
@@ -23,41 +23,31 @@
private List<PlayerDetails.DetailType> funcTypes = new List<PlayerDetails.DetailType>();
- FriendsModel m_FriendModel
- {
- get
- {
+ FriendsModel m_FriendModel {
+ get {
return ModelCenter.Instance.GetModel<FriendsModel>();
}
}
- FairyModel m_FairyModel
- {
- get
- {
+ FairyModel m_FairyModel {
+ get {
return ModelCenter.Instance.GetModel<FairyModel>();
}
}
- RoleParticularModel m_RoleParticularModel
- {
- get
- {
+ RoleParticularModel m_RoleParticularModel {
+ get {
return ModelCenter.Instance.GetModel<RoleParticularModel>();
}
}
- TeamModel m_TeamModel
- {
- get
- {
+ TeamModel m_TeamModel {
+ get {
return ModelCenter.Instance.GetModel<TeamModel>();
}
}
private float ratio = 1.0f;
- public bool IsCrossServerPlayer
- {
- get
- {
+ public bool IsCrossServerPlayer {
+ get {
if (PlayerDetails.ServerGroupId == 0)
{
return false;
@@ -106,17 +96,9 @@
public void ShowPlayerDetail()
{
m_ContainerDetail.localPosition = PlayerDetails.targetPos;
- m_PlayerTxt.text = UIHelper.ServerStringTrim(PlayerDetails.PlayerName);
- if (PlayerDetails.LV > GeneralDefine.greatMasterStartLV)
- {
- m_LevelSign.gameObject.SetActive(true);
- m_PlayerLevelTxt.text = (PlayerDetails.LV - GeneralDefine.greatMasterStartLV).ToString();
- }
- else
- {
- m_LevelSign.gameObject.SetActive(false);
- m_PlayerLevelTxt.text = Language.Get("PlayerDetail_Level", PlayerDetails.LV);
- }
+ m_PlayerTxt.text = UIHelper.ServerStringTrim(PlayerDetails.PlayerName);
+ m_LevelSign.gameObject.SetActive(false);
+ m_PlayerLevelTxt.text = Language.Get("PlayerDetail_Level", PlayerDetails.LV);
CheckDetailType();
OnPlayerDetailRefresh();
diff --git a/System/Treasure/ClientTreasureDungeonStage.cs b/System/Treasure/ClientTreasureDungeonStage.cs
index b8a24a9..c062180 100644
--- a/System/Treasure/ClientTreasureDungeonStage.cs
+++ b/System/Treasure/ClientTreasureDungeonStage.cs
@@ -55,18 +55,20 @@
NormalDialogueWin.onDialogueComplete += OnDialogueComplete;
GlobalTimeEvent.Instance.secondEvent -= PerSecond;
GlobalTimeEvent.Instance.secondEvent += PerSecond;
+ BossShowModel.Instance.bossShowCompletedEvent -= BossShowCompletedEvent;
+ BossShowModel.Instance.bossShowCompletedEvent += BossShowCompletedEvent;
}
protected override void OnStageLoadFinish()
{
base.OnStageLoadFinish();
- dungeonModel.UpdateCoolDown(DungeonCoolDownType.FightStart, 300 * 1000);
-
- fightEndClock = Clock.AlarmAfter(300, OnFightEnd);
-
InitializePlayer();
- InitializeNpc();
+
+ if (!BossShowModel.Instance.BossShowing)
+ {
+ BossShowCompletedEvent();
+ }
}
void InitializePlayer()
@@ -74,8 +76,6 @@
var hero = PlayerDatas.Instance.hero;
hero.Pos = PlayerBornPosition;
CameraController.Instance.Apply();
-
- hero.Behaviour.StartHandupAI();
}
void InitializeNpc()
@@ -120,10 +120,18 @@
}
}
+ private void BossShowCompletedEvent()
+ {
+ dungeonModel.UpdateCoolDown(DungeonCoolDownType.FightStart, 300 * 1000);
+ fightEndClock = Clock.AlarmAfter(300, OnFightEnd);
+ InitializeNpc();
+ PlayerDatas.Instance.hero.Behaviour.StartHandupAI();
+ }
+
private void PerSecond()
{
var hero = PlayerDatas.Instance.hero;
- if (hero == null || m_Npc == null)
+ if (hero == null || m_Npc == null || BossShowModel.Instance.BossShowing)
{
return;
}
@@ -167,6 +175,7 @@
NPCInteractProcessor.s_NpcInteractEvent -= OnNpcTalkEvent;
NormalDialogueWin.onDialogueComplete -= OnDialogueComplete;
- GlobalTimeEvent.Instance.secondEvent -= PerSecond;
+ GlobalTimeEvent.Instance.secondEvent -= PerSecond;
+ BossShowModel.Instance.bossShowCompletedEvent -= BossShowCompletedEvent;
}
}
diff --git a/System/Treasure/TreasureChapterWin.cs b/System/Treasure/TreasureChapterWin.cs
index 2a13524..9035054 100644
--- a/System/Treasure/TreasureChapterWin.cs
+++ b/System/Treasure/TreasureChapterWin.cs
@@ -30,6 +30,8 @@
FunctionUnlockFlyObject flyObject = null;
+ public static bool displaying = false;
+
TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
@@ -45,6 +47,8 @@
protected override void OnPreOpen()
{
+ displaying = true;
+
if (flyObject != null)
{
Destroy(flyObject);
@@ -80,6 +84,7 @@
protected override void OnPreClose()
{
+ displaying = false;
}
protected override void OnAfterClose()
diff --git a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
index 41e8317..ebfd915 100644
--- a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
+++ b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -56,6 +56,7 @@
model.treasureStateChangeEvent += TreasureStateChangeEvent;
model.treasureCollectProgressRefresh += TreasureCollectProgressRefresh;
+ WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;
dirty = false;
DisplayBase();
@@ -91,7 +92,7 @@
void DisplayBase()
{
- bool isChapterOpen = WindowCenter.Instance.IsOpen<TreasureChapterWin>();
+ bool isChapterOpen = TreasureChapterWin.displaying;
m_ContainerUnknown.gameObject.SetActive(displayId == 0 || isChapterOpen);
m_ContainerCollect.gameObject.SetActive(displayId != 0 && !isChapterOpen);
@@ -179,6 +180,14 @@
return true;
}
+ private void WindowAfterOpenEvent(Window window)
+ {
+ if (window is TreasureChapterWin)
+ {
+ DisplayBase();
+ }
+ }
+
private void LateUpdate()
{
if (dirty)
@@ -192,6 +201,7 @@
{
model.treasureStateChangeEvent -= TreasureStateChangeEvent;
model.treasureCollectProgressRefresh -= TreasureCollectProgressRefresh;
+ WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterOpenEvent;
if (m_CacheCoroutine != null)
{
StopCoroutine(m_CacheCoroutine);
diff --git a/UI/HUD/PopUpNum.cs b/UI/HUD/PopUpNum.cs
index 5fcc58d..db0094e 100644
--- a/UI/HUD/PopUpNum.cs
+++ b/UI/HUD/PopUpNum.cs
@@ -335,6 +335,10 @@
PetDeadlyHit = 44, //瀹犵墿鑷存涓�鍑�
EnemyDeadlyHit = 45, //鏁屼汉鑷存涓�鍑�
+ PlayerThumpHit = 46, //鐜╁閲嶅嚮
+ PetThumpHit = 47, //瀹犵墿閲嶅嚮
+ EnemyThumpHit = 48, //鏁屼汉閲嶅嚮
+
BuffAddDefense = 101,//+闃插尽buff
BuffAddAttack = 102,//+鏀诲嚮buff
BuffAddAttackSpeed = 103,//+鏀婚�焍uff
--
Gitblit v1.8.0