diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index 46a0b693d..9083a3196 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -26,21 +26,21 @@ int bool int int int bool mut,int#int,1 int int int 1004 true 0 2 4 false null 0 0 0 1005 true 0 2 5 false null 0 0 0 1006 true 0 2 1 false null 0 0 0 -1007 true 0 2 2 false null 0 0 0 -1008 true 0 2 3 false null 0 0 0 -1009 true 0 2 4 false null 0 0 0 -1010 true 0 4 5 false null 0 0 0 -1011 true 0 4 1 false null 0 0 0 -1012 true 0 4 2 false null 0 0 0 -1013 true 0 4 3 false null 0 0 0 -1014 true 0 4 4 false null 0 0 0 -1015 true 0 4 5 false null 0 0 0 -1016 true 0 4 1 false null 0 0 0 -1017 true 0 4 2 false null 0 0 0 -1018 true 0 4 3 false null 0 0 0 -1019 true 0 4 4 false null 0 0 0 -1020 true 0 4 5 false null 0 0 0 -1021 true 0 4 1 false null 0 0 0 +1007 true 0 2 3 false null 0 0 0 +1008 true 0 2 4 false null 0 0 0 +1009 true 0 2 5 false null 0 0 0 +1010 true 0 4 1 false null 0 0 0 +1011 true 0 4 2 false null 0 0 0 +1012 true 0 4 3 false null 0 0 0 +1013 true 0 4 4 false null 0 0 0 +1014 true 0 4 1 false null 0 0 0 +1015 true 0 4 2 false null 0 0 0 +1016 true 0 4 3 false null 0 0 0 +1017 true 0 4 4 false null 0 0 0 +1018 true 0 4 1 false null 0 0 0 +1019 true 0 4 2 false null 0 0 0 +1020 true 0 4 3 false null 0 0 0 +1021 true 0 4 4 false null 0 0 0 1501 true 0 2 2 false null 0 0 0 1502 true 0 2 3 false null 0 0 0 1503 true 0 2 4 false null 0 0 0 @@ -48,10 +48,135 @@ int bool int int int bool mut,int#int,1 int int int 1505 true 0 4 1 false null 0 0 0 1506 true 0 4 2 false null 0 0 0 1507 true 0 4 3 false null 0 0 0 -2001 true 0 2 4 false null 0 0 0 -2002 true 0 2 5 false null 0 0 0 -2003 true 0 2 1 false null 0 0 0 -2004 true 0 2 2 false null 0 0 0 +6001 true 4 4 0 false null 0 0 0 +6002 true 4 4 0 false null 0 0 0 +6003 true 4 4 0 false null 0 0 0 +6004 true 4 4 0 false null 0 0 0 +6005 true 4 4 0 false null 0 0 0 +6006 true 4 4 0 false null 0 0 0 +6007 true 4 4 0 false null 0 0 0 +6008 true 4 4 0 false null 0 0 0 +6009 true 4 4 0 false null 0 0 0 +6010 true 4 4 0 false null 0 0 0 +6011 true 4 4 0 false null 0 0 0 +6012 true 4 4 0 false null 0 0 0 +6013 true 4 4 0 false null 0 0 0 +6014 true 4 4 0 false null 0 0 0 +6015 true 4 4 0 false null 0 0 0 +6016 true 4 4 0 false null 0 0 0 +6017 true 4 4 0 false null 0 0 0 +6018 true 4 4 0 false null 0 0 0 +6019 true 4 4 0 false null 0 0 0 +6020 true 4 4 0 false null 0 0 0 +6021 true 4 4 0 false null 0 0 0 +6022 true 4 4 0 false null 0 0 0 +6023 true 4 4 0 false null 0 0 0 +6024 true 4 4 0 false null 0 0 0 +6025 true 4 4 0 false null 0 0 0 +6026 true 4 4 0 false null 0 0 0 +6027 true 4 4 0 false null 0 0 0 +6028 true 4 4 0 false null 0 0 0 +6029 true 4 4 0 false null 0 0 0 +6030 true 4 4 0 false null 0 0 0 +6031 true 4 4 0 false null 0 0 0 +6032 true 4 4 0 false null 0 0 0 +7001 true 0 4 4 false null 0 0 0 +7002 true 0 4 4 false null 0 0 0 +7003 true 0 4 4 false null 0 0 0 +7004 true 0 4 4 false null 0 0 0 +7005 true 0 4 4 false null 0 0 0 +7006 true 0 4 4 false null 0 0 0 +7007 true 0 4 4 false null 0 0 0 +7008 true 0 4 4 false null 0 0 0 +7009 true 0 4 4 false null 0 0 0 +7101 true 0 4 5 false null 0 0 0 +7102 true 0 4 5 false null 0 0 0 +7103 true 0 4 5 false null 0 0 0 +7104 true 0 4 5 false null 0 0 0 +7105 true 0 4 5 false null 0 0 0 +7106 true 0 4 5 false null 0 0 0 +7107 true 0 4 5 false null 0 0 0 +7108 true 0 4 5 false null 0 0 0 +7109 true 0 4 5 false null 0 0 0 +7110 true 0 4 5 false null 0 0 0 +7111 true 0 4 5 false null 0 0 0 +7112 true 0 4 5 false null 0 0 0 +7113 true 0 4 5 false null 0 0 0 +7114 true 0 4 5 false null 0 0 0 +7115 true 0 4 5 false null 0 0 0 +7116 true 0 4 5 false null 0 0 0 +7117 true 0 4 5 false null 0 0 0 +7118 true 0 4 5 false null 0 0 0 +8001 false 5 2 2 false null 0 0 0 +8002 false 5 2 2 false null 0 0 0 +8003 false 5 2 2 false null 0 0 0 +8004 false 5 2 2 false null 0 0 0 +8005 false 5 2 2 false null 0 0 0 +8006 false 5 2 2 false null 0 0 0 +8007 false 5 2 3 false null 0 0 0 +8008 false 5 2 3 false null 0 0 0 +8009 false 5 2 3 false null 0 0 0 +8010 false 5 2 3 false null 0 0 0 +8011 false 5 2 3 false null 0 0 0 +8012 false 5 2 3 false null 0 0 0 +8013 false 5 2 4 false null 0 0 0 +8014 false 5 2 4 false null 0 0 0 +8015 false 5 2 4 false null 0 0 0 +8016 false 5 2 4 false null 0 0 0 +8017 false 5 2 4 false null 0 0 0 +8018 false 5 2 4 false null 0 0 0 +8019 false 5 2 5 false null 0 0 0 +8020 false 5 2 5 false null 0 0 0 +8021 false 5 2 5 false null 0 0 0 +8022 false 5 2 5 false null 0 0 0 +8023 false 5 2 5 false null 0 0 0 +8024 false 5 2 5 false null 0 0 0 +8025 false 5 2 4 false null 0 0 0 +8026 false 5 2 4 false null 0 0 0 +8027 false 5 2 4 false null 0 0 0 +8028 false 5 2 4 false null 0 0 0 +8029 false 5 2 4 false null 0 0 0 +8030 false 5 2 4 false null 0 0 0 +8031 false 5 2 5 false null 0 0 0 +8032 false 5 2 5 false null 0 0 0 +8033 false 5 2 5 false null 0 0 0 +8034 false 5 2 5 false null 0 0 0 +8035 false 5 2 5 false null 0 0 0 +8036 false 5 2 5 false null 0 0 0 +8037 false 5 2 5 false null 0 0 0 +8038 false 5 2 5 false null 0 0 0 +8039 false 5 2 5 false null 0 0 0 +8040 false 5 2 5 false null 0 0 0 +8041 false 5 2 5 false null 0 0 0 +8042 false 5 2 5 false null 0 0 0 +8043 false 5 2 5 false null 0 0 0 +8044 false 5 2 5 false null 0 0 0 +8045 false 5 2 5 false null 0 0 0 +8046 false 5 2 5 false null 0 0 0 +8047 false 5 2 5 false null 0 0 0 +8048 false 5 2 5 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 +0 false 0 0 0 false null 0 0 0 10001 false 1 0 5 false null 0 0 0 10002 false 1 0 5 false null 0 0 0 10003 false 1 0 5 false null 0 0 0 @@ -156,4 +281,15 @@ int bool int int int bool mut,int#int,1 int int int 11050 true 2 5 5 false 14#1049 1 150 30 11051 true 2 5 5 false 14#1050 1 151 30 11052 true 2 5 5 false 14#1051 1 152 30 +12001 true 2 5 3 false null 1 501 30 +12002 true 2 5 4 false null 1 502 40 +12003 true 2 5 4 false null 1 503 40 +12004 true 2 5 4 false null 1 504 40 +12005 true 2 5 4 false null 1 505 40 +12006 true 2 5 4 false null 1 506 40 +12007 true 2 5 4 false null 1 507 40 +12008 true 2 5 5 false null 1 508 50 +12009 true 2 5 5 false null 1 509 50 +12010 true 2 5 5 false null 1 510 50 +12011 true 2 5 5 false null 1 511 50 400001 true 0 3 5 false 14#1000 1 2 1 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index 4baec5e89..09be8d31c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -13,6 +13,7 @@ public interface GlobalItemType { int CARD_FRAGMENT = 2; // 卡牌碎片 int EQUIP = 3; //装备 int RANDOM_ITME = 5; // 随机道具 + int RUNNE = 6; //物品使用类型 int NO_USE = 0 ; //不使用 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index b7a97c358..8e34da69e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -4,6 +4,7 @@ import com.ljsd.jieling.config.SEquipConfig; import com.ljsd.jieling.config.SWorkShopEquipmentConfig; import com.ljsd.jieling.config.SWorkShopFoundationConfig; import com.ljsd.jieling.config.SWorkShopRebuildConfig; +import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.logic.dao.Equip; import com.ljsd.jieling.logic.dao.EquipManager; import com.ljsd.jieling.logic.dao.User; @@ -80,18 +81,18 @@ public class WorkShopLogic { runneIdsList =new ArrayList<>(specialRunes.length); } for(Integer runneId : runneIdsList){ - costs[--costLength] = new int[]{runneId,1}; + costs[--costLength] = new int[]{runneId, GlobalItemType.RUNNE}; } for(Integer specialRunneId : specialRunes){ - costs[--costLength] = new int[]{specialRunneId,1}; + costs[--costLength] = new int[]{specialRunneId,GlobalItemType.RUNNE}; runneIdsList.add(specialRunneId); } costs[--costLength] = sWorkShopEquipmentConfig.getMineral(); - /* boolean enoughCost = ItemUtil.itemCost(user,costs); + boolean enoughCost = ItemUtil.itemCost(user,costs); if(!enoughCost){ MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_EQUIP_CREATE_RESPONSE_VALUE,"道具不足"); return; - }*/ + } //熟练度提升 int addExp = sWorkShopEquipmentConfig.getExp(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index b14e5c431..ed7257092 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -168,6 +168,9 @@ public class ItemUtil { case GlobalItemType.CARD_FRAGMENT: itemType = GlobalItemType.ITEM; break; + case GlobalItemType.RUNNE: + itemType = GlobalItemType.ITEM; + break; case GlobalItemType.RANDOM_ITME: if (!sItem.isIsopen()){ itemType = GlobalItemType.ITEM; diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index 2a72c983c..3a9df6780 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -377,6 +377,11 @@ public class ExcelUtils { } else { //数字 cellValue = String.valueOf(cell.getNumericCellValue()); + if (cellType != null && cellType.toString().equals("float")){ + + }else{ + cellValue = (int) cell.getNumericCellValue(); + } } break; }