Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs
@@ -14,7 +14,6 @@ base.Done(vNetPack); var vNetData = vNetPack as HA317_tagMCAllEquipAttrActiveInfo; ModelCenter.Instance.GetModel<TreasureSoulModel>().UpdateTreasurePrivilege(vNetData); } } Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA353_tagMCMWPrivilegeDataInfo.cs
@@ -15,7 +15,6 @@ { base.Done(vNetPack); var package = vNetPack as HA353_tagMCMWPrivilegeDataInfo; ModelCenter.Instance.GetModel<TreasureSoulModel>().UpdateTreasurePrivilege(package); } } Lua/Gen/SnxxzUITreasureSoulModelWrap.cs
File was deleted Lua/Gen/SnxxzUITreasureSoulModelWrap.cs.meta
File was deleted Lua/Gen/XLuaGenAutoRegister.cs
@@ -1386,9 +1386,6 @@ translator.DelayWrapLoader(typeof(PwdKeyboard), PwdKeyboardWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureSoulModel), SnxxzUITreasureSoulModelWrap.__Register); translator.DelayWrapLoader(typeof(Snxxz.UI.TreasureFindHostModel), SnxxzUITreasureFindHostModelWrap.__Register);
@@ -94,7 +94,6 @@ FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } } public override void Init() { @@ -131,7 +130,6 @@ public void OnPlayerLoginOk() { demonJarSoulBuf = treasureSoulModel.GetTreasureSoulValue(2); demonJarSoulIncreaseDelta = 0; var bossId = GetLatestUnLockBoss(); @@ -332,9 +330,8 @@ public void UpdateDemonJarSoul() { var demonJarSoul = treasureSoulModel.GetTreasureSoulValue(2); demonJarSoulIncreaseDelta = demonJarSoul - demonJarSoulBuf; demonJarSoulBuf = demonJarSoul; //demonJarSoulIncreaseDelta = demonJarSoul - demonJarSoulBuf; //demonJarSoulBuf = demonJarSoul; } private void OnPlayerLevelUp(PlayerDataType _type) System/MainInterfacePanel/LowSettingTip.cs
@@ -107,7 +107,6 @@ void OnClickTreasureSoul() { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<TreasureSoulWin>(); } private void GodBeastBtn() { System/Realm/ActivateShow.cs
@@ -205,97 +205,6 @@ } public static void TreasureSoulGetReward(int id, int _beforeLevel, int _currentLevel) { activateType = ActivateFunc.TreasureSoul; treasureSoulId = id; titleIconKey = "XT_FBZH_11"; propertyCompares.Clear(); lastPropertyDict.Clear(); currentPropertyDict.Clear(); var model = ModelCenter.Instance.GetModel<TreasureSoulModel>(); TreasureSpecialData special; if (model.TryGetTreasureSoul(treasureSoulId, out special)) { switch (special.type) { case TreasurePrivilege.StrengthenAdd: var configs = ItemPlusSumAttrConfig.GetValues(); var before = -1; var present = 0; for (int i = 0; i < configs.Count; i++) { if (_beforeLevel >= configs[i].countNeed) { before = i; } if (_currentLevel >= configs[i].countNeed) { present = i; } } ItemPlusSumAttrConfig _beforeConfig = null; if (before >= 0 && before < configs.Count) { _beforeConfig = configs[before]; } List<int> _beforeProperties = new List<int>(); if (_beforeConfig != null) { _beforeProperties.AddRange(_beforeConfig.attType); for (int i = 0; i < _beforeConfig.attType.Length; i++) { lastPropertyDict.Add(_beforeConfig.attType[i], _beforeConfig.attValue[i]); } } var config = (present < 0 || present >= configs.Count) ? null : configs[present]; if (config == null) { return; } for (int i = 0; i < config.attType.Length; i++) { var _index = _beforeProperties.IndexOf(config.attType[i]); if (_index == -1 || config.attValue[i] > _beforeConfig.attValue[_index]) { propertyCompares.Add(new PropertyCompare() { key = config.attType[i], beforeValue = _index == -1 ? 0 : _beforeConfig.attValue[_index], currentValue = config.attValue[i] }); } currentPropertyDict.Add(config.attType[i], config.attValue[i]); } break; case TreasurePrivilege.DemonJarAtk: case TreasurePrivilege.MountAtk: case TreasurePrivilege.PetHp: case TreasurePrivilege.Sp: foreach (var _key in special.propertyDict.Keys) { var beforeValue = special.propertyDict[_key] * _beforeLevel / special.progress; var nowValue = special.propertyDict[_key] * _currentLevel / special.progress; lastPropertyDict.Add(_key, beforeValue); currentPropertyDict.Add(_key, nowValue); propertyCompares.Add(new PropertyCompare() { key = _key, beforeValue = beforeValue, currentValue = nowValue }); } break; } fightPower = UIHelper.GetFightPower(currentPropertyDict) - UIHelper.GetFightPower(lastPropertyDict); if (!WindowCenter.Instance.IsOpen<RealmPropertyUpWin>()) { WindowCenter.Instance.Open<RealmPropertyUpWin>(); } } } public static void JadeDynastySkillUnlock(int skillId) { activateType = ActivateFunc.JadeDynastySkill; @@ -337,7 +246,6 @@ Realm, GodWeapon, Stove, //炼丹炉升级 TreasureSoul,//法宝魂领取属性 JadeDynastySkill, }
@@ -155,11 +155,6 @@ DisplayNewGotSkill(); } break; case ActivateShow.ActivateFunc.TreasureSoul: DisplayTreasureSoul(); DisplayFightPower(); DisplayProperty(); break; case ActivateShow.ActivateFunc.JadeDynastySkill: DisplayFightPower(); DisplayNewGotSkill(); @@ -207,7 +202,6 @@ m_Properties[i].gameObject.SetActive(true); switch (ActivateShow.activateType) { case ActivateShow.ActivateFunc.TreasureSoul: case ActivateShow.ActivateFunc.Realm: m_Properties[i].Display(ActivateShow.propertyCompares[i].key , ActivateShow.propertyCompares[i].beforeValue, ActivateShow.propertyCompares[i].currentValue); System/Rune/RuneResolveModel.cs
@@ -92,18 +92,16 @@ { var result = 0f; var config = ItemConfig.Get(id); var _treasureSoul = ModelCenter.Instance.GetModel<TreasureSoulModel>(); var _upper = (float)_treasureSoul.GetTreasureSoulValue((int)TreasurePrivilege.RuneBreakExpAdd) / 10000; if (config.Type == RuneModel.RUNE_CREAMTYPE) { return config.EffectValueA1 + config.EffectValueA1 * _upper; return config.EffectValueA1 + config.EffectValueA1; } for (int i = 1; i <= level; i++) { if (i == 1 && !fromCompose) { result += m_RuneBaseResolveSplinters[config.ItemColor] + m_RuneBaseResolveSplinters[config.ItemColor] * _upper; m_RuneBaseResolveSplinters[config.ItemColor]; } else { @@ -116,15 +114,13 @@ public float GetRuneResolveGetSouls(int id) { ItemConfig config = ItemConfig.Get(id); var _treasureSoul = ModelCenter.Instance.GetModel<TreasureSoulModel>(); var _upper = (float)_treasureSoul.GetTreasureSoulValue((int)TreasurePrivilege.RuneBreakExpAdd) / 10000; if (config.Type == RuneModel.RUNE_CREAMTYPE) { return config.EffectValueA1 * _upper; return config.EffectValueA1; } else { return m_RuneBaseResolveSplinters[config.ItemColor] * _upper; return m_RuneBaseResolveSplinters[config.ItemColor]; } }
@@ -35,9 +35,6 @@ RuneModel model { get { return ModelCenter.Instance.GetModel<RuneModel>(); } } RuneResolveModel runeResolveModel { get { return ModelCenter.Instance.GetModel<RuneResolveModel>(); } } VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } } TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } } RuneComposeModel runeComposeModel { get { return ModelCenter.Instance.GetModel<RuneComposeModel>(); } } protected override void BindController() @@ -71,7 +68,7 @@ DisplayRuneItems(); m_ContainerRuneSoul.gameObject.SetActive(treasureSoulModel.IsGetTreasureSoul((int)TreasurePrivilege.RuneBreakExpAdd)); m_ContainerRuneSoul.gameObject.SetActive(false); } protected override void OnAfterOpen() System/Treasure/FairyTreasureCollectPanelPattern4.cs
@@ -24,8 +24,6 @@ } } TreasureSoulModel treasureSoulModel { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } } public override void Display(int _treasureId, bool _tween = false) { base.Display(_treasureId, _tween); @@ -82,9 +80,7 @@ private void OnSignRefresh() { if(treasure.id== treasureSoulModel.signAddTreasure) { var _property = treasureSoulModel.signAddProperty.First(); var _property = model.GetSignInPropertys().First(); var _propertyCfg = PlayerPropertyConfig.Get(_property.Key); m_SignPropertyEffect.text = Language.Get("FairyTreasure_5", _property.Value, _propertyCfg.Name); @@ -100,7 +96,6 @@ m_ProerptyValue.text = Language.Get("FairyTreasure_8", _propertyCfg.Name, signInModel.totalSignInCount * _property.Value); m_SignInTip.text = Language.Get("SignInTreasureTip2"); } } } } System/Treasure/TreasureModel.cs
@@ -15,6 +15,17 @@ [XLua.LuaCallCSharp] public class TreasureModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk { Dictionary<int, Treasure> treasures = new Dictionary<int, Treasure>(); Dictionary<TreasureCategory, List<int>> treasureCategory = new Dictionary<TreasureCategory, List<int>>(); Dictionary<int, int> treasureMapDict = new Dictionary<int, int>(); Dictionary<int, TreasureDungeon> treasureDungeons = new Dictionary<int, TreasureDungeon>(); Dictionary<int, List<int>> treasureTasks = new Dictionary<int, List<int>>(); Dictionary<TreasureCategory, int> treasureUnlockShowDict = new Dictionary<TreasureCategory, int>(); Dictionary<int, int> treasureTaskCompletedCounts = new Dictionary<int, int>(); Dictionary<int, int> treasureSignInPropertys = new Dictionary<int, int>(); List<int> eightFurnacesAchievements = new List<int>(); List<int> treasureUnOpens = new List<int>(); public const int TREASURE_DATAMAPID = 41110; public const int TREASURE_MAPID = 41110; public const int TREASURE_GUIDE_ID = 102; @@ -100,16 +111,6 @@ } } } Dictionary<int, Treasure> treasures = new Dictionary<int, Treasure>(); Dictionary<TreasureCategory, List<int>> treasureCategory = new Dictionary<TreasureCategory, List<int>>(); Dictionary<int, int> treasureMapDict = new Dictionary<int, int>(); Dictionary<int, TreasureDungeon> treasureDungeons = new Dictionary<int, TreasureDungeon>(); Dictionary<int, List<int>> treasureTasks = new Dictionary<int, List<int>>(); Dictionary<TreasureCategory, int> treasureUnlockShowDict = new Dictionary<TreasureCategory, int>(); Dictionary<int, int> treasureTaskCompletedCounts = new Dictionary<int, int>(); List<int> eightFurnacesAchievements = new List<int>(); List<int> treasureUnOpens = new List<int>(); public Dictionary<int, int> fairyTreasureGetDict { get; private set; } @@ -322,6 +323,13 @@ } tasks.Add(config.TaskID); } funcConfig = FuncConfigConfig.Get("MWSignDayAttr"); var jsonData = LitJson.JsonMapper.ToObject(funcConfig.Numerical1); foreach (var _key in jsonData.Keys) { treasureSignInPropertys.Add(int.Parse(_key), int.Parse(jsonData[_key].ToString())); } } public void TryOpenRegulusPopWindow() @@ -501,6 +509,11 @@ public List<int> GetFurnacesAchievements() { return eightFurnacesAchievements; } public Dictionary<int, int> GetSignInPropertys() { return treasureSignInPropertys; } private void PlayerDataRefreshInfoEvent(PlayerDataType refreshType) @@ -807,8 +820,7 @@ public int GetExtensionPower(int _treasureId) { var treasureSoulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>(); if (_treasureId == treasureSoulModel.signAddTreasure) if (_treasureId == 304) { var signInDays = ModelCenter.Instance.GetModel<SignInModel>().totalSignInCount; if (signInDays == 0) @@ -816,9 +828,9 @@ return 0; } Dictionary<int, int> dict = new Dictionary<int, int>(); foreach (var key in treasureSoulModel.signAddProperty.Keys) foreach (var key in treasureSignInPropertys.Keys) { dict.Add(key, treasureSoulModel.signAddProperty[key] * signInDays); dict.Add(key, treasureSignInPropertys[key] * signInDays); } return UIHelper.GetFightPower(dict); } System/Treasure/TreasureNewGotWin.cs
@@ -402,8 +402,7 @@ } break; case 304://签到相关配置移到功能配置表 var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>(); var _propertyDict = soulModel.signAddProperty; var _propertyDict = model.GetSignInPropertys(); if (_propertyDict != null) { var _keyValue = _propertyDict.First(); System/Treasure/TreasureSoulAchievementCell.cs
File was deleted System/Treasure/TreasureSoulAchievementCell.cs.meta
File was deleted System/Treasure/TreasureSoulBehaviour.cs
File was deleted System/Treasure/TreasureSoulBehaviour.cs.meta
File was deleted System/Treasure/TreasureSoulCell.cs
File was deleted System/Treasure/TreasureSoulCell.cs.meta
File was deleted System/Treasure/TreasureSoulModel.cs
File was deleted System/Treasure/TreasureSoulModel.cs.meta
File was deleted System/Treasure/TreasureSoulPattern.cs
File was deleted System/Treasure/TreasureSoulPattern.cs.meta
File was deleted System/Treasure/TreasureSoulPattern1.cs
File was deleted System/Treasure/TreasureSoulPattern1.cs.meta
File was deleted System/Treasure/TreasureSoulPattern2.cs
File was deleted System/Treasure/TreasureSoulPattern2.cs.meta
File was deleted System/Treasure/TreasureSoulPattern3.cs
File was deleted System/Treasure/TreasureSoulPattern3.cs.meta
File was deleted System/Treasure/TreasureSoulPattern4.cs
File was deleted System/Treasure/TreasureSoulPattern4.cs.meta
File was deleted System/Treasure/TreasureSoulWin.cs
File was deleted System/Treasure/TreasureSoulWin.cs.meta
File was deleted System/WindowBase/ModelCenter.cs
@@ -182,7 +182,6 @@ RegisterModel<MultipleRealmPointModel>(); RegisterModel<DogzDungeonModel>(); RegisterModel<DogzModel>(); RegisterModel<TreasureSoulModel>(); RegisterModel<FairyGrabBossModel>(); RegisterModel<GodBeastModel>(); RegisterModel<PrayForDurgModel>(); System/WindowJump/WindowJumpMgr.cs
@@ -543,7 +543,6 @@ SetJumpLogic<RolePanel>(_tagWinSearchModel.TABID); break; case JumpUIType.TreasureSoul: SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID); break; case JumpUIType.TreasureCollectSoul: SetJumpLogic<TreasureBaseWin>(0); @@ -652,12 +651,6 @@ case JumpUIType.FaBaoSoul_Wings: case JumpUIType.FaBaoSoul_Suit: case JumpUIType.FaBaoSoul_Wash: var soulId = 0; if (int.TryParse(_tagWinSearchModel.SelectActive, out soulId)) { ModelCenter.Instance.GetModel<TreasureSoulModel>().gotoSoul = soulId; } SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID); break; case JumpUIType.XianBaguaIntr: case JumpUIType.XyjJs: @@ -847,19 +840,6 @@ case JumpUIType.FaBaoSoul_Wings: case JumpUIType.FaBaoSoul_Suit: case JumpUIType.FaBaoSoul_Wash: var soulId = 0; if (int.TryParse(_tagWinSearchModel.SelectActive, out soulId)) { var soulModel = ModelCenter.Instance.GetModel<TreasureSoulModel>(); if (!soulModel.IsOpenTreasureSoul(soulId)) { return false; } } else { return false; } break; case JumpUIType.TrialExchange: case JumpUIType.TrialExchange2:
