From 9809d7d0737e1eea547842c2e6b9d95e6868675a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 21 八月 2018 09:35:08 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/Strengthening/GodBeastEntry.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/System/Strengthening/GodBeastEntry.cs b/System/Strengthening/GodBeastEntry.cs
index 4119582..14956bd 100644
--- a/System/Strengthening/GodBeastEntry.cs
+++ b/System/Strengthening/GodBeastEntry.cs
@@ -16,10 +16,17 @@
[SerializeField] ItemCell m_itemCell;
[SerializeField] GameObject m_Selectedbar_Image;
[SerializeField] Text m_Item_Text;
- //[SerializeField] Button //
+ [SerializeField] Button m_GodBeastButton;
+
+ public Button GodBeastButton
+ {
+ get { return m_GodBeastButton; }
+ set { m_GodBeastButton = value; }
+ }
+
DogzModel Dogz_model;
DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
- public void GetGodBeastLocationMarker(int locationMarker)
+ public void GetGodBeastLocationMarker(int locationMarker, int currentlySelected)
{
int godBeastNumber = locationMarker / 10;
int godBeastPart = locationMarker % 10;
@@ -43,12 +50,17 @@
{
m_Item_Text.text = itemConfig.ItemName;
}
+ if (locationMarker == currentlySelected)
+ {
+ m_Selectedbar_Image.SetActive(true);
+ }
+ else
+ {
+ m_Selectedbar_Image.SetActive(false);
+ }
}
-
}
-
}
-
}
}
--
Gitblit v1.8.0