Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -179,7 +179,6 @@ Register(typeof(HA004_tagServerDateTime), typeof(DTCA004_tagServerDateTime)); Register(typeof(HA402_tagGCFamilyBossFBInfo), typeof(DTCA402_tagGCFamilyBossFBInfo)); Register(typeof(HA405_tagGCFamilyRedPacketGrabInfo), typeof(DTCA405_tagGCFamilyRedPacketGrabInfo)); Register(typeof(HA406_tagGCFamilyStoreItemInfo), typeof(DTCA406_tagGCFamilyStoreItemInfo)); Register(typeof(HA403_tagGCFamilyActionInfo), typeof(DTCA403_tagGCFamilyActionInfo)); Register(typeof(H0431_tagTimeTick), typeof(DTC0431_tagTimeTick)); Register(typeof(H0320_tagFBEnd), typeof(DTC0320_tagFBEnd)); @@ -188,7 +187,6 @@ Register(typeof(H0826_tagClearMissionDict), typeof(DTC0826_tagClearMissionDict)); Register(typeof(H0801_tagEventTalk), typeof(DTC0801_tagEventTalk)); Register(typeof(H0703_tagRolePickupItem), typeof(DTC0703_tagRolePickupItem)); Register(typeof(HA407_tagGCFamilyStoreItemClear), typeof(DTCA407_tagGCFamilyStoreItemClear)); Register(typeof(HA320_tagMCPlayerFBInfoData), typeof(DTCA320_tagMCPlayerFBInfoData)); Register(typeof(HA708_tagMCRunTaskAwardInfo), typeof(DTCA708_tagMCRunTaskAwardInfo)); Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -22,8 +22,6 @@ { get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public FairyData fairy = null; public FairyMember mine = null; public event Action OnRefreshFairyInfo; @@ -136,17 +134,7 @@ member = null; } fairyBossModel.UpdateRedPoint(); //Z-xw写 if (!playerFairyAuTreasureData._DicfamilyStoreItem.ContainsKey(0)) { FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem(); _FamilyStoreItemP.Index = 0; FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); playerFairyAuTreasureData._DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } fairyBossModel.UpdateRedPoint(); if (OnRefreshFairyInfo != null) OnRefreshFairyInfo(); } @@ -280,9 +268,7 @@ else { ClearFairyData(); LocalChatHistory.Clear(ChatInfoType.Fairy); //Z-xw写 playerFairyAuTreasureData._DicfamilyStoreItem.Clear(); LocalChatHistory.Clear(ChatInfoType.Fairy); } if (OnRefreshFairyMine != null) { Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -708,7 +708,6 @@ method.CepaContribution((int)value); break; case PlayerDataType.FamilyStoreScore: ModelCenter.Instance.GetModel<FairyAuTreasureModel>().FairyAuIntegral((int)value); break; case PlayerDataType.SuperHitReduce: extersion.SuperHitReduce = (int)value; Core/GameEngine/Model/TelPartialConfig/PlayerPropertyConfig.cs
@@ -30,26 +30,43 @@ public static string GetPropertyDescription(int propertyId, int value) { return GetPropertyDescription(propertyId, value, 1, false); } public static string GetPropertyDescription(int propertyId, int value, int decimalCount, bool largeValue) { var config = Get(propertyId); if (config == null) { return string.Empty; } float _result = 0f; if (config.ISPercentage == 0) { return value.ToString(); _result = value; } else if (config.ISPercentage == 1) { return (float)Math.Round(value / 100f, 1) + "%"; _result = (float)Math.Round(value / 100f, decimalCount); } else if (config.ISPercentage == 2) { return ((float)Math.Round(value / 100f, 1)).ToString(); _result = (float)Math.Round(value / 100f, decimalCount); } return string.Empty; var label = string.Empty; if (largeValue) { label = UIHelper.ReplaceLargeNum(_result); } else { label = _result.ToString(); } return config.ISPercentage == 1 ? (label + "%") : label; } } Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs
File was deleted Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0416_tagTruckAppearView.cs.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs
@@ -8,15 +8,8 @@ public class DTCA403_tagGCFamilyActionInfo : DtcBasic { FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA403_tagGCFamilyActionInfo vNetData = vNetPack as HA403_tagGCFamilyActionInfo; if (vNetData != null) { playerFairyAuTreasureData.FamilyActionInfo(vNetData); } base.Done(vNetPack); HA403_tagGCFamilyActionInfo vNetData = vNetPack as HA403_tagGCFamilyActionInfo; } } Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/DTCFile/ServerPack/HB0_Event.meta
File was deleted Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs
File was deleted Core/NetworkPackage/ServerPack/H04_Scene/H0416_tagTruckAppearView.cs.meta
File was deleted Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs
File was deleted Core/NetworkPackage/ServerPack/HA4_Family/HA406_tagGCFamilyStoreItemInfo.cs.meta
File was deleted Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs
File was deleted Core/NetworkPackage/ServerPack/HA4_Family/HA407_tagGCFamilyStoreItemClear.cs.meta
File was deleted Core/NetworkPackage/ServerPack/HAD_SaleActivity.meta
File was deleted Core/NetworkPackage/ServerPack/HAE_Truck.meta
File was deleted Core/NetworkPackage/ServerPack/HAF_Merge.meta
File was deleted Core/NetworkPackage/ServerPack/HB0_Event.meta
File was deleted System/BlastFurnace/GetItemPathModel.cs
@@ -217,9 +217,6 @@ public void SetUnionWarehouseGetWay() { var model1 = ModelCenter.Instance.GetModel<FairyAuTreasureModel>(); var model2 = ModelCenter.Instance.GetModel<TreasureFindHostModel>(); model1.JumpItemID = model2.adviceIdlist; } #region 设置弹框位置 System/EquipGem/EquipEvolution.cs
@@ -13,13 +13,16 @@ [SerializeField] Button m_EvolutionBtn; [SerializeField] RichText m_TexLv; [SerializeField] RichText m_TextConent; EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } } private void Start() { m_EvolutionBtn.AddListener(OnClickEvolutionBtn); } public void SetEquipEvolution() public void SetEquipEvolution(int equipPlace, int equipLv) { var evolve = strengthModel.GetEquipPlusEvolve(equipPlace, equipLv); m_TexLv.text = Language.Get("Z1024", equipLv); m_TextConent.text = evolve.AttrName + "+" + evolve.AttrValue; } private void OnClickEvolutionBtn() { System/EquipGem/EquipEvolutionWin.cs
@@ -9,7 +9,8 @@ using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { namespace Snxxz.UI { public class EquipEvolutionWin : Window { @@ -23,34 +24,152 @@ [SerializeField] RichText m_TextAttributesA; [SerializeField] RichText m_TextAttributesB; [SerializeField] ItemCell m_ItemCell; [SerializeField] ItemCell m_ItemCell; [SerializeField] GameObject m_AdvancedObj; [SerializeField] GameObject m_FullLevelObj; [SerializeField] RichText m_TextAttributesFull; [SerializeField] RichText m_TextLvFull; #region Built-in EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } } PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } } int equipType; protected override void BindController() { } protected override void AddListeners() { m_CloseButton.AddListener(()=> { CloseImmediately(); }); m_CloseButton.AddListener(() => { CloseImmediately(); }); m_EvolutionBtn.AddListener(OnClickEvolutionBtn); } protected override void OnPreOpen() { { SetEquipEvolution(); } protected override void OnAfterOpen() { strengthModel.EquipStrngthEvolutionLv += EquipStrngthEvolutionLv; } protected override void OnPreClose() { } { strengthModel.EquipStrngthEvolutionLv -= EquipStrngthEvolutionLv; } protected override void OnAfterClose() { } } #endregion private void OnClickEvolutionBtn() { var isBool = IsCarryOut(); if (isBool) { int equipIndex = EquipPlaceMapConfig.GetServerPlace(strengthModel.SelectLevel, strengthModel.SelectEquipPlace); strengthModel.SendEquipPlusEvolve(equipIndex); } } private void EquipStrngthEvolutionLv() { SetEquipEvolution(); } private void Reinforceable(int advancedLv) { m_AdvancedObj.SetActive(true); var evolve = strengthModel.GetEquipPlusEvolve(strengthModel.SelectEquipPlace, advancedLv); var evolveNext = strengthModel.GetEquipPlusEvolve(strengthModel.SelectEquipPlace, (advancedLv + 1)); m_TextLvNow.text = Language.Get("Z1024", advancedLv); m_TextAttributes.text = evolve.AttrName + "+" + evolve.AttrValue; m_TextLvNext.text = Language.Get("Z1024", advancedLv + 1); m_TextAttribute2.text = evolveNext.AttrName + "+" + evolveNext.AttrValue; ItemCellModel cellModel = new ItemCellModel(evolve.CostItemID, true, (ulong)1); m_ItemCell.Init(cellModel); if (advancedLv == 0) { m_TextAttributesA.text = "装备强化等级到达" + evolveNext.NeedPlusLV + "级"; m_TextAttributesB.text = "消耗" + evolveNext.CostItemCount + "个强化水晶"; } else { m_TextAttributesA.text = "装备强化等级到达" + evolve.NeedPlusLV + "级"; m_TextAttributesB.text = "消耗" + evolve.CostItemCount + "个强化水晶"; } } private void FullLevel(int advancedLv) { m_FullLevelObj.SetActive(true); var evolve = strengthModel.GetEquipPlusEvolve(strengthModel.SelectEquipPlace, advancedLv); m_TextLvFull.text = Language.Get("Z1024", advancedLv); m_TextAttributesFull.text = evolve.AttrName + "+" + evolve.AttrValue; } private void SetEquipEvolution() { m_AdvancedObj.SetActive(false); m_FullLevelObj.SetActive(false); int equipLevel = strengthModel.SelectLevel; int equipPlace = strengthModel.SelectEquipPlace; int equipIndex = EquipPlaceMapConfig.GetServerPlace(equipLevel, equipPlace); equipType = strengthModel.GetEquipStrengthType(equipPlace); int equipLv = 0; int advancedLv = 0; if (strengthModel.EquipStrengthDic.ContainsKey(equipIndex))//获取当前强化等级 { equipLv = strengthModel.EquipStrengthDic[equipIndex].EquipPartStarLV; advancedLv = strengthModel.EquipStrengthDic[equipIndex].EvolveLV; } int advancedMaxLv = 0; if (strengthModel.EvolutionTypeMaxDic.ContainsKey(equipType)) { advancedMaxLv = strengthModel.EvolutionTypeMaxDic[equipType]; } if (advancedLv < advancedMaxLv) { Reinforceable(advancedLv); } else { FullLevel(advancedLv); } } private bool IsCarryOut() { int equipLv = 0; int advancedLv = 0; int itemCount = 0; int equipIndex = EquipPlaceMapConfig.GetServerPlace(strengthModel.SelectLevel, strengthModel.SelectEquipPlace); if (strengthModel.EquipStrengthDic.ContainsKey(equipIndex))//获取当前强化等级 { equipLv = strengthModel.EquipStrengthDic[equipIndex].EquipPartStarLV; advancedLv = strengthModel.EquipStrengthDic[equipIndex].EvolveLV; } var equipPlusEvolve = strengthModel.GetEquipPlusEvolve(strengthModel.SelectEquipPlace, advancedLv + 1); if (equipPlusEvolve == null) { DebugEx.LogError("没有找到表数据"); return false; } itemCount = playerPack.GetItemCountByID(PackType.Item, equipPlusEvolve.CostItemID); if (equipPlusEvolve.NeedPlusLV > equipLv) { DebugEx.LogError("所需强化等级不足"); return false; } if (equipPlusEvolve.CostItemCount > itemCount) { DebugEx.LogError("所需材料不足"); return false; } return true; } } } System/EquipGem/EquipStrengthModel.cs
@@ -49,6 +49,8 @@ public Dictionary<int, int> PartTypeDic = new Dictionary<int, int>();//强化的部位类型 public Dictionary<int, int> EvolutionTypeMaxDic = new Dictionary<int, int>(); public event Action EquipStrengthUpdate;//强化数据刷新 public event Action EquipStrengthLvUpdate;//强化升级成功 public event Action EquipStrngthEvolutionLv;//进阶成功 public event Action SelectEquipRefresh;//二级页签刷新 public event Action SelectLevelRefresh;//一级页签刷新 @@ -126,7 +128,16 @@ equipStrength.EvolveLV = equipPartPlus.EvolveLV; if (EquipStrengthDic.ContainsKey(equipPartPlus.EquipIndex)) { var equip = EquipStrengthDic[equipPartPlus.EquipIndex]; EquipStrengthDic[equipPartPlus.EquipIndex] = equipStrength; if (equip.EquipPartStarLV != equipPartPlus.EquipPartStarLV && EquipStrengthLvUpdate!=null) { EquipStrengthLvUpdate(); } if (equip.EvolveLV != equipPartPlus.EvolveLV && EquipStrngthEvolutionLv != null) { EquipStrngthEvolutionLv(); } } else { @@ -243,10 +254,15 @@ return itemPlusConfig; } public EquipPlusEvolveClass GetEquipPlusEvolve(int equipType, int equipLv = 0)//获取装备进化数据 public EquipPlusEvolveClass GetEquipPlusEvolve(int equipPlace, int equipLv)//获取装备进化数据 { EquipPlusEvolveClass equipPlusEvolve = new EquipPlusEvolveClass(); var equipPlusEvolveConfig = EquipPlusEvolveConfig.GetEquipPlaceAndEvolveLV(equipType, equipLv); int lvType = 1; if (equipLv != 0) { lvType = equipLv; } var equipPlusEvolveConfig = EquipPlusEvolveConfig.GetEquipPlaceAndEvolveLV(equipPlace, lvType); if (equipPlusEvolveConfig != null) { equipPlusEvolve.EquipType = equipPlusEvolveConfig.EquipPlace; @@ -270,25 +286,25 @@ switch (config.ISPercentage) { case 0: equipPlusEvolve.AttrValue = value.ToString(); if (equipLv == 0) { equipPlusEvolve.AttrValue = 0.ToString(); } equipPlusEvolve.AttrValue = value.ToString(); } break; case 1: equipPlusEvolve.AttrValue = (value / 100).ToString() + "%"; if (equipLv == 0) { equipPlusEvolve.AttrValue = 0.ToString() + "%"; } equipPlusEvolve.AttrValue = (value / 100).ToString() + "%"; } break; case 2: equipPlusEvolve.AttrValue = value.ToString() + "%"; if (equipLv == 0) { equipPlusEvolve.AttrValue = 0.ToString() + "%"; } equipPlusEvolve.AttrValue = value.ToString() + "%"; } break; } } System/EquipGem/EquipStrengthWin.cs
@@ -25,6 +25,9 @@ [SerializeField] Button m_AutomaticBtn; [SerializeField] Button m_StopBtn; [SerializeField] UIEffect m_UIEffect1A; [SerializeField] UIEffect m_UIEffect1B; EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } } EquipGemModel model { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } } EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } } @@ -137,7 +140,7 @@ { SetStrengthenedState(); m_Controller.m_Scorller.RefreshActiveCellViews(); } } } void DisplayEquips() { @@ -194,7 +197,7 @@ OnClickStopBtn(); IsAutomaticBool = false; } DisplayEquips(); DisplayEquips(); if (strengthModel.SelectLevel != -1) { SetStrengthenedState(); @@ -236,9 +239,11 @@ int equipIndex = EquipPlaceMapConfig.GetServerPlace(equipLevel, equipPlace); int star = equipStarModel.GetEquipStarLevel(equipLevel, equipPlace); int equipLv = 0; int advancedLv = 0; if (strengthModel.EquipStrengthDic.ContainsKey(equipIndex))//获取当前强化等级 { equipLv = strengthModel.EquipStrengthDic[equipIndex].EquipPartStarLV; advancedLv = strengthModel.EquipStrengthDic[equipIndex].EvolveLV; } int equipType = strengthModel.GetEquipStrengthType(equipPlace); @@ -251,10 +256,11 @@ int maxLv = strengthModel.GetEquipLevelMax(equipType);//获取最大强化等级 m_EquipEvolution.gameObject.SetActive(true); m_EquipEvolution.SetEquipEvolution(equipPlace, advancedLv); if (equipLv >= maxLv)//满级 { m_BottomFrame.SetActive(false); m_EquipStrengthFull.gameObject.SetActive(true); m_EquipStrengthFull.gameObject.SetActive(true); m_EquipStrengthFull.SetEquipStrengthFull(equipGuid, equipLevel, equipPlace); } else if (maxLv > equipLv && equipLv >= itemPlusMaxConfig.levelMax)//强化上限 System/FairyAu/BasicFunction.cs
@@ -11,7 +11,6 @@ [SerializeField] Button SkillBtn; [SerializeField] Button HallBtn; [SerializeField] Button bossBtn; [SerializeField] Button TreasuryBtn; [SerializeField] Button FairyAuBtn; [SerializeField] Button LivenBtn; [SerializeField] Button _fairyStoreBtn; @@ -44,7 +43,6 @@ m_SalaryGetBtn.onClick.AddListener(OnSalaryGet); SkillBtn.onClick.AddListener(SkillBtna); HallBtn.onClick.AddListener(HallButton); TreasuryBtn.onClick.AddListener(TreasuryButton); FairyAuBtn.AddListener(FairyAuButton); } @@ -98,11 +96,6 @@ private void OnBossBtn() { WindowCenter.Instance.Open<FairyBoss>(); } void TreasuryButton() { WindowCenter.Instance.Open<WarehouseTipsWin>(); } void FairyAuButton() System/FairyAu/ConvertItemTipsWin.cs
File was deleted System/FairyAu/ConvertItemTipsWin.cs.meta
File was deleted System/FairyAu/DonateEquipTipsWin.cs
File was deleted System/FairyAu/DonateEquipTipsWin.cs.meta
File was deleted System/FairyAu/FairyAuTreasureModel.cs
File was deleted System/FairyAu/FairyAuTreasureModel.cs.meta
File was deleted System/FairyAu/TreasureTheLog.cs
File was deleted System/FairyAu/TreasureTheLog.cs.meta
File was deleted System/FairyAu/WarehouseTipsWin.cs
File was deleted System/FairyAu/WarehouseTipsWin.cs.meta
File was deleted System/Realm/RealmLevelUpBehaviour.cs
@@ -111,10 +111,13 @@ switch (error) { case 1: SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_1"); break; case 2: SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_2"); break; case 3: SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_3"); break; } } System/Realm/RealmModel.cs
@@ -83,21 +83,12 @@ m_RealmProperties.Add(config.Lv, dict); } if (stages.Contains(config.Lv)) { stages = new List<int>(); m_RealmStages.Add(stages); } stages.Add(config.Lv); if (config.BossID != 0) { var nextConfig = RealmConfig.Get(config.Lv + 1); if (nextConfig != null) { stages.Add(config.Lv + 1); } stages = new List<int>(); m_RealmStages.Add(stages); } if (!string.IsNullOrEmpty(config.equips)) @@ -167,8 +158,13 @@ for (int i = 0; i < m_RealmStages.Count; i++) { var stages = m_RealmStages[i]; if (stages.Contains(realmLevel)) var index = stages.IndexOf(realmLevel); if (index != -1) { if (stages.Count == 1) { return i - 1; } return i; } } System/Realm/RealmWin.cs
@@ -19,6 +19,8 @@ [SerializeField] RealmLevelUpBehaviour m_RealmLevelUp; [SerializeField] RealmAnimationBehaviour m_RealmAnimation; [SerializeField] RealmStageBehaviour[] m_RealmStages; [SerializeField] Transform m_ContainerUnlockEquip; [SerializeField] Image m_EquipName; [SerializeField] Transform m_ContainerBoss; [SerializeField] RealmHeartMagicBehaviour m_RealmHeartMagic; [SerializeField] Button m_RealmRestraint; @@ -27,6 +29,10 @@ [SerializeField] PositionTween m_RealmBriefTween; [SerializeField] PositionTween m_RealmLevelUpTween; int cacheRealmLevel = 0; const int REALM_STAGE_COUNT = 5; RealmState m_RealmState = RealmState.LevelUp; RealmState realmState @@ -86,6 +92,8 @@ PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent; model.selectRealmRefresh += SelectRealmRefresh; m_RealmAnimation.onRotateComplete += OnRotateComplete; cacheRealmLevel = PlayerDatas.Instance.baseData.realmLevel; } protected override void OnActived() @@ -96,8 +104,15 @@ HideRealmBoss(); DisplayRealmUp(); m_RealmBriefTween.Play(); m_RealmLevelUpTween.Play(); var realmLevel = PlayerDatas.Instance.baseData.realmLevel; var requireLevelUp = realmLevel < model.realmMaxLevel && model.selectRealm > realmLevel; if (requireLevelUp) { m_RealmLevelUpTween.Play(); } } protected override void OnAfterOpen() @@ -137,6 +152,7 @@ DisplayRealmLevelUp(); DisplayRealmStages(); DisplayRealmBrief(); DisplayUnlockEquip(); } void HideRealmUp() @@ -167,7 +183,8 @@ void DisplayRealmStages() { var stage = model.GetRealmStage(model.selectRealm); var realmLevel = PlayerDatas.Instance.baseData.realmLevel; var stage = model.GetRealmStage(realmLevel); m_RealmAnimation.SetDefault(); List<int> realms = null; if (model.TryGetRealmStages(stage, out realms)) @@ -175,18 +192,10 @@ for (int i = 0; i < m_RealmStages.Length; i++) { var index = m_RealmStages[i].animIndex; if (index < realms.Count) m_RealmStages[i].gameObject.SetActive(index < REALM_STAGE_COUNT); if (realms[0] + index <= model.realmMaxLevel) { m_RealmStages[i].gameObject.SetActive(true); m_RealmStages[i].Display(realms[index]); } else { m_RealmStages[i].gameObject.SetActive(false); if (realms[realms.Count - 1] < model.realmMaxLevel) { m_RealmStages[i].Display(realms[0] + index); } m_RealmStages[i].Display(realms[0] + index); } } } @@ -211,6 +220,41 @@ m_RealmBrief.Display(model.selectRealm); } void DisplayUnlockEquip() { var realmLevel = PlayerDatas.Instance.baseData.realmLevel; m_ContainerUnlockEquip.gameObject.SetActive(false); var stage = model.GetRealmStage(realmLevel); List<int> realms = null; if (model.TryGetRealmStages(stage, out realms)) { for (int i = 0; i < REALM_STAGE_COUNT; i++) { var level = realms[0] + i; var equipSet = 0; if (realmLevel < level && model.selectRealm != level && model.IsUnlockEquipRealm(level, out equipSet)) { var index = realms.IndexOf(level); m_ContainerUnlockEquip.gameObject.SetActive(true); foreach (var realmStage in m_RealmStages) { if (realmStage.animIndex == index) { var worldpos = realmStage.transform.TransformPoint(Vector2.zero + Vector2.down * 60); var localpos = m_ContainerRealmUp.InverseTransformPoint(worldpos); m_ContainerUnlockEquip.localPosition = localpos; break; } } var config = RealmConfig.Get(level); m_EquipName.SetSprite(config.equipNameIcon); break; } } } } private void PlayerDataRefreshEvent(PlayerDataType dataType) { if (dataType == PlayerDataType.RealmLevel) @@ -222,13 +266,23 @@ } else { var stage = model.GetRealmStage(realmLevel + 1); var currentStage = model.GetRealmStage(model.selectRealm); if (stage != currentStage) { m_RealmAnimation.StartRotate(); } var stage = model.GetRealmStage(realmLevel); var currentStage = model.GetRealmStage(cacheRealmLevel); model.selectRealm = realmLevel + 1; if (cacheRealmLevel > realmLevel || stage > currentStage + 1) { model.selectRealm = realmLevel + 1; DisplayRealmStages(); } else { if (stage != currentStage) { m_RealmAnimation.StartRotate(); m_ContainerUnlockEquip.gameObject.SetActive(false); } } cacheRealmLevel = realmLevel; } } } @@ -236,25 +290,27 @@ private void OnRotateComplete() { var realmLevel = PlayerDatas.Instance.baseData.realmLevel; var stage = model.GetRealmStage(realmLevel + 1); var stage = model.GetRealmStage(realmLevel); List<int> realms = null; if (model.TryGetRealmStages(stage, out realms)) { for (int i = 0; i < m_RealmStages.Length; i++) { var index = m_RealmStages[i].animIndex; if (index > 4) if (index >= REALM_STAGE_COUNT && realms[0] + index <= model.realmMaxLevel) { m_RealmStages[i].Display(realms[0] + index); } } } DisplayUnlockEquip(); } private void SelectRealmRefresh() { DisplayRealmBrief(); DisplayRealmLevelUp(); DisplayUnlockEquip(); } private void OnBack() System/Role/PropertyBehaviour.cs
@@ -15,130 +15,75 @@ public void Display(int _property, int _value) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact( UIHelper.ReplaceLargeNum(UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } m_PropertyName.text = GetPropertyName(_property); m_PropertyValue.text = GetValueLabel(_property, _value); } public void DisplayUpper(int _property, int _value) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } } public void DisplayColon(int _property, int _value) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = StringUtility.Contact(config.Name, "："); m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } m_PropertyName.text = GetPropertyName(_property); m_PropertyValue.text = GetAddValueLabel(_property, _value); } public void DisplayAdd(int _property, int _value, int _add) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = StringUtility.Contact(config.Name, "："); m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); if (_add == 0) { m_PropertyAdd.text = string.Empty; } else { m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } } m_PropertyName.text = StringUtility.Contact(GetPropertyName(_property), "："); m_PropertyValue.text = GetValueLabel(_property, _value); DisplayAddLabel(_property, _add); } public void DisplayGodWeaponAdd(int _property, int _value, int _add) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); if (_add == 0) { m_PropertyAdd.text = string.Empty; } else { m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } } } public void DisplayCompare(int _property, int _value, int _add) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); m_PropertyAdd.text = StringUtility.Contact(UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } m_PropertyName.text = GetPropertyName(_property); m_PropertyValue.text = GetValueLabel(_property, _value); DisplayAddLabel(_property, _add); } public void DisplayUp(int _property, int _value, int _add) { var config = PlayerPropertyConfig.Get(_property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_value, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); if (_add == 0) { m_PropertyAdd.text = string.Empty; } else { m_PropertyAdd.text = StringUtility.Contact("+", UIHelper.ReplaceLargeNum( UIHelper.ReplacePercentage(_add, config.ISPercentage, UIHelper.GetPropertyDecimalCount(_property))), config.ISPercentage == 1 ? "%" : string.Empty); } } m_PropertyName.text = GetPropertyName(_property); m_PropertyValue.text = GetAddValueLabel(_property, _value); DisplayAddLabel(_property, _add); } public void DisplayGem(int _property, int _value) { var config = PlayerPropertyConfig.Get(_property); m_PropertyName.text = GetPropertyName(_property); m_PropertyValue.text = StringUtility.Contact("+", PlayerPropertyConfig.GetPropertyDescription(_property, _value, 2, false)); } string GetPropertyName(int property) { var config = PlayerPropertyConfig.Get(property); if (config != null) { m_PropertyName.text = config.Name; m_PropertyValue.text = StringUtility.Contact("+", UIHelper.ReplacePercentage(_value, config.ISPercentage, config.ISPercentage == 1 ? 2 : 1), config.ISPercentage == 1 ? "%" : string.Empty); return config.Name; } return string.Empty; } void DisplayAddLabel(int _property, int _value) { if (_value == 0) { m_PropertyAdd.text = string.Empty; } else { m_PropertyAdd.text = GetAddValueLabel(_property, _value); } } string GetAddValueLabel(int _property, int _value) { return StringUtility.Contact("+", GetValueLabel(_property, _value)); } string GetValueLabel(int _property, int _value) { var decimalCount = UIHelper.GetPropertyDecimalCount(_property); return PlayerPropertyConfig.GetPropertyDescription(_property, _value, decimalCount, true); } public void SetColor(TextColType colorType, bool bright) System/WindowBase/ModelCenter.cs
@@ -145,7 +145,6 @@ RegisterModel<PreciousItemGetModel>(); RegisterModel<PlayerMainDate>(); RegisterModel<StoryMissionsModel>(); RegisterModel<FairyAuTreasureModel>(); RegisterModel<BoxGetItemModel>(); RegisterModel<RedPacketModel>(); RegisterModel<GuardModel>(); System/WindowJump/WindowJumpMgr.cs
@@ -455,7 +455,7 @@ SetJumpLogic<TreasureSelectWin>(); break; case JumpUIType.UnionWarehouse: SetJumpLogic<WarehouseTipsWin>(_tagWinSearchModel.TABID); DebugEx.LogError("原本仙盟仓库已删除"); break; case JumpUIType.UnionHall: SetJumpLogic<HallTipsWin>(_tagWinSearchModel.TABID);
