From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Store/PetAndMountPushWin.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/System/Store/PetAndMountPushWin.cs b/System/Store/PetAndMountPushWin.cs
index a836a2a..4ab0a23 100644
--- a/System/Store/PetAndMountPushWin.cs
+++ b/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;
}
}
--
Gitblit v1.8.0