From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/Role/RolePanel.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/System/Role/RolePanel.cs b/System/Role/RolePanel.cs
index 3e0e50c..dd95d59 100644
--- a/System/Role/RolePanel.cs
+++ b/System/Role/RolePanel.cs
@@ -44,7 +44,6 @@
[SerializeField] RectTransform m_ContainerExp;
[SerializeField] Slider m_ExpSlider;
[SerializeField] Text m_WorldExp;
- [SerializeField] Button m_PromoteBtn;
[SerializeField] Button m_PlayerPropertyBtn;
[SerializeField] Button m_TitleBtn;
[SerializeField] Button m_RenameBtn;
@@ -127,17 +126,17 @@
{
WindowCenter.Instance.Open<RoleAttrWin>();
}
- private void OnPromoteClick()
- {
- if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.AddPoint))
- {
- WindowCenter.Instance.Open<RolePoint>();
- }
- else
- {
- FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.AddPoint);
- }
- }
+ //private void OnPromoteClick()
+ //{
+ // if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.AddPoint))
+ // {
+ // WindowCenter.Instance.Open<RolePoint>();
+ // }
+ // else
+ // {
+ // FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.AddPoint);
+ // }
+ //}
private void OnRefreshPlayerInfo(PlayerDataRefresh refreshType)
{
switch (refreshType)
@@ -269,7 +268,7 @@
functionButtonMagician.onClick.AddListener(OnFuncMagician);
functionButtonGulu.onClick.AddListener(OnFuncGulu);
functionButtonHorucx.onClick.AddListener(OnFuncHorucx);
- m_PromoteBtn.onClick.AddListener(OnPromoteClick);
+ //m_PromoteBtn.onClick.AddListener(OnPromoteClick);
m_PlayerPropertyBtn.onClick.AddListener(OnAttrExplainClick);
m_TitleBtn.onClick.AddListener(OnDesignationClick);
m_RenameBtn.onClick.AddListener(OnRenameClick);
--
Gitblit v1.8.0