少年修仙传客户端代码仓库
client_linchunjie
2019-01-15 8ba22521fa3deb48e9f018ff10b16b7cdcd90368
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
30 ■■■■ 已修改文件
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/PlayerDatas.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServer/CrossServerUtility.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServiceAchievementCell.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServiceItem.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -43,7 +43,7 @@
    public uint ExAttr2;    //扩展属性2,各项目专用
    public int dungeonLineId;    // 副本线路id
    public uint ExAttr4;    //扩展属性4,各项目专用
    public uint ExAttr5;    //扩展属性5,各项目专用
    public uint CrossServerFlag;    //跨服标识,大于2标识在跨服状态,值是跨服地图的datamapid
    public uint ExAttr6;    //扩展属性6,各项目专用
    public uint ExAttr7;    //扩展属性7,各项目专用
    public uint ExAttr8;    //扩展属性8,各项目专用
@@ -51,7 +51,7 @@
    public uint bubbleId;    //扩展属性10,各项目专用
    public uint ExAttr11;    //预留的扩展属性字段,用来存放项目特定的属性
    public uint ExAttr12;    //预留的扩展属性字段,用来存放项目特定的属性
    public uint ExAttr13;    //预留的扩展属性字段,用来存放项目特定的属性
    public uint ServerGroupId;    //服务器组ID
    public uint ExAttr14;    //预留的扩展属性字段,用来存放项目特定的属性
    public uint HappyPoint;//现为脱机挂剩余时间 23
    public uint faction; //阵营 107
@@ -117,7 +117,7 @@
            ExAttr2 = _serverInfo.ExAttr2;
            dungeonLineId = (int)_serverInfo.ExAttr3;
            ExAttr4 = _serverInfo.ExAttr4;
            ExAttr5 = _serverInfo.ExAttr5;
            CrossServerFlag = _serverInfo.ExAttr5;
            realmLevel = _serverInfo.OfficialRank;
            VIPLv = _serverInfo.VIPLv;
            ExAttr6 = _serverInfo.ExAttr6;
@@ -127,7 +127,7 @@
            bubbleId = _serverInfo.ExAttr10;
            ExAttr11 = _serverInfo.ExAttr11;
            ExAttr12 = _serverInfo.ExAttr12;
            ExAttr13 = _serverInfo.ExAttr13;
            ServerGroupId = _serverInfo.ExAttr13;
            ExAttr14 = _serverInfo.ExAttr14;
            HappyPoint = _serverInfo.HappyPoint;
            faction = _serverInfo.Faction;
@@ -219,7 +219,7 @@
        ExAttr2 = serverInfo.ExAttr2;
        dungeonLineId = (int)serverInfo.ExAttr3;
        ExAttr4 = serverInfo.ExAttr4;
        ExAttr5 = serverInfo.ExAttr5;
        CrossServerFlag = serverInfo.ExAttr5;
        realmLevel = serverInfo.OfficialRank;
        VIPLv = serverInfo.VIPLv;
        ExAttr6 = serverInfo.ExAttr6;
@@ -229,7 +229,7 @@
        bubbleId = serverInfo.ExAttr10;
        ExAttr11 = serverInfo.ExAttr11;
        ExAttr12 = serverInfo.ExAttr12;
        ExAttr13 = serverInfo.ExAttr13;
        ServerGroupId = serverInfo.ExAttr13;
        ExAttr14 = serverInfo.ExAttr14;
        HappyPoint = serverInfo.HappyPoint;
        faction = serverInfo.Faction;
Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -560,8 +560,8 @@
                baseData.ExAttr4 = value;
                break;
            case PlayerDataRefresh.ExAttr5:
                var oldExAttr5 = baseData.ExAttr5;
                baseData.ExAttr5 = value;
                var oldExAttr5 = baseData.CrossServerFlag;
                baseData.CrossServerFlag = value;
                if (oldExAttr5 > 2 && value <= 2)
                {
@@ -639,7 +639,7 @@
                baseData.ExAttr12 = value;
                break;
            case PlayerDataRefresh.ExAttr13:
                baseData.ExAttr13 = value;
                baseData.ServerGroupId = value;
                break;
            case PlayerDataRefresh.ExAttr14:
                baseData.ExAttr14 = value;
System/CrossServer/CrossServerUtility.cs
@@ -8,20 +8,20 @@
    public static bool IsCrossServer()
    {
        return PlayerDatas.Instance.baseData.ExAttr5 > 2;
        return PlayerDatas.Instance.baseData.CrossServerFlag > 2;
    }
    public static bool IsCrossServerOneVsOne()
    {
        var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();
        var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
        return PlayerDatas.Instance.baseData.ExAttr5 > 2
        return PlayerDatas.Instance.baseData.CrossServerFlag > 2
            && dataMapId == CrossServerOneVsOneModel.CrossServerDataMapId;
    }
    public static bool IsCrossServerBoss()
    {
        return PlayerDatas.Instance.baseData.ExAttr5 > 2
        return PlayerDatas.Instance.baseData.CrossServerFlag > 2
            && PlayerDatas.Instance.baseData.MapID == CrossServerBossModel.DATA_MAPID;
    }
}
System/OpenServerActivity/OpenServiceAchievementCell.cs
@@ -122,7 +122,7 @@
                            }
                            else
                            {
                                SysNotifyMgr.Instance.ShowTip("SevenDayOver");
                                SysNotifyMgr.Instance.ShowTip("SevenDayOver2");
                            }
                        });
                    }
@@ -176,7 +176,7 @@
                        }
                        else
                        {
                            SysNotifyMgr.Instance.ShowTip("SevenDayOver");
                            SysNotifyMgr.Instance.ShowTip("SevenDayOver2");
                        }                     
                    });
                }
System/OpenServerActivity/OpenServiceItem.cs
@@ -61,7 +61,7 @@
                        }
                        else
                        {
                            SysNotifyMgr.Instance.ShowTip("SevenDayOver");
                            SysNotifyMgr.Instance.ShowTip("SevenDayOver2");
                        }                         
                    });
                    m_IsReachImage.SetActive(false);