From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Store/PetAndMountPushWin.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/System/Store/PetAndMountPushWin.cs b/System/Store/PetAndMountPushWin.cs
index 4347bef..1b19bb5 100644
--- a/System/Store/PetAndMountPushWin.cs
+++ b/System/Store/PetAndMountPushWin.cs
@@ -12,6 +12,8 @@
[SerializeField] Button closeBtn;
[SerializeField] RichText m_Goto;
[SerializeField] Text fightPower;
+ [SerializeField] Text qualityText;
+ [SerializeField] Image desImg;
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
@@ -60,19 +62,25 @@
rawImag.gameObject.SetActive(true);
if(itemConfig != null)
{
+ titleText.text = itemConfig.ItemName;
+ titleText.color = UIHelper.GetUIColor(itemConfig.ItemColor,true);
switch (itemConfig.Type)
{
case 26:
- titleText.text = Language.Get("StorePetPush");
PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];
var config = Config.Instance.Get<NPCConfig>(petInfo.ID);
fightPower.text = petInfo.ShowFightPower.ToString();
+ qualityText.text = tipsModel.GetQualityName(petInfo.Quality);
+ desImg.SetSprite(petInfo.DescribeIconKey);
+ desImg.SetNativeSize();
UI3DModelExhibition.Instance.ShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);
break;
case 41:
- titleText.text = Language.Get("StoreMountPush");
HorseConfig horseConfig = tipsModel.unlockMountDict[storeConfig.ItemID];
fightPower.text = horseConfig.ShowFightPower.ToString();
+ qualityText.text = tipsModel.GetQualityName(horseConfig.Quality);
+ desImg.SetSprite(horseConfig.DescribeIconKey);
+ desImg.SetNativeSize();
UI3DModelExhibition.Instance.ShowHourse(horseConfig.Model,rawImag);
break;
}
--
Gitblit v1.8.0