From 0501f99c58363fa437eeba57789d9dff574bde31 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 19 九月 2018 14:46:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWin.cs | 29 +++++++++++++++++++++++++++++
System/KnapSack/Logic/ItemModel.cs | 9 ++++-----
Utility/EnumHelper.cs | 2 +-
System/Team/TeamInviteEntrancePanel.cs | 6 +++---
4 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/System/Compose/New/ComposeWin.cs b/System/Compose/New/ComposeWin.cs
index 16496fc..460aa62 100644
--- a/System/Compose/New/ComposeWin.cs
+++ b/System/Compose/New/ComposeWin.cs
@@ -67,6 +67,35 @@
protected override void OnPreOpen()
{
ComposeModel.ResetModel();
+ if(WindowJumpMgr.Instance.IsJumpState)
+ {
+ if(ComposeModel.CurComposeModel != null)
+ {
+ ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType,
+ ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType);
+ switch ((ComposeFuncType)ComposeModel.CurComposeModel.firstType)
+ {
+ case ComposeFuncType.Wings:
+ functionOrder = _wingsUITitleType.order;
+ break;
+ case ComposeFuncType.Ticket:
+ functionOrder = _ticketUITitleType.order;
+ break;
+ case ComposeFuncType.Fairy:
+ functionOrder = _godequipUITitleType.order;
+ break;
+ case ComposeFuncType.Equip:
+ functionOrder = _equipUITitleType.order;
+ break;
+ case ComposeFuncType.Item:
+ functionOrder = _itemUITitleType.order;
+ break;
+ case ComposeFuncType.MountDogz:
+ functionOrder = _dogzEquipFunc.order;
+ break;
+ }
+ }
+ }
}
protected override void OnActived()
diff --git a/System/KnapSack/Logic/ItemModel.cs b/System/KnapSack/Logic/ItemModel.cs
index dcd431b..fb0bc94 100644
--- a/System/KnapSack/Logic/ItemModel.cs
+++ b/System/KnapSack/Logic/ItemModel.cs
@@ -56,15 +56,14 @@
useDataDict = ConfigParse.Analysis(info.UserData);
this.equipScore = modelInterface.SetEquipScore(packType,itemInfo.ItemID,useDataDict);
- DebugEx.Log("Pack:" + packType + "ID锛�" + info.ItemID + "GUID:" + info.ItemGUID);
+ if(GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount) != null)
+ {
+ itemInfo.ItemCount = GetUseDataModel((int)ItemUseDataKey.Def_IudetItemCount)[0];
+ }
List<int> itemEffectTime = GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
if(itemEffectTime != null && itemEffectTime[0] != 0 && chinItemModel.ExpireTime > 0)
{
DebugEx.Log("鍒涘缓鏃堕棿锛�" + itemEffectTime[0]);
- //System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
- //DateTime dt = startTime.AddSeconds(itemEffectTime[0]);
- //DesignDebug.Log("鍒涘缓DataTime:" + dt);
-
switch ((EquipReduceType)chinItemModel.EndureReduceType)
{
case EquipReduceType.Def_EquipReduceType_None:
diff --git a/System/Team/TeamInviteEntrancePanel.cs b/System/Team/TeamInviteEntrancePanel.cs
index ded6a91..6cef6ca 100644
--- a/System/Team/TeamInviteEntrancePanel.cs
+++ b/System/Team/TeamInviteEntrancePanel.cs
@@ -23,20 +23,20 @@
private void OpenFriend()
{
- WindowCenter.Instance.Open<TeamInviteWin>();
model.InvitePlayers(TeamInviteType.Friend);
+ WindowCenter.Instance.Open<TeamInviteWin>();
}
private void OpenFairy()
{
- WindowCenter.Instance.Open<TeamInviteWin>();
model.InvitePlayers(TeamInviteType.Fairy);
+ WindowCenter.Instance.Open<TeamInviteWin>();
}
private void OpenNearby()
{
- WindowCenter.Instance.Open<TeamInviteWin>();
model.InvitePlayers(TeamInviteType.NearBy);
+ WindowCenter.Instance.Open<TeamInviteWin>();
}
private void Awake()
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 27c0625..8d5609d 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1452,10 +1452,10 @@
{
Def_IudetMapLoaction = 15, // 鐗╁搧璁板綍鍦板浘鍧愭爣[mapid, posx, posy]
Def_IudetLegendAttrID = 17, //鐗╁搧浼犲灞炴�D鍒楄〃
+ Def_IudetItemCount = 18, // 鐗╁搧涓暟锛屾敮鎸�20浜匡紝鐩墠浠呯壒娈婅浆鍖栫墿鍝佷細鐢ㄥ埌
Def_IudetLegendAttrValue = 19, //鐗╁搧浼犲灞炴�у�煎垪琛�
Def_IudetOutOfPrintAttrID = 21, //鐗╁搧缁濈増灞炴�D鍒楄〃
Def_IudetOutOfPrintAttrValue = 23, //鐗╁搧缁濈増灞炴�у�煎垪琛�
-
Def_IudetItemColor = 16, //鐗╁搧棰滆壊锛屽鏋滆鍊兼病鏈夊氨鍙栫墿鍝�
Def_IudetCancelUseLimit = 20, //鐗╁搧鍙栨秷浣跨敤闄愬埗
--
Gitblit v1.8.0