Merge branch 'master' of 60.1.1.230:backend/jieling_server

back_recharge
wangyuan 2019-07-08 12:55:40 +08:00
commit 96c2665505
2 changed files with 6 additions and 6 deletions

View File

@ -152,7 +152,7 @@ function Skill:Cast()
else
self.sp = 0
self.spPass = floor(time * BattleLogic.GameFrameRate)
BattleLogic.AddMP(self.owner.camp, 8)
BattleLogic.AddMP(self.owner.camp, 5)
end
self.owner.Event:DispatchEvent(BattleEventName.SkillCast, self)
else

View File

@ -454,11 +454,11 @@ public class FriendLogic {
PlayerManager playerInfoManager = user.getPlayerInfoManager();
FriendManager friendManager = user.getFriendManager();
List<Integer> friends = friendManager.getFriends();
boolean result = ShieldedWordUtils.checkName( name,true);
if (!result) {
MessageUtil.sendErrorResponse(iSession, 0, msgId, "名字不合法");
return;
}
// boolean result = ShieldedWordUtils.checkName( name);
// if (!result) {
// MessageUtil.sendErrorResponse(iSession, 0, msgId, "名字不合法");
// return;
// }
if (playerInfoManager.getNickName().equals(name)){
MessageUtil.sendErrorResponse(iSession, Global.NO_FIND_ONESELF_STATE, msgId, "不能查找自己");
return;