From 1e8c7d6350e5d69823b0c01fc9d8c50980e86e54 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 25 二月 2019 12:25:21 +0800
Subject: [PATCH] 3335 物品相关类型重构
---
System/FairyAu/PlayerFairyAuTreasureData.cs | 304 +++++++++++++++++++++++++-------------------------
1 files changed, 151 insertions(+), 153 deletions(-)
diff --git a/System/FairyAu/PlayerFairyAuTreasureData.cs b/System/FairyAu/PlayerFairyAuTreasureData.cs
index d683fd5..65d8544 100644
--- a/System/FairyAu/PlayerFairyAuTreasureData.cs
+++ b/System/FairyAu/PlayerFairyAuTreasureData.cs
@@ -1,93 +1,91 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-using System;
-using Snxxz.UI;
-//浠欑洘瀹濆簱
-public class FamilyStoreItem//瀹舵棌浠撳簱鐗╁搧淇℃伅
-{
- public int Index;//浠撳簱鏍煎瓙绱㈠紩
- public int ItemID;//鐗╁搧ID
- public ItemJsonData ItemData;
- public Dictionary<int, List<int>> _UserData;
- [Serializable]
- public class ItemJsonData
- {
- public string UserData;
- public int IsSuit;
- public int EquipGS;
- }
-}
-
-public class FamilyActionInfoClass//鎺ユ敹瀹舵棌琛屼负淇℃伅
-{
- public int FamilyID;//瀹舵棌ID
- public int ActionType;//绫诲瀷
- public int Time;//鏃堕棿
- public string Name;//鐜╁鍚�
- public int OperationType;//鎿嶄綔绫诲瀷1-鎹愮尞锛�2-鍏戞崲锛�3-閿�姣�
- public int PlayerID;//鎿嶄綔鐨勭帺瀹禝D;
- public int ItemID;//鐗╁搧ID
- public ItemJsonData ItemData;
- public Dictionary<int, List<int>> _UserData;
- [Serializable]
- public class ItemJsonData
- {
- public int ItemID;
- public string UserData;
- public int IsSuit;
- public int EquipGS;
- }
-
-}
-
-
-public class PlayerFairyAuTreasureData : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
-{
-
- public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//瀹舵棌浠撳簱鐗╁搧淇℃伅
-
- public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>();
- public delegate void OnFairyAuIntegral();
- public static event OnFairyAuIntegral Event_FairyAuIntegral;//鐢ㄤ簬浠欑洘绉垎鐨勫埛鏂�
- public delegate void OnFamilyActionInfo();
- public static event OnFamilyActionInfo Event_FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
- public delegate void OnFamilyStoreItemInfo();
- public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//浠撳簱淇℃伅鐨勫埛鏂�
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+using System;
+using Snxxz.UI;
+//浠欑洘瀹濆簱
+public class FamilyStoreItem//瀹舵棌浠撳簱鐗╁搧淇℃伅
+{
+ public int Index;//浠撳簱鏍煎瓙绱㈠紩
+ public int ItemID;//鐗╁搧ID
+ public ItemJsonData ItemData;
+ public Dictionary<int, List<int>> _UserData;
+ [Serializable]
+ public class ItemJsonData
+ {
+ public string UserData;
+ public int IsSuit;
+ public int EquipGS;
+ }
+}
+
+public class FamilyActionInfoClass//鎺ユ敹瀹舵棌琛屼负淇℃伅
+{
+ public int FamilyID;//瀹舵棌ID
+ public int ActionType;//绫诲瀷
+ public int Time;//鏃堕棿
+ public string Name;//鐜╁鍚�
+ public int OperationType;//鎿嶄綔绫诲瀷1-鎹愮尞锛�2-鍏戞崲锛�3-閿�姣�
+ public int PlayerID;//鎿嶄綔鐨勭帺瀹禝D;
+ public int ItemID;//鐗╁搧ID
+ public ItemJsonData ItemData;
+ public Dictionary<int, List<int>> _UserData;
+ [Serializable]
+ public class ItemJsonData
+ {
+ public int ItemID;
+ public string UserData;
+ public int IsSuit;
+ public int EquipGS;
+ }
+
+}
+
+
+public class PlayerFairyAuTreasureData : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+{
+
+ public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//瀹舵棌浠撳簱鐗╁搧淇℃伅
+
+ public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>();
+ public delegate void OnFairyAuIntegral();
+ public static event OnFairyAuIntegral Event_FairyAuIntegral;//鐢ㄤ簬浠欑洘绉垎鐨勫埛鏂�
+ public delegate void OnFamilyActionInfo();
+ public static event OnFamilyActionInfo Event_FamilyActionInfo;//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
+ public delegate void OnFamilyStoreItemInfo();
+ public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//浠撳簱淇℃伅鐨勫埛鏂�
public static event Action<List<int>> Del_FamilyStoreItemInfo;//浠撳簱淇℃伅鐗╁搧鐨勫垹闄�
PlayerPackModel _playerPack;
PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
- PackModelInterface _modelInterface;
- PackModelInterface modelInterface { get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); } }
- public int _FairyAuIntegral = 0;//鑾峰彇浠欑洘绉垎
-
- public List<int> JumpItemID = new List<int>();//浠庤烦杞埌浠欑洘浠撳簱闇�瑕侀�変腑楂樹寒
- List<int> EquipmentList = new List<int>();//鍏充簬瑁呭浣嶇疆
+ public int _FairyAuIntegral = 0;//鑾峰彇浠欑洘绉垎
+
+ public List<int> JumpItemID = new List<int>();//浠庤烦杞埌浠欑洘浠撳簱闇�瑕侀�変腑楂樹寒
+ List<int> EquipmentList = new List<int>();//鍏充簬瑁呭浣嶇疆
public bool IsShowPoint = false;//鏄惁鏄剧ず绾㈢偣
private const int Redpoint_key1 = 1070103;
- public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//浠欑洘浠撳簱绾㈢偣
-
- public override void Init()
- {
- var funConfig = FuncConfigConfig.Get("StrengthenDisplay");
- int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1);
- EquipmentList.Clear();
+ public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//浠欑洘浠撳簱绾㈢偣
+
+ public override void Init()
+ {
+ var funConfig = FuncConfigConfig.Get("StrengthenDisplay");
+ int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1);
+ EquipmentList.Clear();
for (int i = 0; i < List.Length; i++)
{
EquipmentList.Add(List[i]);
- }
- }
-
- public override void UnInit()
+ }
+ }
+
+ public override void UnInit()
{
- }
-
- public void OnBeforePlayerDataInitialize()
+ }
+
+ public void OnBeforePlayerDataInitialize()
{
- _DicfamilyStoreItem.Clear();
- _FairyAuIntegral = 0;
+ _DicfamilyStoreItem.Clear();
+ _FairyAuIntegral = 0;
}
public void OnPlayerLoginOk()
{
@@ -99,99 +97,99 @@
- public void FairyAuIntegral(int value)//鑾峰彇浠欑洘绉垎
- {
- _FairyAuIntegral = value;
- if (Event_FairyAuIntegral != null)
- Event_FairyAuIntegral();
- }
-
- public void FamilyStoreItemInfo(HA406_tagGCFamilyStoreItemInfo info)//瀹舵棌浠撳簱淇℃伅
- {
- if (!_DicfamilyStoreItem.ContainsKey(0))
- {
- FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
- _FamilyStoreItemP.Index = 0;
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
- _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
+ public void FairyAuIntegral(int value)//鑾峰彇浠欑洘绉垎
+ {
+ _FairyAuIntegral = value;
+ if (Event_FairyAuIntegral != null)
+ Event_FairyAuIntegral();
+ }
+
+ public void FamilyStoreItemInfo(HA406_tagGCFamilyStoreItemInfo info)//瀹舵棌浠撳簱淇℃伅
+ {
+ if (!_DicfamilyStoreItem.ContainsKey(0))
+ {
+ FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
+ _FamilyStoreItemP.Index = 0;
+ FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
+ _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
+ _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
}
- for (int i = 0; i < info.Count; i++)
- {
- if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1))
- continue;
- FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem();
- _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData);
- _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1;
- _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID;
- _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData);
- _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem);
+ for (int i = 0; i < info.Count; i++)
+ {
+ if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1))
+ continue;
+ FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem();
+ _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData);
+ _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1;
+ _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID;
+ _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData);
+ _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem);
}
if (Event_FamilyStoreItemInfo != null)
{
Event_FamilyStoreItemInfo();
- }
- IsShowRedPoint();
+ }
+ IsShowRedPoint();
}
- List<int> List = new List<int>();
- public void WarehouseToRefresh(byte[] _list)//浠撳簱鍒锋柊
+ List<int> List = new List<int>();
+ public void WarehouseToRefresh(byte[] _list)//浠撳簱鍒锋柊
{
- List.Clear();
+ List.Clear();
for (int i = 0; i < _list.Length; i++)
{
List.Add(_list[i] + 1);
- }
+ }
if (Del_FamilyStoreItemInfo != null)
{
Del_FamilyStoreItemInfo(List);
- }
+ }
IsShowRedPoint();
- }
- public void FamilyStoreDel(int _index, int ClearType)//瀹舵棌浠撳簱鐗╁搧鍒犻櫎(娓呴櫎鐨勬牸瀛愮储寮�, 浠呭崟鏍煎瓙娓呴櫎鏃舵湁鏁�,浠�0寮�濮嬩唬琛ㄧ涓�鏍�,0-鍗曟牸瀛愭竻闄�; 1-鎵�鏈夌墿鍝佹竻闄�)
- {
- if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0)
- {
- _DicfamilyStoreItem.Remove(_index + 1);
- }
- if (ClearType == 1)
- {
- _DicfamilyStoreItem.Clear();
- if (!_DicfamilyStoreItem.ContainsKey(0))
- {
- FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
- _FamilyStoreItemP.Index = 0;
- FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
- _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
- _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
- }
+ }
+ public void FamilyStoreDel(int _index, int ClearType)//瀹舵棌浠撳簱鐗╁搧鍒犻櫎(娓呴櫎鐨勬牸瀛愮储寮�, 浠呭崟鏍煎瓙娓呴櫎鏃舵湁鏁�,浠�0寮�濮嬩唬琛ㄧ涓�鏍�,0-鍗曟牸瀛愭竻闄�; 1-鎵�鏈夌墿鍝佹竻闄�)
+ {
+ if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0)
+ {
+ _DicfamilyStoreItem.Remove(_index + 1);
}
- }
-
- public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//鎺ユ敹瀹舵棌琛屼负淇℃伅
- {
- _InformationList.Clear();
- for (int i = 0; i < info.Count; i++)
- {
- FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass();
- _FamilyActionInfoClass.FamilyID = (int)info.FamilyID;
- _FamilyActionInfoClass.ActionType = (int)info.ActionType;
- _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time;
- _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name;
- _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1;
- _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2;
- _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3;
- _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData);
- _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData);
+ if (ClearType == 1)
+ {
+ _DicfamilyStoreItem.Clear();
+ if (!_DicfamilyStoreItem.ContainsKey(0))
+ {
+ FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem();
+ _FamilyStoreItemP.Index = 0;
+ FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange");
+ _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1);
+ _DicfamilyStoreItem.Add(0, _FamilyStoreItemP);
+ }
+ }
+ }
+
+ public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//鎺ユ敹瀹舵棌琛屼负淇℃伅
+ {
+ _InformationList.Clear();
+ for (int i = 0; i < info.Count; i++)
+ {
+ FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass();
+ _FamilyActionInfoClass.FamilyID = (int)info.FamilyID;
+ _FamilyActionInfoClass.ActionType = (int)info.ActionType;
+ _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time;
+ _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name;
+ _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1;
+ _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2;
+ _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3;
+ _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData);
+ _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData);
_InformationList.Add(_FamilyActionInfoClass);
- }
- if (Event_FamilyActionInfo != null)
- Event_FamilyActionInfo();//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
-
+ }
+ if (Event_FamilyActionInfo != null)
+ Event_FamilyActionInfo();//瀹舵棌琛屼负淇℃伅鐨勫埛鏂�
+
}
private bool IsEquipmentComparison()
@@ -213,7 +211,7 @@
int ItemId = _DicfamilyStoreItem[key].ItemID;
var itemConfig = ItemConfig.Get(ItemId);
int RealmLevel = PlayerDatas.Instance.baseData.realmLevel;
- int equipScore = modelInterface.GetEquipScore(PackType.Equip, ItemId, _DicfamilyStoreItem[key]._UserData);
+ int equipScore = ItemLogicUtility.Instance.GetEquipScore(PackType.Equip, ItemId, _DicfamilyStoreItem[key]._UserData);
if (ItemModel.config.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit && equipScore >= ItemModel.equipScore)
{
IsBool = true;
@@ -271,4 +269,4 @@
{
IsShowRedPoint();
}
-}
+}
--
Gitblit v1.8.0