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

client_Wu Xijin

2019-05-21 e123e711a36fe15f5d5aa06318ce5ab730f05334

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

 Lua/LuaGameNetSystem.cs

@@ -132,7 +132,7 @@
        GameNetSystem.Instance.SendInfo(sendBytes.ToArray());
    }

    int readIndex = 0;
    int readIndex = 2;
    public uint TransUintBytes(byte[] value, LuaGameNetSystem.NetDataType type)
    {
        var length = GetBytesLength(type);

 System/Alchemy/AlchemyUseDrugCell.cs

@@ -89,7 +89,14 @@
                    var list = packModel.GetItemsById(PackType.Item, itemId);

                    if (list != null && list.Count > 0)

                    {

                        if (itemCount > 1)

                        int maxValue = itemCount;

                        AlchemyDrugUseLimit drugUseLimit;

                        if (model.TryGetAlchemyUseLimit(itemId, out drugUseLimit))

                        {

                            maxValue = Mathf.Min(itemCount, drugUseLimit.GetUseLimit() - drugUseLimit.eatTimes);

                        }



                        if (maxValue > 1)

                        {

                            AlchemyDrugBatchUseWin.itemId = itemId;

                            WindowCenter.Instance.Open<AlchemyDrugBatchUseWin>();


 System/MainInterfacePanel/TaskBoxBGMWin.cs

@@ -200,8 +200,13 @@
            var taskInfoConfig = TASKINFOConfig.Get(StrConversa);

            if (taskInfoConfig == null)

            {

                DebugEx.LogError("任务表格配置错误");

                return;

                taskInfoConfig = TASKINFOConfig.Get(StrConversa.ToLower());

                if(taskInfoConfig == null) 
                {

                    DebugEx.LogError("任务表格配置错误");

                    return;

                }

               
            }

            if (taskmodel.BountyDic.ContainsKey(_TaskId) || taskmodel.FairyAuDic.ContainsKey(_TaskId))

            {


 System/Pet/PetWin.cs

@@ -23,7 +23,7 @@
        {

            if (!WindowJumpMgr.Instance.IsJumpState && functionOrder < 2)//是否进行跳转

            {

                if (mountModel.IsHorsePanelState() > petmodel.IsPetPanelRedPointState())

                if (mountModel.IsHorsePanelState() < petmodel.IsPetPanelRedPointState())

                {

                    functionOrder = 1;

                }


 System/Skill/ExpertSkillSelectWin.cs

@@ -63,6 +63,8 @@


        int selectActiveLevel = 0;



        int cacheSelectExpert = 0;



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



        FunctionUnlockFlyObject flyObject = null;

@@ -289,6 +291,8 @@
            var selectExpertSkill = 0;

            model.TryGetExpertSkill(selectSkillId, out selectExpertSkill);



            cacheSelectExpert = selectExpertSkill;



            m_ContainerReikiIcon.gameObject.SetActive(selectExpertSkill != 0);

            m_SkillIconSelect.gameObject.SetActive(selectExpertSkill != 0);

            if (selectExpertSkill != 0)

@@ -390,7 +394,7 @@
        {

            var selectExpertSkill = 0;

            if (model.serverInited && model.TryGetExpertSkill(selectSkillId, out selectExpertSkill)

                && selectExpertSkill == selectExpert)

                && selectExpertSkill == selectExpert && cacheSelectExpert != selectExpertSkill)

            {

                if (flyObject != null)

                {


 System/Tip/PromoteDetailsWin.cs

@@ -84,10 +84,10 @@
                    WindowCenter.Instance.Open<EquipFrameWin>(false, 0);

                    break;

                case RolePromoteModel.PromoteDetailType.Mount:

                    WindowCenter.Instance.Open<PetWin>(false, 1);

                    WindowCenter.Instance.Open<PetWin>(false, 0);

                    break;

                case RolePromoteModel.PromoteDetailType.Pet:

                    WindowCenter.Instance.Open<PetWin>(false, 0);

                    WindowCenter.Instance.Open<PetWin>(false, 1);

                    break;

                case RolePromoteModel.PromoteDetailType.RuneMosaic:

                    WindowCenter.Instance.Open<RunePanel>();