Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-08 d4529565bd49054b9a8b7be2eaea2785438f4c41

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/BlastFurnace/GetEquipPathTips.cs

@@ -492,6 +492,16 @@
                gemAttr.SetActive(false);

                return;

            }

            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    gemAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum += 1;

            gemAttr.SetActive(true);

            gemTitleText.text = Language.Get("EquipWin_GemPropObj_Text_1");


 System/FriendSystem/MailPanel.cs

@@ -94,6 +94,8 @@
        get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); }

    }



    DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }



    private void Awake()

    {

        Init();

@@ -327,6 +329,7 @@
                ItemCell itemCell = _reciveItemParent[giftCount].transform.Find("ItemCell").GetComponent<ItemCell>();

                if (info.Count > 0 || info.Gold > 0 || info.GoldPaper > 0 || info.Silver > 0)

                {

                    _deleteBtn.interactable = false;

                    _reciveItemParent[giftCount].SetActive(true);

                    _goldBox.SetActive(true);

                    _drillBox.SetActive(true);

@@ -625,19 +628,30 @@
        int i = 0;

        int getBagItemCount = 0;

        int getRuneCount = 0;

        int getDogzCount = 0;

        ItemConfig tagChinItem = null;

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

        {

            tagChinItem = Config.Instance.Get<ItemConfig>((int)mailInfo.Items[i].ItemID);

            if (tagChinItem != null)

            {

                if (tagChinItem.Type == RuneModel.RUNE_TYPE || tagChinItem.Type == RuneModel.RUNE_CREAMTYPE)

                switch(tagChinItem.Type)

                {

                    getRuneCount += 1;

                }

                else

                {

                    getBagItemCount += 1;

                    case RuneModel.RUNE_TYPE:

                    case  RuneModel.RUNE_CREAMTYPE:

                         getRuneCount += 1;

                        break;

                    case (int)ItemType.DogzStrengthMat:

                    case (int)ItemType.DogzEquipType1:

                    case (int)ItemType.DogzEquipType2:

                    case (int)ItemType.DogzEquipType3:

                    case (int)ItemType.DogzEquipType4:

                    case (int)ItemType.DogzEquipType5:

                        getDogzCount += 1;

                        break;

                    default:

                        getBagItemCount += 1;

                        break;

                }

            }

        }

@@ -653,6 +667,11 @@
            SysNotifyMgr.Instance.ShowTip("RuneBagFull");

            return;

        }

        else if(getDogzCount > playerPack.GetReaminGridCount(PackType.rptDogzItem))

        {

            SysNotifyMgr.Instance.ShowTip("DogzBagFull");

            return;

        }



        CA53B_tagCMRequestCompensation askRecive = new CA53B_tagCMRequestCompensation();

        askRecive.GUID = id;


 System/KnapSack/Logic/BoxGetItemWin.cs

@@ -45,7 +45,7 @@
        FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }



        [SerializeField] float scaleTime = 0.3f;



        Vector3 startPos = Vector3.zero;

        protected override void BindController()

        {



@@ -58,6 +58,7 @@


        protected override void OnPreOpen()

        {

            startPos = getItemParent.anchoredPosition3D;

            WindowCenter.Instance.CloseImmediately<NewItemGetWin>();

            //playerPack.ItemCntReduceAct += RefreshUI;

            getItem.SetActive(false);

@@ -171,6 +172,7 @@
        

        private void CreateGetItem()

        {

            getItemParent.anchoredPosition3D = startPos;

            DestroyGetItemlist();

            GetItemlist.Clear();

            getItemBasiclist.Clear();


 System/KnapSack/Logic/EquipTip.cs

@@ -576,6 +576,18 @@
                washAttr.SetActive(false);

                return;

            }



            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    washAttr.SetActive(false);

                    return;

            }



            curAttrTypeNum = 4;

            washAttr.SetActive(true);

            washTitleText.text = Language.Get("EquipWin_WashPropObj_Text_1");

@@ -584,12 +596,21 @@


        private void SetGemAttrUI()

        {   

            if (itemAttrData.itemConfig.LV < itemTipsModel.gemOpenLvs[0]

                || itemAttrData.packType == PackType.rptDogzEquip

                || itemAttrData.packType == PackType.rptDogzItem)

            if (itemAttrData.itemConfig.LV < itemTipsModel.gemOpenLvs[0])

            {

                gemAttr.SetActive(false);

                return;

            }



            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    gemAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum = 5;

            gemAttr.SetActive(true);

@@ -663,6 +684,17 @@
                suitAttr.SetActive(false);

                return; 

            }



            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    suitAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum = 6;

            suitAttr.SetActive(true);

            CreateSuitProCell();


 System/Mount/PlayerMountDatas.cs

@@ -50,8 +50,8 @@
    private List<HorseConfig> SortMount = new List<HorseConfig>();//用于红点排序

    public int MountStoneItemId = 0;

    public bool IsOk = false;

    public bool IsRedPointSingleFeed = true;

    public List<int> ListEffectSkill = new List<int>();

    private int HorseDanExp = 0;//坐骑丹经验

    PlayerPackModel _playerPack;

    PlayerPackModel playerPack

    {

@@ -78,6 +78,8 @@
        }

        string MountRedDotstr = Config.Instance.Get<FuncConfigConfig>("MountPetRedDot").Numerical1;

        DicDefaultMount = ConfigParse.GetDic<int, int>(MountRedDotstr);

        string HorseUpItem = Config.Instance.Get<FuncConfigConfig>("HorseUpItem").Numerical2;

        HorseDanExp = int.Parse(HorseUpItem);

    }



    public override void UnInit()

@@ -96,7 +98,6 @@
        _DicHorse.Clear();

        HorseRidingBool = false;

        Wait = true;

        IsRedPointSingleFeed = true;

    }



    public void OnPlayerLoginOk()

@@ -250,7 +251,6 @@


    private void RedPointMountDan()

    {

        IsRedPointSingleFeed = false;

        MountDanRed();

    }



@@ -281,22 +281,20 @@


        int GetMountID = 0;

        int GetMountLv = 0;



        int NeedExp = 99999999;

        int NeedNumber = 0;//所需要的经验丹

        for (int i = 0; i < SortMount.Count; i++)

        {

            int horseID = SortMount[i].HorseID;

            if (_DicHorse.ContainsKey(horseID))

            if (_DicHorse.ContainsKey(horseID) && _DicHorse[horseID].Lv < Config.Instance.Get<HorseConfig>(horseID).MaxLV)

            {

                var key = horseID;

                if (GetMountID == 0 && _DicHorse[key].Lv < GetMountSkillMaxLV(key))

                int _NeedExp = HorseUpConfig.GetHorseIDAndLV(horseID, (_DicHorse[horseID].Lv)).NeedExp;

                if (_NeedExp - _DicHorse[horseID].Exp < NeedExp)

                {

                    GetMountID = key;

                    GetMountLv = _DicHorse[key].Lv;

                }

                if (_DicHorse[key].Lv < GetMountLv && _DicHorse[key].Lv < GetMountSkillMaxLV(key))

                {

                    GetMountID = key;

                    GetMountLv = _DicHorse[key].Lv;

                    NeedExp = _NeedExp - _DicHorse[horseID].Exp;

                    GetMountID = horseID;

                    GetMountLv = _DicHorse[horseID].Lv;

                    NeedNumber = Mathf.CeilToInt((float)NeedExp / HorseDanExp);

                }

            }

        }

@@ -312,23 +310,11 @@
                ASingleFeedRedPoint[key].state = RedPointState.Simple;

                return;

            }



        }

        if (ASingleFeedRedPoint.ContainsKey(GetMountID) && number > 0 && GetMountLv < horsecon.MaxLV)

        if (ASingleFeedRedPoint.ContainsKey(GetMountID) && number >= NeedNumber && GetMountLv < horsecon.MaxLV)

        {

            if (PlayerDatas.Instance.baseData.LV >= 1500)

            {

                if (IsRedPointSingleFeed)

                {

                    ASingleFeedRedPoint[GetMountID].state = RedPointState.Simple;

                    return;

                }

            }

            else

            {

                ASingleFeedRedPoint[GetMountID].state = RedPointState.Simple;

                return;

            }

            ASingleFeedRedPoint[GetMountID].state = RedPointState.Simple;

            return;

        }

    }




 System/Pet/PlayerPetDatas.cs

@@ -47,8 +47,7 @@
    public int PetStoneItemId = 0;//用来记录坐骑魂石的ID



    public bool IsOk = false;

    public bool RedPointMaxLv = true;//用来标记灵宠最大限制等级



    private int PetDanExp = 0;//灵宠丹经验

    public List<int> ListEffectSkill = new List<int>();

    PlayerPackModel _playerPack;

    PlayerPackModel playerPack

@@ -98,6 +97,7 @@
        }

        string PetRedDotstr = Config.Instance.Get<FuncConfigConfig>("MountPetRedDot").Numerical2;

        DicDefaultPet = ConfigParse.GetDic<int, int>(PetRedDotstr);

        PetDanExp = int.Parse(Config.Instance.Get<FuncConfigConfig>("PetUpItem").Numerical2);

    }



    public override void UnInit()

@@ -112,7 +112,6 @@
    public void OnBeforePlayerDataInitialize()

    {

        Wait = true;

        RedPointMaxLv = true;

        IsOk = false;

        _TagPetItem.Clear();

        _DicPetBack.Clear();

@@ -234,11 +233,6 @@
            return;

        }

    }

    //Lcj 是否可吞噬装备

    public bool CanDevour

    {

        get { return false; }

    }

    private void PetNumberPreservation()//用来对灵宠个数进行保存

    {

        if (PetRedpoint.Count != 0)

@@ -266,7 +260,6 @@
                CultivateRedPoint.Add(petID, redPointMountStare2);

            }

        }



    }



    private void PetActivateRedPoint()//灵宠激活红点

@@ -291,19 +284,8 @@
            }

        }

    }

    //灵宠进阶和灵宠分解红点

    public bool CanDecom

    {

        get { return false; }

    }



    public bool CanEssence

    {

        get; private set;

    }

    private void IsRedPointCultivate()

    {

        RedPointMaxLv = false;

        GetCultivateRedPoint();

    }

    private void ToAddSorting()

@@ -336,22 +318,20 @@
        }

        int GetPetId = 0;

        int petLv = 0;



        int NeedExp = 99999999;

        int NeedNumber = 0;//所需要的经验丹

        for (int i = 0; i < Sortpet.Count; i++)

        {

            int petID = Sortpet[i].ID;

            if (_DicPetBack.ContainsKey(petID))

            if (_DicPetBack.ContainsKey(petID) && _DicPetBack[petID].PetClass < Config.Instance.Get<PetInfoConfig>(petID).MaxRank)

            {

                var key = petID;

                if (petLv == 0 && _DicPetBack[key].PetClass < GetPetSkillMaxLv(key))

                int _NeedExp = PetClassCostConfig.GetPetIdAndRank(petID, _DicPetBack[petID].PetClass).UpNeedExp;

                if (_NeedExp - _DicPetBack[petID].petExp < NeedExp)

                {

                    petLv = _DicPetBack[key].PetClass;

                    GetPetId = key;

                }

                if (_DicPetBack[key].PetClass < petLv && _DicPetBack[key].PetClass < GetPetSkillMaxLv(key))

                {

                    petLv = _DicPetBack[key].PetClass;

                    GetPetId = key;

                    NeedExp = _NeedExp - _DicPetBack[petID].petExp;

                    petLv = _DicPetBack[petID].PetClass;

                    GetPetId = petID;

                    NeedNumber = Mathf.CeilToInt((float)NeedExp / PetDanExp);

                }

            }

        }

@@ -362,26 +342,14 @@
                && itemCount > 0 && CultivateRedPoint.ContainsKey(key))

            {

                CultivateRedPoint[key].state = RedPointState.Simple;

                CanEssence = true;

                return;

            }

        }

        PetInfoConfig petinfo = Config.Instance.Get<PetInfoConfig>(GetPetId);

        if (PlayerDatas.Instance.baseData.LV >= 1500)

        if (CultivateRedPoint.ContainsKey(GetPetId) && itemCount >= NeedNumber && petinfo.MaxRank > petLv)

        {

            if (CultivateRedPoint.ContainsKey(GetPetId) && itemCount > 0 && RedPointMaxLv && petinfo.MaxRank > petLv)

            {

                CultivateRedPoint[GetPetId].state = RedPointState.Simple;

                CanEssence = true;

            }

        }

        else

        {

            if (CultivateRedPoint.ContainsKey(GetPetId) && itemCount > 0 && petinfo.MaxRank > petLv)

            {

                CultivateRedPoint[GetPetId].state = RedPointState.Simple;

                CanEssence = true;

            }

            CultivateRedPoint[GetPetId].state = RedPointState.Simple;

            return;

        }

    }




 System/Store/Logic/BuyEquipTip.cs

@@ -540,6 +540,16 @@
                washAttr.SetActive(false);

                return;

            }

            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    washAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum = 4;

            washAttr.SetActive(true);

            washTitleText.text = Language.Get("EquipWin_WashPropObj_Text_1");

@@ -552,6 +562,16 @@
            {

                gemAttr.SetActive(false);

                return;

            }

            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    gemAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum = 5;

            gemAttr.SetActive(true);

@@ -626,6 +646,16 @@
                suitAttr.SetActive(false);

                return;

            }

            switch (itemAttrData.itemConfig.EquipPlace)

            {

                case 101:

                case 102:

                case 103:

                case 104:

                case 105:

                    suitAttr.SetActive(false);

                    return;

            }

            curAttrTypeNum = 6;

        }




 System/Store/StoreModel.cs

@@ -1059,6 +1059,7 @@
        }



    }



    public void ClearPetAndMountRedpoint(StoreConfig storeConfig)

    {

        ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(storeConfig.ItemID);

@@ -1074,7 +1075,23 @@
                }

                break;

        }

      
    }



    public void ClearAllPetAndMountRedpoint(StoreFunc storeFunc)

    {

        if (storeFuncType == StoreFunc.BindStore && storeFunc != StoreFunc.BindStore)

        {

            foreach(var key in shopRedDict.Keys)

            {

                if(shopRedDict[key].state != RedPointState.None)

                {

                    string record = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "ShopId",key);

                    shopRedDict[key].state = RedPointState.None;

                    LocalSave.SetBool(record, false);

                }

            }

        }



    }

    #endregion




 System/Store/StoreWin.cs

@@ -146,6 +146,8 @@


        protected override void OnPreClose()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.WeekStore);

            m_storeModel.storeFuncType = StoreFunc.WeekStore;

            m_storeModel.shoplist.Clear();

            m_storeModel.RefreshBuyShopLimitEvent -= OnCreate;

            GlobalTimeEvent.Instance.secondEvent -= RefreshResetTime;

@@ -432,6 +434,7 @@


        private void OnClickIntegralStore()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.IntegralStore);

            m_storeModel.shoplist.Clear();

            m_storeModel.storeFuncType = StoreFunc.IntegralStore;

            OnCreate();

@@ -441,6 +444,7 @@


        private void OnClickBindStore()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.BindStore);

            m_storeModel.shoplist.Clear();

            m_storeModel.storeFuncType = StoreFunc.BindStore;

            OnCreate();

@@ -450,6 +454,7 @@


        private void OnClickStrengthStore()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.GrowStrongerStore);

            m_storeModel.shoplist.Clear();

            m_storeModel.storeFuncType = StoreFunc.GrowStrongerStore;

            OnCreate();

@@ -459,6 +464,7 @@


        private void OnClickCommonStore()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.CommonStore);

            m_storeModel.shoplist.Clear();

            m_storeModel.storeFuncType = StoreFunc.CommonStore;

            OnCreate();

@@ -468,6 +474,7 @@


        private void OnClickWeekStore()

        {

            m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.WeekStore);

            m_storeModel.storeFuncType = StoreFunc.WeekStore;

            OnCreate();

            RefreshResetTime();


 Utility/EnumHelper.cs

@@ -668,12 +668,18 @@
    MakerEquipSuitMat = 34, //装备套装材料

    ComposeSuitStone = 35, //套装石碎片

    WingsMat = 39,  //合成翅膀材料，羽翼精炼材料

    DogzStrengthMat = 70, //提供神兽装备强化的经验

    VipTools = 80, //vip道具

    Box = 81, //宝箱

    Necklaces = 108, //项链

    FairyEquip = 109, //仙器

    Wings = 111, //翅膀

    SpiritAnimal = 112, //灵守

    DogzEquipType1 = 119, //神兽装备兽角

    DogzEquipType2 = 120, //神兽装备魔眼

    DogzEquipType3 = 121, //神兽装备獠牙

    DogzEquipType4 = 122, //神兽装备兽爪

    DogzEquipType5 = 123, //神兽装备鳞甲

}



/** 值为列表形式,枚举值是单数 */