Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 Core/SDK/SDKUtility.cs

@@ -21,6 +21,7 @@
        Free = 1,// 自由

        Mr = 2,// 猫耳

        Sp = 3,// 思璞

        Js = 4,// 极速

    }



    public E_ChannelPlatform ChannelPlatform { get; private set; }

@@ -320,6 +321,10 @@
                        {

                            ChannelPlatform = E_ChannelPlatform.Sp;

                        }

                        else if (_channelPlatform.Equals("js"))

                        {

                            ChannelPlatform = E_ChannelPlatform.Js;

                        }

                    }

                }

                break;