From af39d70914dff3d2fec1bf204227caeeddc5920b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 06 五月 2019 17:10:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/BagStoreWin.cs | 5 --
System/GatheringSoul/GatherSoulTipWin.cs | 53 +++++++++++++-------------
System/TreasureFindHost/TreasureFindHostWin.cs | 3 +
System/Equip/RealmEquipWin.cs | 19 ++++++++-
4 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/System/Equip/RealmEquipWin.cs b/System/Equip/RealmEquipWin.cs
index 5de15c5..861c0a9 100644
--- a/System/Equip/RealmEquipWin.cs
+++ b/System/Equip/RealmEquipWin.cs
@@ -14,8 +14,7 @@
public class RealmEquipWin : Window
{
- [SerializeField] Button m_Close;
- [SerializeField] RectTransform m_LevelsContainer;
+ [SerializeField] RectTransform m_Content;
[SerializeField] EquipSlots m_EquipSlots;
[SerializeField] Text m_FightPoint;
[SerializeField] RawImage m_Role;
@@ -26,6 +25,9 @@
[SerializeField] CandidateEquipWidget m_CandidateEquipWidget;
[SerializeField] EquipGetWayWidget m_GetWayWidget;
+ Button m_Close;
+ RectTransform m_LevelsContainer;
+
List<EquipLevelSelectBehaviour> levelSelectBehaviours = new List<EquipLevelSelectBehaviour>();
EquipModel model { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
@@ -33,6 +35,17 @@
#region Built-in
protected override void BindController()
{
+ var oneLevelFrame = UIUtility.CreateWidget("OneLevelWin_Pattern_1", "Pivot");
+ oneLevelFrame.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+
+ var subWindowContainer = oneLevelFrame.GetComponent<RectTransform>("Container_SubWindow");
+ m_Content.SetParentEx(subWindowContainer, Vector3.zero, Quaternion.identity, Vector3.one);
+
+ var titleIcon = oneLevelFrame.GetComponent<Image>("Container_BackGround/Img_Title");
+ titleIcon.SetSprite("OneLevelTitle_30");
+
+ m_LevelsContainer = oneLevelFrame.GetComponent<RectTransform>("Container_Functions/Content");
+ m_Close = oneLevelFrame.GetComponent<Button>("Container_Buttons/Btn_Close");
}
protected override void AddListeners()
@@ -93,7 +106,7 @@
DisplayEquips(level);
var eightSuitLevel = model.GetSuitLevel(level, EquipSuitType.EightSuit);
- m_SuitPropertyWidget.Init(level , eightSuitLevel);
+ m_SuitPropertyWidget.Init(level, eightSuitLevel);
}
if (force || model.appearance.dirty)
diff --git a/System/GatheringSoul/GatherSoulTipWin.cs b/System/GatheringSoul/GatherSoulTipWin.cs
index a2fcb2c..c318ad9 100644
--- a/System/GatheringSoul/GatherSoulTipWin.cs
+++ b/System/GatheringSoul/GatherSoulTipWin.cs
@@ -126,40 +126,39 @@
void DisplayFuncs()
{
- var list = tipData.operates;
+ var operates = tipData.operates;
var index = 0;
- foreach (var type in list)
+ if (operates != null)
{
- var callBackType = type;
- if (index < m_Funcs.Length)
+ foreach (var type in operates)
{
- m_Funcs[index].gameObject.SetActive(true);
- m_Funcs[index].RemoveAllListeners();
- m_Funcs[index].AddListener(() =>
+ var callBackType = type;
+ if (index < m_Funcs.Length)
{
- ItemTipUtility.GatherSoulOperate(callBackType);
- //if (list[callBackType] != null)
- //{
- // list[callBackType](callBackType, string.Empty);
- //}
- });
- m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));
- m_Redpoints[index].gameObject.SetActive(false);
+ m_Funcs[index].gameObject.SetActive(true);
+ m_Funcs[index].RemoveAllListeners();
+ m_Funcs[index].AddListener(() =>
+ {
+ ItemTipUtility.GatherSoulOperate(callBackType);
+ });
+ m_FuncBtnDisplays[index].text = Language.Get(StringUtility.Contact("ItemHandle_", callBackType));
+ m_Redpoints[index].gameObject.SetActive(false);
- if (callBackType == ItemOperateType.LevelUp)
- {
- m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple
- && tipData.gatherSoul.packType == PackType.InterimPack
- && model.levelUpRedpointHole == tipData.gatherSoul.index);
+ if (callBackType == ItemOperateType.LevelUp)
+ {
+ m_Redpoints[index].gameObject.SetActive(model.levelUpRedpoint.state == RedPointState.Simple
+ && tipData.gatherSoul.packType == PackType.InterimPack
+ && model.levelUpRedpointHole == tipData.gatherSoul.index);
+ }
+ else if (callBackType == ItemOperateType.Replace)
+ {
+ m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple
+ && tipData.gatherSoul.packType == PackType.GatherSoul
+ && tipData.gatherSoul.index == model.replaceRedpointIndex);
+ }
}
- else if (callBackType == ItemOperateType.Replace)
- {
- m_Redpoints[index].gameObject.SetActive(model.replaceRedpoint.state == RedPointState.Simple
- && tipData.gatherSoul.packType == PackType.GatherSoul
- && tipData.gatherSoul.index == model.replaceRedpointIndex);
- }
+ index++;
}
- index++;
}
for (int i = index; i < m_Funcs.Length; i++)
{
diff --git a/System/Store/BagStoreWin.cs b/System/Store/BagStoreWin.cs
index 7d7e89b..03fa177 100644
--- a/System/Store/BagStoreWin.cs
+++ b/System/Store/BagStoreWin.cs
@@ -23,8 +23,6 @@
[SerializeField]
private Text _goldText;
[SerializeField]
- private Text _goldPaperText;
- [SerializeField]
private Text _sliverText;
#endregion
@@ -242,11 +240,10 @@
else
{
_goldText.text = "0";
- _goldPaperText.text = "0";
_sliverText.text = "0";
}
-
}
+
}
}
diff --git a/System/TreasureFindHost/TreasureFindHostWin.cs b/System/TreasureFindHost/TreasureFindHostWin.cs
index 593ed36..d3203e7 100644
--- a/System/TreasureFindHost/TreasureFindHostWin.cs
+++ b/System/TreasureFindHost/TreasureFindHostWin.cs
@@ -51,6 +51,9 @@
var subWindowContainer = oneLevelFrame.transform.Find("Container_SubWindow");
m_Content.SetParentEx(subWindowContainer, Vector3.zero, Quaternion.identity, Vector3.one);
+ var titleIcon = oneLevelFrame.GetComponent<Image>("Container_BackGround/Img_Title");
+ titleIcon.SetSprite("OneLevelTitle_22");
+
funcBtnGroup = this.transform.GetComponent<FunctionButtonGroup>("Pivot/Container_Functions");
var functionContainer = funcBtnGroup.transform.Find("Content");
for (int i = 0; i < 4; i++)
--
Gitblit v1.8.0