少年修仙传客户端代码仓库
hch
2023-06-15 2f344d5003f375eaad3f4bc7607ff7e75ce88c32
0312 增加欢游登录 hy
5个文件已修改
201 ■■■■■ 已修改文件
Core/SDK/SDKUtility.cs 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Login/LoginModel.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Login/LoginWin.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Mail/MailAllModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/UIRoot.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/SDK/SDKUtility.cs
@@ -36,7 +36,8 @@
        Ky = 9,//恺英
        Quick = 10, //quick
        SanXia = 11, //三峡(港台使用)
        SanXiaiOS = 12 //三峡 (港台ios使用)
        SanXiaiOS = 12, //三峡 (港台ios使用)
        Hy = 15, //欢游
    }
    //权限申请回调
@@ -524,103 +525,27 @@
                    var _channelPlatform = _json["channelPlatform"].ToString();
                    if (!string.IsNullOrEmpty(_channelPlatform))
                    {
                        if (_channelPlatform.Equals("mr"))
                        if (_channelPlatform.Equals("hygame"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Mr;
                        }
                        else if (_channelPlatform.Equals("sp"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Sp;
                        }
                        else if (_channelPlatform.Equals("js"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Js;
                        }
                        else if (_channelPlatform.Equals("yj"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Yj;
                        }
                        else if (_channelPlatform.Equals("yl"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Yl;
                        }
                        else if (_channelPlatform.Equals("xn"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Xn;
                        }
                        else if (_channelPlatform.Equals("cjm"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Cjm;
                        }
                        else if (_channelPlatform.Equals("ky"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Ky;
                            ChannelPlatform = E_ChannelPlatform.Hy;
                        }
                        else if (_channelPlatform.Equals("quick"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Quick;
                        }
                        else if (_channelPlatform.Equals("sanxia"))
                        {
                            ChannelPlatform = E_ChannelPlatform.SanXia;
                        }
                        else if (_channelPlatform.Equals("sanxiaios"))
                        {
                            ChannelPlatform = E_ChannelPlatform.SanXiaiOS;
                        }
                    }
                }
                if (ChannelPlatform == E_ChannelPlatform.Yj)
                //Sdk 可能会修改渠道信息,所以需要重新获取
                if (_dict.Contains("yj_appid"))
                {
                    if (_dict.Contains("yj_appid"))
                    {
                        Yj_AppID = _json["yj_appid"].ToString();
                    }
                    Yj_AppID = _json["yj_appid"].ToString();
                }
                    if (_dict.Contains("yj_spid"))
                    {
                        Yj_SpID = _json["yj_spid"].ToString();
                    }
                }
                else if (ChannelPlatform == E_ChannelPlatform.Xn)
                if (_dict.Contains("yj_spid"))
                {
                    if (_dict.Contains("xnappid"))
                    {
                        ThirdPartAppID = _json["xnappid"].ToString();
                    }
                    if (_dict.Contains("xnversion"))
                    {
                        ThirdPartVersion = _json["xnversion"].ToString();
                    }
                }
                else if (ChannelPlatform == E_ChannelPlatform.Cjm)
                {
                    if (_dict.Contains("cjmappid"))
                    {
                        ThirdPartAppID = _json["cjmappid"].ToString();
                    }
                }
                else if (ChannelPlatform == E_ChannelPlatform.Ky)
                {
                    if (_dict.Contains("kyAppID"))
                    {
                        ThirdPartAppID = _json["kyAppID"].ToString();
                        Debug.Log("===========> KYAPPID: " + ThirdPartAppID);
                    }
                }
                else if (ChannelPlatform == E_ChannelPlatform.Quick)
                {
                    if (_dict.Contains("yj_appid"))
                    {
                        Yj_AppID = _json["yj_appid"].ToString();
                    }
                    if (_dict.Contains("yj_spid"))
                    {
                        Yj_SpID = _json["yj_spid"].ToString();
                    }
                    Yj_SpID = _json["yj_spid"].ToString();
                }
                if (_dict.Contains("banhao"))
@@ -729,7 +654,7 @@
                    break;
                }
            case CodeA2U.ExitGame:
                if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Quick)
                if (ChannelPlatform == E_ChannelPlatform.Quick || ChannelPlatform == E_ChannelPlatform.Hy)
                {
                    Application.Quit();
                }
System/Login/LoginModel.cs
@@ -288,58 +288,18 @@
                    {
                        send.IDType = 1;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Mr)
                    {
                        send.IDType = 2;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Sp)
                    {
                        send.IDType = 3;
                        send.Extra += ("|" + SDKUtility.Instance.FreePlatformInfo.sessionID);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Js)
                    {
                        send.IDType = 4;
                        send.Extra += ("|" + sdkLoginResult.token);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yj)
                    {
                        send.IDType = 5;
                        send.Extra += ("|" + SDKUtility.Yj_SpID + "|" +
                                       SDKUtility.Yj_AppID + "|" +
                                       SDKUtility.Instance.FreePlatformInfo.accountID);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yl)
                    {
                        send.IDType = 6;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Xn)
                    {
                        send.IDType = 7;
                        send.Extra += ("|" + SDKUtility.ThirdPartAppID + "|" + SDKUtility.ThirdPartVersion);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Cjm)
                    {
                        send.IDType = 8;
                        send.Extra += ("|" + SDKUtility.ThirdPartAppID + "|" + SDKUtility.Instance.FreePlatformInfo.token);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Ky)
                    {
                        send.IDType = 9;
                        send.Extra += ("|" + SDKUtility.ThirdPartAppID);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Quick)
                    {
                        send.IDType = 10;
                        send.Extra += ("|" + sdkLoginResult.token + "|" + sdkLoginResult.qkUserName);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Hy)
                    {
                        send.IDType = (int)SDKUtility.E_ChannelPlatform.Hy;
                        send.Extra += ("|" + sdkLoginResult.token + "|" + sdkLoginResult.qkUserName);
                        send.ExtraLen = (ushort)send.Extra.Length;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.SanXia)
                    {
                        send.IDType = (int)SDKUtility.E_ChannelPlatform.SanXia;
System/Login/LoginWin.cs
@@ -135,35 +135,16 @@
            ChangeUserInfo(model.localSaveAccountName);
            if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yj
             && SDKUtility.Yj_AppID.Equals("yybgame")
             && !model.sdkLogined)
            {
                m_EnterGame.SetActive(false);
                m_QQLogin.SetActive(true);
                m_WXLogin.SetActive(true);
                SDKUtility.Instance.onFreePlatformLoginOk += OnLoginOk;
            }
            else
            {
                m_EnterGame.SetActive(true);
                m_QQLogin.SetActive(false);
                m_WXLogin.SetActive(false);
            }
            m_EnterGame.SetActive(true);
            m_QQLogin.SetActive(false);
            m_WXLogin.SetActive(false);
            checkRead.isOn = LocalSave.GetBool("secretToggle");
        }
        private void OnLoginOk(SDKUtility.FP_LoginOk arg0)
        {
            if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Yj
             && SDKUtility.Yj_AppID.Equals("yybgame"))
            {
                m_EnterGame.SetActive(true);
                m_QQLogin.SetActive(false);
                m_WXLogin.SetActive(false);
            }
        }
        protected override void OnAfterOpen()
@@ -276,31 +257,11 @@
        protected void QQLogin()
        {
            if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj)
            {
                return;
            }
            if (!SDKUtility.Yj_AppID.Equals("yybgame"))
            {
                return;
            }
            SDKUtility.Instance.TencentLogin("Login");
        }
        protected void WXLogin()
        {
            if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj)
            {
                return;
            }
            if (!SDKUtility.Yj_AppID.Equals("yybgame"))
            {
                return;
            }
            SDKUtility.Instance.TencentLogin("Loginwx");
        }
System/Mail/MailAllModel.cs
@@ -403,7 +403,7 @@
                        string[] mailCont = _mailModel.Content.Split(new string[] { "{0}" }, StringSplitOptions.None);
                        if (mailCont != null && mailCont.Length > 0 && _mailParalist.Count != mailCont.Length)
                        if (mailCont != null && mailCont.Length > 0 && _mailParalist.Count != mailCont.Length - 1)
                        {
                            DebugEx.Log("参数数量不一致" + info.Text);
                        }
UI/Common/UIRoot.cs
@@ -71,8 +71,7 @@
            if (StageLoad.Instance.currentStage != null)
            {
                if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj
                 && SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Js
                if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Hy
                 && SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Quick
                 )
                {