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

client_Wu Xijin

2019-03-29 dc6b3f166e8c1b9f4975e6a0024a3c8eded21c0d

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

 System/Auction/FamilyAuctioncell.cs

@@ -33,7 +33,6 @@
        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;



        [SerializeField] TextEx m_OverTime;//加时时间

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

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

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

@@ -45,7 +44,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            if (!model.FamilyAuctionItemDic.ContainsKey(GUIID))

            {

                DebugEx.LogError("未找到相应的仙盟拍品数据");

@@ -214,14 +212,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }

            }

        }

 System/Auction/FullServiceAuctioncell.cs

@@ -34,7 +34,6 @@
        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;

        [SerializeField] TextEx m_OverTime;//加时时间

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

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

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

@@ -47,7 +46,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == GUID; });

            if (indexList == -1 && !model.BiddingItemInfoDic.ContainsKey(GUID))

            {

@@ -222,6 +220,7 @@


                DateTime overTime = FullServiceAuction.putAwayTime.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

                DateTime extensionTime = FullServiceAuction.latestBiddingTime.AddSeconds(auctionHelpModel.ExtensionTime);

                m_TimeText.color = UIHelper.GetUIColor(TextColType.Green, true);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    if (m_PriceButton.interactable)

@@ -246,14 +245,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }

            }

        }


 System/Auction/MyAuctionCell.cs

@@ -26,7 +26,6 @@
        [SerializeField] TextEx m_TimeText;//时间

        [SerializeField] TextEx m_Income;//收益



        [SerializeField] TextEx m_OverTime;//加时时间

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

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

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

@@ -41,7 +40,6 @@
            }

            m_MyAuction.SetActive(false);

            m_FamilyImage.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItem myAuction = new AuctionItem();

            int type = 0;//0自身上架，1仙盟上架

            if (model.PlayerAuctionItemInfoDic.ContainsKey(GUIID))

@@ -169,14 +167,11 @@
                }

                if (overTime < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }

            }

        }

 System/Auction/MyFocusCell.cs

@@ -32,7 +32,6 @@
        [SerializeField] Button m_BiddingButton;//竞价按钮

        [SerializeField] ImageEx m_BiddingImage;

        [SerializeField] TextEx m_JadeNumber2;

        [SerializeField] TextEx m_OverTime;//加时时间

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

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

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

@@ -49,7 +48,6 @@
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

            AuctionItem myAuction = new AuctionItem();

            int type = 0;

            if (model.AttentionAuctionItemDic.ContainsKey(GUIID))

@@ -232,14 +230,12 @@
                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

                    }

                    m_TimeText.text = Language.Get("PMH_04", 0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;



                    var realOverTime = overTime.AddTicks(auctionHelpModel.ExtensionTime * TimeSpan.TicksPerSecond);

                    TimeSpan timeSpan2 = realOverTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    m_OverTime.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.text = Language.Get("PMH_18", TimeUtility.SecondsToHMS(timeSeconds));

                    m_TimeText.color = UIHelper.GetUIColor(TextColType.Red, true);

                }

            }

        }

 System/Role/ReikiRootModel.cs

@@ -11,6 +11,7 @@
        Dictionary<int, List<int>> m_RecommendReikiRoots = new Dictionary<int, List<int>>();

        Dictionary<int, Dictionary<int, float>> m_RecommendProportion = new Dictionary<int, Dictionary<int, float>>();

        Dictionary<int, int> m_MainReikiRoots = new Dictionary<int, int>();

        Dictionary<int, int> m_ReikiQualityMapColors;

        Dictionary<int, int> m_CacheReikiRootPoints = new Dictionary<int, int>();



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

@@ -106,6 +107,9 @@


            var config = ReikiRootConfig.GetValues()[0];

            maxQuality = config.qualityArea.Length;



            funcConfig = FuncConfigConfig.Get("RecommendPoint");

            m_ReikiQualityMapColors = ConfigParse.GetDic<int, int>(funcConfig.Numerical2);



            reikiRoots.Add((int)PropertyType.Mater);

            reikiRoots.Add((int)PropertyType.Wood);

@@ -296,18 +300,12 @@


        public static string GetQualityLabel(int quality)

        {

            switch (quality)

            {

                case 1:

                case 2:

                case 3:

                case 4:

                case 5:

                case 6:

                    return Language.Get(StringUtility.Contact("ReikiRootQuality_", quality));

                default:

                    return Language.Get(StringUtility.Contact("ReikiRootQuality_", 1));

            }

            return Language.Get(StringUtility.Contact("ReikiRootQuality_", quality));

        }



        public int GetQualityColor(int quality)

        {

            return m_ReikiQualityMapColors.ContainsKey(quality) ? m_ReikiQualityMapColors[quality] : 1;

        }



        public void ReceivePackage(HB107_tagMCRolePointInfo package)


 System/Role/ReikiRootPointBehaviour.cs

@@ -90,7 +90,7 @@
            {

                var propertyConfig = PlayerPropertyConfig.Get(id);

                m_PropertyName.text = StringUtility.Contact(propertyConfig.Name, ReikiRootModel.GetQualityLabel(quality));

                m_PropertyName.color = UIHelper.GetUIColor(quality, true);

                m_PropertyName.color = UIHelper.GetUIColor(model.GetQualityColor(quality), true);

                cacheQuality = quality;

            }

        }