update proto && 千抽调整为每日可领取 && 破碎王座只能上升不下降

conf/server/GlobalActivity.txt

@@ -47,6 +47,7 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 621	51010062	60	20231026 000000	20231101 235900	1	0	0	1	1	2#21	101	0	2#1#999	0	1	0	50000#50001#50002#50003	
 622	51010062	60	20231123 000000	20231129 235900	1	0	0	1	1	2#21	101	0	2#1#999	0	1	0	50000#50001#50002#50003	
 623	51010062	60	20231221 000000	20231227 235900	1	0	0	1	1	2#21	101	0	2#1#999	0	1	0	50000#50001#50002#50003	
+666	51010016	666	20200101 000000	20291231 000000	1	0	0	0	0	null	0	0	2#10#999	107	1	0	null	
 701	51010009	7	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#999#999	0	0	0	null	
 801	51010034	8	2505600	4924799	3	0	0	1	1	null	0	0	2#45#999	5002	1	0	null	
 802	51010034	8	5011200	7430399	3	0	0	1	1	null	0	0	2#45#999	5003	1	0	null	
@@ -132,25 +133,25 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 4901	51010009	49	20291002 000000	20291004 210000	1	0	0	1	1	null	0	0	null	0	0	0	null	
 5001	51010009	50	20291002 000000	20291004 210000	1	0	0	1	1	null	0	0	2#999#999	0	0	0	null	
 5101	51010009	51	20291002 000000	20291004 210000	1	0	0	1	1	null	0	0	null	0	0	0	null	
-6000	51010039	6000	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#30#999	6001#6002#6003	1	0	null	
-6001	51010039	6000	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#30#999	6004#6005#6006	1	0	null	
+6000	51010039	6000	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	0	null	
+6001	51010039	6000	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#30#999	6101#6102#6103#6104#6105#6106	1	0	null	
 6002	51010373	6001	86400	172799	3	0	0	1	0	null	0	0	2#10#999	6007#6008#6009	1	0	null	
 6003	51010373	6001	172800	259199	3	0	0	1	0	null	0	0	2#10#999	6010#6011#6012	1	0	null	
 6004	51010373	6001	259200	345599	3	0	0	1	0	null	0	0	2#10#999	6013#6014#6015	1	0	null	
 6005	51010373	6001	345600	431999	3	0	0	1	0	null	0	0	2#10#999	6016#6017#6018	1	0	null	
 6006	51010373	6001	432000	518399	3	0	0	1	0	null	0	0	2#10#999	6019#6020#6021	1	0	null	
 6007	51010373	6001	518400	604799	3	0	0	1	0	null	0	0	2#10#999	6022#6023#6024	1	0	null	
-6010	51010039	6000	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	6101#6102#6103	1	0	null	
-6011	51010039	6000	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	6201#6202#6203	1	0	null	
+6010	51010039	6000	604800	1209599	3	0	0	1	0	null	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	0	null	
+6011	51010039	6000	1209600	1814399	3	0	0	1	0	null	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	0	null	
 6012	51010039	6000	20291002 000000	20291004 210000	1	0	0	1	0	null	0	0	2#30#999	6301#6302#6303	1	0	null	
-6013	51010039	6000	20211104 000000	20211110 235900	5	0	0	1	0	2#21	0	0	2#30#999	6401#6402#6403	1	70561	null	
-6014	51010039	6000	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	6501#6502#6503	1	70561	null	
-6015	51010039	6000	20211118 000000	20211124 235900	5	0	0	1	0	2#21	0	0	2#30#999	6601#6602#6603	1	70561	null	
-6016	51010039	6000	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	6701#6702#6703	1	70561	null	
-6017	51010039	6000	20211202 000000	20211208 235900	5	0	0	1	0	2#21	0	0	2#30#999	6801#6802#6803	1	70561	null	
-6018	51010039	6000	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	6901#6902#6903	1	70561	null	
-6019	51010039	6000	20211216 000000	20211222 235900	5	0	0	1	0	2#21	0	0	2#30#999	7201#7202#7203	1	70561	null	
-6020	51010039	6000	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	7301#7302#7303	1	70561	null	
+6013	51010039	6000	20211104 000000	20211110 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6014	51010039	6000	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6015	51010039	6000	20211118 000000	20211124 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6016	51010039	6000	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6017	51010039	6000	20211202 000000	20211208 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6018	51010039	6000	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6019	51010039	6000	20211216 000000	20211222 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
+6020	51010039	6000	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#15#999	6101#6102#6103#6104#6105#6106	1	70561	null	
 6200	51010041	62	0	1295999	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
 6201	51010041	62	20221229 000000	20230104 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	0	null	
 6202	51010041	62	20230126 000000	20230201 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	0	null	
@@ -167,10 +168,11 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 6213	51010041	62	20231130 000000	20231206 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	0	null	
 6214	51010041	62	20231228 000000	20240103 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	0	null	
 7000	51010043	7000	0	604799	3	0	0	1	1	null	0	0	2#30#999	70000	1	0	null	
-7001	51010043	7000	20211104 000000	20211110 235900	5	0	0	1	1	2#7	0	0	2#30#999	70001	1	30241	null	
-7002	51010043	7000	20211111 000000	20211117 235900	5	0	0	1	1	2#7	0	0	2#30#999	70002	1	30241	null	
-7003	51010043	7000	20211118 000000	20211124 235900	5	0	0	1	1	2#7	0	0	2#30#999	70003	1	30241	null	
-7004	51010043	7000	20211125 000000	20211201 235900	5	0	0	1	1	2#7	0	0	2#30#999	70004	1	30241	null	
+7001	51010043	7000	20250729 000000	20260729 235900	1	0	0	1	1	null	0	0	2#30#999	70001	1	30241	null	
+7002	51010043	7000	20250729 000000	20260729 235900	1	0	0	1	1	null	0	0	2#30#999	70002	1	30241	null	
+7003	51010043	7000	20250729 000000	20260729 235900	1	0	0	1	1	null	0	0	2#30#999	70003	1	30241	null	
+7004	51010043	7000	20250729 000000	20260729 235900	1	0	0	1	1	null	0	0	2#30#999	70004	1	30241	null	
+7005	51010043	7000	20250729 000000	20260729 235900	1	0	0	1	1	null	0	0	2#30#999	70005	1	30241	null	
 7801	51010020	78	0	0	1	0	0	1	0	null	0	0	2#999#999	7801	1	0	null	
 7802	51010020	78	0	0	1	0	0	1	0	null	0	0	2#999#999	7802	1	0	null	
 7901	51010021	79	0	0	1	0	0	1	0	null	0	0	2#999#999	7901	1	0	null	
@@ -205,7 +207,7 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 10500	51010061	70	1209600	1814399	3	0	1	1	1	null	0	0	2#40#999	0	1	0	null	
 10501	51010061	70	20211118 000000	20211124 235900	5	0	1	1	1	2#21	0	0	2#40#999	0	1	50401	null	
 10502	51010061	70	20211209 000000	20211215 235900	5	0	1	1	1	2#21	0	0	2#40#999	0	1	50401	null	
-10600	51010048	48	0	345599	3	0	1	1	1	null	0	0	2#15#999	0	1	0	null	
+10600	51010048	48	0	345599	3	0	1	1	1	null	0	0	2#13#999	0	1	0	null	
 10601	51010048	48	20211104 000000	20211110 235900	5	0	1	1	1	2#21	0	0	2#15#999	0	1	50401	null	
 10602	51010048	48	20211125 000000	20211201 235900	5	0	1	1	1	2#21	0	0	2#15#999	0	1	50401	null	
 10603	51010048	48	20291002 000000	20291004 210000	1	0	1	1	1	null	0	0	2#25#999	0	1	0	null	
@@ -213,18 +215,18 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 13001	51010018	130	0	315360000	2	0	0	1	1	null	0	0	2#50#80	0	1	0	null	
 13002	51010018	130	0	315360000	2	0	0	1	1	null	0	0	2#80#999	0	1	0	null	
 20000	51010371	20000	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	0	1	0	1013	
-20001	51010055	43	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
+20001	51010055	43	604800	1209599	3	0	0	1	1	null	0	1	2#1#999	0	1	0	null	
 20002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	null	58	0	2#1#999	0	1	0	null	
 20003	51010054	20001	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	300#301#302#303	1	0	null	
 20004	51010053	8000	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
 20005	51010056	20002	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	507#508#509#510#511	1	0	null	
 20006	51010058	58	604800	1209599	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
 20100	51010362	20000	0	604799	3	0	0	1	1	null	0	0	2#1#999	0	1	0	1010	
-20101	51010055	43	345600	604799	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
+20101	51010055	43	345600	604799	3	0	0	1	1	null	0	1	2#1#999	0	1	0	null	
 20105	51010056	20002	345600	604799	3	0	0	1	1	null	0	0	2#1#999	349#350#351#352#353	1	0	null	
 20106	51010058	58	0	604799	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
 21000	51010063	20000	1209600	1814399	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
-21001	51010055	43	1209600	1814399	3	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
+21001	51010055	43	1209600	1814399	3	0	0	1	1	null	0	1	2#1#999	0	1	0	null	
 21002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	null	58	0	2#1#999	0	1	0	null	
 21003	51010054	20001	1209600	1814399	3	0	0	1	1	null	0	0	2#1#999	314#315#316#317	1	0	null	
 21004	51010062	60	1209600	1814399	3	0	0	1	1	null	101	0	2#1#999	0	1	0	50000#50001#50002#50003	
@@ -238,56 +240,56 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 22005	51010056	20002	20291002 000000	20291004 210000	1	0	0	1	1	null	0	0	2#1#999	354#355	1	0	null	
 22006	51010058	58	20291002 000000	20291004 210000	1	0	0	1	1	null	0	0	2#1#999	0	1	0	null	
 30000	51010072	20000	20211104 000000	20211110 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1014	
-30001	51010055	43	20211104 000000	20211110 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+30001	51010055	43	20211104 000000	20211110 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 30002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 30003	51010054	20001	20291002 000000	20291004 210000	1	0	0	1	1	2#21	0	0	2#1#999	328#329#330#331	1	0	null	
 30004	51010041	62	20211104 000000	20211110 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 30005	51010056	20002	20211104 000000	20211110 235900	5	0	0	1	1	2#21	0	0	2#1#999	363#364#365#366#367	1	70561	null	
 30006	51010058	58	20211104 000000	20211110 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 31000	51010070	20000	20211111 000000	20211117 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1015	
-31001	51010055	43	20211111 000000	20211117 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+31001	51010055	43	20211111 000000	20211117 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 31002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 31003	51010054	20001	20291002 000000	20291004 210000	1	0	0	1	1	2#28	0	0	2#1#999	342#343#344#345	1	0	null	
 31004	51010053	8000	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 31005	51010056	20002	20211111 000000	20211117 235900	5	0	0	1	1	2#21	0	0	2#1#999	549#550#551#552#553	1	70561	null	
 31006	51010058	58	20211111 000000	20211117 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 32000	51010077	20000	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1016	
-32001	51010055	43	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+32001	51010055	43	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 32002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 32003	51010054	20001	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	356#357#358#359	1	70561	null	
 32004	51010062	60	20211125 000000	20211201 235900	1	0	0	1	1	2#21	103	0	2#1#999	0	1	70561	50000#50001#50002#50003	
 32005	51010056	20002	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	377#378#379#380#381	1	70561	null	
 32006	51010058	58	20211118 000000	20211124 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 33000	51010063	20000	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
-33001	51010055	43	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+33001	51010055	43	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 33002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 33003	51010054	20001	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	0	2#1#999	370#371#372#373	1	70561	null	
 33004	51010044	15	20211104 000000	20211110 235900	1	0	0	1	0	2#21	44	0	2#10#999	0	1	50401	67	
 33005	51010056	20002	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	0	2#1#999	391#392#393#394#395	1	70561	null	
 33006	51010058	58	20211125 000000	20211201 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 34000	51010075	20000	20211202 000000	20211208 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1017	
-34001	51010055	43	20211202 000000	20211208 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+34001	51010055	43	20211202 000000	20211208 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 34002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 34003	51010054	20001	20291002 000000	20291004 210000	1	0	0	1	1	2#28	0	0	2#1#999	384#385#386#387	1	0	null	
 34004	51010041	62	20211202 000000	20211208 235900	1	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 34005	51010056	20002	20211202 000000	20211208 235900	5	0	0	1	1	2#21	0	0	2#1#999	307#308#309#310#311	1	70561	null	
 34006	51010058	58	20211202 000000	20211208 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 35000	51010372	20000	20211209 000000	20211215 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1018	
-35001	51010055	43	20211209 000000	20211215 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+35001	51010055	43	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	1	2#1#999	0	1	70561	null	
 35002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 35003	51010054	20001	20291002 000000	20291004 210000	1	0	0	1	1	2#28	0	0	2#1#999	500#501#502#503	1	0	null	
 35004	51010053	8000	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 35005	51010056	20002	20211209 000000	20211215 235900	5	0	0	1	1	2#21	0	0	2#1#999	590#591#592#593#594	1	70561	null	
 35006	51010058	58	20211209 000000	20211215 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 36000	51010074	20000	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	1019	
-36001	51010055	43	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+36001	51010055	43	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 36002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 36003	51010054	20001	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	528#529#530#531	1	70561	null	
 36004	51010062	60	20211223 000000	20211229 235900	1	0	0	1	1	2#21	106	0	2#1#999	0	1	70561	50000#50001#50002#50003	
 36005	51010056	20002	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	321#322#323#324#325	1	70561	null	
 36006	51010058	58	20211216 000000	20211222 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
 37000	51010063	20000	20211223 000000	20211229 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
-37001	51010055	43	20211223 000000	20211229 235900	5	0	0	1	1	2#21	0	0	2#1#999	0	1	70561	null	
+37001	51010055	43	20211223 000000	20211229 235900	5	0	0	1	1	2#21	0	1	2#1#999	0	1	70561	null	
 37002	51010057	44	20291002 000000	20291004 210000	1	0	0	1	1	2#21	58	0	2#1#999	0	1	70561	null	
 37003	51010054	20001	20211223 000000	20211229 235900	5	0	0	1	1	2#21	0	0	2#1#999	542#543#544#545	1	70561	null	
 37004	51010044	15	20211118 000000	20211124 235900	1	0	0	1	0	2#21	45	0	2#10#999	0	1	50401	67	
@@ -331,37 +333,64 @@ int	string	int	string	string	int	int	int	int	int	mut,int#int,2	mut,int#int,1	int
 60002	51010059	40000	604800	1209599	3	0	0	1	0	1#7	0	0	2#22#999	0	1	0	null	
 60003	51010069	30000	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
 60004	51010073	30000	20291002 000000	20291004 210000	1	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70001	51010064	50000	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70002	51010065	50001	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	0	1	0	1011	
-70003	51010066	50003	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	700031#700032#700033#700034#700035	1	0	null	
-70004	51010067	50004	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70005	51010068	50005	1209600	1814399	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70101	51010064	50000	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70102	51010065	50001	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	1011	
-70103	51010066	50003	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	701031#701032#701033#701034#701035	1	70561	null	
-70104	51010067	50004	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70105	51010068	50005	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70201	51010064	50000	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70202	51010065	50001	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	1011	
-70203	51010066	50003	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	702031#702032#702033#702034#702035	1	70561	null	
-70204	51010067	50004	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70205	51010068	50005	20211125 000000	20211201 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70301	51010064	50000	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70302	51010065	50001	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	1011	
-70303	51010066	50003	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	703031#703032#703033#703034#703035	1	70561	null	
-70304	51010067	50004	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70305	51010068	50005	20211209 000000	20211215 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70401	51010064	50000	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70402	51010065	50001	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	1011	
-70403	51010066	50003	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	704031#704032#704033#704034#704035	1	70561	null	
-70404	51010067	50004	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70405	51010068	50005	20211223 000000	20211229 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
-70501	51010064	50000	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70502	51010065	50001	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	0	1	0	1011	
-70503	51010066	50003	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	705031#705032#705033#705034#705035	1	0	null	
-70504	51010067	50004	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70505	51010068	50005	604800	1209599	3	0	0	1	0	null	0	0	2#30#999	0	1	0	null	
-70601	51010064	50000	20211111 000000	20211117 235900	5	0	0	1	0	2#21	0	0	2#30#999	0	1	70561	null	
+70001	51010064	50000	0	86399	3	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70002	51010065	50001	0	86399	3	0	0	1	0	null	0	0	2#23#999	0	1	0	1011	
+70003	51010066	50003	0	86399	3	0	0	1	0	null	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	0	null	
+70004	51010067	50004	0	86399	3	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70005	51010068	50005	20211111 000000	20211117 235900	1	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70101	51010064	50000	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70102	51010065	50001	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70103	51010066	50003	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70104	51010067	50004	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70105	51010068	50005	20211111 000000	20211117 235900	1	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70201	51010064	50000	259200	345599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70202	51010065	50001	259200	345599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70203	51010066	50003	259200	345599	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70204	51010067	50004	259200	345599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70205	51010068	50005	20211125 000000	20211201 235900	1	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70301	51010064	50000	345600	518399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70302	51010065	50001	345600	518399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70303	51010066	50003	345600	518399	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70304	51010067	50004	345600	518399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70305	51010068	50005	20211209 000000	20211215 235900	1	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70401	51010064	50000	518400	604799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70402	51010065	50001	518400	604799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70403	51010066	50003	518400	604799	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70404	51010067	50004	518400	604799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70405	51010068	50005	20211223 000000	20211229 235900	1	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70501	51010064	50000	604800	777599	3	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70502	51010065	50001	604800	777599	3	0	0	1	0	null	0	0	2#23#999	0	1	0	1011	
+70503	51010066	50003	604800	777599	3	0	0	1	0	null	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	0	null	
+70504	51010067	50004	604800	777599	3	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70505	51010068	50005	20211111 000000	20211117 235900	1	0	0	1	0	null	0	0	2#23#999	0	1	0	null	
+70601	51010064	50000	864000	1036799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70602	51010065	50001	864000	1036799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70603	51010066	50003	864000	1036799	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70604	51010067	50004	864000	1036799	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70701	51010064	50000	1036800	1123199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70702	51010065	50001	1036800	1123199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70703	51010066	50003	1036800	1123199	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70704	51010067	50004	1036800	1123199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70801	51010064	50000	1123200	1209599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70802	51010065	50001	1123200	1209599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70803	51010066	50003	1123200	1209599	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70804	51010067	50004	1123200	1209599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70901	51010064	50000	1641600	1987199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+70902	51010065	50001	1641600	1987199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+70903	51010066	50003	1641600	1987199	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+70904	51010067	50004	1641600	1987199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71001	51010064	50000	2332800	2678399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71002	51010065	50001	2332800	2678399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+71003	51010066	50003	2332800	2678399	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+71004	51010067	50004	2332800	2678399	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71101	51010064	50000	3024000	3369599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71102	51010065	50001	3024000	3369599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+71103	51010066	50003	3024000	3369599	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+71104	51010067	50004	3024000	3369599	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71201	51010064	50000	20211111 000000	20211117 235900	1	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
+71202	51010065	50001	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	1011	
+71203	51010066	50003	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	62101#62102#62103#62104#62105#62106#62107#62108#62109#62110#62111#62112#62113#	1	70561	null	
+71204	51010067	50004	86400	259199	3	0	0	1	0	2#21	0	0	2#23#999	0	1	70561	null	
 80001	51010085	40000	172800	604740	3	0	0	1	0	null	0	0	2#35#999	0	1	0	null	
 80002	51010085	40000	777600	1209540	3	0	0	1	0	null	0	0	2#35#999	0	1	0	null	
 80003	51010085	40000	1382400	1814340	3	0	0	1	0	null	0	0	2#35#999	0	1	0	null	

gamecommon/src/main/java/com/ljsd/jieling/protocols/ActivityProto.java

@@ -8712,7 +8712,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     boolean hasActivityChapterInfo();
@@ -8720,7 +8719,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo getActivityChapterInfo();
@@ -8728,7 +8726,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfoOrBuilder getActivityChapterInfoOrBuilder();
@@ -8848,7 +8845,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public boolean hasActivityChapterInfo() {
@@ -8858,7 +8854,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo getActivityChapterInfo() {
@@ -8868,7 +8863,6 @@ public final class ActivityProto {
      * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfoOrBuilder getActivityChapterInfoOrBuilder() {
@@ -9123,7 +9117,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public boolean hasActivityChapterInfo() {
@@ -9133,7 +9126,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo getActivityChapterInfo() {
@@ -9147,7 +9139,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setActivityChapterInfo(com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo value) {
@@ -9167,7 +9158,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setActivityChapterInfo(
@@ -9185,7 +9175,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder mergeActivityChapterInfo(com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo value) {
@@ -9208,7 +9197,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearActivityChapterInfo() {
@@ -9225,7 +9213,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfo.Builder getActivityChapterInfoBuilder() {
@@ -9237,7 +9224,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.ActivityProto.ActivityChapterInfoOrBuilder getActivityChapterInfoOrBuilder() {
@@ -9251,7 +9237,6 @@ public final class ActivityProto {
        * <code>optional .com.ljsd.jieling.protocols.ActivityChapterInfo activityChapterInfo = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       private com.google.protobuf.SingleFieldBuilder<

gamecommon/src/main/java/com/ljsd/jieling/protocols/CombatPlanProto.java

@@ -11424,7 +11424,6 @@ public final class CombatPlanProto {
      * <code>optional int32 exp = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     boolean hasExp();
@@ -11432,7 +11431,6 @@ public final class CombatPlanProto {
      * <code>optional int32 exp = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getExp();
@@ -11607,7 +11605,6 @@ public final class CombatPlanProto {
      * <code>optional int32 exp = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public boolean hasExp() {
@@ -11617,7 +11614,6 @@ public final class CombatPlanProto {
      * <code>optional int32 exp = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getExp() {
@@ -12219,7 +12215,6 @@ public final class CombatPlanProto {
        * <code>optional int32 exp = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public boolean hasExp() {
@@ -12229,7 +12224,6 @@ public final class CombatPlanProto {
        * <code>optional int32 exp = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getExp() {
@@ -12239,7 +12233,6 @@ public final class CombatPlanProto {
        * <code>optional int32 exp = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setExp(int value) {
@@ -12252,7 +12245,6 @@ public final class CombatPlanProto {
        * <code>optional int32 exp = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearExp() {

gamecommon/src/main/java/com/ljsd/jieling/protocols/CommonProto.java

@@ -68495,7 +68495,6 @@ public final class CommonProto {
      * <code>optional int32 heroTemplateId = 14;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     boolean hasHeroTemplateId();
@@ -68503,7 +68502,6 @@ public final class CommonProto {
      * <code>optional int32 heroTemplateId = 14;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getHeroTemplateId();
@@ -69097,7 +69095,6 @@ public final class CommonProto {
      * <code>optional int32 heroTemplateId = 14;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public boolean hasHeroTemplateId() {
@@ -69107,7 +69104,6 @@ public final class CommonProto {
      * <code>optional int32 heroTemplateId = 14;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getHeroTemplateId() {
@@ -70445,7 +70441,6 @@ public final class CommonProto {
        * <code>optional int32 heroTemplateId = 14;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public boolean hasHeroTemplateId() {
@@ -70455,7 +70450,6 @@ public final class CommonProto {
        * <code>optional int32 heroTemplateId = 14;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getHeroTemplateId() {
@@ -70465,7 +70459,6 @@ public final class CommonProto {
        * <code>optional int32 heroTemplateId = 14;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setHeroTemplateId(int value) {
@@ -70478,7 +70471,6 @@ public final class CommonProto {
        * <code>optional int32 heroTemplateId = 14;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearHeroTemplateId() {

gamecommon/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java

@@ -19,7 +19,7 @@ public final class PlayerInfoProto {
     /**
      * <code>optional string msg = 1;</code>
      */
-    String getMsg();
+    java.lang.String getMsg();
     /**
      * <code>optional string msg = 1;</code>
      */
@@ -49,7 +49,7 @@ public final class PlayerInfoProto {
     }
 
     private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @Override
+    @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
         getUnknownFields() {
       return this.unknownFields;
@@ -21460,7 +21460,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     boolean hasId();
@@ -21468,7 +21467,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getId();
@@ -21599,7 +21597,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public boolean hasId() {
@@ -21609,7 +21606,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getId() {
@@ -21890,7 +21886,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public boolean hasId() {
@@ -21900,7 +21895,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getId() {
@@ -21910,7 +21904,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setId(int value) {
@@ -21923,7 +21916,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearId() {
@@ -22001,7 +21993,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     boolean hasId();
@@ -22009,7 +22000,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getId();
@@ -22140,7 +22130,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public boolean hasId() {
@@ -22150,7 +22139,6 @@ public final class PlayerInfoProto {
      * <code>optional int32 id = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getId() {
@@ -22431,7 +22419,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public boolean hasId() {
@@ -22441,7 +22428,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getId() {
@@ -22451,7 +22437,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setId(int value) {
@@ -22464,7 +22449,6 @@ public final class PlayerInfoProto {
        * <code>optional int32 id = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearId() {
@@ -61641,7 +61625,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     java.util.List<java.lang.Integer> getItemIdList();
@@ -61649,7 +61632,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getItemIdCount();
@@ -61657,7 +61639,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getItemId(int index);
@@ -61783,7 +61764,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public java.util.List<java.lang.Integer>
@@ -61794,7 +61774,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getItemIdCount() {
@@ -61804,7 +61783,6 @@ public final class PlayerInfoProto {
      * <code>repeated int32 itemId = 1;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getItemId(int index) {
@@ -62061,7 +62039,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public java.util.List<java.lang.Integer>
@@ -62072,7 +62049,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getItemIdCount() {
@@ -62082,7 +62058,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getItemId(int index) {
@@ -62092,7 +62067,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setItemId(
@@ -62106,7 +62080,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addItemId(int value) {
@@ -62119,7 +62092,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addAllItemId(
@@ -62133,7 +62105,6 @@ public final class PlayerInfoProto {
        * <code>repeated int32 itemId = 1;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearItemId() {
@@ -140805,7 +140776,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     java.util.List<com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard> 
@@ -140814,7 +140784,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard getThousandDrawCards(int index);
@@ -140822,7 +140791,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     int getThousandDrawCardsCount();
@@ -140830,7 +140798,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     java.util.List<? extends com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder> 
@@ -140839,11 +140806,28 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder getThousandDrawCardsOrBuilder(
         int index);
+
+    // optional bool canTake = 3;
+    /**
+     * <code>optional bool canTake = 3;</code>
+     *
+     * <pre>
+     *是否可领取
+     * </pre>
+     */
+    boolean hasCanTake();
+    /**
+     * <code>optional bool canTake = 3;</code>
+     *
+     * <pre>
+     *是否可领取
+     * </pre>
+     */
+    boolean getCanTake();
   }
   /**
    * Protobuf type {@code com.ljsd.jieling.protocols.ThousandDrawInfoResponse}
@@ -140909,6 +140893,11 @@ public final class PlayerInfoProto {
               thousandDrawCards_.add(input.readMessage(com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard.PARSER, extensionRegistry));
               break;
             }
+            case 24: {
+              bitField0_ |= 0x00000002;
+              canTake_ = input.readBool();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -140983,7 +140972,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public java.util.List<com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard> getThousandDrawCardsList() {
@@ -140993,7 +140981,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public java.util.List<? extends com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder> 
@@ -141004,7 +140991,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public int getThousandDrawCardsCount() {
@@ -141014,7 +141000,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard getThousandDrawCards(int index) {
@@ -141024,7 +141009,6 @@ public final class PlayerInfoProto {
      * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
      *
      * <pre>
-     *
      * </pre>
      */
     public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder getThousandDrawCardsOrBuilder(
@@ -141032,9 +141016,34 @@ public final class PlayerInfoProto {
       return thousandDrawCards_.get(index);
     }
 
+    // optional bool canTake = 3;
+    public static final int CANTAKE_FIELD_NUMBER = 3;
+    private boolean canTake_;
+    /**
+     * <code>optional bool canTake = 3;</code>
+     *
+     * <pre>
+     *是否可领取
+     * </pre>
+     */
+    public boolean hasCanTake() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional bool canTake = 3;</code>
+     *
+     * <pre>
+     *是否可领取
+     * </pre>
+     */
+    public boolean getCanTake() {
+      return canTake_;
+    }
+
     private void initFields() {
       round_ = 0;
       thousandDrawCards_ = java.util.Collections.emptyList();
+      canTake_ = false;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -141054,6 +141063,9 @@ public final class PlayerInfoProto {
       for (int i = 0; i < thousandDrawCards_.size(); i++) {
         output.writeMessage(2, thousandDrawCards_.get(i));
       }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBool(3, canTake_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -141071,6 +141083,10 @@ public final class PlayerInfoProto {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, thousandDrawCards_.get(i));
       }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, canTake_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -141196,6 +141212,8 @@ public final class PlayerInfoProto {
         } else {
           thousandDrawCardsBuilder_.clear();
         }
+        canTake_ = false;
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -141237,6 +141255,10 @@ public final class PlayerInfoProto {
         } else {
           result.thousandDrawCards_ = thousandDrawCardsBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.canTake_ = canTake_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -141282,6 +141304,9 @@ public final class PlayerInfoProto {
             }
           }
         }
+        if (other.hasCanTake()) {
+          setCanTake(other.getCanTake());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -141375,7 +141400,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public java.util.List<com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard> getThousandDrawCardsList() {
@@ -141389,7 +141413,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public int getThousandDrawCardsCount() {
@@ -141403,7 +141426,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard getThousandDrawCards(int index) {
@@ -141417,7 +141439,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setThousandDrawCards(
@@ -141438,7 +141459,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder setThousandDrawCards(
@@ -141456,7 +141476,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addThousandDrawCards(com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard value) {
@@ -141476,7 +141495,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addThousandDrawCards(
@@ -141497,7 +141515,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addThousandDrawCards(
@@ -141515,7 +141532,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addThousandDrawCards(
@@ -141533,7 +141549,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder addAllThousandDrawCards(
@@ -141551,7 +141566,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder clearThousandDrawCards() {
@@ -141568,7 +141582,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public Builder removeThousandDrawCards(int index) {
@@ -141585,7 +141598,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard.Builder getThousandDrawCardsBuilder(
@@ -141596,7 +141608,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder getThousandDrawCardsOrBuilder(
@@ -141610,7 +141621,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public java.util.List<? extends com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCardOrBuilder> 
@@ -141625,7 +141635,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard.Builder addThousandDrawCardsBuilder() {
@@ -141636,7 +141645,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard.Builder addThousandDrawCardsBuilder(
@@ -141648,7 +141656,6 @@ public final class PlayerInfoProto {
        * <code>repeated .com.ljsd.jieling.protocols.ThousandDrawCard thousandDrawCards = 2;</code>
        *
        * <pre>
-       *
        * </pre>
        */
       public java.util.List<com.ljsd.jieling.protocols.PlayerInfoProto.ThousandDrawCard.Builder> 
@@ -141670,6 +141677,55 @@ public final class PlayerInfoProto {
         return thousandDrawCardsBuilder_;
       }
 
+      // optional bool canTake = 3;
+      private boolean canTake_ ;
+      /**
+       * <code>optional bool canTake = 3;</code>
+       *
+       * <pre>
+       *是否可领取
+       * </pre>
+       */
+      public boolean hasCanTake() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional bool canTake = 3;</code>
+       *
+       * <pre>
+       *是否可领取
+       * </pre>
+       */
+      public boolean getCanTake() {
+        return canTake_;
+      }
+      /**
+       * <code>optional bool canTake = 3;</code>
+       *
+       * <pre>
+       *是否可领取
+       * </pre>
+       */
+      public Builder setCanTake(boolean value) {
+        bitField0_ |= 0x00000004;
+        canTake_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool canTake = 3;</code>
+       *
+       * <pre>
+       *是否可领取
+       * </pre>
+       */
+      public Builder clearCanTake() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        canTake_ = false;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ThousandDrawInfoResponse)
     }
 
@@ -156238,50 +156294,50 @@ public final class PlayerInfoProto {
       " \001(\005\"a\n\020ThousandDrawCard\022\016\n\006number\030\001 \001(\005" +
       "\022\r\n\005cards\030\002 \003(\005\022.\n\004drop\030\003 \001(\0132 .com.ljsd" +
       ".jieling.protocols.Drop\"5\n\023ThousandDrawR" +
-      "equest\022\016\n\006isDraw\030\001 \001(\010\022\016\n\006number\030\002 \001(\005\"r" +
-      "\n\030ThousandDrawInfoResponse\022\r\n\005round\030\001 \001(" +
-      "\005\022G\n\021thousandDrawCards\030\002 \003(\0132,.com.ljsd." +
-      "jieling.protocols.ThousandDrawCard\"\030\n\026Ra",
-      "nkingInfoListRequest\"k\n\027RankingInfoListR" +
-      "esponse\022\025\n\rrewardRecords\030\001 \003(\005\0229\n\010rankIn" +
-      "fo\030\002 \003(\0132\'.com.ljsd.jieling.protocols.Ra" +
-      "nkingInfo\"&\n\030RankingTakeRewardRequest\022\n\n" +
-      "\002id\030\001 \001(\005\"b\n\031RankingTakeRewardResponse\022\025" +
-      "\n\rrewardRecords\030\001 \003(\005\022.\n\004drop\030\002 \001(\0132 .co" +
-      "m.ljsd.jieling.protocols.Drop\"$\n\021SetVipS" +
-      "howRequest\022\017\n\007showVip\030\001 \001(\010\"%\n\022SetVipSho" +
-      "wResponse\022\017\n\007showVip\030\001 \001(\010\"/\n!CardSubjec" +
-      "tHeroGetActivityRequest\022\n\n\002id\030\001 \001(\005\"|\n\"C",
-      "ardSubjectHeroGetActivityResponse\022.\n\004dro" +
-      "p\030\001 \001(\0132 .com.ljsd.jieling.protocols.Dro" +
-      "p\022\r\n\005times\030\002 \001(\005\022\027\n\017wishRewardTimes\030\003 \001(" +
-      "\005\"B\n CardSubjeckWishPoolChangeRequest\022\022\n" +
-      "\nactivityId\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"#\n!CardSub" +
-      "jeckWishPoolChangeResponse\"[\n!MysticalIn" +
-      "structRefreshIndication\0226\n\005tasks\030\001 \003(\0132\'" +
-      ".com.ljsd.jieling.protocols.RefreshTask\"" +
-      "H\n#MysticalInstructRefreshTimeResponse\022\017" +
-      "\n\007dayTime\030\001 \001(\005\022\020\n\010weekTime\030\002 \001(\005\"V\n\034Her",
-      "oCollectRefreshIndication\0226\n\005tasks\030\001 \003(\013" +
-      "2\'.com.ljsd.jieling.protocols.RefreshTas" +
-      "k\"C\n\036HeroCollectRefreshTimeResponse\022\017\n\007d" +
-      "ayTime\030\001 \001(\005\022\020\n\010weekTime\030\002 \001(\005\"5\n\037CardSu" +
-      "bjectHeroLuxuryGetRequest\022\022\n\nactivityId\030" +
-      "\001 \001(\005\"m\n CardSubjectHeroLuxuryGetRespons" +
-      "e\022\r\n\005times\030\001 \001(\005\022:\n\nheroLuxury\030\002 \003(\0132&.c" +
-      "om.ljsd.jieling.protocols.HeroLuxury\"E\n#" +
-      "CardSubjectHeroLuxuryGetFreeRequest\022\022\n\na" +
-      "ctivityId\030\001 \001(\005\022\n\n\002id\030\002 \001(\005\"P\n\036CardSubje",
-      "ctHeroGetFreeResponse\022.\n\004drop\030\001 \001(\0132 .co" +
-      "m.ljsd.jieling.protocols.Drop\",\n\026CardSub" +
-      "jectInitRequest\022\022\n\nactivityId\030\001 \001(\005\"K\n\027C" +
-      "ardSubjectInitResponse\022\021\n\twishTimes\030\001 \001(" +
-      "\005\022\r\n\005times\030\002 \001(\005\022\016\n\006wishId\030\003 \001(\005\"0\n\032Card" +
-      "SubjectHeroGiftRequest\022\022\n\nactivityId\030\001 \001" +
-      "(\005\"O\n\033CardSubjectHeroGiftResponse\022\021\n\twis" +
-      "hTimes\030\001 \001(\005\022\r\n\005times\030\002 \001(\005\022\016\n\006wishId\030\003 " +
-      "\001(\005\"1\n\036BuyGiftGoodsWithVoucherRequest\022\017\n" +
-      "\007goodsId\030\001 \001(\005B\002H\001"
+      "equest\022\016\n\006isDraw\030\001 \001(\010\022\016\n\006number\030\002 \001(\005\"\203" +
+      "\001\n\030ThousandDrawInfoResponse\022\r\n\005round\030\001 \001" +
+      "(\005\022G\n\021thousandDrawCards\030\002 \003(\0132,.com.ljsd" +
+      ".jieling.protocols.ThousandDrawCard\022\017\n\007c",
+      "anTake\030\003 \001(\010\"\030\n\026RankingInfoListRequest\"k" +
+      "\n\027RankingInfoListResponse\022\025\n\rrewardRecor" +
+      "ds\030\001 \003(\005\0229\n\010rankInfo\030\002 \003(\0132\'.com.ljsd.ji" +
+      "eling.protocols.RankingInfo\"&\n\030RankingTa" +
+      "keRewardRequest\022\n\n\002id\030\001 \001(\005\"b\n\031RankingTa" +
+      "keRewardResponse\022\025\n\rrewardRecords\030\001 \003(\005\022" +
+      ".\n\004drop\030\002 \001(\0132 .com.ljsd.jieling.protoco" +
+      "ls.Drop\"$\n\021SetVipShowRequest\022\017\n\007showVip\030" +
+      "\001 \001(\010\"%\n\022SetVipShowResponse\022\017\n\007showVip\030\001" +
+      " \001(\010\"/\n!CardSubjectHeroGetActivityReques",
+      "t\022\n\n\002id\030\001 \001(\005\"|\n\"CardSubjectHeroGetActiv" +
+      "ityResponse\022.\n\004drop\030\001 \001(\0132 .com.ljsd.jie" +
+      "ling.protocols.Drop\022\r\n\005times\030\002 \001(\005\022\027\n\017wi" +
+      "shRewardTimes\030\003 \001(\005\"B\n CardSubjeckWishPo" +
+      "olChangeRequest\022\022\n\nactivityId\030\001 \001(\005\022\n\n\002i" +
+      "d\030\002 \001(\005\"#\n!CardSubjeckWishPoolChangeResp" +
+      "onse\"[\n!MysticalInstructRefreshIndicatio" +
+      "n\0226\n\005tasks\030\001 \003(\0132\'.com.ljsd.jieling.prot" +
+      "ocols.RefreshTask\"H\n#MysticalInstructRef" +
+      "reshTimeResponse\022\017\n\007dayTime\030\001 \001(\005\022\020\n\010wee",
+      "kTime\030\002 \001(\005\"V\n\034HeroCollectRefreshIndicat" +
+      "ion\0226\n\005tasks\030\001 \003(\0132\'.com.ljsd.jieling.pr" +
+      "otocols.RefreshTask\"C\n\036HeroCollectRefres" +
+      "hTimeResponse\022\017\n\007dayTime\030\001 \001(\005\022\020\n\010weekTi" +
+      "me\030\002 \001(\005\"5\n\037CardSubjectHeroLuxuryGetRequ" +
+      "est\022\022\n\nactivityId\030\001 \001(\005\"m\n CardSubjectHe" +
+      "roLuxuryGetResponse\022\r\n\005times\030\001 \001(\005\022:\n\nhe" +
+      "roLuxury\030\002 \003(\0132&.com.ljsd.jieling.protoc" +
+      "ols.HeroLuxury\"E\n#CardSubjectHeroLuxuryG" +
+      "etFreeRequest\022\022\n\nactivityId\030\001 \001(\005\022\n\n\002id\030",
+      "\002 \001(\005\"P\n\036CardSubjectHeroGetFreeResponse\022" +
+      ".\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.protoco" +
+      "ls.Drop\",\n\026CardSubjectInitRequest\022\022\n\nact" +
+      "ivityId\030\001 \001(\005\"K\n\027CardSubjectInitResponse" +
+      "\022\021\n\twishTimes\030\001 \001(\005\022\r\n\005times\030\002 \001(\005\022\016\n\006wi" +
+      "shId\030\003 \001(\005\"0\n\032CardSubjectHeroGiftRequest" +
+      "\022\022\n\nactivityId\030\001 \001(\005\"O\n\033CardSubjectHeroG" +
+      "iftResponse\022\021\n\twishTimes\030\001 \001(\005\022\r\n\005times\030" +
+      "\002 \001(\005\022\016\n\006wishId\030\003 \001(\005\"1\n\036BuyGiftGoodsWit" +
+      "hVoucherRequest\022\017\n\007goodsId\030\001 \001(\005B\002H\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -157511,7 +157567,7 @@ public final class PlayerInfoProto {
           internal_static_com_ljsd_jieling_protocols_ThousandDrawInfoResponse_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_com_ljsd_jieling_protocols_ThousandDrawInfoResponse_descriptor,
-              new java.lang.String[] { "Round", "ThousandDrawCards", });
+              new java.lang.String[] { "Round", "ThousandDrawCards", "CanTake", });
           internal_static_com_ljsd_jieling_protocols_RankingInfoListRequest_descriptor =
             getDescriptor().getMessageTypes().get(204);
           internal_static_com_ljsd_jieling_protocols_RankingInfoListRequest_fieldAccessorTable = new

gamecommon/src/main/java/com/ljsd/jieling/protocols/SupportProto.java

@@ -1194,7 +1194,7 @@ public final class SupportProto {
      * <code>optional int32 type = 1;</code>
      *
      * <pre>
-     *1单次2一键
+     *1单次2一键
      * </pre>
      */
     boolean hasType();
@@ -1202,7 +1202,7 @@ public final class SupportProto {
      * <code>optional int32 type = 1;</code>
      *
      * <pre>
-     *1单次2一键
+     *1单次2一键
      * </pre>
      */
     int getType();
@@ -1310,7 +1310,7 @@ public final class SupportProto {
      * <code>optional int32 type = 1;</code>
      *
      * <pre>
-     *1单次2一键
+     *1单次2一键
      * </pre>
      */
     public boolean hasType() {
@@ -1320,7 +1320,7 @@ public final class SupportProto {
      * <code>optional int32 type = 1;</code>
      *
      * <pre>
-     *1单次2一键
+     *1单次2一键
      * </pre>
      */
     public int getType() {
@@ -1560,7 +1560,7 @@ public final class SupportProto {
        * <code>optional int32 type = 1;</code>
        *
        * <pre>
-       *1单次2一键
+       *1单次2一键
        * </pre>
        */
       public boolean hasType() {
@@ -1570,7 +1570,7 @@ public final class SupportProto {
        * <code>optional int32 type = 1;</code>
        *
        * <pre>
-       *1单次2一键
+       *1单次2一键
        * </pre>
        */
       public int getType() {
@@ -1580,7 +1580,7 @@ public final class SupportProto {
        * <code>optional int32 type = 1;</code>
        *
        * <pre>
-       *1单次2一键
+       *1单次2一键
        * </pre>
        */
       public Builder setType(int value) {
@@ -1593,7 +1593,7 @@ public final class SupportProto {
        * <code>optional int32 type = 1;</code>
        *
        * <pre>
-       *1单次2一键
+       *1单次2一键
        * </pre>
        */
       public Builder clearType() {

gamecommon/src/main/java/com/ljsd/jieling/protocols/SupremacyProto.java

@@ -623,7 +623,7 @@ public final class SupremacyProto {
      * <code>optional int32 investigateLevel = 12;</code>
      *
      * <pre>
-     *号角等级
+     *号角等级
      * </pre>
      */
     boolean hasInvestigateLevel();
@@ -631,7 +631,7 @@ public final class SupremacyProto {
      * <code>optional int32 investigateLevel = 12;</code>
      *
      * <pre>
-     *号角等级
+     *号角等级
      * </pre>
      */
     int getInvestigateLevel();
@@ -1023,7 +1023,7 @@ public final class SupremacyProto {
      * <code>optional int32 investigateLevel = 12;</code>
      *
      * <pre>
-     *号角等级
+     *号角等级
      * </pre>
      */
     public boolean hasInvestigateLevel() {
@@ -1033,7 +1033,7 @@ public final class SupremacyProto {
      * <code>optional int32 investigateLevel = 12;</code>
      *
      * <pre>
-     *号角等级
+     *号角等级
      * </pre>
      */
     public int getInvestigateLevel() {
@@ -2106,7 +2106,7 @@ public final class SupremacyProto {
        * <code>optional int32 investigateLevel = 12;</code>
        *
        * <pre>
-       *号角等级
+       *号角等级
        * </pre>
        */
       public boolean hasInvestigateLevel() {
@@ -2116,7 +2116,7 @@ public final class SupremacyProto {
        * <code>optional int32 investigateLevel = 12;</code>
        *
        * <pre>
-       *号角等级
+       *号角等级
        * </pre>
        */
       public int getInvestigateLevel() {
@@ -2126,7 +2126,7 @@ public final class SupremacyProto {
        * <code>optional int32 investigateLevel = 12;</code>
        *
        * <pre>
-       *号角等级
+       *号角等级
        * </pre>
        */
       public Builder setInvestigateLevel(int value) {
@@ -2139,7 +2139,7 @@ public final class SupremacyProto {
        * <code>optional int32 investigateLevel = 12;</code>
        *
        * <pre>
-       *号角等级
+       *号角等级
        * </pre>
        */
       public Builder clearInvestigateLevel() {

gamecommon/src/main/java/com/ljsd/jieling/protocols/global/GlobalProto.java

@@ -26,7 +26,7 @@ public final class GlobalProto {
      * <code>optional int32 worldTypeID = 2;</code>
      *
      * <pre>
-     *跨服类型Id,1=跨服竞技场，2=跨服公会战
+     *跨服类型Id,1=跨服竞技场，2=跨服公会战
      * </pre>
      */
     boolean hasWorldTypeID();
@@ -34,7 +34,7 @@ public final class GlobalProto {
      * <code>optional int32 worldTypeID = 2;</code>
      *
      * <pre>
-     *跨服类型Id,1=跨服竞技场，2=跨服公会战
+     *跨服类型Id,1=跨服竞技场，2=跨服公会战
      * </pre>
      */
     int getWorldTypeID();
@@ -163,7 +163,7 @@ public final class GlobalProto {
      * <code>optional int32 worldTypeID = 2;</code>
      *
      * <pre>
-     *跨服类型Id,1=跨服竞技场，2=跨服公会战
+     *跨服类型Id,1=跨服竞技场，2=跨服公会战
      * </pre>
      */
     public boolean hasWorldTypeID() {
@@ -173,7 +173,7 @@ public final class GlobalProto {
      * <code>optional int32 worldTypeID = 2;</code>
      *
      * <pre>
-     *跨服类型Id,1=跨服竞技场，2=跨服公会战
+     *跨服类型Id,1=跨服竞技场，2=跨服公会战
      * </pre>
      */
     public int getWorldTypeID() {
@@ -463,7 +463,7 @@ public final class GlobalProto {
        * <code>optional int32 worldTypeID = 2;</code>
        *
        * <pre>
-       *跨服类型Id,1=跨服竞技场，2=跨服公会战
+       *跨服类型Id,1=跨服竞技场，2=跨服公会战
        * </pre>
        */
       public boolean hasWorldTypeID() {
@@ -473,7 +473,7 @@ public final class GlobalProto {
        * <code>optional int32 worldTypeID = 2;</code>
        *
        * <pre>
-       *跨服类型Id,1=跨服竞技场，2=跨服公会战
+       *跨服类型Id,1=跨服竞技场，2=跨服公会战
        * </pre>
        */
       public int getWorldTypeID() {
@@ -483,7 +483,7 @@ public final class GlobalProto {
        * <code>optional int32 worldTypeID = 2;</code>
        *
        * <pre>
-       *跨服类型Id,1=跨服竞技场，2=跨服公会战
+       *跨服类型Id,1=跨服竞技场，2=跨服公会战
        * </pre>
        */
       public Builder setWorldTypeID(int value) {
@@ -496,7 +496,7 @@ public final class GlobalProto {
        * <code>optional int32 worldTypeID = 2;</code>
        *
        * <pre>
-       *跨服类型Id,1=跨服竞技场，2=跨服公会战
+       *跨服类型Id,1=跨服竞技场，2=跨服公会战
        * </pre>
        */
       public Builder clearWorldTypeID() {
@@ -555,7 +555,7 @@ public final class GlobalProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     boolean hasGroup();
@@ -563,7 +563,7 @@ public final class GlobalProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     int getGroup();
@@ -767,7 +767,7 @@ public final class GlobalProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     public boolean hasGroup() {
@@ -777,7 +777,7 @@ public final class GlobalProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     public int getGroup() {
@@ -1203,7 +1203,7 @@ public final class GlobalProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public boolean hasGroup() {
@@ -1213,7 +1213,7 @@ public final class GlobalProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public int getGroup() {
@@ -1223,7 +1223,7 @@ public final class GlobalProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public Builder setGroup(int value) {
@@ -1236,7 +1236,7 @@ public final class GlobalProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public Builder clearGroup() {

gamecommon/src/main/java/com/ljsd/jieling/protocols/worldchat/WorldChatProto.java

@@ -994,7 +994,7 @@ public final class WorldChatProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     boolean hasGroup();
@@ -1002,7 +1002,7 @@ public final class WorldChatProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     int getGroup();
@@ -1206,7 +1206,7 @@ public final class WorldChatProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     public boolean hasGroup() {
@@ -1216,7 +1216,7 @@ public final class WorldChatProto {
      * <code>optional int32 group = 3;</code>
      *
      * <pre>
-     *分组 全服唯一worldId*10000+index；
+     *分组 全服唯一worldId*10000+index；
      * </pre>
      */
     public int getGroup() {
@@ -1642,7 +1642,7 @@ public final class WorldChatProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public boolean hasGroup() {
@@ -1652,7 +1652,7 @@ public final class WorldChatProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public int getGroup() {
@@ -1662,7 +1662,7 @@ public final class WorldChatProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public Builder setGroup(int value) {
@@ -1675,7 +1675,7 @@ public final class WorldChatProto {
        * <code>optional int32 group = 3;</code>
        *
        * <pre>
-       *分组 全服唯一worldId*10000+index；
+       *分组 全服唯一worldId*10000+index；
        * </pre>
        */
       public Builder clearGroup() {
@@ -1704,7 +1704,7 @@ public final class WorldChatProto {
      * <code>optional int32 chatType = 1;</code>
      *
      * <pre>
-     * 类型 0:系统 1:世界 2:公会 3 好友
+     * 类型 0:系统 1:世界 2:公会 3 好友
      * </pre>
      */
     boolean hasChatType();
@@ -1712,7 +1712,7 @@ public final class WorldChatProto {
      * <code>optional int32 chatType = 1;</code>
      *
      * <pre>
-     * 类型 0:系统 1:世界 2:公会 3 好友
+     * 类型 0:系统 1:世界 2:公会 3 好友
      * </pre>
      */
     int getChatType();
@@ -1722,7 +1722,7 @@ public final class WorldChatProto {
      * <code>optional uint64 messageId = 2;</code>
      *
      * <pre>
-     *消息号
+     *消息号
      * </pre>
      */
     boolean hasMessageId();
@@ -1730,7 +1730,7 @@ public final class WorldChatProto {
      * <code>optional uint64 messageId = 2;</code>
      *
      * <pre>
-     *消息号
+     *消息号
      * </pre>
      */
     long getMessageId();
@@ -1843,7 +1843,7 @@ public final class WorldChatProto {
      * <code>optional int32 chatType = 1;</code>
      *
      * <pre>
-     * 类型 0:系统 1:世界 2:公会 3 好友
+     * 类型 0:系统 1:世界 2:公会 3 好友
      * </pre>
      */
     public boolean hasChatType() {
@@ -1853,7 +1853,7 @@ public final class WorldChatProto {
      * <code>optional int32 chatType = 1;</code>
      *
      * <pre>
-     * 类型 0:系统 1:世界 2:公会 3 好友
+     * 类型 0:系统 1:世界 2:公会 3 好友
      * </pre>
      */
     public int getChatType() {
@@ -1867,7 +1867,7 @@ public final class WorldChatProto {
      * <code>optional uint64 messageId = 2;</code>
      *
      * <pre>
-     *消息号
+     *消息号
      * </pre>
      */
     public boolean hasMessageId() {
@@ -1877,7 +1877,7 @@ public final class WorldChatProto {
      * <code>optional uint64 messageId = 2;</code>
      *
      * <pre>
-     *消息号
+     *消息号
      * </pre>
      */
     public long getMessageId() {
@@ -2134,7 +2134,7 @@ public final class WorldChatProto {
        * <code>optional int32 chatType = 1;</code>
        *
        * <pre>
-       * 类型 0:系统 1:世界 2:公会 3 好友
+       * 类型 0:系统 1:世界 2:公会 3 好友
        * </pre>
        */
       public boolean hasChatType() {
@@ -2144,7 +2144,7 @@ public final class WorldChatProto {
        * <code>optional int32 chatType = 1;</code>
        *
        * <pre>
-       * 类型 0:系统 1:世界 2:公会 3 好友
+       * 类型 0:系统 1:世界 2:公会 3 好友
        * </pre>
        */
       public int getChatType() {
@@ -2154,7 +2154,7 @@ public final class WorldChatProto {
        * <code>optional int32 chatType = 1;</code>
        *
        * <pre>
-       * 类型 0:系统 1:世界 2:公会 3 好友
+       * 类型 0:系统 1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder setChatType(int value) {
@@ -2167,7 +2167,7 @@ public final class WorldChatProto {
        * <code>optional int32 chatType = 1;</code>
        *
        * <pre>
-       * 类型 0:系统 1:世界 2:公会 3 好友
+       * 类型 0:系统 1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder clearChatType() {
@@ -2183,7 +2183,7 @@ public final class WorldChatProto {
        * <code>optional uint64 messageId = 2;</code>
        *
        * <pre>
-       *消息号
+       *消息号
        * </pre>
        */
       public boolean hasMessageId() {
@@ -2193,7 +2193,7 @@ public final class WorldChatProto {
        * <code>optional uint64 messageId = 2;</code>
        *
        * <pre>
-       *消息号
+       *消息号
        * </pre>
        */
       public long getMessageId() {
@@ -2203,7 +2203,7 @@ public final class WorldChatProto {
        * <code>optional uint64 messageId = 2;</code>
        *
        * <pre>
-       *消息号
+       *消息号
        * </pre>
        */
       public Builder setMessageId(long value) {
@@ -2216,7 +2216,7 @@ public final class WorldChatProto {
        * <code>optional uint64 messageId = 2;</code>
        *
        * <pre>
-       *消息号
+       *消息号
        * </pre>
        */
       public Builder clearMessageId() {
@@ -2919,7 +2919,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     boolean hasChatInfo();
@@ -2927,7 +2927,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     com.ljsd.jieling.protocols.ChatProto.ChatInfo getChatInfo();
@@ -2935,7 +2935,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     com.ljsd.jieling.protocols.ChatProto.ChatInfoOrBuilder getChatInfoOrBuilder();
@@ -3051,7 +3051,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     public boolean hasChatInfo() {
@@ -3061,7 +3061,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     public com.ljsd.jieling.protocols.ChatProto.ChatInfo getChatInfo() {
@@ -3071,7 +3071,7 @@ public final class WorldChatProto {
      * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
      *
      * <pre>
-     * 类型1:世界 2:公会 3 好友
+     * 类型1:世界 2:公会 3 好友
      * </pre>
      */
     public com.ljsd.jieling.protocols.ChatProto.ChatInfoOrBuilder getChatInfoOrBuilder() {
@@ -3322,7 +3322,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public boolean hasChatInfo() {
@@ -3332,7 +3332,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public com.ljsd.jieling.protocols.ChatProto.ChatInfo getChatInfo() {
@@ -3346,7 +3346,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder setChatInfo(com.ljsd.jieling.protocols.ChatProto.ChatInfo value) {
@@ -3366,7 +3366,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder setChatInfo(
@@ -3384,7 +3384,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder mergeChatInfo(com.ljsd.jieling.protocols.ChatProto.ChatInfo value) {
@@ -3407,7 +3407,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public Builder clearChatInfo() {
@@ -3424,7 +3424,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public com.ljsd.jieling.protocols.ChatProto.ChatInfo.Builder getChatInfoBuilder() {
@@ -3436,7 +3436,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       public com.ljsd.jieling.protocols.ChatProto.ChatInfoOrBuilder getChatInfoOrBuilder() {
@@ -3450,7 +3450,7 @@ public final class WorldChatProto {
        * <code>optional .com.ljsd.jieling.protocols.ChatInfo chatInfo = 1;</code>
        *
        * <pre>
-       * 类型1:世界 2:公会 3 好友
+       * 类型1:世界 2:公会 3 好友
        * </pre>
        */
       private com.google.protobuf.SingleFieldBuilder<

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java

@@ -1133,6 +1133,11 @@ public class PlayerManager extends MongoBase {
         updateString("thousandDrawInfo.cards."+number,cards);
     }
 
+    public void setThousandDrawCanTake(boolean canTake){
+        this.thousandDrawInfo.setCanTake(canTake);
+        updateString("thousandDrawInfo.canTake",canTake);
+    }
+
     public List<Integer> getRankingRewardRecord() {
         return rankingRewardRecord;
     }

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ThousandDrawInfo.java

@@ -7,6 +7,7 @@ import java.util.Map;
 public class ThousandDrawInfo {
     private int round;
     private Map<Integer,List<Integer>> cards = new HashMap<>();//number:[cardId]  List[0]为关键卡
+    private boolean canTake;
 
 
     public int getRound() {
@@ -24,4 +25,12 @@ public class ThousandDrawInfo {
     public void setCards(Map<Integer, List<Integer>> cards) {
         this.cards = cards;
     }
+
+    public boolean getCanTake() {
+        return canTake;
+    }
+
+    public void setCanTake(boolean canTake) {
+        this.canTake = canTake;
+    }
 }

serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java

@@ -553,6 +553,18 @@ public class PlayerLogic {
             ItemUtil.itemCost(user, dailyScore, BIReason.DAILY_SCORE_CONSUME, 1);
         }
 
+        // 千抽可领奖
+        ThousandDrawInfo thousandDrawInfo = user.getPlayerInfoManager().getThousandDrawInfo();
+        if(thousandDrawInfo == null) {
+            thousandDrawInfo = new ThousandDrawInfo();
+            thousandDrawInfo.setRound(1);
+            thousandDrawInfo.setCanTake(true);
+            user.getPlayerInfoManager().setThousandDrawInfo(thousandDrawInfo);
+        } else {
+            user.getPlayerInfoManager().setThousandDrawCanTake(true);
+        }
+
+
     }
 
     //周末福利活动 刷新

serverlogic/src/main/java/com/ljsd/jieling/logic/supremacy/SupremacyLogic.java

@@ -327,24 +327,29 @@ public class SupremacyLogic {
 
         //全局保存战斗信息
         if (resultCode == 1) {
+
+            //Map<Integer, SSupremacyConfig> configs = SSupremacyConfig.sSupremacyConfigMap;
+            SSupremacyConfig tmpSupremacyConfig = null;
+            for (SSupremacyConfig sSupremacyConfig : configs.values()) {
+                if (sSupremacyConfig.getRank() == Integer.parseInt(split[2]) && sSupremacyConfig.getPos() == Integer.parseInt(split[3])) {
+                    tmpSupremacyConfig = sSupremacyConfig;
+                }
+            }
+
             //清除该玩家之前占领的位置
             List<SupremacyInfo> supremacyInfoList = MongoUtil.getInstence().getMyMongoTemplate().findAll(SupremacyInfo._COLLECTION_NAME, SupremacyInfo.class);
             for (int i = 0; i < supremacyInfoList.size(); i++) {
                 SupremacyInfo info = supremacyInfoList.get(i);
+                // 排位小于当前位置才交换
                 if (info.getUid() != 0 && info.getUid() == uid) {
+                    if (tmpSupremacyConfig.getRank() >= info.getRank()) {
+                        return;
+                    }
                     info.setUid(0);
                     MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(info);
                 }
             }
 
-            //Map<Integer, SSupremacyConfig> configs = SSupremacyConfig.sSupremacyConfigMap;
-            SSupremacyConfig tmpSupremacyConfig = null;
-            for (SSupremacyConfig sSupremacyConfig : configs.values()) {
-                if (sSupremacyConfig.getRank() == Integer.parseInt(split[2]) && sSupremacyConfig.getPos() == Integer.parseInt(split[3])) {
-                    tmpSupremacyConfig = sSupremacyConfig;
-                }
-            }
-
             SupremacyInfo info = new SupremacyInfo();
             info.setId(tmpSupremacyConfig.getId());
             info.setLevel(Integer.parseInt(split[4]));

serverlogic/src/main/java/com/ljsd/jieling/logic/thousandDraw/ThousandDrawLogic.java

@@ -58,6 +58,7 @@ public class ThousandDrawLogic {
         if(thousandDrawInfo == null){
             thousandDrawInfo = new ThousandDrawInfo();
             thousandDrawInfo.setRound(1);
+            thousandDrawInfo.setCanTake(true);
             playerManager.setThousandDrawInfo(thousandDrawInfo);
         }
         List<PlayerInfoProto.ThousandDrawCard> list = new ArrayList<>();
@@ -67,7 +68,7 @@ public class ThousandDrawLogic {
             list.add(build);
         }
         PlayerInfoProto.ThousandDrawInfoResponse build = PlayerInfoProto.ThousandDrawInfoResponse.newBuilder()
-                .setRound(thousandDrawInfo.getRound()).addAllThousandDrawCards(list).build();
+                .setRound(thousandDrawInfo.getRound()).addAllThousandDrawCards(list).setCanTake(thousandDrawInfo.getCanTake()).build();
         MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.ThousandDrawInfoResponse.getNumber(), build, true);
     }
 
@@ -249,6 +250,10 @@ public class ThousandDrawLogic {
             LOGGER.error("takeCard uid:{},number:{}, thousandDrawInfo is null.",user.getId(),number);
             throw new ErrorCodeException(ErrorCode.PARAM_ERR);
         }
+        if (!thousandDrawInfo.getCanTake()) {
+            LOGGER.error("takeCard uid:{},number:{}, can not take card.",user.getId(),number);
+            throw new ErrorCodeException(ErrorCode.TOMORROW_TAKE_REWARD);
+        }
         int round = thousandDrawInfo.getRound();
         SThousandDrawConfig thousandDrawConfig = SThousandDrawConfig.getConfigByRound(round);
         if(!thousandDrawInfo.getCards().containsKey(number)){

serverlogic/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #server info
 #test dev
-server.id = 10001
+server.id = 10002
 server.openTime = 20190101000102
 server.num = 1
 server.sendlog37 = false
@@ -25,7 +25,7 @@ spring.redis.database=0
 #spring.redis.host=120.92.119.145
 #spring.redis.port=6080
 #spring.redis.password=@emiplay_m5fangzhi_redis
-spring.redis.host=127.0.0.1
+spring.redis.host=49.232.165.138
 spring.redis.port=6379
 spring.redis.password=f7bd979b98fb334d
 #-----\u672C\u5730------
@@ -46,9 +46,9 @@ spring.redis.expireTime = -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://root:f7bd979b98fb334d@127.0.0.1:27017/m5_x1_game_10001?authSource=admin
+spring.data.mongodb.uri = mongodb://root:f7bd979b98fb334d@49.232.165.138:27017/m5_x1_game_10001?authSource=admin
 mongo.uriDbNamePrefix = m5_x1_game_
-spring.data.mongodbcore.uri = mongodb://root:f7bd979b98fb334d@127.0.0.1:27017/m5_tk_login?authSource=admin
+spring.data.mongodbcore.uri = mongodb://root:f7bd979b98fb334d@49.232.165.138:27017/m5_tk_login?authSource=admin
 
 #spring.data.mongodb.uri = mongodb://root:KJM!45kz6z#k8@120.92.216.50:27017/game_10001?authSource=admin
 #mongo.uriDbNamePrefix = game_
@@ -86,7 +86,7 @@ netty.allTimeout=60
 #core     ##\uFFFD\uFFFDsdk\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\u00F5\uFFFD
 
 services.core.ip=127.0.0.1
-services.core.port=19001
+services.core.port=7915
 services.core.gmport=7916
 services.core.worldport=7108
 services.core.area=1000
@@ -95,15 +95,15 @@ services.core.weight=5
 
 
 server.openCross = true
-services.core.chatip=127.0.0.1
+services.core.chatip=49.232.165.138
 services.core.chatport=17181
 services.core.gamechatport=7920
 
-services.core.globalip=127.0.0.1
+services.core.globalip=49.232.165.138
 services.core.globalport=17080
 
 xxl.job.enabled=true
-xxl.job.admin.addresses=http://127.0.0.1:83/xxl-job-admin
+xxl.job.admin.addresses=http://49.232.165.138:83/xxl-job-admin
 xxl.job.accessToken=default_token
 xxl.job.executor.appname=other${server.id}
 xxl.job.executor.address=

tablemanager/src/main/java/manager/STableManager.java

@@ -233,7 +233,7 @@ public class STableManager {
                         try {
                             dealParams(clazz, map, key, type, obj, prarms);
                         }catch (Exception e){
-                            LOGGER.error("clazz = [" + clazz + "], line = [" + line.substring(0,10) + "]"+prarms.toString() + "exception=" + e);
+                            LOGGER.error("clazz = {}, line = {}, para = {}, excep = {}",clazz, line.substring(0,10), Arrays.toString(prarms), e);
                             throw e;
                         }
                         break;