Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/GeneralConfig/GeneralDefine.cs

@@ -138,7 +138,7 @@
    public static Dictionary<int, int> fairyGrabBossMapLines { get; private set; }

    public static Dictionary<int, List<int>> DropItemEffectMapID { get; private set; }

    public static Dictionary<int, List<int>> itemPutInPackDict { get; private set; }
    public static List<int> RebornAutoFightMapID { get; private set; }

    public static string teamWorldCall;
@@ -172,6 +172,7 @@
    public static Dictionary<int, int> SgzcRealm { get; private set; }

    public static int crossServerOneVsOneOpenDay { get; private set; }
    public static int UISpringDecorate { get; private set; }

    public static void Init()
    {
@@ -278,6 +279,25 @@
                _pos[0] = (double)_data[_key][0];
                _pos[1] = (double)_data[_key][1];
                NpcPosOffset.Add(_npcID, new Vector3((float)_pos[0], 0, (float)_pos[1]));
            }

            var putInItemPack = Config.Instance.Get<FuncConfigConfig>("PutInItemPack");
            LitJson.JsonData itemPutInData = LitJson.JsonMapper.ToObject(putInItemPack.Numerical1);
            itemPutInPackDict = new Dictionary<int, List<int>>();
            foreach(var _key in itemPutInData.Keys)

            {

                var itemTypeData = itemPutInData[_key];

                int packType = int.Parse(_key);

                List<int> itemTypes = new List<int>();

                itemPutInPackDict.Add(packType,itemTypes);

                if(itemTypeData.IsArray)

                {

                    for (i = 0; i < itemTypeData.Count; i++)

                    {

                        int itemType = int.Parse(itemTypeData[i].ToString());

                        itemTypes.Add(itemType);

                    }

                }

            }

            FuncConfigConfig nxxdImg = Config.Instance.Get<FuncConfigConfig>("NXXDPicture");
@@ -657,6 +677,7 @@
            }

            crossServerOneVsOneOpenDay = GetInt("CrossRealmCfg");
            UISpringDecorate = GetInt("UISpringDecorate");
        }
        catch (Exception ex)
        {
@@ -689,6 +710,19 @@
        }
    }

    public static PackType GetPackTypeByItemType(int itemType)

    {

        foreach(var key in itemPutInPackDict.Keys)

        {

            var types = itemPutInPackDict[key];

            if(types.Contains(itemType))

            {

                return (PackType)key;

            }

        }

        return PackType.rptItem;

    }

    private static int GetInt(string _key, int _index = 1)
    {
        var result = 0;