diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index ca22b80fb..9e4f618bd 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -19,9 +19,9 @@ int bool int int int bool int string int int int int mut,int#int,1 int 1004 true 0 2 4 false 1 100001 0 0 0 0 null 1 1005 true 0 2 5 false 1 100001 0 0 0 0 null 1 1006 true 0 2 1 false 1 100001 0 0 0 0 null 1 -1007 true 0 2 3 false 1 100001 0 0 0 0 null 1 -1008 true 0 2 4 false 1 100001 0 0 0 0 null 1 -1009 true 0 2 5 false 1 100001 0 0 0 0 null 1 +1007 true 0 2 3 false 1 15001 0 0 0 0 null 1 +1008 true 0 2 4 false 1 15002 0 0 0 0 null 1 +1009 true 0 2 5 false 1 15003 0 0 0 0 null 1 1010 true 0 4 1 false 1 100001 0 0 0 0 null 1 1011 true 0 4 2 false 1 100001 0 0 0 0 null 1 1012 true 0 4 3 false 1 100001 0 0 0 0 null 1 @@ -41,10 +41,10 @@ int bool int int int bool int string int int int int mut,int#int,1 int 1505 true 0 4 1 false 1 100001 0 0 0 0 null 1 1506 true 0 4 2 false 1 100001 0 0 0 0 null 1 1507 true 0 4 3 false 1 100001 0 0 0 0 null 1 -1508 true 0 4 2 false 1 100001 0 0 0 0 null 1 -1509 true 0 4 3 false 1 100001 0 0 0 0 null 1 -1510 true 0 4 4 false 1 100001 0 0 0 0 null 1 -1511 true 0 4 5 false 1 100001 0 0 0 0 null 1 +1508 true 0 4 2 false 1 15011 0 0 0 0 null 1 +1509 true 0 4 3 false 1 15012 0 0 0 0 null 1 +1510 true 0 4 4 false 1 15013 0 0 0 0 null 1 +1511 true 0 4 5 false 1 15014 0 0 0 0 null 1 3001 true 3 1 1 false 1 100001 0 0 0 0 null 1 3002 true 3 1 1 false 1 100001 0 0 0 0 null 1 3003 true 3 1 1 false 1 100001 0 0 0 0 null 1 @@ -436,40 +436,40 @@ int bool int int int bool int string int int int int mut,int#int,1 int 11050 true 2 5 3 false 1 100001 1 750 30 0 null 1 11051 true 2 5 3 false 1 100001 1 751 30 0 null 1 11052 true 2 5 3 false 1 100001 1 752 30 0 null 1 -12001 true 2 5 3 false 1 1 501 30 0 null 0 -12002 true 2 5 4 false 1 1 502 40 0 null 0 -12003 true 2 5 4 false 1 1 503 40 0 null 0 -12004 true 2 5 4 false 1 1 504 40 0 null 0 -12005 true 2 5 4 false 1 1 505 40 0 null 0 -12006 true 2 5 4 false 1 1 506 40 0 null 0 -12007 true 2 5 4 false 1 1 507 40 0 null 0 -12008 true 2 5 5 false 1 1 508 50 0 null 0 -12009 true 2 5 5 false 1 1 509 50 0 null 0 -12010 true 2 5 5 false 1 1 510 50 0 null 0 -12011 true 2 5 5 false 1 1 511 50 0 null 0 -12012 true 2 5 5 false 1 1 512 40 0 null 0 -12013 true 2 5 5 false 1 1 513 50 0 null 0 -13024 false 1 0 5 false 0 0 0 0 0 10024#5 1 -13025 false 1 0 5 false 0 0 0 0 0 10025#5 1 -13026 false 1 0 5 false 0 0 0 0 0 10026#5 1 -13027 false 1 0 5 false 0 0 0 0 0 10027#5 1 -13028 false 1 0 5 false 0 0 0 0 0 10028#5 1 -13029 false 1 0 5 false 0 0 0 0 0 10029#5 1 -13030 false 1 0 5 false 0 0 0 0 0 10030#5 1 -13031 false 1 0 5 false 0 0 0 0 0 10031#5 1 -13032 false 1 0 5 false 0 0 0 0 0 10032#5 1 -13033 false 1 0 5 false 0 0 0 0 0 10033#5 1 -13034 false 1 0 5 false 0 0 0 0 0 10034#5 1 -13035 false 1 0 5 false 0 0 0 0 0 10035#5 1 -13036 false 1 0 5 false 0 0 0 0 0 10036#5 1 -13037 false 1 0 5 false 0 0 0 0 0 10037#5 1 -13038 false 1 0 5 false 0 0 0 0 0 10038#5 1 -13039 false 1 0 5 false 0 0 0 0 0 10039#5 1 -13040 false 1 0 5 false 0 0 0 0 0 10040#5 1 -13041 false 1 0 5 false 0 0 0 0 0 10041#5 1 -13042 false 1 0 5 false 0 0 0 0 0 10042#5 1 -13043 false 1 0 5 false 0 0 0 0 0 10043#5 1 -13044 false 1 0 5 false 0 0 0 0 0 10044#5 1 -13045 false 1 0 5 false 0 0 0 0 0 10045#5 1 -13046 false 1 0 5 false 0 0 0 0 0 10046#5 1 -400001 true 5 3 5 false 0 100001 1 2 1 0 null 0 +12001 true 2 5 3 false 1 100001 1 501 30 0 null 0 +12002 true 2 5 4 false 1 100001 1 502 40 0 null 0 +12003 true 2 5 4 false 1 100001 1 503 40 0 null 0 +12004 true 2 5 4 false 1 100001 1 504 40 0 null 0 +12005 true 2 5 4 false 1 100001 1 505 40 0 null 0 +12006 true 2 5 4 false 1 100001 1 506 40 0 null 0 +12007 true 2 5 4 false 1 100001 1 507 40 0 null 0 +12008 true 2 5 5 false 1 100001 1 508 50 0 null 0 +12009 true 2 5 5 false 1 100001 1 509 50 0 null 0 +12010 true 2 5 5 false 1 100001 1 510 50 0 null 0 +12011 true 2 5 5 false 1 100001 1 511 50 0 null 0 +12012 true 2 5 5 false 1 100001 1 512 40 0 null 0 +12013 true 2 5 5 false 1 100001 1 513 50 0 null 0 +13024 false 1 0 5 false 1 100001 0 0 0 0 10024#5 1 +13025 false 1 0 5 false 1 100001 0 0 0 0 10025#5 1 +13026 false 1 0 5 false 1 100001 0 0 0 0 10026#5 1 +13027 false 1 0 5 false 1 100001 0 0 0 0 10027#5 1 +13028 false 1 0 5 false 1 100001 0 0 0 0 10028#5 1 +13029 false 1 0 5 false 1 100001 0 0 0 0 10029#5 1 +13030 false 1 0 5 false 1 100001 0 0 0 0 10030#5 1 +13031 false 1 0 5 false 1 100001 0 0 0 0 10031#5 1 +13032 false 1 0 5 false 1 100001 0 0 0 0 10032#5 1 +13033 false 1 0 5 false 1 100001 0 0 0 0 10033#5 1 +13034 false 1 0 5 false 1 100001 0 0 0 0 10034#5 1 +13035 false 1 0 5 false 1 100001 0 0 0 0 10035#5 1 +13036 false 1 0 5 false 1 100001 0 0 0 0 10036#5 1 +13037 false 1 0 5 false 1 100001 0 0 0 0 10037#5 1 +13038 false 1 0 5 false 1 100001 0 0 0 0 10038#5 1 +13039 false 1 0 5 false 1 100001 0 0 0 0 10039#5 1 +13040 false 1 0 5 false 1 100001 0 0 0 0 10040#5 1 +13041 false 1 0 5 false 1 100001 0 0 0 0 10041#5 1 +13042 false 1 0 5 false 1 100001 0 0 0 0 10042#5 1 +13043 false 1 0 5 false 1 100001 0 0 0 0 10043#5 1 +13044 false 1 0 5 false 1 100001 0 0 0 0 10044#5 1 +13045 false 1 0 5 false 1 100001 0 0 0 0 10045#5 1 +13046 false 1 0 5 false 1 100001 0 0 0 0 10046#5 1 +400001 true 5 3 5 false 1 100001 1 2 1 0 null 0 diff --git a/conf/server/LevelDifficultyConfig.txt b/conf/server/LevelDifficultyConfig.txt index 5e2076507..08b2c7e07 100644 --- a/conf/server/LevelDifficultyConfig.txt +++ b/conf/server/LevelDifficultyConfig.txt @@ -1,152 +1,152 @@ Id Precondition LevelLimit MonsterGroup Cost PreLevelCost Exp FirstReward RandomReward RankTime MaxCountPerDay RecommendFightAbility int int int int mut,int#int,2 mut,int#int,2 int mut,int#int,1 mut,int#int,1 int int int -1011 0 0 51011 2#7 2#1 8 6001#5001 4001#3001 300 0 500 -1021 1011 0 51012 2#7 2#1 8 6002#5002 4002#3002 300 0 600 -1031 1021 0 51013 2#7 2#1 8 6003#5003 4003#3003 300 0 700 -1041 1031 0 51014 2#7 2#1 8 6004#5004 4004#3004 300 0 800 -1051 1041 0 51015 2#7 2#1 8 6005#5005 4005#3005 300 0 900 -2011 1051 0 51021 2#7 2#1 8 6006#5006 4006#3006 300 0 2015 -2021 2011 0 51022 2#7 2#1 8 6007#5007 4007#3007 300 0 2519 -2031 2021 0 51023 2#7 2#1 8 6008#5008 4008#3008 300 0 3023 -2041 2031 0 51024 2#7 2#1 8 6009#5009 4009#3009 300 0 3527 -2051 2041 0 51025 2#7 2#1 8 6010#5010 4010#3010 300 0 4031 -3011 2051 0 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 4535 -3021 3011 0 51032 2#7 2#1 8 6012#5012 4012#3012 300 0 5039 -3031 3021 0 51033 2#7 2#1 8 6013#5013 4013#3013 300 0 5543 -3041 3031 0 51034 2#7 2#1 8 6014#5014 4014#3014 300 0 6047 -3051 3041 0 51035 2#7 2#1 8 6015#5015 4015#3015 300 0 6551 -4011 3051 0 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 7055 -4021 4011 0 51042 2#7 2#1 8 6017#5017 4017#3017 300 0 8063 -4031 4021 0 51043 2#7 2#1 8 6018#5018 4018#3018 300 0 9071 -4041 4031 0 51044 2#7 2#1 8 6019#5019 4019#3019 300 0 10079 -4051 4041 0 51045 2#7 2#1 8 6020#5020 4020#3020 300 0 10320 -5011 4051 0 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10320 -5021 5011 0 51052 2#7 2#1 8 6022#5022 4022#3022 300 0 10561 -5031 5021 0 51053 2#7 2#1 8 6023#5023 4023#3023 300 0 10802 -5041 5031 0 51054 2#7 2#1 8 6024#5024 4024#3024 300 0 11043 -5051 5041 0 51055 2#7 2#1 8 6025#5025 4025#3025 300 0 11284 -6011 5051 0 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 11669 -6021 6011 0 51062 2#7 2#1 8 6027#5027 4027#3027 300 0 12055 -6031 6021 0 51063 2#7 2#1 8 6028#5028 4028#3028 300 0 12441 -6041 6031 0 51064 2#7 2#1 8 6029#5029 4029#3029 300 0 12826 -6051 6041 0 51065 2#7 2#1 8 6030#5030 4030#3030 300 0 13212 -7011 6051 0 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 13237 -7021 7011 0 51072 2#7 2#1 8 6032#5032 4032#3032 300 0 13262 -7031 7021 0 51073 2#7 2#1 8 6033#5033 4033#3033 300 0 13296 -7041 7031 0 51074 2#7 2#1 8 6034#5034 4034#3034 300 0 13449 -7051 7041 0 51075 2#7 2#1 8 6035#5035 4035#3035 300 0 13603 -8011 7051 0 51081 2#7 2#1 8 6036#5036 4036#3036 300 0 14642 -8021 8011 0 51082 2#7 2#1 8 6037#5037 4037#3037 300 0 15682 -8031 8021 0 51083 2#7 2#1 8 6038#5038 4038#3038 300 0 17068 -8041 8031 0 51084 2#7 2#1 8 6039#5039 4039#3039 300 0 17221 -8051 8041 0 51085 2#7 2#1 8 6040#5040 4040#3040 300 0 17375 -9011 8051 0 51091 2#7 2#1 8 6041#5041 4041#3041 300 0 19398 -9021 9011 0 51092 2#7 2#1 8 6042#5042 4042#3042 300 0 21421 -9031 9021 0 51093 2#7 2#1 8 6043#5043 4043#3043 300 0 24118 -9041 9031 0 51094 2#7 2#1 8 6044#5044 4044#3044 300 0 24449 -9051 9041 0 51095 2#7 2#1 8 6045#5045 4045#3045 300 0 24781 -10011 9051 0 51094 2#7 2#1 8 6046#5046 4046#3046 300 0 25222 -10021 10011 0 51095 2#7 2#1 8 6047#5047 4047#3047 300 0 25009 -10031 10021 0 51094 2#7 2#1 8 6048#5048 4048#3048 300 0 24797 -10041 10031 0 51095 2#7 2#1 8 6049#5049 4049#3049 300 0 24513 -10051 10041 0 51094 2#7 2#1 8 6050#5050 4050#3050 300 0 24873 -1012 10051 0 51095 2#7 2#1 8 8101 8001#7001 300 0 25233 -1022 1012 0 51094 2#7 2#1 8 8102 8002#7002 300 0 25472 -1032 1022 0 51095 2#7 2#1 8 8103 8003#7003 300 0 25712 -1042 1032 0 51094 2#7 2#1 8 8104 8004#7004 300 0 26312 -1052 1042 0 51095 2#7 2#1 8 8105 8005#7005 300 0 26912 -2012 1052 0 51094 2#7 2#1 8 8106 8006#7006 300 0 27511 -2022 2012 0 51095 2#7 2#1 8 8107 8007#7007 300 0 28111 -2032 2022 0 51094 2#7 2#1 8 8108 8008#7008 300 0 29311 -2042 2032 0 51095 2#7 2#1 8 8109 8009#7009 300 0 30629 -2052 2042 0 51094 2#7 2#1 8 8110 8010#7010 300 0 33715 -3012 2052 0 51095 2#7 2#1 8 8111 8011#7011 300 0 35909 -3022 3012 0 51094 2#7 2#1 8 8112 8012#7012 300 0 38102 -3032 3022 0 51095 2#7 2#1 8 8113 8013#7013 300 0 40295 -3042 3032 0 51094 2#7 2#1 8 8114 8014#7014 300 0 42489 -3052 3042 0 51095 2#7 2#1 8 8115 8015#7015 300 0 44682 -4012 3052 0 51094 2#7 2#1 8 8116 8016#7016 300 0 46856 -4022 4012 0 51095 2#7 2#1 8 8117 8017#7017 300 0 49030 -4032 4022 0 51094 2#7 2#1 8 8118 8018#7018 300 0 51205 -4042 4032 0 51095 2#7 2#1 8 8119 8019#7019 300 0 53379 -4052 4042 0 51094 2#7 2#1 8 8120 8020#7020 300 0 55553 -5012 4052 0 51095 2#7 2#1 8 8121 8021#7021 300 0 57705 -5022 5012 0 51094 2#7 2#1 8 8122 8022#7022 300 0 59858 -5032 5022 0 51095 2#7 2#1 8 8123 8023#7023 300 0 60733 -5042 5032 0 51094 2#7 2#1 8 8124 8024#7024 300 0 62992 -5052 5042 0 51095 2#7 2#1 8 8125 8025#7025 300 0 36956 -6012 5052 0 51094 2#7 2#1 8 8126 8026#7026 300 0 37774 -6022 6012 0 51095 2#7 2#1 8 8127 8027#7027 300 0 38592 -6032 6022 0 51094 2#7 2#1 8 8128 8028#7028 300 0 39409 -6042 6032 0 51095 2#7 2#1 8 8129 8029#7029 300 0 40250 -6052 6042 0 51094 2#7 2#1 8 8130 8030#7030 300 0 41070 -7012 6052 0 51095 2#7 2#1 8 8131 8031#7031 300 0 41889 -7022 7012 0 51094 2#7 2#1 8 8132 8032#7032 300 0 42764 -7032 7022 0 51095 2#7 2#1 8 8133 8033#7033 300 0 43587 -7042 7032 0 51094 2#7 2#1 8 8134 8034#7034 300 0 44409 -7052 7042 0 51095 2#7 2#1 8 8135 8035#7035 300 0 45232 -8012 7052 0 51094 2#7 2#1 8 8136 8036#7036 300 0 46055 -8022 8012 0 51095 2#7 2#1 8 8137 8037#7037 300 0 46877 -8032 8022 0 51094 2#7 2#1 8 8138 8038#7038 300 0 47700 -8042 8032 0 51095 2#7 2#1 8 8139 8039#7039 300 0 48522 -8052 8042 0 51094 2#7 2#1 8 8140 8040#7040 300 0 49467 -9012 8052 0 51095 2#7 2#1 8 8141 8041#7041 300 0 51284 -9022 9012 0 51094 2#7 2#1 8 8142 8042#7042 300 0 53102 -9032 9022 0 51095 2#7 2#1 8 8143 8043#7043 300 0 54919 -9042 9032 0 51094 2#7 2#1 8 8144 8044#7044 300 0 56727 -9052 9042 0 51095 2#7 2#1 8 8145 8045#7045 300 0 58553 -10012 9052 0 51094 2#7 2#1 8 8146 8046#7046 300 0 60378 -10022 10012 0 51095 2#7 2#1 8 8147 8047#7047 300 0 62203 -10032 10022 0 51094 2#7 2#1 8 8148 8048#7048 300 0 64029 -10042 10032 0 51095 2#7 2#1 8 8149 8049#7049 300 0 66078 -10052 10042 0 51094 2#7 2#1 8 8150 8050#7050 300 0 67911 -1013 10052 0 51095 2#7 2#1 8 null 8601#8501 300 0 67911 -1023 1013 0 51094 2#7 2#1 8 null 8602#8502 300 0 69743 -1033 1023 0 51095 2#7 2#1 8 null 8603#8503 300 0 71576 -1043 1033 0 51094 2#7 2#1 8 null 8604#8504 300 0 73408 -1053 1043 0 51095 2#7 2#1 8 null 8605#8505 300 0 75241 -2013 1053 0 51094 2#7 2#1 8 null 8606#8506 300 0 77456 -2023 2013 0 51095 2#7 2#1 8 null 8607#8507 300 0 78605 -2033 2023 0 51094 2#7 2#1 8 null 8608#8508 300 0 79754 -2043 2033 0 51095 2#7 2#1 8 null 8609#8509 300 0 81281 -2053 2043 0 51094 2#7 2#1 8 null 8610#8510 300 0 82443 -3013 2053 0 51095 2#7 2#1 8 null 8611#8511 300 0 83670 -3023 3013 0 51094 2#7 2#1 8 null 8612#8512 300 0 84930 -3033 3023 0 51095 2#7 2#1 8 null 8613#8513 300 0 86190 -3043 3033 0 51094 2#7 2#1 8 null 8614#8514 300 0 87450 -3053 3043 0 51095 2#7 2#1 8 null 8615#8515 300 0 88709 -4013 3053 0 51094 2#7 2#1 8 null 8616#8516 300 0 90389 -4023 4013 0 51095 2#7 2#1 8 null 8617#8517 300 0 92660 -4033 4023 0 51094 2#7 2#1 8 null 8618#8518 300 0 94147 -4043 4033 0 51095 2#7 2#1 8 null 8619#8519 300 0 95419 -4053 4043 0 51094 2#7 2#1 8 null 8620#8520 300 0 96691 -5013 4053 0 51095 2#7 2#1 8 null 8621#8521 300 0 98019 -5023 5013 0 51094 2#7 2#1 8 null 8622#8522 300 0 99403 -5033 5023 0 51095 2#7 2#1 8 null 8623#8523 300 0 98802 -5043 5033 0 51094 2#7 2#1 8 null 8624#8524 300 0 109455 -5053 5043 0 51095 2#7 2#1 8 null 8625#8525 300 0 123410 -6013 5053 0 51094 2#7 2#1 8 null 8626#8526 300 0 133818 -6023 6013 0 51095 2#7 2#1 8 null 8627#8527 300 0 144227 -6033 6023 0 51094 2#7 2#1 8 null 8628#8528 300 0 154636 -6043 6033 0 51095 2#7 2#1 8 null 8629#8529 300 0 165045 -6053 6043 0 51094 2#7 2#1 8 null 8630#8530 300 0 175448 -7013 6053 0 51095 2#7 2#1 8 null 8631#8531 300 0 185847 -7023 7013 0 51094 2#7 2#1 8 null 8632#8532 300 0 196749 -7033 7023 0 51095 2#7 2#1 8 null 8633#8533 300 0 207165 -7043 7033 0 51094 2#7 2#1 8 null 8634#8534 300 0 217581 -7053 7043 0 51095 2#7 2#1 8 null 8635#8535 300 0 227996 -8013 7053 0 51094 2#7 2#1 8 null 8636#8536 300 0 238412 -8023 8013 0 51095 2#7 2#1 8 null 8637#8537 300 0 248828 -8033 8023 0 51094 2#7 2#1 8 null 8638#8538 300 0 259243 -8043 8033 0 51095 2#7 2#1 8 null 8639#8539 300 0 269348 -8053 8043 0 51094 2#7 2#1 8 null 8640#8540 300 0 280174 -9013 8053 0 51095 2#7 2#1 8 null 8641#8541 300 0 290284 -9023 9013 0 51094 2#7 2#1 8 null 8642#8542 300 0 300381 -9033 9023 0 51095 2#7 2#1 8 null 8643#8543 300 0 306304 -9043 9033 0 51094 2#7 2#1 8 null 8644#8544 300 0 308054 -9053 9043 0 51095 2#7 2#1 8 null 8645#8545 300 0 309804 -10013 9053 0 51094 2#7 2#1 8 null 8646#8546 300 0 311554 -10023 10013 0 51095 2#7 2#1 8 null 8647#8547 300 0 313304 -10033 10023 0 51094 2#7 2#1 8 null 8648#8548 300 0 316025 -10043 10033 0 51095 2#7 2#1 8 null 8649#8549 300 0 317796 -10053 10043 0 51094 2#7 2#1 8 null 8650#8550 300 0 319402 +1011 0 0 51011 2#7 2#1 8 6001#5001 4001#3001 300 0 1007 +1021 1011 0 51012 2#7 2#1 8 6002#5002 4002#3002 300 0 1050 +1031 1021 0 51013 2#7 2#1 8 6003#5003 4003#3003 300 0 1093 +1041 1031 0 51014 2#7 2#1 8 6004#5004 4004#3004 300 0 1136 +1051 1041 0 51015 2#7 2#1 8 6005#5005 4005#3005 300 0 1179 +2011 1051 0 51021 2#7 2#1 8 6006#5006 4006#3006 300 0 1224 +2021 2011 0 51022 2#7 2#1 8 6007#5007 4007#3007 300 0 1583 +2031 2021 0 51023 2#7 2#1 8 6008#5008 4008#3008 300 0 1942 +2041 2031 0 51024 2#7 2#1 8 6009#5009 4009#3009 300 0 2301 +2051 2041 0 51025 2#7 2#1 8 6010#5010 4010#3010 300 0 2660 +3011 2051 0 51031 2#7 2#1 8 6011#5011 4011#3011 300 0 3023 +3021 3011 0 51032 2#7 2#1 8 6012#5012 4012#3012 300 0 3527 +3031 3021 0 51033 2#7 2#1 8 6013#5013 4013#3013 300 0 4031 +3041 3031 0 51034 2#7 2#1 8 6014#5014 4014#3014 300 0 4535 +3051 3041 0 51035 2#7 2#1 8 6015#5015 4015#3015 300 0 5039 +4011 3051 0 51041 2#7 2#1 8 6016#5016 4016#3016 300 0 6047 +4021 4011 0 51042 2#7 2#1 8 6017#5017 4017#3017 300 0 7055 +4031 4021 0 51043 2#7 2#1 8 6018#5018 4018#3018 300 0 8063 +4041 4031 0 51044 2#7 2#1 8 6019#5019 4019#3019 300 0 9071 +4051 4041 0 51045 2#7 2#1 8 6020#5020 4020#3020 300 0 10079 +5011 4051 0 51051 2#7 2#1 8 6021#5021 4021#3021 300 0 10199 +5021 5011 0 51052 2#7 2#1 8 6022#5022 4022#3022 300 0 10320 +5031 5021 0 51053 2#7 2#1 8 6023#5023 4023#3023 300 0 10440 +5041 5031 0 51054 2#7 2#1 8 6024#5024 4024#3024 300 0 10561 +5051 5041 0 51055 2#7 2#1 8 6025#5025 4025#3025 300 0 10681 +6011 5051 0 51061 2#7 2#1 8 6026#5026 4026#3026 300 0 10802 +6021 6011 0 51062 2#7 2#1 8 6027#5027 4027#3027 300 0 10922 +6031 6021 0 51063 2#7 2#1 8 6028#5028 4028#3028 300 0 11043 +6041 6031 0 51064 2#7 2#1 8 6029#5029 4029#3029 300 0 11163 +6051 6041 0 51065 2#7 2#1 8 6030#5030 4030#3030 300 0 11284 +7011 6051 0 51071 2#7 2#1 8 6031#5031 4031#3031 300 0 11669 +7021 7011 0 51072 2#7 2#1 8 6032#5032 4032#3032 300 0 12055 +7031 7021 0 51073 2#7 2#1 8 6033#5033 4033#3033 300 0 12441 +7041 7031 0 51074 2#7 2#1 8 6034#5034 4034#3034 300 0 12826 +7051 7041 0 51075 2#7 2#1 8 6035#5035 4035#3035 300 0 13212 +8011 7051 0 51081 2#7 2#1 8 6036#5036 4036#3036 300 0 13246 +8021 8011 0 51082 2#7 2#1 8 6037#5037 4037#3037 300 0 13279 +8031 8021 0 51083 2#7 2#1 8 6038#5038 4038#3038 300 0 13357 +8041 8031 0 51084 2#7 2#1 8 6039#5039 4039#3039 300 0 13480 +8051 8041 0 51085 2#7 2#1 8 6040#5040 4040#3040 300 0 13603 +9011 8051 0 51091 2#7 2#1 8 6041#5041 4041#3041 300 0 14989 +9021 9011 0 51092 2#7 2#1 8 6042#5042 4042#3042 300 0 16375 +9031 9021 0 51093 2#7 2#1 8 6043#5043 4043#3043 300 0 17129 +9041 9031 0 51094 2#7 2#1 8 6044#5044 4044#3044 300 0 17252 +9051 9041 0 51095 2#7 2#1 8 6045#5045 4045#3045 300 0 17375 +10011 9051 0 51094 2#7 2#1 8 6046#5046 4046#3046 300 0 20746 +10021 10011 0 51095 2#7 2#1 8 6047#5047 4047#3047 300 0 24118 +10031 10021 0 51094 2#7 2#1 8 6048#5048 4048#3048 300 0 24670 +10041 10031 0 51095 2#7 2#1 8 6049#5049 4049#3049 300 0 25222 +10051 10041 0 51094 2#7 2#1 8 6050#5050 4050#3050 300 0 24513 +1012 5011 0 51095 2#7 2#1 8 8101 8001#7001 300 0 25222 +1022 1012 0 51094 2#7 2#1 8 8102 8002#7002 300 0 24513 +1032 1022 0 51095 2#7 2#1 8 8103 8003#7003 300 0 25222 +1042 1032 0 51094 2#7 2#1 8 8104 8004#7004 300 0 24513 +1052 1042 0 51095 2#7 2#1 8 8105 8005#7005 300 0 25222 +2012 1052 0 51094 2#7 2#1 8 8106 8006#7006 300 0 24513 +2022 2012 0 51095 2#7 2#1 8 8107 8007#7007 300 0 25222 +2032 2022 0 51094 2#7 2#1 8 8108 8008#7008 300 0 24513 +2042 2032 0 51095 2#7 2#1 8 8109 8009#7009 300 0 25222 +2052 2042 0 51094 2#7 2#1 8 8110 8010#7010 300 0 24513 +3012 2052 0 51095 2#7 2#1 8 8111 8011#7011 300 0 25222 +3022 3012 0 51094 2#7 2#1 8 8112 8012#7012 300 0 24513 +3032 3022 0 51095 2#7 2#1 8 8113 8013#7013 300 0 25222 +3042 3032 0 51094 2#7 2#1 8 8114 8014#7014 300 0 24513 +3052 3042 0 51095 2#7 2#1 8 8115 8015#7015 300 0 25222 +4012 3052 0 51094 2#7 2#1 8 8116 8016#7016 300 0 24513 +4022 4012 0 51095 2#7 2#1 8 8117 8017#7017 300 0 25222 +4032 4022 0 51094 2#7 2#1 8 8118 8018#7018 300 0 24513 +4042 4032 0 51095 2#7 2#1 8 8119 8019#7019 300 0 25222 +4052 4042 0 51094 2#7 2#1 8 8120 8020#7020 300 0 24513 +5012 4052 0 51095 2#7 2#1 8 8121 8021#7021 300 0 25222 +5022 5012 0 51094 2#7 2#1 8 8122 8022#7022 300 0 24513 +5032 5022 0 51095 2#7 2#1 8 8123 8023#7023 300 0 25222 +5042 5032 0 51094 2#7 2#1 8 8124 8024#7024 300 0 24513 +5052 5042 0 51095 2#7 2#1 8 8125 8025#7025 300 0 25222 +6012 5052 0 51094 2#7 2#1 8 8126 8026#7026 300 0 24513 +6022 6012 0 51095 2#7 2#1 8 8127 8027#7027 300 0 25222 +6032 6022 0 51094 2#7 2#1 8 8128 8028#7028 300 0 24513 +6042 6032 0 51095 2#7 2#1 8 8129 8029#7029 300 0 25222 +6052 6042 0 51094 2#7 2#1 8 8130 8030#7030 300 0 24513 +7012 6052 0 51095 2#7 2#1 8 8131 8031#7031 300 0 25222 +7022 7012 0 51094 2#7 2#1 8 8132 8032#7032 300 0 24513 +7032 7022 0 51095 2#7 2#1 8 8133 8033#7033 300 0 25222 +7042 7032 0 51094 2#7 2#1 8 8134 8034#7034 300 0 24513 +7052 7042 0 51095 2#7 2#1 8 8135 8035#7035 300 0 25222 +8012 7052 0 51094 2#7 2#1 8 8136 8036#7036 300 0 24513 +8022 8012 0 51095 2#7 2#1 8 8137 8037#7037 300 0 25222 +8032 8022 0 51094 2#7 2#1 8 8138 8038#7038 300 0 24513 +8042 8032 0 51095 2#7 2#1 8 8139 8039#7039 300 0 25222 +8052 8042 0 51094 2#7 2#1 8 8140 8040#7040 300 0 24513 +9012 8052 0 51095 2#7 2#1 8 8141 8041#7041 300 0 25222 +9022 9012 0 51094 2#7 2#1 8 8142 8042#7042 300 0 24513 +9032 9022 0 51095 2#7 2#1 8 8143 8043#7043 300 0 25222 +9042 9032 0 51094 2#7 2#1 8 8144 8044#7044 300 0 24513 +9052 9042 0 51095 2#7 2#1 8 8145 8045#7045 300 0 25222 +10012 9052 0 51094 2#7 2#1 8 8146 8046#7046 300 0 24513 +10022 10012 0 51095 2#7 2#1 8 8147 8047#7047 300 0 25222 +10032 10022 0 51094 2#7 2#1 8 8148 8048#7048 300 0 24513 +10042 10032 0 51095 2#7 2#1 8 8149 8049#7049 300 0 25222 +10052 10042 0 51094 2#7 2#1 8 8150 8050#7050 300 0 24513 +1013 2052 0 51095 2#7 2#1 8 null 8601#8501 300 0 25222 +1023 1013 0 51094 2#7 2#1 8 null 8602#8502 300 0 24513 +1033 1023 0 51095 2#7 2#1 8 null 8603#8503 300 0 25222 +1043 1033 0 51094 2#7 2#1 8 null 8604#8504 300 0 24513 +1053 1043 0 51095 2#7 2#1 8 null 8605#8505 300 0 25222 +2013 1053 0 51094 2#7 2#1 8 null 8606#8506 300 0 24513 +2023 2013 0 51095 2#7 2#1 8 null 8607#8507 300 0 25222 +2033 2023 0 51094 2#7 2#1 8 null 8608#8508 300 0 24513 +2043 2033 0 51095 2#7 2#1 8 null 8609#8509 300 0 25222 +2053 2043 0 51094 2#7 2#1 8 null 8610#8510 300 0 24513 +3013 2053 0 51095 2#7 2#1 8 null 8611#8511 300 0 25222 +3023 3013 0 51094 2#7 2#1 8 null 8612#8512 300 0 24513 +3033 3023 0 51095 2#7 2#1 8 null 8613#8513 300 0 25222 +3043 3033 0 51094 2#7 2#1 8 null 8614#8514 300 0 24513 +3053 3043 0 51095 2#7 2#1 8 null 8615#8515 300 0 25222 +4013 3053 0 51094 2#7 2#1 8 null 8616#8516 300 0 24513 +4023 4013 0 51095 2#7 2#1 8 null 8617#8517 300 0 25222 +4033 4023 0 51094 2#7 2#1 8 null 8618#8518 300 0 24513 +4043 4033 0 51095 2#7 2#1 8 null 8619#8519 300 0 25222 +4053 4043 0 51094 2#7 2#1 8 null 8620#8520 300 0 24513 +5013 4053 0 51095 2#7 2#1 8 null 8621#8521 300 0 25222 +5023 5013 0 51094 2#7 2#1 8 null 8622#8522 300 0 24513 +5033 5023 0 51095 2#7 2#1 8 null 8623#8523 300 0 25222 +5043 5033 0 51094 2#7 2#1 8 null 8624#8524 300 0 24513 +5053 5043 0 51095 2#7 2#1 8 null 8625#8525 300 0 25222 +6013 5053 0 51094 2#7 2#1 8 null 8626#8526 300 0 24513 +6023 6013 0 51095 2#7 2#1 8 null 8627#8527 300 0 25222 +6033 6023 0 51094 2#7 2#1 8 null 8628#8528 300 0 24513 +6043 6033 0 51095 2#7 2#1 8 null 8629#8529 300 0 25222 +6053 6043 0 51094 2#7 2#1 8 null 8630#8530 300 0 24513 +7013 6053 0 51095 2#7 2#1 8 null 8631#8531 300 0 25222 +7023 7013 0 51094 2#7 2#1 8 null 8632#8532 300 0 24513 +7033 7023 0 51095 2#7 2#1 8 null 8633#8533 300 0 25222 +7043 7033 0 51094 2#7 2#1 8 null 8634#8534 300 0 24513 +7053 7043 0 51095 2#7 2#1 8 null 8635#8535 300 0 25222 +8013 7053 0 51094 2#7 2#1 8 null 8636#8536 300 0 24513 +8023 8013 0 51095 2#7 2#1 8 null 8637#8537 300 0 25222 +8033 8023 0 51094 2#7 2#1 8 null 8638#8538 300 0 24513 +8043 8033 0 51095 2#7 2#1 8 null 8639#8539 300 0 25222 +8053 8043 0 51094 2#7 2#1 8 null 8640#8540 300 0 24513 +9013 8053 0 51095 2#7 2#1 8 null 8641#8541 300 0 25222 +9023 9013 0 51094 2#7 2#1 8 null 8642#8542 300 0 24513 +9033 9023 0 51095 2#7 2#1 8 null 8643#8543 300 0 25222 +9043 9033 0 51094 2#7 2#1 8 null 8644#8544 300 0 24513 +9053 9043 0 51095 2#7 2#1 8 null 8645#8545 300 0 25222 +10013 9053 0 51094 2#7 2#1 8 null 8646#8546 300 0 24513 +10023 10013 0 51095 2#7 2#1 8 null 8647#8547 300 0 25222 +10033 10023 0 51094 2#7 2#1 8 null 8648#8548 300 0 24513 +10043 10033 0 51095 2#7 2#1 8 null 8649#8549 300 0 25222 +10053 10043 0 51094 2#7 2#1 8 null 8650#8550 300 0 24513 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java index 2286c8e8e..6b0cd1163 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java @@ -14,7 +14,6 @@ public class SItem implements BaseConfig { private int itemType; private int itemBaseType; //道具类型(该道具在哪个背包显示) private int quantity; - private String price; private int useType; //使用类型0不使用 1掉落组 2N选1 private int rewardGroup; private int usePerCount; @@ -54,10 +53,6 @@ public class SItem implements BaseConfig { return quantity; } - public String getPrice() { - return price; - } - public int getUseType() { return useType; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 6978fbea6..918ce7b30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -47,11 +47,19 @@ public class ItemLogic { if (cost.length() == 0){ cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum()); SItem sItem = SItem.getsItemMap().get(item.getItemId()); - reward = new StringBuilder(sItem.getPrice()); + if (sItem.getIfResolve() ==0){ + MessageUtil.sendErrorResponse(iSession,0,msgId,""); + return; + } + reward = new StringBuilder(sItem.getResolveReward()); }else{ cost.append("|").append(item.getItemId()).append("#").append(item.getItemNum()); SItem sItem = SItem.getsItemMap().get(item.getItemId()); - reward.append("#").append(sItem.getPrice()); + if (sItem.getIfResolve() ==0){ + MessageUtil.sendErrorResponse(iSession,0,msgId,""); + return; + } + reward.append("#").append(sItem.getResolveReward()); } } int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString()); @@ -112,12 +120,20 @@ public class ItemLogic { MessageUtil.sendErrorResponse(iSession,0,msgId,""); return; } + if (!StringUtil.isEmpty(equip.getHeroId())){ + MessageUtil.sendErrorResponse(iSession,0,msgId,""); + return; + } SItem sItem = SItem.getsItemMap().get(equip.getEquipId()); + if (sItem.getIfResolve() ==0){ + MessageUtil.sendErrorResponse(iSession,0,msgId,""); + return; + } equipManager.remove(equipId); if (reward.length() == 0){ - reward = new StringBuilder(sItem.getPrice()); + reward = new StringBuilder(sItem.getResolveReward()); }else{ - reward.append("#").append(sItem.getPrice()); + reward.append("#").append(sItem.getResolveReward()); } } }