Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Store/PetAndMountPushWin.cs

@@ -11,6 +11,7 @@
        [SerializeField] RawImage rawImag;

        [SerializeField] Button closeBtn;

        [SerializeField] RichText m_Goto;

        [SerializeField] Text fightPower;



        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -65,12 +66,14 @@
                            titleText.text = Language.Get("StorePetPush");

                            PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];

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

                            UI3DModelExhibition.Instance.BeginShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);

                            fightPower.text = petInfo.ShowFightPower.ToString();

                            UI3DModelExhibition.Instance.ShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);

                            break;

                        case 41:

                            titleText.text = Language.Get("StoreMountPush");

                            HorseConfig horseConfig = tipsModel.unlockMountDict[storeConfig.ItemID];

                            UI3DModelExhibition.Instance.BeginShowHourse(horseConfig.Model,rawImag);

                            fightPower.text = horseConfig.ShowFightPower.ToString();

                            UI3DModelExhibition.Instance.ShowHourse(horseConfig.Model,rawImag);

                            break;

                    }

                }