| System/DailyQuest/DailyQuestBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/ItemTipsModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/CommonItemBaisc.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/New/FairyWearWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HoistingWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Pet/RidingAndPetActivationModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/RoleParticulars/RoleParticularModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureAchievement.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Vip/VipModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/LanguageVerify.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/DailyQuest/DailyQuestBehaviour.cs
@@ -107,6 +107,7 @@ m_AchievementEffect = null; } this.gameObject.name = "DailyQuestBehaviour_0"; model.dailyQuestProgressUpdateEvent -= OnProgressUpdate; dungeonModel.updateDungeonBuyCnt -= OnTotalTimeChange; dungeonModel.dungeonRecordChangeEvent -= OnDungeonRecordChange; System/KnapSack/Logic/ItemTipsModel.cs
@@ -428,7 +428,15 @@ , itemModel.packType, itemModel.itemInfo.ItemGUID, ConfigParse.Analysis(itemModel.itemInfo.UserData),ItemTipChildType.Normal); } public void SetCompareAttrData(PackType type,int equipPlace) public void SetCompareAttrData(ItemModel itemModel) { compareAttrData = new ItemAttrData(itemModel.itemInfo.ItemID, false, (ulong)itemModel.itemInfo.ItemCount , itemModel.itemInfo.ItemPlace, itemModel.itemInfo.IsBind, true , itemModel.packType, itemModel.itemInfo.ItemGUID, ConfigParse.Analysis(itemModel.itemInfo.UserData)); } private void SetCompareAttrData(PackType type,int equipPlace) { compareAttrData = null; ItemModel itemModel = null; System/KnapSack/New/CommonItemBaisc.cs
@@ -119,6 +119,8 @@ get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } /// <summary> /// 初始化数据 bool值用来判断是否需要展示评分高低或者职业限制 /// </summary> @@ -219,9 +221,7 @@ { equipScore1 = putOnModel.equipScore; } int playerJob = PlayerDatas.Instance.baseData.Job; if (playerJob == Math.Floor((double)itemConfig.JobLimit / 100) || itemConfig.JobLimit == 0) { if (equipScore1 > score) System/KnapSack/New/FairyWearWin.cs
@@ -90,16 +90,16 @@ { _itemCell01.gameObject.SetActive(true); _itemCell01.Init(_itemModel01, false); _itemCell01.cellBtn.RemoveAllListeners(); _itemCell01.cellBtn.AddListener(()=> { if (PackSendQuestMgr.Instance.sendItemModel != null) { itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel,true); itemTipsModel.SetCompareAttrData(PackType.rptEquip, (int)RoleEquipType.retFairyCan); itemTipsModel.ShowUICtrl(); } }); //_itemCell01.cellBtn.RemoveAllListeners(); //_itemCell01.cellBtn.AddListener(()=> //{ // if (PackSendQuestMgr.Instance.sendItemModel != null) // { // itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel,true); // itemTipsModel.SetCompareAttrData(_itemModel01); // itemTipsModel.ShowUICtrl(); // } //}); //pdr ToDo _wear01Text.text = Language.Get("BagWin_BtnText_1"); } @@ -116,16 +116,16 @@ //pdr ToDo _wear02Text.text = Language.Get("BagWin_BtnText_1"); _itemCell02.cellBtn.RemoveAllListeners(); _itemCell02.cellBtn.AddListener(()=> { if (PackSendQuestMgr.Instance.sendItemModel != null) { itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel, true); itemTipsModel.SetCompareAttrData(PackType.rptEquip, (int)RoleEquipType.retFairyCan2); itemTipsModel.ShowUICtrl(); } }); //_itemCell02.cellBtn.RemoveAllListeners(); //_itemCell02.cellBtn.AddListener(()=> //{ // if (PackSendQuestMgr.Instance.sendItemModel != null) // { // itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel, true); // itemTipsModel.SetCompareAttrData(_itemModel02); // itemTipsModel.ShowUICtrl(); // } //}); } else System/MainInterfacePanel/HoistingWin.cs
@@ -32,6 +32,7 @@ PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } WorldBossModel Worldmodel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } } DailyQuestModel dailyquestmodel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } #region Built-in protected override void BindController() { @@ -43,6 +44,7 @@ FairyLandButton.AddListener(() => { Close(); dailyquestmodel.currentDailyQuest = (int)DailyQuestType.FairyLand; WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1); }); @@ -54,6 +56,7 @@ BountyTaskButton.AddListener(() => { Close(); dailyquestmodel.currentDailyQuest = (int)DailyQuestType.BountyMission; WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1); }); System/Pet/RidingAndPetActivationModel.cs
@@ -75,7 +75,7 @@ public enum RidingAndPetProperty { PetAttack = 508,//灵宠攻击 PetLife = 509,//灵宠生命 PetLife = 509,//人物生命(灵宠赋予角色的) MountProperty1 = 510,//坐骑属性效果1 MountProperty2 = 511,//坐骑属性效果2 } @@ -87,27 +87,27 @@ { return 0f; } if (skillconfig.Effect1 == (int)RidingAndPetProperty.PetLife) if (skillconfig.Effect1 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue11, skillconfig.EffectValue12); } else if (skillconfig.Effect2 == (int)RidingAndPetProperty.PetLife) else if (skillconfig.Effect2 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue21, skillconfig.EffectValue22); } else if (skillconfig.Effect3 == (int)RidingAndPetProperty.PetLife) else if (skillconfig.Effect3 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue31, skillconfig.EffectValue32); } else if (skillconfig.Effect4 == (int)RidingAndPetProperty.PetLife) else if (skillconfig.Effect4 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue41, skillconfig.EffectValue42); } else if (skillconfig.Effect5 == (int)RidingAndPetProperty.PetLife) else if (skillconfig.Effect5 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue51, skillconfig.EffectValue52); } else if (skillconfig.Effect6 == (int)RidingAndPetProperty.PetLife) else if (skillconfig.Effect6 == (int)RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue61, skillconfig.EffectValue62); } @@ -171,27 +171,27 @@ { return 0f; } if (skillconfig.Effect1 == (int)RidingAndPetProperty.PetAttack) if (skillconfig.Effect1 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue11, skillconfig.EffectValue12); } else if (skillconfig.Effect2 == (int)RidingAndPetProperty.PetAttack) else if (skillconfig.Effect2 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue21, skillconfig.EffectValue22); } else if (skillconfig.Effect3 == (int)RidingAndPetProperty.PetAttack) else if (skillconfig.Effect3 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue31, skillconfig.EffectValue32); } else if (skillconfig.Effect4 == (int)RidingAndPetProperty.PetAttack) else if (skillconfig.Effect4 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue41, skillconfig.EffectValue42); } else if (skillconfig.Effect5 == (int)RidingAndPetProperty.PetAttack) else if (skillconfig.Effect5 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue51, skillconfig.EffectValue52); } else if (skillconfig.Effect6 == (int)RidingAndPetProperty.PetAttack) else if (skillconfig.Effect6 == (int)RidingAndPetProperty.PetLife) { return GetPetAttack(skillconfig.EffectValue61, skillconfig.EffectValue62); } System/RoleParticulars/RoleParticularModel.cs
@@ -532,27 +532,27 @@ { return 0; } if (skillconfig.Effect1 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) if (skillconfig.Effect1 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue11, skillconfig.EffectValue12, pets); } else if (skillconfig.Effect2 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) else if (skillconfig.Effect2 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue21, skillconfig.EffectValue22, pets); } else if (skillconfig.Effect3 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) else if (skillconfig.Effect3 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue31, skillconfig.EffectValue32, pets); } else if (skillconfig.Effect4 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) else if (skillconfig.Effect4 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue41, skillconfig.EffectValue42, pets); } else if (skillconfig.Effect5 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) else if (skillconfig.Effect5 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue51, skillconfig.EffectValue52, pets); } else if (skillconfig.Effect6 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetLife) else if (skillconfig.Effect6 == (int)RidingAndPetActivationModel.RidingAndPetProperty.PetAttack) { return GetPetAttack(skillconfig.EffectValue61, skillconfig.EffectValue62, pets); } System/Treasure/TreasureAchievement.cs
@@ -107,6 +107,12 @@ model.achievementProgressUpdateEvent -= OnAchievementProgressUpdate; model.achievementCompletedEvent -= OnAchievementCompleted; treasureModel.treasureStateChangeEvent -= TreasureStateChangeEvent; if (FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide() && this.name.Equals("Achievement_0")) { FunctionalGuideCenter.Instance.RemoveGuide(65); } } public override void OpeningShow() System/Vip/VipModel.cs
@@ -824,7 +824,7 @@ { return; } if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.CheckOpen<MainInterfaceWin>()) if (!NewBieCenter.Instance.inGuiding && WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !waitingJump) { if (PlayerDatas.Instance.baseData.coinPointTotal > 0 && !firstChargeRewardGet && firstRechargeOpen && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()) Utility/LanguageVerify.cs
@@ -8,7 +8,7 @@ public class LanguageVerify : Singleton<LanguageVerify> { const string RequireVerifyAppid = "498_mrgame"; const string RequireVerifyAppid = "498mrgame"; const string Sercret = "c345a165b566d1c421afd8a748373d7f"; bool requireVerify {
