Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
cbea3a4ecd
|
@ -1,77 +1,77 @@
|
|||
Id Type OpenRules Mineral RunesNum SpecialRunes Exp
|
||||
int int mut,int#int,1 mut,int#int,1 int mut,int#int,1 int
|
||||
3001 1 null 1007#1 1 null 0
|
||||
3002 1 null 1007#1 2 null 0
|
||||
3003 1 null 1007#1 1 null 0
|
||||
3004 1 null 1007#1 2 null 0
|
||||
3005 1 null 1007#1 1 null 0
|
||||
3006 1 null 1007#1 2 null 0
|
||||
3007 1 null 1007#1 1 null 0
|
||||
3008 1 null 1007#1 2 null 0
|
||||
3009 1 null 1007#1 1 null 0
|
||||
3010 1 null 1007#1 2 null 0
|
||||
3011 1 null 1007#1 1 null 0
|
||||
3012 1 null 1007#1 2 null 0
|
||||
3013 1 null 1007#1 1 null 0
|
||||
3014 1 null 1007#1 2 null 0
|
||||
3015 1 null 1007#1 1 null 0
|
||||
3016 1 null 1007#1 2 null 0
|
||||
3017 1 null 1007#1 1 null 0
|
||||
3018 1 null 1007#1 2 null 0
|
||||
3101 1 null 1007#1 1 null 0
|
||||
3102 1 null 1007#1 2 null 0
|
||||
3103 1 null 1007#1 1 null 0
|
||||
3104 1 null 1007#1 2 null 0
|
||||
3105 1 null 1007#1 1 null 0
|
||||
3106 1 null 1007#1 2 null 0
|
||||
3107 1 null 1007#1 1 null 0
|
||||
3108 1 null 1007#1 2 null 0
|
||||
3109 1 null 1007#1 1 null 0
|
||||
3110 1 null 1007#1 2 null 0
|
||||
3111 1 null 1007#1 1 null 0
|
||||
3112 1 null 1007#1 2 null 0
|
||||
3113 1 null 1007#1 1 null 0
|
||||
3114 1 null 1007#1 2 null 0
|
||||
3115 1 null 1007#1 1 null 0
|
||||
3116 1 null 1007#1 2 null 0
|
||||
3117 1 null 1007#1 1 null 0
|
||||
3118 1 null 1007#1 2 null 0
|
||||
3201 1 null 1008#1 1 null 0
|
||||
3202 1 null 1008#1 2 null 0
|
||||
3203 1 null 1008#1 1 null 0
|
||||
3204 1 null 1008#1 2 null 0
|
||||
3205 1 null 1008#1 1 null 0
|
||||
3206 1 null 1008#1 2 null 0
|
||||
3207 1 null 1008#1 1 null 0
|
||||
3208 1 null 1008#1 2 null 0
|
||||
3209 1 null 1008#1 1 null 0
|
||||
3210 1 null 1008#1 2 null 0
|
||||
3211 1 null 1008#1 1 null 0
|
||||
3212 1 null 1008#1 2 null 0
|
||||
3213 1 null 1008#1 1 null 0
|
||||
3214 1 null 1008#1 2 null 0
|
||||
3215 1 null 1008#1 1 null 0
|
||||
3216 1 null 1008#1 2 null 0
|
||||
3217 1 null 1008#1 1 null 0
|
||||
3218 1 null 1008#1 2 null 0
|
||||
3301 1 null 1009#1 1 null 0
|
||||
3302 1 null 1009#1 2 null 0
|
||||
3303 1 null 1009#1 1 null 0
|
||||
3304 1 null 1009#1 2 null 0
|
||||
3305 1 null 1009#1 1 null 0
|
||||
3306 1 null 1009#1 2 null 0
|
||||
3307 1 null 1009#1 1 null 0
|
||||
3308 1 null 1009#1 2 null 0
|
||||
3309 1 null 1009#1 1 null 0
|
||||
3310 1 null 1009#1 2 null 0
|
||||
3311 1 null 1009#1 1 null 0
|
||||
3312 1 null 1009#1 2 null 0
|
||||
3313 1 null 1009#1 1 null 0
|
||||
3314 1 null 1009#1 2 null 0
|
||||
3315 1 null 1009#1 1 null 0
|
||||
3316 1 null 1009#1 2 null 0
|
||||
3317 1 null 1009#1 1 null 0
|
||||
3318 1 null 1009#1 2 null 0
|
||||
int int mut,int#int,1 mut,int#int,1 int mut,int#int,2 int
|
||||
3001 1 1#1 1007#1 1 null 0
|
||||
3002 1 1#1 1007#1 2 null 0
|
||||
3003 1 1#1 1007#1 1 null 0
|
||||
3004 1 1#1 1007#1 2 null 0
|
||||
3005 1 1#1 1007#1 1 null 0
|
||||
3006 1 1#1 1007#1 2 null 0
|
||||
3007 1 1#1 1007#1 1 null 0
|
||||
3008 1 1#1 1007#1 2 null 0
|
||||
3009 1 1#1 1007#1 1 null 0
|
||||
3010 1 1#1 1007#1 2 null 0
|
||||
3011 1 1#1 1007#1 1 null 0
|
||||
3012 1 1#1 1007#1 2 null 0
|
||||
3013 1 1#1 1007#1 1 null 0
|
||||
3014 1 1#1 1007#1 2 null 0
|
||||
3015 1 1#1 1007#1 1 null 0
|
||||
3016 1 1#1 1007#1 2 null 0
|
||||
3017 1 1#1 1007#1 1 null 0
|
||||
3018 1 1#1 1007#1 2 null 0
|
||||
3101 1 1#1 1007#1 1 null 0
|
||||
3102 1 1#1 1007#1 2 null 0
|
||||
3103 1 1#1 1007#1 1 null 0
|
||||
3104 1 1#1 1007#1 2 null 0
|
||||
3105 1 1#1 1007#1 1 null 0
|
||||
3106 1 1#1 1007#1 2 null 0
|
||||
3107 1 1#1 1007#1 1 null 0
|
||||
3108 1 1#1 1007#1 2 null 0
|
||||
3109 1 1#1 1007#1 1 null 0
|
||||
3110 1 1#1 1007#1 2 null 0
|
||||
3111 1 1#1 1007#1 1 null 0
|
||||
3112 1 1#1 1007#1 2 null 0
|
||||
3113 1 1#1 1007#1 1 null 0
|
||||
3114 1 1#1 1007#1 2 null 0
|
||||
3115 1 1#2 1007#1 1 null 0
|
||||
3116 1 1#3 1007#1 2 null 0
|
||||
3117 1 1#4 1007#1 1 null 0
|
||||
3118 1 1#5 1007#1 2 null 0
|
||||
3201 1 1#6 1008#1 1 null 0
|
||||
3202 1 1#7 1008#1 2 null 0
|
||||
3203 1 1#8 1008#1 1 null 0
|
||||
3204 1 1#9 1008#1 2 null 0
|
||||
3205 1 1#10 1008#1 1 null 0
|
||||
3206 1 1#11 1008#1 2 null 0
|
||||
3207 1 1#12 1008#1 1 null 0
|
||||
3208 1 1#13 1008#1 2 null 0
|
||||
3209 1 1#14 1008#1 1 null 0
|
||||
3210 1 1#15 1008#1 2 null 0
|
||||
3211 1 1#16 1008#1 1 null 0
|
||||
3212 1 1#17 1008#1 2 null 0
|
||||
3213 1 1#18 1008#1 1 null 0
|
||||
3214 1 1#19 1008#1 2 null 0
|
||||
3215 1 1#20 1008#1 1 null 0
|
||||
3216 1 1#21 1008#1 2 null 0
|
||||
3217 1 1#22 1008#1 1 null 0
|
||||
3218 1 1#23 1008#1 2 null 0
|
||||
3301 1 1#24 1009#1 1 null 0
|
||||
3302 1 1#25 1009#1 2 null 0
|
||||
3303 1 1#26 1009#1 1 null 0
|
||||
3304 1 1#27 1009#1 2 null 0
|
||||
3305 1 1#28 1009#1 1 null 0
|
||||
3306 1 1#29 1009#1 2 null 0
|
||||
3307 1 1#30 1009#1 1 null 0
|
||||
3308 1 1#31 1009#1 2 null 0
|
||||
3309 1 1#32 1009#1 1 null 0
|
||||
3310 1 1#33 1009#1 2 null 0
|
||||
3311 1 1#34 1009#1 1 null 0
|
||||
3312 1 1#35 1009#1 2 null 0
|
||||
3313 1 1#36 1009#1 1 null 0
|
||||
3314 1 1#37 1009#1 2 null 0
|
||||
3315 1 1#38 1009#1 1 null 0
|
||||
3316 1 1#39 1009#1 2 null 0
|
||||
3317 1 1#40 1009#1 1 null 0
|
||||
3318 1 1#41 1009#1 2 null 0
|
||||
4001 1 2#7001 1008#1 2 null 0
|
||||
4002 1 2#7002 1008#1 2 null 0
|
||||
4003 1 2#7003 1008#1 2 null 0
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Id Type OpenRules Cost Exp Num
|
||||
int int mut,int#int,1 mut,int#int,2 int int
|
||||
1007 0 null null 0 0
|
||||
1008 0 null null 0 0
|
||||
1009 0 null null 0 0
|
||||
1007 1 1#1 1005#100 1 5
|
||||
1008 1 1#2 1005#101 1 5
|
||||
1009 1 1#3 1005#102 1 5
|
||||
0 0 null null 0 0
|
||||
|
|
|
@ -1,103 +1,103 @@
|
|||
Id Exp Promote FoodExp AddNum PoolRate AddSuccessRate
|
||||
int int mut,int#int,1 int float mut,float#float,1 float
|
||||
0 0 null 0 int null 0.0
|
||||
1 1000 1#1 0 int null 0.0
|
||||
2 1500 2#1 0 int null 0.0
|
||||
3 2000 3#1 0 int null 0.0
|
||||
4 2500 4#1 0 int null 0.0
|
||||
5 2500 5#1 0 int null 0.0
|
||||
6 3500 1#3 0 int null 0.0
|
||||
7 4000 2#3 0 int null 0.0
|
||||
8 4500 3#3 0 int null 0.0
|
||||
9 5000 4#3 0 int null 0.0
|
||||
10 5500 5#3 0 int null 0.0
|
||||
11 6000 1#6 0 int null 0.0
|
||||
12 6500 2#6 0 int null 0.0
|
||||
13 7000 3#6 0 int null 0.0
|
||||
14 7500 4#6 0 int null 0.0
|
||||
15 8000 5#6 0 int null 0.0
|
||||
16 8500 1#10 0 int null 0.0
|
||||
17 9000 2#10 0 int null 0.0
|
||||
18 9500 3#10 0 int null 0.0
|
||||
19 10000 4#10 0 int null 0.0
|
||||
20 10500 5#10 0 int null 0.0
|
||||
21 11000 1#15 0 int null 0.0
|
||||
22 11500 2#15 0 int null 0.0
|
||||
23 12000 3#15 0 int null 0.0
|
||||
24 12500 4#15 0 int null 0.0
|
||||
25 13000 5#15 0 int null 0.0
|
||||
26 13500 1#21 0 int null 0.0
|
||||
27 14000 2#21 0 int null 0.0
|
||||
28 14500 3#21 0 int null 0.0
|
||||
29 15000 4#21 0 int null 0.0
|
||||
30 15500 5#21 0 int null 0.0
|
||||
31 16000 1#28 0 int null 0.0
|
||||
32 16500 2#28 0 int null 0.0
|
||||
33 17000 3#28 0 int null 0.0
|
||||
34 17500 4#28 0 int null 0.0
|
||||
35 18000 5#28 0 int null 0.0
|
||||
36 18500 1#36 0 int null 0.0
|
||||
37 19000 2#36 0 int null 0.0
|
||||
38 19500 3#36 0 int null 0.0
|
||||
39 20000 4#36 0 int null 0.0
|
||||
40 20500 5#36 0 int null 0.0
|
||||
41 21000 1#45 0 int null 0.0
|
||||
42 21500 2#45 0 int null 0.0
|
||||
43 22000 3#45 0 int null 0.0
|
||||
44 22500 4#45 0 int null 0.0
|
||||
45 23000 5#45 0 int null 0.0
|
||||
46 23500 1#55 0 int null 0.0
|
||||
47 24000 2#55 0 int null 0.0
|
||||
48 24500 3#55 0 int null 0.0
|
||||
49 25000 4#55 0 int null 0.0
|
||||
50 25500 5#55 0 int null 0.0
|
||||
51 26000 1#65 0 int null 0.0
|
||||
52 26500 2#65 0 int null 0.0
|
||||
53 27000 3#65 0 int null 0.0
|
||||
54 27500 4#65 0 int null 0.0
|
||||
55 28000 5#65 0 int null 0.0
|
||||
56 28500 1#76 0 int null 0.0
|
||||
57 29000 2#76 0 int null 0.0
|
||||
58 29500 3#76 0 int null 0.0
|
||||
59 30000 4#76 0 int null 0.0
|
||||
60 30500 5#76 0 int null 0.0
|
||||
61 31000 1#88 0 int null 0.0
|
||||
62 31500 2#88 0 int null 0.0
|
||||
63 32000 3#88 0 int null 0.0
|
||||
64 32500 4#88 0 int null 0.0
|
||||
65 33000 5#88 0 int null 0.0
|
||||
66 33500 1#101 0 int null 0.0
|
||||
67 34000 2#101 0 int null 0.0
|
||||
68 34500 3#101 0 int null 0.0
|
||||
69 35000 4#101 0 int null 0.0
|
||||
70 35500 5#101 0 int null 0.0
|
||||
71 36000 1#115 0 int null 0.0
|
||||
72 36500 2#115 0 int null 0.0
|
||||
73 37000 3#115 0 int null 0.0
|
||||
74 37500 4#115 0 int null 0.0
|
||||
75 38000 5#115 0 int null 0.0
|
||||
76 38500 1#130 0 int null 0.0
|
||||
77 39000 2#130 0 int null 0.0
|
||||
78 39500 3#130 0 int null 0.0
|
||||
79 40000 4#130 0 int null 0.0
|
||||
80 40500 5#130 0 int null 0.0
|
||||
81 41000 1#146 0 int null 0.0
|
||||
82 41500 2#146 0 int null 0.0
|
||||
83 42000 3#146 0 int null 0.0
|
||||
84 42500 4#146 0 int null 0.0
|
||||
85 43000 5#146 0 int null 0.0
|
||||
86 43500 1#163 0 int null 0.0
|
||||
87 44000 2#163 0 int null 0.0
|
||||
88 44500 3#163 0 int null 0.0
|
||||
89 45000 4#163 0 int null 0.0
|
||||
90 45500 5#163 0 int null 0.0
|
||||
91 46000 1#181 0 int null 0.0
|
||||
92 46500 2#181 0 int null 0.0
|
||||
93 47000 3#181 0 int null 0.0
|
||||
94 47500 4#181 0 int null 0.0
|
||||
95 48000 5#181 0 int null 0.0
|
||||
96 48500 1#200 0 int null 0.0
|
||||
97 49000 2#200 0 int null 0.0
|
||||
98 49500 3#200 0 int null 0.0
|
||||
99 50000 4#200 0 int null 0.0
|
||||
100 50500 5#200 0 int null 0.0
|
||||
int int mut,int#int,1 int float mut,int#int,2 float
|
||||
0 0 null 0 0.0 null 0.0
|
||||
1 1000 1#1 0 0.0 null 0.0
|
||||
2 1500 2#1 0 0.0 null 0.0
|
||||
3 2000 3#1 0 0.0 null 0.0
|
||||
4 2500 4#1 0 0.0 null 0.0
|
||||
5 2500 5#1 0 0.0 null 0.0
|
||||
6 3500 1#3 0 0.0 null 0.0
|
||||
7 4000 2#3 0 0.0 null 0.0
|
||||
8 4500 3#3 0 0.0 null 0.0
|
||||
9 5000 4#3 0 0.0 null 0.0
|
||||
10 5500 5#3 0 0.0 null 0.0
|
||||
11 6000 1#6 0 0.0 null 0.0
|
||||
12 6500 2#6 0 0.0 null 0.0
|
||||
13 7000 3#6 0 0.0 null 0.0
|
||||
14 7500 4#6 0 0 null 0.0
|
||||
15 8000 5#6 0 0.0 null 0.0
|
||||
16 8500 1#10 0 0.0 null 0.0
|
||||
17 9000 2#10 0 0.0 null 0.0
|
||||
18 9500 3#10 0 0.0 null 0.0
|
||||
19 10000 4#10 0 0.0 null 0.0
|
||||
20 10500 5#10 0 0.0 null 0.0
|
||||
21 11000 1#15 0 0.0 null 0.0
|
||||
22 11500 2#15 0 0.0 null 0.0
|
||||
23 12000 3#15 0 0.0 null 0.0
|
||||
24 12500 4#15 0 0.0 null 0.0
|
||||
25 13000 5#15 0 0.0 null 0.0
|
||||
26 13500 1#21 0 0.0 null 0.0
|
||||
27 14000 2#21 0 0.0 null 0.0
|
||||
28 14500 3#21 0 0.0 null 0.0
|
||||
29 15000 4#21 0 0.0 null 0.0
|
||||
30 15500 5#21 0 0.0 null 0.0
|
||||
31 16000 1#28 0 0.0 null 0.0
|
||||
32 16500 2#28 0 0.0 null 0.0
|
||||
33 17000 3#28 0 0.0 null 0.0
|
||||
34 17500 4#28 0 0.0 null 0.0
|
||||
35 18000 5#28 0 0.0 null 0.0
|
||||
36 18500 1#36 0 0.0 null 0.0
|
||||
37 19000 2#36 0 0.0 null 0.0
|
||||
38 19500 3#36 0 0.0 null 0.0
|
||||
39 20000 4#36 0 0.0 null 0.0
|
||||
40 20500 5#36 0 0.0 null 0.0
|
||||
41 21000 1#45 0 0.0 null 0.0
|
||||
42 21500 2#45 0 0.0 null 0.0
|
||||
43 22000 3#45 0 0.0 null 0.0
|
||||
44 22500 4#45 0 0.0 null 0.0
|
||||
45 23000 5#45 0 0.0 null 0.0
|
||||
46 23500 1#55 0 0.0 null 0.0
|
||||
47 24000 2#55 0 0.0 null 0.0
|
||||
48 24500 3#55 0 0.0 null 0.0
|
||||
49 25000 4#55 0 0.0 null 0.0
|
||||
50 25500 5#55 0 0.0 null 0.0
|
||||
51 26000 1#65 0 0.0 null 0.0
|
||||
52 26500 2#65 0 0.0 null 0.0
|
||||
53 27000 3#65 0 0.0 null 0.0
|
||||
54 27500 4#65 0 0.0 null 0.0
|
||||
55 28000 5#65 0 0.0 null 0.0
|
||||
56 28500 1#76 0 0.0 null 0.0
|
||||
57 29000 2#76 0 0.0 null 0.0
|
||||
58 29500 3#76 0 0.0 null 0.0
|
||||
59 30000 4#76 0 0.0 null 0.0
|
||||
60 30500 5#76 0 0.0 null 0.0
|
||||
61 31000 1#88 0 0.0 null 0.0
|
||||
62 31500 2#88 0 0.0 null 0.0
|
||||
63 32000 3#88 0 0.0 null 0.0
|
||||
64 32500 4#88 0 0.0 null 0.0
|
||||
65 33000 5#88 0 0.0 null 0.0
|
||||
66 33500 1#101 0 0.0 null 0.0
|
||||
67 34000 2#101 0 0.0 null 0.0
|
||||
68 34500 3#101 0 0.0 null 0.0
|
||||
69 35000 4#101 0 0.0 null 0.0
|
||||
70 35500 5#101 0 0.0 null 0.0
|
||||
71 36000 1#115 0 0.0 null 0.0
|
||||
72 36500 2#115 0 0.0 null 0.0
|
||||
73 37000 3#115 0 0.0 null 0.0
|
||||
74 37500 4#115 0 0.0 null 0.0
|
||||
75 38000 5#115 0 0.0 null 0.0
|
||||
76 38500 1#130 0 0.0 null 0.0
|
||||
77 39000 2#130 0 0.0 null 0.0
|
||||
78 39500 3#130 0 0.0 null 0.0
|
||||
79 40000 4#130 0 0.0 null 0.0
|
||||
80 40500 5#130 0 0.0 null 0.0
|
||||
81 41000 1#146 0 0.0 null 0.0
|
||||
82 41500 2#146 0 0.0 null 0.0
|
||||
83 42000 3#146 0 0.0 null 0.0
|
||||
84 42500 4#146 0 0.0 null 0.0
|
||||
85 43000 5#146 0 0.0 null 0.0
|
||||
86 43500 1#163 0 0.0 null 0.0
|
||||
87 44000 2#163 0 0.0 null 0.0
|
||||
88 44500 3#163 0 0.0 null 0.0
|
||||
89 45000 4#163 0 0.0 null 0.0
|
||||
90 45500 5#163 0 0.0 null 0.0
|
||||
91 46000 1#181 0 0.0 null 0.0
|
||||
92 46500 2#181 0 0.0 null 0.0
|
||||
93 47000 3#181 0 0.0 null 0.0
|
||||
94 47500 4#181 0 0.0 null 0.0
|
||||
95 48000 5#181 0 0.0 null 0.0
|
||||
96 48500 1#200 0 0.0 null 0.0
|
||||
97 49000 2#200 0 0.0 null 0.0
|
||||
98 49500 3#200 0 0.0 null 0.0
|
||||
99 50000 4#200 0 0.0 null 0.0
|
||||
100 50500 5#200 0 0.0 null 0.0
|
||||
|
|
|
@ -29,6 +29,8 @@ public class User extends MongoRoot {
|
|||
|
||||
private PokemonManager pokemonManager;
|
||||
|
||||
private WorkShopController workShopController;
|
||||
|
||||
|
||||
|
||||
public User(int uid, PlayerManager playerManager, ItemManager itemManager,
|
||||
|
@ -45,6 +47,7 @@ public class User extends MongoRoot {
|
|||
this.equipManager = new EquipManager();
|
||||
this.adventureManager = new AdventureManager();
|
||||
this.pokemonManager = new PokemonManager();
|
||||
this.workShopController = new WorkShopController();
|
||||
|
||||
//綁定关系
|
||||
this.playerManager.init(this, "playerManager", false);
|
||||
|
@ -57,6 +60,7 @@ public class User extends MongoRoot {
|
|||
this.equipManager.init(this,"equipManager",false);
|
||||
this.adventureManager.init(this,"adventureManager",false);
|
||||
this.pokemonManager.init(this,"pokemonManager",false);
|
||||
// this.workShopController.init(this,"workShopController",false);
|
||||
}
|
||||
|
||||
public User(){
|
||||
|
@ -78,6 +82,7 @@ public class User extends MongoRoot {
|
|||
missionManager.init(this, "missionManager", false);
|
||||
adventureManager.init(this,"adventureManager",false);
|
||||
pokemonManager.init(this,"pokemonManager",false);
|
||||
// workShopController.init(this,"workShopController",false);
|
||||
}
|
||||
|
||||
public static void init(LjsdMongoTemplate ljsdMongoTemplate) {
|
||||
|
@ -156,4 +161,8 @@ public class User extends MongoRoot {
|
|||
public MissionManager getMissionManager() {
|
||||
return missionManager;
|
||||
}
|
||||
|
||||
public WorkShopController getWorkShopController() {
|
||||
return workShopController;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#server info
|
||||
server.id = 10212
|
||||
server.id = 10215
|
||||
server.openTime = 20190101000101
|
||||
server.num = 1
|
||||
|
||||
|
@ -30,7 +30,7 @@ spring.redis.expireTime = -1
|
|||
#spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1
|
||||
#spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1
|
||||
#mongodb2 develop
|
||||
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212
|
||||
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10215
|
||||
mongodb.options.maxWaitTime = 120000
|
||||
mongodb.options.connectTimeout = 1000
|
||||
mongodb.options.socketTimeout = 0
|
||||
|
|
Loading…
Reference in New Issue