Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
36028386a8
|
@ -1,15 +1,15 @@
|
|||
Id Quality ProfessionLimit Position PropertyMin PropertyMax Pool SecondNumMin SecondNumMax SkillId IfClear
|
||||
int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
||||
3001 1 1501 1 2#42 2#70 1 0 0 0 0
|
||||
3002 1 1501 1 2#42 2#70 1 0 0 0 0
|
||||
3003 1 1502 1 2#42 2#70 1 0 0 0 0
|
||||
3004 1 1502 1 2#42 2#70 1 0 0 0 0
|
||||
3005 1 1503 1 2#42 2#70 1 0 0 0 0
|
||||
3006 1 1503 1 2#42 2#70 1 0 0 0 0
|
||||
3007 1 1504 1 2#42 2#70 1 0 0 0 0
|
||||
3008 1 1504 1 2#42 2#70 1 0 0 0 0
|
||||
3009 1 1505 1 2#42 2#70 1 0 0 0 0
|
||||
3010 1 1505 1 2#42 2#70 1 0 0 0 0
|
||||
3001 1 3 1 2#42 2#70 1 0 0 0 0
|
||||
3002 1 3 1 2#42 2#70 1 0 0 0 0
|
||||
3003 1 5 1 2#42 2#70 1 0 0 0 0
|
||||
3004 1 5 1 2#42 2#70 1 0 0 0 0
|
||||
3005 1 1 1 2#42 2#70 1 0 0 0 0
|
||||
3006 1 1 1 2#42 2#70 1 0 0 0 0
|
||||
3007 1 2 1 2#42 2#70 1 0 0 0 0
|
||||
3008 1 2 1 2#42 2#70 1 0 0 0 0
|
||||
3009 1 4 1 2#42 2#70 1 0 0 0 0
|
||||
3010 1 4 1 2#42 2#70 1 0 0 0 0
|
||||
3011 1 0 2 3#43 3#72 1 0 0 0 0
|
||||
3012 1 0 2 3#43 3#72 1 0 0 0 0
|
||||
3013 1 0 2 4#40 4#67 1 0 0 0 0
|
||||
|
@ -18,16 +18,16 @@ int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
|||
3016 1 0 4 5#24 5#28 1 0 0 0 0
|
||||
3017 1 0 3 1#460 1#767 1 0 0 0 0
|
||||
3018 1 0 3 1#460 1#767 1 0 0 0 0
|
||||
3101 2 1501 1 2#56 2#93 1 0 1 0 0
|
||||
3102 2 1501 1 2#56 2#93 1 0 1 0 0
|
||||
3103 2 1502 1 2#56 2#93 1 0 1 0 0
|
||||
3104 2 1502 1 2#56 2#93 1 0 1 0 0
|
||||
3105 2 1503 1 2#56 2#93 1 0 1 0 0
|
||||
3106 2 1503 1 2#56 2#93 1 0 1 0 0
|
||||
3107 2 1504 1 2#56 2#93 1 0 1 0 0
|
||||
3108 2 1504 1 2#56 2#93 1 0 1 0 0
|
||||
3109 2 1505 1 2#56 2#93 1 0 1 0 0
|
||||
3110 2 1505 1 2#56 2#93 1 0 1 0 0
|
||||
3101 2 3 1 2#56 2#93 1 0 1 0 0
|
||||
3102 2 3 1 2#56 2#93 1 0 1 0 0
|
||||
3103 2 5 1 2#56 2#93 1 0 1 0 0
|
||||
3104 2 5 1 2#56 2#93 1 0 1 0 0
|
||||
3105 2 1 1 2#56 2#93 1 0 1 0 0
|
||||
3106 2 1 1 2#56 2#93 1 0 1 0 0
|
||||
3107 2 2 1 2#56 2#93 1 0 1 0 0
|
||||
3108 2 2 1 2#56 2#93 1 0 1 0 0
|
||||
3109 2 4 1 2#56 2#93 1 0 1 0 0
|
||||
3110 2 4 1 2#56 2#93 1 0 1 0 0
|
||||
3111 2 0 2 3#58 3#96 2 0 1 0 0
|
||||
3112 2 0 2 3#58 3#96 2 0 1 0 0
|
||||
3113 2 0 2 4#54 4#90 2 0 1 0 0
|
||||
|
@ -36,16 +36,16 @@ int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
|||
3116 2 0 4 5#48 5#56 3 0 1 0 0
|
||||
3117 2 0 3 1#616 1#1027 4 0 1 0 0
|
||||
3118 2 0 3 1#616 1#1027 4 0 1 0 0
|
||||
3201 3 1501 1 2#72 2#120 5 1 3 0 1
|
||||
3202 3 1501 1 2#72 2#120 5 1 3 0 1
|
||||
3203 3 1502 1 2#72 2#120 5 1 3 0 1
|
||||
3204 3 1502 1 2#72 2#120 5 1 3 0 1
|
||||
3205 3 1503 1 2#72 2#120 5 1 3 0 1
|
||||
3206 3 1503 1 2#72 2#120 5 1 3 0 1
|
||||
3207 3 1504 1 2#72 2#120 5 1 3 0 1
|
||||
3208 3 1504 1 2#72 2#120 5 1 3 0 1
|
||||
3209 3 1505 1 2#72 2#120 5 1 3 0 1
|
||||
3210 3 1505 1 2#72 2#120 5 1 3 0 1
|
||||
3201 3 3 1 2#72 2#120 5 1 3 0 1
|
||||
3202 3 3 1 2#72 2#120 5 1 3 0 1
|
||||
3203 3 5 1 2#72 2#120 5 1 3 0 1
|
||||
3204 3 5 1 2#72 2#120 5 1 3 0 1
|
||||
3205 3 1 1 2#72 2#120 5 1 3 0 1
|
||||
3206 3 1 1 2#72 2#120 5 1 3 0 1
|
||||
3207 3 2 1 2#72 2#120 5 1 3 0 1
|
||||
3208 3 2 1 2#72 2#120 5 1 3 0 1
|
||||
3209 3 4 1 2#72 2#120 5 1 3 0 1
|
||||
3210 3 4 1 2#72 2#120 5 1 3 0 1
|
||||
3211 3 0 2 3#74 3#124 6 1 3 0 1
|
||||
3212 3 0 2 3#74 3#124 6 1 3 0 1
|
||||
3213 3 0 2 4#70 4#116 6 1 3 0 1
|
||||
|
@ -54,16 +54,16 @@ int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
|||
3216 3 0 4 5#72 5#84 7 1 3 0 1
|
||||
3217 3 0 3 1#792 1#1320 8 1 3 0 1
|
||||
3218 3 0 3 1#792 1#1320 8 1 3 0 1
|
||||
3301 4 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3302 4 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3303 4 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3304 4 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3305 4 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3306 4 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3307 4 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3308 4 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3309 4 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3310 4 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3301 4 3 1 2#383 2#638 9 2 4 0 1
|
||||
3302 4 3 1 2#383 2#638 9 2 4 0 1
|
||||
3303 4 5 1 2#383 2#638 9 2 4 0 1
|
||||
3304 4 5 1 2#383 2#638 9 2 4 0 1
|
||||
3305 4 1 1 2#383 2#638 9 2 4 0 1
|
||||
3306 4 1 1 2#383 2#638 9 2 4 0 1
|
||||
3307 4 2 1 2#383 2#638 9 2 4 0 1
|
||||
3308 4 2 1 2#383 2#638 9 2 4 0 1
|
||||
3309 4 4 1 2#383 2#638 9 2 4 0 1
|
||||
3310 4 4 1 2#383 2#638 9 2 4 0 1
|
||||
3311 4 0 2 3#396 3#659 10 2 4 0 1
|
||||
3312 4 0 2 3#396 3#659 10 2 4 0 1
|
||||
3313 4 0 2 4#370 4#617 10 2 4 0 1
|
||||
|
@ -72,16 +72,16 @@ int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
|||
3316 4 0 4 5#96 5#113 11 2 4 0 1
|
||||
3317 4 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3318 4 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3319 4 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3320 4 1501 1 2#383 2#638 9 2 4 0 1
|
||||
3321 4 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3322 4 1502 1 2#383 2#638 9 2 4 0 1
|
||||
3323 4 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3324 4 1503 1 2#383 2#638 9 2 4 0 1
|
||||
3325 4 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3326 4 1504 1 2#383 2#638 9 2 4 0 1
|
||||
3327 4 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3328 4 1505 1 2#383 2#638 9 2 4 0 1
|
||||
3319 4 3 1 2#383 2#638 9 2 4 0 1
|
||||
3320 4 3 1 2#383 2#638 9 2 4 0 1
|
||||
3321 4 5 1 2#383 2#638 9 2 4 0 1
|
||||
3322 4 5 1 2#383 2#638 9 2 4 0 1
|
||||
3323 4 1 1 2#383 2#638 9 2 4 0 1
|
||||
3324 4 1 1 2#383 2#638 9 2 4 0 1
|
||||
3325 4 2 1 2#383 2#638 9 2 4 0 1
|
||||
3326 4 2 1 2#383 2#638 9 2 4 0 1
|
||||
3327 4 4 1 2#383 2#638 9 2 4 0 1
|
||||
3328 4 4 1 2#383 2#638 9 2 4 0 1
|
||||
3329 4 0 2 3#396 3#659 10 2 4 0 1
|
||||
3330 4 0 2 3#396 3#659 10 2 4 0 1
|
||||
3331 4 0 2 4#370 4#617 10 2 4 0 1
|
||||
|
@ -90,25 +90,25 @@ int int int int mut,int#int,1 mut,int#int,1 int int int int int
|
|||
3334 4 0 4 5#96 5#113 11 2 4 0 1
|
||||
3335 4 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
3336 4 0 3 1#4212 1#7020 12 2 4 0 1
|
||||
4001 3 1501 1 2#72 2#120 5 1 3 0 0
|
||||
4002 3 1502 1 2#72 2#120 5 1 3 0 0
|
||||
4003 3 1503 1 2#72 2#120 5 1 3 0 0
|
||||
4004 3 1504 1 2#72 2#120 5 1 3 0 0
|
||||
4005 3 1505 1 2#72 2#120 5 1 3 0 0
|
||||
4001 3 3 1 2#72 2#120 5 1 3 0 0
|
||||
4002 3 5 1 2#72 2#120 5 1 3 0 0
|
||||
4003 3 1 1 2#72 2#120 5 1 3 0 0
|
||||
4004 3 2 1 2#72 2#120 5 1 3 0 0
|
||||
4005 3 4 1 2#72 2#120 5 1 3 0 0
|
||||
4006 3 0 2 3#74 3#124 6 1 3 0 0
|
||||
4007 3 0 2 4#70 4#116 6 1 3 0 0
|
||||
4008 3 0 4 5#72 5#84 7 1 3 0 0
|
||||
4009 3 0 3 1#792 1#1320 8 1 3 0 0
|
||||
4101 4 1501 1 2#383 2#638 9 2 4 0 0
|
||||
4102 4 1501 1 2#383 2#638 9 2 4 0 0
|
||||
4103 4 1502 1 2#383 2#638 9 2 4 0 0
|
||||
4104 4 1502 1 2#383 2#638 9 2 4 0 0
|
||||
4105 4 1503 1 2#383 2#638 9 2 4 0 0
|
||||
4106 4 1503 1 2#383 2#638 9 2 4 0 0
|
||||
4107 4 1504 1 2#383 2#638 9 2 4 0 0
|
||||
4108 4 1504 1 2#383 2#638 9 2 4 0 0
|
||||
4109 4 1505 1 2#383 2#638 9 2 4 0 0
|
||||
4110 4 1505 1 2#383 2#638 9 2 4 0 0
|
||||
4101 4 3 1 2#383 2#638 9 2 4 0 0
|
||||
4102 4 3 1 2#383 2#638 9 2 4 0 0
|
||||
4103 4 5 1 2#383 2#638 9 2 4 0 0
|
||||
4104 4 5 1 2#383 2#638 9 2 4 0 0
|
||||
4105 4 1 1 2#383 2#638 9 2 4 0 0
|
||||
4106 4 1 1 2#383 2#638 9 2 4 0 0
|
||||
4107 4 2 1 2#383 2#638 9 2 4 0 0
|
||||
4108 4 2 1 2#383 2#638 9 2 4 0 0
|
||||
4109 4 4 1 2#383 2#638 9 2 4 0 0
|
||||
4110 4 4 1 2#383 2#638 9 2 4 0 0
|
||||
4111 4 0 2 3#396 3#659 10 2 4 0 0
|
||||
4112 4 0 2 3#396 3#659 10 2 4 0 0
|
||||
4113 4 0 2 4#370 4#617 10 2 4 0 0
|
||||
|
|
|
@ -48,6 +48,123 @@ 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
|
||||
3001 true 3 1 1 false null 0 0 0
|
||||
3002 true 3 1 1 false null 0 0 0
|
||||
3003 true 3 1 1 false null 0 0 0
|
||||
3004 true 3 1 1 false null 0 0 0
|
||||
3005 true 3 1 1 false null 0 0 0
|
||||
3006 true 3 1 1 false null 0 0 0
|
||||
3007 true 3 1 1 false null 0 0 0
|
||||
3008 true 3 1 1 false null 0 0 0
|
||||
3009 true 3 1 1 false null 0 0 0
|
||||
3010 true 3 1 1 false null 0 0 0
|
||||
3011 true 3 1 1 false null 0 0 0
|
||||
3012 true 3 1 1 false null 0 0 0
|
||||
3013 true 3 1 1 false null 0 0 0
|
||||
3014 true 3 1 1 false null 0 0 0
|
||||
3015 true 3 1 1 false null 0 0 0
|
||||
3016 true 3 1 1 false null 0 0 0
|
||||
3017 true 3 1 1 false null 0 0 0
|
||||
3018 true 3 1 1 false null 0 0 0
|
||||
3101 true 3 1 2 false null 0 0 0
|
||||
3102 true 3 1 2 false null 0 0 0
|
||||
3103 true 3 1 2 false null 0 0 0
|
||||
3104 true 3 1 2 false null 0 0 0
|
||||
3105 true 3 1 2 false null 0 0 0
|
||||
3106 true 3 1 2 false null 0 0 0
|
||||
3107 true 3 1 2 false null 0 0 0
|
||||
3108 true 3 1 2 false null 0 0 0
|
||||
3109 true 3 1 2 false null 0 0 0
|
||||
3110 true 3 1 2 false null 0 0 0
|
||||
3111 true 3 1 2 false null 0 0 0
|
||||
3112 true 3 1 2 false null 0 0 0
|
||||
3113 true 3 1 2 false null 0 0 0
|
||||
3114 true 3 1 2 false null 0 0 0
|
||||
3115 true 3 1 2 false null 0 0 0
|
||||
3116 true 3 1 2 false null 0 0 0
|
||||
3117 true 3 1 2 false null 0 0 0
|
||||
3118 true 3 1 2 false null 0 0 0
|
||||
3201 true 3 1 3 false null 0 0 0
|
||||
3202 true 3 1 3 false null 0 0 0
|
||||
3203 true 3 1 3 false null 0 0 0
|
||||
3204 true 3 1 3 false null 0 0 0
|
||||
3205 true 3 1 3 false null 0 0 0
|
||||
3206 true 3 1 3 false null 0 0 0
|
||||
3207 true 3 1 3 false null 0 0 0
|
||||
3208 true 3 1 3 false null 0 0 0
|
||||
3209 true 3 1 3 false null 0 0 0
|
||||
3210 true 3 1 3 false null 0 0 0
|
||||
3211 true 3 1 3 false null 0 0 0
|
||||
3212 true 3 1 3 false null 0 0 0
|
||||
3213 true 3 1 3 false null 0 0 0
|
||||
3214 true 3 1 3 false null 0 0 0
|
||||
3215 true 3 1 3 false null 0 0 0
|
||||
3216 true 3 1 3 false null 0 0 0
|
||||
3217 true 3 1 3 false null 0 0 0
|
||||
3218 true 3 1 3 false null 0 0 0
|
||||
3301 true 3 1 4 false null 0 0 0
|
||||
3302 true 3 1 4 false null 0 0 0
|
||||
3303 true 3 1 4 false null 0 0 0
|
||||
3304 true 3 1 4 false null 0 0 0
|
||||
3305 true 3 1 4 false null 0 0 0
|
||||
3306 true 3 1 4 false null 0 0 0
|
||||
3307 true 3 1 4 false null 0 0 0
|
||||
3308 true 3 1 4 false null 0 0 0
|
||||
3309 true 3 1 4 false null 0 0 0
|
||||
3310 true 3 1 4 false null 0 0 0
|
||||
3311 true 3 1 4 false null 0 0 0
|
||||
3312 true 3 1 4 false null 0 0 0
|
||||
3313 true 3 1 4 false null 0 0 0
|
||||
3314 true 3 1 4 false null 0 0 0
|
||||
3315 true 3 1 4 false null 0 0 0
|
||||
3316 true 3 1 4 false null 0 0 0
|
||||
3317 true 3 1 4 false null 0 0 0
|
||||
3318 true 3 1 4 false null 0 0 0
|
||||
3319 true 3 1 4 false null 0 0 0
|
||||
3320 true 3 1 4 false null 0 0 0
|
||||
3321 true 3 1 4 false null 0 0 0
|
||||
3322 true 3 1 4 false null 0 0 0
|
||||
3323 true 3 1 4 false null 0 0 0
|
||||
3324 true 3 1 4 false null 0 0 0
|
||||
3325 true 3 1 4 false null 0 0 0
|
||||
3326 true 3 1 4 false null 0 0 0
|
||||
3327 true 3 1 4 false null 0 0 0
|
||||
3328 true 3 1 4 false null 0 0 0
|
||||
3329 true 3 1 4 false null 0 0 0
|
||||
3330 true 3 1 4 false null 0 0 0
|
||||
3331 true 3 1 4 false null 0 0 0
|
||||
3332 true 3 1 4 false null 0 0 0
|
||||
3333 true 3 1 4 false null 0 0 0
|
||||
3334 true 3 1 4 false null 0 0 0
|
||||
3335 true 3 1 4 false null 0 0 0
|
||||
3336 true 3 1 4 false null 0 0 0
|
||||
4001 true 3 1 3 false null 0 0 0
|
||||
4002 true 3 1 3 false null 0 0 0
|
||||
4003 true 3 1 3 false null 0 0 0
|
||||
4004 true 3 1 3 false null 0 0 0
|
||||
4005 true 3 1 3 false null 0 0 0
|
||||
4006 true 3 1 3 false null 0 0 0
|
||||
4007 true 3 1 3 false null 0 0 0
|
||||
4008 true 3 1 3 false null 0 0 0
|
||||
4009 true 3 1 3 false null 0 0 0
|
||||
4101 true 3 1 4 false null 0 0 0
|
||||
4102 true 3 1 4 false null 0 0 0
|
||||
4103 true 3 1 4 false null 0 0 0
|
||||
4104 true 3 1 4 false null 0 0 0
|
||||
4105 true 3 1 4 false null 0 0 0
|
||||
4106 true 3 1 4 false null 0 0 0
|
||||
4107 true 3 1 4 false null 0 0 0
|
||||
4108 true 3 1 4 false null 0 0 0
|
||||
4109 true 3 1 4 false null 0 0 0
|
||||
4110 true 3 1 4 false null 0 0 0
|
||||
4111 true 3 1 4 false null 0 0 0
|
||||
4112 true 3 1 4 false null 0 0 0
|
||||
4113 true 3 1 4 false null 0 0 0
|
||||
4114 true 3 1 4 false null 0 0 0
|
||||
4115 true 3 1 4 false null 0 0 0
|
||||
4116 true 3 1 4 false null 0 0 0
|
||||
4117 true 3 1 4 false null 0 0 0
|
||||
4118 true 3 1 4 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
|
||||
|
@ -107,76 +224,54 @@ int bool int int int bool mut,int#int,1 int int int
|
|||
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
|
||||
8001 true 6 2 2 false null 0 0 0
|
||||
8002 true 6 2 2 false null 0 0 0
|
||||
8003 true 6 2 2 false null 0 0 0
|
||||
8004 true 6 2 2 false null 0 0 0
|
||||
8005 true 6 2 2 false null 0 0 0
|
||||
8006 true 6 2 2 false null 0 0 0
|
||||
8007 true 6 2 3 false null 0 0 0
|
||||
8008 true 6 2 3 false null 0 0 0
|
||||
8009 true 6 2 3 false null 0 0 0
|
||||
8010 true 6 2 3 false null 0 0 0
|
||||
8011 true 6 2 3 false null 0 0 0
|
||||
8012 true 6 2 3 false null 0 0 0
|
||||
8013 true 6 2 4 false null 0 0 0
|
||||
8014 true 6 2 4 false null 0 0 0
|
||||
8015 true 6 2 4 false null 0 0 0
|
||||
8016 true 6 2 4 false null 0 0 0
|
||||
8017 true 6 2 4 false null 0 0 0
|
||||
8018 true 6 2 4 false null 0 0 0
|
||||
8019 true 6 2 5 false null 0 0 0
|
||||
8020 true 6 2 5 false null 0 0 0
|
||||
8021 true 6 2 5 false null 0 0 0
|
||||
8022 true 6 2 5 false null 0 0 0
|
||||
8023 true 6 2 5 false null 0 0 0
|
||||
8024 true 6 2 5 false null 0 0 0
|
||||
8025 true 6 2 4 false null 0 0 0
|
||||
8026 true 6 2 4 false null 0 0 0
|
||||
8027 true 6 2 4 false null 0 0 0
|
||||
8028 true 6 2 4 false null 0 0 0
|
||||
8029 true 6 2 4 false null 0 0 0
|
||||
8030 true 6 2 4 false null 0 0 0
|
||||
8031 true 6 2 5 false null 0 0 0
|
||||
8032 true 6 2 5 false null 0 0 0
|
||||
8033 true 6 2 5 false null 0 0 0
|
||||
8034 true 6 2 5 false null 0 0 0
|
||||
8035 true 6 2 5 false null 0 0 0
|
||||
8036 true 6 2 5 false null 0 0 0
|
||||
8037 true 6 2 5 false null 0 0 0
|
||||
8038 true 6 2 5 false null 0 0 0
|
||||
8039 true 6 2 5 false null 0 0 0
|
||||
8040 true 6 2 5 false null 0 0 0
|
||||
8041 true 6 2 5 false null 0 0 0
|
||||
8042 true 6 2 5 false null 0 0 0
|
||||
8043 true 6 2 5 false null 0 0 0
|
||||
8044 true 6 2 5 false null 0 0 0
|
||||
8045 true 6 2 5 false null 0 0 0
|
||||
8046 true 6 2 5 false null 0 0 0
|
||||
8047 true 6 2 5 false null 0 0 0
|
||||
8048 true 6 2 5 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
|
||||
|
@ -292,4 +387,4 @@ int bool int int int bool mut,int#int,1 int int int
|
|||
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
|
||||
400001 true 5 3 5 false 14#1000 1 2 1
|
||||
|
|
|
@ -1,69 +1,101 @@
|
|||
Id Reward ItemName Pool Weight OpenRules
|
||||
int mut,int#int,1 string int int int,int#int,1
|
||||
2 10002#1 角色2 1 11 null
|
||||
3 10003#1 角色3 1 11 null
|
||||
4 10004#1 角色4 1 8 null
|
||||
5 10005#1 角色5 1 11 null
|
||||
6 10006#1 角色6 1 11 null
|
||||
7 10007#1 角色7 1 11 null
|
||||
8 10008#1 角色8 1 8 null
|
||||
9 10009#1 角色9 1 11 null
|
||||
10 10010#1 角色10 1 5 null
|
||||
11 10011#1 角色11 1 11 null
|
||||
12 10012#1 角色12 1 8 null
|
||||
13 10013#1 角色13 1 11 null
|
||||
14 10014#1 角色14 1 5 null
|
||||
15 10015#1 角色15 1 11 null
|
||||
16 10016#1 角色16 1 8 null
|
||||
17 10017#1 角色17 1 11 null
|
||||
18 10018#1 角色18 1 5 null
|
||||
19 10019#1 角色19 1 5 null
|
||||
20 10020#1 角色20 1 11 null
|
||||
21 10021#1 角色21 1 95 null
|
||||
22 10022#1 角色22 1 95 null
|
||||
23 10023#1 角色23 1 95 null
|
||||
24 10024#1 角色24 1 95 null
|
||||
25 10025#1 角色25 1 95 null
|
||||
26 10026#1 角色26 1 95 null
|
||||
27 10027#1 角色27 1 95 null
|
||||
28 10028#1 角色28 1 95 null
|
||||
29 10029#1 角色29 1 95 null
|
||||
30 10030#1 角色30 1 95 null
|
||||
31 10031#1 角色31 1 95 null
|
||||
32 10032#1 角色32 1 95 null
|
||||
33 10033#1 角色33 1 95 null
|
||||
34 10034#1 角色34 1 95 null
|
||||
35 10035#1 角色35 1 95 null
|
||||
36 10036#1 角色36 1 95 null
|
||||
37 10037#1 角色37 1 95 null
|
||||
38 10038#1 角色38 1 95 null
|
||||
39 10039#1 角色39 1 47 null
|
||||
40 10040#1 角色40 1 47 null
|
||||
41 10041#1 角色41 1 95 null
|
||||
42 10042#1 角色42 1 95 null
|
||||
43 10043#1 角色43 1 600 null
|
||||
44 10044#1 角色44 1 600 null
|
||||
45 10045#1 角色45 1 600 null
|
||||
46 10046#1 角色46 1 600 null
|
||||
47 10047#1 角色47 1 600 null
|
||||
48 10048#1 角色48 1 600 null
|
||||
49 10049#1 角色49 1 600 null
|
||||
50 10050#1 角色50 1 600 null
|
||||
51 10051#1 角色51 1 600 null
|
||||
52 10052#1 角色52 1 600 null
|
||||
57 10035#1 角色35 11 100 null
|
||||
58 10036#1 角色36 11 100 null
|
||||
59 10037#1 角色37 11 100 null
|
||||
60 10038#1 角色38 11 100 null
|
||||
61 10031#1 角色31 12 100 null
|
||||
62 10032#1 角色32 12 100 null
|
||||
63 10033#1 角色33 12 100 null
|
||||
64 10034#1 角色34 12 100 null
|
||||
65 10026#1 角色26 13 100 null
|
||||
66 10027#1 角色27 13 100 null
|
||||
67 10028#1 角色28 13 100 null
|
||||
68 10029#1 角色29 13 100 null
|
||||
69 10021#1 角色21 14 100 null
|
||||
70 10022#1 角色22 14 100 null
|
||||
71 10023#1 角色23 14 100 null
|
||||
72 10024#1 角色24 14 100 null
|
||||
Id Reward Pool Weight OpenRules
|
||||
int mut,int#int,1 int int int,int#int,1
|
||||
2 10002#1 1 11 null
|
||||
3 10003#1 1 11 null
|
||||
4 10004#1 1 8 null
|
||||
5 10005#1 1 11 null
|
||||
6 10006#1 1 11 null
|
||||
7 10007#1 1 11 null
|
||||
8 10008#1 1 8 null
|
||||
9 10009#1 1 11 null
|
||||
10 10010#1 1 5 null
|
||||
11 10011#1 1 11 null
|
||||
12 10012#1 1 8 null
|
||||
13 10013#1 1 11 null
|
||||
14 10014#1 1 5 null
|
||||
15 10015#1 1 11 null
|
||||
16 10016#1 1 8 null
|
||||
17 10017#1 1 11 null
|
||||
18 10018#1 1 5 null
|
||||
19 10019#1 1 5 null
|
||||
20 10020#1 1 11 null
|
||||
21 10021#1 1 95 null
|
||||
22 10022#1 1 95 null
|
||||
23 10023#1 1 95 null
|
||||
24 10024#1 1 95 null
|
||||
25 10025#1 1 95 null
|
||||
26 10026#1 1 95 null
|
||||
27 10027#1 1 95 null
|
||||
28 10028#1 1 95 null
|
||||
29 10029#1 1 95 null
|
||||
30 10030#1 1 95 null
|
||||
31 10031#1 1 95 null
|
||||
32 10032#1 1 95 null
|
||||
33 10033#1 1 95 null
|
||||
34 10034#1 1 95 null
|
||||
35 10035#1 1 95 null
|
||||
36 10036#1 1 95 null
|
||||
37 10037#1 1 95 null
|
||||
38 10038#1 1 95 null
|
||||
39 10039#1 1 47 null
|
||||
40 10040#1 1 47 null
|
||||
41 10041#1 1 95 null
|
||||
42 10042#1 1 95 null
|
||||
43 10043#1 1 600 null
|
||||
44 10044#1 1 600 null
|
||||
45 10045#1 1 600 null
|
||||
46 10046#1 1 600 null
|
||||
47 10047#1 1 600 null
|
||||
48 10048#1 1 600 null
|
||||
49 10049#1 1 600 null
|
||||
50 10050#1 1 600 null
|
||||
51 10051#1 1 600 null
|
||||
52 10052#1 1 600 null
|
||||
57 10001#1 11 20 null
|
||||
58 10007#1 11 60 null
|
||||
59 10010#1 11 60 null
|
||||
60 10021#1 11 60 null
|
||||
61 10036#1 11 150 null
|
||||
62 10037#1 11 150 null
|
||||
63 10039#1 11 150 null
|
||||
64 10043#1 11 150 null
|
||||
65 12008#10 11 50 null
|
||||
66 12008#8 11 50 null
|
||||
67 12008#12 11 50 null
|
||||
68 12008#10 11 50 null
|
||||
69 10006#1 12 60 null
|
||||
70 10012#1 12 20 null
|
||||
71 10016#1 12 60 null
|
||||
72 10020#1 12 60 null
|
||||
73 10025#1 12 150 null
|
||||
74 10038#1 12 150 null
|
||||
75 10040#1 12 150 null
|
||||
76 10041#1 12 150 null
|
||||
77 12009#10 12 50 null
|
||||
78 12009#8 12 50 null
|
||||
79 12009#12 12 50 null
|
||||
80 12009#10 12 50 null
|
||||
81 10002#1 13 60 null
|
||||
82 10004#1 13 20 null
|
||||
83 10019#1 13 60 null
|
||||
84 10022#1 13 60 null
|
||||
85 10024#1 13 150 null
|
||||
86 10030#1 13 150 null
|
||||
87 10042#1 13 150 null
|
||||
88 10045#1 13 150 null
|
||||
89 12011#10 13 50 null
|
||||
90 12011#8 13 50 null
|
||||
91 12011#12 13 50 null
|
||||
92 12011#10 13 50 null
|
||||
93 10003#1 14 20 null
|
||||
94 10005#1 14 60 null
|
||||
95 10011#1 14 60 null
|
||||
96 10013#1 14 60 null
|
||||
97 10029#1 14 150 null
|
||||
98 10031#1 14 150 null
|
||||
99 10032#1 14 150 null
|
||||
100 10033#1 14 150 null
|
||||
101 12010#10 14 50 null
|
||||
102 12010#8 14 50 null
|
||||
103 12010#12 14 50 null
|
||||
104 12010#10 14 50 null
|
||||
|
|
|
@ -29,7 +29,7 @@ public class SPropertyConfig implements BaseConfig {
|
|||
int propertyId = sPropertyConfig.getPropertyId();
|
||||
sPropertyConfigByPIDMapTmp.put(propertyId,sPropertyConfig);
|
||||
}
|
||||
sPropertyConfigByPIDMapTmp = sPropertyConfigByPIDMap;
|
||||
sPropertyConfigByPIDMap = sPropertyConfigByPIDMapTmp;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,8 @@ import com.ljsd.jieling.protocols.HeroInfoProto;
|
|||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Component
|
||||
public class EquipUnLoadOptHandler extends BaseHandler {
|
||||
@Override
|
||||
|
@ -17,9 +19,8 @@ public class EquipUnLoadOptHandler extends BaseHandler {
|
|||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
HeroInfoProto.EquipUnLoadOptRequest equipUnLoadOptRequest = HeroInfoProto.EquipUnLoadOptRequest.parseFrom(netData.parseClientProtoNetData());
|
||||
int type = equipUnLoadOptRequest.getType();
|
||||
String equipId = equipUnLoadOptRequest.getEquipId();
|
||||
List<String> equipIdsList = equipUnLoadOptRequest.getEquipIdsList();
|
||||
String heroId = equipUnLoadOptRequest.getHeroId();
|
||||
HeroLogic.getInstance().unloadEquipOpt(iSession,type,heroId,equipId);
|
||||
HeroLogic.getInstance().unloadEquipOpt(iSession,heroId,equipIdsList);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@ public class GMRequestHandler extends BaseHandler{
|
|||
byte[] message = netData.parseClientProtoNetData();
|
||||
CommonProto.GMCommand gmCommand = CommonProto.GMCommand.parseFrom(message);
|
||||
String command = gmCommand.getCommand();
|
||||
LOGGER.info("gm commond is {}",command);
|
||||
if (!command.contains("#") || command.split("#").length < 3) {
|
||||
LOGGER.error("wrong command :" + command);
|
||||
return;
|
||||
|
@ -50,7 +51,8 @@ public class GMRequestHandler extends BaseHandler{
|
|||
User cUser = UserManager.getUser(uid);
|
||||
switch (gmCommandType){
|
||||
case GlobalGm.ADD_ITEM:
|
||||
giveItem(cUser,prarm1,prarm2);
|
||||
ItemUtil.drop(cUser,new int[][]{{prarm1,prarm2}});
|
||||
// giveItem(cUser,prarm1,prarm2);
|
||||
break;
|
||||
case GlobalGm.ADD_CARD:
|
||||
giveHero(cUser,prarm1,prarm2);
|
||||
|
|
|
@ -136,17 +136,17 @@ public class Hero extends MongoBase {
|
|||
}
|
||||
|
||||
public void setEquipByPositionMap(Map<Integer, String> equipByPositionMap) throws Exception {
|
||||
updateString("breakId",breakId);
|
||||
updateString("equipByPositionMap",equipByPositionMap);
|
||||
this.equipByPositionMap = equipByPositionMap;
|
||||
}
|
||||
|
||||
public void updateEquipPositionMap(int position,String equipId) throws Exception {
|
||||
updateString("breakId." + position ,breakId);
|
||||
updateString("equipByPositionMap." + position ,equipId);
|
||||
this.equipByPositionMap.put(position,equipId);
|
||||
}
|
||||
|
||||
public void removeEquip(int position){
|
||||
removeString("breakId." + position);
|
||||
removeString("equipByPositionMap." + position);
|
||||
this.equipByPositionMap.remove(position);
|
||||
}
|
||||
|
||||
|
@ -158,4 +158,8 @@ public class Hero extends MongoBase {
|
|||
updateString("breakId",breakId);
|
||||
this.breakId = breakId;
|
||||
}
|
||||
|
||||
public int getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ public class User extends MongoRoot {
|
|||
equipManager.init(this,"equipManager",false);
|
||||
missionManager.init(this, "missionManager", false);
|
||||
adventureManager.init(this,"adventureManager",false);
|
||||
adventureManager.init(this,"pokemonManager",false);
|
||||
pokemonManager.init(this,"pokemonManager",false);
|
||||
}
|
||||
|
||||
public static void init(LjsdMongoTemplate ljsdMongoTemplate) {
|
||||
|
|
|
@ -33,6 +33,7 @@ public class HeroLogic {
|
|||
}
|
||||
|
||||
|
||||
|
||||
public static class Instance {
|
||||
public final static HeroLogic instance = new HeroLogic();
|
||||
}
|
||||
|
@ -240,7 +241,7 @@ public class HeroLogic {
|
|||
|
||||
public String checkTeamPos(User user, int teamId,List<CommonProto.TeamHeroInfo> heroIds, List<CommonProto.TeamPokemonInfo> pokemonoIds ){
|
||||
if(heroIds ==null || heroIds.isEmpty()){
|
||||
return "队伍信息错误";
|
||||
return "";
|
||||
}
|
||||
|
||||
Set<String> cacheHeroIds = new HashSet<>();
|
||||
|
@ -630,9 +631,11 @@ public class HeroLogic {
|
|||
Hero hero = user.getHeroManager().getHero(heroId);
|
||||
Equip equip = user.getEquipManager().getEquipMap().get(equipId);
|
||||
if( null == equip || null == hero ){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
if(!StringUtil.isEmpty(equip.getHeroId())){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
int equipIdTid = equip.getEquipId();
|
||||
|
@ -641,38 +644,43 @@ public class HeroLogic {
|
|||
int professionLimit = sEquipConfig.getProfessionLimit();
|
||||
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
||||
if(professionLimit!=0 && scHero.getProfession()!= professionLimit){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_WEAR_REQUEST_VALUE,"");
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
|
||||
hero.updateEquipPositionMap(position,equipId);
|
||||
|
||||
LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero));
|
||||
//LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero));
|
||||
|
||||
//发送成功消息
|
||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_REQUEST_VALUE,null,true);
|
||||
MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,null,true);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void unloadEquipOpt(ISession session,int type,String heroId,String equipId) throws Exception {
|
||||
public void unloadEquipOpt(ISession session,String heroId,List<String> equipIds) throws Exception {
|
||||
int uid = session.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
Equip equip = user.getEquipManager().getEquipMap().get(equipId);
|
||||
Hero hero = user.getHeroManager().getHero(heroId);
|
||||
if( hero == null|| null == equip || !StringUtil.isEmpty(equip.getHeroId()) ){
|
||||
if( hero == null || equipIds.isEmpty()){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_UNLOAD_OPT_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
int equipIdTid = equip.getEquipId();
|
||||
SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equipIdTid);
|
||||
int position = sEquipConfig.getPosition();
|
||||
|
||||
if(type == 1){
|
||||
equip.setHeroId("");
|
||||
hero.removeEquip(position);
|
||||
List<Integer> positions = new ArrayList<>();
|
||||
for(String equipId : equipIds){
|
||||
Equip equip = user.getEquipManager().getEquipMap().get(equipId);
|
||||
if(null == equip || !StringUtil.isEmpty(equip.getHeroId())){
|
||||
MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.EQUIP_UNLOAD_OPT_RESPONSE_VALUE,"");
|
||||
return;
|
||||
}
|
||||
int equipIdTid = equip.getEquipId();
|
||||
SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equipIdTid);
|
||||
int position = sEquipConfig.getPosition();
|
||||
positions.add(position);
|
||||
}
|
||||
if(type == 2){
|
||||
hero.setEquipByPositionMap(new HashMap<>());
|
||||
|
||||
for(Integer position : positions){
|
||||
hero.removeEquip(position);
|
||||
}
|
||||
|
||||
//发送成功消息
|
||||
|
|
|
@ -294,16 +294,16 @@ public class ProtocolsManager implements ProtocolsAbstract {
|
|||
return;
|
||||
}
|
||||
|
||||
ISession nowSession = (ISession) GameMessageHandler.currentSessions.get(session.getUid());
|
||||
if (nowSession == null) {
|
||||
LOGGER.info("offLine->uid={},session={},, nowSession is null",
|
||||
session.getUid(), session);
|
||||
return;
|
||||
}
|
||||
if (nowSession != null && !session.getId().equals(nowSession.getId())) {
|
||||
LOGGER.error("offLine->uid={},nowUid={}", session.getUid(), nowSession.getId());
|
||||
return;
|
||||
}
|
||||
// ISession nowSession = (ISession) GameMessageHandler.currentSessions.get(session.getUid());
|
||||
// if (nowSession == null) {
|
||||
// LOGGER.info("offLine->uid={},session={},, nowSession is null",
|
||||
// session.getUid(), session);
|
||||
// return;
|
||||
// }
|
||||
// if (nowSession != null && !session.getId().equals(nowSession.getId())) {
|
||||
// LOGGER.error("offLine->uid={},nowUid={}", session.getUid(), nowSession.getId());
|
||||
// return;
|
||||
// }
|
||||
|
||||
GameMessageHandler.currentSessions.remove(session.getUid());
|
||||
|
||||
|
|
|
@ -37,6 +37,11 @@ public class CBean2Proto {
|
|||
}
|
||||
|
||||
public static CommonProto.Hero getHero(Hero hero){
|
||||
Map<Integer, String> equipByPositionMap = hero.getEquipByPositionMap();
|
||||
List<String> equipList = new ArrayList<>();
|
||||
for(String equipId : equipByPositionMap.values()){
|
||||
equipList.add(equipId);
|
||||
}
|
||||
CommonProto.Hero heroProto = CommonProto.Hero
|
||||
.newBuilder()
|
||||
.setId(hero.getId())
|
||||
|
@ -44,8 +49,9 @@ public class CBean2Proto {
|
|||
.setLevel(hero.getLevel())
|
||||
.setStar(hero.getStar())
|
||||
.setBreakId(hero.getBreakId())
|
||||
.setCreateTime(hero.getCreateTime())
|
||||
.addAllSkillIdList(hero.getSkillList())
|
||||
// .addAllEquipIdList(getHeroEquip(hero.getEquipList()))
|
||||
.addAllEquipIdList(equipList)
|
||||
.build();
|
||||
return heroProto;
|
||||
}
|
||||
|
|
|
@ -152,7 +152,7 @@ public class ItemUtil {
|
|||
putcountMap(itemId, itemNum, cardMap);
|
||||
break;
|
||||
case GlobalItemType.EQUIP:
|
||||
putcountMap(itemId, itemNum, cardMap);
|
||||
putcountMap(itemId, itemNum, equipMap);
|
||||
break;
|
||||
case GlobalItemType.RANDOM_ITME:
|
||||
putcountMap(itemId, itemNum, randomMap);
|
||||
|
|
|
@ -170,7 +170,7 @@ public class ExcelUtils {
|
|||
int colnum = row1.getLastCellNum();
|
||||
for (int j = 1; j < colnum; j++) {
|
||||
int cellFormatValue = (int) getCellFormatValue(row1.getCell(j),null);
|
||||
if (cellFormatValue == 3){
|
||||
if (cellFormatValue == 3 || cellFormatValue == 0){
|
||||
continue;
|
||||
}
|
||||
Cell cell = row.getCell(j);
|
||||
|
|
Loading…
Reference in New Issue