From 9f89e3be35da42eb9ccb44e6589d62f320aa444c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 四月 2019 21:31:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Login/CreateRoleWin.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/System/Login/CreateRoleWin.cs b/System/Login/CreateRoleWin.cs
index 567bb51..f63293c 100644
--- a/System/Login/CreateRoleWin.cs
+++ b/System/Login/CreateRoleWin.cs
@@ -21,11 +21,13 @@
[SerializeField] Button m_Back;
[SerializeField] InputField m_NameInput;
+
[SerializeField] Image m_Description;
+ [SerializeField] Image m_JobName;
+ [SerializeField] Image m_JobSign;
[SerializeField] PositionTween m_LeftPostionTween;
[SerializeField] PositionTween m_RightPositionTween;
- [SerializeField] UIAlphaTween m_AlphaTween;
LoginModel model { get { return ModelCenter.Instance.GetModel<LoginModel>(); } }
@@ -81,7 +83,6 @@
base.OnActived();
m_LeftPostionTween.Play();
m_RightPositionTween.Play();
- m_AlphaTween.Play();
ChangeUserName(CreateRoleManager.Instance.selectedJob.value, true);
DisplayDynamicInfo(true);
@@ -105,7 +106,9 @@
m_JobSelect2.SetSelected(job == 2);
var config = CreateRoleConfig.Get(job);
- m_Description.SetSprite(config.desc);
+ m_Description.SetSprite(config.description);
+ m_JobName.SetSprite(config.jobName);
+ m_JobSign.SetSprite(config.jobSign);
}
}
@@ -232,8 +235,9 @@
public void SetSelected(bool selected)
{
var config = CreateRoleConfig.Get(job);
- backGround.SetSprite(selected ? config.selectIcon : config.unselectIcon);
- icon.SetSprite(selected ? "CreateRole_Job1_Select" : "CreateRole_Job1_UnSelect");
+ backGround.SetSprite(selected ? "CreateRole_ChoosenBottom_a" : "CreateRole_UnChoosenBottom_a");
+ icon.SetSprite(selected ? config.selectIcon : config.unselectIcon);
+ icon.SetNativeSize();
}
}
--
Gitblit v1.8.0