1212
This commit is contained in:
@@ -54,7 +54,8 @@ public class UserController : ControllerBase
|
||||
object exp = new { expInfo.exp, expInfo.upExp };
|
||||
var vigourInfo = await _attrService.GetUserVigourInfo(userId);
|
||||
var accInfo = await _accService.GetUserAccInfo(userId);
|
||||
object acc = new { accInfo.gold, accInfo.cowry, accInfo.teach, accInfo.renown };
|
||||
var userDataInfo = await _accService.GetUserDataInfo(userId);
|
||||
object acc = new { accInfo.gold, accInfo.cowry, userDataInfo.teach, userDataInfo.renown,userDataInfo.enemy };
|
||||
|
||||
var buff = await _attrService.GetUserStateData(userId, "ALL");
|
||||
var stock = await _attrService.GetUserStock(userId);
|
||||
@@ -165,15 +166,17 @@ public class UserController : ControllerBase
|
||||
return PoAction.Message("用户本身!", 101);
|
||||
}
|
||||
|
||||
bool isAtArea = true;
|
||||
if (userInfo.areaId != StateHelper.areaId)
|
||||
{
|
||||
isAtArea = false;
|
||||
return PoAction.Message("玩家不存在!", 102);
|
||||
}
|
||||
|
||||
object user = new { userInfo.userNo, userInfo.nick, userInfo.sex, userInfo.sign };
|
||||
var attrInfo = await _attrService.GetUserAttrModel(userInfo.userId); //基础属性
|
||||
var accInfo = await _accService.GetUserAccInfo(userInfo.userId);
|
||||
object acc = new { accInfo.teach };
|
||||
var accInfo = await _accService.GetUserDataInfo(userInfo.userId);
|
||||
object acc = new { accInfo.teach,accInfo.enemy };
|
||||
|
||||
var online = await _mapService.GetUserOnMap(userInfo.userId);
|
||||
int isOnline = online.upTime >
|
||||
@@ -189,9 +192,11 @@ public class UserController : ControllerBase
|
||||
|
||||
var equ = await _equService.GetUserOnEqu(userInfo.userId);
|
||||
var suit = await _equService.GetUserEquSuit(userInfo.userId);
|
||||
|
||||
var isPk = await UserStateTool.CheckPkState(userId, userInfo.userId, isEnemy, isAtArea);
|
||||
object result = new
|
||||
{
|
||||
user, attr = new { attrInfo.lev }, acc, isOnline, onMapName, isFriend, isEnemy, team, equ, suit
|
||||
user, attr = new { attrInfo.lev }, acc, isOnline, onMapName, isFriend, isEnemy, team, equ, suit,isPk
|
||||
};
|
||||
return PoAction.Ok(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user