| 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
@@ -333,7 +333,7 @@ public void OnBeforePlayerDataInitialize() { } public override void UnInit() @@ -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
@@ -1,195 +1,197 @@ using UnityEngine; using UnityEngine.UI; using TableConfig; using Snxxz.UI; using System.Collections.Generic; using System; using System.Linq; namespace Snxxz.UI { public class CommonItemBaisc : MonoBehaviour { Image _bgIcon; public Image bgIcon { get { if (_bgIcon == null) { var _trans = transform.Find("EquipBG"); _bgIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _bgIcon; } } Image _itemIcon; public Image itemIcon { get { if (_itemIcon == null) { var _trans = transform.Find("ItemIcon"); _itemIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _itemIcon; } } Image _bindIcon; public Image bindIcon { get { if (_bindIcon == null) { var _trans = transform.Find("BindBG"); _bindIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _bindIcon; } } Image _stateIcon; public Image stateIcon { get { if (_stateIcon == null) { var _trans = transform.Find("stateIcon"); _stateIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _stateIcon; } } Text _countText; public Text countText { get { if (_countText == null) { var _trans = transform.Find("CountText"); _countText = _trans != null ? _trans.GetComponent<Text>() : null; } return _countText; } } GameObject _starlist; public GameObject starlist { get { if (_starlist == null) { var _trans = transform.Find("StarList"); _starlist = _trans != null ? _trans.gameObject : null; } return _starlist; } } Button _cellBtn; public Button cellBtn { get { if (_cellBtn == null) _cellBtn = this.GetComponent<Button>(); return _cellBtn; } } public ItemConfig itemConfig; PackModelInterface _modelInterface; protected PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } PlayerPackModel _playerPack; protected PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } /// <summary> /// 初始化数据 bool值用来判断是否需要展示评分高低或者职业限制 /// </summary> /// <param name="model"></param> /// <param name="isCompare"></param> public virtual void Init(ItemModel model,bool isCompare = false) { itemConfig = Config.Instance.Get<ItemConfig>(model.itemInfo.ItemID); InitUI(model.itemInfo.ItemGUID,model.itemInfo.ItemID,(ulong)model.itemInfo.ItemCount,model.equipScore,model.itemInfo.IsBind,model.packType,isCompare,model.useDataDict); } /// <summary> /// 初始化数据（预览） /// </summary> /// <param name="model"></param> public virtual void Init(ItemCellModel model) { itemConfig = model.itemConfig; InitUI(model.guid,model.itemId, model.count, model.score, model.isBind,model.packType,model.isCompare,model.useDataDic); } private void InitUI(string guid,int itemId,ulong count,int score,int isBind,PackType type,bool isCompare, Dictionary<int, List<int>> useDataDic) { if (itemConfig == null) return; itemIcon.gameObject.SetActive(true); bgIcon.gameObject.SetActive(true); itemIcon.SetSprite(itemConfig.IconKey); bgIcon.SetItemBackGround(modelInterface.GetItemQuality(itemId, useDataDic)); int i = 0; for(i = 0; i < starlist.transform.childCount; i++) { Image starIcon = starlist.transform.GetChild(i).GetComponent<Image>(); starIcon.SetSprite("Stars_a"); if (i >= itemConfig.StarLevel) { starIcon.gameObject.SetActive(false); } else { starIcon.gameObject.SetActive(true); } } if(isBind == 0) { bindIcon.gameObject.SetActive(false); } else { bindIcon.gameObject.SetActive(true); } countText.text = UIHelper.ReplaceLargeNum((double)count); if(count > 1) { countText.gameObject.SetActive(true); } else { countText.gameObject.SetActive(false); } if(!isCompare || type == PackType.rptEquip) { stateIcon.gameObject.SetActive(false); } else { stateIcon.gameObject.SetActive(true); using UnityEngine; using UnityEngine.UI; using TableConfig; using Snxxz.UI; using System.Collections.Generic; using System; using System.Linq; namespace Snxxz.UI { public class CommonItemBaisc : MonoBehaviour { Image _bgIcon; public Image bgIcon { get { if (_bgIcon == null) { var _trans = transform.Find("EquipBG"); _bgIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _bgIcon; } } Image _itemIcon; public Image itemIcon { get { if (_itemIcon == null) { var _trans = transform.Find("ItemIcon"); _itemIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _itemIcon; } } Image _bindIcon; public Image bindIcon { get { if (_bindIcon == null) { var _trans = transform.Find("BindBG"); _bindIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _bindIcon; } } Image _stateIcon; public Image stateIcon { get { if (_stateIcon == null) { var _trans = transform.Find("stateIcon"); _stateIcon = _trans != null ? _trans.GetComponent<Image>() : null; } return _stateIcon; } } Text _countText; public Text countText { get { if (_countText == null) { var _trans = transform.Find("CountText"); _countText = _trans != null ? _trans.GetComponent<Text>() : null; } return _countText; } } GameObject _starlist; public GameObject starlist { get { if (_starlist == null) { var _trans = transform.Find("StarList"); _starlist = _trans != null ? _trans.gameObject : null; } return _starlist; } } Button _cellBtn; public Button cellBtn { get { if (_cellBtn == null) _cellBtn = this.GetComponent<Button>(); return _cellBtn; } } public ItemConfig itemConfig; PackModelInterface _modelInterface; protected PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } PlayerPackModel _playerPack; protected PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } } /// <summary> /// 初始化数据 bool值用来判断是否需要展示评分高低或者职业限制 /// </summary> /// <param name="model"></param> /// <param name="isCompare"></param> public virtual void Init(ItemModel model,bool isCompare = false) { itemConfig = Config.Instance.Get<ItemConfig>(model.itemInfo.ItemID); InitUI(model.itemInfo.ItemGUID,model.itemInfo.ItemID,(ulong)model.itemInfo.ItemCount,model.equipScore,model.itemInfo.IsBind,model.packType,isCompare,model.useDataDict); } /// <summary> /// 初始化数据（预览） /// </summary> /// <param name="model"></param> public virtual void Init(ItemCellModel model) { itemConfig = model.itemConfig; InitUI(model.guid,model.itemId, model.count, model.score, model.isBind,model.packType,model.isCompare,model.useDataDic); } private void InitUI(string guid,int itemId,ulong count,int score,int isBind,PackType type,bool isCompare, Dictionary<int, List<int>> useDataDic) { if (itemConfig == null) return; itemIcon.gameObject.SetActive(true); bgIcon.gameObject.SetActive(true); itemIcon.SetSprite(itemConfig.IconKey); bgIcon.SetItemBackGround(modelInterface.GetItemQuality(itemId, useDataDic)); int i = 0; for(i = 0; i < starlist.transform.childCount; i++) { Image starIcon = starlist.transform.GetChild(i).GetComponent<Image>(); starIcon.SetSprite("Stars_a"); if (i >= itemConfig.StarLevel) { starIcon.gameObject.SetActive(false); } else { starIcon.gameObject.SetActive(true); } } if(isBind == 0) { bindIcon.gameObject.SetActive(false); } else { bindIcon.gameObject.SetActive(true); } countText.text = UIHelper.ReplaceLargeNum((double)count); if(count > 1) { countText.gameObject.SetActive(true); } else { countText.gameObject.SetActive(false); } if(!isCompare || type == PackType.rptEquip) { stateIcon.gameObject.SetActive(false); } else { stateIcon.gameObject.SetActive(true); if(type != PackType.rptDogzItem) { bool isOverdue = modelInterface.IsOverdue(guid, itemId, useDataDic); @@ -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) @@ -246,7 +246,7 @@ { stateIcon.SetSprite("EquipForbidIcon"); } } } else { var dogzModel = ModelCenter.Instance.GetModel<DogzModel>(); @@ -278,61 +278,61 @@ stateIcon.gameObject.SetActive(false); } } } } } } public class ItemCellModel { public string guid { get; private set; } public int itemId { get; private set; } public ulong count { get; private set; } public int isBind { get; private set; } public int score { get; private set; } public bool isCompare { get; private set; } public ItemConfig itemConfig { get; private set;} public PackType packType { get; private set; } public Dictionary<int, List<int>> useDataDic { get; private set; } public Dictionary<int, int> specAttrDic { get; private set; } PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } public ItemCellModel(int itemId,bool isPreview = false,ulong count = 0,int isBind = 0,string guid = "",PackType type = PackType.rptDeleted,bool isCompare = false, Dictionary<int, List<int>> useDataDic = null) { specAttrDic = new Dictionary<int, int>(); this.guid = guid; this.itemId = itemId; this.count = count; this.isBind = isBind; this.itemConfig = Config.Instance.Get<ItemConfig>(itemId); this.isCompare = isCompare; this.useDataDic = useDataDic; this.packType = type; if(CheckIsCustomItem()) { this.itemId = itemConfig.EffectValueA1; this.itemConfig = Config.Instance.Get<ItemConfig>(this.itemId); } this.score = modelInterface.SetEquipScore(type,itemId,useDataDic,isPreview); } public bool CheckIsCustomItem() { if (itemConfig == null) return false; if (itemConfig.Effect1 == 220) { return true; } return false; } } } } } } } public class ItemCellModel { public string guid { get; private set; } public int itemId { get; private set; } public ulong count { get; private set; } public int isBind { get; private set; } public int score { get; private set; } public bool isCompare { get; private set; } public ItemConfig itemConfig { get; private set;} public PackType packType { get; private set; } public Dictionary<int, List<int>> useDataDic { get; private set; } public Dictionary<int, int> specAttrDic { get; private set; } PackModelInterface _modelInterface; PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } } public ItemCellModel(int itemId,bool isPreview = false,ulong count = 0,int isBind = 0,string guid = "",PackType type = PackType.rptDeleted,bool isCompare = false, Dictionary<int, List<int>> useDataDic = null) { specAttrDic = new Dictionary<int, int>(); this.guid = guid; this.itemId = itemId; this.count = count; this.isBind = isBind; this.itemConfig = Config.Instance.Get<ItemConfig>(itemId); this.isCompare = isCompare; this.useDataDic = useDataDic; this.packType = type; if(CheckIsCustomItem()) { this.itemId = itemConfig.EffectValueA1; this.itemConfig = Config.Instance.Get<ItemConfig>(this.itemId); } this.score = modelInterface.SetEquipScore(type,itemId,useDataDic,isPreview); } public bool CheckIsCustomItem() { if (itemConfig == null) return false; if (itemConfig.Effect1 == 220) { return true; } return false; } } }
@@ -1,161 +1,161 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Wednesday, September 13, 2017 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class FairyWearWin : Window { #region 成员变量 private Button _closeBtn; private Button _wear01Btn; private Button _wear02Btn; private ItemCell _itemCell01; private ItemCell _itemCell02; private ItemModel _itemModel01 = null; private ItemModel _itemModel02 = null; private Text _wear01Text; private Text _wear02Text; #endregion ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } #region Built-in protected override void BindController() { _closeBtn = transform.Find("CloseBtn").GetComponent<Button>(); _wear01Btn = transform.Find("Fairy01/WearBtn").GetComponent<Button>(); _wear02Btn = transform.Find("Fairy02/WearBtn").GetComponent<Button>(); _itemCell01 = transform.Find("Fairy01/ItemCell").GetComponent<ItemCell>(); _itemCell02 = transform.Find("Fairy02/ItemCell").GetComponent<ItemCell>(); _wear01Text = transform.Find("Fairy01/WearBtn/BtnText").GetComponent<Text>(); _wear02Text = transform.Find("Fairy02/WearBtn/BtnText").GetComponent<Text>(); } protected override void AddListeners() { _closeBtn.onClick.AddListener(OnClickCloseBtn); _wear01Btn.onClick.AddListener(OnClickWear01Btn); _wear02Btn.onClick.AddListener(OnClickWear02Btn); } protected override void OnPreOpen() { SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip); if (singlePack == null) return; _itemModel01 = singlePack.GetItemModelByIndex((int)RoleEquipType.retFairyCan); _itemModel02 = singlePack.GetItemModelByIndex((int)RoleEquipType.retFairyCan2); } protected override void OnAfterOpen() { InitPanel(); } protected override void OnPreClose() { } protected override void OnAfterClose() { } #endregion public void InitPanel() { if (_itemModel01 != null) { _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(); } }); //pdr ToDo _wear01Text.text = Language.Get("BagWin_BtnText_1"); } else { _itemCell01.gameObject.SetActive(false); _wear01Text.text = Language.Get("BagWin_BtnText_2"); } if (_itemModel02 != null) { _itemCell02.gameObject.SetActive(true); _itemCell02.Init(_itemModel02, false); //pdr ToDo //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Wednesday, September 13, 2017 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class FairyWearWin : Window { #region 成员变量 private Button _closeBtn; private Button _wear01Btn; private Button _wear02Btn; private ItemCell _itemCell01; private ItemCell _itemCell02; private ItemModel _itemModel01 = null; private ItemModel _itemModel02 = null; private Text _wear01Text; private Text _wear02Text; #endregion ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerPackModel _playerPack; PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } } #region Built-in protected override void BindController() { _closeBtn = transform.Find("CloseBtn").GetComponent<Button>(); _wear01Btn = transform.Find("Fairy01/WearBtn").GetComponent<Button>(); _wear02Btn = transform.Find("Fairy02/WearBtn").GetComponent<Button>(); _itemCell01 = transform.Find("Fairy01/ItemCell").GetComponent<ItemCell>(); _itemCell02 = transform.Find("Fairy02/ItemCell").GetComponent<ItemCell>(); _wear01Text = transform.Find("Fairy01/WearBtn/BtnText").GetComponent<Text>(); _wear02Text = transform.Find("Fairy02/WearBtn/BtnText").GetComponent<Text>(); } protected override void AddListeners() { _closeBtn.onClick.AddListener(OnClickCloseBtn); _wear01Btn.onClick.AddListener(OnClickWear01Btn); _wear02Btn.onClick.AddListener(OnClickWear02Btn); } protected override void OnPreOpen() { SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip); if (singlePack == null) return; _itemModel01 = singlePack.GetItemModelByIndex((int)RoleEquipType.retFairyCan); _itemModel02 = singlePack.GetItemModelByIndex((int)RoleEquipType.retFairyCan2); } protected override void OnAfterOpen() { InitPanel(); } protected override void OnPreClose() { } protected override void OnAfterClose() { } #endregion public void InitPanel() { if (_itemModel01 != null) { _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(_itemModel01); // itemTipsModel.ShowUICtrl(); // } //}); //pdr ToDo _wear01Text.text = Language.Get("BagWin_BtnText_1"); } else { _itemCell01.gameObject.SetActive(false); _wear01Text.text = Language.Get("BagWin_BtnText_2"); } if (_itemModel02 != null) { _itemCell02.gameObject.SetActive(true); _itemCell02.Init(_itemModel02, false); //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(); } }); } else { _itemCell02.gameObject.SetActive(false); _wear02Text.text = Language.Get("BagWin_BtnText_2"); } } public void OnClickWear01Btn() { PackSendQuestMgr.Instance.CheckSuitReplaceInfo((int)RoleEquipType.retFairyCan); Close(); } public void OnClickWear02Btn() { PackSendQuestMgr.Instance.CheckSuitReplaceInfo((int)RoleEquipType.retFairyCan2); Close(); } private void OnClickCloseBtn() { Close(); } } } //_itemCell02.cellBtn.RemoveAllListeners(); //_itemCell02.cellBtn.AddListener(()=> //{ // if (PackSendQuestMgr.Instance.sendItemModel != null) // { // itemTipsModel.SetCurrentAttrData(PackSendQuestMgr.Instance.sendItemModel, true); // itemTipsModel.SetCompareAttrData(_itemModel02); // itemTipsModel.ShowUICtrl(); // } //}); } else { _itemCell02.gameObject.SetActive(false); _wear02Text.text = Language.Get("BagWin_BtnText_2"); } } public void OnClickWear01Btn() { PackSendQuestMgr.Instance.CheckSuitReplaceInfo((int)RoleEquipType.retFairyCan); Close(); } public void OnClickWear02Btn() { PackSendQuestMgr.Instance.CheckSuitReplaceInfo((int)RoleEquipType.retFairyCan2); Close(); } private void OnClickCloseBtn() { Close(); } } }
@@ -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 {
