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

client_linchunjie

2019-01-23 1b67f8f193fe2ff4a000f87302454fbff2b0e01c

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

 System/JadeDynastyTower/JadeDynastyTowerRewardBehaviour.cs

@@ -46,7 +46,7 @@
                if (i < config.rewardIdsLevelA.Length)
                {
                    var id = config.rewardIdsLevelA[i];
                    var count = config.rewardIdsLevelS[i];
                    var count = config.rewardCountsLevelA[i];
                    behaviour.gameObject.SetActive(true);
                    behaviour.SetItem(id, count);
                }

 System/JadeDynastyTower/JadyDynastyTowerVictoryWin.cs

@@ -106,7 +106,7 @@
        {
            model.RequestAward();

            if (model.IsTopFloor(model.currentFloor))
            if (model.IsTopFloor(model.highestPassFloor))
            {
                dungeonModel.ExitCurrentDungeon();
            }

 Utility/StageLoadTimeOutCatcher.cs

@@ -46,13 +46,12 @@
        {
            var title = StringUtility.Contact(stageId, "地图加载超时");
            var description = StringUtility.Contact(
                                        "开始时间:", startTime.ToString("HH:mm:ss"), ";",
                                        "超时时间:", DateTime.Now.ToString("HH:mm:ss"),
                                        "0102记录:", got0102Time.ToString(), ";",
                                        "A126记录:", gotA126Time.ToString(), ";",
                                        "A127记录:", gotA127Time.ToString(), ";",
                                        "0109记录:", got0109Time.ToString(), ";",
                                        "0107记录:", send0107Time.ToString());
                                        "开始时间:", startTime.ToString("HH:mm:ss"), "$$",
                                        got0102Time.ToString(), "$$",
                                        gotA126Time.ToString(), "$$",
                                        gotA127Time.ToString(), "$$",
                                        got0109Time.ToString(), "$$",
                                        send0107Time.ToString());

            ExceptionCatcher.ReportException(title, description);
            Stop();