Merge branch 'jieling' of http://60.1.1.230/backend/gm_tw_admin into jieling

master
lvxinran 2020-09-14 10:06:40 +08:00
commit bab0c39bf5
2 changed files with 4 additions and 4 deletions

View File

@ -121,9 +121,9 @@ public class UserInfoController {
// int GOLD = 14; //金币
// int SOULCRYSTAL = 15; // 魂晶id
// int GEM = 16; // 妖精id
cUserVo.setGem(gsUser.getItemManager().getItemMap().getOrDefault(15,new GSItemBean()).getItemNum());
cUserVo.setGem(gsUser.getItemManager().getItemMap().getOrDefault(16,new GSItemBean()).getItemNum());
cUserVo.setGold(gsUser.getItemManager().getItemMap().getOrDefault(14,new GSItemBean()).getItemNum());
cUserVo.setCurStamina(gsUser.getItemManager().getItemMap().getOrDefault(2,new GSItemBean()).getItemNum());
cUserVo.setCurStamina(gsUser.getItemManager().getItemMap().getOrDefault(3,new GSItemBean()).getItemNum());
cUserVo.setSave_amt(gsUser.getPlayerManager().getRechargeInfo().getSaveAmt());
cUserVo.setCreateTime(JsonUtil.timeStamp2Date(String.valueOf(gsUser.getPlayerManager().getCreateTime())));

View File

@ -36,9 +36,9 @@
<th width="500">ID</th>
<th width="500">角色名</th>
<th width="200">等級</th>
<th width="200">魂晶</th>
<th width="200">妖精</th>
<th width="200">金幣</th>
<th width="200">體力</th>
<th width="200">成长护符</th>
<th width="500">目前儲值</th>
<th width="1000">創角時間</th>
<th width="800">最近登出時間</th>