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

client_Hale

2018-12-14 106a7c03b639a48ca05a3fdca90ae7687c6825d0

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

 System/Dungeon/DungeonAssistModel.cs

@@ -727,7 +727,8 @@
                string fbName = string.Empty;

                if(mapId == 31110)

                {

                    RealmConfig realmConfig = Config.Instance.Get<RealmConfig>(funcLineId);

                    int realmLv = PlayerDatas.Instance.baseData.realmLevel;

                    RealmConfig realmConfig = Config.Instance.Get<RealmConfig>(realmLv);

                    string realmName = realmConfig != null ? realmConfig.Name : string.Empty;

                    if(!string.IsNullOrEmpty(realmName))

                    {

@@ -1147,7 +1148,15 @@
                    Name = nPCConfig.charName;

                    relatedToPlayer = RelatedToPlayer.None;

                    int mapId = PlayerDatas.Instance.baseData.MapID;

                    int lineId = PlayerDatas.Instance.baseData.dungeonLineId;

                    int lineId = 0;

                    if(mapId != 31110)

                    {

                        lineId = PlayerDatas.Instance.baseData.dungeonLineId;

                    }

                    else

                    {

                        lineId = PlayerDatas.Instance.baseData.realmLevel;

                    } 
                    var battleConfig = assistModel.GetHelpBattleConfig(mapId,lineId);

                    if(battleConfig != null)

                    {


 System/OpenServerActivity/FlashRushToBuyCoolDown.cs

@@ -45,12 +45,12 @@
                case FlashRushToBuyModel.FlashRushToBuySate.NoOpen:

                    break;

                case FlashRushToBuyModel.FlashRushToBuySate.InAdvance:



                    int saleDay = operation.startDate.day + saleShop.dayIndex;

                    int offsetDay = saleDay - TimeUtility.ServerNow.Day;

                    var operationDate = operation.startDate.AddDays(saleShop.dayIndex);

                    DateTime openTime = new DateTime(operationDate.year,operationDate.month,operationDate.day);

                    int offsetDay = Mathf.CeilToInt((float)(openTime - TimeUtility.ServerNow).TotalDays);

                    if(offsetDay > 1)

                    {

                        string saleDate = StringUtility.Contact(operation.startDate.month, Language.Get("Month"),saleDay,Language.Get("Day"));

                        string saleDate = StringUtility.Contact(operationDate.month, Language.Get("Month"), operationDate.day,Language.Get("Day"));

                        timeText.text = saleDate;

                    }

                    else if(offsetDay == 1)


 System/OpenServerActivity/FlashSaleTimeCell.cs

@@ -60,15 +60,15 @@


            int seconds = 0;

            OperationTime operationTime = operation.times[timeIndex];

            var date = operation.startDate;

            int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, dayIndex, timeIndex, out seconds);

            var operationDate = operation.startDate.AddDays(dayIndex);

            switch (buyState)

            {

                case -1:

                    string timeStr = "";

                    if(seconds > 7200)

                    {

                        timeStr = operation.ToDisplayBuyTime(date.month, dayIndex + date.day, operationTime.startHour, operationTime.startMinute);

                        timeStr = operation.ToDisplayBuyTime(operationDate.month, operationDate.day, operationTime.startHour, operationTime.startMinute);

                        remainText.text = Language.Get("FlashRushToBuy106", timeStr);

                    }

                    else


 System/OpenServerActivity/OperationFlashRushToBuy.cs

@@ -55,10 +55,10 @@
        public int GetBuyTimeState(DateTime time,int dayIndex,int timeIndex,out int seconds)

        {

            seconds = 0;

            int day = startDate.day + dayIndex;

            var operationDate = startDate.AddDays(dayIndex);

            OperationTime operationTime = times[timeIndex];

            var startTime = new DateTime(startDate.year, startDate.month,day, operationTime.startHour, operationTime.startMinute,0);

            var endTime = new DateTime(startDate.year, startDate.month,day, operationTime.endHour, operationTime.endMinute, 0);

            var startTime = new DateTime(operationDate.year, operationDate.month, operationDate.day, operationTime.startHour, operationTime.startMinute,0);

            var endTime = new DateTime(operationDate.year, operationDate.month, operationDate.day, operationTime.endHour, operationTime.endMinute, 0);

            int advanceSec = Mathf.CeilToInt((float)(startTime - time).TotalSeconds);

            int endSec = Mathf.CeilToInt((float)(endTime - time).TotalSeconds);

            if (advanceSec > 0)