Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -37,11 +37,11 @@
                    UI3DTreasureExhibition.Instance.BeginShowTreasure(id, modelImg);

                    break;

                case ModelShowType.mount:

                    UI3DModelExhibition.Instance.BeginShowHourse(id, modelImg);

                    UI3DModelExhibition.Instance.ShowHourse(id, modelImg);

                    break;

                case ModelShowType.pet:

                    var config = Config.Instance.Get<NPCConfig>(id);

                    UI3DModelExhibition.Instance.BeginShowNPC(id, config.UIModeLOffset, config.UIModelRotation, modelImg);

                    UI3DModelExhibition.Instance.ShowNPC(id, config.UIModeLOffset, config.UIModelRotation, modelImg);

                    break;

            }