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

client_Wu Xijin

2019-03-15 f0e0b9194f083810972a57f5e6f96e8622133f42

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

 System/Auction/FamilyAuctioncell.cs

@@ -89,16 +89,18 @@
                // m_Score.text

            }

            int needJade = 0;

            int priceMax = 0;

            priceMax = auctionItem.BuyoutPrice * familyAuctionItem.ItemCount;

            if (familyAuctionItem.BidderPrice == 0)

            {

                needJade = auctionItem.BasePrice;

                needJade = auctionItem.BasePrice * familyAuctionItem.ItemCount;

            }

            else

            {

                needJade = familyAuctionItem.BidderPrice + auctionItem.BiddingAdd;

                needJade = familyAuctionItem.BidderPrice + auctionItem.BiddingAdd * familyAuctionItem.ItemCount;

            }

            m_JadeNumber.text = familyAuctionItem.BidderPrice.ToString();

            m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

            {

                m_PriceButton.gameObject.SetActive(false);

@@ -110,21 +112,20 @@
            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                string str = Language.Get("PMH_02", priceMax);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) =>

                {

                    if (isOk)

                    {

                        if (jade >= auctionItem.BuyoutPrice)

                        if (jade >= priceMax)

                        {

                            AuctionInquiry.Instance.SendSellAuctionItem(GUIID, auctionItem.BuyoutPrice);

                            AuctionInquiry.Instance.SendSellAuctionItem(GUIID, priceMax);

                        }

                        else

                        {

                            WindowCenter.Instance.Open<RechargeTipWin>();

                        }

                    }



                });

            });

            m_JadeNumber2.text = (needJade).ToString();

@@ -146,7 +147,6 @@
                        }

                    }

                });



            });

        }

        private void LateUpdate()


 System/Auction/FullServiceAuctioncell.cs

@@ -107,16 +107,18 @@
                // m_Score.text

            }

            int needJade = 0;

            int priceMax = 0;

            priceMax = auctionItem.BuyoutPrice * fullServiceAuction.ItemCount;

            if (fullServiceAuction.BidderPrice == 0)

            {

                needJade = auctionItem.BasePrice;

                needJade = auctionItem.BasePrice * fullServiceAuction.ItemCount;

            }

            else

            {

                needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd;

                needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd* fullServiceAuction.ItemCount;

            }

            m_JadeNumber.text = fullServiceAuction.BidderPrice.ToString();

            m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

            {

                m_PriceButton.gameObject.SetActive(false);

@@ -128,21 +130,19 @@
            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                string str = Language.Get("PMH_02", priceMax);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

                        if (jade >= auctionItem.BuyoutPrice)

                        if (jade >= priceMax)

                        {

                            AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, auctionItem.BuyoutPrice);

                            AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, priceMax);

                        }

                        else

                        {

                            WindowCenter.Instance.Open<RechargeTipWin>();

                        }



                    }

                  
                    }                
                });

            });

            m_JadeNumber2.text = needJade.ToString();


 System/Auction/MyAuctionCell.cs

@@ -84,15 +84,15 @@
                if (type == 0)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                        AuctionTaxrate1 * myAuction.BidderPrice) / 100);//个人税收

                    int incomeNumber = myAuction.BidderPrice - auctionTaxrate;

                        AuctionTaxrate1 * myAuction.BidderPrice* myAuction.ItemCount) / 100);//个人税收

                    int incomeNumber = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate;

                    m_Income.text = incomeNumber.ToString();

                }

                else if (type == 1)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                       AuctionTaxrate2 * myAuction.BidderPrice) / 100);//仙盟税收

                    int number = myAuction.BidderPrice - auctionTaxrate;

                       AuctionTaxrate2 * myAuction.BidderPrice * myAuction.ItemCount) / 100);//仙盟税收

                    int number = myAuction.BidderPrice * myAuction.ItemCount - auctionTaxrate;

                    int incomeMax = number - Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);

                    int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count);                

                    if (incomeMax >= incomeNumber)


 System/Auction/MyFocusCell.cs

@@ -98,13 +98,15 @@
                // m_Score.text

            }

            int needJade = 0;

            int priceMax = 0;

            priceMax = auctionItem.BuyoutPrice * myAuction.ItemCount;

            if (myAuction.BidderPrice == 0)

            {

                needJade = auctionItem.BasePrice;

                needJade = auctionItem.BasePrice * myAuction.ItemCount;

            }

            else

            {

                needJade = myAuction.BidderPrice + auctionItem.BiddingAdd;

                needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount;

            }

            m_JadeNumber.text = myAuction.BidderPrice.ToString();

            if (auctionItem.BuyoutPrice == 0)

@@ -115,17 +117,17 @@
            {

                m_PriceButton.gameObject.SetActive(true);

            }

            m_JadeNumber1.text = auctionItem.BuyoutPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;               

                string str = Language.Get("PMH_02", auctionItem.BuyoutPrice);

                string str = Language.Get("PMH_02", priceMax);

                ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), str, (bool isOk) => {

                    if (isOk)

                    {

                        if (jade >= auctionItem.BuyoutPrice)

                        if (jade >= priceMax)

                        {

                            AuctionInquiry.Instance.SendSellAuctionItem(GUIID, auctionItem.BuyoutPrice);

                            AuctionInquiry.Instance.SendSellAuctionItem(GUIID, priceMax);

                        }

                        else

                        {


 System/Dungeon/DungeonModel.cs

@@ -1019,7 +1019,7 @@
                            WindowCenter.Instance.Open<DungeonSlayerVictoryWin>();

                            break;

                        case RealmModel.REALM_DUNGEON_ID:

                            var realmLevel = PlayerDatas.Instance.baseData.realmLevel + 1;

                            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

                            RealmBossShow.Instance.Open(realmLevel);

                            break;

                        case RuneTowerModel.RUNETOWER_MAPID:


 System/EquipGem/EquipStrengthModel.cs

@@ -20,9 +20,9 @@


public class EquipTypeClass

{

    public int AttType;

    public int AttValue;

    public string StrName;

    public int AttType;//属性类型

    public int AttValue;//属性值

    public string StrName;//属性名

}

public class EquipMaxLvClass

{

@@ -208,7 +208,7 @@
        return lv;

    }



    public List<EquipTypeClass> GetEquipValueList(int level, int equipPlace, int addlv = 0)

    public List<EquipTypeClass> GetEquipValueList(int level, int equipPlace, int addlv = 0)//当前获得的强化属性

    {

        List<EquipTypeClass> EquipTypeList = new List<EquipTypeClass>();

        int type = GetEquipStrengthType(equipPlace);


 System/EquipGem/EquipStrengthWin.cs

@@ -27,6 +27,7 @@


        [SerializeField] UIEffect m_UIEffect1A;

        [SerializeField] UIEffect m_UIEffect1B;

        [SerializeField] UIEffect m_UIEffect1C;



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

        EquipGemModel model { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
@@ -63,9 +64,11 @@
            SetStrengthenedState();

            strengthModel.SelectEquipRefresh += SelectEquipRefresh;

            strengthModel.SelectLevelRefresh += SelectLevelRefresh;

            strengthModel.EquipStrengthUpdate += EquipStrengthUpdate;
        }

            strengthModel.EquipStrengthUpdate += EquipStrengthUpdate;

            strengthModel.EquipStrengthLvUpdate += EquipStrengthLvUpdate;
        }



       
        protected override void OnAfterOpen()
        {
        }
@@ -75,6 +78,7 @@
            strengthModel.SelectEquipRefresh -= SelectEquipRefresh;

            strengthModel.SelectLevelRefresh -= SelectLevelRefresh;

            strengthModel.EquipStrengthUpdate -= EquipStrengthUpdate;
            strengthModel.EquipStrengthLvUpdate -= EquipStrengthLvUpdate;
        }





@@ -134,12 +138,26 @@
            m_AutomaticBtn.gameObject.SetActive(true);



        }



        private void EquipStrengthLvUpdate()

        {

            if (!m_UIEffect1B.IsPlaying)

            {

                m_UIEffect1B.Play();

            }          
        }



        private void EquipStrengthUpdate()

        {

            if (!m_UIEffect1A.IsPlaying)

            {

                m_UIEffect1A.Play();

            }

            m_UIEffect1C.Play();

            if (strengthModel.SelectLevel != -1)

            {

                SetStrengthenedState();

                m_Controller.m_Scorller.RefreshActiveCellViews();

                m_Controller.m_Scorller.RefreshActiveCellViews();               
            }

        }

        void DisplayEquips()


 System/Realm/RealmModel.cs

@@ -38,12 +38,15 @@
            }

        }



        int cacheMapId = 0;



        public event Action selectRealmRefresh;



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



        public override void Init()

        {

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            ParseConfig();

        }



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


        public override void UnInit()

        {

            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;

        }



        void ParseConfig()

@@ -206,5 +210,50 @@
        {

            isBossPass = package.IsPass == 1;

        }



        private void OnStageLoadFinish()

        {

            if (!(StageLoad.Instance.currentStage is DungeonStage))

            {

                cacheMapId = 0;

            }

            else

            {

                var mapId = PlayerDatas.Instance.baseData.MapID;

                if (cacheMapId == REALM_DUNGEON_ID

                    && mapId != REALM_DUNGEON_ID)

                {

                    if (isBossPass)

                    {

                        SnxxzGame.Instance.StartCoroutine(Co_TryOpenRealmWin());

                    }

                }

                cacheMapId = mapId;

            }

        }



        IEnumerator Co_TryOpenRealmWin()

        {

            yield return WaitingForSecondConst.WaitMS1000;

            TryOpenRealmWin();

        }



        private void TryOpenRealmWin()

        {

            if (NewBieCenter.Instance.inGuiding)

            {

                return;

            }

            var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();

            if (treasureModel.newGotShowing)

            {

                return;

            }

            if (WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())

            {

                return;

            }

            WindowCenter.Instance.Open<RealmWin>();

        }

    }

}