From f16eabb382dd930927030f7f4e27fbfec991d8ab Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 11 八月 2018 17:11:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerMainDate.cs | 4 ++--
System/BlastFurnace/BlastFurnaceModel.cs | 4 ++--
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
index e8e840a..291f64d 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -85,6 +85,9 @@
case PlayerDataRefresh.BattleValEx1:
_player.CalculateAtkSpeed(vNetData.Value);
break;
+ case PlayerDataRefresh.OfficialRank:
+ _player.ActorInfo.realm = vNetData.Value;
+ break;
}
if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Family
diff --git a/System/BlastFurnace/BlastFurnaceModel.cs b/System/BlastFurnace/BlastFurnaceModel.cs
index 6cb2da5..f175f1c 100644
--- a/System/BlastFurnace/BlastFurnaceModel.cs
+++ b/System/BlastFurnace/BlastFurnaceModel.cs
@@ -712,7 +712,7 @@
{
if (StoveLV >= alchemyModellist[i].BlastFurnaceLV)
{
- if (IsSpecMatEnough(alchemyModellist[i]) && IsNormalMatEnough(alchemyModellist[i]) && !IsReachMaxStoveLv())
+ if (IsSpecMatEnough(alchemyModellist[i]) && IsNormalMatEnough(alchemyModellist[i]))
{
danDrugRedPointlist[i].state = RedPointState.Simple;
return;
@@ -726,7 +726,7 @@
{
if(!CheckNormalAlchemyIsReachMaxUse(alchemyModellist[i]))
{
- if (IsNormalMatEnough(alchemyModellist[i]) && !IsReachMaxStoveLv())
+ if (IsNormalMatEnough(alchemyModellist[i]))
{
danDrugRedPointlist[i].state = RedPointState.Simple;
return;
diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index 5256589..fce87a8 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -108,7 +108,7 @@
public override void Init()
{
IsTipBool = true;
- ElectricQuantity = SDKUtility.Instance.BatteryLevel;
+ ElectricQuantity = SDKUtility.Instance.BatteryLevel * 0.01f;
if (GetCurrencyItemID.Count <= 0)
{
string str = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MoneyDisplayModel").Numerical1;
@@ -246,7 +246,7 @@
private void OnBatteryChanged(int arg0)
{
- ElectricQuantity = SDKUtility.Instance.BatteryLevel;
+ ElectricQuantity = SDKUtility.Instance.BatteryLevel * 0.01f;
if (ElectricQuantityEvent != null)
{
ElectricQuantityEvent();
--
Gitblit v1.8.0