少年修仙传客户端代码仓库
client_linchunjie
2018-09-12 382c8a8c0c3547b66af92d91aa4c6ce744134d05
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
48 ■■■■■ 已修改文件
Fight/MapTransferUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/AssetVersion/AssetVersionUtility.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Team/TeamData.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Team/TeamModel.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/MapTransferUtility.cs
@@ -747,7 +747,7 @@
    public static bool Send_WorldTransfer(int mapId, Vector3 position, MapTransferType type, byte lineID = 255, int _npcId = 0)
    {
        if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)
        if (!AssetSource.sceneFromEditor && !AssetVersionUtility.IsUnpriorAssetDownLoadOk())
        {
            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0);
            var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));
System/AssetVersion/AssetVersionUtility.cs
@@ -185,4 +185,15 @@
        return path;
    }
    public static bool IsUnpriorAssetDownLoadOk()
    {
        if (VersionConfig.Get().assetAccess == InstalledAsset.IngoreDownLoad)
        {
            return true;
        }
        return unPriorAssetDownLoadDone;
    }
}
System/Dungeon/DungeonModel.cs
@@ -1165,7 +1165,7 @@
        public void RequestChallangeDungeon(int _dataMapId, int _lineId)
        {
            if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)
            if (!AssetSource.sceneFromEditor && !AssetVersionUtility.IsUnpriorAssetDownLoadOk())
            {
                var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(_dataMapId, _lineId);
                var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));
System/Team/TeamData.cs
@@ -49,6 +49,11 @@
            this.levelMax = _serverInfo.ReqMaxLV;
        }
        public static int Sort(TheirTeam lhs, TheirTeam rhs)
        {
            return lhs.memberCount < 4 && lhs.memberCount > rhs.memberCount ? -1 : 1;
        }
    }
    public class MyTeam
@@ -108,7 +113,7 @@
                for (int i = 0; i < members.Count; i++)
                {
                    var member = members[i];
                    if (member.id != PlayerDatas.Instance.baseData.PlayerID
                    if (member.id != PlayerDatas.Instance.baseData.PlayerID
                        && member.mapId == PlayerDatas.Instance.baseData.MapID)
                    {
                        count++;
System/Team/TeamModel.cs
@@ -693,19 +693,12 @@
        public void OnGetTheirTeams(HB904_tagGCSceneTeamRefresh _teamInfo)
        {
            theirTeams.Clear();
            for (int i = 0; i < _teamInfo.SceneTeamList.Length; i++)
            {
                theirTeams.Add(new TheirTeam(_teamInfo.SceneTeamList[i]));
            }
            theirTeams.Sort(
                (TheirTeam a, TheirTeam b) =>
                {
                    return a.memberCount < 4 && a.memberCount > b.memberCount ? -1 : 1;
                }
                );
            theirTeams.Sort(TheirTeam.Sort);
            if (theirTeamListRefreshEvent != null)
            {
                theirTeamListRefreshEvent();
@@ -715,19 +708,16 @@
        public void OnGetTheirTeams(HB909_tagGCTagMapTeamList _teamInfo)
        {
            theirTeams.Clear();
            for (int i = 0; i < _teamInfo.TeamList.Length; i++)
            {
                theirTeams.Add(new TheirTeam((int)_teamInfo.TagMapID, _teamInfo.IsTagEx == 1 ? _teamInfo.TagMapEx : -1, _teamInfo.MatchState == 1, _teamInfo.TeamList[i]));
                var mapId = (int)_teamInfo.TagMapID;
                var isTagEx = _teamInfo.IsTagEx == 1 ? _teamInfo.TagMapEx : -1;
                var matchState = _teamInfo.MatchState == 1;
                theirTeams.Add(new TheirTeam(mapId, isTagEx, matchState, _teamInfo.TeamList[i]));
            }
            theirTeams.Sort(
                (TheirTeam a, TheirTeam b) =>
                {
                    return a.memberCount < 4 && a.memberCount > b.memberCount ? -1 : 1;
                }
                );
            theirTeams.Sort(TheirTeam.Sort);
            if (theirTeamListRefreshEvent != null)
            {
                theirTeamListRefreshEvent();
@@ -997,7 +987,7 @@
        public void OnUpdateDungeonPrepareState(HB911_tagGCTeamEnterFBPrepare _serverInfo)
        {
            if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)
            if (!AssetSource.sceneFromEditor && !AssetVersionUtility.IsUnpriorAssetDownLoadOk())
            {
                RequestPrepareEnterDungeon(false);
                return;