From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWinModel.cs | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/System/Compose/New/ComposeWinModel.cs b/System/Compose/New/ComposeWinModel.cs
index 42607a1..f100981 100644
--- a/System/Compose/New/ComposeWinModel.cs
+++ b/System/Compose/New/ComposeWinModel.cs
@@ -814,44 +814,49 @@
int[] composeCondi = itemConfig.JumpComposeCondi;
if (composeCondi.Length < 3) return false;
- ItemCompoundConfig itemCompound = GetThirdTypeModellist(composeCondi[0],composeCondi[1],composeCondi[2])[0];
- if(itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV)
+ ItemCompoundConfig itemCompound = ItemCompoundConfig.GetItemCompoundByType(composeCondi[0], composeCondi[1], composeCondi[2]);
+ if(itemCompound != null)
{
- switch (itemCompound.firstType)
+ if (itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV)
{
- case 1:
- jumpId = (int)JumpUIType.ComposeFunc1;
- break;
- case 2:
- jumpId = (int)JumpUIType.ComposeFunc2;
- break;
- case 3:
- jumpId = (int)JumpUIType.ComposeFunc3;
- break;
- case 4:
- jumpId = (int)JumpUIType.ComposeFunc4;
- break;
- case 5:
- jumpId = (int)JumpUIType.ComposeFunc5;
- break;
- }
- this.secondType = itemCompound.secondType;
+ switch (itemCompound.firstType)
+ {
+ case 1:
+ jumpId = (int)JumpUIType.ComposeFunc1;
+ break;
+ case 2:
+ jumpId = (int)JumpUIType.ComposeFunc2;
+ break;
+ case 3:
+ jumpId = (int)JumpUIType.ComposeFunc3;
+ break;
+ case 4:
+ jumpId = (int)JumpUIType.ComposeFunc4;
+ break;
+ case 5:
+ jumpId = (int)JumpUIType.ComposeFunc5;
+ break;
+ }
+ this.secondType = itemCompound.secondType;
- if(itemCompound.firstType == 5 && itemCompound.secondType == 3)
- {
- this.thirdType = PlayerDatas.Instance.baseData.Job;
+ if (itemCompound.firstType == 5 && itemCompound.secondType == 3)
+ {
+ this.thirdType = PlayerDatas.Instance.baseData.Job;
+ }
+ else
+ {
+ this.thirdType = itemCompound.thirdType;
+ }
+ return true;
}
else
{
- this.thirdType = itemCompound.thirdType;
+ SysNotifyMgr.Instance.ShowTip("TicketComposeUnlock", itemCompound.levelNeed, itemCompound.secondTypeName);
+ return false;
}
- return true;
}
- else
- {
- SysNotifyMgr.Instance.ShowTip("TicketComposeUnlock", itemCompound.levelNeed, itemCompound.secondTypeName);
- return false;
- }
+
+ return false;
}
public bool CheckIsComposeByType(int firstType,int secondType,int thirdType)
--
Gitblit v1.8.0