DESKTOP-98AVA47\Administrator
|
d3bef43914
|
判空
|
2021-10-31 01:04:06 +07:00 |
mengchengzhen
|
aa086627e4
|
新礼包
|
2021-05-31 02:58:35 +08:00 |
mengchengzhen
|
7d41aeec3a
|
新礼包
|
2021-04-30 01:44:11 +08:00 |
lvxinran
|
832a767b77
|
同步战斗
|
2021-05-01 01:19:59 +08:00 |
mengchengzhen
|
697f129301
|
新礼包
|
2021-04-28 00:35:03 +08:00 |
mengchengzhen
|
48cf68f620
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-28 00:16:46 +08:00 |
lvxinran
|
6c8e14ba4d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-30 23:08:12 +08:00 |
lvxinran
|
f0838b269d
|
0伤害判断
|
2021-04-30 23:08:06 +08:00 |
lvxinran
|
a1dbf73f89
|
战斗逻辑
|
2021-04-30 21:12:34 +08:00 |
lvxinran
|
d593a41660
|
月卡改回
|
2021-04-30 20:30:48 +08:00 |
lvxinran
|
3c3beed1cf
|
月卡开启时间0点修改
|
2021-04-30 19:48:18 +08:00 |
lvxinran
|
80882ce656
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-30 19:36:47 +08:00 |
lvxinran
|
8cd48d6adb
|
空奖励修改
|
2021-04-30 19:36:34 +08:00 |
mengchengzhen
|
3a5f1a07aa
|
新礼包推送
|
2021-04-28 00:16:35 +08:00 |
mengchengzhen
|
2cfe67afe4
|
新礼包推送弹出
|
2021-04-27 22:28:08 +08:00 |
mengchengzhen
|
32900d9aa9
|
新礼包
|
2021-04-27 21:37:34 +08:00 |
mengchengzhen
|
e8edb1fe95
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 21:20:19 +08:00 |
mengchengzhen
|
98b068f243
|
新礼包豪华基金
|
2021-04-27 21:18:46 +08:00 |
mengchengzhen
|
c9db588348
|
新礼包
|
2021-04-27 19:27:28 +08:00 |
mengchengzhen
|
9f00d7a855
|
新礼包豪华基金邮件
|
2021-05-01 16:43:12 +08:00 |
mengchengzhen
|
747fd9bdb0
|
豪华基金每天奖励
|
2021-05-01 16:26:13 +08:00 |
lvxinran
|
d9e5327137
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 15:53:28 +08:00 |
lvxinran
|
43e10b0ea8
|
修改入库读库错误
|
2021-04-27 15:53:23 +08:00 |
mengchengzhen
|
9b6ec67346
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 14:01:33 +08:00 |
mengchengzhen
|
b1f6fbb581
|
新礼包添加每日充值金额
|
2021-04-27 13:58:54 +08:00 |
mengchengzhen
|
3af3a725c3
|
新礼包
|
2021-04-28 00:27:43 +08:00 |
lvxinran
|
91db235c90
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 13:40:20 +08:00 |
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 |