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

Client_PangDeRong

2018-09-06 9e0eff9be781cd2fcbeb6d0988333c5c9ed1ddc7

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

 System/Chat/ChatCtrl.cs

@@ -237,7 +237,7 @@
                default:

                    return;

            }

            OperationLogCollect.Instance.ChatReport(content, channelName, toPlayer);

            OperationLogCollect.Instance.ChatReport(content, channelName, chatType == ChatInfoType.Friend ? toPlayer : string.Empty);

        }

        catch (Exception e)

        {


 System/MainInterfacePanel/IsPlayerUIeffect.cs

@@ -38,6 +38,7 @@
            if (m_IsPlayUIEffect)

            {

                m_UIEffect.Play();

                m_IsPlayUIEffect = false;

            }

        }




 System/Treasure/TreasureCollectBriefInfoBehaviour.cs

@@ -288,10 +288,14 @@


                Treasure treasure;

                model.TryGetTreasure(displayTreasureId, out treasure);

                var progress = 1f;

                if (treasure != null && config.PreferredStage != 0)

                var progress = 0f;

                try

                {

                    progress = (float)treasure.stage / config.PreferredStage;

                    progress = treasure.progress / (float)treasure.achievements.Count;

                }

                catch (System.Exception ex)

                {

                    Debug.Log(ex);

                }



                switch (displayState)