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

client_Zxw

2018-09-06 43abbfca275d5f6612f10b6f2d7f6acc386b561a

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/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)