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

client_linchunjie

2019-06-10 0dd1db04bd79557ad8882821464695c0e8684333

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

 System/EquipStar/EquipStarModel.cs

@@ -1,7 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System.Linq;
using System;

namespace Snxxz.UI
{
@@ -171,13 +171,33 @@
                return;
            }

            var info = new CA5C5_tagCMEquipPartStarUp();
            info.EquipPackIndex = (ushort)EquipSet.ClientPlaceToServerPlace(equipPosition);
            info.CostEquipIndex = materialIndexs.ToArray();
            info.CostEquipID = materialItemIds.ToArray();
            info.CostEquipCnt = (byte)materialIndexs.Count;
            Action sendInfo = () =>
            {
                var info = new CA5C5_tagCMEquipPartStarUp();
                info.EquipPackIndex = (ushort)EquipSet.ClientPlaceToServerPlace(equipPosition);
                info.CostEquipIndex = materialIndexs.ToArray();
                info.CostEquipID = materialItemIds.ToArray();
                info.CostEquipCnt = (byte)materialIndexs.Count;
                GameNetSystem.Instance.SendInfo(info);
            };

            GameNetSystem.Instance.SendInfo(info);
            if (starUpgradeProbability.value < 100)
            {
                ConfirmCancel.ShowPopConfirm(
                    Language.Get("Mail101"),
                    Language.Get("EquipStarUpgradePossibility"),
                    (bool ok) =>
                    {
                        if (ok)
                        {
                            sendInfo();
                        }
                    });
            }
            else
            {
                sendInfo();
            }
        }

        public void ResetOperateParams()

 System/FindPrecious/DemonJarModel.cs

@@ -199,7 +199,7 @@
                for (int i = sortedBossIds.Count - 1; i >= 0; i--)

                {

                    var bossId = sortedBossIds[i];

                    if (findPreciousModel.IsBossUnlock(bossId))

                    if (findPreciousModel.IsRealmEnoughToKillBoss(bossId))

                    {

                        latestBossId = bossId;

                        break;