hch
7 天以前 837a005fde997dd926720c65777baa72d6eadf95
0312 高热的需要取数据库账号

# Conflicts:
# Main/System/Login/LoginManager.cs
# Main/System/Login/LoginWin.cs
3个文件已修改
43 ■■■■■ 已修改文件
Main/SDK/SDKUtils.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Login/ServerData.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Login/ServerListCenter.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/SDK/SDKUtils.cs
@@ -882,6 +882,7 @@
        public string yjAppId;
        public string yjSdkId;
        public string qkUserName; // 目前当做原始UID使用,因为游戏中会统一小写
        public string channelId;
    }
    public struct FP_CheckIDAuthentication
@@ -1107,6 +1108,11 @@
        {
            FreePlatformInfo.qkUserName = json["userName"].ToString();
        }
        if (_iDict.Contains("channelID"))
        {
            FreePlatformInfo.channelId = json["channelID"].ToString();
        }
        FreePlatformInfo.phone = 0;
    }
Main/System/Login/ServerData.cs
@@ -91,6 +91,7 @@
    public string roleid;
    public int level;
    public DateTime last_login_time;
    public string account;
    // public ServerData(LoginSeverListConfig config)
    // {
Main/System/Login/ServerListCenter.cs
@@ -490,7 +490,8 @@
                        job = originalData.job,
                        roleid = originalData.roleid,
                        level = originalData.level,
                        last_login_time = originalData.last_login_time
                        last_login_time = originalData.last_login_time,
                        account = originalData.account,
                    };
                }
            }
@@ -559,6 +560,39 @@
                }
            }
            //高热的 需要获取最近登录服里的数据库记录账号进行替换
            if (VersionConfig.Get().appId == "ryzj")
            {
                if (serverInfoPlayer != null && serverInfoPlayer.player != null && serverInfoPlayer.player.group_list != null && serverInfoPlayer.player.group_list.Length > 0)
                {
                    var serverDatas = serverInfoPlayer.player.group_list;
                    for (int j = 0; j < serverDatas.Length; j++)
                    {
                        if (localSaveServerId == serverDatas[j].region_flag)
                        {
                            findTarget = true;
                            currentServer = serverDatas[j];
                            if (string.IsNullOrEmpty(currentServerGroup))
                            {
                                currentServerGroup = serverInfoPlayer.player.group_title;
                            }
                            else
                            {
                                serverGroupSelectEvent?.Invoke();
                            }
                            break;
                        }
                    }
                    if (!findTarget)
                    {
                        currentServer = serverInfoPlayer.player.group_list[0];
                        currentServerGroup = serverInfoPlayer.player.group_title;
                        findTarget = true;
                    }
                }
            }
            //最近服在中心,存在删号未清楚的情况,暂且不优先找最近服
            if (!findTarget)
            {
                if (serverInfoPlayer != null && serverInfoPlayer.player != null && serverInfoPlayer.player.group_list != null && serverInfoPlayer.player.group_list.Length > 0)