root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修正

back_recharge
duhui 2022-11-03 17:56:57 +08:00
parent 23c4427207
commit a520fb0a75
4 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serverlogic/src/main/java/com/ljsd/jieling/handler/store/BuyStoreItemHandler.java
View File

@ -13,6 +13,7 @@ import rpc.protocols.MessageTypeProto;
import rpc.protocols.PlayerInfoProto;
import com.ljsd.jieling.util.MessageUtil;
import org.springframework.stereotype.Component;
import util.TimeUtils;
@Component
public class BuyStoreItemHandler extends BaseHandler {
@ -24,8 +25,7 @@ public class BuyStoreItemHandler extends BaseHandler {
@Override
public void process(ISession iSession, PacketNetData netData) throws Exception {
PlayerInfoProto.BuyStoreItemRequest buyStoreItemRequest
= PlayerInfoProto.BuyStoreItemRequest.parseFrom(netData.parseClientProtoNetData());
PlayerInfoProto.BuyStoreItemRequest buyStoreItemRequest = PlayerInfoProto.BuyStoreItemRequest.parseFrom(netData.parseClientProtoNetData());
CommonProto.Drop drop = StoreLogic.buyStoreItem(iSession.getUid(), buyStoreItemRequest.getStoreId(), buyStoreItemRequest.getItemId(), buyStoreItemRequest.getItemNum());
if (buyStoreItemRequest.getItemId()==1106){
Poster.getPoster().dispatchEvent(new NewWelfareEvent(UserManager.getUser(iSession.getUid()), NewWelfareTypeEnum.BUY_1106.getType(),0));
@ -33,8 +33,8 @@ public class BuyStoreItemHandler extends BaseHandler {
if (buyStoreItemRequest.getItemId()==1107){
Poster.getPoster().dispatchEvent(new NewWelfareEvent(UserManager.getUser(iSession.getUid()), NewWelfareTypeEnum.BUY_1107.getType(),0));
}
int msgId = MessageTypeProto.MessageType.BUY_STORE_ITEM_RESPONSE_VALUE;
PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build();
int msgId = MessageTypeProto.MessageType.BUY_STORE_ITEM_RESPONSE_VALUE;
MessageUtil.sendMessage(iSession, 1,msgId, builder, true);
}
}

2
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -3593,8 +3593,6 @@ public class HeroLogic {
//新版穿装备
private boolean checkEquipForWear(Hero hero, User user, List<String> equipIds, Map<Integer, Integer> equipInfos) throws Exception {
if (equipIds == null || equipIds.isEmpty()) {
return false;
}

2
serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
View File

@ -575,7 +575,7 @@ public class BuyGoodsNewLogic {
public static void addNewPrivilege(User user ,int privilege,PlayerInfoProto.PrivilegeIndication.Builder indication) throws Exception {
int privilegeType = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilege).getPrivilegeType();
if(privilegeType == VipPrivilegeType.ADVENTURE_BASE_REWARD){
CombatLogic.getInstance().getNewAdventureReward(user,true,(int)(TimeUtils.now()/1000));
CombatLogic.getInstance().getNewAdventureReward(user,true,TimeUtils.nowInt());
}
user.getPlayerInfoManager().addVipInfo(privilege);
VipInfo vipInfo = user.getPlayerInfoManager().getVipInfo().get(privilege);

25
serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java
View File

@ -507,12 +507,8 @@ public class StoreLogic implements IEventHandler {
if(extraAdd!=null && extraAdd.length>0){
for(int[] extra : extraAdd){
int type = extra[0];
if(type == 1){
// SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.sPlayerLevelConfigMap.get(user.getPlayerInfoManager().getLevel());
// add += sPlayerLevelConfig.getExtraAdd();
}else if(type == 2){
if(type == 2){
int addPrivageId = extra[1];
// PlayerLogic.getInstance().getMaxCountByPrivilegeType(user,addPrivageId);
add = PlayerLogic.getInstance().getMaxCountByPrivilegeType(user,addPrivageId);
}
}
@ -531,13 +527,6 @@ public class StoreLogic implements IEventHandler {
levelAdd = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(user.getPlayerInfoManager().getLevel()).getGoldExtraNum3();
}
}
// if (levelAdd > 0) {
// Map<Integer, Integer> map = SPrivilegeTypeConfig.conditionMap.get(GlobalsDef.VIP_UNLOCK_PRIVILEGE).get(VipPrivilegeType.SHOP_DIAN_JING);
// Integer orDefault = map.getOrDefault(user.getPlayerInfoManager().getVipLevel(), 0);
// if (orDefault != null && orDefault != 0) {
// add += orDefault;
// }
// }
dropItems[i][1] = ((goods[i][1] + levelAdd) * itemNum * (add / 1000)) / 10;
}
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.STORE_BUY_ITEM);
@ -550,7 +539,6 @@ public class StoreLogic implements IEventHandler {
if(storeId==Global.GODSTORID){
Poster.getPoster().dispatchEvent(new GoldEvent(user.getId(),itemNum));
}
if(storeId==Global.VIPSTORID){
int vipLeve = user.getPlayerInfoManager().getVipLevel();
user.getPlayerInfoManager().setHadTakeLevelBoxVip(vipLeve);
@ -561,18 +549,9 @@ public class StoreLogic implements IEventHandler {
for(int i=0;i<itemNum;i++){
for(int privilege:openPrivilege){
// int privilegeType = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilege).getPrivilegeType();
// if(privilegeType== VipPrivilegeType.ADVENTURE_BASE_REWARD||privilegeType==VipPrivilegeType.FAST_MAP_LIMIT){
// CombatLogic.getInstance().getNewAdventureReward(user,true);
// }
// user.getPlayerInfoManager().addVipInfo(privilege);
// VipInfo vipInfo = user.getPlayerInfoManager().getVipInfo().get(privilege);
// indication.addInfos(CommonProto.Privilege.newBuilder().setId(privilege).setUsedTimes(vipInfo.getCount()).setEffectTime(vipInfo.getEffectTime()).build());
BuyGoodsNewLogic.addNewPrivilege(user,privilege,indication);
}
}
ISession sessionByUid = OnlineUserManager.getSessionByUid(uid);
MessageUtil.sendIndicationMessage(sessionByUid,1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE,indication.build(),true);
}
@ -658,7 +637,7 @@ public class StoreLogic implements IEventHandler {
return "";
}
private static int[][] getCost(int buyTimes,int itemNum,int[][] costs,int premiumType,int isDiscount,int discountDegree) {
public static int[][] getCost(int buyTimes,int itemNum,int[][] costs,int premiumType,int isDiscount,int discountDegree) {
int costItemId = costs[0][0];
int[] ints = costs[1];
int nums = buyTimes+itemNum;