mengchengzhen
|
c0271abb3d
|
新礼包
|
2021-04-26 18:24:02 +08:00 |
mengchengzhen
|
2019129057
|
Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
|
2021-04-26 17:29:25 +08:00 |
mengchengzhen
|
27aa32bd23
|
新礼包
|
2021-04-26 17:27:54 +08:00 |
lvxinran
|
d1a54c7377
|
充值 发邮件 发奖修改
|
2021-04-26 15:40:51 +08:00 |
mengchengzhen
|
972806ba8f
|
新礼包
|
2021-04-26 13:45:30 +08:00 |
mengchengzhen
|
54a3149de6
|
Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
|
2021-04-26 12:01:08 +08:00 |
mengchengzhen
|
2cac69ffcb
|
新礼包
|
2021-04-22 17:43:30 +08:00 |
mengchengzhen
|
7d91d069aa
|
新礼包测试
|
2021-04-22 13:55:20 +08:00 |
lvxinran
|
3f0ecd8d6f
|
判断类型修改
|
2021-04-21 14:15:51 +08:00 |
lvxinran
|
96163db7b5
|
礼包优化
|
2021-04-21 14:03:40 +08:00 |
mengchengzhen
|
c48ad44e27
|
新礼包
|
2021-04-20 15:03:50 +08:00 |
mengchengzhen
|
30814f86a5
|
新礼包
|
2021-04-28 18:03:47 +08:00 |
mengchengzhen
|
0b59e617c8
|
新礼包
|
2021-04-19 15:37:34 +08:00 |
mengchengzhen
|
2f03e2c24e
|
新礼包
|
2021-04-19 14:50:06 +08:00 |
mengchengzhen
|
c5b4dcd3bd
|
新礼包
|
2021-04-19 11:27:48 +08:00 |
mengchengzhen
|
4ffb494609
|
礼包优化1
|
2021-05-14 17:05:27 +08:00 |
mengchengzhen
|
2aa15c7c32
|
十五日优化
|
2021-04-12 15:09:43 +08:00 |
mengchengzhen
|
8af8ba001c
|
称号优化
|
2021-04-12 15:06:14 +08:00 |
mengchengzhen
|
00ed0e9988
|
15
|
2021-04-06 16:49:40 +08:00 |
mengchengzhen
|
b6031f08de
|
排行榜战力刷新优化
|
2021-04-06 15:53:00 +08:00 |
mengchengzhen
|
b4029e7fd9
|
15
|
2021-04-06 15:51:32 +08:00 |
mengchengzhen
|
12a6f5d580
|
15
|
2021-04-16 20:47:46 +08:00 |
mengchengzhen
|
f07c099715
|
Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2021-04-01 13:45:41 +08:00 |
lvxinran
|
ee53f583f5
|
归元修改
|
2021-05-19 00:18:01 +08:00 |
lvxinran
|
448c13c550
|
福星高照计时修改
|
2021-05-19 00:01:18 +08:00 |
lvxinran
|
15bd393c89
|
福星高照
|
2021-05-02 20:26:14 +08:00 |
lvxinran
|
0228b97402
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-01 13:57:43 +08:00 |
lvxinran
|
bfe16940b2
|
储值活动、聊天修改 提交
|
2021-04-01 13:57:12 +08:00 |
lvxinran
|
c4b4415e00
|
活动类型添加
|
2021-03-31 21:40:07 +08:00 |
mengchengzhen
|
859daed04b
|
15
|
2021-03-30 16:41:53 +08:00 |
whb
|
3db8b587be
|
Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
|
2021-03-30 13:50:29 +08:00 |
mengchengzhen
|
2d9ad53842
|
Merge branch 'master_test_gn' into master_test_gn_mcz
|
2021-03-29 18:09:37 +08:00 |
mengchengzhen
|
c6df17e07b
|
坐骑,皮肤,称号
|
2021-03-29 18:02:38 +08:00 |
lvxinran
|
e39ac0cd61
|
冲突修改
|
2021-03-29 14:29:35 +08:00 |
lvxinran
|
d080a9a0d8
|
Merge branch 'master_online_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java
|
2021-03-29 14:26:02 +08:00 |
lvxinran
|
ad35dedf3b
|
0元不算首冲修改,公会副本推送修改
|
2021-03-31 09:13:49 +08:00 |
lvxinran
|
1b472203e7
|
报错修改
|
2021-03-27 18:45:00 +08:00 |
lvxinran
|
4fa6b8e8af
|
冲突修改
|
2021-03-27 16:43:49 +08:00 |
lvxinran
|
2b06894b07
|
merge2
|
2021-03-27 16:40:32 +08:00 |
lvxinran
|
5f335130c9
|
merge
|
2021-03-27 16:30:56 +08:00 |
whb
|
7c14f87a04
|
图鉴
|
2021-03-25 16:05:35 +08:00 |
duhui
|
55dc3c50af
|
牛气冲天
|
2021-03-25 14:07:35 +08:00 |
lvxinran
|
4c0ce0872c
|
工会副本修改
|
2021-03-23 03:30:42 +08:00 |
lvxinran
|
6f8e28efcd
|
充值成功indication
|
2021-03-20 21:17:16 +08:00 |
lvxinran
|
70c50ed74b
|
删除无用日志
|
2021-03-20 14:59:55 +08:00 |
lvxinran
|
58713e49da
|
添加日志
|
2021-04-02 00:24:40 +08:00 |
lvxinran
|
97b65368e2
|
添加日志
|
2021-04-02 00:10:33 +08:00 |
lvxinran
|
c6286f1834
|
添加日志
|
2021-04-01 23:51:00 +08:00 |
lvxinran
|
4f9f8a76eb
|
删除无用公会代码
|
2021-03-19 23:26:07 +08:00 |
whb
|
61ffca630c
|
羁绊激活
|
2021-03-19 18:41:28 +08:00 |