Merge branch 'master_test_gn_mcz' into master_test_gn
commit
c0f10f4f49
|
@ -153,7 +153,8 @@ public class ChampinGetHandler extends BaseHandler {
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId());
|
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId())
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
teamInfo.setTotalForce(fightInfo.getForce());
|
teamInfo.setTotalForce(fightInfo.getForce());
|
||||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||||
|
@ -194,7 +195,8 @@ public class ChampinGetHandler extends BaseHandler {
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid());
|
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid())
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
teamInfo.setTotalForce(fightInfo.getForce());
|
teamInfo.setTotalForce(fightInfo.getForce());
|
||||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||||
|
|
|
@ -180,7 +180,8 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId());
|
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId())
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
teamInfo.setTotalForce(fightInfo.getForce());
|
teamInfo.setTotalForce(fightInfo.getForce());
|
||||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||||
|
@ -222,7 +223,8 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid());
|
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid())
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
teamInfo.setTotalForce(fightInfo.getForce());
|
teamInfo.setTotalForce(fightInfo.getForce());
|
||||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||||
|
|
|
@ -28,7 +28,8 @@ public class FifteenActivity extends AbstractActivity {
|
||||||
@Override
|
@Override
|
||||||
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
if(TimeUtils.getOverTimeCount(user.getPlayerInfoManager().getCreateTime(),
|
SGlobalActivity globalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
|
if(TimeUtils.getOverTimeCount(user.getPlayerInfoManager().getCreateTime()+globalActivity.getStartTimeLong()*1000,
|
||||||
System.currentTimeMillis(),0)<sActivityRewardConfig.getValues()[0][0]-1){
|
System.currentTimeMillis(),0)<sActivityRewardConfig.getValues()[0][0]-1){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -37,24 +38,22 @@ public class FifteenActivity extends AbstractActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initActivity(User user) throws Exception {
|
public void initActivity(User user) throws Exception {
|
||||||
List<SGlobalActivity> typeList = SGlobalActivity.getsGlobalActivityMapByType(ActivityType.FIFTEEN_LOGIN);
|
SGlobalActivity globalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
if(typeList == null){
|
if(globalActivity == null){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for(SGlobalActivity globalActivity : typeList){
|
ActivityLogic.getInstance().initAllActivityMission(user.getActivityManager().getActivityMissionMap(),globalActivity.getId());
|
||||||
ActivityLogic.getInstance().initAllActivityMission(user.getActivityManager().getActivityMissionMap(),globalActivity.getId());
|
if(user.getActivityManager().getActivityMissionMap().get(globalActivity.getId()) == null){
|
||||||
if(user.getActivityManager().getActivityMissionMap().get(globalActivity.getId()) == null){
|
return;
|
||||||
continue;
|
}
|
||||||
}
|
long startTime = ToolsUtil.getTimeLong
|
||||||
long startTime = ToolsUtil.getTimeLong
|
(globalActivity.getStartTimeLong(),globalActivity.getEndTimeLong(),globalActivity.getTime(),
|
||||||
(globalActivity.getStartTimeLong(),globalActivity.getEndTimeLong(),globalActivity.getTime(),
|
user.getPlayerInfoManager().getCreateTime(), 1);
|
||||||
user.getPlayerInfoManager().getCreateTime(), 1);
|
int st = (int)(startTime/1000);
|
||||||
int st = (int)(startTime/1000);
|
for(Map.Entry<Integer,ActivityProgressInfo> entry : user.getActivityManager().getActivityMissionMap().
|
||||||
for(Map.Entry<Integer,ActivityProgressInfo> entry : user.getActivityManager().getActivityMissionMap().
|
get(globalActivity.getId()).getActivityMissionMap().entrySet()){
|
||||||
get(globalActivity.getId()).getActivityMissionMap().entrySet()){
|
SActivityRewardConfig config = SActivityRewardConfig.getsActivityRewardConfigByMissionId(entry.getKey());
|
||||||
SActivityRewardConfig config = SActivityRewardConfig.getsActivityRewardConfigByMissionId(entry.getKey());
|
entry.getValue().setProgrss((int)((TimeUtils.DAY * (config.getValues()[0][0] - 1))/1000) + st);
|
||||||
entry.getValue().setProgrss((int)((TimeUtils.DAY * (config.getValues()[0][0] - 1))/1000) + st);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -536,7 +536,8 @@ public class ChampionshipLogic {
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(uid);
|
.setName(playerManager.getNickName()).setUid(uid)
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
// CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
// CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
// teamInfo.setTotalForce(fightInfo.getForce());
|
// teamInfo.setTotalForce(fightInfo.getForce());
|
||||||
// if (!fightInfo.getPokenmonIds().isEmpty()) {
|
// if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||||
|
|
|
@ -1255,7 +1255,8 @@ public class GuildLogic {
|
||||||
.setTime(already.getValue().getTime())
|
.setTime(already.getValue().getTime())
|
||||||
.setItemId(already.getValue().getItemId())
|
.setItemId(already.getValue().getItemId())
|
||||||
.setCount(already.getValue().getCount())
|
.setCount(already.getValue().getCount())
|
||||||
.setPosition(already.getValue().getPosition());
|
.setPosition(already.getValue().getPosition())
|
||||||
|
.setUserTitle(playerInfoManager.getUserTitle());
|
||||||
builder.addInfo(detail.build());
|
builder.addInfo(detail.build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -606,7 +606,8 @@ public class PlayerLogic {
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setHeadFrame(playerManager.getHeadFrame())
|
.setHeadFrame(playerManager.getHeadFrame())
|
||||||
.setLevel(playerManager.getLevel())
|
.setLevel(playerManager.getLevel())
|
||||||
.setName(playerManager.getNickName()).setUid(uid);
|
.setName(playerManager.getNickName()).setUid(uid)
|
||||||
|
.setUserTitle(playerManager.getUserTitle());
|
||||||
TeamPosManager teamPosManager = user.getTeamPosManager();
|
TeamPosManager teamPosManager = user.getTeamPosManager();
|
||||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||||
teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false));
|
teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false));
|
||||||
|
|
|
@ -418,6 +418,7 @@ public class CBean2Proto {
|
||||||
chatInfo.setFrame(playerInfoManager.getHeadFrame());
|
chatInfo.setFrame(playerInfoManager.getHeadFrame());
|
||||||
chatInfo.setSoulVal(playerInfoManager.getMaxForce());
|
chatInfo.setSoulVal(playerInfoManager.getMaxForce());
|
||||||
chatInfo.setMessageId(messageId);
|
chatInfo.setMessageId(messageId);
|
||||||
|
chatInfo.setUserTitle(playerInfoManager.getUserTitle());
|
||||||
return chatInfo.build();
|
return chatInfo.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue