少年修仙传客户端代码仓库
client_Zxw
2018-09-18 eb50f45c340ba3169835fa99b1b11633c232e574
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
7个文件已修改
99 ■■■■ 已修改文件
Core/NetworkPackage/ClientPack/ClientToMapServer/C01_System/C0101_tagCPlayerLogin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/NetPkgCtl.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/SDK/SDKUtility.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestData.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/BossHomeModel.cs 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/PersonalBossModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Login/LoginModel.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ClientPack/ClientToMapServer/C01_System/C0101_tagCPlayerLogin.cs
@@ -17,6 +17,8 @@
    public byte Phone;    //是否绑定手机
    public uint ServerID;    //服务器ID
    public byte Adult;    //是否成年 0未成年 1成年
    public byte ExtraLen; // 扩展信息长度
    public string Extra; // 扩展信息
    public C0101_tagCPlayerLogin()
    {
@@ -37,6 +39,8 @@
        WriteBytes(Phone, NetDataType.BYTE);
        WriteBytes(ServerID, NetDataType.DWORD);
        WriteBytes(Adult, NetDataType.BYTE);
        WriteBytes(ExtraLen, NetDataType.BYTE);
        WriteBytes(Extra, NetDataType.Chars, ExtraLen);
    }
}
Core/NetworkPackage/NetPkgCtl.cs
@@ -81,7 +81,7 @@
        return _tempNetPkgLst;
    }
    public static void WriteAllNetLog()
    public static void WriteAllNetLog(bool @details)
    {
        if (_typeLst != null)
        {
@@ -96,8 +96,9 @@
                var package = _typeLst[i];
                var line = string.Empty;
                line = StringUtility.Contact(package.NetPkgTp == NetPkgType.Client ? "【发送】" : "【接收】", package.SendOrGetTime, ":", package.GameNetName, "\r\n");
                if (package.fieldDetails != null)
                line = StringUtility.Contact(package.NetPkgTp == NetPkgType.Client ? "【发送】\t" : "【接收】\t", package.SendOrGetTime, ":", package.GameNetName, @details ? "\r\n" : "-->" + package.fields);
                if (@details && package.fieldDetails != null)
                {
                    for (int j = 0; j < package.fieldDetails.Count; j++)
                    {
@@ -109,7 +110,7 @@
                count++;
            }
            File.WriteAllLines(Application.dataPath + "/PackageLogs" + "_" + DateTime.Now.ToString("HH_mm_ss") + ".txt", lines.ToArray());
            File.WriteAllLines(Application.dataPath + "/PackageLogs_" + (@details ? "details" : "abstract") + "_" + DateTime.Now.ToString("HH_mm_ss") + ".txt", lines.ToArray());
        }
    }
}
Core/SDK/SDKUtility.cs
@@ -18,8 +18,9 @@
    public enum E_ChannelPlatform
    {
        Free,
        Mr,
        Free = 1,// 自由
        Mr = 2,// 猫耳
        Sp = 3,// 思璞
    }
    public E_ChannelPlatform ChannelPlatform { get; private set; }
@@ -315,6 +316,10 @@
                        {
                            ChannelPlatform = E_ChannelPlatform.Mr;
                        }
                        else if (_channelPlatform.Equals("sp"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Sp;
                        }
                    }
                }
                break;
@@ -498,6 +503,7 @@
        public const int PayFinished = 105;
        public const int CreateRole = 106;
        public const int RoleLogin = 107;
        public const int RoleLevelUp = 108;
        /**
         * 极光推送
         * */
@@ -546,6 +552,8 @@
        public string tokenExpire;
        public int phone;
        public int accountID;
        public string timeStamp;
        public string sessionID;
    }
    public struct FP_CheckIDAuthentication
@@ -689,13 +697,27 @@
                        m_Json["cpInfo"] = cpInfo;
                        m_Json["title"] = title;
                        if (ChannelPlatform == E_ChannelPlatform.Mr)
                        if(ChannelPlatform == E_ChannelPlatform.Mr
                        || ChannelPlatform == E_ChannelPlatform.Sp)
                        {
                            m_Json["notifyurl"] = _json["notifyurl"];
                            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"] = "s" + 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 UNITY_IOS
                        m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
@@ -787,7 +809,6 @@
        if (_iDict.Contains("token"))
        {
            FreePlatformInfo.token = json["token"].ToString();
            Debug.Log("token: " + FreePlatformInfo.token);
        }
        if (_iDict.Contains("token_expire"))
        {
@@ -800,12 +821,21 @@
        if (_iDict.Contains("account"))
        {
            FreePlatformInfo.account = json["account"].ToString();
            Debug.Log("account: " + FreePlatformInfo.account);
        }
        if (_iDict.Contains("account_id"))
        {
            int.TryParse(json["account_id"].ToString(), out FreePlatformInfo.accountID);
            Debug.Log("account_id: " + FreePlatformInfo.accountID);
        }
        if (_iDict.Contains("session_id"))
        {
            FreePlatformInfo.sessionID = (string)json["session_id"];
        }
        if (_iDict.Contains("timeStamp"))
        {
            FreePlatformInfo.timeStamp = (string)json["timeStamp"];
        }
        FreePlatformInfo.phone = 0;
@@ -848,9 +878,17 @@
    {
        m_Json.Clear();
        m_Json["code"] = CodeU2A.CreateRole;
        m_Json["roleID"] = roleID;
        m_Json["roleName"] = roleName;
        m_Json["sid"] = "s" + ServerListCenter.Instance.currentServer.region_flag;
        m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
        m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
        m_Json["level"] = "1";
        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();
        SendMessageToSDK(m_Json);
    }
System/DailyQuest/DailyQuestData.cs
@@ -330,7 +330,7 @@
        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
        List<HourMinute> hourMinutes = null;
        var dayDelta = (week == 0 ? 7 : week) - openDayWeek;
        var dayDelta = (week == 0 ? 7 : week) - (openDayWeek == 0 ? 7 : openDayWeek);
        if (TimeUtility.OpenWeekCnt < 1 && dayDelta < 0)
        {
            openTimes.TryGetValue(week, out hourMinutes);
@@ -358,7 +358,7 @@
    {
        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
        var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
        var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek));
        var dayDelta = (week == 0 ? 7 : week) - (openDayWeek == 0 ? 7 : openDayWeek);
        if (TimeUtility.OpenWeekCnt < 1 && dayDelta < 0)
        {
System/FindPrecious/BossHomeModel.cs
@@ -50,11 +50,7 @@
            get { return m_WearyValue; }
            set {
                m_WearyValue = value;
                var count = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit) - m_WearyValue;
                bossHomeRedpoint.count = count;
                bossHomeRedpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
                UpdateRedpoint();
                if (bossWearyValueChangeEvent != null)
                {
                    bossWearyValueChangeEvent();
@@ -75,10 +71,12 @@
        public override void Init()
        {
            ParseConfig();
            PlayerDatas.Instance.PlayerDataRefreshEvent += OnPlayerDataChange;
        }
        public override void UnInit()
        {
            PlayerDatas.Instance.PlayerDataRefreshEvent -= OnPlayerDataChange;
        }
        public bool TryGetBossHomeData(int _layer, out BossHomeData _data)
@@ -148,6 +146,21 @@
            }
        }
        private void OnPlayerDataChange(PlayerDataRefresh _type, int _value)
        {
            if (_type == PlayerDataRefresh.VIPLv)
            {
                UpdateRedpoint();
            }
        }
        private void UpdateRedpoint()
        {
            var count = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit) - m_WearyValue;
            bossHomeRedpoint.count = count;
            bossHomeRedpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
        }
        private void ParseConfig()
        {
            var bossHomeConfigs = Config.Instance.GetAllValues<BossHomeConfig>();
System/FindPrecious/PersonalBossModel.cs
@@ -133,6 +133,7 @@
            if (enterTimes >= totalTimes)
            {
                personalRedpoint.count = 0;
                personalRedpoint.state = RedPointState.None;
                return;
            }
System/Login/LoginModel.cs
@@ -271,6 +271,8 @@
                    send.Phone = 0;
                    send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag;
                    send.Adult = 1;
                    send.ExtraLen = 0;
                    send.Extra = "";
                    break;
                case VersionAuthority.Release:
                    if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Free)
@@ -281,6 +283,10 @@
                    {
                        send.IDType = 2;
                    }
                    else if (SDKUtility.Instance.ChannelPlatform == SDKUtility.E_ChannelPlatform.Sp)
                    {
                        send.IDType = 3;
                    }
                    send.AccID = sdkLoginResult.account;
                    send.Password = sdkLoginResult.token;
                    send.MAC = DeviceUtility.GetMac();