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

client_Hale

2019-01-11 1abf40d6f3ce3d558d801ab561420ac23867a40b

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

 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -73,6 +73,8 @@
            }
            _MyBuffSortList.Clear();
            _OpponentBuffSortList.Clear();
            m_ScoreText1.text = 0.ToString();
            m_ScoreText2.text = 0.ToString();
            SetScoreText();

            BuffScheduling();//buff排序

            GetopponentBuff();


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -307,7 +307,15 @@
        _C0801.NPCID = instanceId;

        _C0801.PosX = (ushort)Posx;

        _C0801.PosY = (ushort)PosY;

        GameNetSystem.Instance.SendInfo(_C0801);



        if (CrossServerUtility.IsCrossServer())

        {

            GameNetSystem.Instance.SendToCrossServer(_C0801);

        }

        else

        {

            GameNetSystem.Instance.SendInfo(_C0801);

        }

    }



    void DefaultDialogue()//关于打开默认对话界面


 System/Realm/RealmProgressBehaviour.cs

@@ -86,7 +86,7 @@
                {

                    rect.pivot = middleCenter;

                    rect.anchoredPosition = new Vector2(m_EndRealmPositionx, 0);

                    rightRatio = Mathf.Abs(m_EndRealmPositionx - m_BigRealmBottomWidth / 2) / m_ContainerPoint.rect.width;

                    rightRatio = Mathf.Abs(m_EndRealmPositionx - m_BigRealmBottomWidth / 2 + 30) / m_ContainerPoint.rect.width;

                }

                else

                {


 System/Role/EquipShowSwitch.cs

@@ -30,6 +30,10 @@
        public static bool IsGodWeaponEffectOn(uint value, int type, out int level)

        {

            level = 0;

            if (value == 7)

            {

                return false;

            }

            for (int i = 0; i < GODWEAPON_EFFECT_STAGE; i++)

            {

                var stage = i + 1;


 System/Role/RolePanel.cs

@@ -70,6 +70,12 @@
                return m_TitleModel ?? (m_TitleModel = ModelCenter.Instance.GetModel<TitleModel>());

            }

        }



        PlayerPackModel packModel

        {

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

        }



        private void OnRefreshTitle()

        {

            TitleData titleData = titleModel.GetTitleEquip();

@@ -196,9 +202,14 @@
            OnUpdateSpecialAttr();

            OnUpdateLvExp();

            m_PlayerFightPower.text = PlayerDatas.Instance.baseData.FightPoint.ToString();

            UI3DModelExhibition.Instance.ShowPlayer(m_PlayerShowModel, PlayerDatas.Instance.baseData.Job);

            DisplayModel();

            OnRefreshRealm();

            OnRefreshWorldLv();

        }



        void DisplayModel()

        {

            UI3DModelExhibition.Instance.ShowPlayer(m_PlayerShowModel, PlayerDatas.Instance.baseData.Job);

        }



        void OnUpdateLvExp()

@@ -314,6 +325,7 @@
            titleModel.OnRefreshGainTitle += OnRefreshTitle;

            PlayerDatas.Instance.OnRoleAttrRefresh += OnRefreshWorldLv;

            PlayerDatas.Instance.RefreshPlayerInfoEvent += RefreshPlayerInfoEvent;

            packModel.RefreshItemCountAct += RefreshItemCountAct;

        }



        protected override void OnActived()

@@ -335,6 +347,7 @@
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnRefreshPlayerInfo;

            titleModel.OnRefreshGainTitle -= OnRefreshTitle;

            PlayerDatas.Instance.OnRoleAttrRefresh -= OnRefreshWorldLv;

            packModel.RefreshItemCountAct -= RefreshItemCountAct;

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -343,6 +356,14 @@
            CloseChild();

        }



        private void RefreshItemCountAct(PackType packType, int index, int arg3)

        {

            if (packType == PackType.rptEquip)

            {

                DisplayModel();

            }

        }



        private void OnRefreshWorldLv()

        {

            int limit = Config.Instance.Get<FuncOpenLVConfig>((int)FuncOpenEnum.WorldLv).LimitLV;


 System/Vip/FairyJadeInvestmentModel.cs

@@ -17,10 +17,12 @@
    public MonthlyInvestmentModel.MonthlyInvestmentItem FairyJadeInvestmentItem;//奖励

}

[XLua.LuaCallCSharp]

    public class FairyJadeInvestmentModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

public class FairyJadeInvestmentModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

{

    public Dictionary<int, FairyJadeInvestmentClass> FairyJadeInvestmentDic = new Dictionary<int, FairyJadeInvestmentClass>();//等级

    public Dictionary<int, int> InfoSeriors = new Dictionary<int, int>();//奖励领取信息//key为索引，Value(0,未领，其他值未领的钱数)

    public Dictionary<int, FairyJadeInvestmentClass> FairyJadeInvestmentDic = new Dictionary<int, FairyJadeInvestmentClass>();//等级(0-300级)

    public Dictionary<int, Dictionary<int, FairyJadeInvestmentClass>> FairyJadeInvestmentTypeDic = new Dictionary<int, Dictionary<int, FairyJadeInvestmentClass>>();//根据投资类型来存储奖励类型和金额(类型3，4，5);

    public Dictionary<int, int> InfoSeriors = new Dictionary<int, int>();//奖励领取信息//key为索引，Value(0,未领，其他值未领的钱数)等级(0-300级)

    public Dictionary<int, int> InfoSeriorsTwo = new Dictionary<int, int>();//奖励领取信息//key为索引，Value(0,未领，其他值未领的钱数)等级(301-400)

    public Dictionary<int, int> InvestmentAmountDic = new Dictionary<int, int>();//投资金额

    public static Action FairyJadeInfoSeriorsUpdate;

    public int InvestGold = 0; // 投资额度

@@ -130,7 +132,9 @@
        FairyJadeInvestmentDic.Clear();

        InvestmentAmountDic.Clear();

        InfoSeriors.Clear();

        InfoSeriorsTwo.Clear();

        Assignment();



    }



    public void OnPlayerLoginOk()

@@ -166,8 +170,102 @@
    {



    }



    public void AssignmentType()

    {

        //根据投资类型来存储奖励信息（类型3，4，5）

        if (FairyJadeInvestmentTypeDic.Count >= 3)

        {

            return;

        }

        var InvestConfig = Config.Instance.GetAllValues<InvestConfig>();

        foreach (var value in InvestConfig)

        {

            if ((value.type == 3 || value.type == 4 || value.type == 5))

            {

                if (!FairyJadeInvestmentTypeDic.ContainsKey(value.type))

                {

                    Dictionary<int, FairyJadeInvestmentClass> Dic = new Dictionary<int, FairyJadeInvestmentClass>();

                    FairyJadeInvestmentClass fairyJadeInvestment = new FairyJadeInvestmentClass();

                    if (value.id >= 310)

                    {

                        fairyJadeInvestment.ID = value.id % 100;

                    }

                    else

                    {

                        fairyJadeInvestment.ID = value.id % 10;

                    }

                    fairyJadeInvestment.Type = value.type;

                    fairyJadeInvestment.NeedDay = value.needDay;

                    fairyJadeInvestment.NeedLv = value.needLV;

                    MonthlyInvestmentModel.MonthlyInvestmentItem FairyJadeItem = new MonthlyInvestmentModel.MonthlyInvestmentItem();

                    var _jsonData = LitJson.JsonMapper.ToObject(value.award);

                    foreach (string key in _jsonData.Keys)

                    {

                        var _job = int.Parse(key);

                        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],

                            });

                        }

                    }

                    fairyJadeInvestment.FairyJadeInvestmentItem = FairyJadeItem;

                    Dic.Add(value.needLV, fairyJadeInvestment);

                    FairyJadeInvestmentTypeDic.Add(value.type, Dic);

                }

                else

                {

                    var dict = FairyJadeInvestmentTypeDic[value.type];

                    FairyJadeInvestmentClass fairyJadeInvestment = new FairyJadeInvestmentClass();

                    if (value.id >= 310)

                    {

                        fairyJadeInvestment.ID = value.id % 100;

                    }

                    else

                    {

                        fairyJadeInvestment.ID = value.id % 10;

                    }

                    fairyJadeInvestment.Type = value.type;

                    fairyJadeInvestment.NeedDay = value.needDay;

                    fairyJadeInvestment.NeedLv = value.needLV;

                    MonthlyInvestmentModel.MonthlyInvestmentItem FairyJadeItem = new MonthlyInvestmentModel.MonthlyInvestmentItem();

                    var _jsonData = LitJson.JsonMapper.ToObject(value.award);

                    foreach (string key in _jsonData.Keys)

                    {

                        var _job = int.Parse(key);

                        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],

                            });

                        }

                    }

                    fairyJadeInvestment.FairyJadeInvestmentItem = FairyJadeItem;

                    if (!dict.ContainsKey(value.needLV))

                    {

                        dict.Add(value.needLV, fairyJadeInvestment);



                    }

                    else

                    {

                        dict[value.needLV] = fairyJadeInvestment;

                    }

                }

            }

        }

       // DebugEx.LogError(FairyJadeInvestmentTypeDic);

    }



    public void Assignment()

    {

       // AssignmentType();

        var InvestConfig = Config.Instance.GetAllValues<InvestConfig>();

        if (FairyJadeInvestmentDic.Count > 0)

        {

@@ -212,7 +310,9 @@
                FairyJadeInvestmentDic.Add(value.needLV, fairyJadeInvestment);

            }

        }

      //  DebugEx.LogError(FairyJadeInvestmentDic);

    }



    public void GetInfoSeriors(HA337_tagMCGoldInvestInfo vNetData)//接受信息

    {

        if (vNetData.InvestType == 3)

@@ -346,7 +446,7 @@
            {

                redPointStre1.state = RedPointState.Simple;

            }

           


        }

        else

        {


 UI/Common/UI3DModelExhibition.cs

@@ -270,7 +270,7 @@
                var flashSecondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retFashionWeapon2);

                var secondary = playerPack.GetItemModelByIndex(PackType.rptEquip, (int)RoleEquipType.retWeapon2);

                secondaryId = secondary == null ? 0 : (int)secondary.itemInfo.ItemID;

                flashSecondaryId = secondary == null ? 0 : flashSecondary.itemInfo.ItemID;

                flashSecondaryId = flashSecondary == null ? 0 : flashSecondary.itemInfo.ItemID;

            }



            var suitLevel = 0;