Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
lvxinran 2021-01-21 11:03:35 +08:00
commit 6e396124ec
8 changed files with 83 additions and 18 deletions

View File

@ -63,7 +63,7 @@ public enum FunctionIdEnum {
DeathPath(72,null),
Car_Delay(73,new CarDelayFunction()),
Situation_challenge(74,null),
Pokemon(79,null),
Pokemon(79,null,MessageTypeProto.MessageType.POKEMON_COMONPENT_LEVELUP_REQUEST_VALUE,MessageTypeProto.MessageType.POKEMON_ADVANCED_REQUEST_VALUE),
World_Arena(82,new WorldArenaFunction()),
;

View File

@ -16,7 +16,8 @@ public final class ActivityMission extends MongoBase {
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
private int activityState;
private int openType;
private int v;
private int v;
private long creatTime;
public ActivityMission() {
}
@ -28,6 +29,7 @@ public final class ActivityMission extends MongoBase {
this.activityState = _o_.activityState;
this.openType = _o_.openType;
this.v = _o_.v;
this.creatTime = _o_.creatTime;
}
public Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> getActivityMissionMap() {
@ -63,6 +65,14 @@ public final class ActivityMission extends MongoBase {
this.v = v;
}
public long getCreatTime() {
return creatTime;
}
public void setCreatTime(long creatTime) {
updateString("creatTime",creatTime);
this.creatTime = creatTime;
}
@Override
public String toString() {
@ -72,6 +82,7 @@ public final class ActivityMission extends MongoBase {
_sb_.append(this.activityState).append(",");
_sb_.append(this.openType).append(",");
_sb_.append(this.v).append(",");
_sb_.append(this.creatTime).append(",");
_sb_.append(")");
return _sb_.toString();
}

View File

@ -265,6 +265,7 @@ public class ActivityLogic implements IEventHandler{
activityMission.setOpenType(1);
activityMission.setActivityState(ActivityType.OPEN_STATE);
activityMission.setV(0);
activityMission.setCreatTime(0);
}
public void initOtherMission(ActivityMission activityMission,List<Integer> missionIds){

View File

@ -72,7 +72,7 @@ public class FightMainEventHandler implements IEventHandler{
ActivityTypeEnum.getActicityType(sGlobalActivity.getId()).update(user,user.getPlayerInfoManager().getLevel());
}
}
List<SGlobalSystemConfig> sGlobalSystemConfigs = STableManager.getFigureConfig(CommonStaticConfig.class).getsGlobalSystemConfigMapByTypeAndConditionMap().get(1).get(fightId);
/*List<SGlobalSystemConfig> sGlobalSystemConfigs = STableManager.getFigureConfig(CommonStaticConfig.class).getsGlobalSystemConfigMapByTypeAndConditionMap().get(1).get(fightId);
if(sGlobalSystemConfigs == null){
return;
}
@ -81,7 +81,7 @@ public class FightMainEventHandler implements IEventHandler{
if(openGifts!=null && openGifts.length>0){
ItemUtil.drop(user,openGifts, BIReason.SYSTERM_OPEN_REWARD);
}
}
}*/
}
}

View File

@ -8,6 +8,7 @@ import com.ljsd.jieling.logic.activity.event.SignInEvent;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.network.session.ISession;
import config.SActivityRewardConfig;
import util.TimeUtils;
import java.util.List;
import java.util.Map;
@ -31,7 +32,24 @@ class SignInSumActivity extends AbstractActivity {
@Override
void updateProgress(ActivityMission activityMission, int count) {
activityMission.setV(count + activityMission.getV());
// 初始化时间为0
long o1 = activityMission.getCreatTime();
if (o1 == 0){
activityMission.setV(count + activityMission.getV());
activityMission.setCreatTime(TimeUtils.now());
return;
}
// 获取当天零点时间戳
long o2 = TimeUtils.getAppointTime(0);
// 后面比前面多几天
int day = TimeUtils.differentDays(o1, o2);
// 大于1天重新开始
if (day > 1){
activityMission.setV(count);
}else {
activityMission.setV(count + activityMission.getV());
}
activityMission.setCreatTime(TimeUtils.now());
}
@Override

View File

@ -275,11 +275,8 @@ public class CombatLogic {
}
}
int[] randomRewardMin = targetMainLevelConfig.getRandomRewardMin();
ItemUtil.combineReward(user,false,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
int timesTemp =times;
while (timesTemp-->0){
ItemUtil.combineReward(user,true,targetMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
}
ItemUtil.combineRewardByMainLine(user,false,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
ItemUtil.combineRewardByMainLine(user,true,targetMainLevelConfig.getRandomReward(), times,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
randomEquipMap = equipAutoCombine(randomEquipMap);
//清除无用活动道具
removeNoUseItem(user,randomItemMap);
@ -946,11 +943,13 @@ public class CombatLogic {
Integer times = fightStateInfoItem.getValue();
SMainLevelConfig sMainLevelConfig = SMainLevelConfig.config.get(fightId);
int[] randomRewardMin = sMainLevelConfig.getRandomRewardMin();
ItemUtil.combineReward(user,true,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
int timesTemp =times;
while (!viewBaseReward&&timesTemp-->0){
ItemUtil.combineReward(user,true,sMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
ItemUtil.combineRewardByMainLine(user,true,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
if (!viewBaseReward){
ItemUtil.combineRewardByMainLine(user,true,sMainLevelConfig.getRandomReward(), times,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
}
/*while (!viewBaseReward&&timesTemp-->0){
ItemUtil.combineReward(user,true,sMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
}*/
takeTimes+=times;
}
int fightId = mainLevelManager.getFightId();
@ -964,11 +963,14 @@ public class CombatLogic {
if(maxTimes>0){
times = times > maxTimes?maxTimes:times;
int[] randomRewardMin = targetMainLevelConfig.getRandomRewardMin();
ItemUtil.combineReward(user,true,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
int timesTemp =times;
ItemUtil.combineRewardByMainLine(user,true,randomRewardMin, times,baseItemMap,baseCardMap,baseEquipMap,baseRandomMap,itemObj,BIReason.ADVENTURE_BASE_REWARD);
if (!viewBaseReward){
ItemUtil.combineRewardByMainLine(user,true,targetMainLevelConfig.getRandomReward(), times,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
}
/*int timesTemp =times;
while (!viewBaseReward&&timesTemp-->0){
ItemUtil.combineReward(user,true,targetMainLevelConfig.getRandomReward(), 1f,randomItemMap,randomCardMap,randomEquipMap,randomRandomMap,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD);
}
}*/
lastTimeTakes=times;
}
ItemUtil.extraAddItem(user,baseItemMap,BIReason.ADVENTURE_BASE_REWARD);

View File

@ -320,7 +320,32 @@ public class ItemUtil {
if(!isLoop){
extraAddItem(user,itemMap,reason);
}
}
/**
* 线
* @param user
* @param isLoop
* @param dropGroupIds
* @param time
* @param itemMap
* @param cardMap
* @param equipMap
* @param randomMap
* @param itemObj
* @param reason
* @throws ErrorCodeException
*/
public static void combineRewardByMainLine(User user,boolean isLoop,int[] dropGroupIds,int time, Map<Integer, Integer> itemMap, Map<Integer, Integer> cardMap, Map<Integer, Integer> equipMap, Map<Integer, Integer> randomMap,ItemMap itemObj,int reason)throws ErrorCodeException{
for (int id:dropGroupIds){
SRewardGroup sRewardGroup = SRewardGroup.getsRewardItemMap().get(id);
// 次数
long num = time / sRewardGroup.getDrapRate();
combineRewardDropGroup(user, new int[]{id}, num, itemMap, cardMap, equipMap, randomMap,itemObj);
}
if(!isLoop){
extraAddItem(user,itemMap,reason);
}
}
public static void extraAddItem(User user, Map<Integer, Integer> itemMap,int reason){

View File

@ -23,10 +23,14 @@ public class SRewardGroup implements BaseConfig {
*/
private int loop ;
/**
*
*/
private int drapRate;
@Override
public void init() throws Exception {
sRewardItemMap = STableManager.getConfig(SRewardGroup.class);
}
@ -53,4 +57,8 @@ public class SRewardGroup implements BaseConfig {
public int getLoop() {
return loop;
}
public int getDrapRate() {
return drapRate;
}
}