From ba2ec30c2919befc2a9e5d1470ff6a7772026ee9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 15:26:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/EquipTip.cs | 16 ++++++++++++++++
System/Achievement/AchievementModel.cs | 6 ++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/System/Achievement/AchievementModel.cs b/System/Achievement/AchievementModel.cs
index af759a2..886a080 100644
--- a/System/Achievement/AchievementModel.cs
+++ b/System/Achievement/AchievementModel.cs
@@ -21,7 +21,6 @@
PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }
GetItemPathModel getItemPathModel { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } }
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
-
Dictionary<int, int> equipQualityItemIdTables = new Dictionary<int, int>() { { 1, 2110 }, { 2, 2111 }, { 3, 2112 }, { 4, 2113 }, { 5, 2114 } };
public override void Init()
@@ -294,6 +293,7 @@
}
else
{
+ AchievementGoto.guideAchievementId = _achievementId;
playerPack.SetLookIndex(guid39);
GotoCompleteByJump(144);
}
@@ -314,6 +314,7 @@
}
else
{
+ AchievementGoto.guideAchievementId = _achievementId;
WindowCenter.Instance.Close<TreasureLevelUpWin>();
playerPack.SetLookIndex(guid82);
@@ -329,7 +330,7 @@
if (equipQualityItemIdTables.ContainsKey(itemQuality))
{
getItemPathModel.SetChinItemModel(equipQualityItemIdTables[itemQuality]);
- }
+ }
else
{
getItemPathModel.SetChinItemModel(2108);
@@ -337,6 +338,7 @@
}
else
{
+ AchievementGoto.guideAchievementId = _achievementId;
playerPack.SetLookIndex(guid83);
WindowCenter.Instance.Close<TreasureLevelUpWin>();
WindowCenter.Instance.Close<MainInterfaceWin>();
diff --git a/System/KnapSack/Logic/EquipTip.cs b/System/KnapSack/Logic/EquipTip.cs
index a9868d4..08c6baf 100644
--- a/System/KnapSack/Logic/EquipTip.cs
+++ b/System/KnapSack/Logic/EquipTip.cs
@@ -944,6 +944,22 @@
foreach (ItemWinBtnType key in itemAttrData.tipsFuncBtnDic.Keys)
{
Button btn = OnGUIButton(btnGroup.gameObject, operateBtn, key.ToString(), Language.Get(StringUtility.Contact("ItemHandle_", key.ToString())));
+ switch (key)
+ {
+ case ItemWinBtnType.putOn:
+ SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
+ if(successConfig != null
+ && (successConfig.Type == 39
+ || successConfig.Type == 82
+ || successConfig.Type == 83))
+ {
+ AchievementGuideEffect guidEffect = AchievementGuideEffectPool.Require(1);
+ guidEffect.transform.SetParentEx(btn.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ guidEffect.effect.renderQueue = 4500;
+ }
+ break;
+ }
+
btn.RemoveAllListeners();
btn.onClick.AddListener(() => {
OnClickCloseBtn();
--
Gitblit v1.8.0