Core/AI/NavmeshPathFind/PathFinder.cs
@@ -22,7 +22,7 @@ NavMesh.CalculatePath(source, dest, -1, _path); if (_path.corners != null && _path.corners.Length > 0) { return true; return MathUtility.DistanceSqrtXZ(dest, _path.corners[_path.corners.Length - 1]) < 0.01f; } return false; } Core/GameEngine/Model/Config/ItemPlusConfig.cs
@@ -1,6 +1,6 @@ //-------------------------------------------------------- // [Author]: Fish // [ Date ]: Thursday, February 14, 2019 // [ Date ]: Tuesday, March 12, 2019 //-------------------------------------------------------- using System.Collections.Generic; @@ -13,14 +13,14 @@ public partial class ItemPlusConfig { public readonly int id; public readonly int type; public readonly int level; public readonly string attType; public readonly string attValue; public readonly int costCount; public readonly int getExp; public readonly int upExpNeed; public readonly int id; public readonly int type; public readonly int level; public readonly int[] attType; public readonly int[] attValue; public readonly int costCount; public readonly int getExp; public readonly int upExpNeed; public readonly int upExpTotal; public ItemPlusConfig() @@ -33,22 +33,32 @@ { var tables = input.Split('\t'); int.TryParse(tables[0],out id); int.TryParse(tables[1],out type); int.TryParse(tables[2],out level); attType = tables[3]; attValue = tables[4]; int.TryParse(tables[5],out costCount); int.TryParse(tables[6],out getExp); int.TryParse(tables[7],out upExpNeed); int.TryParse(tables[0],out id); int.TryParse(tables[1],out type); int.TryParse(tables[2],out level); string[] attTypeStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries); attType = new int[attTypeStringArray.Length]; for (int i=0;i<attTypeStringArray.Length;i++) { int.TryParse(attTypeStringArray[i],out attType[i]); } string[] attValueStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries); attValue = new int[attValueStringArray.Length]; for (int i=0;i<attValueStringArray.Length;i++) { int.TryParse(attValueStringArray[i],out attValue[i]); } int.TryParse(tables[5],out costCount); int.TryParse(tables[6],out getExp); int.TryParse(tables[7],out upExpNeed); int.TryParse(tables[8],out upExpTotal); } catch (Exception ex) Core/GameEngine/Model/TelPartialConfig/tagItemPlusConfig.cs
@@ -4,43 +4,17 @@ public partial class ItemPlusConfig : IConfigPostProcess { private static Dictionary<string, ItemPlusData> t_ItemP = new Dictionary<string, ItemPlusData>(); private static Dictionary<string, ItemPlusConfig> ItemPlus = new Dictionary<string, ItemPlusConfig>(); public void OnConfigParseCompleted() { ItemPlusData plusData = new ItemPlusData(); plusData.guid = StringUtility.Contact(type, level); plusData.plusConfig = this; plusData.attrIds = ConfigParse.GetMultipleStr<int>(attType); plusData.attrValues = ConfigParse.GetMultipleStr<int>(attValue); t_ItemP.Add(plusData.guid, plusData); ItemPlus.Add(StringUtility.Contact(type, level).ToString(), this); } public static ItemPlusConfig GetTypeAndGrade(int _type, int _level) public static ItemPlusConfig GetTypeAndLevel(int type, int level) { ItemPlusConfig itemPlus = null; string key = StringUtility.Contact(_type, _level); if (t_ItemP.ContainsKey(key)) { itemPlus = t_ItemP[key].plusConfig; } ItemPlus.TryGetValue(StringUtility.Contact(type, level).ToString(), out itemPlus); return itemPlus; } public static ItemPlusData GetItemPlusData(int _type, int _level) { ItemPlusData itemPlus = null; string key = StringUtility.Contact(_type, _level); t_ItemP.TryGetValue(key, out itemPlus); return itemPlus; } public class ItemPlusData { public string guid; public ItemPlusConfig plusConfig; public int[] attrIds; public int[] attrValues; } }
@@ -1,11 +1,21 @@ using UnityEngine; using System.Collections; using Snxxz.UI; // A3 B3 装备部位强化信息 #tagMCEquipPartPlusInfo public class DTCA3B3_tagMCEquipPartPlusInfo : DtcBasic { // A3 B3 装备部位强化信息 #tagMCEquipPartPlusInfo public class DTCA3B3_tagMCEquipPartPlusInfo : DtcBasic { EquipStrengthModel m_EquipStrengthModel; EquipStrengthModel equipStrengthModel { get { return m_EquipStrengthModel ?? (m_EquipStrengthModel = ModelCenter.Instance.GetModel<EquipStrengthModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA3B3_tagMCEquipPartPlusInfo vNetData = vNetPack as HA3B3_tagMCEquipPartPlusInfo; HA3B3_tagMCEquipPartPlusInfo vNetData = vNetPack as HA3B3_tagMCEquipPartPlusInfo; if (vNetData == null) { return; } equipStrengthModel.GetEuipPartPlusInfo(vNetData); } } Fight/Actor/HeroBehaviour.cs
@@ -707,6 +707,7 @@ CB405_tagCMSuperAtk _b405 = null; if (!ClientDungeonStageUtility.isClientDungeon && !ClientSceneManager.Instance.IsClientFightMode #if UNITY_EDITOR && !RuntimeLogUtility.TEST_CLIENT_PVP #endif Fight/Actor/Skill/Skill.cs
@@ -185,6 +185,7 @@ || PlayerDatas.Instance.baseData.MapID == 52020 || userSID != PlayerDatas.Instance.PlayerId || ClientDungeonStageUtility.isClientDungeon || ClientSceneManager.Instance.IsClientFightMode #if UNITY_EDITOR || RuntimeLogUtility.TEST_CLIENT_PVP #endif Fight/Actor/State/SMB/SMB_Base.cs
@@ -92,7 +92,8 @@ protected void AddToNpcPosList(GActorFight attacker, GActorFight target, int bodyControlId, Vector3 direction, List<NPCPos> npcPosList) { // Debug.LogFormat("{0} attack {1} ==================== 0", attacker.GetType().ToString(), target.GetType().ToString()); if (PreFightMission.Instance.IsFinished() == false) if (!PreFightMission.Instance.IsFinished() || ClientSceneManager.Instance.IsClientFightMode) { return; } @@ -106,7 +107,7 @@ return; } if (AttackHandler.CheckPull(attacker, target, bodyControlId) == false) if (!AttackHandler.CheckPull(attacker, target, bodyControlId)) { return; } Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -724,8 +724,9 @@ if (m_NpcPosList.Count > 0) { if (!ClientDungeonStageUtility.isClientDungeon && !ClientSceneManager.Instance.IsClientFightMode #if UNITY_EDITOR && !RuntimeLogUtility.TEST_CLIENT_PVP && !RuntimeLogUtility.TEST_CLIENT_PVP #endif ) { Fight/Actor/UserInputHandler.cs
@@ -131,6 +131,8 @@ OnCirclePanelTouched(); } MapTransferUtility.Instance.Clear(); // 是否是可以移动的状态 _direction = CameraController.Instance.transform.TransformDirection(_direction); _direction.y = 0; Fight/GameActor/GA_Hero.cs
@@ -8,6 +8,7 @@ { public static Vector3 MapOffset; public static bool s_MapSwitching = false; public static bool s_Flying = false; //public static bool s_MapSwitching //{ // get Fight/MapTransferUtility.cs
@@ -19,11 +19,14 @@ Fight, } private E_MapTransferDoType m_MapTransferType; public E_MapTransferDoType MapTransferDoType { get { public E_MapTransferDoType MapTransferDoType { get { return m_MapTransferType; } set { set { m_MapTransferType = value; #if UNITY_EDITOR // Debug.LogFormat("设置方式: {0}", m_MapTransferType); @@ -122,7 +125,8 @@ #endregion #region npc public int NpcID { public int NpcID { get; set; } #endregion @@ -179,7 +183,99 @@ public bool forceMove = false; public void MoveToNPC(int npcID, int sid = 0) private struct MoveToData { public int npcID; public int sid; } public void MoveToNPC(int _npcID, int _sid = 0) { StopCoroutine("CoMoveToNPC"); var _data = new MoveToData { npcID = _npcID, sid = _sid }; StartCoroutine("CoMoveToNPC", _data); } private IEnumerator CoMoveToNPC(MoveToData data) { var _hero = PlayerDatas.Instance.hero; if (_hero == null) { yield break; } var npcID = data.npcID; var sid = data.sid; Vector3 _destPostion = Vector3.zero; // 判断是否能够得到到达指定点 // 获取NPC位置数据 GAStaticDefine.NPCLocation _npcLocation; var _findLocation = GAStaticDefine.TryGetMapNPCLocation(npcID, out _npcLocation); if (!_findLocation) { #if UNITY_EDITOR Debug.LogWarningFormat("需要传送至的npcid有错,无法在mapnpc表中查询到, id: {0}", npcID); #endif // 如果找不到配置, 可能为客户端战斗配置的刷怪逻辑 // 由于可能有回包慢问题, 这里等待 yield return WaitingForSecondConst.WaitMS200; GActor _npc = GAMgr.Instance.GetCloserNPC(_hero.Pos, npcID); if (_npc != null) { //Debug.LogFormat(" |-- 在视野内"); _destPostion = _npc.Pos; } } else { _destPostion = new Vector3(_npcLocation.position.x, 0, _npcLocation.position.y); } if (_destPostion == Vector3.zero) { Debug.LogErrorFormat("移动至NPC: {0} 时找不到一个可以到达的点.", npcID); yield break; } if (PathFinder.WalkAble(_hero.Pos, _destPostion)) { _MoveToNPC(npcID, sid); } else { // 不可达的情况, 这里寻找是否有可以跳跃的点 Vector3 _jumpPos = ClientSceneManager.Instance.GetCloseTransPoint(_destPostion); if (_jumpPos == Vector3.zero) { Debug.LogErrorFormat("移动至NPC: {0} 时找不到任何跳跃点", npcID); yield break; } float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _jumpPos); while (_dis > 0.01f) { _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _jumpPos); _hero.MoveToPosition(_jumpPos); yield return null; } while (!GA_Hero.s_Flying) { yield return null; } while (GA_Hero.s_Flying) { yield return null; } _MoveToNPC(npcID, sid); } } private void _MoveToNPC(int npcID, int sid = 0) { if (npcID != NpcID) { @@ -982,6 +1078,7 @@ public void Clear() { StopCoroutine("CoMoveToNPC"); if (m_SwitchMapFinished) { NpcID = 0; Fight/Stage/MapEditor/Game/ClientSceneManager.cs
@@ -13,6 +13,7 @@ private Dictionary<int, TriggerHandler> m_TriggerHandlerDict = new Dictionary<int, TriggerHandler>(); private List<int> m_ReadyRemoveTriggerList = new List<int>(); private Dictionary<int, List<GActorNpcFight>> m_EventActorDict = new Dictionary<int, List<GActorNpcFight>>(); public bool IsClientFightMode { get; private set; } private IEnumerator DelayUnTrigger(int id) { @@ -131,6 +132,7 @@ int _triggerID = (int)package.DictValue; if (_triggerID == 0) { Debug.LogFormat("退出当前触发事件, 已触发数量: {0}", m_TriggerIDToMissionIDDict.Count); foreach (var _removeTriggerID in m_TriggerIDToMissionIDDict.Keys) { SnxxzGame.Instance.StartCoroutine(DelayUnTrigger(_removeTriggerID)); @@ -147,10 +149,12 @@ if (package.DictValue == 0) { Debug.LogFormat("= 退出了前端模式 ="); IsClientFightMode = false; } else { Debug.LogFormat("= 进入了前端模式 ="); IsClientFightMode = true; } } } @@ -246,21 +250,44 @@ return null; } public Vector3 GetCloseTransPoint(Vector3 pos) { // 遍历找到离给定点最近并且可寻路至的传送点 P // 找到 P点的 另一端 P1 // 判断当前传入的点是否可以寻路至 P1 // 不行的话重新寻找 可以的话返回 P1 的坐标 float _compareDis; float _dis; Vector3 _targetPos = Vector3.zero; foreach (var _p in m_TransferGroupList) foreach (var _t in m_MapData.transfers) { for (int i = 0; i < _t.transferPoints.Length; ++i) { if (PathFinder.WalkAble(pos, _t.transferPoints[i].position)) { if (i == 0) { _targetPos = _t.transferPoints[_t.transferPoints.Length - 1].position; } else { _targetPos = _t.transferPoints[0].position; } break; } } if (_targetPos != Vector3.zero) { break; } } return Vector3.zero; if (_targetPos == Vector3.zero) { Debug.LogWarningFormat("寻找最近的寻路飞跃点, 没有找到任何结果..."); } return _targetPos; } private IEnumerator DelayTrigger(uint missionID, int triggerID) Fight/Stage/MapEditor/Game/EventRefreshNPCHandler.cs
@@ -88,7 +88,7 @@ { var _data = m_Evt.monsters[m_RefreshCount]; var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(_data.npcID, E_ActorGroup.Enemy); _npc.Pos = _data.position; _npc.BornPos = _npc.Pos = _data.position; _npc.belongEventID = m_Evt.id; ClientSceneManager.Instance.NpcBorn(m_Evt.id, _npc); } @@ -101,7 +101,7 @@ foreach (var _data in m_Evt.monsters) { var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(_data.npcID, E_ActorGroup.Enemy); _npc.Pos = _data.position; _npc.BornPos = _npc.Pos = _data.position; _npc.belongEventID = m_Evt.id; ClientSceneManager.Instance.NpcBorn(m_Evt.id, _npc); } Fight/Stage/MapEditor/Game/TransferGroup.cs
@@ -79,6 +79,7 @@ { _hero.RunImmediate(); } GA_Hero.s_Flying = true; break; } } @@ -185,6 +186,7 @@ _hero.SwitchHeadNameBindNode(false); _hero.StopPathFind(); CameraController.Instance.LookAtTarget = _hero.Root; GA_Hero.s_Flying = false; } } break; @@ -196,8 +198,6 @@ m_Step = 0; m_InCreaseTime = 0; targetPoint = -1; _hero.StopPathFind(); _hero.Behaviour.StopHandupAI(true); } break; } Lua/Gen/ItemPlusConfigWrap.cs
@@ -41,14 +41,13 @@ Utils.EndObjectRegister(type, L, translator, null, null, null, null, null); Utils.BeginClassRegister(type, L, __CreateInstance, 8, 1, 0); Utils.BeginClassRegister(type, L, __CreateInstance, 7, 1, 0); Utils.RegisterFunc(L, Utils.CLS_IDX, "Get", _m_Get_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "GetKeys", _m_GetKeys_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "GetValues", _m_GetValues_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "Has", _m_Has_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "Init", _m_Init_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTypeAndGrade", _m_GetTypeAndGrade_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "GetItemPlusData", _m_GetItemPlusData_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTypeAndLevel", _m_GetTypeAndLevel_xlua_st_); @@ -297,7 +296,7 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_GetTypeAndGrade_xlua_st_(RealStatePtr L) static int _m_GetTypeAndLevel_xlua_st_(RealStatePtr L) { try { @@ -307,38 +306,10 @@ { int __type = LuaAPI.xlua_tointeger(L, 1); int __level = LuaAPI.xlua_tointeger(L, 2); int _type = LuaAPI.xlua_tointeger(L, 1); int _level = LuaAPI.xlua_tointeger(L, 2); ItemPlusConfig gen_ret = ItemPlusConfig.GetTypeAndGrade( __type, __level ); translator.Push(L, gen_ret); return 1; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_GetItemPlusData_xlua_st_(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); { int __type = LuaAPI.xlua_tointeger(L, 1); int __level = LuaAPI.xlua_tointeger(L, 2); ItemPlusConfig.ItemPlusData gen_ret = ItemPlusConfig.GetItemPlusData( __type, __level ); ItemPlusConfig gen_ret = ItemPlusConfig.GetTypeAndLevel( _type, _level ); translator.Push(L, gen_ret); @@ -416,7 +387,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); ItemPlusConfig gen_to_be_invoked = (ItemPlusConfig)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushstring(L, gen_to_be_invoked.attType); translator.Push(L, gen_to_be_invoked.attType); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -430,7 +401,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); ItemPlusConfig gen_to_be_invoked = (ItemPlusConfig)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushstring(L, gen_to_be_invoked.attValue); translator.Push(L, gen_to_be_invoked.attValue); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } Lua/Gen/SnxxzUIFairyLeagueModelWrap.cs
@@ -102,10 +102,6 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "crystalPosList", _g_get_crystalPosList); Utils.RegisterFunc(L, Utils.SETTER_IDX, "integralRankAwardDict", _s_set_integralRankAwardDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "finalWarWinAwardDict", _s_set_finalWarWinAwardDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "finalWarChampionWinAwardDict", _s_set_finalWarChampionWinAwardDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "finalWarDefeatAwardDict", _s_set_finalWarDefeatAwardDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "finalWarChampionDefeatAwardDict", _s_set_finalWarChampionDefeatAwardDict); Utils.RegisterFunc(L, Utils.SETTER_IDX, "fairyLeagueResults", _s_set_fairyLeagueResults); Utils.RegisterFunc(L, Utils.SETTER_IDX, "crystalPosList", _s_set_crystalPosList); @@ -1584,65 +1580,6 @@ return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_finalWarWinAwardDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.FairyLeagueModel gen_to_be_invoked = (Snxxz.UI.FairyLeagueModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.finalWarWinAwardDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_finalWarChampionWinAwardDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.FairyLeagueModel gen_to_be_invoked = (Snxxz.UI.FairyLeagueModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.finalWarChampionWinAwardDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_finalWarDefeatAwardDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.FairyLeagueModel gen_to_be_invoked = (Snxxz.UI.FairyLeagueModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.finalWarDefeatAwardDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_finalWarChampionDefeatAwardDict(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.FairyLeagueModel gen_to_be_invoked = (Snxxz.UI.FairyLeagueModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.finalWarChampionDefeatAwardDict = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)translator.GetObject(L, 2, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<Snxxz.UI.AwardItem>>)); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 0; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_fairyLeagueResults(RealStatePtr L) Lua/Gen/SnxxzUIVipModelWrap.cs
@@ -34,8 +34,6 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetVipTitle", _m_GetVipTitle); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTitlePower", _m_GetTitlePower); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetCTGConfigs", _m_GetCTGConfigs); Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetRechargeItem", _m_TryGetRechargeItem); Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetFirstReward", _m_TryGetFirstReward); Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateVipGift", _m_UpdateVipGift); Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateVipExp", _m_UpdateVipExp); Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateVipTime", _m_UpdateVipTime); @@ -466,69 +464,6 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_TryGetRechargeItem(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.VipModel gen_to_be_invoked = (Snxxz.UI.VipModel)translator.FastGetCSObj(L, 1); { int _id = LuaAPI.xlua_tointeger(L, 2); System.Collections.Generic.List<Snxxz.UI.AwardItem> _list; bool gen_ret = gen_to_be_invoked.TryGetRechargeItem( _id, out _list ); LuaAPI.lua_pushboolean(L, gen_ret); translator.Push(L, _list); return 2; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_TryGetFirstReward(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.VipModel gen_to_be_invoked = (Snxxz.UI.VipModel)translator.FastGetCSObj(L, 1); { int __job = LuaAPI.xlua_tointeger(L, 2); System.Collections.Generic.List<Snxxz.UI.AwardItem> __list; bool gen_ret = gen_to_be_invoked.TryGetFirstReward( __job, out __list ); LuaAPI.lua_pushboolean(L, gen_ret); translator.Push(L, __list); return 2; } } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_UpdateVipGift(RealStatePtr L) System/Backpack/BackpackData.cs
@@ -39,12 +39,6 @@ this.quality = _quality; } } public struct AwardItem { public Item item; public int isBind; } }
@@ -74,7 +74,7 @@ { return; } if (user.serverGroupId == PlayerDatas.Instance.baseData.ServerGroupId) if (user.serverGroupId == 0 || user.serverGroupId == PlayerDatas.Instance.baseData.ServerGroupId) { PlayerDetails.ShowPlayerDetails(user.player, null); } System/Chat/ChatPlayerOtherCell.cs
@@ -66,7 +66,7 @@ { return; } if (user.serverGroupId == PlayerDatas.Instance.baseData.ServerGroupId) if (user.serverGroupId == 0 || user.serverGroupId == PlayerDatas.Instance.baseData.ServerGroupId) { PlayerDetails.ShowPlayerDetails(user.player, null); } System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -278,11 +278,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_ranking, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); _award.Add(_ranking, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2] == 1)); } } SeasonRewardDic = _award; System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -139,8 +139,8 @@ if (i < List.Count) { ObjChild.SetActive(true); var config = KingTreasureItemConfig.Get(List[i].item.id); var Itemconfig = ItemConfig.Get(List[i].item.id); var config = KingTreasureItemConfig.Get(List[i].id); var Itemconfig = ItemConfig.Get(List[i].id); if (config != null) { kingRewardItem.KingText.gameObject.SetActive(true); @@ -164,12 +164,12 @@ { ui.Stop(); } ItemCellModel cellModel = new ItemCellModel(List[i].item.id, true, (ulong)List[i].item.count, List[i].isBind); ItemCellModel cellModel = new ItemCellModel(List[i].id, true, (ulong)List[i].count, List[i].bind ? 1 : 0); _ItemCell.Init(cellModel); int type = i; _ItemCell.cellBtn.SetListener(() => { ItemAttrData attrData = new ItemAttrData(List[type].item.id, false, (ulong)List[type].item.count, -1, List[type].isBind); ItemAttrData attrData = new ItemAttrData(List[type].id, false, (ulong)List[type].count, -1, List[type].bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); }); } System/Dungeon/DungeonData.cs
@@ -63,7 +63,7 @@ public int leaderID; public int wheel; public Dictionary<string, AssistPlayer> helpPlayer; public int myMenberCnt; public int memberCnt; public long totalExp { System/Equip/EquipModel.cs
@@ -31,6 +31,8 @@ PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } EquipStarModel starModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } } public event Action appearanceChangeEvent; public override void Init() { ParseConfig(); @@ -487,6 +489,15 @@ equipSets[clientPlace.x].UpdateEquipSlot(clientPlace.y, equip == null ? string.Empty : equip.guid); appearance.value = GetAppearance(selectedLevel.value); if (clientPlace.x == PlayerDatas.Instance.baseData.equipShowSwitch / 10) { if (appearanceChangeEvent != null) { appearanceChangeEvent(); } } break; }
@@ -17,6 +17,13 @@ public int PackType;//强化类型 } public class EquipTypeClass { public int AttType; public int AttValue; public string StrName; } public class EquipStrengthModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, EquipStrengthClass> EquipStrengthDic = new Dictionary<int, EquipStrengthClass>();//强化数据 @@ -25,6 +32,13 @@ public event Action EquipStrengthUpdate;//强化数据刷新 public event Action SelectEquipRefresh;//二级页签刷新 public event Action SelectLevelRefresh;//一级页签刷新 private bool isChangeBool = true; public bool IsChangeBool { get { return isChangeBool; } set { isChangeBool = value; } } private int selectLevel = 0; public int SelectLevel//装备类别 { @@ -106,6 +120,14 @@ } } public void SendEquip(int equipIndex, int packTyp = 1) { CA301_tagEquipPlus CA301 = new CA301_tagEquipPlus(); CA301.PackType = (byte)packTyp; CA301.ItemIndex = (ushort)equipIndex; GameNetSystem.Instance.SendInfo(CA301);//向服务器发送装备位 } private void GetEquipLevelMax() { var itemPlusMax = ItemPlusMaxConfig.GetValues(); @@ -145,6 +167,53 @@ } return lv; } public List<EquipTypeClass> GetEquipValueList(int level, int equipPlace,int addlv=0) { List<EquipTypeClass> EquipTypeList = new List<EquipTypeClass>(); int type = GetEquipStrengthType(equipPlace); int equiplv = 0; int equipIndex = level * 10 + equipPlace; if (EquipStrengthDic.ContainsKey(equipIndex)) { equiplv = EquipStrengthDic[equipIndex].EquipPartStarLV; } equiplv += addlv; var itemPlus = ItemPlusConfig.GetTypeAndLevel(type, equiplv); if (itemPlus != null) { int [] attType = itemPlus.attType; int [] attValue = itemPlus.attValue; for (int i = 0; i < attType.Length; i++) { EquipTypeClass equipType = new EquipTypeClass(); equipType.AttType = attType[i]; equipType.AttValue = attValue[i]; var config = PlayerPropertyConfig.Get(attType[i]); if (config != null) { equipType.StrName = config.Name; } EquipTypeList.Add(equipType); } } return EquipTypeList; } public ItemPlusConfig GetEquipConfig(int level, int equipPlace) { ItemPlusConfig itemPlusConfig = new ItemPlusConfig(); int type = GetEquipStrengthType(equipPlace); int equiplv = 0; int equipIndex = level * 10 + equipPlace; if (EquipStrengthDic.ContainsKey(equipIndex)) { equiplv = EquipStrengthDic[equipIndex].EquipPartStarLV; } itemPlusConfig = ItemPlusConfig.GetTypeAndLevel(type, equiplv); return itemPlusConfig; } }
@@ -5,12 +5,100 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; using System; namespace Snxxz.UI { namespace Snxxz.UI { public class EquipStrengthRein:MonoBehaviour { public class EquipStrengthRein : MonoBehaviour { [SerializeField] ItemCell m_ItemMoney; [SerializeField] ItemCell m_ItemEquip; [SerializeField] IntensifySmoothSlider m_Slider; [SerializeField] Text NeedMoney; [SerializeField] Text m_AttributesText1; [SerializeField] Text m_AttributesText2; [SerializeField] Text m_AttributesText3; [SerializeField] Text m_SliderText; PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } } public void SetEquipStrengthRein(string equipGuid,int level,int equipPlace) { //ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); int equipIndex = level * 10 + equipPlace; int equipLv = 0; EquipStrengthClass equipStrength=new EquipStrengthClass(); if (strengthModel.EquipStrengthDic.ContainsKey(equipIndex))//获取当前强化等级 { equipLv = strengthModel.EquipStrengthDic[equipIndex].EquipPartStarLV; equipStrength = strengthModel.EquipStrengthDic[equipIndex]; } var itemPlus = strengthModel.GetEquipConfig(level, equipPlace); if (itemPlus == null) { DebugEx.LogError("没有索引到对应的强化表数据"); return; } var item = packModel.GetItemByGuid(equipGuid); if (item != null) { m_ItemEquip.Init(item); } ItemCellModel cellModel = new ItemCellModel(2100, true, (ulong)1, 0); m_ItemMoney.Init(cellModel); var equipLvNowList = strengthModel.GetEquipValueList(level, equipPlace); var equipAddLvList = strengthModel.GetEquipValueList(level, equipPlace,1); m_AttributesText1.gameObject.SetActive(false); m_AttributesText2.gameObject.SetActive(false); m_AttributesText3.gameObject.SetActive(false); for (int i = 0; i < 3; i++) { if (i < equipLvNowList.Count) { int type = i; var _equipLv = equipLvNowList[type]; var _equipAddLv = equipAddLvList[type]; switch (type) { case 0: m_AttributesText1.gameObject.SetActive(true); Text addText = m_AttributesText1.transform.Find("Number").GetComponent<Text>(); m_AttributesText1.text = _equipLv.StrName + ":" + _equipLv.AttValue; addText.text = "+" + (_equipAddLv.AttValue - _equipLv.AttValue); break; case 1: m_AttributesText2.gameObject.SetActive(true); Text addText1 = m_AttributesText2.transform.Find("Number").GetComponent<Text>(); m_AttributesText2.text = _equipLv.StrName + ":" + _equipLv.AttValue; addText1.text = "+" + (_equipAddLv.AttValue - _equipLv.AttValue); break; case 2: m_AttributesText3.gameObject.SetActive(true); Text addText2 = m_AttributesText3.transform.Find("Number").GetComponent<Text>(); m_AttributesText3.text = _equipLv.StrName + ":" + _equipLv.AttValue; addText2.text = "+" + (_equipAddLv.AttValue - _equipLv.AttValue); break; } } } m_SliderText.text = equipStrength.Proficiency + "/" + itemPlus.upExpNeed; if (strengthModel.IsChangeBool) { strengthModel.IsChangeBool = false; m_Slider.delay = 0f; m_Slider.stage = equipLv; m_Slider.ResetStage(); m_Slider.value = (float)Math.Round((double)equipStrength.Proficiency/ itemPlus.upExpNeed, 2, MidpointRounding.AwayFromZero); } else { m_Slider.delay = 0.2f; m_Slider.stage = equipLv; m_Slider.value = (float)Math.Round((double)equipStrength.Proficiency / itemPlus.upExpNeed, 2, MidpointRounding.AwayFromZero); } } }
@@ -19,6 +19,10 @@ [SerializeField] EquipStrengthFull m_EquipStrengthFull;//满级 [SerializeField] EquipStrengthUpper m_EquipStrengthUpper;//强化上限 [SerializeField] EquipStrengthRein m_EquipStrengthRein;//可强化 [SerializeField] GameObject m_BottomFrame; [SerializeField] Button m_StrengBtn; [SerializeField] Button m_AutomaticBtn; [SerializeField] Button m_StopBtn; EquipStrengthModel strengthModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } } EquipGemModel model { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } } @@ -33,10 +37,16 @@ protected override void AddListeners() { m_Controller.OnRefreshCell += OnRefreshCell; m_StrengBtn.AddListener(OnClickStrengBtn); m_AutomaticBtn.AddListener(OnClickAutomaticBtn); m_StopBtn.AddListener(OnClickStopBtn); } protected override void OnPreOpen() { m_StopBtn.gameObject.SetActive(false); m_AutomaticBtn.gameObject.SetActive(true); DisplayEquips(); strengthModel.SelectEquipRefresh += SelectEquipRefresh; strengthModel.SelectLevelRefresh += SelectLevelRefresh; @@ -52,14 +62,32 @@ strengthModel.SelectEquipRefresh -= SelectEquipRefresh; strengthModel.SelectLevelRefresh -= SelectLevelRefresh; strengthModel.EquipStrengthUpdate -= EquipStrengthUpdate; } protected override void OnAfterClose() { } #endregion private void OnClickStrengBtn() { int itemIndex = strengthModel.SelectLevel * 10 + strengthModel.SelectEquipPlace; strengthModel.SendEquip(itemIndex); } private void OnClickAutomaticBtn() { m_StopBtn.gameObject.SetActive(true); m_AutomaticBtn.gameObject.SetActive(false); } private void OnClickStopBtn() { m_StopBtn.gameObject.SetActive(false); m_AutomaticBtn.gameObject.SetActive(true); } private void EquipStrengthUpdate() { SetStrengthenedState(); @@ -158,19 +186,24 @@ if (equipLv >= maxLv)//满级 { m_BottomFrame.SetActive(false); m_EquipStrengthFull.gameObject.SetActive(true); } else if (maxLv > equipLv && equipLv >= itemPlusMaxConfig.levelMax)//强化上限 { m_BottomFrame.SetActive(false); m_EquipStrengthUpper.gameObject.SetActive(true); } else if (itemPlusMaxConfig.levelMax > equipLv)//可强化过 { m_BottomFrame.SetActive(true); m_EquipStrengthRein.gameObject.SetActive(true); m_EquipStrengthRein.SetEquipStrengthRein(equipGuid, equipLevel, equipPlace); } } else { m_BottomFrame.SetActive(false); m_NotEquipped.SetActive(true); } } System/FairyAu/AllianceBossEntranceWin.cs
@@ -108,6 +108,7 @@ { var levelLimitMin = dungeonConfig.LVLimitMin; var playerLevel = PlayerDatas.Instance.baseData.LV; m_LimitLevel.text = levelLimitMin.ToString(); m_LimitLevel.color = playerLevel >= levelLimitMin ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.Red, true); m_Description.text = dungeonConfig.Description;
@@ -22,8 +22,12 @@ [SerializeField] Transform m_ContainerAuctionReward; [SerializeField] Transform m_ContainerNoneReward; [SerializeField] Text m_NoneRewardRemind; [SerializeField] DemonJarRewardBehaviour[] m_AuctionItems; [SerializeField] DemonJarRewardBehaviour[] m_MyItems; [SerializeField] HorizontalLayoutGroup m_AuctionItemRoot; [SerializeField] ScrollRect m_AcctionItemScroll; [SerializeField] List<DemonJarRewardBehaviour> m_AuctionItems; [SerializeField] HorizontalLayoutGroup m_MyItemRoot; [SerializeField] ScrollRect m_MyItemScroll; [SerializeField] List<DemonJarRewardBehaviour> m_MyItems; [SerializeField] Button m_GotoAuction; AllianceBossModel model { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } } @@ -56,19 +60,26 @@ m_Rank.SetSprite(StringUtility.Contact("AllianceBossRank_", result.rank)); } m_AllianceRank.text = Language.Get("AllianceBossRank", result.rank); m_AllianceParticipate.text = Language.Get("AllianceParticipate", result.myMenberCnt); m_AllianceParticipate.text = Language.Get("AllianceParticipate", result.memberCnt); m_NoneRewardRemind.text = Language.Get("AllianceParticipateLimitMin", model.participateLimit); } void DisplayAutionItems() { var result = dungeonModel.dungeonResult; if (result.AuctionItem != null) { GenerateRewardBehaviour(m_AuctionItems, m_AuctionItemRoot.transform, result.AuctionItem.Length); m_AcctionItemScroll.horizontal = result.AuctionItem.Length > 4; m_AuctionItemRoot.childAlignment = result.AuctionItem.Length > 4 ? TextAnchor.MiddleLeft : TextAnchor.MiddleCenter; } m_AcctionItemScroll.horizontalNormalizedPosition = 0; var existAuctionItem = result.AuctionItem != null && result.AuctionItem.Length > 0; m_ContainerAuctionReward.gameObject.SetActive(existAuctionItem); m_ContainerNoneReward.gameObject.SetActive(!existAuctionItem); if (existAuctionItem) { for (int i = 0; i < m_AuctionItems.Length; i++) for (int i = 0; i < m_AuctionItems.Count; i++) { if (i < result.AuctionItem.Length) { @@ -87,7 +98,14 @@ void DisplayMyItems() { var result = dungeonModel.dungeonResult; for (int i = 0; i < m_MyItems.Length; i++) if (result.itemInfo != null) { GenerateRewardBehaviour(m_MyItems, m_MyItemRoot.transform, result.itemInfo.Length); m_MyItemScroll.horizontal = result.itemInfo.Length > 4; m_MyItemRoot.childAlignment = result.itemInfo.Length > 4 ? TextAnchor.MiddleLeft : TextAnchor.MiddleCenter; } m_MyItemScroll.horizontalNormalizedPosition = 0; for (int i = 0; i < m_MyItems.Count; i++) { if (result.itemInfo != null && i < result.itemInfo.Length) { @@ -106,6 +124,22 @@ { WindowCenter.Instance.Open<AuctionHouseWin>(false, 1); } private void GenerateRewardBehaviour(List<DemonJarRewardBehaviour> rewardBehaviours, Transform _parent, int _needCount) { var nowCount = rewardBehaviours.Count; var dif = _needCount - nowCount; if (dif > 0) { for (int i = 0; i < dif; i++) { var instance = UIUtility.CreateWidget("DemonJarRewardBehaviour", "DemonJarRewardBehaviour"); var behaviour = instance.GetComponent<DemonJarRewardBehaviour>(); rewardBehaviours.Add(behaviour); instance.transform.SetParentEx(_parent, Vector3.zero, Vector3.zero, Vector3.one); } } } } } System/FairyAu/FairyAuTaskWin.cs
@@ -400,7 +400,7 @@ { m_GridLeft.GetChild(i).gameObject.SetActive(false); } List<AwardItem> AwardItemList = new List<AwardItem>(); List<Item> AwardItemList = new List<Item>(); AwardItemList = RankAwardItem.GetAwardItem(12); for (int i = 0; i < AwardItemList.Count; i++) { @@ -409,8 +409,8 @@ m_GridLeft.GetChild(i).gameObject.SetActive(true); ItemCell itemCell = m_GridLeft.GetChild(i).GetComponent<ItemCell>(); ulong Number = 0; Number = (ulong)AwardItemList[i].item.count; if (AwardItemList[i].item.id == 2103) Number = (ulong)AwardItemList[i].count; if (AwardItemList[i].id == 2103) { Equation.Instance.Clear(); int playerlv = PlayerDatas.Instance.baseData.LV; @@ -419,12 +419,12 @@ Number = Equation.Instance.Eval<ulong>("reExp"); } ItemCellModel cellModel = new ItemCellModel(AwardItemList[i].item.id, true, Number, AwardItemList[i].isBind); ItemCellModel cellModel = new ItemCellModel(AwardItemList[i].id, true, Number, AwardItemList[i].bind?1:0); itemCell.Init(cellModel); int tab = i; itemCell.cellBtn.SetListener(()=> { ItemAttrData attrData = new ItemAttrData(AwardItemList[tab].item.id, false, Number, -1, AwardItemList[tab].isBind); ItemAttrData attrData = new ItemAttrData(AwardItemList[tab].id, false, Number, -1, AwardItemList[tab].bind?1:0); itemTipsModel.SetItemTipsModel(attrData); }); } @@ -439,11 +439,7 @@ var _jsonData = LitJson.JsonMapper.ToObject(runTaskAward.Numerical3); if (runTaskAward.Numerical4 != string.Empty)//经验 { _award.Add(12, new AwardItem() { item = new Item(2103, 1), isBind = 1, }); _award.Add(12, new Item(2103, 1)); } foreach (string key in _jsonData.Keys) { @@ -451,11 +447,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2]==1)); } }
@@ -278,10 +278,10 @@ /// <summary> /// key----世界等级 /// </summary> public Dictionary<int, List<AwardItem>> finalWarWinAwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<AwardItem>> finalWarChampionWinAwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<AwardItem>> finalWarDefeatAwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<AwardItem>> finalWarChampionDefeatAwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<Item>> finalWarWinAwardDict = new Dictionary<int, List<Item>>(); public Dictionary<int, List<Item>> finalWarChampionWinAwardDict = new Dictionary<int, List<Item>>(); public Dictionary<int, List<Item>> finalWarDefeatAwardDict = new Dictionary<int, List<Item>>(); public Dictionary<int, List<Item>> finalWarChampionDefeatAwardDict = new Dictionary<int, List<Item>>(); private Dictionary<int, float> crystalRateDict = new Dictionary<int, float>(); readonly List<int> fairyLeagueStateValues = new List<int>() { 11, 12, 13, 21, 22, 23 }; FairyLeagueWeekTime fairyLeagueWeekTime = new FairyLeagueWeekTime(); @@ -377,7 +377,7 @@ foreach (Match match in _regex.Matches(cfg.Numerical1)) { var _worldLv = int.Parse(match.Groups[1].Value); List<AwardItem> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); List<Item> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); finalWarWinAwardDict.Add(_worldLv, _list); } } @@ -386,7 +386,7 @@ foreach (Match match in _regex.Matches(cfg.Numerical2)) { var _worldLv = int.Parse(match.Groups[1].Value); List<AwardItem> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); List<Item> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); finalWarDefeatAwardDict.Add(_worldLv, _list); } } @@ -396,7 +396,7 @@ foreach (Match match in _regex.Matches(cfg.Numerical1)) { var _worldLv = int.Parse(match.Groups[1].Value); List<AwardItem> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); List<Item> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); finalWarChampionWinAwardDict.Add(_worldLv, _list); } } @@ -405,7 +405,7 @@ foreach (Match match in _regex.Matches(cfg.Numerical2)) { var _worldLv = int.Parse(match.Groups[1].Value); List<AwardItem> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); List<Item> _list = ParseAward(StringUtility.Contact('[', match.Groups[2].Value, ']')); finalWarChampionDefeatAwardDict.Add(_worldLv, _list); } } @@ -425,18 +425,18 @@ return index; } private List<AwardItem> ParseAward(string _config) private List<Item> ParseAward(string _config) { List<AwardItem> _list = new List<AwardItem>(); List<Item> _list = new List<Item>(); var _array = JsonMapper.ToObject<int[][]>(_config); if (_array != null) { for (int i = 0; i < _array.Length; i++) { AwardItem _item = new AwardItem(); _item.item.id = _array[i][0]; _item.item.count = _array[i][1]; _item.isBind = _array[i][2]; Item _item = new Item(); _item.id = _array[i][0]; _item.count = _array[i][1]; _item.bind = _array[i][2] == 1; _list.Add(_item); } } System/FairyAu/FairyLeagueRankCell.cs
@@ -77,7 +77,7 @@ m_ChampionAwardBtn.onClick.RemoveAllListeners(); if (model.fairyLeagueGroupId == 5 && (winChampion || defeatChampion)) { Dictionary<int, List<AwardItem>> _dict = null; Dictionary<int, List<Item>> _dict = null; if (winChampion) { _dict = (model.fairyLeagueSession == 1 && model.fairyLeagueHelp.fairyWarEnter.IsFinalMatch == 1) ? @@ -92,10 +92,10 @@ { _rankKey = UIHelper.GetIntervalAward(_dict.Keys, (int)PlayerDatas.Instance.worldLv); var _Award = _dict[_rankKey][0]; m_ChampionAward.Init(_Award.item.id, Mathf.Min(1, _Award.item.count), _Award.isBind); m_ChampionAward.Init(_Award.id, Mathf.Min(1, _Award.count), _Award.bind?1:0); m_ChampionAwardBtn.onClick.AddListener(() => { ItemAttrData _itemData = new ItemAttrData(_Award.item.id, false, (ulong)_Award.item.count, -1, _Award.isBind); ItemAttrData _itemData = new ItemAttrData(_Award.id, false, (ulong)_Award.count, -1, _Award.bind?1:0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemData); }); } System/KnapSack/Logic/ItemTipsModel.cs
@@ -2227,28 +2227,28 @@ { int lv = strengthengmodel.StrengthenTheCeiling(index); int type = strengthengmodel.GameDefineIndex(index); var itemPlus = ItemPlusConfig.GetItemPlusData(type, lv); if (itemPlus != null) { int[] attrIDs = itemPlus.attrIds; int[] attrValues = itemPlus.attrValues; for (int i = 0; i < attrIDs.Length; i++) { var attrId = attrIDs[i]; var attrValue = attrValues[i]; if (attrValue > 0) { if (!attrDict.ContainsKey(attrId)) { attrDict.Add(attrId, attrValue); } else { attrDict[attrId] += attrValue; } } } } //var itemPlus = ItemPlusConfig.GetItemPlusData(type, lv); //if (itemPlus != null) //{ // int[] attrIDs = itemPlus.attrIds; // int[] attrValues = itemPlus.attrValues; // for (int i = 0; i < attrIDs.Length; i++) // { // var attrId = attrIDs[i]; // var attrValue = attrValues[i]; // if (attrValue > 0) // { // if (!attrDict.ContainsKey(attrId)) // { // attrDict.Add(attrId, attrValue); // } // else // { // attrDict[attrId] += attrValue; // } // } // } //} } } return attrDict; @@ -2819,7 +2819,7 @@ /// <summary> /// 设置强化数据 /// </summary> private ItemPlusConfig.ItemPlusData itemPlus; //private ItemPlusConfig.ItemPlusData itemPlus; public int StrengthLV { get; private set; } public void SetStrengthData(int lv, int type) { @@ -2828,17 +2828,17 @@ if (lv <= 0) return; strengthDataDict = new Dictionary<int, int>(); itemPlus = ItemPlusConfig.GetItemPlusData(type, lv); if (itemPlus != null) { int[] attrIDs = itemPlus.attrIds; int[] attrValues = itemPlus.attrValues; int i = 0; for (i = 0; i < attrIDs.Length; i++) { strengthDataDict.Add(attrIDs[i], attrValues[i]); } } //itemPlus = ItemPlusConfig.GetItemPlusData(type, lv); //if (itemPlus != null) //{ // int[] attrIDs = itemPlus.attrIds; // int[] attrValues = itemPlus.attrValues; // int i = 0; // for (i = 0; i < attrIDs.Length; i++) // { // strengthDataDict.Add(attrIDs[i], attrValues[i]); // } //} } /// <summary> System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -120,11 +120,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[_key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = 1, }); _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1])); } } DicAwardItem.Add(functionForecastConfig.FuncId, _award); System/MainInterfacePanel/FeaturesType3.cs
@@ -118,7 +118,7 @@ private void SetRankAwardItem(int funcID) { ImpactRankModel.RankAwardItem rankAward = featureNoticeModel.DicAwardItem[funcID]; List<AwardItem> List = rankAward.GetAwardItem(PlayerDatas.Instance.baseData.Job); List<Item> List = rankAward.GetAwardItem(PlayerDatas.Instance.baseData.Job); if (List.Count <= 1) { @@ -136,9 +136,9 @@ } } private void SetItem1(List<AwardItem> List,int funcID) private void SetItem1(List<Item> List,int funcID) { var itemConfig = ItemConfig.Get(List[0].item.id); var itemConfig = ItemConfig.Get(List[0].id); UIHelper.SetItemBackGround(m_ItemBG1, itemConfig.ItemColor); m_Icon1.SetSprite(itemConfig.IconKey); m_IconBtn1.SetListener(() => @@ -151,22 +151,22 @@ } else { ItemAttrData attrData = new ItemAttrData(List[0].item.id, false, (ulong)List[0].item.count, -1, List[0].isBind); ItemAttrData attrData = new ItemAttrData(List[0].id, false, (ulong)List[0].count, -1, List[0].bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); // DebugEx.LogError("弹框"); } }); if (List[0].item.count > 1) if (List[0].count > 1) { m_Number1.gameObject.SetActive(true); m_Number1.text = List[0].item.count.ToString(); m_Number1.text = List[0].count.ToString(); } else { m_Number1.gameObject.SetActive(false); } if (List[0].isBind==1) if (List[0].bind) { m_Lock1.gameObject.SetActive(true); } @@ -204,9 +204,9 @@ m_HasReceived1.SetActive(false); } } private void SetItem2(List<AwardItem> List, int funcID) private void SetItem2(List<Item> List, int funcID) { var itemConfig = ItemConfig.Get(List[1].item.id); var itemConfig = ItemConfig.Get(List[1].id); UIHelper.SetItemBackGround(m_ItemBG2, itemConfig.ItemColor); m_Icon2.SetSprite(itemConfig.IconKey); m_IconBtn2.SetListener(() => @@ -219,21 +219,21 @@ } else { ItemAttrData attrData = new ItemAttrData(List[1].item.id, false, (ulong)List[1].item.count, -1, List[1].isBind); ItemAttrData attrData = new ItemAttrData(List[1].id, false, (ulong)List[1].count, -1, List[1].bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); //DebugEx.LogError("弹框"); } }); if (List[1].item.count > 1) if (List[1].count > 1) { m_Number2.gameObject.SetActive(true); m_Number2.text = List[1].item.count.ToString(); m_Number2.text = List[1].count.ToString(); } else { m_Number2.gameObject.SetActive(false); } if (List[1].isBind==1) if (List[1].bind) { m_Lock2.gameObject.SetActive(true); } System/MainInterfacePanel/PlayerMainDate.cs
@@ -256,7 +256,6 @@ PlayerDatas.Instance.hero.OnPathFindStop -= OnFinishedPathFind; SDKUtility.Instance.OnBatteryLevelChanged -= OnBatteryChanged;//电量 SDKUtility.Instance.OnNetworkStatusChanged -= OnNetStatusChanged;//无网络 StrengtheningSripts.IsFightUp -= IsFightUp;//停止自动强化 DeadModel.playerDieEvent -= playerDieEvent; playerPack.useItemSuccessEvent -= UseItemSuccessAct; PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting; @@ -265,7 +264,6 @@ PlayerDatas.Instance.hero.OnPathFindStop += OnFinishedPathFind; SDKUtility.Instance.OnBatteryLevelChanged += OnBatteryChanged;//电量 SDKUtility.Instance.OnNetworkStatusChanged += OnNetStatusChanged;//无网络 StrengtheningSripts.IsFightUp += IsFightUp;//停止自动强化 DeadModel.playerDieEvent += playerDieEvent;//获取玩家死亡状态 playerPack.useItemSuccessEvent += UseItemSuccessAct; PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting; @@ -409,15 +407,6 @@ prowNum = power; } } } private void IsFightUp()//存储自动强化中间的值 { if (StrengthegingAddFight > 0) { SnxxzGame.Instance.StartCoroutine(LoadingIE()); } } IEnumerator LoadingIE() System/OpenServerActivity/ImpactRankModel.cs
@@ -130,11 +130,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[_key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2] == 1)); } } _awardList.Add(_award); @@ -178,11 +174,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[_key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = 1, }); _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1])); } } _awardList.Add(_award); @@ -421,24 +413,24 @@ public class RankAwardItem { private Dictionary<int, List<AwardItem>> m_AwardDict = new Dictionary<int, List<AwardItem>>(); public Dictionary<int, List<AwardItem>> AwardDic private Dictionary<int, List<Item>> m_AwardDict = new Dictionary<int, List<Item>>(); public Dictionary<int, List<Item>> AwardDic { get { return m_AwardDict; } } public List<AwardItem> GetAwardItem(int _job) public List<Item> GetAwardItem(int _job) { List<AwardItem> _items = null; List<Item> _items = null; m_AwardDict.TryGetValue(_job, out _items); return _items; } public void Add(int _job, AwardItem _item) public void Add(int _job, Item _item) { List<AwardItem> _list = null; List<Item> _list = null; if (!m_AwardDict.TryGetValue(_job, out _list)) { _list = new List<AwardItem>(); _list = new List<Item>(); m_AwardDict.Add(_job, _list); } _list.Add(_item); System/OpenServerActivity/ImpactRankWin.cs
@@ -300,14 +300,14 @@ if (_itemList != null && i < _itemList.Count) { var _item = _itemList[i]; ItemCellModel _ItemData = new ItemCellModel(_item.item.id, false, (ulong)_item.item.count, _item.isBind); ItemCellModel _ItemData = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0); _cell.items[i].SetItemRare(_ItemData, 5); _cell.items[i].cellBtn.RemoveAllListeners(); _cell.items[i].cellBtn.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_item.item.id, false, (ulong)_item.item.count, -1, _item.isBind); ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, false, (ulong)_item.count, -1, _item.bind?1:0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); }); } System/OpenServerActivity/InSevenDayBehavior.cs
@@ -57,16 +57,16 @@ } ImpactRankModel.RankAwardItem RankAwardItem = inSevenDayModel.InSevenDayDic[inDay].RankAwardItem; int Job = PlayerDatas.Instance.baseData.Job; List<AwardItem> list = RankAwardItem.GetAwardItem(Job); List<Item> list = RankAwardItem.GetAwardItem(Job); if (list.Count > 0) { AwardItem item = list[0]; ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind); Item item = list[0]; ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)item.count, item.bind ? 1 : 0); m_ItemCell.Init(cellModel); m_ItemCell.cellBtn.RemoveAllListeners(); m_ItemCell.cellBtn.AddListener(()=> m_ItemCell.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); }); } System/OpenServerActivity/InSevenDayModel.cs
@@ -100,11 +100,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = 1, }); _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1])); } } System/OpenServerActivity/MonthlyInvestmentModel.cs
@@ -120,20 +120,20 @@ } public class MonthlyInvestmentItem { private Dictionary<int, List<AwardItem>> m_AwardDict = new Dictionary<int, List<AwardItem>>(); private Dictionary<int, List<Item>> m_AwardDict = new Dictionary<int, List<Item>>(); public List<AwardItem> GetAwardItem(int _job) public List<Item> GetAwardItem(int _job) { List<AwardItem> _items = null; List<Item> _items = null; m_AwardDict.TryGetValue(_job, out _items); return _items; } public void Add(int _job, AwardItem _item) public void Add(int _job, Item _item) { List<AwardItem> _list = null; List<Item> _list = null; if (!m_AwardDict.TryGetValue(_job, out _list)) { _list = new List<AwardItem>(); _list = new List<Item>(); m_AwardDict.Add(_job, _list); } _list.Add(_item); @@ -160,11 +160,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _monthyItem.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); _monthyItem.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2] == 1)); } } monthlyInvestment.monthlyInvestmentItem = _monthyItem; System/OpenServerActivity/MotnlyInvestmentItem.cs
@@ -134,19 +134,19 @@ { if (monthlyInvestmentModel.MonthlyInvestmentDic.ContainsKey(Day)) { List<AwardItem> monthlyInvestmentItem = monthlyInvestmentModel.MonthlyInvestmentDic[Day].monthlyInvestmentItem.GetAwardItem(1); List<Item> monthlyInvestmentItem = monthlyInvestmentModel.MonthlyInvestmentDic[Day].monthlyInvestmentItem.GetAwardItem(1); for (int i = 0; i < m_Group.childCount; i++) { if (i < monthlyInvestmentItem.Count) { m_Group.GetChild(i).gameObject.SetActive(true); AwardItem item = monthlyInvestmentItem[i]; Item item = monthlyInvestmentItem[i]; MotnlyItem motnlyItem = m_Group.GetChild(i).GetComponent<MotnlyItem>(); var Item = ItemConfig.Get(item.item.id); ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)1, item.isBind); var Item = ItemConfig.Get(item.id); ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)1, item.bind?1:0); motnlyItem.Item_Cell.Init(cellModel); motnlyItem.NameText.text = Item.ItemName; motnlyItem.MoneyNumberText.text = item.item.count.ToString(); motnlyItem.MoneyNumberText.text = item.count.ToString(); motnlyItem.MoneyImage.SetSprite(Item.IconKey); } else System/OpenServerActivity/RewardInformation.cs
@@ -36,7 +36,7 @@ var GetInSevenDay = inSevenDay.InSevenDayDic[Day]; m_IncentiveValue.text =string.Format(Language.Get("IncentiveValue"), GetInSevenDay.Money); int Job = PlayerDatas.Instance.baseData.Job; List<AwardItem> list = GetInSevenDay.RankAwardItem.GetAwardItem(Job); List<Item> list = GetInSevenDay.RankAwardItem.GetAwardItem(Job); for (int i = 0; i < m_Group.childCount; i++) { GameObject obj = m_Group.GetChild(i).gameObject; @@ -47,13 +47,13 @@ obj.SetActive(true); } ItemCell itemCell = obj.GetComponent<ItemCell>(); AwardItem item = list[i]; ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind); Item item = list[i]; ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)item.count, item.bind?1:0); itemCell.Init(cellModel); itemCell.cellBtn.RemoveAllListeners(); itemCell.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind?1:0); itemTipsModel.SetItemTipsModel(attrData); }); } System/OpenServerActivity/SuperValueGiftBehaviour.cs
@@ -62,13 +62,13 @@ { if (rechargeId != 0) { List<AwardItem> items; List<Item> items; if (vipModel.TryGetRechargeItem(rechargeId, out items)) { if (index < items.Count) { var item = items[index]; ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind?1:0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); } } @@ -94,7 +94,7 @@ public void Display(int id) { rechargeId = id; List<AwardItem> items; List<Item> items; bool hasItem = vipModel.TryGetRechargeItem(id, out items); for (int i = 0; i < m_Items.Length; i++) { @@ -102,7 +102,7 @@ { m_Items[i].gameObject.SetActive(true); var _item = items[i]; var _itemModel = new ItemCellModel(_item.item.id, false, (ulong)_item.item.count, _item.isBind); var _itemModel = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0); m_Items[i].SetItemRare(_itemModel, i == 0); } else System/RoleParticulars/RoleParticularModel.cs
@@ -707,7 +707,8 @@ public bool IsCrossServerPlayer() { return rolePropData.ServerGroupID != PlayerDatas.Instance.baseData.ServerGroupId; return rolePropData.ServerGroupID != 0 && rolePropData.ServerGroupID != PlayerDatas.Instance.baseData.ServerGroupId; } }
@@ -15,15 +15,15 @@ private StrengthenModel strengtheng { get { return M_Strengtheng ?? (M_Strengtheng = ModelCenter.Instance.GetModel<StrengthenModel>()); } } private Button _closeBtn; private StrengtheningSripts _strengtheningPanel; public StrengtheningSripts StrengthenPnl { get { if (_strengtheningPanel == null) _strengtheningPanel = transform.Find("CommonPanel/StrengtheningPanel").GetComponent<StrengtheningSripts>(); return _strengtheningPanel; //private StrengtheningSripts _strengtheningPanel; //public StrengtheningSripts StrengthenPnl { // get { // if (_strengtheningPanel == null) // _strengtheningPanel = transform.Find("CommonPanel/StrengtheningPanel").GetComponent<StrengtheningSripts>(); // return _strengtheningPanel; } } // } //} private Button _prePageBtn; private Button _nextPageBtn; @@ -73,7 +73,7 @@ protected override void OnPreOpen() { StrengthenPnl.gameObject.SetActive(false); //StrengthenPnl.gameObject.SetActive(false); _InlaidGemPanel.gameObject.SetActive(false); _wingsRefinePanel.SetActive(false); @@ -139,10 +139,10 @@ private void OnClickItemWashTitle() { if (StrengthenPnl.gameObject.activeSelf) { StrengthenPnl.gameObject.SetActive(false); } //if (StrengthenPnl.gameObject.activeSelf) //{ // StrengthenPnl.gameObject.SetActive(false); //} _InlaidGemPanel.gameObject.SetActive(false); _wingsRefinePanel.SetActive(false); @@ -151,10 +151,10 @@ private void OnClickEquipSuit() { if (StrengthenPnl.gameObject.activeSelf) { StrengthenPnl.gameObject.SetActive(false); } //if (StrengthenPnl.gameObject.activeSelf) //{ // StrengthenPnl.gameObject.SetActive(false); //} _InlaidGemPanel.gameObject.SetActive(false); _wingsRefinePanel.SetActive(false); functionOrder = _equipSuitTitle.order; @@ -162,10 +162,10 @@ private void OnClickWingsRefine() { if (StrengthenPnl.gameObject.activeSelf) { StrengthenPnl.gameObject.SetActive(false); } //if (StrengthenPnl.gameObject.activeSelf) //{ // StrengthenPnl.gameObject.SetActive(false); //} _InlaidGemPanel.gameObject.SetActive(false); _wingsRefinePanel.SetActive(true); model.redPointStre.state = RedPointState.None; @@ -174,10 +174,10 @@ private void OnClickInlayTitle() { if (StrengthenPnl.gameObject.activeSelf) { StrengthenPnl.gameObject.SetActive(false); } //if (StrengthenPnl.gameObject.activeSelf) //{ // StrengthenPnl.gameObject.SetActive(false); //} _InlaidGemPanel.gameObject.SetActive(true); _wingsRefinePanel.SetActive(false); functionOrder = _inlayTitle.order; @@ -185,7 +185,6 @@ private void OnClickStrengthTitle() { StrengthenPnl.gameObject.SetActive(true); _InlaidGemPanel.gameObject.SetActive(false); _wingsRefinePanel.SetActive(false); functionOrder = _strengthTitle.order; System/Strengthening/StrengthenModel.cs
@@ -149,24 +149,24 @@ } public void MoneyRequired(int EquippedWith, int EquipmentLevel)//获取最高阶所需的钱数 { int Type = GameDefineIndex(EquippedWith); ItemPlusConfig _tagItemPlue = ItemPlusConfig.GetTypeAndGrade(Type, EquipmentLevel); if (_tagItemPlue == null) { return; } if (DicEquip.ContainsKey(EquippedWith)) { DicEquip[EquippedWith].CurrentLevel = EquipmentLevel; DicEquip[EquippedWith].Money = _tagItemPlue.costCount; } else { EquipRedDot _EquipRedDot = new EquipRedDot(); _EquipRedDot.CurrentLevel = EquipmentLevel; _EquipRedDot.Money = _tagItemPlue.costCount; DicEquip.Add(EquippedWith, _EquipRedDot); } //int Type = GameDefineIndex(EquippedWith); ////ItemPlusConfig _tagItemPlue = ItemPlusConfig.GetTypeAndGrade(Type, EquipmentLevel); //if (_tagItemPlue == null) //{ // return; //} //if (DicEquip.ContainsKey(EquippedWith)) //{ // DicEquip[EquippedWith].CurrentLevel = EquipmentLevel; // DicEquip[EquippedWith].Money = _tagItemPlue.costCount; //} //else //{ // EquipRedDot _EquipRedDot = new EquipRedDot(); // _EquipRedDot.CurrentLevel = EquipmentLevel; // _EquipRedDot.Money = _tagItemPlue.costCount; // DicEquip.Add(EquippedWith, _EquipRedDot); //} MoneyData(); } public void MoneyData()//获取金钱数据 System/Strengthening/StrengtheningSripts.cs
@@ -1,1238 +1,1238 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; ////using System.Collections; ////using System.Collections.Generic; ////using UnityEngine; ////using UnityEngine.UI; using System; using Snxxz.UI; ////using System; ////using Snxxz.UI; //强化界面面板 public class StrengtheningSripts : MonoBehaviour { //////强化界面面板 ////public class StrengtheningSripts : MonoBehaviour ////{ [SerializeField] ItemCell UpIteemCell; [SerializeField] ItemCell NowIteemCell; [SerializeField] ItemCell FullIteemCell; [SerializeField] Text GradeTextNext; [SerializeField] Text m_DefenseText;//防御力 [SerializeField] Text m_DefenseNum;//防御增加值 [SerializeField] Text m_LifeValueText;//生命 [SerializeField] Text m_LifeValueNum;//生命增加值 [SerializeField] Text m_AttText;//攻击 [SerializeField] Text m_AttNum;//攻击增加值 [SerializeField] Text m_Money_text;//背包铜钱数量 [SerializeField] Text m_PromoteLimit; //// [SerializeField] ItemCell UpIteemCell; //// [SerializeField] ItemCell NowIteemCell; //// [SerializeField] ItemCell FullIteemCell; //// [SerializeField] Text GradeTextNext; //// [SerializeField] Text m_DefenseText;//防御力 //// [SerializeField] Text m_DefenseNum;//防御增加值 //// [SerializeField] Text m_LifeValueText;//生命 //// [SerializeField] Text m_LifeValueNum;//生命增加值 //// [SerializeField] Text m_AttText;//攻击 //// [SerializeField] Text m_AttNum;//攻击增加值 //// [SerializeField] Text m_Money_text;//背包铜钱数量 //// [SerializeField] Text m_PromoteLimit; private Dictionary<int, string> _toggleName = new Dictionary<int, string>();//关于响应事件字典存储 Dictionary<int, string> _toponym = new Dictionary<int, string>(); private string[] _locationSort = new string[] { };//装备位优先级数组 private List<int> _wear = new List<int>();//有穿戴的装备 private List<int> _notWear = new List<int>();//未穿戴的装备 private List<int> _fullLevel = new List<int>();//满阶的装备 private GameObject _ScrollRectPanel;//活动框面板 private Transform _content;//Toggle组 public ScrollRect _Scrobar;//索引条 //// private Dictionary<int, string> _toggleName = new Dictionary<int, string>();//关于响应事件字典存储 //// Dictionary<int, string> _toponym = new Dictionary<int, string>(); //// private string[] _locationSort = new string[] { };//装备位优先级数组 //// private List<int> _wear = new List<int>();//有穿戴的装备 //// private List<int> _notWear = new List<int>();//未穿戴的装备 //// private List<int> _fullLevel = new List<int>();//满阶的装备 //// private GameObject _ScrollRectPanel;//活动框面板 //// private Transform _content;//Toggle组 //// public ScrollRect _Scrobar;//索引条 private Button _stopBtn;//停止强化 private Button _strengBtn;//强化按钮 private Button _automaticBtn;//自动强化按钮 private Text _StrengImage;//强化Image //// private Button _stopBtn;//停止强化 //// private Button _strengBtn;//强化按钮 //// private Button _automaticBtn;//自动强化按钮 //// private Text _StrengImage;//强化Image private Image TheningFloor;//控制显隐 //// private Image TheningFloor;//控制显隐 private Transform _TheningTop;//强化面板总 private Transform _GridGreenImage;//强化面板 private Image _gridAblueImage;//所需的金币 private Text _moneyText;//需要升级的金钱 private Button _MoneyButton;//金币按钮弹框 private Text _gradText;//当前等级 private Slider _slider;//经验条 private Text _sliderText;//熟练度 //// private Transform _TheningTop;//强化面板总 //// private Transform _GridGreenImage;//强化面板 //// private Image _gridAblueImage;//所需的金币 //// private Text _moneyText;//需要升级的金钱 //// private Button _MoneyButton;//金币按钮弹框 //// private Text _gradText;//当前等级 //// private Slider _slider;//经验条 //// private Text _sliderText;//熟练度 private Transform _GridGreenB;//满级面板 private Text _LevelTextB;//满级的等级 private Slider _GBSlider;//满级滑动条 private Text _FillAText;//满级超出内容 private Transform _AttributesBig;//未装备面板 //// private Transform _GridGreenB;//满级面板 //// private Text _LevelTextB;//满级的等级 //// private Slider _GBSlider;//满级滑动条 //// private Text _FillAText;//满级超出内容 //// private Transform _AttributesBig;//未装备面板 private int _tag;//用来当做标记位（当前的装备位置） private int _StrengtheningType = 0;//强化类型标记 private int _StrengthenLevel = 0;//用来标记当前强化等级 private ulong _money;//需要消耗的钱数 EquipmentInitialization _equipment; private bool _boolIE;//是否再强化中 private bool _open = true; private bool _ToggleDown = true;//默认第一次 private int _lvInt; int _numberText; private float _flotA; private float _flotB; private bool _effects = true; public Transform _TheningFloor; public IntensifySmoothSlider _SmoothSlider;//Slider //// private int _tag;//用来当做标记位（当前的装备位置） //// private int _StrengtheningType = 0;//强化类型标记 //// private int _StrengthenLevel = 0;//用来标记当前强化等级 //// private ulong _money;//需要消耗的钱数 //// EquipmentInitialization _equipment; //// private bool _boolIE;//是否再强化中 //// private bool _open = true; //// private bool _ToggleDown = true;//默认第一次 //// private int _lvInt; //// int _numberText; //// private float _flotA; //// private float _flotB; //// private bool _effects = true; //// public Transform _TheningFloor; //// public IntensifySmoothSlider _SmoothSlider;//Slider GetItemPathModel _GetItemPath; GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } } StrengthenModel m_StrengthengModel; StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } } //// GetItemPathModel _GetItemPath; //// GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } } //// StrengthenModel m_StrengthengModel; //// StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } //// ItemTipsModel _itemTipsModel; //// ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } PlayerMainDate m_MainModel; PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } TaskModel m_PlayerTask; //// PackModel _playerPack; //// PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } //// PlayerMainDate m_MainModel; //// PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } //// TaskModel m_PlayerTask; public static Action IsFightUp; //// public static Action IsFightUp; [SerializeField] UIEffect _UIEffect1A; [SerializeField] UIEffect _UIEffect1B; [SerializeField] UIEffect _UIEffect1C; [SerializeField] UIEffect _UIEffect1D; //// [SerializeField] UIEffect _UIEffect1A; //// [SerializeField] UIEffect _UIEffect1B; //// [SerializeField] UIEffect _UIEffect1C; //// [SerializeField] UIEffect _UIEffect1D; [SerializeField] GameObject m_ImageBGObj; public float _Delaytime = 0.1f;//延迟时间 public float _Contracttime = 0.15f;//发包时间 //// [SerializeField] GameObject m_ImageBGObj; //// public float _Delaytime = 0.1f;//延迟时间 //// public float _Contracttime = 0.15f;//发包时间 private bool IsGuide = false; void Awake() { //// private bool IsGuide = false; //// void Awake() //// { #region 属性赋值 _ScrollRectPanel = this.transform.Find("StrengBackground/ManagementFrame/ScrollRectPanel").gameObject; _content = this.transform.Find("StrengBackground/ManagementFrame/ScrollRectPanel/Viewport/Content"); //// #region 属性赋值 //// _ScrollRectPanel = this.transform.Find("StrengBackground/ManagementFrame/ScrollRectPanel").gameObject; //// _content = this.transform.Find("StrengBackground/ManagementFrame/ScrollRectPanel/Viewport/Content"); _stopBtn = this.transform.Find("BottomFrame/StopBtn").GetComponent<Button>(); _strengBtn = this.transform.Find("BottomFrame/StrengBtn").GetComponent<Button>(); _StrengImage = this.transform.Find("BottomFrame/StrengBtn/StrengImage").GetComponent<Text>(); _automaticBtn = this.transform.Find("BottomFrame/AutomaticBtn").GetComponent<Button>(); //// _stopBtn = this.transform.Find("BottomFrame/StopBtn").GetComponent<Button>(); //// _strengBtn = this.transform.Find("BottomFrame/StrengBtn").GetComponent<Button>(); //// _StrengImage = this.transform.Find("BottomFrame/StrengBtn/StrengImage").GetComponent<Text>(); //// _automaticBtn = this.transform.Find("BottomFrame/AutomaticBtn").GetComponent<Button>(); TheningFloor = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor").GetComponent<Image>(); //// TheningFloor = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor").GetComponent<Image>(); _TheningTop = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop").transform; _GridGreenImage = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips").transform; //// _TheningTop = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop").transform; //// _GridGreenImage = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips").transform; _MoneyButton = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/DownImage").GetComponent<Button>(); _moneyText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/DownImage/Level_2_TAB").GetComponent<Text>(); _gradText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/GradientAImage/GradText").GetComponent<Text>(); _slider = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/Slider").GetComponent<Slider>(); _sliderText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/Slider/Background/NumericalText").GetComponent<Text>(); //// _MoneyButton = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/DownImage").GetComponent<Button>(); //// _moneyText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/DownImage/Level_2_TAB").GetComponent<Text>(); //// _gradText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/GradientAImage/GradText").GetComponent<Text>(); //// _slider = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/Slider").GetComponent<Slider>(); //// _sliderText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/StrengthenGreenATips/Slider/Background/NumericalText").GetComponent<Text>(); _GridGreenB = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB").transform; _LevelTextB = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Gradient/GradientText").GetComponent<Text>(); _GBSlider = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Slider").GetComponent<Slider>(); _FillAText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Slider/Background/SkilledArticleText").GetComponent<Text>(); //// _GridGreenB = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB").transform; //// _LevelTextB = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Gradient/GradientText").GetComponent<Text>(); //// _GBSlider = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Slider").GetComponent<Slider>(); //// _FillAText = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/GridGreenB/GridGreenBTips/Slider/Background/SkilledArticleText").GetComponent<Text>(); _AttributesBig = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/AttributesBigTips").transform; #endregion //// _AttributesBig = this.transform.Find("StrengBackground/ManagementFrame/Background/TheningFloor/TheningTop/AttributesBigTips").transform; //// #endregion _toggleName.Add(1, "WeaponPlate");//武器 _toggleName.Add(2, "DeputyPlate");//副手 _toggleName.Add(3, "HelmetPlate");//帽子 _toggleName.Add(4, "ChestPlate");//衣袍 _toggleName.Add(5, "BeltPlate");//腰带 _toggleName.Add(6, "ShinPads");//下装 _toggleName.Add(7, "BootsPlate");//鞋履 _toggleName.Add(8, "NecklacePlate");//项链 _toggleName.Add(9, "FairyPlate1");//仙器1 _toggleName.Add(10, "FairyPlate2");//仙器2 _toponym.Add(1, Language.Get("Z1001")); _toponym.Add(2, Language.Get("Z1002")); _toponym.Add(3, Language.Get("Z1003")); _toponym.Add(4, Language.Get("Z1004")); _toponym.Add(5, Language.Get("Z1005")); _toponym.Add(6, Language.Get("Z1006")); _toponym.Add(7, Language.Get("Z1007")); _toponym.Add(8, Language.Get("Z1008")); _toponym.Add(9, Language.Get("Z1009")); _toponym.Add(10, Language.Get("Z1010")); } //// _toggleName.Add(1, "WeaponPlate");//武器 //// _toggleName.Add(2, "DeputyPlate");//副手 //// _toggleName.Add(3, "HelmetPlate");//帽子 //// _toggleName.Add(4, "ChestPlate");//衣袍 //// _toggleName.Add(5, "BeltPlate");//腰带 //// _toggleName.Add(6, "ShinPads");//下装 //// _toggleName.Add(7, "BootsPlate");//鞋履 //// _toggleName.Add(8, "NecklacePlate");//项链 //// _toggleName.Add(9, "FairyPlate1");//仙器1 //// _toggleName.Add(10, "FairyPlate2");//仙器2 //// _toponym.Add(1, Language.Get("Z1001")); //// _toponym.Add(2, Language.Get("Z1002")); //// _toponym.Add(3, Language.Get("Z1003")); //// _toponym.Add(4, Language.Get("Z1004")); //// _toponym.Add(5, Language.Get("Z1005")); //// _toponym.Add(6, Language.Get("Z1006")); //// _toponym.Add(7, Language.Get("Z1007")); //// _toponym.Add(8, Language.Get("Z1008")); //// _toponym.Add(9, Language.Get("Z1009")); //// _toponym.Add(10, Language.Get("Z1010")); //// } bool EffectsJudgment(int _tag)//特效判断 { for (int i = 0; i < _wear.Count; i++) { if (_wear[i] == _tag) return true; } return false; } //// bool EffectsJudgment(int _tag)//特效判断 //// { //// for (int i = 0; i < _wear.Count; i++) //// { //// if (_wear[i] == _tag) //// return true; //// } //// return false; //// } private void OnEnable() { IsGuide = NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 10; _effects = true; _open = true; _money = PlayerDatas.Instance.baseData.allCopper; StrengthenModel.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息 PlayerDatas.Instance.playerDataRefreshEvent += RefreshMoney;//金钱的刷新 Initialize(); WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeCloseEvent; } //// private void OnEnable() //// { //// IsGuide = NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 10; //// _effects = true; //// _open = true; //// _money = PlayerDatas.Instance.baseData.allCopper; //// StrengthenModel.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息 //// PlayerDatas.Instance.playerDataRefreshEvent += RefreshMoney;//金钱的刷新 //// Initialize(); //// WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeCloseEvent; //// } private void windowBeforeCloseEvent(Window obj) { if (obj as GetItemPathWin) { if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } } } //// private void windowBeforeCloseEvent(Window obj) //// { //// if (obj as GetItemPathWin) //// { //// if (IsGuide) //// { //// NewBieCenter.Instance.StartNewBieGuide(92); //// IsGuide = false; //// } //// } //// } void Start() { #region 按钮注册 _stopBtn.onClick.AddListener(StopBtn); UIEventTrigger.Get(_strengBtn.gameObject).OnDown = StrengBtn; UIEventTrigger.Get(_strengBtn.gameObject).OnUp = UpButton; _automaticBtn.onClick.AddListener(AutomaticBtn); _MoneyButton.onClick.AddListener(MoneyButton); #endregion } //// void Start() //// { //// #region 按钮注册 //// _stopBtn.onClick.AddListener(StopBtn); //// UIEventTrigger.Get(_strengBtn.gameObject).OnDown = StrengBtn; //// UIEventTrigger.Get(_strengBtn.gameObject).OnUp = UpButton; //// _automaticBtn.onClick.AddListener(AutomaticBtn); //// _MoneyButton.onClick.AddListener(MoneyButton); //// #endregion //// } public void Initialize() { ClearToArray(); m_Money_text.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); _locationSort = LocationSort();//装备位优先级数组 TheEquipment();//通过数组来份类是否穿戴 DynamicAssignment();//动态赋值名称 FindBind(); if (strengthengmodel.equipmentA == 0) { _content.GetChild(0).GetComponent<Toggle>().isOn = true;//每次都是点亮第一个 _Scrobar.verticalNormalizedPosition = 1; } else { string str = _toggleName[strengthengmodel.equipmentA]; _content.transform.Find(str).GetComponent<Toggle>().isOn = true; for (int i = 0; i < _content.childCount; i++) { if (_content.GetChild(i).name == str) { int type = i; if (type >= 4) { var _position = (10 - type) * 104 + (10 - type - 1) * 4; _position -= 444; _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_position / (1076.0f - 444)); _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_Scrobar.verticalNormalizedPosition + (50 / (1076.0f - 444))); } else { _Scrobar.verticalNormalizedPosition = 1; } //// public void Initialize() //// { //// ClearToArray(); //// m_Money_text.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); //// _locationSort = LocationSort();//装备位优先级数组 //// TheEquipment();//通过数组来份类是否穿戴 //// DynamicAssignment();//动态赋值名称 //// FindBind(); //// if (strengthengmodel.equipmentA == 0) //// { //// _content.GetChild(0).GetComponent<Toggle>().isOn = true;//每次都是点亮第一个 //// _Scrobar.verticalNormalizedPosition = 1; //// } //// else //// { //// string str = _toggleName[strengthengmodel.equipmentA]; //// _content.transform.Find(str).GetComponent<Toggle>().isOn = true; //// for (int i = 0; i < _content.childCount; i++) //// { //// if (_content.GetChild(i).name == str) //// { //// int type = i; //// if (type >= 4) //// { //// var _position = (10 - type) * 104 + (10 - type - 1) * 4; //// _position -= 444; //// _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_position / (1076.0f - 444)); //// _Scrobar.verticalNormalizedPosition = Mathf.Clamp01(_Scrobar.verticalNormalizedPosition + (50 / (1076.0f - 444))); //// } //// else //// { //// _Scrobar.verticalNormalizedPosition = 1; //// } } } } //// } //// } //// } _stopBtn.gameObject.SetActive(false); //// _stopBtn.gameObject.SetActive(false); } //// } void MoneyButton()//金币按钮弹框 { //// void MoneyButton()//金币按钮弹框 //// { GetItemPath.SetChinItemModel(2100); } //// GetItemPath.SetChinItemModel(2100); //// } #region Toggle按钮的点击事件 void WeaponPlateT(bool _bool) { EventResponse(_bool, 1); } //// #region Toggle按钮的点击事件 //// void WeaponPlateT(bool _bool) //// { //// EventResponse(_bool, 1); //// } void DeputyPlateT(bool _bool) { EventResponse(_bool, 2); } //// void DeputyPlateT(bool _bool) //// { //// EventResponse(_bool, 2); //// } void ChestPlateT(bool _bool) { EventResponse(_bool, 4); } //// void ChestPlateT(bool _bool) //// { //// EventResponse(_bool, 4); //// } void HelmetPlateT(bool _bool) { EventResponse(_bool, 3); } //// void HelmetPlateT(bool _bool) //// { //// EventResponse(_bool, 3); //// } void NecklacePlateT(bool _bool) { EventResponse(_bool, 8); } //// void NecklacePlateT(bool _bool) //// { //// EventResponse(_bool, 8); //// } void BeltPlateT(bool _bool) { EventResponse(_bool, 5); } //// void BeltPlateT(bool _bool) //// { //// EventResponse(_bool, 5); //// } void ShinPadsT(bool _bool) { EventResponse(_bool, 6); } //// void ShinPadsT(bool _bool) //// { //// EventResponse(_bool, 6); //// } void BootsPlateT(bool _bool) { EventResponse(_bool, 7); } //// void BootsPlateT(bool _bool) //// { //// EventResponse(_bool, 7); //// } void FairyPlate1T(bool _bool) { EventResponse(_bool, 9); } //// void FairyPlate1T(bool _bool) //// { //// EventResponse(_bool, 9); //// } void FairyPlate2T(bool _bool) { EventResponse(_bool, 10); } #endregion //// void FairyPlate2T(bool _bool) //// { //// EventResponse(_bool, 10); //// } //// #endregion void StopBtn()//停止强化 { StopCoroutine("AutomaticRein"); _boolIE = false; onMainModel.StrengthegingBool = _boolIE; if (IsFightUp != null) { IsFightUp(); } _automaticBtn.gameObject.SetActive(true);//自动强化按钮 _strengBtn.interactable = true;//强化按钮 _StrengImage.color = new Color32(51, 8, 0, 255); _stopBtn.gameObject.SetActive(false);//停止强化按钮 } //// void StopBtn()//停止强化 //// { //// StopCoroutine("AutomaticRein"); //// _boolIE = false; //// onMainModel.StrengthegingBool = _boolIE; //// if (IsFightUp != null) //// { //// IsFightUp(); //// } //// _automaticBtn.gameObject.SetActive(true);//自动强化按钮 //// _strengBtn.interactable = true;//强化按钮 //// _StrengImage.color = new Color32(51, 8, 0, 255); //// _stopBtn.gameObject.SetActive(false);//停止强化按钮 //// } void StrengBtn(GameObject obj)//强化 { if (!_strengBtn.interactable) { return; } int _theType = SwitchControl(_tag); if (_theType == 1) { ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_tag) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); } if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV) { if (Judgment(_tag)) { _boolIE = true; onMainModel.StrengthegingBool = _boolIE; StartCoroutine("AutomaticRein"); } else { StopBtn(); GetItemPath.SetChinItemModel(2100); } } else { ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 } } else if (_theType == 2) { ServerTipDetails.DisplayNormalTip(Language.Get("Z1013"));//请佩戴装备 } else if (_theType == 3) { ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 } } //// void StrengBtn(GameObject obj)//强化 //// { //// if (!_strengBtn.interactable) //// { //// return; //// } //// int _theType = SwitchControl(_tag); //// if (_theType == 1) //// { //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_tag) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), ItemConfig.Get((int)item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); //// } //// if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV) //// { //// if (Judgment(_tag)) //// { //// _boolIE = true; //// onMainModel.StrengthegingBool = _boolIE; //// StartCoroutine("AutomaticRein"); //// } //// else //// { //// StopBtn(); //// GetItemPath.SetChinItemModel(2100); //// } //// } //// else //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 //// } //// } //// else if (_theType == 2) //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1013"));//请佩戴装备 //// } //// else if (_theType == 3) //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 //// } //// } void UpButton(GameObject obj) { if (!_strengBtn.interactable) { return; } StopCoroutine("AutomaticRein"); _boolIE = false; onMainModel.StrengthegingBool = _boolIE; if (IsFightUp != null) { IsFightUp(); } } //// void UpButton(GameObject obj) //// { //// if (!_strengBtn.interactable) //// { //// return; //// } //// StopCoroutine("AutomaticRein"); //// _boolIE = false; //// onMainModel.StrengthegingBool = _boolIE; //// if (IsFightUp != null) //// { //// IsFightUp(); //// } //// } void AutomaticBtn()//自动强化 { int _theType = SwitchControl(_tag); if (_theType == 1) { ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_tag) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); } if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV) { if (Judgment(_tag)) { _automaticBtn.gameObject.SetActive(false);//自动强化按钮 _strengBtn.interactable = false;//强化按钮 _StrengImage.color = new Color32(51, 8, 0, 150); _stopBtn.gameObject.SetActive(true);//停止强化按钮 _boolIE = true; onMainModel.StrengthegingBool = _boolIE; StartCoroutine("AutomaticRein"); } else { StopBtn(); GetItemPath.SetChinItemModel(2100); } } else { ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 } } else if (_theType == 2) { ServerTipDetails.DisplayNormalTip(Language.Get("Z1013"));//请佩戴装备 if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } } else if (_theType == 3) { ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 } //// void AutomaticBtn()//自动强化 //// { //// int _theType = SwitchControl(_tag); //// if (_theType == 1) //// { //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_tag) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), //// // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); //// } //// if (_itemPM.levelMax > strengthengmodel._EqInfo[_tag].EquipPartStarLV) //// { //// if (Judgment(_tag)) //// { //// _automaticBtn.gameObject.SetActive(false);//自动强化按钮 //// _strengBtn.interactable = false;//强化按钮 //// _StrengImage.color = new Color32(51, 8, 0, 150); //// _stopBtn.gameObject.SetActive(true);//停止强化按钮 //// _boolIE = true; //// onMainModel.StrengthegingBool = _boolIE; //// StartCoroutine("AutomaticRein"); //// } //// else //// { //// StopBtn(); //// GetItemPath.SetChinItemModel(2100); //// } //// } //// else //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 //// } //// } //// else if (_theType == 2) //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1013"));//请佩戴装备 //// if (IsGuide) //// { //// NewBieCenter.Instance.StartNewBieGuide(92); //// IsGuide = false; //// } //// } //// else if (_theType == 3) //// { //// ServerTipDetails.DisplayNormalTip(Language.Get("Z1012"));//装备强化满级 //// } } //// } IEnumerator AutomaticRein()//自动强化开始的协程 { while (_boolIE) { if (Judgment(_tag)) { if (_open) { CA301_tagEquipPlus _tagEPlus = new CA301_tagEquipPlus(); _tagEPlus.ItemIndex = (ushort)_tag; _tagEPlus.PackType = 1; GameNetSystem.Instance.SendInfo(_tagEPlus);//向服务器发送装备位 } yield return new WaitForSeconds(_Contracttime); } else { StopBtn(); int _type = strengthengmodel.GameDefineIndex(_tag);//强化类型的返回 ItemPlusConfig _itemPlus = ItemPlusConfig.GetTypeAndGrade(_type, strengthengmodel._EqInfo[_tag].EquipPartStarLV); _moneyText.text = MoneyContrast(_money); GetItemPath.SetChinItemModel(2100); yield return null; } } } void StrengthenRefresh()//数据的强化 { int _number = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//当前部位的等级 ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); if (item == null) { return; } ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_tag) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); } if (_itemPM.levelMax >= _number) { if (Judgment(_tag)) { StrengtheningA(_tag); //// IEnumerator AutomaticRein()//自动强化开始的协程 //// { //// while (_boolIE) //// { //// if (Judgment(_tag)) //// { //// if (_open) //// { //// CA301_tagEquipPlus _tagEPlus = new CA301_tagEquipPlus(); //// _tagEPlus.ItemIndex = (ushort)_tag; //// _tagEPlus.PackType = 1; //// GameNetSystem.Instance.SendInfo(_tagEPlus);//向服务器发送装备位 //// } //// yield return new WaitForSeconds(_Contracttime); //// } //// else //// { //// //StopBtn(); //// //int _type = strengthengmodel.GameDefineIndex(_tag);//强化类型的返回 //// //ItemPlusConfig _itemPlus = ItemPlusConfig.GetTypeAndGrade(_type, strengthengmodel._EqInfo[_tag].EquipPartStarLV); //// //_moneyText.text = MoneyContrast(_money); //// //GetItemPath.SetChinItemModel(2100); //// yield return null; //// } //// } //// } //// void StrengthenRefresh()//数据的强化 //// { //// int _number = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//当前部位的等级 //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); //// if (item == null) //// { //// return; //// } //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_tag) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), //// // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_tag), 0, 0); //// } //// if (_itemPM.levelMax >= _number) //// { //// if (Judgment(_tag)) //// { //// StrengtheningA(_tag); } if (_number >= _itemPM.levelMax) { TheningFloor.color = new Color32(255, 255, 255, 0); _GridGreenImage.gameObject.SetActive(false); _AttributesBig.gameObject.SetActive(false); _GridGreenB.gameObject.SetActive(true); DisplayPromoteLv(_tag); _UIEffect1D.StopImediatly(); FullLevel(_tag); _wear.Clear(); _notWear.Clear(); _fullLevel.Clear(); TheEquipment(); if (IsGuide) { NewBieCenter.Instance.StartNewBieGuide(92); IsGuide = false; } _automaticBtn.gameObject.SetActive(true);//自动强化按钮 _strengBtn.interactable = true;//强化按钮 _StrengImage.color = new Color32(51, 8, 0, 255); _stopBtn.gameObject.SetActive(false);//停止强化按钮 StopCoroutine("AutomaticRein"); _boolIE = false; onMainModel.StrengthegingBool = _boolIE; if (IsFightUp != null) { IsFightUp(); } } } } List<int> StrengthList = new List<int>(); string[] LocationSort()//装备位优先级 { string _array = FuncConfigConfig.Get("StrengthenDisplay").Numerical1; string[] _Sarray = new string[] { };//接收排序 List<string> SortList = new List<string>(); if (StrengthList.Count <= 0) { for (int i = 0; i < ConfigParse.GetMultipleStr(_array).Length; i++) { StrengthList.Add(int.Parse(ConfigParse.GetMultipleStr(_array)[i])); } } for (int i = 0; i < ConfigParse.GetMultipleStr(_array).Length; i++) { SortList.Add(ConfigParse.GetMultipleStr(_array)[i]); } SortList.Sort(Compare); _Sarray = SortList.ToArray(); return _Sarray; } //// } //// if (_number >= _itemPM.levelMax) //// { //// TheningFloor.color = new Color32(255, 255, 255, 0); //// _GridGreenImage.gameObject.SetActive(false); //// _AttributesBig.gameObject.SetActive(false); //// _GridGreenB.gameObject.SetActive(true); //// DisplayPromoteLv(_tag); //// _UIEffect1D.StopImediatly(); //// FullLevel(_tag); //// _wear.Clear(); //// _notWear.Clear(); //// _fullLevel.Clear(); //// TheEquipment(); //// if (IsGuide) //// { //// NewBieCenter.Instance.StartNewBieGuide(92); //// IsGuide = false; //// } //// _automaticBtn.gameObject.SetActive(true);//自动强化按钮 //// _strengBtn.interactable = true;//强化按钮 //// _StrengImage.color = new Color32(51, 8, 0, 255); //// _stopBtn.gameObject.SetActive(false);//停止强化按钮 //// StopCoroutine("AutomaticRein"); //// _boolIE = false; //// onMainModel.StrengthegingBool = _boolIE; //// if (IsFightUp != null) //// { //// IsFightUp(); //// } //// } //// } //// } //// List<int> StrengthList = new List<int>(); //// string[] LocationSort()//装备位优先级 //// { //// string _array = FuncConfigConfig.Get("StrengthenDisplay").Numerical1; //// string[] _Sarray = new string[] { };//接收排序 //// List<string> SortList = new List<string>(); //// if (StrengthList.Count <= 0) //// { //// for (int i = 0; i < ConfigParse.GetMultipleStr(_array).Length; i++) //// { //// StrengthList.Add(int.Parse(ConfigParse.GetMultipleStr(_array)[i])); //// } //// } //// for (int i = 0; i < ConfigParse.GetMultipleStr(_array).Length; i++) //// { //// SortList.Add(ConfigParse.GetMultipleStr(_array)[i]); //// } //// SortList.Sort(Compare); //// _Sarray = SortList.ToArray(); //// return _Sarray; //// } private int Compare(string x, string y)//数组排列 { var _index_x = int.Parse(x); var _index_y = int.Parse(y); bool havex = IsFairyDevice(_index_x); bool havey = IsFairyDevice(_index_y); if (havex.CompareTo(havey) != 0) { return -havex.CompareTo(havey); } var _sort_x = StrengthList.IndexOf(_index_x); var _sort_y = StrengthList.IndexOf(_index_y); return _sort_x.CompareTo(_sort_y); } //// private int Compare(string x, string y)//数组排列 //// { //// var _index_x = int.Parse(x); //// var _index_y = int.Parse(y); //// bool havex = IsFairyDevice(_index_x); //// bool havey = IsFairyDevice(_index_y); //// if (havex.CompareTo(havey) != 0) //// { //// return -havex.CompareTo(havey); //// } //// var _sort_x = StrengthList.IndexOf(_index_x); //// var _sort_y = StrengthList.IndexOf(_index_y); //// return _sort_x.CompareTo(_sort_y); //// } private bool IsFairyDevice(int Index) { if (Index == 9 || Index == 10) { SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); if (singlePack != null && singlePack.GetAllItems().ContainsKey(Index)) { ItemModel item = singlePack.GetItemByIndex(Index); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0); if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比 { return true; } } } return false; } //// private bool IsFairyDevice(int Index) //// { //// if (Index == 9 || Index == 10) //// { //// SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); //// if (singlePack != null && singlePack.GetAllItems().ContainsKey(Index)) //// { //// ItemModel item = singlePack.GetItemByIndex(Index); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(Index), 0, 0); //// if (_itemPM.levelMax > strengthengmodel._EqInfo[Index].EquipPartStarLV)//最大可升阶等级和服务端对比 //// { //// return true; //// } //// } //// } //// return false; //// } void TheEquipment()//通过数组来份类是否穿戴 { for (int i = 0; i < _locationSort.Length; i++) { SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); if (singlePack == null) { _notWear.Add(int.Parse(_locationSort[i]));//未穿戴 continue; } //// void TheEquipment()//通过数组来份类是否穿戴 //// { //// for (int i = 0; i < _locationSort.Length; i++) //// { //// SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); //// if (singlePack == null) //// { //// _notWear.Add(int.Parse(_locationSort[i]));//未穿戴 //// continue; //// } if (singlePack.GetAllItems().ContainsKey(int.Parse(_locationSort[i]))) { ItemModel item = singlePack.GetItemByIndex(int.Parse(_locationSort[i])); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(int.Parse(_locationSort[i])) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), 0, 0); } if (_itemPM.levelMax > strengthengmodel._EqInfo[int.Parse(_locationSort[i])].EquipPartStarLV)//最大可升阶等级和服务端对比 { _wear.Add(int.Parse(_locationSort[i]));//未满阶 } else { _fullLevel.Add(int.Parse(_locationSort[i]));//满阶 } } else { _notWear.Add(int.Parse(_locationSort[i]));//未穿戴 } } } //// if (singlePack.GetAllItems().ContainsKey(int.Parse(_locationSort[i]))) //// { //// ItemModel item = singlePack.GetItemByIndex(int.Parse(_locationSort[i])); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(int.Parse(_locationSort[i])) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), //// // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(int.Parse(_locationSort[i])), 0, 0); //// } //// if (_itemPM.levelMax > strengthengmodel._EqInfo[int.Parse(_locationSort[i])].EquipPartStarLV)//最大可升阶等级和服务端对比 //// { //// _wear.Add(int.Parse(_locationSort[i]));//未满阶 //// } //// else //// { //// _fullLevel.Add(int.Parse(_locationSort[i]));//满阶 //// } //// } //// else //// { //// _notWear.Add(int.Parse(_locationSort[i]));//未穿戴 //// } //// } //// } void DynamicAssignment()//动态赋值名称 { //// void DynamicAssignment()//动态赋值名称 //// { for (int i = 1; i <= _locationSort.Length; i++) { //// for (int i = 1; i <= _locationSort.Length; i++) //// { if (i <= _wear.Count)//有装备 { _content.GetChild(i - 1).gameObject.name = _toggleName[(_wear[i - 1])]; int part = (_wear[i - 1]); _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _wear[i - 1]); _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(false); ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>(); _ItemCell.gameObject.SetActive(true); _ItemCell.Init(item); _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_wear[i - 1])); _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true); _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false); } else { if (i - _wear.Count <= _notWear.Count)//没装备 { //// if (i <= _wear.Count)//有装备 //// { //// _content.GetChild(i - 1).gameObject.name = _toggleName[(_wear[i - 1])]; //// int part = (_wear[i - 1]); //// _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _wear[i - 1]); //// _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(false); //// ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>(); //// _ItemCell.gameObject.SetActive(true); //// _ItemCell.Init(item); //// _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_wear[i - 1])); //// _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true); //// _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false); //// } //// else //// { //// if (i - _wear.Count <= _notWear.Count)//没装备 //// { _content.GetChild(i - 1).gameObject.name = _toggleName[(_notWear[i - _wear.Count - 1])]; int part = (_notWear[i - _wear.Count - 1]); _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(true); _content.GetChild(i - 1).transform.Find("ItemCell").gameObject.SetActive(false); _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(false); _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(true); _content.GetChild(i - 1).transform.Find("TextBGPanel/UpText").GetComponent<Text>().text = Language.Get("Z1015") + _toponym[(_notWear[i - _wear.Count - 1])]; } else//满阶 { _content.GetChild(i - 1).gameObject.name = _toggleName[(_fullLevel[i - _wear.Count - _notWear.Count - 1])]; int part = (_fullLevel[i - _wear.Count - _notWear.Count - 1]); _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(false); ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _fullLevel[i - _wear.Count - _notWear.Count - 1]); ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>(); _ItemCell.gameObject.SetActive(true); _ItemCell.Init(item); _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_fullLevel[i - _wear.Count - _notWear.Count - 1])); _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true); _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false); } } } } //// _content.GetChild(i - 1).gameObject.name = _toggleName[(_notWear[i - _wear.Count - 1])]; //// int part = (_notWear[i - _wear.Count - 1]); //// _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; //// _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(true); //// _content.GetChild(i - 1).transform.Find("ItemCell").gameObject.SetActive(false); //// _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(false); //// _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(true); //// _content.GetChild(i - 1).transform.Find("TextBGPanel/UpText").GetComponent<Text>().text = Language.Get("Z1015") + _toponym[(_notWear[i - _wear.Count - 1])]; //// } //// else//满阶 //// { //// _content.GetChild(i - 1).gameObject.name = _toggleName[(_fullLevel[i - _wear.Count - _notWear.Count - 1])]; //// int part = (_fullLevel[i - _wear.Count - _notWear.Count - 1]); //// _content.GetChild(i - 1).transform.Find("RedPoint").GetComponent<RedpointBehaviour>().redpointId = strengthengmodel.StrengthengRedPoint[part].id; //// _content.GetChild(i - 1).transform.Find("BGMImage").gameObject.SetActive(false); //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _fullLevel[i - _wear.Count - _notWear.Count - 1]); //// ItemCell _ItemCell = _content.GetChild(i - 1).transform.Find("ItemCell").GetComponent<ItemCell>(); //// _ItemCell.gameObject.SetActive(true); //// _ItemCell.Init(item); //// _content.GetChild(i - 1).transform.Find("ContentText").GetComponent<Text>().text = ItemColor((int)item.itemId, (_fullLevel[i - _wear.Count - _notWear.Count - 1])); //// _content.GetChild(i - 1).transform.Find("ContentText").gameObject.SetActive(true); //// _content.GetChild(i - 1).transform.Find("TextBGPanel").gameObject.SetActive(false); //// } //// } //// } //// } void FindBind()//Toggle 的动态赋值 { for (int i = 0; i < _content.childCount; i++) { _content.GetChild(i).transform.GetComponent<Toggle>().onValueChanged.RemoveAllListeners(); } _content.Find("WeaponPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { WeaponPlateT(_bool); } ); _content.Find("DeputyPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { DeputyPlateT(_bool); } ); _content.Find("HelmetPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { HelmetPlateT(_bool); } ); _content.Find("ChestPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { ChestPlateT(_bool); } ); _content.Find("BeltPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { BeltPlateT(_bool); } ); _content.Find("ShinPads").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { ShinPadsT(_bool); } ); _content.Find("BootsPlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { BootsPlateT(_bool); } ); _content.Find("NecklacePlate").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { NecklacePlateT(_bool); } ); _content.Find("FairyPlate1").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { FairyPlate1T(_bool); } ); _content.Find("FairyPlate2").GetComponent<Toggle>().onValueChanged.AddListener( delegate (bool _bool) { FairyPlate2T(_bool); } ); }//查找Toggle和赋值 //// void FindBind()//Toggle 的动态赋值 //// { //// for (int i = 0; i < _content.childCount; i++) //// { //// _content.GetChild(i).transform.GetComponent<Toggle>().onValueChanged.RemoveAllListeners(); //// } //// _content.Find("WeaponPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// WeaponPlateT(_bool); //// } //// ); //// _content.Find("DeputyPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// DeputyPlateT(_bool); //// } //// ); //// _content.Find("HelmetPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// HelmetPlateT(_bool); //// } //// ); //// _content.Find("ChestPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// ChestPlateT(_bool); //// } //// ); //// _content.Find("BeltPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// BeltPlateT(_bool); //// } //// ); //// _content.Find("ShinPads").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// ShinPadsT(_bool); //// } //// ); //// _content.Find("BootsPlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// BootsPlateT(_bool); //// } //// ); //// _content.Find("NecklacePlate").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// NecklacePlateT(_bool); //// } //// ); //// _content.Find("FairyPlate1").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// FairyPlate1T(_bool); //// } //// ); //// _content.Find("FairyPlate2").GetComponent<Toggle>().onValueChanged.AddListener( //// delegate (bool _bool) //// { //// FairyPlate2T(_bool); //// } //// ); //// }//查找Toggle和赋值 int SwitchControl(int _arrayNumber)//返回是否有穿戴装备 { _wear.Clear(); _notWear.Clear(); _fullLevel.Clear(); TheEquipment(); for (int i = 0; i < _wear.Count; i++)//有装备 { if (_wear[i] == _arrayNumber) return 1; } //// int SwitchControl(int _arrayNumber)//返回是否有穿戴装备 //// { //// _wear.Clear(); //// _notWear.Clear(); //// _fullLevel.Clear(); //// TheEquipment(); //// for (int i = 0; i < _wear.Count; i++)//有装备 //// { //// if (_wear[i] == _arrayNumber) //// return 1; //// } for (int j = 0; j < _notWear.Count; j++)//无装备 { if (_notWear[j] == _arrayNumber) return 2; } for (int k = 0; k < _fullLevel.Count; k++)//满阶 { if (_fullLevel[k] == _arrayNumber) return 3; } return 0; } //// for (int j = 0; j < _notWear.Count; j++)//无装备 //// { //// if (_notWear[j] == _arrayNumber) //// return 2; //// } //// for (int k = 0; k < _fullLevel.Count; k++)//满阶 //// { //// if (_fullLevel[k] == _arrayNumber) //// return 3; //// } //// return 0; //// } void FullLevel(int _number)//满级面板的赋值 { TheningFloor.color = new Color32(255, 255, 255, 0); int _theTpye = strengthengmodel.GameDefineIndex(_number); ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _number); FullIteemCell.Init(item); FullIteemCell.cellBtn.RemoveAllListeners(); FullIteemCell.cellBtn.AddListener(() => { itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid); }); ItemPlusMaxConfig _tagItem = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_number) != 3) { //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); } else { //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), 0, 0); } _LevelTextB.text = _tagItem.levelMax.ToString(); if (_tagItem.levelMax == strengthengmodel._EqInfo[_number].EquipPartStarLV) { //// void FullLevel(int _number)//满级面板的赋值 //// { //// TheningFloor.color = new Color32(255, 255, 255, 0); //// int _theTpye = strengthengmodel.GameDefineIndex(_number); //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _number); //// FullIteemCell.Init(item); //// FullIteemCell.cellBtn.RemoveAllListeners(); //// FullIteemCell.cellBtn.AddListener(() => //// { //// itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid); //// }); //// ItemPlusMaxConfig _tagItem = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_number) != 3) //// { //// //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), //// // ItemConfig.Get(item.itemId).LV, ItemConfig.Get(item.itemId).ItemColor); //// } //// else //// { //// //_tagItem = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_number), 0, 0); //// } //// _LevelTextB.text = _tagItem.levelMax.ToString(); //// if (_tagItem.levelMax == strengthengmodel._EqInfo[_number].EquipPartStarLV) //// { _FillAText.text = string.Format(Language.Get("Z1016"), strengthengmodel._EqInfo[_number].Proficiency); } else { ItemPlusConfig _tagItem_A = ItemPlusConfig.GetTypeAndGrade(_theTpye, strengthengmodel._EqInfo[_number].EquipPartStarLV); ItemPlusConfig _tagItem_B = ItemPlusConfig.GetTypeAndGrade(_theTpye, _tagItem.levelMax); int _beyond = _tagItem_A.upExpTotal - _tagItem_B.upExpTotal + strengthengmodel._EqInfo[_number].Proficiency; _FillAText.text = string.Format(Language.Get("Z1016"), _beyond); //// _FillAText.text = string.Format(Language.Get("Z1016"), strengthengmodel._EqInfo[_number].Proficiency); //// } //// else //// { //// //ItemPlusConfig _tagItem_A = ItemPlusConfig.GetTypeAndGrade(_theTpye, strengthengmodel._EqInfo[_number].EquipPartStarLV); //// //ItemPlusConfig _tagItem_B = ItemPlusConfig.GetTypeAndGrade(_theTpye, _tagItem.levelMax); //// //int _beyond = _tagItem_A.upExpTotal - _tagItem_B.upExpTotal + strengthengmodel._EqInfo[_number].Proficiency; //// _FillAText.text = string.Format(Language.Get("Z1016"), _beyond); } } //// } //// } void StrengtheningA(int _tag)//强化面板的赋值 { TheningFloor.color = new Color32(255, 255, 255, 255); ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); NowIteemCell.Init(item); ItemConfig tagItem = ItemConfig.Get(item.itemId.ToString()); //// void StrengtheningA(int _tag)//强化面板的赋值 //// { //// TheningFloor.color = new Color32(255, 255, 255, 255); //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _tag); //// NowIteemCell.Init(item); //// ItemConfig tagItem = ItemConfig.Get(item.itemId.ToString()); NowIteemCell.cellBtn.RemoveAllListeners(); NowIteemCell.cellBtn.AddListener(() => { itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid, false); itemTipsModel.curAttrData.SetStrengthData(strengthengmodel.StrengthenTheCeiling(item.itemPlace) + 1, strengthengmodel.GameDefineIndex(item.itemPlace )); itemTipsModel.ShowUICtrl(); }); //当前阶 UpIteemCell.Init(item); UpIteemCell.cellBtn.RemoveAllListeners(); UpIteemCell.cellBtn.AddListener(() => { itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid); }); int _levelNum = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//获取服务端的当前等级 int _strType = strengthengmodel.GameDefineIndex(_tag); ;//强化类型返回 ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum); if (_ToggleDown) { _SmoothSlider.delay = 0f; _SmoothSlider.stage = _levelNum; _SmoothSlider.ResetStage(); _SmoothSlider.value = (float)Math.Round((double)strengthengmodel._EqInfo[_tag].Proficiency / _tagItem.upExpNeed, 2, MidpointRounding.AwayFromZero); _ToggleDown = false; } else { if (_levelNum > _StrengthenLevel) { if (EffectsJudgment(_tag)) _UIEffect1B.Play(); _StrengthenLevel = _levelNum; } _SmoothSlider.delay = _Delaytime; _SmoothSlider.stage = _levelNum; _SmoothSlider.value = (float)Math.Round((double)strengthengmodel._EqInfo[_tag].Proficiency / _tagItem.upExpNeed, 2, MidpointRounding.AwayFromZero); } //// NowIteemCell.cellBtn.RemoveAllListeners(); //// NowIteemCell.cellBtn.AddListener(() => //// { //// itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid, false); //// itemTipsModel.curAttrData.SetStrengthData(strengthengmodel.StrengthenTheCeiling(item.itemPlace) + 1, strengthengmodel.GameDefineIndex(item.itemPlace //// )); //// itemTipsModel.ShowUICtrl(); //// }); //// //当前阶 //// UpIteemCell.Init(item); //// UpIteemCell.cellBtn.RemoveAllListeners(); //// UpIteemCell.cellBtn.AddListener(() => //// { //// itemTipsModel.SetItemTipsModel(PackType.Equip, item.guid); //// }); //// int _levelNum = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//获取服务端的当前等级 //// int _strType = strengthengmodel.GameDefineIndex(_tag); //// ;//强化类型返回 //// //ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum); //// if (_ToggleDown) //// { //// _SmoothSlider.delay = 0f; //// _SmoothSlider.stage = _levelNum; //// _SmoothSlider.ResetStage(); //// _SmoothSlider.value = (float)Math.Round((double)strengthengmodel._EqInfo[_tag].Proficiency / _tagItem.upExpNeed, 2, MidpointRounding.AwayFromZero); //// _ToggleDown = false; //// } //// else //// { //// if (_levelNum > _StrengthenLevel) //// { //// if (EffectsJudgment(_tag)) //// _UIEffect1B.Play(); //// _StrengthenLevel = _levelNum; //// } //// _SmoothSlider.delay = _Delaytime; //// _SmoothSlider.stage = _levelNum; //// _SmoothSlider.value = (float)Math.Round((double)strengthengmodel._EqInfo[_tag].Proficiency / _tagItem.upExpNeed, 2, MidpointRounding.AwayFromZero); //// } _gradText.text = _levelNum.ToString();//当前等级赋值 GradeTextNext.text = (_levelNum + 1).ToString();//下级等级赋值 _moneyText.text = MoneyContrast(_money); //// _gradText.text = _levelNum.ToString();//当前等级赋值 //// GradeTextNext.text = (_levelNum + 1).ToString();//下级等级赋值 //// _moneyText.text = MoneyContrast(_money); _sliderText.text = strengthengmodel._EqInfo[_tag].Proficiency.ToString() + "/" + _tagItem.upExpNeed.ToString(); //// _sliderText.text = strengthengmodel._EqInfo[_tag].Proficiency.ToString() + "/" + _tagItem.upExpNeed.ToString(); if (_tagItem.attType.Split('|').Length == 1) { Dictionary<int, int> _dicOne = AsStipulated((int)item.itemId); PlayerPropertyConfig _playPM = PlayerPropertyConfig.Get(_tagItem.attType); if (ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1) == null) return; ItemPlusConfig _tagItemA = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1); m_DefenseText.gameObject.SetActive(false); m_LifeValueText.gameObject.SetActive(false); m_AttText.gameObject.SetActive(true); m_AttText.text = string.Format(Language.Get("Z1060"), _playPM.Name, int.Parse(_tagItem.attValue) + _dicOne[67], int.Parse(_tagItem.attValue) + _dicOne[68]); m_AttNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_tagItemA.attValue) - int.Parse(_tagItem.attValue)); } else { m_AttText.gameObject.SetActive(false); m_DefenseText.gameObject.SetActive(true); m_LifeValueText.gameObject.SetActive(true); //// if (_tagItem.attType.Split('|').Length == 1) //// { //// Dictionary<int, int> _dicOne = AsStipulated((int)item.itemId); //// PlayerPropertyConfig _playPM = PlayerPropertyConfig.Get(_tagItem.attType); //// if (ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1) == null) //// return; //// ItemPlusConfig _tagItemA = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1); //// m_DefenseText.gameObject.SetActive(false); //// m_LifeValueText.gameObject.SetActive(false); //// m_AttText.gameObject.SetActive(true); //// m_AttText.text = string.Format(Language.Get("Z1060"), _playPM.Name, int.Parse(_tagItem.attValue) + _dicOne[67], int.Parse(_tagItem.attValue) + _dicOne[68]); //// m_AttNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_tagItemA.attValue) - int.Parse(_tagItem.attValue)); //// } //// else //// { //// m_AttText.gameObject.SetActive(false); //// m_DefenseText.gameObject.SetActive(true); //// m_LifeValueText.gameObject.SetActive(true); Dictionary<int, int> _dicTwo = AsStipulated((int)item.itemId); string[] _str = new string[] { }; string[] _strA = new string[] { }; _str = _tagItem.attType.Split('|'); _strA = _tagItem.attValue.Split('|'); PlayerPropertyConfig _playPMA = PlayerPropertyConfig.Get(_str[0]); if (ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1) == null) return; ItemPlusConfig _tagItemB = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1); string[] _strB = new string[] { }; string[] _strB1 = new string[] { }; _strB = _tagItemB.attType.Split('|'); _strB1 = _tagItemB.attValue.Split('|'); m_DefenseText.text = string.Format(Language.Get("Z1061"), _playPMA.Name, int.Parse(_strA[0]) + _dicTwo[6]); m_DefenseNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_strB1[0]) - int.Parse(_strA[0])); PlayerPropertyConfig _playPMB = PlayerPropertyConfig.Get(_str[1]); m_LifeValueText.text = string.Format(Language.Get("Z1061"), _playPMB.Name, int.Parse(_strA[1]) + _dicTwo[8]); m_LifeValueNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_strB1[1]) - int.Parse(_strA[1])); Array.Clear(_str, 0, _str.Length); Array.Clear(_strA, 0, _strA.Length); Array.Clear(_strB, 0, _strB.Length); Array.Clear(_strB1, 0, _strB1.Length); } } //// Dictionary<int, int> _dicTwo = AsStipulated((int)item.itemId); //// string[] _str = new string[] { }; //// string[] _strA = new string[] { }; //// _str = _tagItem.attType.Split('|'); //// _strA = _tagItem.attValue.Split('|'); //// PlayerPropertyConfig _playPMA = PlayerPropertyConfig.Get(_str[0]); //// if (ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1) == null) //// return; //// ItemPlusConfig _tagItemB = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNum + 1); //// string[] _strB = new string[] { }; //// string[] _strB1 = new string[] { }; //// _strB = _tagItemB.attType.Split('|'); //// _strB1 = _tagItemB.attValue.Split('|'); //// m_DefenseText.text = string.Format(Language.Get("Z1061"), _playPMA.Name, int.Parse(_strA[0]) + _dicTwo[6]); //// m_DefenseNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_strB1[0]) - int.Parse(_strA[0])); //// PlayerPropertyConfig _playPMB = PlayerPropertyConfig.Get(_str[1]); //// m_LifeValueText.text = string.Format(Language.Get("Z1061"), _playPMB.Name, int.Parse(_strA[1]) + _dicTwo[8]); //// m_LifeValueNum.text = string.Format(Language.Get("Strengthen_ValueNum"), int.Parse(_strB1[1]) - int.Parse(_strA[1])); //// Array.Clear(_str, 0, _str.Length); //// Array.Clear(_strA, 0, _strA.Length); //// Array.Clear(_strB, 0, _strB.Length); //// Array.Clear(_strB1, 0, _strB1.Length); //// } //// } Dictionary<int, int> AsStipulated(int _id)//获取物品表的属性值 { Dictionary<int, int> _dic = new Dictionary<int, int>(); ItemConfig tagCIM = ItemConfig.Get(_id); if (tagCIM.Effect1 != 0) { _dic.Add(tagCIM.Effect1, tagCIM.EffectValueA1); } if (tagCIM.Effect2 != 0) { _dic.Add(tagCIM.Effect2, tagCIM.EffectValueA2); } if (tagCIM.Effect3 != 0) { _dic.Add(tagCIM.Effect3, tagCIM.EffectValueA3); } if (tagCIM.Effect4 != 0) { _dic.Add(tagCIM.Effect4, tagCIM.EffectValueA4); } if (tagCIM.Effect5 != 0) { _dic.Add(tagCIM.Effect5, tagCIM.EffectValueA5); } if (_dic.Count == 0) return null; return _dic; } //// Dictionary<int, int> AsStipulated(int _id)//获取物品表的属性值 //// { //// Dictionary<int, int> _dic = new Dictionary<int, int>(); //// ItemConfig tagCIM = ItemConfig.Get(_id); //// if (tagCIM.Effect1 != 0) //// { //// _dic.Add(tagCIM.Effect1, tagCIM.EffectValueA1); //// } //// if (tagCIM.Effect2 != 0) //// { //// _dic.Add(tagCIM.Effect2, tagCIM.EffectValueA2); //// } //// if (tagCIM.Effect3 != 0) //// { //// _dic.Add(tagCIM.Effect3, tagCIM.EffectValueA3); //// } //// if (tagCIM.Effect4 != 0) //// { //// _dic.Add(tagCIM.Effect4, tagCIM.EffectValueA4); //// } //// if (tagCIM.Effect5 != 0) //// { //// _dic.Add(tagCIM.Effect5, tagCIM.EffectValueA5); //// } //// if (_dic.Count == 0) //// return null; //// return _dic; //// } public void ClearToArray()//关于数组的清空赋值 { _wear.Clear(); _notWear.Clear(); _fullLevel.Clear(); Array.Clear(_locationSort, 0, _locationSort.Length); for (int i = 0; i < _content.childCount; i++) { _content.GetChild(i).GetComponent<Toggle>().isOn = false; } } //// public void ClearToArray()//关于数组的清空赋值 //// { //// _wear.Clear(); //// _notWear.Clear(); //// _fullLevel.Clear(); //// Array.Clear(_locationSort, 0, _locationSort.Length); //// for (int i = 0; i < _content.childCount; i++) //// { //// _content.GetChild(i).GetComponent<Toggle>().isOn = false; //// } //// } void EventResponse(bool _bool, int _equipped)//按钮绑定的事件响应 { if (_bool) { _ToggleDown = true; StopBtn();//停止强化 _tag = _equipped; _StrengtheningType = strengthengmodel.GameDefineIndex(_tag);//获取强化类型 ColrToPitchUp(_equipped); _StrengthenLevel = strengthengmodel._EqInfo[_equipped].EquipPartStarLV;//得到部位强化等级 int _locationIndex = SwitchControl(_equipped); if (_locationIndex == 1) { StrengtheningA(_equipped); _GridGreenImage.gameObject.SetActive(true); m_ImageBGObj.SetActive(false); _AttributesBig.gameObject.SetActive(false); _GridGreenB.gameObject.SetActive(false); if (!_UIEffect1D.IsPlaying) { _UIEffect1D.Play(); } } else if (_locationIndex == 2) { _GridGreenImage.gameObject.SetActive(false); TheningFloor.color = new Color32(255, 255, 255, 0); m_ImageBGObj.SetActive(true); _AttributesBig.gameObject.SetActive(true); _GridGreenB.gameObject.SetActive(false); _UIEffect1D.StopImediatly(); _UIEffect1C.StopImediatly(); _UIEffect1A.StopImediatly(); _UIEffect1B.StopImediatly(); } else if (_locationIndex == 3) { FullLevel(_equipped); _GridGreenImage.gameObject.SetActive(false); m_ImageBGObj.SetActive(false); _AttributesBig.gameObject.SetActive(false); _GridGreenB.gameObject.SetActive(true); DisplayPromoteLv(_equipped); _UIEffect1D.StopImediatly(); _UIEffect1C.StopImediatly(); _UIEffect1A.StopImediatly(); _UIEffect1B.StopImediatly(); } } } //// void EventResponse(bool _bool, int _equipped)//按钮绑定的事件响应 //// { //// if (_bool) //// { //// _ToggleDown = true; //// StopBtn();//停止强化 //// _tag = _equipped; //// _StrengtheningType = strengthengmodel.GameDefineIndex(_tag);//获取强化类型 //// ColrToPitchUp(_equipped); //// _StrengthenLevel = strengthengmodel._EqInfo[_equipped].EquipPartStarLV;//得到部位强化等级 //// int _locationIndex = SwitchControl(_equipped); //// if (_locationIndex == 1) //// { //// StrengtheningA(_equipped); //// _GridGreenImage.gameObject.SetActive(true); //// m_ImageBGObj.SetActive(false); //// _AttributesBig.gameObject.SetActive(false); //// _GridGreenB.gameObject.SetActive(false); //// if (!_UIEffect1D.IsPlaying) //// { //// _UIEffect1D.Play(); //// } //// } //// else if (_locationIndex == 2) //// { //// _GridGreenImage.gameObject.SetActive(false); //// TheningFloor.color = new Color32(255, 255, 255, 0); //// m_ImageBGObj.SetActive(true); //// _AttributesBig.gameObject.SetActive(true); //// _GridGreenB.gameObject.SetActive(false); //// _UIEffect1D.StopImediatly(); //// _UIEffect1C.StopImediatly(); //// _UIEffect1A.StopImediatly(); //// _UIEffect1B.StopImediatly(); //// } //// else if (_locationIndex == 3) //// { //// FullLevel(_equipped); //// _GridGreenImage.gameObject.SetActive(false); //// m_ImageBGObj.SetActive(false); //// _AttributesBig.gameObject.SetActive(false); //// _GridGreenB.gameObject.SetActive(true); //// DisplayPromoteLv(_equipped); //// _UIEffect1D.StopImediatly(); //// _UIEffect1C.StopImediatly(); //// _UIEffect1A.StopImediatly(); //// _UIEffect1B.StopImediatly(); //// } //// } //// } void DisplayPromoteLv(int _index) { var itemModel = playerPack.GetItemByIndex(PackType.Equip, _index); if (itemModel != null) { var itemConfig = ItemConfig.Get(itemModel.itemId); var type = strengthengmodel.GameDefineIndex(_index); if (ItemPlusMaxConfig.GetItemPlusMaxLv(type) > itemConfig.LV) { var nextLv = itemConfig.LV + 1; m_PromoteLimit.text = Language.Get("ItemPlusPromoteLimit", nextLv); } else { m_PromoteLimit.text = string.Empty; } } } //// void DisplayPromoteLv(int _index) //// { //// var itemModel = playerPack.GetItemByIndex(PackType.Equip, _index); //// if (itemModel != null) //// { //// var itemConfig = ItemConfig.Get(itemModel.itemId); //// var type = strengthengmodel.GameDefineIndex(_index); //// if (ItemPlusMaxConfig.GetItemPlusMaxLv(type) > itemConfig.LV) //// { //// var nextLv = itemConfig.LV + 1; //// m_PromoteLimit.text = Language.Get("ItemPlusPromoteLimit", nextLv); //// } //// else //// { //// m_PromoteLimit.text = string.Empty; //// } //// } //// } void ColrToPitchUp(int _equipped)//颜色变化的切换 { Transform _tran = _content.transform.Find(_toggleName[_equipped] + "/ContentText").transform; _tran.GetComponent<Text>().color = new Color32(255, 250, 240, 255); for (int i = 1; i <= 10; i++) { if (_equipped == i) continue; Transform _tranA = _content.transform.Find(_toggleName[i] + "/ContentText").transform; _tranA.GetComponent<Text>().color = new Color32(236, 215, 174, 255); } } //// void ColrToPitchUp(int _equipped)//颜色变化的切换 //// { //// Transform _tran = _content.transform.Find(_toggleName[_equipped] + "/ContentText").transform; //// _tran.GetComponent<Text>().color = new Color32(255, 250, 240, 255); //// for (int i = 1; i <= 10; i++) //// { //// if (_equipped == i) //// continue; //// Transform _tranA = _content.transform.Find(_toggleName[i] + "/ContentText").transform; //// _tranA.GetComponent<Text>().color = new Color32(236, 215, 174, 255); //// } //// } void EquipPartStar(HA3B3_tagMCEquipPartStarLVInfo info)//服务器下发的数据初始化 { SoundPlayer.Instance.PlayUIAudio(14); TheDynamicChange(_tag, strengthengmodel._EqInfo[_tag].EquipPartStarLV);//刷新等级和阶数 StrengthenRefresh();//强化刷新 Refresh(); if (EffectsJudgment(_tag)) { _UIEffect1A.Play(); if (!_UIEffect1C.IsPlaying) { _UIEffect1C.Play(); } //// void EquipPartStar(HA3B3_tagMCEquipPartStarLVInfo info)//服务器下发的数据初始化 //// { //// SoundPlayer.Instance.PlayUIAudio(14); //// TheDynamicChange(_tag, strengthengmodel._EqInfo[_tag].EquipPartStarLV);//刷新等级和阶数 //// StrengthenRefresh();//强化刷新 //// Refresh(); //// if (EffectsJudgment(_tag)) //// { //// _UIEffect1A.Play(); //// if (!_UIEffect1C.IsPlaying) //// { //// _UIEffect1C.Play(); //// } } //// } } //// } void RefreshMoney(PlayerDataType _tCDBPlayerRefresh) { //// void RefreshMoney(PlayerDataType _tCDBPlayerRefresh) //// { switch (_tCDBPlayerRefresh) { case PlayerDataType.Silver: _money = PlayerDatas.Instance.baseData.allCopper; _moneyText.text = MoneyContrast(_money); m_Money_text.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); break; default: break; } } //// switch (_tCDBPlayerRefresh) //// { //// case PlayerDataType.Silver: //// _money = PlayerDatas.Instance.baseData.allCopper; //// _moneyText.text = MoneyContrast(_money); //// m_Money_text.text = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3)); //// break; //// default: //// break; //// } //// } string MoneyContrast(ulong _haveMoney)//金钱对比 { int _needMoney = 0; int _levelNumber = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//获取服务端的当前等级 ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_StrengtheningType, _levelNumber); _needMoney = _tagItem.costCount; string str = null; if (_haveMoney >= (ulong)_needMoney) { str = "<color=#fffaf0>" + (_needMoney / 10000).ToString() + Language.Get("Z1014") + "</color>"; return str; } else { str = "<color=#ff0000>" + (_needMoney / 10000).ToString() + Language.Get("Z1014") + "</color>"; return str; } } //// string MoneyContrast(ulong _haveMoney)//金钱对比 //// { //// int _needMoney = 0; //// int _levelNumber = strengthengmodel._EqInfo[_tag].EquipPartStarLV;//获取服务端的当前等级 //// ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_StrengtheningType, _levelNumber); //// _needMoney = _tagItem.costCount; //// string str = null; //// if (_haveMoney >= (ulong)_needMoney) //// { //// str = "<color=#fffaf0>" + (_needMoney / 10000).ToString() + Language.Get("Z1014") + "</color>"; //// return str; //// } //// else //// { //// str = "<color=#ff0000>" + (_needMoney / 10000).ToString() + Language.Get("Z1014") + "</color>"; //// return str; //// } //// } bool Judgment(int _number)//判断金钱是否足够能否强化 { int _strType = strengthengmodel.GameDefineIndex(_number);// 化类型返回 int _levelNumber = strengthengmodel._EqInfo[_number].EquipPartStarLV;//获取服务端的当前等级 ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNumber); if (_money >= (ulong)_tagItem.costCount) { return true; } else { return false; } } //// bool Judgment(int _number)//判断金钱是否足够能否强化 //// { //// int _strType = strengthengmodel.GameDefineIndex(_number);// 化类型返回 //// int _levelNumber = strengthengmodel._EqInfo[_number].EquipPartStarLV;//获取服务端的当前等级 //// ItemPlusConfig _tagItem = ItemPlusConfig.GetTypeAndGrade(_strType, _levelNumber); //// if (_money >= (ulong)_tagItem.costCount) //// { //// return true; //// } //// else //// { //// return false; //// } //// } private void Refresh() { foreach (var key in strengthengmodel._EqInfo.Keys) { TheDynamicChange(key, strengthengmodel._EqInfo[key].EquipPartStarLV); } } //// private void Refresh() //// { //// foreach (var key in strengthengmodel._EqInfo.Keys) //// { //// TheDynamicChange(key, strengthengmodel._EqInfo[key].EquipPartStarLV); //// } //// } void TheDynamicChange(int _equippedWithA, int _equipmentLevel)//动态修改(装备位和装备等级) { ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _equippedWithA); if (item == null) return; //// void TheDynamicChange(int _equippedWithA, int _equipmentLevel)//动态修改(装备位和装备等级) //// { //// ItemModel item = playerPack.GetItemByIndex(PackType.Equip, _equippedWithA); //// if (item == null) //// return; Text _nameText = _content.Find(_toggleName[_equippedWithA] + "/ContentText").GetComponent<Text>(); string str = null; ItemConfig _Item = ItemConfig.Get((int)item.itemId); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_equippedWithA) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), _Item.LV, _Item.ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), 0, 0); } switch (_Item.ItemColor) { case 0: case 1: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; case 2: //// Text _nameText = _content.Find(_toggleName[_equippedWithA] + "/ContentText").GetComponent<Text>(); //// string str = null; //// ItemConfig _Item = ItemConfig.Get((int)item.itemId); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_equippedWithA) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), _Item.LV, _Item.ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_equippedWithA), 0, 0); //// } //// switch (_Item.ItemColor) //// { //// case 0: //// case 1: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// case 2: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; case 3: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// case 3: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; case 4: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// case 4: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; case 5: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; case 6: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); break; default: break; } } //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// case 5: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// case 6: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, _equipmentLevel); //// _nameText.text = UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// break; //// default: //// break; //// } //// } int StrengthenTheCeiling(int _Max, int _equipmentLevel)//强化上限 { if (_Max >= _equipmentLevel) return _equipmentLevel; else return _Max; } //// int StrengthenTheCeiling(int _Max, int _equipmentLevel)//强化上限 //// { //// if (_Max >= _equipmentLevel) //// return _equipmentLevel; //// else //// return _Max; //// } string ItemColor(int ItemID, int _equipmentLevel)//颜色的赋值和装备强化等级 { string str = null; ItemConfig _Item = ItemConfig.Get(ItemID); ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); if (strengthengmodel.EquipMax(_Item.EquipPlace) != 3) { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor); } else { //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), 0, 0); } switch (_Item.ItemColor) { case 0: case 1: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); case 2: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); case 3: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); case 4: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); case 5: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); case 6: str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); return UIHelper.AppendStringColor(_Item.ItemColor, str, true); default: return str; } } //// string ItemColor(int ItemID, int _equipmentLevel)//颜色的赋值和装备强化等级 //// { //// string str = null; //// ItemConfig _Item = ItemConfig.Get(ItemID); //// ItemPlusMaxConfig _itemPM = new ItemPlusMaxConfig(); //// if (strengthengmodel.EquipMax(_Item.EquipPlace) != 3) //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), _Item.LV, _Item.ItemColor); //// } //// else //// { //// //_itemPM = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor(strengthengmodel.EquipMax(_Item.EquipPlace), 0, 0); //// } //// switch (_Item.ItemColor) //// { //// case 0: //// case 1: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// case 2: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// case 3: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// case 4: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// case 5: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// case 6: //// str = _Item.ItemName + " +" + StrengthenTheCeiling(_itemPM.levelMax, strengthengmodel._EqInfo[_equipmentLevel].EquipPartStarLV); //// return UIHelper.AppendStringColor(_Item.ItemColor, str, true); //// default: //// return str; //// } //// } void OnDisable()//界面关闭时调用 { _open = false; StopBtn();//停止强化关闭携程 StrengthenModel.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息 PlayerDatas.Instance.playerDataRefreshEvent -= RefreshMoney;//金钱的刷新 WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeCloseEvent; int playerLv = PlayerDatas.Instance.baseData.LV; if (playerLv >= 150) { foreach (int key in strengthengmodel.StrengthengRedPoint.Keys) { strengthengmodel.StrengthengRedPoint[key].state = RedPointState.None; } //// void OnDisable()//界面关闭时调用 //// { //// _open = false; //// StopBtn();//停止强化关闭携程 //// StrengthenModel.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息 //// PlayerDatas.Instance.playerDataRefreshEvent -= RefreshMoney;//金钱的刷新 //// WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeCloseEvent; //// int playerLv = PlayerDatas.Instance.baseData.LV; //// if (playerLv >= 150) //// { //// foreach (int key in strengthengmodel.StrengthengRedPoint.Keys) //// { //// strengthengmodel.StrengthengRedPoint[key].state = RedPointState.None; //// } if (strengthengmodel.LevelAstrictBool) { strengthengmodel.LevelAstrictBool = false; } strengthengmodel.equipmentA = 0; } } //// if (strengthengmodel.LevelAstrictBool) //// { //// strengthengmodel.LevelAstrictBool = false; //// } //// strengthengmodel.equipmentA = 0; //// } //// } } ////} System/Tip/PlayerDetailWin.cs
@@ -58,6 +58,10 @@ { get { if (PlayerDetails.ServerGroupId == 0) { return false; } return PlayerDetails.ServerGroupId != PlayerDatas.Instance.baseData.ServerGroupId; } } System/Tip/PlayerDetails.cs
@@ -32,7 +32,9 @@ PlayerName = data.name; OnlineType = 0; IsInTeam = 0; ServerGroupId = data.serverGroupId; ServerGroupId = data.serverGroupId; RectTransformUtility.ScreenPointToLocalPointInRectangle(WindowCenter.Instance.uiRoot.tipsCanvas, Input.mousePosition, WindowCenter.Instance.uiRoot.uicamera, out targetPos); if (!WindowCenter.Instance.IsOpen<PlayerDetailWin>()) { @@ -50,7 +52,9 @@ PlayerName = name; OnlineType = 0; IsInTeam = 0; ServerGroupId = serverGroupId; ServerGroupId = serverGroupId; RectTransformUtility.ScreenPointToLocalPointInRectangle(WindowCenter.Instance.uiRoot.tipsCanvas, Input.mousePosition, WindowCenter.Instance.uiRoot.uicamera, out targetPos); if (!WindowCenter.Instance.IsOpen<PlayerDetailWin>()) { System/Treasure/TreasureSoulModel.cs
@@ -302,7 +302,7 @@ public int progress { get; private set; } public int totalProgress { get; private set; } public int effectValue { get; private set; } public List<AwardItem> items { get; private set; } public List<Item> items { get; private set; } public Dictionary<int, int> propertyDict { get; private set; } public Redpoint redpoint { get; private set; } public Redpoint privilegeRedpoint { get; private set; } @@ -348,19 +348,11 @@ var itemArray = LitJson.JsonMapper.ToObject<int[][]>(config.itemAward); if (itemArray != null && itemArray.Length > 0) { items = new List<AwardItem>(); items = new List<Item>(); for (int i = 0; i < itemArray.Length; i++) { var _array = itemArray[i]; items.Add(new AwardItem() { isBind = _array[2], item = new Item() { id = _array[0], count = _array[1], }, }); items.Add(new Item(_array[0], _array[1], _array[2] == 1)); } } } System/Treasure/TreasureSoulPattern3.cs
@@ -46,11 +46,11 @@ if (special.items != null && i < special.items.Count) { var award = special.items[i]; ItemCellModel cellModel = new ItemCellModel(award.item.id, true, (ulong)award.item.count, award.isBind); ItemCellModel cellModel = new ItemCellModel(award.id, true, (ulong)award.count, award.bind?1:0); m_Items[i].Init(cellModel); m_Items[i].cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(award.item.id, true, (ulong)award.item.count, -1, award.isBind); ItemAttrData attrData = new ItemAttrData(award.id, true, (ulong)award.count, -1, award.bind?1:0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); }); } System/Vip/FairyJadeInvestmentItem.cs
@@ -99,16 +99,16 @@ } else { List<AwardItem> fairyJadeInvestmentItem = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(InvestmentGrade); List<Item> fairyJadeInvestmentItem = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(InvestmentGrade); int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.count; } if (fairyJadeInvestmentItem[0].item.count > AtPresentNumber) if (fairyJadeInvestmentItem[0].count > AtPresentNumber) { m_ReceiveAwardBtn.gameObject.SetActive(true); m_Uieffect.gameObject.SetActive(true); @@ -203,7 +203,7 @@ } List<AwardItem> fairyJadeInvestmentItem = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(grade); List<Item> fairyJadeInvestmentItem = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(grade); int indexID = Dit[Lv].ID; int IsReceive = 0; var dit = fairyJadeInvestmentModel.GetInfoSeriors(); @@ -216,17 +216,17 @@ if (i < fairyJadeInvestmentItem.Count) { m_Group.GetChild(i).gameObject.SetActive(true); AwardItem item = fairyJadeInvestmentItem[i]; Item item = fairyJadeInvestmentItem[i]; MotnlyItem motnlyItem = m_Group.GetChild(i).GetComponent<MotnlyItem>(); var Item = ItemConfig.Get(item.item.id); ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)1, item.isBind); var Item = ItemConfig.Get(item.id); ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)1, item.bind?1:0); motnlyItem.Item_Cell.Init(cellModel); if (IsReceive == 0) { if (Lv <= 0) { motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_3"), item.item.count); motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_3"), item.count); } else { @@ -235,27 +235,27 @@ int GetValue = Mathf.FloorToInt((GetFairyJadeNumber / ShowLinesNumber) * 100); motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_10"), Lv, GetValue); } motnlyItem.MoneyNumberText.text = item.item.count.ToString(); motnlyItem.MoneyNumberText.text = item.count.ToString(); } else { int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[i]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = Dit[Lv].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[i]; AtPresentNumber = itemAdd.count; } if (item.item.count > AtPresentNumber) if (item.count > AtPresentNumber) { motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_5"), (item.item.count - AtPresentNumber)); motnlyItem.MoneyNumberText.text = (item.item.count - AtPresentNumber).ToString(); motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_5"), (item.count - AtPresentNumber)); motnlyItem.MoneyNumberText.text = (item.count - AtPresentNumber).ToString(); } else { motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_6"), item.item.count); motnlyItem.MoneyNumberText.text = item.item.count.ToString(); motnlyItem.NameText.text = string.Format(Language.Get("FairyJadeInvestment_6"), item.count); motnlyItem.MoneyNumberText.text = item.count.ToString(); } } @@ -320,9 +320,9 @@ { if (key == Lv) { List<AwardItem> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(grade); AwardItem item = fairyJadeInvestmentItem[0]; GetFairyJade = item.item.count; List<Item> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(grade); Item item = fairyJadeInvestmentItem[0]; GetFairyJade = item.count; } } return GetFairyJade; @@ -361,9 +361,9 @@ { if (key <= lv) { List<AwardItem> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(grade); AwardItem item = fairyJadeInvestmentItem[0]; GetFairyJade += item.item.count; List<Item> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(grade); Item item = fairyJadeInvestmentItem[0]; GetFairyJade += item.count; } }
@@ -219,11 +219,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { FairyJadeItem.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); FairyJadeItem.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2]==1)); } } fairyJadeInvestment.FairyJadeInvestmentItem = FairyJadeItem; @@ -247,11 +243,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { FairyJadeItem.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); FairyJadeItem.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2]==1)); } } fairyJadeInvestment.FairyJadeInvestmentItem = FairyJadeItem; @@ -427,15 +419,15 @@ } else { List<AwardItem> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(InvestmentGrade); List<Item> fairyJadeInvestmentItem = Dit[key].FairyJadeInvestmentItem.GetAwardItem(InvestmentGrade); int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = Dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = Dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.count; } if (fairyJadeInvestmentItem[0].item.count > AtPresentNumber) if (fairyJadeInvestmentItem[0].count > AtPresentNumber) { redPointStre1.state = RedPointState.GetReward; JumpInedx = type; @@ -575,15 +567,15 @@ } else { List<AwardItem> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); List<Item> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.count; } if (fairyJadeInvestmentItem[0].item.count > AtPresentNumber) if (fairyJadeInvestmentItem[0].count > AtPresentNumber) { Isbool3 = true; } @@ -617,15 +609,15 @@ } else { List<AwardItem> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); List<Item> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.count; } if (fairyJadeInvestmentItem[0].item.count > AtPresentNumber) if (fairyJadeInvestmentItem[0].count > AtPresentNumber) { Isbool4 = true; } @@ -660,15 +652,15 @@ } else { List<AwardItem> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); List<Item> fairyJadeInvestmentItem = dit[key].FairyJadeInvestmentItem.GetAwardItem(typeGrade); int AtPresentNumber = 0; if (IsReceive != 0) { List<AwardItem> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); AwardItem itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.item.count; List<Item> fairyJadeInvestmentItemAdd = dit[key].FairyJadeInvestmentItem.GetAwardItem(IsReceive); Item itemAdd = fairyJadeInvestmentItemAdd[0]; AtPresentNumber = itemAdd.count; } if (fairyJadeInvestmentItem[0].item.count > AtPresentNumber) if (fairyJadeInvestmentItem[0].count > AtPresentNumber) { Isbool5 = true; } System/Vip/FirstRechargeWin.cs
@@ -150,7 +150,7 @@ private void UpdateItems() { List<AwardItem> _list = null; List<Item> _list = null; model.TryGetFirstReward(PlayerDatas.Instance.baseData.Job, out _list); if (_list != null) { @@ -163,7 +163,7 @@ } m_Items[i].gameObject.SetActive(true); var _item = _list[i]; var _itemModel = new ItemCellModel(_item.item.id, false, (ulong)_item.item.count, _item.isBind); var _itemModel = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0); m_Items[i].Init(_itemModel); } } @@ -171,14 +171,14 @@ private void OnItemClick(int _index) { List<AwardItem> _list = null; List<Item> _list = null; model.TryGetFirstReward(PlayerDatas.Instance.baseData.Job, out _list); if (_list != null) { if (_index < _list.Count) { var item = _list[_index]; ItemAttrData attrData = new ItemAttrData(item.item.id, true, (ulong)item.item.count, -1, item.isBind, true); ItemAttrData attrData = new ItemAttrData(item.id, true, (ulong)item.count, -1, item.bind?1:0, true); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); } } System/Vip/NeedForWhiteInvestment.cs
@@ -66,16 +66,16 @@ } m_Text_NeedMoeny.text = NeedForWhite.NeedMoney.ToString(); var Job = PlayerDatas.Instance.baseData.Job; List<AwardItem> NeedForWhiteItem = NeedForWhite.AwardItem.GetAwardItem(Job); List<Item> NeedForWhiteItem = NeedForWhite.AwardItem.GetAwardItem(Job); m_ItemCell_One.gameObject.SetActive(false); m_ItemCell_Two.gameObject.SetActive(false); m_ItemCell_Three.gameObject.SetActive(false); for (int i = 0; i < NeedForWhiteItem.Count; i++) { int Type = i; AwardItem item = NeedForWhiteItem[i]; var Item = ItemConfig.Get(item.item.id); ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind); Item item = NeedForWhiteItem[i]; var Item = ItemConfig.Get(item.id); ItemCellModel cellModel = new ItemCellModel(item.id, true, (ulong)item.count, item.bind?1:0); switch (Type) { case 0: @@ -84,7 +84,7 @@ m_ItemCell_One.cellBtn.RemoveAllListeners(); m_ItemCell_One.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); }); break; @@ -94,7 +94,7 @@ m_ItemCell_Two.cellBtn.RemoveAllListeners(); m_ItemCell_Two.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind ? 1 : 0); itemTipsModel.SetItemTipsModel(attrData); }); break; @@ -104,7 +104,7 @@ m_ItemCell_Three.cellBtn.RemoveAllListeners(); m_ItemCell_Three.cellBtn.AddListener(() => { ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind?1:0); itemTipsModel.SetItemTipsModel(attrData); }); break; System/Vip/NeedForWhiteModel.cs
@@ -81,11 +81,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { awardItem.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); awardItem.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2]==1)); } } NeedForWhite.AwardItem = awardItem; @@ -95,20 +91,20 @@ public class NeedForWhiteItem { private Dictionary<int, List<AwardItem>> m_AwardDict = new Dictionary<int, List<AwardItem>>(); private Dictionary<int, List<Item>> m_AwardDict = new Dictionary<int, List<Item>>(); public List<AwardItem> GetAwardItem(int _job) public List<Item> GetAwardItem(int _job) { List<AwardItem> _items = null; List<Item> _items = null; m_AwardDict.TryGetValue(_job, out _items); return _items; } public void Add(int _job, AwardItem _item) public void Add(int _job, Item _item) { List<AwardItem> _list = null; List<Item> _list = null; if (!m_AwardDict.TryGetValue(_job, out _list)) { _list = new List<AwardItem>(); _list = new List<Item>(); m_AwardDict.Add(_job, _list); } _list.Add(_item); System/Vip/RechargeBoxWin.cs
@@ -81,7 +81,7 @@ } m_Items[i].gameObject.SetActive(true); var _item = _list[i]; var _itemModel = new ItemCellModel(_item.item.id, false, (ulong)_item.item.count, _item.isBind); var _itemModel = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0); m_Items[i].SetItemRare(_itemModel, 4); } } @@ -97,7 +97,7 @@ if (index < _list.Count) { var item = _list[index]; ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind); ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind ? 1:0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData); } } System/Vip/VipModel.cs
@@ -242,11 +242,7 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[_key].ToJson()); for (int j = 0; j < _itemArray.Length; j++) { _item.Add(_job, new AwardItem() { item = new Item(_itemArray[j][0], _itemArray[j][1]), isBind = _itemArray[j][2], }); _item.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1], _itemArray[j][2]==1)); } } data.giftItems = _item; @@ -388,7 +384,7 @@ private void ParseCTGConfig() { var configs = OrderInfoConfig.GetValues(); m_RechargeGainItemDict = new Dictionary<int, List<AwardItem>>(); m_RechargeGainItemDict = new Dictionary<int, List<Item>>(); for (int i = 0; i < configs.Count; i++) { List<OrderInfoConfig> list; @@ -415,19 +411,11 @@ var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(ctg.GainItemList); if (_itemArray != null && _itemArray.Length > 0) { var _itemList = new List<AwardItem>(); var _itemList = new List<Item>(); m_RechargeGainItemDict.Add(configs[i].CTGID, _itemList); for (int k = 0; k < _itemArray.Length; k++) { AwardItem _item = new AwardItem() { item = new Item() { id = _itemArray[k][0], count = _itemArray[k][1], }, isBind = _itemArray[k][2], }; Item _item = new Item(_itemArray[k][0], _itemArray[k][1], _itemArray[k][2]==1); _itemList.Add(_item); } } @@ -448,12 +436,12 @@ return m_CTGConfigDict.Values.Last(); } public bool TryGetRechargeItem(int id, out List<AwardItem> list) public bool TryGetRechargeItem(int id, out List<Item> list) { return m_RechargeGainItemDict.TryGetValue(id, out list); } private Dictionary<int, List<AwardItem>> m_FirstChargeItemDict = new Dictionary<int, List<AwardItem>>(); private Dictionary<int, List<Item>> m_FirstChargeItemDict = new Dictionary<int, List<Item>>(); private Dictionary<int, int> m_FirstChargeWorthDict = new Dictionary<int, int>(); private void ParseFirstCharge() { @@ -463,31 +451,23 @@ foreach (var _key in _itemJson.Keys) { var _job = int.Parse(_key); List<AwardItem> _list = null; List<Item> _list = null; if (!m_FirstChargeItemDict.TryGetValue(_job, out _list)) { _list = new List<AwardItem>(); _list = new List<Item>(); m_FirstChargeItemDict.Add(_job, _list); } m_FirstChargeWorthDict.Add(_job, int.Parse(_worthJson[_key].ToJson())); var _itemArray = JsonMapper.ToObject<int[][]>(_itemJson[_key].ToJson()); for (int i = 0; i < _itemArray.Length; i++) { AwardItem _item = new AwardItem() { item = new Item() { id = _itemArray[i][0], count = _itemArray[i][1], }, isBind = _itemArray[i][2], }; Item _item = new Item(_itemArray[i][0], _itemArray[i][1], _itemArray[i][2] == 1); _list.Add(_item); } } } public bool TryGetFirstReward(int _job, out List<AwardItem> _list) public bool TryGetFirstReward(int _job, out List<Item> _list) { return m_FirstChargeItemDict.TryGetValue(_job, out _list); } @@ -708,7 +688,7 @@ #region 充值 public Dictionary<int, int> firstRechargeWeapon { get; private set; } public Dictionary<int, List<AwardItem>> m_RechargeGainItemDict { get; private set; } public Dictionary<int, List<Item>> m_RechargeGainItemDict { get; private set; } private Dictionary<int, RechargeCount> m_RechargeCountDict = new Dictionary<int, RechargeCount>(); Dictionary<string, List<OrderInfoConfig>> m_OrderInfoDict = new Dictionary<string, List<OrderInfoConfig>>(); public int presentSelectRechargeId { get; private set; } System/Vip/VipWin.cs
@@ -375,20 +375,20 @@ { if (index < m_Items.Length) { ItemCellModel cellModel = new ItemCellModel(award.item.id, false, (ulong)award.item.count, award.isBind); ItemCellModel cellModel = new ItemCellModel(award.id, false, (ulong)award.count, award.bind?1:0); m_Items[index].Init(cellModel); m_Items[index].cellBtn.RemoveAllListeners(); m_Items[index].cellBtn.AddListener(() => { TreasureEffectModel effectModel = ModelCenter.Instance.GetModel<TreasureEffectModel>(); ItemConfig itemConfig = ItemConfig.Get(award.item.id); ItemConfig itemConfig = ItemConfig.Get(award.id); if(itemConfig.Effect1 == 232) { effectModel.SetTreasureID(itemConfig.EffectValueA1, model.presentSelectVip); } else { ItemAttrData attrData = new ItemAttrData(award.item.id, false, (ulong)award.item.count, -1, award.isBind); ItemAttrData attrData = new ItemAttrData(award.id, false, (ulong)award.count, -1, award.bind?1:0); itemTipsModel.SetItemTipsModel(attrData); } }); System/Welfare/LevelGiftModel.cs
@@ -61,11 +61,7 @@ var _array = LitJson.JsonMapper.ToObject<int[][]>(_json[_key].ToJson()); for (int j = 0; j < _array.Length; j++) { _award.Add(_job, new AwardItem() { item = new Item(_array[j][0], _array[j][1]), isBind = 1, }); _award.Add(_job, new Item(_array[j][0], _array[j][1])); } } levelGiftItemDict.Add(_cfgs[i].RewardID, _award); @@ -73,15 +69,7 @@ var intarray = LitJson.JsonMapper.ToObject<int[][]>(_cfgs[i].VIPAward); VIPAward vipAward = new VIPAward() { item = new AwardItem() { item = new Item() { id = intarray[0][0], count = intarray[0][1], }, isBind = 0, }, item = new Item(intarray[0][0], intarray[0][1]), vipLv = _cfgs[i].VIPLimit, }; m_VipItemDict.Add(_cfgs[i].RewardID, vipAward); @@ -228,7 +216,7 @@ public struct VIPAward { public AwardItem item; public Item item; public int vipLv; } } System/Welfare/LevelGiftWin.cs
@@ -84,12 +84,12 @@ _cell.items[i].gameObject.SetActive(true); _cell.gotImages[i].gameObject.SetActive(_isGet); var _item = _items[i]; ItemCellModel _ItemData = new ItemCellModel(_item.item.id, false, (ulong)_item.item.count, _item.isBind); ItemCellModel _ItemData = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0); _cell.items[i].Init(_ItemData); _cell.items[i].cellBtn.RemoveAllListeners(); _cell.items[i].cellBtn.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_item.item.id, false, (ulong)_item.item.count, -1, _item.isBind); ItemAttrData _itemPropertyData = new ItemAttrData(_item.id, false, (ulong)_item.count, -1, _item.bind ? 1 : 0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); }); } @@ -100,12 +100,12 @@ } var _vipAward = model.m_VipItemDict[_cell.index]; ItemCellModel _vipDate = new ItemCellModel(_vipAward.item.item.id, false, (ulong)_vipAward.item.item.count, _vipAward.item.isBind); ItemCellModel _vipDate = new ItemCellModel(_vipAward.item.id, false, (ulong)_vipAward.item.count, _vipAward.item.bind ? 1 : 0); _cell.vipItem.Init(_vipDate); _cell.vipItem.cellBtn.RemoveAllListeners(); _cell.vipItem.cellBtn.AddListener(() => { ItemAttrData _itemPropertyData = new ItemAttrData(_vipAward.item.item.id, false, (ulong)_vipAward.item.item.count, -1, _vipAward.item.isBind); ItemAttrData _itemPropertyData = new ItemAttrData(_vipAward.item.id, false, (ulong)_vipAward.item.count, -1, _vipAward.item.bind ? 1 : 0); ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(_itemPropertyData); }); _cell.vipGotImage.gameObject.SetActive(_vipGot);
