Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 System/FriendSystem/MailAllModel.cs

@@ -63,20 +63,28 @@
    }



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



    bool isLogin = true;

    public MailAllModel()

    {

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInit;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;

    }



    private void BeforePlayerDataInit()

    {

        isLogin = true;

        funcType = MailFuncType.Mail;

        mailModelDict.Clear();

        timeOrderMailInfo.Clear();

        mailTitleStr = "";

        mailContentstr = "";

        mailSendPersonStr = "";

    }





    private void OnPlayerLoginOk()

    {

        isLogin = false;

    }



    public MailFuncType funcType = MailFuncType.Mail;

@@ -171,6 +179,16 @@
                    {

                        exchangeModel.SetAwardExchangeModel(info.Items);

                    }



                    if(!isLogin)

                    {

                       if (info.Count > 0 || info.Gold > 0 || info.GoldPaper > 0

                          || info.Silver > 0)

                        {

                            SoundPlayer.Instance.PlayUIAudio(740);

                        }

                    }

                 
                }

            }

            addMailCnt = mailModelDict.Count - preMailCnt;