From ace39a965071d6d8c73387f5484c7743eba8dc4e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 29 六月 2019 16:36:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Login/LoginModel.cs | 2 +-
Fight/Actor/Skill/AttackHandler.cs | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Fight/Actor/Skill/AttackHandler.cs b/Fight/Actor/Skill/AttackHandler.cs
index 3cd007b..15c7a57 100644
--- a/Fight/Actor/Skill/AttackHandler.cs
+++ b/Fight/Actor/Skill/AttackHandler.cs
@@ -625,7 +625,7 @@
#endregion
- _isMiss = IsMiss(_hitRate, _missRate);
+ _isMiss = IsMiss(_hitRate, _missRate, 10000, 0);
_isCrit = IsCrit(_aSuperHitRate);
_isLucky = IsLucky(_aLuckyHitRate);
_isZhuxianHit = false;//IsZhuXianHit(_aZhuXianHitRate);
@@ -880,9 +880,10 @@
}
}
- private static bool IsMiss(int hit, int miss)
+ private static bool IsMiss(int hit, int miss, int hitSuccessRate, int missSuccessRate)
{
- return hit * 1f / (hit + miss) - Random.Range(0f, 1f) < 0;
+ // max(min(max(min(aHit*9.0 / max(aHit*9.0 + dMiss , 1),0.99),0.7) + max(aHitSuccessRate-10000,0)/10000.0 - dMissSuccessRate/10000.0,1),0.6) - random.random()
+ return Mathf.Max(Mathf.Min(Mathf.Max(Mathf.Min(hit * 9.0f / Mathf.Max(hit * 9.0f + miss, 1), 0.99f), 0.7f) + Mathf.Max(hitSuccessRate - 10000, 0) / 10000 - missSuccessRate / 10000, 1), 0.6f) - Random.Range(0.0f, 1.0f) < 0;
}
private static bool IsZhongji(int skillId, GActorFight target)
diff --git a/System/Login/LoginModel.cs b/System/Login/LoginModel.cs
index 9f647e3..8dbffe5 100644
--- a/System/Login/LoginModel.cs
+++ b/System/Login/LoginModel.cs
@@ -354,7 +354,7 @@
{
send.Password = "";
}
- send.Extra += ("|" + VersionConfig.Get().version);
+ send.Extra += ("|" + StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex));
send.ExtraLen = (byte)send.Extra.Length;
send.MAC = DeviceUtility.GetMac();
send.Version = _serverInfo.Version;
--
Gitblit v1.8.0