删除完成活动
parent
db5ddc0fcc
commit
e67bf61141
|
@ -1,6 +1,9 @@
|
|||
package com.ljsd.jieling.ktbeans;
|
||||
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.globals.Global;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamRoleBean;
|
||||
import com.ljsd.jieling.logic.dao.Item;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
@ -13,6 +16,18 @@ public class KTRoleUtil {
|
|||
paramRoleBean.setRole_name_s(user.getPlayerInfoManager().getNickName());
|
||||
paramRoleBean.setLevel_i(String.valueOf(user.getPlayerInfoManager().getLevel()));
|
||||
paramRoleBean.setVip_level_i(user.getPlayerInfoManager().getVipLevel());
|
||||
Item gem = user.getItemManager().getItemMap().get(Global.GEM);
|
||||
Item gold = user.getItemManager().getItemMap().get(Global.GOLD);
|
||||
int gemCount =0;
|
||||
int goldCount =0;
|
||||
if(gem!=null){
|
||||
gemCount = gem.getItemNum();
|
||||
}
|
||||
if(gold!=null){
|
||||
goldCount = gold.getItemNum();
|
||||
}
|
||||
paramRoleBean.setCurrency_1_d(String.valueOf(gemCount));
|
||||
paramRoleBean.setCurrency_2_d(String.valueOf(goldCount));
|
||||
return paramRoleBean;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,6 +41,7 @@ public class KtEventUtils {
|
|||
paramEventBean.add(sGlobalActivity.getSesc());
|
||||
paramEventBean.add(sGlobalActivity.getSesc());
|
||||
paramEventBean.add(parm[1].toString());
|
||||
paramEventBean.add("COMPLETE");
|
||||
break;
|
||||
case ParamEventBean.UserItemEvent:
|
||||
case ParamEventBean.UserCurrencyEvent:
|
||||
|
@ -89,8 +90,7 @@ public class KtEventUtils {
|
|||
case ParamEventBean.UserTaskEvent:
|
||||
int misionType = (int)parm[0];
|
||||
int misionId = (int)parm[1];
|
||||
paramEventBean.add(String.valueOf(misionType));
|
||||
paramEventBean.add(String.valueOf(misionId));
|
||||
paramEventBean.add(misionType+"_"+misionId);
|
||||
paramEventBean.add("COMPLETE");
|
||||
break;
|
||||
|
||||
|
|
|
@ -21,6 +21,8 @@ public class ParamRoleBean {
|
|||
private String role_name_s;
|
||||
private String level_i;
|
||||
private int vip_level_i;
|
||||
private String currency_1_d;
|
||||
private String currency_2_d;
|
||||
|
||||
public String getRole_id_s() {
|
||||
return role_id_s;
|
||||
|
@ -54,4 +56,20 @@ public class ParamRoleBean {
|
|||
public void setVip_level_i(int vip_level_i) {
|
||||
this.vip_level_i = vip_level_i;
|
||||
}
|
||||
|
||||
public String getCurrency_1_d() {
|
||||
return currency_1_d;
|
||||
}
|
||||
|
||||
public void setCurrency_1_d(String currency_1_d) {
|
||||
this.currency_1_d = currency_1_d;
|
||||
}
|
||||
|
||||
public String getCurrency_2_d() {
|
||||
return currency_2_d;
|
||||
}
|
||||
|
||||
public void setCurrency_2_d(String currency_2_d) {
|
||||
this.currency_2_d = currency_2_d;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -311,7 +311,6 @@ public class ActivityLogic {
|
|||
continue;
|
||||
}
|
||||
checkActivityMissionFinishAndTaked(activityMission);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -46,7 +46,8 @@ public class ActivityMission extends MongoBase {
|
|||
|
||||
|
||||
public void updateActivityState(int state){
|
||||
updateString("state",state);
|
||||
activityState = state;
|
||||
updateString("activityState",state);
|
||||
}
|
||||
|
||||
public void updateProgressInfo(int missionId, ActivityProgressInfo activityProgressInfo) {
|
||||
|
|
|
@ -638,7 +638,6 @@ public class CombatLogic {
|
|||
public void challengeInvasionBoss(ISession session,String bossId,int teamId,int fightTimes,int skipFight) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
SGameSetting sGameSetting = SGameSetting.getGameSetting();
|
||||
if(fightTimes<=0 || StringUtil.isEmpty(bossId)){
|
||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_BOSS_CHALLENGE_RESPONSE_VALUE,"");
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue