From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Treasure/TreasureModel.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index d5c6344..4447e50 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -382,34 +382,34 @@
public bool GetTreasureFinishAnim(int _treasureId)
{
- //if (_treasureId == 101)
- //{
+ if (_treasureId == 101)
+ {
return false;
- //}
- //var list = GetTreasureCategory(TreasureCategory.Human);
- //var index = list.IndexOf(_treasureId);
- //if (index == -1)
- //{
- // return false;
- //}
- //uint value = 0;
- //uint.TryParse(QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, 0), out value);
- //return MathUtility.GetBitValue(value, (ushort)index);
+ }
+ var list = GetTreasureCategory(TreasureCategory.Human);
+ var index = list.IndexOf(_treasureId);
+ if (index == -1)
+ {
+ return false;
+ }
+ uint value = 0;
+ uint.TryParse(QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, 0), out value);
+ return MathUtility.GetBitValue(value, (ushort)index);
}
public void SetTreasureFinishAnim(int _treasureId, bool anim = true)
{
- //var list = GetTreasureCategory(TreasureCategory.Human);
- //var index = list.IndexOf(_treasureId);
- //if (index == -1)
- //{
- // return;
- //}
- //uint value = 0;
- //uint.TryParse(QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, 0), out value);
- //int bitValue = MathUtility.SetBitValue((int)value, (ushort)index, anim);
- //QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, bitValue);
- //QuickSetting.Instance.SendPackage();
+ var list = GetTreasureCategory(TreasureCategory.Human);
+ var index = list.IndexOf(_treasureId);
+ if (index == -1)
+ {
+ return;
+ }
+ uint value = 0;
+ uint.TryParse(QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, 0), out value);
+ int bitValue = MathUtility.SetBitValue((int)value, (ushort)index, anim);
+ QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.TreasureHighestAnim, bitValue);
+ QuickSetting.Instance.SendPackage();
}
public bool TryGetUnlockShowTreasure(out int _id)
--
Gitblit v1.8.0