Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
New file @@ -0,0 +1,47 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, January 11, 2019 //-------------------------------------------------------- using UnityEngine; using System; namespace TableConfig { public partial class WeekPartyPointConfig : ConfigBase { public int Id { get ; private set ; } public string ImageType1 { get ; private set; } public string ImageType2 { get ; private set; } public string name { get ; private set; } public override string getKey() { return Id.ToString(); } public override void Parse() { try { Id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; ImageType1 = rawContents[1].Trim(); ImageType2 = rawContents[2].Trim(); name = rawContents[3].Trim(); } catch (Exception ex) { DebugEx.Log(ex); } } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: d6d1596f2167efa4c9db2e7971f6fb3a timeCreated: 1547186735 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/GameEngine/Model/ConfigManager.cs
@@ -223,7 +223,7 @@ AddAsyncTask<WeekPartyConfig>(); AddAsyncTask<FashionDressCabinetConfig>(); AddAsyncTask<FashionDressConfig>(); AddAsyncTask<WeekPartyPointConfig>(); while (!AllCompleted()) { var completedCount = 0; System/BlastFurnace/GetEquipPathTips.cs
@@ -297,7 +297,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/Chat/ChatMineVoiceCell.cs
@@ -40,7 +40,7 @@ m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm"); if (_data.vipLv > 0) { m_VipLevel.text = "Vip";//string.Format("V{0}", _data.vipLv); m_VipLevel.text = "VIP";//string.Format("V{0}", _data.vipLv); } else { System/Chat/ChatOtherVoiceCell.cs
@@ -45,7 +45,7 @@ m_ChatTime.text = _data.createTime.ToString("yyyy-MM-dd HH:mm"); if (_data.vipLv > 0) { m_VipLevel.text = "Vip";//string.Format("V{0}", _data.vipLv); m_VipLevel.text = "VIP";//string.Format("V{0}", _data.vipLv); } else { System/Chat/ChatPlayerMineCell.cs
@@ -45,7 +45,7 @@ m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm"); if (chatUserData.vipLv > 0) { m_VipLv.text = "Vip";//string.Format("V{0}", chatUserData.vipLv); m_VipLv.text = "VIP";//string.Format("V{0}", chatUserData.vipLv); } else { System/Chat/ChatPlayerOtherCell.cs
@@ -43,7 +43,7 @@ m_ChatTime.text = data.createTime.ToString("yyyy-MM-dd HH:mm"); if (chatUserData.vipLv > 0) { m_VipLv.text = "Vip";//string.Format("V{0}", chatUserData.vipLv); m_VipLv.text = "VIP";//string.Format("V{0}", chatUserData.vipLv); } else { System/Chat/ChatTip.cs
@@ -273,7 +273,7 @@ chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = "Vip";//StringUtility.Contact("V", chatUserData.vipLv); vipLv = "VIP";//StringUtility.Contact("V", chatUserData.vipLv); } break; } @@ -283,7 +283,7 @@ chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = "Vip";// StringUtility.Contact("V", chatUserData.vipLv); vipLv = "VIP";// StringUtility.Contact("V", chatUserData.vipLv); } break; } @@ -293,7 +293,7 @@ chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = "Vip";// StringUtility.Contact("V", chatUserData.vipLv); vipLv = "VIP";// StringUtility.Contact("V", chatUserData.vipLv); } break; } @@ -303,7 +303,7 @@ chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = "Vip";// StringUtility.Contact("V", chatUserData.vipLv); vipLv = "VIP";// StringUtility.Contact("V", chatUserData.vipLv); } break; } @@ -313,7 +313,7 @@ chatName = chatUserData.name; if (chatUserData.vipLv > 0) { vipLv = "Vip";// StringUtility.Contact("V", chatUserData.vipLv); vipLv = "VIP";// StringUtility.Contact("V", chatUserData.vipLv); } break; } System/FairyAu/FairyFeastTransmitShow.cs
@@ -219,11 +219,11 @@ var data = new UI3DPlayerExhibitionData { job = PlayerDatas.Instance.baseData.Job, clothesId = fashionClothesId > 0 ? fashionClothesId : clothesId, suitLevel = 0, weaponId = 0, clothesId = clothesId, wingsId = wingsId, secondaryId = fashionSecondaryId > 0 ? fashionSecondaryId : secondaryId, secondaryId = secondaryId, fashionClothesId = fashionClothesId, fashionSecondaryId = fashionSecondaryId, isDialogue = false, godWeapons = null }; @@ -245,10 +245,11 @@ { clothesId = itemData.ItemID; } fashionClothesId = 0; itemData = roleParticularModel.GetItemData(RoleEquipType.retFashionClothes); if (itemData != null) { clothesId = itemData.ItemID; fashionClothesId = itemData.ItemID; } wingsId = 0; itemData = roleParticularModel.GetItemData(RoleEquipType.retWing); @@ -262,22 +263,21 @@ { secondaryId = itemData.ItemID; } fashionSecondaryId = 0; itemData = roleParticularModel.GetItemData(RoleEquipType.retFashionWeapon2); if (itemData != null) { secondaryId = itemData.ItemID; fashionSecondaryId = itemData.ItemID; } data = new UI3DPlayerExhibitionData { job = viewPlayerData.rolePropData.Job, clothesId = clothesId, suitLevel = 0, weaponId = 0, wingsId = wingsId, secondaryId = secondaryId, godWeapons = null, isDialogue = false, fashionClothesId = fashionClothesId, fashionSecondaryId = fashionSecondaryId, }; if (m_Player != null) @@ -334,6 +334,7 @@ GameObject clothesModel; Animator clothesAnimator; GameObject secondaryModel; GameObject extraSecondaryModel; GameObject wingsModel; Animator wingsAnimator; @@ -344,10 +345,9 @@ this.showPoint = showPoint; this.job = data.job; var clothes = data.clothesId; var clothes = data.fashionClothesId > 0 ? data.fashionClothesId : data.clothesId; var wingsId = data.wingsId; var secondaryId = data.secondaryId; var godWeapons = data.godWeapons; var secondaryId = data.fashionSecondaryId > 0 ? data.fashionSecondaryId : data.secondaryId; var jobConfig = Config.Instance.Get<JobSetupConfig>(job); @@ -367,13 +367,16 @@ var secondaryResId = 0; if (secondaryId == 0) { if (this.job == 1) if (data.fashionClothesId <= 0) { secondaryResId = clothes + 2900; } else { secondaryResId = jobConfig.BaseEquip[2]; if (this.job == 1) { secondaryResId = clothes + 2900; } else { secondaryResId = jobConfig.BaseEquip[2]; } } } else @@ -382,6 +385,23 @@ secondaryResId = item == null ? jobConfig.BaseEquip[2] : item.ChangeOrd; } PutOnSecondary(secondaryResId); var extraSecondaryId = 0; if (data.job == 1 && data.fashionSecondaryId > 0 && data.fashionClothesId == 0) { if (data.clothesId == 0) { extraSecondaryId = jobConfig.BaseEquip[0] + 2900; } else { var item = Config.Instance.Get<ItemConfig>(data.clothesId); var defaultClothesResId = item == null ? jobConfig.BaseEquip[0] : item.ChangeOrd; extraSecondaryId = defaultClothesResId + 2900; } } PutOnExtraSecondary(job, extraSecondaryId); var wingsResId = 0; if (wingsId != 0) @@ -463,6 +483,10 @@ private void PutOnSecondary(int secondaryResId) { if (this.job == 2) { return; } if (secondaryResId != 0) { var prefab = InstanceResourcesLoader.LoadModelRes(secondaryResId); @@ -479,6 +503,32 @@ secondaryModel.layer = LayerUtility.BossShow; var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]); secondaryModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one); } } } private void PutOnExtraSecondary(int job, int extraSecondaryId) { if (this.job == 2) { return; } if (extraSecondaryId != 0) { var prefab = InstanceResourcesLoader.LoadModelRes(extraSecondaryId); if (!prefab) { var config = Config.Instance.Get<JobSetupConfig>(job); extraSecondaryId = config.BaseEquip[2]; prefab = InstanceResourcesLoader.LoadModelRes(extraSecondaryId); } if (prefab) { extraSecondaryModel = GameObject.Instantiate(prefab); extraSecondaryModel.layer = LayerUtility.BossShow; var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]); extraSecondaryModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one); } } } @@ -552,6 +602,10 @@ { Destroy(secondaryModel); } if (extraSecondaryModel != null) { Destroy(extraSecondaryModel); } if (wingsModel != null) { Destroy(wingsModel); System/KnapSack/Logic/BoxInfoWin.cs
@@ -229,7 +229,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemTipsModel.curAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/KnapSack/Logic/EquipTip.cs
@@ -331,7 +331,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/KnapSack/Logic/ItemInfoWin.cs
@@ -243,7 +243,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemTipsModel.curAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/KnapSack/Logic/UnionWarehouseEquipTip.cs
@@ -297,7 +297,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/KnapSack/Logic/WingsTip.cs
@@ -201,6 +201,7 @@ conditionValueText.gameObject.SetActive(false); } } conditionValueText.SetNativeSize(); } else { System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -71,6 +71,14 @@ private int _SelectedNow = 0; private int ResetType = 0;// 重置类型，0-0点重置；1-5点重置 public event Action IsOpenEvent; private int _JumpIndex = -1;//跳转选中值 public int JumpIndex { get { return _JumpIndex; } set { _JumpIndex = value; } } public int SelectedNow//选中天 { get { return _SelectedNow; } @@ -420,7 +428,7 @@ { TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes; } if (TaypeNumber > 0) if (TaypeNumber > 0 && rewardNum< number) { return RedPointState.Simple; } @@ -507,6 +515,28 @@ } } public bool IsJumpOpen() { bool Isbool = false; if (LimitLV == 0)//活动未开启 { SysNotifyMgr.Instance.ShowTip("OutofActivityTime"); return false; } else { if (PlayerDatas.Instance.baseData.LV < LimitLV)//等级未到达 { SysNotifyMgr.Instance.ShowTip("NotEenoughGrade"); return Isbool; } } if (_IsOpen) { Isbool = true; } return Isbool; } }
@@ -13,7 +13,7 @@ namespace Snxxz.UI { //开服成就 //开服成就(8-14天) [XLua.Hotfix] public class OpenServiceAchievementWin : Window { @@ -47,7 +47,7 @@ protected override void OnPreOpen() { model.SelectedNow = model.DayNow; ChooseDay(); SetTextIntegral(); OnCreateGridLineCell1(m_ScrollerController1); OnCreateGridLineCell2(m_ScrollerController2); @@ -60,6 +60,7 @@ protected override void OnPreClose() { model.JumpIndex = -1; model.WeekPartyDayInfoUpdate -= WeekPartyDayInfoUpdate; } @@ -89,13 +90,16 @@ ButtonEx Btn = cell.GetComponent<ButtonEx>(); GameObject SelectedObj = cell.transform.Find("Image_XZ").gameObject;//选中 GameObject SelectedObj1 = cell.transform.Find("Image_XZ1").gameObject;//选中 ImageEx SelectedImageEx = SelectedObj.GetComponent<ImageEx>(); GameObject Unselected = cell.transform.Find("Image_WXZ").gameObject;//未选中 ImageEx UnselectedIm = Unselected.GetComponent<ImageEx>(); GameObject Lock = cell.transform.Find("Lock").gameObject;//锁 GameObject IsNotGary = cell.transform.Find("Obj1").gameObject; Text IsNotGary_text = IsNotGary.transform.Find("DayText").GetComponent<Text>(); GameObject Gary= cell.transform.Find("Obj2").gameObject; GameObject Gary = cell.transform.Find("Obj2").gameObject; Text Gary_text = Gary.transform.Find("DayText").GetComponent<Text>(); RedpointBehaviour redPoint = cell.transform.Find("RedPoint").GetComponent<RedpointBehaviour>();//红点 @@ -105,6 +109,7 @@ } if (Index <= model.DayNow) { SelectedImageEx.gray = false; Unselected.SetActive(true); UnselectedIm.gray = false; SelectedObj.SetActive(false); @@ -128,17 +133,29 @@ if (Index == model.SelectedNow) { if (Index > model.DayNow) { SelectedImageEx.gray = true; IsNotGary.SetActive(false); Gary.SetActive(true); Lock.SetActive(true); } else { SelectedImageEx.gray = false; IsNotGary.SetActive(true); Gary.SetActive(false); Lock.SetActive(false); } SelectedObj.SetActive(true); SelectedObj1.SetActive(true); Unselected.SetActive(false); Lock.SetActive(false); IsNotGary.SetActive(true); Gary.SetActive(false); IsNotGary_text.text = (Index + 1).ToString(); } Btn.SetListener(() => { if (Index != model.SelectedNow && Index<= model.DayNow) if (Index != model.SelectedNow) { model.SelectedNow = Index;//选中天 SetTextIntegral(); @@ -185,7 +202,7 @@ dailyIdlist.Add(_list[i]); } } foreach (var key in model.WeekPartyDayDic.Keys) { if (key == model.SelectedNow) @@ -204,15 +221,15 @@ { SortList.Add(TemplateId); } // var Dailyquse = Config.Instance.Get<DailyQuestConfig>(TemplateId); // var Dailyquse = Config.Instance.Get<DailyQuestConfig>(TemplateId); } else { SortList.Add(TemplateId); } } } } @@ -338,16 +355,34 @@ { m_One.SetActive(false); m_Two.SetActive(true); m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0],0); m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1],1); m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0], 0, 2); m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1], 1, 2); } else { m_One.SetActive(true); m_Two.SetActive(false); m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0); m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0, 2); } } private void ChooseDay()//选择天 { if (model.JumpIndex != -1)//跳转选择的天 { model.SelectedNow = model.JumpIndex; return; } foreach (var key in model.RedPointDic.Keys)//红点选择可领取的天 { if (model.RedPointDic[key].state == RedPointState.Simple) { model.SelectedNow = key; return; } } model.SelectedNow = model.DayNow; } } } System/OpenServerActivity/OpenServiceItem.cs
@@ -22,9 +22,22 @@ [SerializeField] GameObject m_IsReachImage; [SerializeField] GameObject m_IsDrawImage; OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } } public void SetReward(int day, WeekPartyItemClass item, int index) public void SetReward(int day, WeekPartyItemClass item, int index,int Type) { var weekPartPointConfig = Config.Instance.Get<WeekPartyPointConfig>(item.ItemID); if (weekPartPointConfig != null) { m_Text_A.text = weekPartPointConfig.name; if (Type == 1) { m_ImageShow.SetSprite(weekPartPointConfig.ImageType1); } else { m_ImageShow.SetSprite(weekPartPointConfig.ImageType2); } m_ImageShow.SetNativeSize(); } int Point = model.GetPoint(day); m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint); bool IsBool = model.IsDayReward(model.SelectedNow, index); System/Realm/RealmBossShow.cs
@@ -13,6 +13,7 @@ GameObject clothesModel; GameObject secondaryModel; GameObject extraSecondaryModel; Animator clothesAnimator; Transform showPoint; @@ -117,29 +118,18 @@ var clothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retClothes); var _clothesId = clothes == null ? 0 : (int)clothes.itemInfo.ItemID; var weapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon); var _weaponId = weapon == null ? 0 : (int)weapon.itemInfo.ItemID; var wings = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWing); var _wingsId = wings == null ? 0 : (int)wings.itemInfo.ItemID; var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2); var _secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID; var fashionClothes = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionClothes); var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemInfo.ItemID; var fashionWeapon = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon); var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemInfo.ItemID; var fashionSecondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon2); var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemInfo.ItemID; #endregion showPoint = m_HeroStage; var _hero = ShowHero(_job, fashionClothesId > 0 ? fashionClothesId : _clothesId, fashionWeaponId > 0 ? fashionWeaponId : _weaponId, _wingsId, fashionSecondaryId > 0 ? fashionSecondaryId : _secondaryId); var _hero = ShowHero(_job, _clothesId, _secondaryId, fashionClothesId, fashionSecondaryId); if (_hero != null) { SitDown(); @@ -218,29 +208,62 @@ } } GameObject ShowHero(int _job, int _clothes, int _weaponId, int _wingsId, int _secondaryId) GameObject ShowHero(int job, int clothesId, int secondaryId, int fashionClothesId, int fashionSecondaryId) { PutOnClothes(_job, _clothes); var jobConfig = Config.Instance.Get<JobSetupConfig>(_job); var secondaryResId = 0; if (_secondaryId == 0) clothesId = fashionClothesId > 0 ? fashionClothesId : clothesId; secondaryId = fashionSecondaryId > 0 ? fashionSecondaryId : secondaryId; var jobConfig = Config.Instance.Get<JobSetupConfig>(job); var clothesResId = 0; if (clothesId == 0) { if (_job == 1) clothesResId = jobConfig.BaseEquip[0]; } else { var item = Config.Instance.Get<ItemConfig>(clothesId); clothesResId = item == null ? clothesResId = jobConfig.BaseEquip[0] : item.ChangeOrd; } PutOnClothes(job, clothesResId); var secondaryResId = 0; if (secondaryId == 0) { if (fashionClothesId <= 0) { secondaryResId = _clothes + 2900; } else { secondaryResId = jobConfig.BaseEquip[2]; if (job == 1) { secondaryResId = clothesId + 2900; } else { secondaryResId = jobConfig.BaseEquip[2]; } } } else { var item = Config.Instance.Get<ItemConfig>(_secondaryId); var item = Config.Instance.Get<ItemConfig>(secondaryId); secondaryResId = item == null ? jobConfig.BaseEquip[2] : item.ChangeOrd; } PutOnSecondary(_job, secondaryResId); PutOnSecondary(job, secondaryResId); var extraSecondaryId = 0; if (job == 1 && fashionSecondaryId > 0 && fashionClothesId == 0) { if (clothesId == 0) { extraSecondaryId = jobConfig.BaseEquip[0] + 2900; } else { var item = Config.Instance.Get<ItemConfig>(clothesId); var defaultClothesResId = item == null ? jobConfig.BaseEquip[0] : item.ChangeOrd; extraSecondaryId = defaultClothesResId + 2900; } } PutOnExtraSecondary(job, extraSecondaryId); return clothesModel; } @@ -254,28 +277,16 @@ } } public void PutOnClothes(int _job, int itemID) public void PutOnClothes(int _job, int clothesResId) { var newClothes = 0; var config = Config.Instance.Get<JobSetupConfig>(_job); if (itemID == 0) { newClothes = config.BaseEquip[0]; } else { var item = Config.Instance.Get<ItemConfig>(itemID); newClothes = item == null ? newClothes = config.BaseEquip[0] : item.ChangeOrd; } var _prefab = InstanceResourcesLoader.LoadModelRes(newClothes,true); var _prefab = InstanceResourcesLoader.LoadModelRes(clothesResId, true); if (!_prefab) { newClothes = config.BaseEquip[0]; clothesResId = config.BaseEquip[0]; } LoadClothes(newClothes, _job); LoadClothes(clothesResId, _job); } private void PutOnSecondary(int _job, int secondaryResId) @@ -306,9 +317,38 @@ } } private void LoadClothes(int resID,int job) private void PutOnExtraSecondary(int job, int extraSecondaryId) { var prefab = InstanceResourcesLoader.LoadModelRes(resID,true); if (job == 2) { return; } if (extraSecondaryId != 0) { var prefab = InstanceResourcesLoader.LoadModelRes(extraSecondaryId); if (!prefab) { var config = Config.Instance.Get<JobSetupConfig>(job); extraSecondaryId = config.BaseEquip[2]; prefab = InstanceResourcesLoader.LoadModelRes(extraSecondaryId); } if (prefab) { if (extraSecondaryModel == null) { extraSecondaryModel = Instantiate(prefab, Constants.Special_Hide_Position, Quaternion.identity); var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]); extraSecondaryModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one); } } } } private void LoadClothes(int resID, int job) { var prefab = InstanceResourcesLoader.LoadModelRes(resID, true); if (clothesModel == null) { clothesModel = Instantiate(prefab, Constants.Special_Hide_Position, Quaternion.identity); @@ -320,7 +360,7 @@ LayerUtility.SetLayer(clothesModel, LayerUtility.Player, false); var skinnedMeshRenderer = clothesModel.GetComponentInChildren<SkinnedMeshRenderer>(true); var mat = MaterialLoader.LoadClothesMaterial(resID, false, IsSuit(job, resID)); var mat = MaterialLoader.LoadClothesMaterial(resID, false, false); if (mat) { skinnedMeshRenderer.material = mat; @@ -343,66 +383,6 @@ clothesAnimator.runtimeAnimatorController = _controller; clothesAnimator.enabled = true; } } public bool IsSuit(int job, int clothedID) { var _equipModel = ModelCenter.Instance.GetModel<PlayerPackModel>().GetSinglePackModel(PackType.rptEquip); if (_equipModel == null) { return false; } int _suitCount = 0; int _start = (int)RoleEquipType.retHat; int _end = (int)RoleEquipType.retShoes; ItemModel _itemModel = null; _itemModel = _equipModel.GetItemModelByIndex((int)RoleEquipType.retClothes); if (_itemModel == null) { return false; } int _rank = _itemModel.chinItemModel.LV; for (int i = _start; i <= _end; ++i) { _itemModel = _equipModel.GetItemModelByIndex(i); if (_itemModel == null) { continue; } if (_itemModel.chinItemModel.SuiteiD <= 0) { continue; } if (i == (int)RoleEquipType.retClothes) { _rank = _itemModel.chinItemModel.LV; } var suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>(); if (suitModel.suitModelDict.ContainsKey(i)) { if (suitModel.suitModelDict[i].ContainsKey(1) || suitModel.suitModelDict[i].ContainsKey(2)) { if (_itemModel.chinItemModel.LV >= _rank) { _suitCount += 1; } } } } return _suitCount >= 5; } } } System/Role/GodWeaponSkillBehaviour.cs
@@ -54,7 +54,7 @@ m_Effect.StopImediatly(); if (config != null) { m_SkillIcon.SetSprite(config.icon); m_SkillIcon.SetSprite(model.GetEffectSkillIcon(config.type, config.level)); var weaponInfo = model.GetGodWeaponInfo(config.type); bool active = weaponInfo != null && weaponInfo.level >= config.level; m_SkillCondition.gameObject.SetActive(!active); System/Role/MagicianModel.cs
@@ -94,6 +94,7 @@ new Dictionary<int, List<GodWeaponEffectProperty>>(); Dictionary<int, Dictionary<int, int>> effectFightPower = new Dictionary<int, Dictionary<int, int>>(); Dictionary<int, int> godWeaponEffectEquipDict = new Dictionary<int, int>(); Dictionary<int, List<GodWeaponEffectInfo>> godWeaponEffectInfos = new Dictionary<int, List<GodWeaponEffectInfo>>(); int[] autoHammerExpArea { get; set; } int[] autoHammerCount { get; set; } @@ -262,6 +263,25 @@ { godWeaponEffectTypes.Add(config.type); } List<GodWeaponEffectInfo> effectInfos; if (!godWeaponEffectInfos.TryGetValue(config.type, out effectInfos)) { effectInfos = new List<GodWeaponEffectInfo>(); godWeaponEffectInfos.Add(config.type, effectInfos); } Dictionary<int, string> skillIconDict = new Dictionary<int, string>(); var iconJson = LitJson.JsonMapper.ToObject(config.icon); foreach (var key in iconJson.Keys) { var job = int.Parse(key); skillIconDict.Add(job, iconJson[key].ToString()); } effectInfos.Add(new GodWeaponEffectInfo() { level = config.level, skillIconDict = skillIconDict, }); } funcConfig = Config.Instance.Get<FuncConfigConfig>("MagicExterior"); @@ -829,6 +849,27 @@ return displaySkillLevels; } public string GetEffectSkillIcon(int type, int level) { var job = PlayerDatas.Instance.baseData.Job; if (godWeaponEffectInfos.ContainsKey(type)) { var list = godWeaponEffectInfos[type]; var index = list.FindIndex((x) => { return x.level == level; }); if (index != -1) { if (list[index].skillIconDict.ContainsKey(job)) { return list[index].skillIconDict[job]; } } } return string.Empty; } void CheckGodWeaponEffectOn() { var value = PlayerDatas.Instance.baseData.equipShowSwitch; @@ -894,5 +935,11 @@ public int level; public Dictionary<int, int> propertyDict; } public struct GodWeaponEffectInfo { public int level; public Dictionary<int, string> skillIconDict; } }
@@ -40,7 +40,8 @@ public void DisplayGodWeaponEffect(GodWeaponEffectConfig config) { godWeaponEffectConfig = config; m_SkillIcon.SetSprite(config.icon); var _model = ModelCenter.Instance.GetModel<MagicianModel>(); m_SkillIcon.SetSprite(_model.GetEffectSkillIcon(config.type, config.level)); if (m_SkillName != null) { m_SkillName.text = config.skillName; System/Store/Logic/BuyBoxInfoWin.cs
@@ -237,7 +237,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemTipsModel.curAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/Store/Logic/BuyEquipTip.cs
@@ -330,7 +330,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemAttrData.itemConfig.RealmLimit) { realmTitleText.color = conditionColor; System/Store/Logic/BuyItemInfoWin.cs
@@ -231,6 +231,7 @@ realmImg.SetSprite(realmConfig.Img); } } realmImg.SetNativeSize(); if (PlayerDatas.Instance.baseData.realmLevel >= itemTipsModel.curAttrData.itemConfig.RealmLimit) { System/Store/Logic/BuyWingsTip.cs
@@ -236,6 +236,7 @@ } } conditionValueText.SetNativeSize(); } else { System/Tip/SkillDetailsWin.cs
@@ -138,7 +138,7 @@ var level = godWeaponModel.GetGodWeaponStageRequireLevel(SkillDetails.godWeaponType, SkillDetails.godWeaponEffectStage); var godWeaponEffectConfig = GodWeaponEffectConfig.Get(SkillDetails.godWeaponType, level); var config = GodWeaponConfig.GetConfig(SkillDetails.godWeaponType, 1); m_SkillIcon.SetSprite(godWeaponEffectConfig.icon); m_SkillIcon.SetSprite(godWeaponModel.GetEffectSkillIcon(godWeaponEffectConfig.type, godWeaponEffectConfig.level)); m_SkillInfo1.text = Language.Get("GodWeaponEffectSource", config.Name); m_SkillInfo2.text = godWeaponEffectConfig.skillName;
@@ -110,7 +110,8 @@ { m_UnLockType = FunctionUnlockType.GodWeaponEffect; m_Id = config.level; m_FunctionIcon.SetSprite(config.icon); var _model = ModelCenter.Instance.GetModel<MagicianModel>(); m_FunctionIcon.SetSprite(_model.GetEffectSkillIcon(config.type, config.level)); originalScale = 1f; this.transform.localScale = Vector3.one * originalScale; UI/Common/UI3DShowHero.cs
@@ -73,7 +73,7 @@ var secondaryResId = 0; if (secondaryId == 0) { if (data.fashionClothesId < 0) if (data.fashionClothesId == 0) { if (this.job == 1) {
