Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-20 a82a222a5b5748de55494ec61115cc880b1eeec1

 Core/SDK/SDKUtility.cs

@@ -27,11 +27,18 @@
        Js = 4,// 极速

        Yj = 5,// 易接

        Yl = 6,// 易乐

        Xn = 7,// 小牛

        Cjm = 8,// 超级梦

    }



    public E_ChannelPlatform ChannelPlatform { get; set; }



    public static string Yj_AppID

    {

        get; private set;

    }



    public static string Yj_Version

    {

        get; private set;

    }

@@ -118,6 +125,7 @@
    {

        Yj_AppID = string.Empty;

        Yj_SpID = string.Empty;

        Yj_Version = string.Empty;

        RegistrationID = string.Empty;

        AssetCopyFinished = false;

        ChannelPlatform = E_ChannelPlatform.Free;

@@ -350,6 +358,20 @@
                {

                    _result = "yileplatform";

                }

                else if (ChannelPlatform == E_ChannelPlatform.Xn)

                {

                    using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

                    {

                        _result = _jc.CallStatic<string>("getMetaString", "XnAppID");

                    }

                }

                else if (ChannelPlatform == E_ChannelPlatform.Cjm)

                {

                    using (AndroidJavaClass _jc = new AndroidJavaClass("com.secondworld.univeralsdk.UniversalUtil"))

                    {

                        _result = _jc.CallStatic<string>("getMetaString", "SUPERDREAM_APPID");

                    }

                }

                break;

            case RuntimePlatform.IPhonePlayer:

                _result = "ios";//ios平台固定返回ios

@@ -453,6 +475,14 @@
                        {

                            ChannelPlatform = E_ChannelPlatform.Yl;

                        }

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

                        {

                            ChannelPlatform = E_ChannelPlatform.Xn;

                        }

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

                        {

                            ChannelPlatform = E_ChannelPlatform.Cjm;

                        }

                    }

                }



@@ -468,6 +498,27 @@
                        Yj_SpID = _json["yj_spid"].ToString();

                    }

                }

                else if (ChannelPlatform == E_ChannelPlatform.Xn)

                {

                    if (_dict.Contains("xnappid"))

                    {

                        Yj_AppID = _json["xnappid"].ToString();

                    }



                    if (_dict.Contains("xnversion"))

                    {

                        Yj_Version = _json["xnversion"].ToString();

                    }

                }

                else if (ChannelPlatform == E_ChannelPlatform.Cjm)

                {

                    if (_dict.Contains("cjmappid"))

                    {

                        Yj_AppID = _json["cjmappid"].ToString();

                    }

                }







                if (_dict.Contains("banhao"))

                {

@@ -866,6 +917,14 @@
        {

            m_PaymentTable["RechargeChannel"] = "6";

        }

        else if (ChannelPlatform == E_ChannelPlatform.Xn)

        {

            m_PaymentTable["RechargeChannel"] = "7";

        }

        else if (ChannelPlatform == E_ChannelPlatform.Cjm)

        {

            m_PaymentTable["RechargeChannel"] = "8";

        }



        var _stringBuilder = new System.Text.StringBuilder();

        var _md5Body = _stringBuilder.Append(m_PaymentTable["AppID"]).

@@ -907,29 +966,20 @@
                        m_Json["mount"] = money;

                        m_Json["cpInfo"] = cpInfo;

                        m_Json["title"] = title;



                        if(ChannelPlatform == E_ChannelPlatform.Mr

                        || ChannelPlatform == E_ChannelPlatform.Sp

                        || ChannelPlatform == E_ChannelPlatform.Yl)

                        {

                            m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID;

                            m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;

                            m_Json["level"] = PlayerDatas.Instance.baseData.LV.ToString();

                            m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;

                        }



                        if (ChannelPlatform == E_ChannelPlatform.Mr)

                        {

                            m_Json["notifyurl"] = _json["notifyurl"];

                        }

                        else if(ChannelPlatform == E_ChannelPlatform.Sp)

                        {

                            m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;

                            m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;

                            m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();

                            m_Json["money"] = PlayerDatas.Instance.baseData.Gold.ToString();

                            m_Json["gameName"] = VersionConfig.Get().productName;

                            m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();



                        if (ChannelPlatform == E_ChannelPlatform.Mr)

                        {

                            m_Json["notifyurl"] = _json["notifyurl"];

                        }

#if UNITY_IOS

                        m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;