From dc6deba3deacbdc8e9223ed35e5e458bfb87ae45 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 11 三月 2019 16:36:50 +0800
Subject: [PATCH] 3335 删掉旧的境界代码
---
System/Realm/RealmModel.cs | 50 ++++
System/Team/TeamTargetJoinLimitWin.cs | 10
System/Team/GroupDungeonChallengeProcessor.cs | 2
Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs | 3
Lua/Gen/PlayerDatasWrap.cs | 31 --
System/Dungeon/DungeonModel.cs | 13
System/MainInterfacePanel/ChatFrame.cs | 4
Lua/Gen/SnxxzUIChatCenterWrap.cs | 27 --
System/Chat/ChatCenter.cs | 52 ----
Fight/Stage/Dungeon/DungeonStage.cs | 10
System/Realm/RealmModel.cs.meta | 24 +-
System/RolePromote/RolePromoteModel.cs | 2
/dev/null | 12 -
Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs | 5
Lua/Gen/XLuaGenAutoRegister.cs | 6
System/Realm/RealmUpWin.cs | 412 +---------------------------------
Core/GameEngine/Model/Player/PlayerDatas.cs | 1
System/Team/TeamModel.cs | 10
System/Dungeon/DungeonRealmVictoryWin.cs | 2
System/Dungeon/DungeonFightWin.cs | 8
20 files changed, 80 insertions(+), 604 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index d802966..cba7960 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -18,7 +18,6 @@
public PlayerExtersionData extersion { get { return m_Extersion; } }
public PlayerFairyData fairyData = new PlayerFairyData();
- public PlayerRealmData realm = new PlayerRealmData();
PlayerSkillDatas m_Skill = new PlayerSkillDatas();
public PlayerSkillDatas skill { get { return m_Skill; } }
diff --git a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs b/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
deleted file mode 100644
index abe578c..0000000
--- a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-锘縰sing Snxxz.UI;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-using LitJson;
-
-public class PlayerRealmData
-{
- RealmModel m_Model;
- RealmModel model
- {
- get
- {
- return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<RealmModel>());
- }
- }
-
- #region 鎶ゆ硶
- public List<RealmHoldData> holdDataList = new List<RealmHoldData>();
-
- public static event Action OnRefreshHoldData;
-
- public void OnRefreshData(HA908_tagGCRealmFBHelpInfo vNetData)
- {
- RealmHoldData data = null;
- if (holdDataList.Count > 0)
- {
- data = holdDataList.Find((x) =>
- {
- return vNetData.PlayerID == x.PlayerID;
- });
- }
- if (data != null)
- {
- data.AtkAdd = vNetData.AtkAdd;
- data.RealmLV = vNetData.RealmLV;
- }
- else
- {
- data = new RealmHoldData();
- data.PlayerID = vNetData.PlayerID;
- data.PlayerName = UIHelper.ServerStringTrim(vNetData.PlayerName);
- data.RealmLV = vNetData.RealmLV;
- data.AtkAdd = vNetData.AtkAdd;
- data.Job = vNetData.Job;
- data.JobRank = vNetData.JobRank;
- holdDataList.Add(data);
- if (StageLoad.Instance.isLoading)
- {
- return;
- }
- if (!WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding
- && !BossShowModel.Instance.BossShowing && !FairyFeastTransmitShow.Instance.IsOpen)
- {
- WindowCenter.Instance.Open<RealmUpHoldWin>();
- }
- if (OnRefreshHoldData != null)
- {
- OnRefreshHoldData();
- }
- }
- }
-
- public void RemoveHoldData()
- {
- if (holdDataList.Count > 0)
- {
- RealmHoldData data = holdDataList[0];
- holdDataList.RemoveAt(0);
- data = null;
- }
- }
- #endregion
-
- #region 鎶ゆ硶淇℃伅
- [Serializable]
- public class RealmHelpInfo
- {
- public string helpInfo;
- }
-
- public struct RealmHelpData
- {
- public int type;
- public string name;
- }
-
- public List<RealmHelpData> realmHelpList = new List<RealmHelpData>();
-
- public static event Action OnRefreshHelpInfo;
-
- public void OnRefreshData(H0319_tagFBHelp vNetData)
- {
- RealmHelpInfo data = JsonUtility.FromJson<RealmHelpInfo>(vNetData.Msg);
- if (data != null && data.helpInfo != null)
- {
- realmHelpList.Clear();
- string[] array = data.helpInfo.Split(',');
- for (int i = 0; i < array.Length; i++)
- {
- string[] infoarray = array[i].Split('|');
- if (infoarray.Length == 2)
- {
- RealmHelpData help = new RealmHelpData();
- help.name = infoarray[1];
- help.type = int.Parse(infoarray[0]);
- realmHelpList.Add(help);
- }
- }
- if (OnRefreshHelpInfo != null)
- OnRefreshHelpInfo();
- }
- }
-
- public enum RealmHelpType
- {
- Self = 0,
- Normal = 1,
- High = 2,
- }
- #endregion
-}
-
-public class RealmHoldData
-{
- public string PlayerName; //鐜╁鍚嶅瓧
-
- public uint PlayerID; //鐜╁ID
-
- public byte RealmLV; //鐜╁澧冪晫
-
- public byte AtkAdd; //鑾峰緱鍔犳垚
-
- public byte Job; //鐜╁鑱屼笟
-
- public byte JobRank; //鐜╁鑱屼笟闃剁骇
-}
diff --git a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs.meta b/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs.meta
deleted file mode 100644
index 2c2ab08..0000000
--- a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6a39ceccd51b24b4daafbe888333f018
-timeCreated: 1507701572
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/GameEngine/Model/Player/Realm/RealmModel.cs b/Core/GameEngine/Model/Player/Realm/RealmModel.cs
deleted file mode 100644
index e8a8153..0000000
--- a/Core/GameEngine/Model/Player/Realm/RealmModel.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-锘縰sing LitJson;
-using Snxxz.UI;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-using UnityEngine;
-namespace Snxxz.UI
-{
- [XLua.LuaCallCSharp]
- public class RealmModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
- {
- DungeonModel m_DungeonModel;
- DungeonModel dungeonModel {
- get {
- return m_DungeonModel ?? (m_DungeonModel = ModelCenter.Instance.GetModel<DungeonModel>());
- }
- }
-
- public void OnBeforePlayerDataInitialize()
- {
- PlayerDatas.Instance.realm.holdDataList.Clear();
- openedRealmUpWin = false;
- serverInited = false;
- leaderId = 0;
- cacheRealmLv = 0;
- beforeRealmPoint = 0;
- }
-
- public override void Init()
- {
- ParseConfig();
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
- PlayerDatas.Instance.playerDataRefreshEvent += RefreshInfo;
- StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
- NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;
- NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;
- BossShowModel.Instance.bossShowCompletedEvent += BossShowCompletedEvent;
- FairyFeastTransmitShow.Instance.onComplete += BossShowCompletedEvent;
- }
-
- private int cacheMapId = 0;
-
- bool serverInited = false;
-
- public int cacheRealmLv { get; set; }
-
- public bool openByDungeonStep { get; set; }
-
- public int leaderId { get; set; }
-
- public int beforeRealmPoint { get; private set; }
-
- public int realmGuardianDisplayTime { get; private set; }
-
- public bool excuteRealmOpenGuide { get; private set; }
-
- public bool realmDungeonState {
- get { return LocalSave.GetBool(StringUtility.Contact(PlayerDatas.Instance.PlayerId, "_RealmDungeon_Show")); }
- set { LocalSave.SetBool(StringUtility.Contact(PlayerDatas.Instance.PlayerId, "_RealmDungeon_Show"), value); }
- }
-
- private void GuideCompletedEvent(int _id)
- {
- SnxxzGame.Instance.StartCoroutine(Co_GuideComplete());
- }
-
- private void GuideBeginEvent()
- {
- if (NewBieCenter.Instance.inGuiding &&
- NewBieCenter.Instance.currentGuide == 36)
- {
- excuteRealmOpenGuide = true;
- }
- }
-
- IEnumerator Co_GuideComplete()
- {
- yield return null;
- if (StageLoad.Instance.stageType == Stage.E_StageType.Dungeon)
- {
- if (PlayerDatas.Instance.realm.holdDataList.Count > 0
- && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding
- && !BossShowModel.Instance.BossShowing && !FairyFeastTransmitShow.Instance.IsOpen)
- {
- WindowCenter.Instance.Open<RealmUpHoldWin>();
- }
- }
- }
-
- private void OnStageLoadFinish()
- {
- if (!(StageLoad.Instance.stageType == Stage.E_StageType.Dungeon))
- {
- cacheMapId = 0;
- excuteRealmOpenGuide = false;
- return;
- }
- if (PlayerDatas.Instance.baseData.MapID == REALM_DUNGEON_ID)
- {
- cacheRealmLv = PlayerDatas.Instance.baseData.realmLevel;
- }
- if (PlayerDatas.Instance.realm.holdDataList.Count > 0
- && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding
- && !BossShowModel.Instance.BossShowing && !FairyFeastTransmitShow.Instance.IsOpen)
- {
- WindowCenter.Instance.Open<RealmUpHoldWin>();
- }
- if (cacheMapId == REALM_DUNGEON_ID)
- {
- if (dungeonModel.dungeonResult.leaderID == PlayerDatas.Instance.PlayerId)
- {
- if (!WindowCenter.Instance.IsOpen<RealmWin>() && !NewBieCenter.Instance.inGuiding)
- {
- openByDungeonStep = cacheRealmLv < PlayerDatas.Instance.baseData.realmLevel;
- WindowCenter.Instance.Open<RealmWin>();
- }
- }
- }
- cacheMapId = PlayerDatas.Instance.baseData.MapID;
- }
-
- private void BossShowCompletedEvent()
- {
- if (StageLoad.Instance.stageType == Stage.E_StageType.Dungeon)
- {
- if (PlayerDatas.Instance.realm.holdDataList.Count > 0
- && !WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding
- && !BossShowModel.Instance.BossShowing && !FairyFeastTransmitShow.Instance.IsOpen)
- {
- WindowCenter.Instance.Open<RealmUpHoldWin>();
- }
- }
- }
-
- private void RefreshInfo(PlayerDataType refreshType)
- {
- if (refreshType == PlayerDataType.RealmLevel)
- {
- openedRealmUpWin = false;
- }
- if (refreshType == PlayerDataType.RealmPoint)
- {
- if (!IsRealmHighest && serverInited)
- {
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (beforeRealmPoint < config.NeedPoint && PlayerDatas.Instance.extersion.realmPoint >= config.NeedPoint)
- {
- realmDungeonState = true;
- }
- }
- beforeRealmPoint = PlayerDatas.Instance.extersion.realmPoint;
- }
- if (refreshType == PlayerDataType.RealmPoint || refreshType == PlayerDataType.RealmLevel)
- {
- UpdateRedpoint();
- }
- }
-
- private void OnFuncStateChangeEvent(int func)
- {
- if (func == (int)FuncOpenEnum.Realm)
- {
- UpdateRedpoint();
- }
- }
-
- public override void UnInit()
- {
- }
-
- #region 閰嶇疆
- public const int REALM_DUNGEON_ID = 31110;
- public int realmHoleLimit { get; private set; }
- public int realmInspireCoolDownTime { get; private set; }
- public int realmMaxLevel { get; private set; }
- public int realmSuppressHurt { get; private set; }
- private Dictionary<int, List<int>> realmHelperAttrDic = new Dictionary<int, List<int>>();
- private Dictionary<int, Dictionary<int, int>> realmSitTimesDict = new Dictionary<int, Dictionary<int, int>>();
- private Dictionary<int, int> realmStageDict = new Dictionary<int, int>();
- private void ParseConfig()
- {
- var config = FuncConfigConfig.Get("RealmFBHelpAttr");
- realmHoleLimit = int.Parse(config.Numerical2);
- realmInspireCoolDownTime = int.Parse(config.Numerical3);
- JsonData _jsonData = JsonMapper.ToObject(config.Numerical1);
- foreach (var typeKey in _jsonData.Keys)
- {
- List<int> list = new List<int>();
- foreach (var attrKey in _jsonData[typeKey].Keys)
- {
- list.Add(int.Parse(_jsonData[typeKey][attrKey].ToString()));
- }
- realmHelperAttrDic.Add(int.Parse(typeKey), list);
- }
-
- var configs = RealmConfig.GetValues();
- var start = 0;
- for (int i = 0; i < configs.Count; i++)
- {
- var _dict = new Dictionary<int, int>();
- var _json = JsonMapper.ToObject(configs[i].SitTime);
- foreach (var _key in _json.Keys)
- {
- _dict.Add(int.Parse(_key), int.Parse(_json[_key].ToString()));
- }
- realmSitTimesDict.Add(configs[i].Lv, _dict);
-
- if (configs[i].IsBigRealm == 1)
- {
- realmStageDict.Add(start, configs[i].Lv);
- start = configs[i].Lv + 1;
- }
-
- realmMaxLevel = configs[i].Lv > realmMaxLevel ? configs[i].Lv : realmMaxLevel;
- }
-
- config = FuncConfigConfig.Get("RealmGuardian");
- realmGuardianDisplayTime = int.Parse(config.Numerical1);
-
- config = FuncConfigConfig.Get("RealmSuppressHurt");
- realmSuppressHurt = config != null ? int.Parse(config.Numerical1) : 0;
- }
-
- public int GetRealmHelperAttr(int type, int index)
- {
- List<int> list = null;
- realmHelperAttrDic.TryGetValue(type, out list);
- if (index < list.Count)
- {
- return list[index];
- }
- return 0;
- }
-
- public bool IsBigRealm()
- {
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- return config != null && config.IsBigRealm == 1;
- }
-
- public bool TryGetRealmStage(int _realmLv, out int start, out int end)
- {
- start = 0; end = 0;
- foreach (var _key in realmStageDict.Keys)
- {
- if (_realmLv >= _key && _realmLv <= realmStageDict[_key])
- {
- start = _key;
- end = realmStageDict[_key];
- return true;
- }
- }
- return false;
- }
- #endregion
-
- public bool IsRealmHighest {
- get {
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel + 1);
- return config == null;
- }
- }
-
- public bool IsDungeonState {
- get {
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- if (IsRealmHighest)
- {
- return false;
- }
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- return _realmPoint >= config.NeedPoint;
- }
- }
-
- public Redpoint realmRedpoint = new Redpoint(114, 11401);
-
- public bool openedRealmUpWin = false;
-
- public void UpdateRedpoint()
- {
- realmRedpoint.state = RedPointState.None;
- if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm))
- {
- return;
- }
- if (IsRealmHighest)
- {
- return;
- }
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- if (_realmPoint >= config.NeedPoint && !openedRealmUpWin)
- {
- realmRedpoint.state = RedPointState.Simple;
- }
- }
-
- public void GotoDungeon()
- {
- var _realmCfg = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (_realmCfg == null)
- {
- return;
- }
- if (PlayerDatas.Instance.extersion.realmPoint < _realmCfg.NeedPoint)
- {
- return;
- }
- if (_realmCfg != null && _realmCfg.IsBigRealm == 1)
- {
- dungeonModel.GroupChallenge(REALM_DUNGEON_ID, 1);
- }
- else
- {
- dungeonModel.SingleChallenge(REALM_DUNGEON_ID);
- }
- }
-
- public void OnPlayerLoginOk()
- {
- UpdateRedpoint();
- beforeRealmPoint = PlayerDatas.Instance.extersion.realmPoint;
- serverInited = true;
-
- var realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- bool satisfyChallenge = false;
- if (config != null)
- {
- satisfyChallenge = realmPoint >= config.NeedPoint;
- }
- if (realmDungeonState && !satisfyChallenge)
- {
- realmDungeonState = false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Core/NetworkPackage/DTCFile/ClientPack.meta b/Core/NetworkPackage/DTCFile/ClientPack.meta
deleted file mode 100644
index a5a6f03..0000000
--- a/Core/NetworkPackage/DTCFile/ClientPack.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 722e5e3d30096674e811f5bd191246a0
-folderAsset: yes
-timeCreated: 1539228128
-licenseType: Pro
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs b/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs
index 8aeb855..a10d03d 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0319_tagFBHelp.cs
@@ -20,11 +20,6 @@
switch (PlayerDatas.Instance.baseData.MapID)
{
- case 31110:
- { //娓″姭鍓湰
- PlayerDatas.Instance.realm.OnRefreshData(vNetData);
- }
- break;
case 31230:
break;
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs
index 94ba5d3..f720fec 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA9_Function/DTCA908_tagGCRealmFBHelpInfo.cs
@@ -12,9 +12,6 @@
base.Done(vNetPack);
HA908_tagGCRealmFBHelpInfo vNetData = vNetPack as HA908_tagGCRealmFBHelpInfo;
- if (vNetData != null) {
- PlayerDatas.Instance.realm.OnRefreshData(vNetData);
- }
}
}
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index 733d8ee..3f980f2 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -204,16 +204,6 @@
var mapId = PlayerDatas.Instance.baseData.MapID;
switch (mapId)
{
- case 31110:
- var cfg = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (cfg != null)
- {
- if (cfg.IsBigRealm != 1)
- {
- WindowCenter.Instance.Open<RealmDungeonWin>();
- }
- }
- break;
case 31080:
{
if (!WindowCenter.Instance.IsOpen<DungeonFairyLandWin>())
diff --git a/Lua/Gen/PlayerDatasWrap.cs b/Lua/Gen/PlayerDatasWrap.cs
index 5749a44..f6c19dc 100644
--- a/Lua/Gen/PlayerDatasWrap.cs
+++ b/Lua/Gen/PlayerDatasWrap.cs
@@ -56,7 +56,6 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "hero", _g_get_hero);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "loginInfo", _g_get_loginInfo);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "fairyData", _g_get_fairyData);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realm", _g_get_realm);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "maliciousAtkPlayer", _g_get_maliciousAtkPlayer);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossServerTick", _g_get_crossServerTick);
@@ -64,7 +63,6 @@
Utils.RegisterFunc(L, Utils.SETTER_IDX, "hero", _s_set_hero);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "loginInfo", _s_set_loginInfo);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "fairyData", _s_set_fairyData);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "realm", _s_set_realm);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "maliciousAtkPlayer", _s_set_maliciousAtkPlayer);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossServerTick", _s_set_crossServerTick);
@@ -692,20 +690,6 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realm(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.realm);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_maliciousAtkPlayer(RealStatePtr L)
{
try {
@@ -788,21 +772,6 @@
PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1);
gen_to_be_invoked.fairyData = (PlayerFairyData)translator.GetObject(L, 2, typeof(PlayerFairyData));
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_realm(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.realm = (PlayerRealmData)translator.GetObject(L, 2, typeof(PlayerRealmData));
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
diff --git a/Lua/Gen/RealmPracticeModelWrap.cs b/Lua/Gen/RealmPracticeModelWrap.cs
deleted file mode 100644
index 6eb2605..0000000
--- a/Lua/Gen/RealmPracticeModelWrap.cs
+++ /dev/null
@@ -1,676 +0,0 @@
-锘�#if USE_UNI_LUA
-using LuaAPI = UniLua.Lua;
-using RealStatePtr = UniLua.ILuaState;
-using LuaCSFunction = UniLua.CSharpFunctionDelegate;
-#else
-using LuaAPI = XLua.LuaDLL.Lua;
-using RealStatePtr = System.IntPtr;
-using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
-#endif
-
-using XLua;
-using System.Collections.Generic;
-
-
-namespace XLua.CSObjectWrap
-{
- using Utils = XLua.Utils;
- public class RealmPracticeModelWrap
- {
- public static void __Register(RealStatePtr L)
- {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- System.Type type = typeof(RealmPracticeModel);
- Utils.BeginObjectRegister(type, L, translator, 0, 16, 4, 1);
-
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnAfterPlayerDataInitialize", _m_OnAfterPlayerDataInitialize);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshOpenPracModel", _m_RefreshOpenPracModel);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetAllOpenRealmPra", _m_GetAllOpenRealmPra);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRealmPracticelist", _m_GetRealmPracticelist);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTagSuccessModel", _m_GetTagSuccessModel);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GeTagChinItemModel", _m_GeTagChinItemModel);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetAchievement", _m_SetAchievement);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetPracticePointStr", _m_GetPracticePointStr);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRealmPraPointByType", _m_GetRealmPraPointByType);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "RealmTypeRedPointCtrl", _m_RealmTypeRedPointCtrl);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshAchieveState", _m_RefreshAchieveState);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsReachAchieve", _m_IsReachAchieve);
-
-
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "AchieveModel", _g_get_AchieveModel);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmFirstTypeDict", _g_get_realmFirstTypeDict);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmSecondTypeDict", _g_get_realmSecondTypeDict);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmPraRedPoint", _g_get_realmPraRedPoint);
-
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "realmPraRedPoint", _s_set_realmPraRedPoint);
-
-
- Utils.EndObjectRegister(type, L, translator, null, null,
- null, null, null);
-
- Utils.BeginClassRegister(type, L, __CreateInstance, 4, 0, 0);
-
-
- Utils.RegisterObject(L, translator, Utils.CLS_IDX, "PLAYERLV_KEY", RealmPracticeModel.PLAYERLV_KEY);
- Utils.RegisterObject(L, translator, Utils.CLS_IDX, "REALMREDPOINT_KEY", RealmPracticeModel.REALMREDPOINT_KEY);
- Utils.RegisterObject(L, translator, Utils.CLS_IDX, "REALMPRAFUNCREDPOINT_KEY", RealmPracticeModel.REALMPRAFUNCREDPOINT_KEY);
-
-
-
-
- Utils.EndClassRegister(type, L, translator);
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int __CreateInstance(RealStatePtr L)
- {
-
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- if(LuaAPI.lua_gettop(L) == 1)
- {
-
- RealmPracticeModel gen_ret = new RealmPracticeModel();
- translator.Push(L, gen_ret);
-
- return 1;
- }
-
- }
- catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return LuaAPI.luaL_error(L, "invalid arguments to RealmPracticeModel constructor!");
-
- }
-
-
-
-
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Init(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.Init( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnBeforePlayerDataInitialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnBeforePlayerDataInitialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnAfterPlayerDataInitialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnAfterPlayerDataInitialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnPlayerLoginOk(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnPlayerLoginOk( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_UnInit(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.UnInit( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_RefreshOpenPracModel(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.RefreshOpenPracModel( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetAllOpenRealmPra(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<RealmPracticeConfig>>> gen_ret = gen_to_be_invoked.GetAllOpenRealmPra( );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetRealmPracticelist(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
- int _secondType = LuaAPI.xlua_tointeger(L, 3);
-
- System.Collections.Generic.List<RealmPracticeConfig> gen_ret = gen_to_be_invoked.GetRealmPracticelist( _firstType, _secondType );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetTagSuccessModel(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _achievementId = LuaAPI.xlua_tointeger(L, 2);
-
- SuccessConfig gen_ret = gen_to_be_invoked.GetTagSuccessModel( _achievementId );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GeTagChinItemModel(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _Id = LuaAPI.xlua_tointeger(L, 2);
-
- ItemConfig gen_ret = gen_to_be_invoked.GeTagChinItemModel( _Id );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_SetAchievement(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int[] _idlist = (int[])translator.GetObject(L, 2, typeof(int[]));
- Snxxz.UI.Achievement _achieve;
-
- int gen_ret = gen_to_be_invoked.SetAchievement( _idlist, out _achieve );
- LuaAPI.xlua_pushinteger(L, gen_ret);
- translator.Push(L, _achieve);
-
-
-
-
- return 2;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetPracticePointStr(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 3&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3))
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
- int _secondType = LuaAPI.xlua_tointeger(L, 3);
-
- string gen_ret = gen_to_be_invoked.GetPracticePointStr( _firstType, _secondType );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2))
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
-
- string gen_ret = gen_to_be_invoked.GetPracticePointStr( _firstType );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to RealmPracticeModel.GetPracticePointStr!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetRealmPraPointByType(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 4&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 4))
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
- int _secondType = LuaAPI.xlua_tointeger(L, 3);
- bool _isSumRealmPraPoint = LuaAPI.lua_toboolean(L, 4);
-
- int gen_ret = gen_to_be_invoked.GetRealmPraPointByType( _firstType, _secondType, _isSumRealmPraPoint );
- LuaAPI.xlua_pushinteger(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 3&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3))
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
- int _secondType = LuaAPI.xlua_tointeger(L, 3);
-
- int gen_ret = gen_to_be_invoked.GetRealmPraPointByType( _firstType, _secondType );
- LuaAPI.xlua_pushinteger(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2))
- {
- int _firstType = LuaAPI.xlua_tointeger(L, 2);
-
- int gen_ret = gen_to_be_invoked.GetRealmPraPointByType( _firstType );
- LuaAPI.xlua_pushinteger(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to RealmPracticeModel.GetRealmPraPointByType!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_RealmTypeRedPointCtrl(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.RealmTypeRedPointCtrl( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_RefreshAchieveState(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _id = LuaAPI.xlua_tointeger(L, 2);
-
- gen_to_be_invoked.RefreshAchieveState( _id );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_IsReachAchieve(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- Snxxz.UI.Achievement _achieve = (Snxxz.UI.Achievement)translator.GetObject(L, 2, typeof(Snxxz.UI.Achievement));
-
- bool gen_ret = gen_to_be_invoked.IsReachAchieve( _achieve );
- LuaAPI.lua_pushboolean(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_AchieveModel(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.AchieveModel);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmFirstTypeDict(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.realmFirstTypeDict);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmSecondTypeDict(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.realmSecondTypeDict);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmPraRedPoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.realmPraRedPoint);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_realmPraRedPoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- RealmPracticeModel gen_to_be_invoked = (RealmPracticeModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.realmPraRedPoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
-
-
-
-
- }
-}
diff --git a/Lua/Gen/RealmPracticeModelWrap.cs.meta b/Lua/Gen/RealmPracticeModelWrap.cs.meta
deleted file mode 100644
index 27e14fa..0000000
--- a/Lua/Gen/RealmPracticeModelWrap.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8e93f41ceb8373e41ba43cca767e8d7c
-timeCreated: 1550120582
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/Gen/SnxxzUIChatCenterWrap.cs b/Lua/Gen/SnxxzUIChatCenterWrap.cs
index b9209c9..ae3ba73 100644
--- a/Lua/Gen/SnxxzUIChatCenterWrap.cs
+++ b/Lua/Gen/SnxxzUIChatCenterWrap.cs
@@ -38,7 +38,6 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "PlaySpeech", _m_PlaySpeech);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckAutoPlayVoice", _m_CheckAutoPlayVoice);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckSendRealmThanks", _m_CheckSendRealmThanks);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetChatExtra", _m_SetChatExtra);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "HandleChatBanned", _m_HandleChatBanned);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ServerForbidenChat", _m_ServerForbidenChat);
@@ -607,32 +606,6 @@
}
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_CheckSendRealmThanks(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.ChatCenter gen_to_be_invoked = (Snxxz.UI.ChatCenter)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.CheckSendRealmThanks( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_SetChatExtra(RealStatePtr L)
diff --git a/Lua/Gen/SnxxzUIRealmModelWrap.cs b/Lua/Gen/SnxxzUIRealmModelWrap.cs
deleted file mode 100644
index 0acd3d4..0000000
--- a/Lua/Gen/SnxxzUIRealmModelWrap.cs
+++ /dev/null
@@ -1,670 +0,0 @@
-锘�#if USE_UNI_LUA
-using LuaAPI = UniLua.Lua;
-using RealStatePtr = UniLua.ILuaState;
-using LuaCSFunction = UniLua.CSharpFunctionDelegate;
-#else
-using LuaAPI = XLua.LuaDLL.Lua;
-using RealStatePtr = System.IntPtr;
-using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
-#endif
-
-using XLua;
-using System.Collections.Generic;
-
-
-namespace XLua.CSObjectWrap
-{
- using Utils = XLua.Utils;
- public class SnxxzUIRealmModelWrap
- {
- public static void __Register(RealStatePtr L)
- {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- System.Type type = typeof(Snxxz.UI.RealmModel);
- Utils.BeginObjectRegister(type, L, translator, 0, 10, 17, 8);
-
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRealmHelperAttr", _m_GetRealmHelperAttr);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsBigRealm", _m_IsBigRealm);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetRealmStage", _m_TryGetRealmStage);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateRedpoint", _m_UpdateRedpoint);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "GotoDungeon", _m_GotoDungeon);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPlayerLoginOk", _m_OnPlayerLoginOk);
-
-
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "cacheRealmLv", _g_get_cacheRealmLv);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "openByDungeonStep", _g_get_openByDungeonStep);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "leaderId", _g_get_leaderId);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "beforeRealmPoint", _g_get_beforeRealmPoint);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmGuardianDisplayTime", _g_get_realmGuardianDisplayTime);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "excuteRealmOpenGuide", _g_get_excuteRealmOpenGuide);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmDungeonState", _g_get_realmDungeonState);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmHoleLimit", _g_get_realmHoleLimit);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmInspireCoolDownTime", _g_get_realmInspireCoolDownTime);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmMaxLevel", _g_get_realmMaxLevel);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmSuppressHurt", _g_get_realmSuppressHurt);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsRealmHighest", _g_get_IsRealmHighest);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsDungeonState", _g_get_IsDungeonState);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "realmRedpoint", _g_get_realmRedpoint);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "openedRealmUpWin", _g_get_openedRealmUpWin);
-
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "cacheRealmLv", _s_set_cacheRealmLv);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "openByDungeonStep", _s_set_openByDungeonStep);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "leaderId", _s_set_leaderId);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "realmDungeonState", _s_set_realmDungeonState);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "realmRedpoint", _s_set_realmRedpoint);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "openedRealmUpWin", _s_set_openedRealmUpWin);
-
-
- Utils.EndObjectRegister(type, L, translator, null, null,
- null, null, null);
-
- Utils.BeginClassRegister(type, L, __CreateInstance, 2, 0, 0);
-
-
- Utils.RegisterObject(L, translator, Utils.CLS_IDX, "REALM_DUNGEON_ID", Snxxz.UI.RealmModel.REALM_DUNGEON_ID);
-
-
-
-
- Utils.EndClassRegister(type, L, translator);
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int __CreateInstance(RealStatePtr L)
- {
-
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- if(LuaAPI.lua_gettop(L) == 1)
- {
-
- Snxxz.UI.RealmModel gen_ret = new Snxxz.UI.RealmModel();
- translator.Push(L, gen_ret);
-
- return 1;
- }
-
- }
- catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.RealmModel constructor!");
-
- }
-
-
-
-
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnBeforePlayerDataInitialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnBeforePlayerDataInitialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Init(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.Init( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_UnInit(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.UnInit( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetRealmHelperAttr(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _type = LuaAPI.xlua_tointeger(L, 2);
- int _index = LuaAPI.xlua_tointeger(L, 3);
-
- int gen_ret = gen_to_be_invoked.GetRealmHelperAttr( _type, _index );
- LuaAPI.xlua_pushinteger(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_IsBigRealm(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- bool gen_ret = gen_to_be_invoked.IsBigRealm( );
- LuaAPI.lua_pushboolean(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_TryGetRealmStage(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int __realmLv = LuaAPI.xlua_tointeger(L, 2);
- int _start;
- int _end;
-
- bool gen_ret = gen_to_be_invoked.TryGetRealmStage( __realmLv, out _start, out _end );
- LuaAPI.lua_pushboolean(L, gen_ret);
- LuaAPI.xlua_pushinteger(L, _start);
-
- LuaAPI.xlua_pushinteger(L, _end);
-
-
-
-
- return 3;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_UpdateRedpoint(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.UpdateRedpoint( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GotoDungeon(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.GotoDungeon( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnPlayerLoginOk(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnPlayerLoginOk( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_cacheRealmLv(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.cacheRealmLv);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_openByDungeonStep(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.openByDungeonStep);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_leaderId(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.leaderId);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_beforeRealmPoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.beforeRealmPoint);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmGuardianDisplayTime(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.realmGuardianDisplayTime);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_excuteRealmOpenGuide(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.excuteRealmOpenGuide);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmDungeonState(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.realmDungeonState);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmHoleLimit(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.realmHoleLimit);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmInspireCoolDownTime(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.realmInspireCoolDownTime);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmMaxLevel(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.realmMaxLevel);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmSuppressHurt(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.realmSuppressHurt);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_IsRealmHighest(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsRealmHighest);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_IsDungeonState(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsDungeonState);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_realmRedpoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.realmRedpoint);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_openedRealmUpWin(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushboolean(L, gen_to_be_invoked.openedRealmUpWin);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_cacheRealmLv(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.cacheRealmLv = LuaAPI.xlua_tointeger(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_openByDungeonStep(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.openByDungeonStep = LuaAPI.lua_toboolean(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_leaderId(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.leaderId = LuaAPI.xlua_tointeger(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_realmDungeonState(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.realmDungeonState = LuaAPI.lua_toboolean(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_realmRedpoint(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.realmRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_openedRealmUpWin(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- Snxxz.UI.RealmModel gen_to_be_invoked = (Snxxz.UI.RealmModel)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.openedRealmUpWin = LuaAPI.lua_toboolean(L, 2);
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
-
-
-
-
-
- }
-}
diff --git a/Lua/Gen/SnxxzUIRealmModelWrap.cs.meta b/Lua/Gen/SnxxzUIRealmModelWrap.cs.meta
deleted file mode 100644
index b55e707..0000000
--- a/Lua/Gen/SnxxzUIRealmModelWrap.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 19816d15e3e81a847a0fb8ce3b139755
-timeCreated: 1550120575
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/Gen/XLuaGenAutoRegister.cs b/Lua/Gen/XLuaGenAutoRegister.cs
index 3c484e1..bd090cd 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs
+++ b/Lua/Gen/XLuaGenAutoRegister.cs
@@ -698,9 +698,6 @@
translator.DelayWrapLoader(typeof(PlayerDatas), PlayerDatasWrap.__Register);
- translator.DelayWrapLoader(typeof(Snxxz.UI.RealmModel), SnxxzUIRealmModelWrap.__Register);
-
-
translator.DelayWrapLoader(typeof(SnxxzGame), SnxxzGameWrap.__Register);
@@ -1279,9 +1276,6 @@
{
translator.DelayWrapLoader(typeof(Snxxz.UI.RankModel), SnxxzUIRankModelWrap.__Register);
-
-
- translator.DelayWrapLoader(typeof(RealmPracticeModel), RealmPracticeModelWrap.__Register);
translator.DelayWrapLoader(typeof(Snxxz.UI.Redpoint), SnxxzUIRedpointWrap.__Register);
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index 8c0d817..680b8aa 100644
--- a/System/Chat/ChatCenter.cs
+++ b/System/Chat/ChatCenter.cs
@@ -825,58 +825,6 @@
}
#endregion
- #region 澧冪晫娓″姭绉佽亰鎰熻阿
- const string RealmThank = "ThankMessage";
- const int RealmThankCount = 11;
- public void CheckSendRealmThanks()
- {
- try
- {
- var model = ModelCenter.Instance.GetModel<DungeonModel>();
- var realmConfig = RealmConfig.Get(realmModel.cacheRealmLv);
- if (model.dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID
- && realmConfig != null && realmConfig.IsBigRealm == 1)
- {
- var count = 0;
- var configs = RealmConfig.GetValues();
- for (int i = 0; i < configs.Count; i++)
- {
- if (configs[i].Lv < realmModel.cacheRealmLv && configs[i].IsBigRealm == 1)
- {
- count++;
- }
- else if (configs[i].Lv >= realmModel.cacheRealmLv)
- {
- break;
- }
- }
- if (count >= 3)
- {
- return;
- }
- var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
- for (int i = 0; i < teamModel.myTeam.memberCount; i++)
- {
- Teammate teammate;
- if (teamModel.myTeam.TryGetMember(i, out teammate)
- && teammate.id != PlayerDatas.Instance.baseData.PlayerID && teammate.online)
- {
- ChatCtrl.Inst.PteChatID = (int)teammate.id;
- ChatCtrl.Inst.PteChatName = teammate.mateName;
- LanguageVerify.toPlayerLevel = teammate.level;
- var content = StringUtility.Contact(RealmThank, UnityEngine.Random.Range(1, RealmThankCount + 1));
- ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend, Language.Get(content));
- }
- }
- }
- }
- catch (Exception e)
- {
- DebugEx.Log(e.Message);
- }
- }
- #endregion
-
#region 鑱婂ぉ榛戝悕鍗�
public string SetChatExtra()
diff --git a/System/Dungeon/DungeonFightWin.cs b/System/Dungeon/DungeonFightWin.cs
index 2a09373..cbadeb4 100644
--- a/System/Dungeon/DungeonFightWin.cs
+++ b/System/Dungeon/DungeonFightWin.cs
@@ -431,14 +431,6 @@
}
break;
case RealmModel.REALM_DUNGEON_ID:
- var realmLv = ModelCenter.Instance.GetModel<RealmModel>().cacheRealmLv;
- var realmConfig = RealmConfig.Get(realmLv);
- if (model.dungeonResult.leaderID != PlayerDatas.Instance.baseData.PlayerID
- || realmConfig == null || realmConfig.IsBigRealm != 1
- || model.dungeonResult.isPass != 1)
- {
- model.ExitCurrentDungeon();
- }
break;
case JadeDynastyTowerModel.DATA_MAPID:
var jadeDynastyTowerModel = ModelCenter.Instance.GetModel<JadeDynastyTowerModel>();
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 3ae5389..31b5f4d 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -1019,17 +1019,8 @@
WindowCenter.Instance.Open<DungeonSlayerVictoryWin>();
break;
case RealmModel.REALM_DUNGEON_ID:
- var realmConfig = RealmConfig.Get(realmModel.cacheRealmLv);
- if (realmConfig != null && realmConfig.IsBigRealm == 1
- && dungeonResult.leaderID == PlayerDatas.Instance.baseData.PlayerID)
- {
- RealmBossShow.Instance.Open(realmModel.cacheRealmLv);
- //ModelCenter.Instance.GetModel<ChatCenter>().CheckSendRealmThanks();
- }
- else
- {
- WindowCenter.Instance.Open<DungeonRealmVictoryWin>();
- }
+ var realmLevel = PlayerDatas.Instance.baseData.realmLevel + 1;
+ RealmBossShow.Instance.Open(realmLevel);
break;
case RuneTowerModel.RUNETOWER_MAPID:
WindowCenter.Instance.Open<DungeonRuneTowerVictoryWin>();
diff --git a/System/Dungeon/DungeonRealmVictoryWin.cs b/System/Dungeon/DungeonRealmVictoryWin.cs
index 25e6a3c..c99d854 100644
--- a/System/Dungeon/DungeonRealmVictoryWin.cs
+++ b/System/Dungeon/DungeonRealmVictoryWin.cs
@@ -50,7 +50,7 @@
void DisplayProperty()
{
- var _realmLv = realmModel.cacheRealmLv;
+ var _realmLv = PlayerDatas.Instance.baseData.realmLevel;
RealmConfig presentcfg = RealmConfig.Get(_realmLv);
if (presentcfg != null)
{
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index 1d968e3..57c6255 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -193,7 +193,7 @@
public void CheckRealmSfx()
{
var _model = ModelCenter.Instance.GetModel<RealmModel>();
- if (_model.IsDungeonState && realmModel.realmRedpoint.state == RedPointState.Simple)
+ if (realmModel.redpoint.state == RedPointState.Simple)
{
m_RealmRed.gameObject.SetActive(false);
if (!m_RealmSfx.IsPlaying)
@@ -265,7 +265,7 @@
private void RedpointValueChangeEvent(int _id)
{
- if (_id == realmModel.realmRedpoint.id)
+ if (_id == realmModel.redpoint.id)
{
CheckRealmSfx();
}
diff --git a/System/Realm/PracticeTypeCell.cs b/System/Realm/PracticeTypeCell.cs
deleted file mode 100644
index 0b1b9c3..0000000
--- a/System/Realm/PracticeTypeCell.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Linq;
-
-namespace Snxxz.UI
-{
- public class PracticeTypeCell : CellView
- {
- [SerializeField] public GameObject unSelectImg;
- [SerializeField] public GameObject selectImg;
- [SerializeField] public Text nameText;
- [SerializeField] public Slider progressSlider;
- [SerializeField] public Text progressText;
- [SerializeField] public Button cellBtn;
- [SerializeField] public Transform arrowIcon;
- [SerializeField] public RedpointBehaviour redpoint;
-
- RealmPracticeModel practiceModel { get { return ModelCenter.Instance.GetModel<RealmPracticeModel>(); } }
-
- public void Init(int firstType,int selectFirstType,bool isDoubleClick)
- {
- redpoint.redpointId = practiceModel.realmFirstTypeDict[firstType].id;
- nameText.text = practiceModel.GetPracticePointStr(firstType);
-
- List<int> secondTypelist = practiceModel.GetAllOpenRealmPra()[firstType].Keys.ToList();
- if(secondTypelist[0] != 0)
- {
- arrowIcon.gameObject.SetActive(true);
- }
- else
- {
- arrowIcon.gameObject.SetActive(false);
- }
-
- if(selectFirstType == firstType)
- {
- selectImg.SetActive(true);
- unSelectImg.SetActive(false);
- if(secondTypelist[0] != 0)
- {
- if(isDoubleClick)
- {
- arrowIcon.localRotation = Quaternion.Euler(0, 0, 0);
- }
- else
- {
- arrowIcon.localRotation = Quaternion.Euler(0, 0, -90);
- }
-
- }
- }
- else
- {
- arrowIcon.localRotation = Quaternion.Euler(0, 0,0);
- unSelectImg.SetActive(true);
- selectImg.SetActive(false);
- }
-
- RefreshProgress(firstType);
- }
-
- public void RefreshProgress(int practiceType)
- {
- progressSlider.minValue = 0;
- progressSlider.maxValue = practiceModel.GetRealmPraPointByType(practiceType);
- progressSlider.value = practiceModel.GetRealmPraPointByType(practiceType,0,false);
- string precent = "";
- float precentValue = (float)(progressSlider.value / progressSlider.maxValue)*100;
- if(precentValue > 0 && precentValue < 1)
- {
- precentValue = 1;
- }
- precent = StringUtility.Contact((float)Math.Round(precentValue,1),"%");
- progressText.text = precent;
- }
- }
-}
diff --git a/System/Realm/PracticeTypeCell.cs.meta b/System/Realm/PracticeTypeCell.cs.meta
deleted file mode 100644
index d574bf3..0000000
--- a/System/Realm/PracticeTypeCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a54beab72d0714b4db85a4f36d7bf45d
-timeCreated: 1523858228
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmDungeonWin.cs b/System/Realm/RealmDungeonWin.cs
deleted file mode 100644
index 420f80b..0000000
--- a/System/Realm/RealmDungeonWin.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, October 11, 2017
-//--------------------------------------------------------
-
-using EnhancedUI.EnhancedScroller;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
- public class RealmDungeonWin : Window
- {
- [SerializeField] Text additionAttr1;
- [SerializeField] Text additionAttr2;
-
- [SerializeField] Text additionTip1;
-
- [SerializeField] Button inspireBtn;
- [SerializeField] Text inspireBtnText;
-
- [SerializeField] ScrollerController helpCtrl;
-
- private int surplusTime = 0;
-
- private float m_Time = 0;
-
- private bool hasInspire = false;
-
- [SerializeField] Text destText;
-
- RealmModel m_Model;
- RealmModel model
- {
- get
- {
- return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<RealmModel>());
- }
- }
-
- #region Built-in
- protected override void BindController()
- {
-
- }
-
- private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height)
- {
- height = 0;
- PlayerRealmData.RealmHelpData data = PlayerDatas.Instance.realm.realmHelpList[index];
- int additionValue1 = 0; int additionValue2 = 0;
- switch ((PlayerRealmData.RealmHelpType)data.type)
- {
- case PlayerRealmData.RealmHelpType.Self:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.Normal:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.High:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- additionValue2 = model.GetRealmHelperAttr(data.type, 1);
- break;
- }
- if (data.type == 0)
- {
- destText.text = Language.Get("RealmWin_Bewrite_19", additionValue1);
- }
- else
- {
- destText.text = Language.Get("RealmWin_Bewrite_20", data.name, additionValue1);
- if (additionValue2 != 0)
- {
- destText.text += Language.Get("RealmWin_Bewrite_22", additionValue2);
- }
- }
- if (destText.font == null)
- {
- destText.font = FontUtility.preferred;
- }
- height = destText.cachedTextGeneratorForLayout.GetPreferredHeight(destText.text, destText.GetGenerationSettings(new Vector2(destText.rectTransform.rect.size.x, 0.0f))) / destText.pixelsPerUnit;
- return true;
- }
-
- private void OnRefreshCell(ScrollerDataType type, CellView cell)
- {
- int index = cell.index;
- if (index < PlayerDatas.Instance.realm.realmHelpList.Count)
- {
- PlayerRealmData.RealmHelpData data = PlayerDatas.Instance.realm.realmHelpList[index];
- int additionValue1 = 0; int additionValue2 = 0;
- switch ((PlayerRealmData.RealmHelpType)data.type)
- {
- case PlayerRealmData.RealmHelpType.Self:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.Normal:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.High:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- additionValue2 = model.GetRealmHelperAttr(data.type, 1);
- break;
- }
- Text text = cell.GetComponent<Text>();
-
- if (data.type == 0)
- {
- text.text = Language.Get("RealmWin_Bewrite_19", additionValue1);
- }
- else
- {
- text.text = Language.Get("RealmWin_Bewrite_20", data.name, additionValue1);
- if (additionValue2 != 0)
- {
- text.text += Language.Get("RealmWin_Bewrite_22", additionValue2);
- }
- }
- }
- }
-
- protected override void AddListeners()
- {
- inspireBtn.onClick.AddListener(OnInspireBtn);
- helpCtrl.OnRefreshCell += OnRefreshCell;
- helpCtrl.OnGetDynamicSize += OnGetDynamicSize;
- }
-
- private void OnInspireBtn()
- {
- if (!hasInspire)
- {
- CA508_tagCMDoFBAction inspirepack = new CA508_tagCMDoFBAction();
- inspirepack.ActionType = 1;
- inspirepack.ActionInfo = 0;
- GameNetSystem.Instance.SendInfo(inspirepack);
- hasInspire = true;
- surplusTime = model.realmInspireCoolDownTime;
- RefreshInspireBtnText();
- }
- }
-
- protected override void OnPreOpen()
- {
- PlayerRealmData.OnRefreshHelpInfo += OnRefreshHelpInfo;
- surplusTime = 0;
- hasInspire = false;
- InitData();
- }
-
- private float GetHeight(int _index = 0)
- {
- PlayerRealmData.RealmHelpData data = PlayerDatas.Instance.realm.realmHelpList[_index];
- int additionValue1 = 0; int additionValue2 = 0;
- switch ((PlayerRealmData.RealmHelpType)data.type)
- {
- case PlayerRealmData.RealmHelpType.Self:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.Normal:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.High:
- additionValue1 = model.GetRealmHelperAttr(data.type, 0) / 100;
- additionValue2 = model.GetRealmHelperAttr(data.type, 1);
- break;
- }
- string _value = string.Empty;
- if (data.type == 0)
- {
- _value = Language.Get("RealmWin_Bewrite_19", additionValue1);
- }
- else
- {
- _value = Language.Get("RealmWin_Bewrite_20", data.name, additionValue1);
- if (additionValue2 != 0)
- {
- _value += Language.Get("RealmWin_Bewrite_22", additionValue2);
- }
- }
- if (destText.font == null)
- {
- destText.font = FontUtility.preferred;
- }
- return destText.cachedTextGeneratorForLayout.GetPreferredHeight(_value, destText.GetGenerationSettings(new Vector2(destText.rectTransform.rect.size.x, 0.0f))) / destText.pixelsPerUnit;
- }
-
- private void OnRefreshHelpInfo()
- {
- int addtionValue1 = 0;
- int addtionValue2 = 0;
- var list = PlayerDatas.Instance.realm.realmHelpList;
- helpCtrl.lockType = list.Count > 2 ? EnhanceLockType.KeepVertical2 : EnhanceLockType.LockVerticalTop;
- helpCtrl.Refresh();
- for (int i = 0; i < list.Count; i++)
- {
- PlayerRealmData.RealmHelpData data = list[i];
- switch ((PlayerRealmData.RealmHelpType)data.type)
- {
- case PlayerRealmData.RealmHelpType.Self:
- addtionValue1 += model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.Normal:
- addtionValue1 += model.GetRealmHelperAttr(data.type, 0) / 100;
- break;
- case PlayerRealmData.RealmHelpType.High:
- addtionValue1 += model.GetRealmHelperAttr(data.type, 0) / 100;
- addtionValue2 += model.GetRealmHelperAttr(data.type, 1);
- break;
- }
- helpCtrl.AddCell(ScrollerDataType.Header, i);
- }
- helpCtrl.Restart();
- if (list.Count > 2)
- {
- helpCtrl.JumpIndex(-GetHeight() - 10, 0.3f, EnhancedScroller.TweenType.linear);
- }
-
- addtionValue1 = Mathf.Min(addtionValue1, model.realmHoleLimit / 100);
- if (addtionValue1 >= model.realmHoleLimit / 100)
- {
- surplusTime = 0;
- hasInspire = false;
- inspireBtnText.text = Language.Get("RealmWin_Bewrite_18");
- inspireBtn.interactable = false;
- }
- else
- {
- inspireBtn.interactable = true;
- RefreshInspireBtnText();
- }
-
- additionAttr1.text = StringUtility.Contact(Language.Get("RealmWin_Bewrite_44"), "<color=#109d06>", addtionValue1, "%", "</color>");
- additionAttr2.text = StringUtility.Contact(Language.Get("RealmWin_Bewrite_21"), "<color=#109d06>", addtionValue2, "</color>");
-
- additionTip1.text = Language.Get("RealmWin_Bewrite_23", model.realmHoleLimit / 100);
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- }
-
- protected override void OnAfterClose()
- {
- PlayerRealmData.OnRefreshHelpInfo -= OnRefreshHelpInfo;
- }
-
- protected override void LateUpdate()
- {
- if (hasInspire)
- {
- m_Time += Time.deltaTime;
- int _surplus = Mathf.CeilToInt(model.realmInspireCoolDownTime - m_Time);
- _surplus = Mathf.Max(_surplus, 0);
- if (_surplus != surplusTime)
- {
- surplusTime = _surplus;
- RefreshInspireBtnText();
- }
- if (m_Time >= model.realmInspireCoolDownTime)
- {
- hasInspire = false;
- m_Time = 0;
- }
- }
- }
- #endregion
-
- private void InitData()
- {
- RefreshInspireBtnText();
- OnRefreshHelpInfo();
- }
-
- private void RefreshInspireBtnText()
- {
- if (surplusTime == 0)
- {
- inspireBtnText.text = Language.Get("RealmWin_Bewrite_16");
- }
- else
- {
- inspireBtnText.text = Language.Get("RealmWin_Bewrite_17", surplusTime);
- }
- }
-
- }
-
-}
-
-
-
-
diff --git a/System/Realm/RealmDungeonWin.cs.meta b/System/Realm/RealmDungeonWin.cs.meta
deleted file mode 100644
index 6657d16..0000000
--- a/System/Realm/RealmDungeonWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ae3249b4ccc1c664799c023ba1a8221c
-timeCreated: 1507721487
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmModel.cs b/System/Realm/RealmModel.cs
new file mode 100644
index 0000000..19ea639
--- /dev/null
+++ b/System/Realm/RealmModel.cs
@@ -0,0 +1,50 @@
+锘縰sing LitJson;
+using Snxxz.UI;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEngine;
+namespace Snxxz.UI
+{
+ public class RealmModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
+ {
+
+ public int realmMaxLevel { get; private set; }
+
+ public const int REALM_DUNGEON_ID = 31110;
+
+ public readonly Redpoint redpoint = new Redpoint(114, 11401);
+
+ public override void Init()
+ {
+ ParseConfig();
+ }
+
+ public void OnBeforePlayerDataInitialize()
+ {
+ }
+
+ public void OnPlayerLoginOk()
+ {
+ }
+
+ public override void UnInit()
+ {
+ }
+
+ void ParseConfig()
+ {
+ realmMaxLevel = 0;
+ var configs = RealmConfig.GetValues();
+ foreach (var config in configs)
+ {
+ if (config.Lv > realmMaxLevel)
+ {
+ realmMaxLevel = config.Lv;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Core/GameEngine/Model/Player/Realm/RealmModel.cs.meta b/System/Realm/RealmModel.cs.meta
similarity index 99%
rename from Core/GameEngine/Model/Player/Realm/RealmModel.cs.meta
rename to System/Realm/RealmModel.cs.meta
index 8e768e2..f308a07 100644
--- a/Core/GameEngine/Model/Player/Realm/RealmModel.cs.meta
+++ b/System/Realm/RealmModel.cs.meta
@@ -1,12 +1,12 @@
-fileFormatVersion: 2
-guid: 4839d4a757dc0ae4b9330fff398a4846
-timeCreated: 1507905919
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
+fileFormatVersion: 2
+guid: 4839d4a757dc0ae4b9330fff398a4846
+timeCreated: 1507905919
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/Realm/RealmPracticeModel.cs b/System/Realm/RealmPracticeModel.cs
deleted file mode 100644
index f63a76c..0000000
--- a/System/Realm/RealmPracticeModel.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-using Snxxz.UI;
-using System.Linq;
-using UnityEngine;
-using System.Text;
-
-[XLua.LuaCallCSharp]
- public class RealmPracticeModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
-{
- private Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> OpenRealmPraDict = new Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>>();
- private SuccessConfig _tagAchievementModel = null;
- private ItemConfig _tagChinItemModel = null;
- private FuncOpenLVConfig _tagFuncOpenModel = null;
-
- AchievementModel _achieveModel;
- public AchievementModel AchieveModel
- {
- get
- {
- return _achieveModel ?? (_achieveModel = ModelCenter.Instance.GetModel<AchievementModel>());
- }
- }
-
- public const string PLAYERLV_KEY = "PlayerID";
-
- public override void Init()
- {
- SetRealmFirstTypeRedPoint();
- SetRealmSecondTypeRedPoint();
- SetPracTaskRedPoint();
- }
-
- public void OnBeforePlayerDataInitialize()
- {
- _tagAchievementModel = null;
- _tagChinItemModel = null;
- _tagFuncOpenModel = null;
-
- FuncOpen.Instance.OnFuncStateChangeEvent -= RefreshFuncOpenState;
- AchieveModel.achievementProgressUpdateEvent -= RefreshAchieveState;
- AchieveModel.achievementCompletedEvent -= RefreshAchieveState;
- }
-
- public void OnAfterPlayerDataInitialize()
- {
-
- }
-
-
- public void OnPlayerLoginOk()
- {
- RefreshFuncOpenState((int)FuncOpenEnum.Realm);
- FuncOpen.Instance.OnFuncStateChangeEvent += RefreshFuncOpenState;
- AchieveModel.achievementProgressUpdateEvent += RefreshAchieveState;
- AchieveModel.achievementCompletedEvent += RefreshAchieveState;
- }
-
- public override void UnInit()
- {
-
- }
-
- private void RefreshFuncOpenState(int funcId)
- {
- if(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm))
- {
- RefreshOpenPracModel();
- }
-
- if (funcId != (int)FuncOpenEnum.Realm) return;
-
- RealmTypeRedPointCtrl();
- }
-
- public void RefreshOpenPracModel()
- {
- OpenRealmPraDict.Clear();
- Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> realmPraDict = RealmPracticeConfig.GetRealmPraDict();
- foreach(var first in realmPraDict.Keys)
- {
- Dictionary<int, List<RealmPracticeConfig>> secondDict = new Dictionary<int, List<RealmPracticeConfig>>();
- OpenRealmPraDict.Add(first,secondDict);
- foreach(var second in realmPraDict[first].Keys)
- {
- List<RealmPracticeConfig> praclist = realmPraDict[first][second];
- for(int i = 0; i < praclist.Count; i++)
- {
- if(!secondDict.ContainsKey(second))
- {
- List<RealmPracticeConfig> list = new List<RealmPracticeConfig>();
- list.Add(praclist[i]);
- if(praclist[i].FunctionID == 0)
- {
- secondDict.Add(second,list);
- }
- else
- {
- if (FuncOpen.Instance.IsFuncOpen(praclist[i].FunctionID))
- {
- secondDict.Add(second, list);
- }
- }
- }
- else
- {
- if (praclist[i].FunctionID == 0)
- {
- secondDict[second].Add(praclist[i]);
- }
- else
- {
- if (FuncOpen.Instance.IsFuncOpen(praclist[i].FunctionID))
- {
- secondDict[second].Add(praclist[i]);
- }
- }
-
- }
- }
- }
- }
- }
-
- private List<RealmPracticeConfig> GetOpenRealmPralist(int firstType,int secondType)
- {
- if(OpenRealmPraDict.ContainsKey(firstType))
- {
- if(OpenRealmPraDict[firstType].ContainsKey(secondType))
- {
- return OpenRealmPraDict[firstType][secondType];
- }
- }
- return null;
- }
-
- public Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> GetAllOpenRealmPra()
- {
- return OpenRealmPraDict;
- }
-
- private List<RealmPracticeConfig> orderlist = new List<RealmPracticeConfig>();
- private List<RealmPracticeConfig> OpenPraclist;
- public List<RealmPracticeConfig> GetRealmPracticelist(int firstType,int secondType)
- {
- orderlist.Clear();
- OpenPraclist = GetOpenRealmPralist(firstType,secondType);
- if (OpenPraclist == null) return orderlist;
-
- orderlist.AddRange(OpenPraclist);
- orderlist.Sort(CompareTaskState);
- return orderlist;
- }
-
- private int CompareTaskState(RealmPracticeConfig start, RealmPracticeConfig next)
- {
- Achievement startAchieve = null;
- SetAchievement(start.AchieveID, out startAchieve);
- Achievement nextAchieve = null;
- SetAchievement(next.AchieveID, out nextAchieve);
-
- bool x = IsReach(startAchieve);
- bool y = IsReach(nextAchieve);
- if (x.CompareTo(y) != 0) return -x.CompareTo(y);
-
- x = IsCompleted(startAchieve);
- y = IsCompleted(nextAchieve);
- if (x.CompareTo(y) != 0) return x.CompareTo(y);
-
- int orderx = OpenPraclist.IndexOf(start);
- int ordery = OpenPraclist.IndexOf(next);
- if (orderx.CompareTo(ordery) != 0)
- return orderx.CompareTo(ordery);
-
- return 0;
- }
-
- private bool IsReach(Achievement achieve)
- {
- bool isReach = false;
- if(!achieve.completed)
- {
- if(Achievement.IsReach(achieve.id, achieve.progress))
- {
- isReach = true;
- }
- }
- return isReach;
- }
-
- private bool IsCompleted(Achievement achieve)
- {
- return achieve.completed;
- }
-
- public SuccessConfig GetTagSuccessModel(int achievementId)
- {
- _tagAchievementModel = SuccessConfig.Get(achievementId);
- if (_tagAchievementModel != null)
- return _tagAchievementModel;
- else
- return null;
-
- }
-
-
- public ItemConfig GeTagChinItemModel(int Id)
- {
- _tagChinItemModel = ItemConfig.Get(Id);
- if (_tagChinItemModel != null)
- return _tagChinItemModel;
- else
- return null;
-
- }
- public int SetAchievement(int[] idlist,out Achievement achieve)
- {
- achieve = null;
- int k = 0;
- for (k = 0; k < idlist.Length; k++)
- {
- if (AchieveModel.TryGetAchievement(idlist[k], out achieve))
- {
- if (!achieve.completed)
- {
- return k;
- }
- else
- {
- if (idlist[idlist.Length - 1] == achieve.id)
- {
- return idlist.Length;
- }
- }
- }
- }
- return -1;
-
- }
-
- private StringBuilder _pointStr = new StringBuilder();
-
- public string GetPracticePointStr(int firstType,int secondType = 0)
- {
- _pointStr.Length = 0;
- string s = "";
- List<RealmPracticeConfig> typelist = GetOpenRealmPralist(firstType,secondType);
- List<RealmPracticeConfig> alllist = RealmPracticeConfig.GetRealmPraAchieveBySecondType(firstType,secondType);
- if (typelist != null)
- {
- if (secondType != 0)
- {
- s = alllist[0].SecondTypeName;
- _pointStr.AppendFormat("<Img img={0}/>{1}/{2}", "Money_Type_13", UIHelper.ReplaceLargeNum(GetRealmPraPointByType(firstType, secondType, false)), UIHelper.ReplaceLargeNum(GetRealmPraPointByType(firstType,secondType)));
- s = StringUtility.Contact(s, "\n", "(", _pointStr.ToString(), ")");
- }
- else
- {
- s = alllist[0].FirstTypeName;
- }
- }
- else
- {
- alllist = RealmPracticeConfig.GetRealmPraAchieveBySecondType(firstType,1);
- s = alllist[0].FirstTypeName;
- }
- return s;
-
- }
-
- public int GetRealmPraPointByType(int firstType,int secondType = 0,bool isSumRealmPraPoint = true)
- {
- if (!OpenRealmPraDict.ContainsKey(firstType)) return 0;
-
- int sumPoint = 0;
- Dictionary<int, List<RealmPracticeConfig>> secondDict = OpenRealmPraDict[firstType];
-
- if(secondType == 0)
- {
- foreach (var second in secondDict.Keys)
- {
- for (int i = 0; i < secondDict[second].Count; i++)
- {
- RealmPracticeConfig config = secondDict[second][i];
- sumPoint += GetAchieveRealmPraPoint(config,isSumRealmPraPoint);
- }
- }
- }
- else
- {
- if(secondDict.ContainsKey(secondType))
- {
- for (int i = 0; i < secondDict[secondType].Count; i++)
- {
- RealmPracticeConfig config = secondDict[secondType][i];
- sumPoint += GetAchieveRealmPraPoint(config,isSumRealmPraPoint);
- }
- }
- }
-
- return sumPoint;
- }
-
- private int GetAchieveRealmPraPoint(RealmPracticeConfig config,bool isSumRealmPraPoint)
- {
- if (config == null) return 0;
-
- int[] idlist = config.AchieveID;
- int realmPraPoint = 0;
- for (int j = 0; j < idlist.Length; j++)
- {
- Achievement achieve = null;
- AchieveModel.TryGetAchievement(idlist[j], out achieve);
- if (achieve != null)
- {
- if(isSumRealmPraPoint)
- {
- int k = 0;
- for (k = 0; k < achieve.rewardCurrency.Length; k++)
- {
- if (achieve.rewardCurrency[k].id == 13)
- {
- realmPraPoint += achieve.rewardCurrency[k].count;
- }
- }
- }
- else
- {
- if (achieve.completed)
- {
- int k = 0;
- for (k = 0; k < achieve.rewardCurrency.Length; k++)
- {
- if (achieve.rewardCurrency[k].id == 13)
- {
- realmPraPoint += achieve.rewardCurrency[k].count;
- }
- }
- }
- }
-
- }
- }
- return realmPraPoint;
- }
-
- #region 绾㈢偣閫昏緫
- public const int REALMREDPOINT_KEY = 114;
- public const int REALMPRAFUNCREDPOINT_KEY = 11402;
- public Redpoint realmPraRedPoint = new Redpoint(REALMREDPOINT_KEY, REALMPRAFUNCREDPOINT_KEY);
-
- public Dictionary<int,Redpoint> realmFirstTypeDict { get;private set; }
- private void SetRealmFirstTypeRedPoint()
- {
- realmFirstTypeDict = null;
- Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> realmPraDict = RealmPracticeConfig.GetRealmPraDict();
- realmFirstTypeDict = new Dictionary<int, Redpoint>();
- int i = 0;
- foreach(var type in realmPraDict.Keys)
- {
- int id = REALMPRAFUNCREDPOINT_KEY * 100 + i;
- Redpoint redpoint = new Redpoint(REALMPRAFUNCREDPOINT_KEY, id);
- realmFirstTypeDict.Add(type, redpoint);
- i += 1;
- }
- }
- public Dictionary<int, Dictionary<int, Redpoint>> realmSecondTypeDict { get; private set; }
- private void SetRealmSecondTypeRedPoint()
- {
- realmSecondTypeDict = null;
- Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> realmPraDict = RealmPracticeConfig.GetRealmPraDict();
- realmSecondTypeDict = new Dictionary<int, Dictionary<int, Redpoint>>();
- int i = 0;
- foreach (var type in realmPraDict.Keys)
- {
- Dictionary<int, Redpoint> secondRedDict = new Dictionary<int, Redpoint>();
- realmSecondTypeDict.Add(type,secondRedDict);
- foreach (var second in realmPraDict[type].Keys)
- {
- if(second != 0)
- {
- int id = realmFirstTypeDict[type].id * 100 + i;
- Redpoint redpoint = new Redpoint(realmFirstTypeDict[type].id, id);
- secondRedDict.Add(second, redpoint);
- i += 1;
- }
- }
- }
- }
-
-
- private Dictionary<int, Redpoint> PracTaskRedPointDict = new Dictionary<int, Redpoint>(); //id 娴佹按鍙�
- private void SetPracTaskRedPoint()
- {
- PracTaskRedPointDict.Clear();
- Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> realmPraDict = RealmPracticeConfig.GetRealmPraDict();
- foreach(var first in realmPraDict.Keys)
- {
- foreach(var second in realmPraDict[first].Keys)
- {
- List<RealmPracticeConfig> pralist = realmPraDict[first][second];
- Redpoint redpointType;
- if(second != 0)
- {
- redpointType = realmSecondTypeDict[first][second];
- }
- else
- {
- redpointType = realmFirstTypeDict[first];
- }
- for (int i = 0; i < pralist.Count; i++)
- {
- int id = redpointType.id * 10000 + i;
- Redpoint redpoint = new Redpoint(redpointType.id, id);
- if (!PracTaskRedPointDict.ContainsKey(pralist[i].ID))
- {
- PracTaskRedPointDict.Add(pralist[i].ID, redpoint);
- }
- }
- }
- }
- }
-
- public void RealmTypeRedPointCtrl()
- {
- if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm)) return;
-
- foreach(var first in OpenRealmPraDict.Keys)
- {
- foreach(var second in OpenRealmPraDict[first].Keys)
- {
- List<RealmPracticeConfig> praclist = OpenRealmPraDict[first][second];
- for (int j = 0; j < praclist.Count; j++)
- {
- Achievement achieve = null;
- SetAchievement(praclist[j].AchieveID, out achieve);
- if (IsReachAchieve(achieve))
- {
- if (PracTaskRedPointDict[praclist[j].ID].state != RedPointState.Simple)
- {
- PracTaskRedPointDict[praclist[j].ID].state = RedPointState.Simple;
- }
- }
- else
- {
- if (PracTaskRedPointDict[praclist[j].ID].state != RedPointState.None)
- {
- PracTaskRedPointDict[praclist[j].ID].state = RedPointState.None;
- }
- }
-
- }
- }
- }
- }
-
- public void RefreshAchieveState(int id)
- {
- if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm)) return;
-
- SuccessConfig successConfig = SuccessConfig.Get(id);
- if (successConfig != null)
- {
- RealmPracticeConfig practiceConfig = RealmPracticeConfig.Get(successConfig.RealmPracticeID);
- if (practiceConfig == null) return;
-
- if(OpenRealmPraDict.ContainsKey(practiceConfig.Type))
- {
- if(OpenRealmPraDict[practiceConfig.Type].ContainsKey(practiceConfig.SecondType))
- {
- Achievement achieve = null;
- SetAchievement(practiceConfig.AchieveID, out achieve);
-
- if (IsReachAchieve(achieve))
- {
- if (PracTaskRedPointDict[successConfig.RealmPracticeID].state != RedPointState.Simple)
- {
- PracTaskRedPointDict[successConfig.RealmPracticeID].state = RedPointState.Simple;
- }
- }
- else
- {
- if (PracTaskRedPointDict[successConfig.RealmPracticeID].state != RedPointState.None)
- {
- PracTaskRedPointDict[successConfig.RealmPracticeID].state = RedPointState.None;
- }
- }
- }
- }
- }
- }
-
-
- public bool IsReachAchieve(Achievement achieve)
- {
- if (achieve == null) return false;
- bool isReach = false;
-
- if(!achieve.completed)
- {
- if (Achievement.IsReach(achieve.id, achieve.progress))
- {
- isReach = true;
- }
- }
- return isReach;
- }
- #endregion
-
-}
diff --git a/System/Realm/RealmPracticeModel.cs.meta b/System/Realm/RealmPracticeModel.cs.meta
deleted file mode 100644
index d8ec1e5..0000000
--- a/System/Realm/RealmPracticeModel.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: aa97193a6daa03d45b687a54bd671c38
-timeCreated: 1508144961
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmPracticeWin.cs b/System/Realm/RealmPracticeWin.cs
deleted file mode 100644
index ca70f92..0000000
--- a/System/Realm/RealmPracticeWin.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Saturday, October 14, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Linq;
-
-namespace Snxxz.UI {
-
- public class RealmPracticeWin : Window
- {
- private ScrollerController _practiceTypeCtrl;
- private ScrollerController _taskTypeCtrl;
- private Text _curPracticePointText;
- private Text _nextRealmPointText;
- private RealmConfig _tagRealmModel;
- RealmPracticeModel practiceModel { get { return ModelCenter.Instance.GetModel<RealmPracticeModel>(); } }
- Dictionary<int, Dictionary<int, List<RealmPracticeConfig>>> realmPraDict;
- private int selectFirstType = 0;
- private int selectSecondType = 0;
- private bool isOpen = true;
- #region Built-in
- protected override void BindController()
- {
- _practiceTypeCtrl = transform.Find("PracticeTypeCtrl").GetComponent<ScrollerController>();
- _taskTypeCtrl = transform.Find("TaskTypeCtrl").GetComponent<ScrollerController>();
- _curPracticePointText = transform.Find("NowNumImg/PointValue").GetComponent<Text>();
- _nextRealmPointText = transform.Find("NowNumImg/PointValue/TipsText").GetComponent<Text>();
- _taskTypeCtrl.lockType = EnhanceLockType.KeepVertical;
-
- }
-
- protected override void AddListeners()
- {
-
- }
-
- protected override void OnPreOpen()
- {
- isOpen = true;
- _practiceTypeCtrl.OnRefreshCell += RefreshPracticeTypeCell;
- _taskTypeCtrl.OnRefreshCell += RefreshTaskTypeCell;
- practiceModel.AchieveModel.achievementAwardableEvent += RefreshIsReach;
- practiceModel.AchieveModel.achievementCompletedEvent += RefreshComplete;
- PlayerDatas.Instance.playerDataRefreshEvent += RefreshRealmPoint;
- realmPraDict = practiceModel.GetAllOpenRealmPra();
- if(realmPraDict.Count > 0)
- {
- selectFirstType = realmPraDict.Keys.ToList()[0];
- }
- if (AchievementGoto.guideAchievementId != 0)
- {
- SuccessConfig config = SuccessConfig.Get(AchievementGoto.guideAchievementId);
- if (config.Type == 114)
- {
- bool isAchieveReach = false;
- foreach(var first in practiceModel.realmFirstTypeDict.Keys)
- {
- if(practiceModel.realmFirstTypeDict[first].state == RedPointState.Simple)
- {
- isAchieveReach = true;
- selectFirstType = first;
- }
-
- foreach(var second in practiceModel.realmSecondTypeDict[first].Keys)
- {
- if(practiceModel.realmSecondTypeDict[first][second].state == RedPointState.Simple)
- {
- selectSecondType = second;
- break;
- }
- }
-
- if(isAchieveReach)
- {
- break;
- }
- }
-
- if(!isAchieveReach)
- {
- ServerTipDetails.DisplayNormalTip(Language.Get("RealmWin_Practice_1"));
- }
- AchievementGoto.guideAchievementId = 0;
- }
- }
-
- InitUI();
- }
-
- protected override void OnAfterOpen()
- {
- _taskTypeCtrl.vertical = true;
- _practiceTypeCtrl.mScrollRect.verticalNormalizedPosition = 1;
- _taskTypeCtrl.mScrollRect.verticalNormalizedPosition = 1;
- }
-
- protected override void OnPreClose()
- {
- }
-
- protected override void OnAfterClose()
- {
- _practiceTypeCtrl.OnRefreshCell -= RefreshPracticeTypeCell;
- PlayerDatas.Instance.playerDataRefreshEvent -= RefreshRealmPoint;
- _taskTypeCtrl.OnRefreshCell -= RefreshTaskTypeCell;
- practiceModel.AchieveModel.achievementCompletedEvent -= RefreshComplete;
- practiceModel.AchieveModel.achievementAwardableEvent -= RefreshIsReach;
- }
- #endregion
-
- public void InitUI()
- {
- OnClickFirstTypeCell(selectFirstType);
- RefreshUI();
- isOpen = false;
- }
-
-
- private void RefreshComplete(int id)
- {
- SuccessConfig successConfig = SuccessConfig.Get(id);
- RealmPracticeConfig practiceConfig = RealmPracticeConfig.Get(successConfig.RealmPracticeID);
-
- if (practiceConfig != null && PracticeModellist != null)
- {
- if(PracticeModellist.Contains(practiceConfig))
- {
- PracticeModellist = practiceModel.GetRealmPracticelist(selectFirstType,selectSecondType);
- _practiceTypeCtrl.m_Scorller.RefreshActiveCellViews();
- _taskTypeCtrl.m_Scorller.RefreshActiveCellViews();
- }
- }
- }
-
- private void RefreshIsReach(int id)
- {
- SuccessConfig successConfig = SuccessConfig.Get(id);
- RealmPracticeConfig practiceConfig = RealmPracticeConfig.Get(successConfig.RealmPracticeID);
-
- if (practiceConfig != null && PracticeModellist != null)
- {
- if (PracticeModellist.Contains(practiceConfig))
- {
- PracticeModellist = practiceModel.GetRealmPracticelist(selectFirstType, selectSecondType);
- _practiceTypeCtrl.m_Scorller.RefreshActiveCellViews();
- _taskTypeCtrl.m_Scorller.RefreshActiveCellViews();
- }
- }
- }
-
- private void RefreshRealmPoint(PlayerDataType type)
- {
- if (type != PlayerDataType.RealmPoint) return;
-
- RefreshUI();
- }
-
- public void RefreshUI()
- {
- _curPracticePointText.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.extersion.realmPoint);
- _tagRealmModel = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (_tagRealmModel != null)
- {
- _nextRealmPointText.text = Language.Get("RealmPractice101").Replace("{0}",UIHelper.ReplaceLargeNum(_tagRealmModel.NeedPoint));
- }
- }
-
- private void CreatePracticeTypeCell()
- {
- _practiceTypeCtrl.Refresh();
- foreach (var first in realmPraDict.Keys)
- {
- _practiceTypeCtrl.AddCell(ScrollerDataType.Header, first);
- if (selectFirstType == first && !isDoubleClick)
- {
- foreach (var second in realmPraDict[first].Keys)
- {
- if (second != 0)
- {
- _practiceTypeCtrl.AddCell(ScrollerDataType.Normal, second);
- }
- }
- }
- }
- _practiceTypeCtrl.Restart();
- DebugEx.Log("Cell鏁伴噺" + _practiceTypeCtrl.GetNumberOfCells(_practiceTypeCtrl.m_Scorller));
- if (_practiceTypeCtrl.GetNumberOfCells(_practiceTypeCtrl.m_Scorller) < _practiceTypeCtrl.maxCellCnt)
- {
- _practiceTypeCtrl.mScrollRect.vertical = false;
- }
- else
- {
- _practiceTypeCtrl.mScrollRect.vertical = true;
- }
- }
-
- private void RefreshPracticeTypeCell(ScrollerDataType type, CellView cell)
- {
- switch (type)
- {
- case ScrollerDataType.Header:
- PracticeTypeCell firstType = cell.GetComponent<PracticeTypeCell>();
- firstType.Init(cell.index,selectFirstType,isDoubleClick);
- firstType.cellBtn.RemoveAllListeners();
- firstType.cellBtn.AddListener(() => { OnClickFirstTypeCell(cell.index); });
- break;
- case ScrollerDataType.Normal:
- SecondPraTypeCell secondType = cell.GetComponent<SecondPraTypeCell>();
- secondType.Init(selectFirstType,cell.index,selectSecondType);
- secondType.cellBtn.RemoveAllListeners();
- secondType.cellBtn.AddListener(() => { OnClickSecondTypeCell(cell.index); });
- break;
- }
- }
-
- private bool isDoubleClick = false;
- private void OnClickFirstTypeCell(int firstType)
- {
- if (!isOpen)
- {
- if (selectFirstType == firstType)
- {
- if(!isDoubleClick)
- {
- isDoubleClick = true;
- }
- else
- {
- isDoubleClick = false;
- }
- CreatePracticeTypeCell();
- if (!realmPraDict[firstType].ContainsKey(selectSecondType))
- {
- selectSecondType = realmPraDict[firstType].Keys.ToList()[0];
- }
- CreateTaskTypeCell();
- return;
- }
-
- }
- isDoubleClick = false;
- selectFirstType = firstType;
- selectSecondType = realmPraDict[firstType].Keys.ToList()[0];
- CreatePracticeTypeCell();
- CreateTaskTypeCell();
- }
-
- private void OnClickSecondTypeCell(int secondType)
- {
- selectSecondType = secondType;
- _practiceTypeCtrl.m_Scorller.RefreshActiveCellViews();
- CreateTaskTypeCell();
- }
-
- private List<RealmPracticeConfig> PracticeModellist;
- private void CreateTaskTypeCell()
- {
- _taskTypeCtrl.Refresh();
- PracticeModellist = practiceModel.GetRealmPracticelist(selectFirstType,selectSecondType);
- for (int i = 0; i < PracticeModellist.Count; i++)
- {
- _taskTypeCtrl.AddCell(ScrollerDataType.Header, i);
-
- }
- _taskTypeCtrl.Restart();
- if (PracticeModellist.Count < _taskTypeCtrl.maxCellCnt)
- _taskTypeCtrl.mScrollRect.vertical = false;
-
- }
-
- private void RefreshTaskTypeCell(ScrollerDataType type, CellView cell)
- {
- TaskTypeCell taskTypeCell = cell.GetComponent<TaskTypeCell>();
- taskTypeCell.InitModel(PracticeModellist[cell.index]);
- }
-
- private void OnClickReceiveReward(int id)
- {
-
- practiceModel.AchieveModel.GetAchievementReward(id);
- }
- }
-
-}
-
-
-
-
diff --git a/System/Realm/RealmPracticeWin.cs.meta b/System/Realm/RealmPracticeWin.cs.meta
deleted file mode 100644
index 2404f30..0000000
--- a/System/Realm/RealmPracticeWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: dec619385428f924b85a10c8d03f6e4a
-timeCreated: 1507944761
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmProgressBehaviour.cs b/System/Realm/RealmProgressBehaviour.cs
deleted file mode 100644
index 21fade2..0000000
--- a/System/Realm/RealmProgressBehaviour.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class RealmProgressBehaviour : MonoBehaviour
- {
- [SerializeField] RealmStageBehaviour[] m_RealmStages;
- [SerializeField] SmoothSlider m_ItemSlider;
- [SerializeField] Text m_RealmPoint;
- [SerializeField] Text m_OpenRemind;
- [SerializeField] RectTransform m_ContainerPoint;
- [SerializeField] float m_StartRealmPositionx;
- [SerializeField] float m_EndRealmPositionx;
- [SerializeField] float m_BigRealmBottomWidth;
- [SerializeField] float m_Spacing;
-
- [SerializeField] RectTransform m_ContainerRemind;
- [SerializeField] PropertyBehaviour m_SpecialProperty;
- [SerializeField] Text m_HurtRemind;
-
- RealmModel model { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }
-
- static readonly Vector2 middleLeft = new Vector2(0, 0.5f);
- static readonly Vector2 middleRight = new Vector2(1, 0.5f);
- static readonly Vector2 middleCenter = new Vector2(0.5f, 0.5f);
-
- float leftRatio = 0f;
- float rightRatio = 0;
-
- public void Display()
- {
- DisplayStages();
- DisplayProgress();
- }
-
- void DisplayStages()
- {
- var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
- int start = 0; int end = 0;
- model.TryGetRealmStage(realmLevel, out start, out end);
- var index = 0;
-
- m_ContainerRemind.gameObject.SetActive(false);
-
- for (int i = start; i <= realmLevel; i++)
- {
- var rect = m_RealmStages[index].transform as RectTransform;
- rect.anchorMax = middleLeft;
- rect.anchorMin = middleLeft;
- rect.pivot = middleLeft;
- if (i == start)
- {
- rect.anchoredPosition = new Vector2(m_StartRealmPositionx, 0);
- leftRatio = (m_StartRealmPositionx + m_RealmStages[0].GetWidth(i)) / m_ContainerPoint.rect.width;
- }
- else
- {
- var width = 0f;
- for (int k = start; k < i; k++)
- {
- width += m_RealmStages[0].GetWidth(k);
- width += m_Spacing;
- }
- var positionx = m_StartRealmPositionx + width;
- rect.anchoredPosition = new Vector2(positionx, 0);
- if (i == realmLevel)
- {
- leftRatio = (positionx + m_RealmStages[0].GetWidth(i)) / m_ContainerPoint.rect.width;
- }
- }
- m_RealmStages[index].gameObject.SetActive(true);
- m_RealmStages[index].Display(i, false);
- index++;
- }
- end = end == model.realmMaxLevel ? end : (end + 1);
- for (int i = end; i > realmLevel; i--)
- {
- var rect = m_RealmStages[index].transform as RectTransform;
- rect.anchorMax = middleRight;
- rect.anchorMin = middleRight;
- if (i == end)
- {
- rect.pivot = middleCenter;
- rect.anchoredPosition = new Vector2(m_EndRealmPositionx, 0);
- rightRatio = Mathf.Abs(m_EndRealmPositionx - m_BigRealmBottomWidth / 2 + 30) / m_ContainerPoint.rect.width;
- }
- else
- {
- var width = 0f;
- for (int k = end - 1; k > i; k--)
- {
- width += m_RealmStages[0].GetWidth(k);
- width += m_Spacing;
- }
- rect.pivot = middleRight;
- var positionx = m_EndRealmPositionx - m_BigRealmBottomWidth / 2 - m_Spacing - width;
- rect.anchoredPosition = new Vector2(positionx, 0);
- if (i == realmLevel + 1)
- {
- rightRatio = (Mathf.Abs(positionx) + m_RealmStages[0].GetWidth(i)) / m_ContainerPoint.rect.width;
- }
- }
- m_RealmStages[index].gameObject.SetActive(true);
- m_RealmStages[index].Display(i, i == end);
- DisplayRemind(i);
- index++;
- }
- for (int i = index; i < m_RealmStages.Length; i++)
- {
- m_RealmStages[i].gameObject.SetActive(false);
- }
- }
-
- public void DisplayProgress(bool anim = false)
- {
- var deltaRatio = 1 - leftRatio - rightRatio;
- var realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- var progress = leftRatio + deltaRatio * (Mathf.Min((float)realmPoint / config.NeedPoint, 1));
- m_ItemSlider.delay = anim ? 0.2f : 0f;
- m_ItemSlider.value = progress;
-
- m_RealmPoint.transform.localPosition = m_RealmPoint.transform.localPosition.SetX(m_ContainerPoint.rect.width * (leftRatio + deltaRatio * 0.5f));
- m_RealmPoint.text = StringUtility.Contact(UIHelper.AppendStringColor(realmPoint >= config.NeedPoint ? TextColType.Green : TextColType.Red,
- realmPoint.ToString()), "/", config.NeedPoint);
-
- m_OpenRemind.text = realmPoint < config.NeedPoint ?
- UIHelper.ReplaceNewLine(Language.Get("RealmCollectingTab", config.NeedPoint - realmPoint)) : string.Empty;
- m_OpenRemind.transform.localPosition = m_OpenRemind.transform.localPosition.SetX(m_ContainerPoint.rect.width * (leftRatio + deltaRatio * 0.5f));
- }
-
- public void DisplayRemind(int _realmLv)
- {
- var config = RealmConfig.Get(_realmLv);
- if (config.specialProperty != 0)
- {
- m_ContainerRemind.gameObject.SetActive(true);
- var index = 0;
- for (int i = 0; i < config.AddAttrType.Length; i++)
- {
- if (config.AddAttrType[i] == config.specialProperty)
- {
- index = i;
- break;
- }
- }
- m_SpecialProperty.DisplayColon(config.specialProperty, config.AddAttrNum[index]);
- m_HurtRemind.text = UIHelper.ReplaceNewLine(Language.Get("RealmSuppressHurt", UIHelper.GetRealmName(config.Lv), (float)model.realmSuppressHurt / 100));
- }
- }
- }
-}
-
diff --git a/System/Realm/RealmProgressBehaviour.cs.meta b/System/Realm/RealmProgressBehaviour.cs.meta
deleted file mode 100644
index 8c80546..0000000
--- a/System/Realm/RealmProgressBehaviour.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 4e6a16e9d528c1b49a9bda1476e3d389
-timeCreated: 1533278099
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmUpHoldWin.cs b/System/Realm/RealmUpHoldWin.cs
deleted file mode 100644
index 463d777..0000000
--- a/System/Realm/RealmUpHoldWin.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, October 11, 2017
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
-
- public class RealmUpHoldWin : Window
- {
- [SerializeField] Image m_PlayerIcon;
- [SerializeField] Text m_AddValue;
- [SerializeField] Text m_Desc;
- [SerializeField] Button m_HoldBtn;
- [SerializeField] Text m_HoldBtnTxt;
- [SerializeField] Button m_CloseBtn;
-
- DateTime displayTime = DateTime.Now;
-
- RealmModel m_Model;
- RealmModel model
- {
- get
- {
- return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<RealmModel>());
- }
- }
- #region Built-in
- protected override void BindController()
- {
- }
-
- protected override void AddListeners()
- {
- m_CloseBtn.onClick.AddListener(OnCloseBtn);
- m_HoldBtn.onClick.AddListener(OnHoldBtn);
- }
-
- private void OnHoldBtn()
- {
- if (PlayerDatas.Instance.realm.holdDataList.Count > 0)
- {
- RealmHoldData data = PlayerDatas.Instance.realm.holdDataList[0];
- if (data.AtkAdd < model.realmHoleLimit)
- {
- CA902_tagCGRealmFBHelp holdpack = new CA902_tagCGRealmFBHelp();
- holdpack.PlayerID = data.PlayerID;
- GameNetSystem.Instance.SendInfo(holdpack);
- }
- else
- {
- ServerTipDetails.DisplayNormalTip(Language.Get("RealmWin_Bewrite_8"));
- }
- }
- OnCloseBtn();
- }
-
- private void OnCloseBtn()
- {
- PlayerDatas.Instance.realm.RemoveHoldData();
- if (PlayerDatas.Instance.realm.holdDataList.Count > 0)
- {
- InitData();
- }
- else
- {
- CloseImmediately();
- }
- }
-
- protected override void OnPreOpen()
- {
- PlayerRealmData.OnRefreshHoldData += OnRefreshHoldData;
- InitData();
- }
-
- private void OnRefreshHoldData()
- {
- InitData();
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- PlayerRealmData.OnRefreshHoldData -= OnRefreshHoldData;
- }
-
- protected override void OnAfterClose()
- {
- }
-
- protected override void LateUpdate()
- {
- base.LateUpdate();
- if ((DateTime.Now - displayTime).TotalSeconds >= model.realmGuardianDisplayTime)
- {
- OnCloseBtn();
- }
- }
- #endregion
-
- private void InitData()
- {
- if (PlayerDatas.Instance.realm.holdDataList.Count == 0)
- {
- return;
- }
- displayTime = DateTime.Now;
- RealmHoldData data = PlayerDatas.Instance.realm.holdDataList[0];
- m_AddValue.text = Language.Get("RealmWin_Bewrite_4", data.PlayerName);
- float _addValue = model.GetRealmHelperAttr(PlayerDatas.Instance.baseData.realmLevel > data.RealmLV ? 2 : 1, 0) / 100;
- m_Desc.text = Language.Get("RealmWin_Bewrite_5", _addValue);
- if (PlayerDatas.Instance.baseData.realmLevel > data.RealmLV)
- {
- m_HoldBtnTxt.text = Language.Get("RealmWin_Bewrite_7");
- }
- else
- {
- m_HoldBtnTxt.text = Language.Get("RealmWin_Bewrite_6");
- }
- m_PlayerIcon.SetSprite(GeneralDefine.GetJobHeadPortrait(data.Job, data.JobRank));
- }
-
- }
-
-}
-
-
-
-
diff --git a/System/Realm/RealmUpHoldWin.cs.meta b/System/Realm/RealmUpHoldWin.cs.meta
deleted file mode 100644
index e374b77..0000000
--- a/System/Realm/RealmUpHoldWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: cfe6f297be3a72741965f2cb25aa1ebb
-timeCreated: 1507726571
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/RealmUpWin.cs b/System/Realm/RealmUpWin.cs
index 9ffe383..35b469f 100644
--- a/System/Realm/RealmUpWin.cs
+++ b/System/Realm/RealmUpWin.cs
@@ -17,422 +17,34 @@
[XLua.Hotfix]
public class RealmUpWin : Window
{
- #region built-in
- [SerializeField] RectTransform m_ContainerNow;
- [SerializeField] RectTransform m_ContainerNowHasRealm;
- [SerializeField] RectTransform m_ContainerNext;
- [SerializeField] RectTransform m_ContainerProgress;
- [SerializeField] RectTransform m_ContainerModel;
-
- [SerializeField] RectTransform m_ContainerNoHighestBottom;
- [SerializeField] RectTransform m_ContainerHighestBottom;
-
- [SerializeField] Image m_RealmTitleNext;
- [SerializeField] RealmIcon m_RealmIconNow;
- [SerializeField] RealmIcon m_RealmIconNowHighest;
- [SerializeField] RealmIcon m_RealmIconNext;
- [SerializeField] RealmPropertyCell m_RealmPropertyNow;
- [SerializeField] RealmPropertyCell m_RealmPropertyNext;
-
- [SerializeField] RawImage m_RawBoss;
- [SerializeField] RawImage m_RawPlayer;
-
- [SerializeField] RealmProgressBehaviour m_RealmProgress;
-
- [SerializeField] UIEffect m_RealmDungeonSfx;
-
- [SerializeField] Button m_SingleDungeon;
- [SerializeField] Button m_FuncButton;
- [SerializeField] Text m_RealmStageTip;
-
- [SerializeField] RectTransform m_ContainerFightPower;
- [SerializeField] Text m_FightPower;
-
- [SerializeField] Button m_RealmPreview;
-
- [SerializeField, Header("Boss鍒濆鏈濆悜")] Vector3 direction = Vector3.zero;
- [SerializeField, Header("妯″瀷浣嶇疆")] Vector3[] m_ModelPositions;
- [SerializeField, Header("褰撳墠澧冪晫浣嶇疆")] Vector3[] m_RealmNowPositions;
- [SerializeField, Header("涓嬩竴澧冪晫浣嶇疆")] Vector3[] m_RealmNextwPositions;
- [SerializeField, Header("Boss浣嶇疆")] Vector3[] m_BossPositions;
- [SerializeField, Header("Boss鍑虹幇寤堕暱")] float m_DelayEnterTime = 1f;
- [SerializeField, Header("鍑哄満鎬绘椂闀�")] float m_BossEnterDuration = 3f;
- int cacheRealmPoint = 0;
- Coroutine cacheCoroutine = null;
- const string State_EnterHash = "Show";
- const string State_IdleHash = "Idle";
- DateTime overdueTime = DateTime.Now;
-
- RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }
-
-
+ protected override void AddListeners()
+ {
+ throw new NotImplementedException();
+ }
protected override void BindController()
{
- }
-
- protected override void AddListeners()
- {
- m_SingleDungeon.onClick.AddListener(SingleDungeon);
- m_FuncButton.onClick.AddListener(OnFunctionClick);
- m_RealmPreview.onClick.AddListener(OnRealmPreview);
- }
-
- protected override void OnPreOpen()
- {
- PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshInfoEvent;
- WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;
- cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint;
- m_RawBoss.gameObject.SetActive(false);
- m_RawPlayer.gameObject.SetActive(false);
- overdueTime = DateTime.Now;
- Display();
- }
-
- protected override void OnActived()
- {
- base.OnActived();
- if (realmModel.realmDungeonState)
- {
- StopBoss();
- m_RawBoss.gameObject.SetActive(false);
- m_RawPlayer.gameObject.SetActive(true);
- UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
- }
-
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- bool satisfyChallenge = false;
- if (config != null)
- {
- satisfyChallenge = _realmPoint >= config.NeedPoint;
- }
- if (satisfyChallenge && !NewBieCenter.Instance.inGuiding
- && !NewBieCenter.Instance.IsGuideCompleted(35)
- && realmModel.excuteRealmOpenGuide)
- {
- NewBieCenter.Instance.StartNewBieGuide(35);
- }
- }
-
- protected override void OnAfterOpen()
- {
- HandleAchievement();
- if (realmModel.openByDungeonStep && !realmModel.realmDungeonState)
- {
- m_RawBoss.gameObject.SetActive(false);
- m_RawPlayer.gameObject.SetActive(false);
- ActivateShow.RealmActivate(PlayerDatas.Instance.baseData.realmLevel);
- }
- realmModel.openByDungeonStep = false;
- if (realmModel.realmDungeonState)
- {
- m_RealmDungeonSfx.Play();
- overdueTime = DateTime.Now.AddSeconds(m_BossEnterDuration);
- StartCoroutine(Co_DisplayBossShow());
- }
- realmModel.realmDungeonState = false;
- }
-
- protected override void OnPreClose()
- {
- PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshInfoEvent;
- WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;
- StopBoss();
- UI3DModelExhibition.Instance.StopShow();
- realmModel.realmDungeonState = false;
- if (cacheCoroutine != null)
- {
- StopCoroutine(cacheCoroutine);
- cacheCoroutine = null;
- }
+ throw new NotImplementedException();
}
protected override void OnAfterClose()
{
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (!realmModel.IsRealmHighest && _realmPoint >= config.NeedPoint
- && realmModel.realmRedpoint.state == RedPointState.Simple)
- {
- realmModel.openedRealmUpWin = true;
- realmModel.UpdateRedpoint();
- }
- }
- #endregion
-
- IEnumerator Co_DisplayBossShow()
- {
- yield return WaitingForSecondConst.WaitMS800;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- m_RawPlayer.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.StopShow();
- yield return WaitingForSecondConst.GetWaitForSeconds(m_DelayEnterTime > 0 ? m_DelayEnterTime : 1f);
- StartBoss(config, true);
+ throw new NotImplementedException();
}
- private void PlayerDataRefreshInfoEvent(PlayerDataType refreshType)
+ protected override void OnAfterOpen()
{
- if (refreshType == PlayerDataType.RealmLevel)
- {
- DisplayRealmNow();
- DisplayRealmNext();
- DisplayModel();
- DisplayButton();
- DisplayProgress();
- DisplayContainer();
- }
- else if (refreshType == PlayerDataType.RealmPoint)
- {
- m_RealmProgress.DisplayProgress(true);
- DisplayRemind();
- DisplayModel();
- DisplayButton();
-
- cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint;
- }
+ throw new NotImplementedException();
}
- private void Display()
+ protected override void OnPreClose()
{
- DisplayRealmNow();
- DisplayRealmNext();
- DisplayModel();
- DisplayProgress();
- DisplayButton();
- DisplayContainer();
+ throw new NotImplementedException();
}
- private void DisplayRealmNow()
+ protected override void OnPreOpen()
{
- var _realmLv = PlayerDatas.Instance.baseData.realmLevel;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- m_ContainerNow.gameObject.SetActive(_realmLv > 0);
- m_ContainerNoHighestBottom.gameObject.SetActive(!realmModel.IsRealmHighest);
- m_ContainerHighestBottom.gameObject.SetActive(realmModel.IsRealmHighest);
- if (_realmLv > 0)
- {
- m_RealmPropertyNow.Display(_realmLv, false);
- m_RealmIconNow.Display(_realmLv);
- m_RealmIconNowHighest.Display(_realmLv);
- }
- }
-
- private void DisplayRealmNext()
- {
- var _realmLv = PlayerDatas.Instance.baseData.realmLevel + 1;
- var config = RealmConfig.Get(_realmLv);
- m_ContainerNext.gameObject.SetActive(config != null);
- if (config != null)
- {
- m_RealmPropertyNext.Display(_realmLv, false);
- m_RealmIconNext.Display(_realmLv);
- var fightPower = PlayerDatas.Instance.baseData.FightPoint;
-
- m_FightPower.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, Language.Get("RolePromoteBetterFight")),
- UIHelper.AppendStringColor(fightPower >= config.FightPower ? TextColType.Green : TextColType.Red, fightPower.ToString())
- , "/", config.FightPower);
- }
- }
-
- private void DisplayProgress()
- {
-
- if (!realmModel.IsRealmHighest)
- {
- m_RealmProgress.Display();
- }
- DisplayRemind();
- }
-
- private void DisplayRemind()
- {
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- m_ContainerFightPower.gameObject.SetActive(!realmModel.IsRealmHighest && _realmPoint >= config.NeedPoint);
- if (_realmPoint < config.NeedPoint)
- {
- m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_39");
- }
- else
- {
- if (config.IsBigRealm == 1)
- {
- m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_2");
- }
- else
- {
- m_RealmStageTip.text = Language.Get("RealmWin_Bewrite_11");
- }
- }
- if (realmModel.IsRealmHighest)
- {
- m_RealmStageTip.text = string.Empty;
- }
- }
-
- private void DisplayModel()
- {
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (realmModel.IsRealmHighest || _realmPoint < config.NeedPoint)
- {
- m_RawPlayer.gameObject.SetActive(true);
- StopBoss();
- m_RawBoss.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
- }
- else if (_realmPoint >= config.NeedGood)
- {
- m_RawBoss.gameObject.SetActive(true);
- m_RawPlayer.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.StopShow();
- StartBoss(config);
- }
- }
-
- private void StopBoss()
- {
- UI3DModelExhibition.Instance.StopShow();
- }
-
- private void StartBoss(RealmConfig config, bool act = false)
- {
- StopBoss();
- m_RawBoss.gameObject.SetActive(true);
- UI3DModelExhibition.Instance.StopShow();
- UI3DModelExhibition.Instance.ShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false);
- var npcConfig = NPCConfig.Get(config.BossID);
- var npcModel = UI3DModelExhibition.Instance.NpcModelPet;
- m_RawBoss.transform.localPosition = config.IsBigRealm == 1 ? m_BossPositions[1] : m_BossPositions[0];
- if (npcModel != null)
- {
- var animator = npcModel.GetComponentInChildren<Animator>();
- if (animator != null)
- {
- var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerRealmSuffix, npcConfig.MODE);
- animator.runtimeAnimatorController = runtimeController;
- animator.Play(act ? State_EnterHash : State_IdleHash, 0);
- }
- }
- }
-
- private void DisplayContainer()
- {
- int _state = PlayerDatas.Instance.baseData.realmLevel == 0 ? 0 : realmModel.IsRealmHighest ? 2 : 1;
- m_ContainerProgress.gameObject.SetActive(_state != 2);
- m_ContainerNow.transform.localPosition = _state == 2 ? m_RealmNowPositions[1] : m_RealmNowPositions[0];
- m_ContainerNext.transform.localPosition = _state == 0 ? m_RealmNextwPositions[1] : m_RealmNextwPositions[0];
- m_ContainerModel.transform.localPosition = m_ModelPositions[_state];
- m_RealmTitleNext.SetSprite(_state == 0 ? "TB_JJ_10" : "TB_JJ_7");
- }
-
- private void DisplayButton()
- {
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- bool satisfyChallenge = _realmPoint >= config.NeedPoint;
- m_SingleDungeon.gameObject.SetActive(!realmModel.IsRealmHighest && satisfyChallenge);
- m_FuncButton.gameObject.SetActive(!realmModel.IsRealmHighest && !satisfyChallenge);
- }
-
- private void OnFunctionClick()
- {
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
- }
-
- //private void GroupDungeon()
- //{
- // if (DateTime.Now < overdueTime)
- // {
- // return;
- // }
- // if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID)
- // {
- // return;
- // }
- // var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
- // if (teamModel.myTeam.inTeam && teamModel.myTeam.iamCaptainer)
- // {
- // ModelCenter.Instance.GetModel<DungeonModel>().GroupChallenge(RealmModel.REALM_DUNGEON_ID, 1);
- // }
- // else
- // {
- // teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);
- // WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);
- // }
- //}
-
- //private void AutoGroup()
- //{
- // if (DateTime.Now < overdueTime)
- // {
- // return;
- // }
- // var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
- // teamModel.RequestAutoMatchTeam(new TeamMission(RealmModel.REALM_DUNGEON_ID, 1));
- // WindowCenter.Instance.Open<TeamFrameWin>(false, 1);
- //}
-
- private void SingleDungeon()
- {
- if (DateTime.Now < overdueTime)
- {
- return;
- }
- if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID)
- {
- return;
- }
- PlayerDatas.Instance.realm.realmHelpList.Clear();
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (_realmPoint >= config.NeedPoint)
- {
- ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(RealmModel.REALM_DUNGEON_ID, config.IsBigRealm == 1 ? 1 : 0);
- }
- }
-
- private void OnRealmPreview()
- {
- WindowCenter.Instance.Open<RealmPreviewWin>();
- }
-
- void HandleAchievement()
- {
- if (AchievementGoto.achievementType == AchievementGoto.RealmDungeon)
- {
- if (!realmModel.IsRealmHighest)
- {
- var _effect = AchievementGuideEffectPool.Require(1);
- _effect.transform.SetParentEx(m_FuncButton.transform, Vector3.zero, Vector3.zero, Vector3.one);
- AchievementGoto.achievementType = 0;
- }
- }
- else if (AchievementGoto.achievementType == AchievementGoto.RealmDungeonHelp)
- {
- var _level = PlayerDatas.Instance.baseData.realmLevel;
- var _realmCfg = RealmConfig.Get(_level);
- if (_realmCfg != null && _realmCfg.IsBigRealm == 1 && realmModel.IsDungeonState)
- {
- var _effect = AchievementGuideEffectPool.Require(1);
- _effect.transform.SetParentEx(m_FuncButton.transform, Vector3.zero, Vector3.zero, Vector3.one);
- }
- else
- {
- SysNotifyMgr.Instance.ShowTip("Achievement_79");
- }
- AchievementGoto.achievementType = 0;
- }
- AchievementGoto.achievementType = 0;
- }
-
- private void WindowAfterCloseEvent(Window _win)
- {
- if (_win is RealmPropertyUpWin)
- {
- DisplayModel();
- }
+ throw new NotImplementedException();
}
}
}
diff --git a/System/Realm/SecondPraTypeCell.cs b/System/Realm/SecondPraTypeCell.cs
deleted file mode 100644
index 52112b5..0000000
--- a/System/Realm/SecondPraTypeCell.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing System;
-using UnityEngine;
-using UnityEngine.UI;
-
-
-namespace Snxxz.UI
-{
- public class SecondPraTypeCell : CellView
- {
- [SerializeField] public GameObject unSelectImg;
- [SerializeField] public GameObject selectImg;
- [SerializeField] public Text nameText;
- [SerializeField] public Button cellBtn;
- [SerializeField] public RedpointBehaviour redpoint;
-
- RealmPracticeModel practiceModel { get { return ModelCenter.Instance.GetModel<RealmPracticeModel>(); } }
-
- public void Init(int firstType,int secondType,int selectSecondType = -1)
- {
- redpoint.redpointId = practiceModel.realmSecondTypeDict[firstType][secondType].id;
- nameText.text = practiceModel.GetPracticePointStr(firstType,secondType);
- if(selectSecondType == secondType)
- {
- selectImg.SetActive(true);
- unSelectImg.SetActive(false);
- }
- else
- {
- unSelectImg.SetActive(true);
- selectImg.SetActive(false);
- }
-
- }
- }
-}
diff --git a/System/Realm/SecondPraTypeCell.cs.meta b/System/Realm/SecondPraTypeCell.cs.meta
deleted file mode 100644
index d64de29..0000000
--- a/System/Realm/SecondPraTypeCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ac27f012a5377e740809237c25859fd4
-timeCreated: 1524465087
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/Realm/TaskTypeCell.cs b/System/Realm/TaskTypeCell.cs
deleted file mode 100644
index 17801dc..0000000
--- a/System/Realm/TaskTypeCell.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-锘縰sing UnityEngine;
-using UnityEngine.UI;
-using System.Collections.Generic;
-
-using System;
-
-namespace Snxxz.UI
-{
- public class TaskTypeCell : MonoBehaviour
- {
- private Image _itemIcon;
- public Image itemIcon
- {
- get
- {
- if (_itemIcon == null)
- {
- _itemIcon = transform.Find("ItemBg/ItemIcon").GetComponent<Image>();
- }
- return _itemIcon;
- }
- }
-
- private Image _doTaskImg;
- public Image doTaskImg
- {
- get
- {
- if (_doTaskImg == null)
- {
- _doTaskImg = transform.Find("GoBtn").GetComponent<Image>();
- }
- return _doTaskImg;
- }
- }
-
- private Text _taskName;
- public Text taskName
- {
- get
- {
- if (_taskName == null)
- {
- _taskName = transform.Find("TaskNameText").GetComponent<Text>();
- }
- return _taskName;
- }
- }
- private Text _taskProgress;
- public Text taskProgress
- {
- get
- {
- if (_taskProgress == null)
- {
- _taskProgress = transform.Find("ProgressText").GetComponent<Text>();
- }
- return _taskProgress;
- }
- }
-
- private Text _remainNumText;
- public Text remainNumText
- {
- get
- {
- if (_remainNumText == null)
- {
- _remainNumText = transform.Find("RemainNumText").GetComponent<Text>();
- }
- return _remainNumText;
- }
- }
-
- private Text _doTaskText;
- public Text doTaskText
- {
- get
- {
- if (_doTaskText == null)
- {
- _doTaskText = transform.Find("GoBtn/Text").GetComponent<Text>();
- }
- return _doTaskText;
- }
- }
-
- private Button _doTaskBtn;
- public Button doTaskBtn
- {
- get
- {
- if (_doTaskBtn == null)
- {
- _doTaskBtn = transform.Find("GoBtn").GetComponent<Button>();
- }
- return _doTaskBtn;
- }
- }
-
- private GameObject _rewardParent;
- public GameObject rewardParent
- {
- get
- {
- if (_rewardParent == null)
- {
- _rewardParent = transform.Find("RewardParent").gameObject;
- }
- return _rewardParent;
- }
- }
-
- public List<Image> taskRewardImglist = new List<Image>();
- public List<Text> taskRewardCntlist = new List<Text>();
-
- private GameObject _haveReceiveImage;
- public GameObject haveReceiveImage
- {
- get
- {
- if (_haveReceiveImage == null)
- {
- _haveReceiveImage = transform.Find("DrawImage").gameObject;
- }
- return _haveReceiveImage;
- }
- }
-
- private UIEffect _receiveEffect;
- public UIEffect receiveEffect
- {
- get
- {
- if(_receiveEffect == null)
- {
- _receiveEffect = transform.Find("GoBtn/receiveEffect").GetComponent<UIEffect>();
-
- }
- return _receiveEffect;
- }
- }
-
- private Achievement achieve = null;
- private SuccessConfig successConfig = null;
- private RealmPracticeConfig practiceConfig = null;
- private int remainTaskCnt = 0;
- RealmPracticeModel practiceModel { get { return ModelCenter.Instance.GetModel<RealmPracticeModel>(); } }
-
- private void OnEnable()
- {
- practiceModel.AchieveModel.achievementProgressUpdateEvent += RefreshProgress;
- }
-
- private void OnDisable()
- {
- practiceModel.AchieveModel.achievementProgressUpdateEvent -= RefreshProgress;
- }
-
- public void InitModel(RealmPracticeConfig config)
- {
- achieve = null;
- int curNum = practiceModel.SetAchievement(config.AchieveID, out achieve);
- if (achieve == null) return;
-
- practiceConfig = config;
- remainTaskCnt = config.AchieveID.Length - curNum;
- successConfig = SuccessConfig.Get(achieve.id);
-
- InitUI();
- }
-
- private void InitUI()
- {
- taskName.text = AchievementModel.ParseAchievementDescription(achieve.id);
- itemIcon.SetSprite(practiceConfig.Icon);
- RefreshRemainTaskCnt();
- RefreshTaskProgress();
- RefreshTaskState();
- RefreshTaskReward();
- }
-
- private void RefreshRemainTaskCnt()
- {
- remainNumText.text = Language.Get("RealmPractice113", remainTaskCnt);
- if (achieve.completed)
- {
- remainNumText.gameObject.SetActive(false);
- }
- else
- {
- if (practiceConfig.Type == 1)
- {
- remainNumText.gameObject.SetActive(true);
- }
- else
- {
- remainNumText.gameObject.SetActive(false);
- }
- }
-
- }
-
- private void RefreshTaskProgress()
- {
- string s = "";
- if (achieve.completed)
- {
- string maxProgress = UIHelper.ReplaceLargeNum(successConfig.NeedCnt);
- s = StringUtility.Contact(maxProgress, "/", maxProgress);
- }
- else
- {
- s = StringUtility.Contact(UIHelper.ReplaceLargeNum(achieve.progress), "/", UIHelper.ReplaceLargeNum(successConfig.NeedCnt));
- }
-
- taskProgress.text = Language.Get("RealmPractice111", s);
- }
-
- private void RefreshTaskState()
- {
- doTaskBtn.onClick.RemoveAllListeners();
- if (achieve.completed)
- {
- doTaskText.text = Language.Get("RealmPractice110");
- doTaskBtn.gameObject.SetActive(false);
- receiveEffect.gameObject.SetActive(false);
- haveReceiveImage.SetActive(true);
- }
- else
- {
- doTaskBtn.gameObject.SetActive(true);
- haveReceiveImage.SetActive(false);
- if (Achievement.IsReach(achieve.id, achieve.progress))
- {
- doTaskText.text = Language.Get("RealmPractice109");
- doTaskImg.SetSprite("JingJieIcon2");
- doTaskBtn.onClick.AddListener(() => { OnClickReceiveReward(achieve.id); });
- receiveEffect.gameObject.SetActive(true);
- practiceModel.RefreshAchieveState(achieve.id);
- }
- else
- {
- doTaskImg.SetSprite("JingJieIcon1");
- doTaskText.text = Language.Get("RealmPractice108");
- doTaskBtn.onClick.AddListener(() => { OnClickGoTo(); });
- receiveEffect.gameObject.SetActive(false);
- }
- }
- }
-
- private void RefreshTaskReward()
- {
- for (int i = 0; i < taskRewardImglist.Count; i++)
- {
- taskRewardImglist[i].gameObject.SetActive(false);
- }
-
- int rewardLength1 = achieve.rewardCurrency.Length;
- for (int k = 0; k < rewardLength1; k++)
- {
- taskRewardImglist[k].gameObject.SetActive(true);
- UIHelper.SetIconWithMoneyType(taskRewardImglist[k], achieve.rewardCurrency[k].id);
- taskRewardCntlist[k].text = UIHelper.ReplaceLargeNum(achieve.rewardCurrency[k].count);
- }
-
- for (int j = 0; j < achieve.rewardItem.Length; j++)
- {
- taskRewardImglist[rewardLength1 + j].gameObject.SetActive(true);
- ItemConfig tagItemModel = ItemConfig.Get(achieve.rewardItem[j].id);
- if (tagItemModel != null)
- {
- taskRewardImglist[rewardLength1 + j].SetSprite(tagItemModel.IconKey);
- }
- taskRewardCntlist[rewardLength1 + j].text = UIHelper.ReplaceLargeNum(achieve.rewardItem[j].count);
- }
- }
-
- private void OnClickReceiveReward(int id)
- {
- practiceModel.AchieveModel.GetAchievementReward(id);
- }
-
- private void OnClickGoTo()
- {
- if (achieve == null) return;
- ModelCenter.Instance.GetModel<AchievementModel>().GotoCompleteAchievement(achieve.id);
- }
-
- private void RefreshProgress(int id)
- {
- if (id != achieve.id) return;
- RefreshTaskState();
- RefreshTaskProgress();
- }
- }
-}
diff --git a/System/Realm/TaskTypeCell.cs.meta b/System/Realm/TaskTypeCell.cs.meta
deleted file mode 100644
index 9a5a779..0000000
--- a/System/Realm/TaskTypeCell.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0a35c8cca5eb35e469f3fdba2c2cadb5
-timeCreated: 1521203045
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/RolePromote/RolePromoteModel.cs b/System/RolePromote/RolePromoteModel.cs
index bbece6b..2fa575c 100644
--- a/System/RolePromote/RolePromoteModel.cs
+++ b/System/RolePromote/RolePromoteModel.cs
@@ -492,7 +492,7 @@
_id == runeModel.runeMosaicRedpoint.id ||
_id == magicianModel.magicianRedpoint.id ||
_id == methodData.fairyHeartRedpoint.id ||
- _id == realmModel.realmRedpoint.id ||
+ _id == realmModel.redpoint.id ||
_id == gemModel.gemTagRedPoint.id ||
_id == rolePointModel.redpoint.id)
{
diff --git a/System/Team/GroupDungeonChallengeProcessor.cs b/System/Team/GroupDungeonChallengeProcessor.cs
index 430fcf0..06059b6 100644
--- a/System/Team/GroupDungeonChallengeProcessor.cs
+++ b/System/Team/GroupDungeonChallengeProcessor.cs
@@ -37,8 +37,6 @@
switch (_mapId)
{
case RealmModel.REALM_DUNGEON_ID:
- var realmModel = ModelCenter.Instance.GetModel<RealmModel>();
- realmModel.GotoDungeon();
break;
case 31080:
{
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 6b2765f..3c03437 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -248,16 +248,6 @@
public void RequestCreateTeam(int _mapId, int _lineId, int _levelMin = 1, int _levelMax = 1)
{
- if (_mapId == 31110)
- {
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (config.IsBigRealm != 1 || !ModelCenter.Instance.GetModel<RealmModel>().IsDungeonState)
- {
- SysNotifyMgr.Instance.ShowTip("NOGreatBourn");
- return;
- }
- }
-
var mapId = _mapId == NONE_MISSION ? 0 : _mapId == CURRENTMAP_MISSION ? PlayerDatas.Instance.baseData.MapID : _mapId;
var mapEx = _lineId <= 0 ? 0 : _lineId;
var dungeonId = dungeonModel.GetDungeonId(mapId, mapEx);
diff --git a/System/Team/TeamTargetJoinLimitWin.cs b/System/Team/TeamTargetJoinLimitWin.cs
index 6e030d7..fab7f46 100644
--- a/System/Team/TeamTargetJoinLimitWin.cs
+++ b/System/Team/TeamTargetJoinLimitWin.cs
@@ -189,16 +189,6 @@
missionBuf.mapId == TeamModel.CURRENTMAP_MISSION ? PlayerDatas.Instance.baseData.MapID : missionBuf.mapId;
var mapEx = missionBuf.mapEx <= 0 ? 0 : missionBuf.mapEx;
- if (mapId == 31110)
- {
- var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
- if (config.IsBigRealm != 1 || !ModelCenter.Instance.GetModel<RealmModel>().IsDungeonState)
- {
- SysNotifyMgr.Instance.ShowTip("NOGreatBourn");
- return;
- }
- }
-
var key = dungeonModel.GetDungeonId(mapId, mapEx);
if (key == 0)
--
Gitblit v1.8.0