lvxinran
|
21973c02d6
|
免费不发送邮件
|
2021-04-27 13:40:09 +08:00 |
mengchengzhen
|
c9580f6ba4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-26 20:50:41 +08:00 |
mengchengzhen
|
fcff8428e9
|
新礼包
|
2021-04-26 20:50:32 +08:00 |
lvxinran
|
b7b9753b6f
|
邮件标题错误修改
|
2021-04-26 19:42:16 +08:00 |
lvxinran
|
3eb625070f
|
购买妖精双倍添加
|
2021-04-26 19:40:57 +08:00 |
lvxinran
|
2de2762b5d
|
报错修改
|
2021-04-26 19:09:36 +08:00 |
mengchengzhen
|
f0db839fab
|
Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2021-04-26 19:04:40 +08:00 |
xuexinpeng
|
d827c0057e
|
踏碎凌霄
|
2021-04-26 18:34:58 +08:00 |
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 |
xuexinpeng
|
197616887a
|
Merge branch 'master_test_gn_arean' into master_test_gn
|
2021-04-26 16:27:19 +08:00 |
xuexinpeng
|
7fb75df1b6
|
踏碎凌霄
|
2021-04-26 16:25:14 +08:00 |
lvxinran
|
d1a54c7377
|
充值 发邮件 发奖修改
|
2021-04-26 15:40:51 +08:00 |
duhui
|
e9d4c76dd6
|
内部gm,跳过公会boss
|
2021-04-26 14:09:04 +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 |
lvxinran
|
ae93532942
|
大闹天宫招募节点宝物添加
|
2021-04-23 15:19:47 +08:00 |
mengchengzhen
|
fca38c08d0
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-22 17:46:43 +08:00 |
mengchengzhen
|
82cc2a5feb
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-28 18:13:51 +08:00 |
mengchengzhen
|
2cac69ffcb
|
新礼包
|
2021-04-22 17:43:30 +08:00 |
mengchengzhen
|
7d91d069aa
|
新礼包测试
|
2021-04-22 13:55:20 +08:00 |
lvxinran
|
148487cfd8
|
Merge branch 'master_test_gn_c' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-04-22 10:04:16 +08:00 |
lvxinran
|
11bb0ec986
|
报错修改
|
2021-04-22 10:00:24 +08:00 |
lvxinran
|
66a0486528
|
抽卡逻辑修改
|
2021-04-21 14:44:26 +08:00 |
lvxinran
|
47efe87f3a
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-21 14:17:04 +08:00 |
lvxinran
|
8d985faf56
|
暂时提交
|
2021-04-21 14:16:59 +08:00 |
lvxinran
|
3f0ecd8d6f
|
判断类型修改
|
2021-04-21 14:15:51 +08:00 |
lvxinran
|
96163db7b5
|
礼包优化
|
2021-04-21 14:03:40 +08:00 |
duhui
|
c05d0ea2b6
|
首次挑战成功时改为不消耗次数
|
2021-04-21 11:30:04 +08:00 |
xuexinpeng
|
2c92ff12e6
|
Merge branch 'master_test_gn' into master_test_gn_arean
|
2021-05-04 00:25:29 +08:00 |
xuexinpeng
|
59b28c36e8
|
竞技场优化 赛季重置不清空积分,初始化为上赛季积分的百分比
|
2021-05-04 00:24:50 +08:00 |
mengchengzhen
|
c48ad44e27
|
新礼包
|
2021-04-20 15:03:50 +08:00 |
mengchengzhen
|
30814f86a5
|
新礼包
|
2021-04-28 18:03:47 +08:00 |
duhui
|
a41d8fff66
|
Merge branch 'dh_dev_cn_oblation' into master_test_gn
通用祭品
|
2021-04-20 14:44:01 +08:00 |
lvxinran
|
1a1a112734
|
抽卡清计数修改
|
2021-04-20 14:04:01 +08:00 |
lvxinran
|
305f2879ed
|
社稷大典排行修改
|
2021-04-19 20:20:56 +08:00 |
duhui
|
ed597fd903
|
大闹天宫,招募星级问题
|
2021-04-20 11:08:00 +08:00 |
lvxinran
|
ffbd9ac401
|
公会祭祀 援助 打印日志
|
2021-04-20 10:45:53 +08:00 |
lvxinran
|
416a93b981
|
公会类型排行榜修改
|
2021-04-20 10:26:52 +08:00 |
duhui
|
174a0f799a
|
同系祭品
|
2021-04-19 17:53:44 +08:00 |
duhui
|
5aa5b1fecb
|
Merge branch 'master_test' into master_test_gn
|
2021-04-19 16:50:36 +08:00 |
lvxinran
|
eb11dd82d1
|
Merge branch 'master_test' into master_test_gn
|
2021-04-20 10:26:04 +08:00 |
lvxinran
|
59a2dfa11a
|
公会类型排行榜修改
|
2021-04-20 10:25:38 +08:00 |
duhui
|
5648d6392e
|
大闹天宫,招募星级问题
|
2021-04-19 16:48:00 +08:00 |
mengchengzhen
|
ee6575e2a3
|
装备升星
|
2021-04-19 15:51:36 +08:00 |
duhui
|
4761478c74
|
通用祭品bug修改
|
2021-04-19 15:38:29 +08:00 |
mengchengzhen
|
0b59e617c8
|
新礼包
|
2021-04-19 15:37:34 +08:00 |
lvxinran
|
935740a46e
|
怪物传星级给前端
|
2021-04-19 15:28:05 +08:00 |
mengchengzhen
|
bad33084ee
|
装备升星
|
2021-04-19 15:12:56 +08:00 |