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

Client_PangDeRong

2018-08-20 f22ac489730521a8da5208222641519e06f721d8

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

 System/NewBieGuidance/NewBieCenter.cs

@@ -341,6 +341,10 @@
                case GuideTriggerType.RealmSitDown:

                    return false;

                case GuideTriggerType.ItemCompound:

                    if (DungeonSuppliesLackWin.lackType != DungeonSuppliesLackWin.LackType.FairyLand)

                    {

                        return false;

                    }

                    var itemId = composeModel.GetTicketId((int)ComposeFuncType.Ticket, config.Condition, 0);

                    var singlepack = packModel.GetSinglePackModel(PackType.rptItem);

                    var count = singlepack != null ? singlepack.GetItemCountByID(itemId) : 0;