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

client_linchunjie

2019-03-14 eedeb8a020fce13e0e63ad7c57adfdff7578e875

 System/Compose/New/ComposeWinModel.cs

@@ -897,7 +897,7 @@
        bool isRefineMat = false;

        foreach (var model in unfixedDic.Values)

        {

            if (model.GetUseDataModel((int)ItemUseDataKey.wingMaterialItemID) != null)

            if (model.GetUseData((int)ItemUseDataKey.wingMaterialItemID) != null)

            {

                isRefineMat = true;

                break;