Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-01-22 670dbdbac95aa8eb17fa9c5ee03bb273d42048db

 System/JadeDynastyTower/JadeDynastyTowerModel.cs

@@ -62,6 +62,8 @@
                        break;
                    case 2:
                        break;
                    case 3:
                        break;
                    default:
                        break;
                }
@@ -75,16 +77,22 @@

        private int GetErrorOfChallenge()
        {
            //if (!FuncOpen.Instance.IsFuncOpen(FUNCTIONID))
            //  {
            //  return 1;
            //}
            if (!FuncOpen.Instance.IsFuncOpen(FUNCTIONID))
            {
                return 1;
            }

            var coolDown = dungeonModel.GetEnterCoolDown(JadeDynastyTowerModel.DATA_MAPID);
            if (coolDown != null && coolDown.suplursSeconds > 0)
            {
                return 2;
            }

            var enterTimes = dungeonModel.GetEnterTimes(DATA_MAPID);
            var totalTimes = dungeonModel.GetTotalTimes(DATA_MAPID);
            if (enterTimes >= totalTimes)
            {
                return 2;
                return 3;
            }

            return 0;
@@ -125,7 +133,7 @@
            }
            else if (currentIndex >= sortedFloors.Count - 2)
            {
                for (var i = sortedFloors.Count - 4; i <= sortedFloors.Count - 1; i++)
                for (var i = sortedFloors.Count - 3; i <= sortedFloors.Count - 1; i++)
                {
                    floors.Add(sortedFloors[i]);
                }