From 7bb3defa2f7ff43cf4456494f3f1be8fc8effb35 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 25 五月 2019 14:13:19 +0800
Subject: [PATCH] 3335 删除职业阶级设定.
---
System/CrossServerOneVsOne/RankCellCtrl.cs | 2 +-
System/Dungeon/AssistPlayerCell.cs | 2 +-
Lua/Gen/OccupationNameConfigWrap.cs | 7 -------
Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs | 6 +++---
System/Rank/RankHeadCell.cs | 2 +-
System/Team/TeamApplicationBehaviour.cs | 2 +-
System/Team/TeamInvitationBehaviour.cs | 2 +-
System/Team/TeamInviteBehaviour.cs | 2 +-
System/Team/MyTeammateBehaviour.cs | 2 +-
9 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs b/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs
index 810b739..d457428 100644
--- a/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs
+++ b/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs
@@ -4,14 +4,14 @@
public partial class OccupationNameConfig
{
- public static string GetOccupationName(int occupa, int classLv)
+ public static string GetOccupationName(int occupa)
{
- var cfg = OccupationNameConfig.Get(occupa * 100 + classLv);
+ var cfg = OccupationNameConfig.Get(occupa * 100 + 1);
if (cfg != null)
{
return cfg.name;
}
- DebugEx.LogError(string.Format("琛ㄦ牸涓病鏈墈0}鑱屼笟{1}闃剁骇瀵瑰簲鐨勫悕绉�", occupa, classLv));
+ DebugEx.LogError(string.Format("琛ㄦ牸涓病鏈墈0}鑱屼笟闃剁骇瀵瑰簲鐨勫悕绉�", occupa));
return string.Empty;
}
}
diff --git a/Lua/Gen/OccupationNameConfigWrap.cs b/Lua/Gen/OccupationNameConfigWrap.cs
index e7b9cbe..a86fc73 100644
--- a/Lua/Gen/OccupationNameConfigWrap.cs
+++ b/Lua/Gen/OccupationNameConfigWrap.cs
@@ -269,13 +269,6 @@
{
- int _occupa = LuaAPI.xlua_tointeger(L, 1);
- int _classLv = LuaAPI.xlua_tointeger(L, 2);
-
- string gen_ret = OccupationNameConfig.GetOccupationName( _occupa, _classLv );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
return 1;
}
diff --git a/System/CrossServerOneVsOne/RankCellCtrl.cs b/System/CrossServerOneVsOne/RankCellCtrl.cs
index a847a0a..dc794dc 100644
--- a/System/CrossServerOneVsOne/RankCellCtrl.cs
+++ b/System/CrossServerOneVsOne/RankCellCtrl.cs
@@ -86,7 +86,7 @@
m_NameTxt.color = new Color32(64, 28, 6, 255); ;
}
m_NameTxt.text = data.PlayerName;
- m_JobTxt.text = OccupationNameConfig.GetOccupationName(data.Job, 1);
+ m_JobTxt.text = OccupationNameConfig.GetOccupationName(data.Job);
RealmConfig presentCfg = RealmConfig.Get(data.Realm);
if (data.Realm > 0 && presentCfg != null)
{
diff --git a/System/Dungeon/AssistPlayerCell.cs b/System/Dungeon/AssistPlayerCell.cs
index b3c9c67..76b7b1e 100644
--- a/System/Dungeon/AssistPlayerCell.cs
+++ b/System/Dungeon/AssistPlayerCell.cs
@@ -56,7 +56,7 @@
realmIcon.SetSprite(realmConfig == null ? "NoRealm" : realmConfig.Img);
fightPowerText.text = StringUtility.Contact(Language.Get("MainInterfacePanel_HeadPortraitTip_ZL"),playerInfo.FightPower);
UpdateAssistState(playerInfo.PlayerID);
- jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);
+ jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job);
UpdateAssistReward();
UpdateRelation();
int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;
diff --git a/System/Rank/RankHeadCell.cs b/System/Rank/RankHeadCell.cs
index e4f3fec..64037b5 100644
--- a/System/Rank/RankHeadCell.cs
+++ b/System/Rank/RankHeadCell.cs
@@ -55,7 +55,7 @@
int.TryParse(jobStr[jobStr.Length - 1].ToString(), out occupa);
int classLv = 0;
int.TryParse(jobStr.Substring(0, jobStr.Length - 1), out classLv);
- jobText.text = OccupationNameConfig.GetOccupationName(occupa, 1);
+ jobText.text = OccupationNameConfig.GetOccupationName(occupa);
int realmLv = 0;
switch ((RankType)data.type)
{
diff --git a/System/Team/MyTeammateBehaviour.cs b/System/Team/MyTeammateBehaviour.cs
index 84860bb..988b119 100644
--- a/System/Team/MyTeammateBehaviour.cs
+++ b/System/Team/MyTeammateBehaviour.cs
@@ -206,7 +206,7 @@
}
}
- m_Job.text = OccupationNameConfig.GetOccupationName(_mate.job, _mate.jobLevel);
+ m_Job.text = OccupationNameConfig.GetOccupationName(_mate.job);
var level = _mate.id == PlayerDatas.Instance.baseData.PlayerID ? PlayerDatas.Instance.baseData.LV : _mate.level;
m_LevelSign.gameObject.SetActive(false);
diff --git a/System/Team/TeamApplicationBehaviour.cs b/System/Team/TeamApplicationBehaviour.cs
index ada98d0..15569dc 100644
--- a/System/Team/TeamApplicationBehaviour.cs
+++ b/System/Team/TeamApplicationBehaviour.cs
@@ -53,7 +53,7 @@
m_Realm.SetSprite(realmConfig.Img);
}
}
- m_Job.text = OccupationNameConfig.GetOccupationName(application.job, application.jobLevel);
+ m_Job.text = OccupationNameConfig.GetOccupationName(application.job);
m_LevelSign.gameObject.SetActive(false);
m_Level.text = application.playerLevel.ToString();
}
diff --git a/System/Team/TeamInvitationBehaviour.cs b/System/Team/TeamInvitationBehaviour.cs
index 21c38fd..4cbd544 100644
--- a/System/Team/TeamInvitationBehaviour.cs
+++ b/System/Team/TeamInvitationBehaviour.cs
@@ -38,7 +38,7 @@
}
m_PlayerName.text = invitation.playerName;
- m_Job.text = OccupationNameConfig.GetOccupationName(invitation.job, invitation.jobLevel);
+ m_Job.text = OccupationNameConfig.GetOccupationName(invitation.job);
m_LevelSign.gameObject.SetActive(false);
m_Level.text =invitation.level.ToString();
diff --git a/System/Team/TeamInviteBehaviour.cs b/System/Team/TeamInviteBehaviour.cs
index f2426e8..8904564 100644
--- a/System/Team/TeamInviteBehaviour.cs
+++ b/System/Team/TeamInviteBehaviour.cs
@@ -42,7 +42,7 @@
m_Icon.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(invite.job, 0));
m_PlayerName.text = invite.playerName;
- m_Job.text = OccupationNameConfig.GetOccupationName(invite.job, invite.jobLevel);
+ m_Job.text = OccupationNameConfig.GetOccupationName(invite.job);
m_Realm.gameObject.SetActive(invite.realm > 0);
if (invite.realm > 0)
--
Gitblit v1.8.0