Merge branch 'master' into 3243Activity

client_Wu Xijin

2018-09-07 ff5a952767a0c98fff6cf53733df93db5aa80b2f

 System/Chat/ChatCenter.cs

@@ -766,8 +766,8 @@
        #endregion



        #region 境界渡劫私聊感谢

        private string[] realmThankChats = new string[7] {"ThankMessage1", "ThankMessage2", "ThankMessage3", "ThankMessage4",

                          "ThankMessage5","ThankMessage6","ThankMessage7"};

        const string RealmThank = "ThankMessage";

        const int RealmThankCount = 11;

        public void CheckSendRealmThanks()

        {

            try

@@ -804,7 +804,7 @@
                            ChatCtrl.Inst.PteChatID = (int)teammate.id;

                            ChatCtrl.Inst.PteChatName = teammate.mateName;

                            LanguageVerify.toPlayerLevel = teammate.level;

                            var content = realmThankChats[UnityEngine.Random.Range(0, 7)];

                            var content = StringUtility.Contact(RealmThank, UnityEngine.Random.Range(1, RealmThankCount + 1));

                            ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend, Language.Get(content));

                        }

                    }