jiahuiwen
|
bf85dfec3c
|
超值返利删除容错代码
|
2021-12-28 15:24:37 +08:00 |
jiahuiwen
|
811d67c536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:00:18 +08:00 |
jiahuiwen
|
7ebd8878de
|
神将回退卸下魂印bug
|
2021-12-27 16:55:11 +08:00 |
yuanshuai
|
6faac1d034
|
超值返利网页支付bug修改
|
2021-12-27 16:24:46 +08:00 |
jiahuiwen
|
5820b43cae
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:13:47 +08:00 |
jiahuiwen
|
ac30e70c2e
|
神将回退bug
|
2021-12-27 16:11:51 +08:00 |
jiahuiwen
|
5f04e68e3d
|
神将回退bug
|
2021-12-27 16:09:56 +08:00 |
jiahuiwen
|
9c998b86e6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:01:30 +08:00 |
jiahuiwen
|
4ee0f7b5f2
|
神将回退bug
|
2021-12-27 15:57:09 +08:00 |
jiahuiwen
|
ecd017281d
|
神将回退增加上报
|
2021-12-27 14:25:21 +08:00 |
jiahuiwen
|
b88a69ef3a
|
减少玩家数据在内存时间
|
2021-12-27 10:25:35 +08:00 |
jiahuiwen
|
c6d13b6685
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-12-24 17:52:59 +08:00 |
jiahuiwen
|
4132cd1f80
|
删除无用代码
|
2021-12-24 17:52:09 +08:00 |
jiahuiwen
|
8f47418546
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-24 13:55:10 +08:00 |
jiahuiwen
|
0602b9f003
|
逐胜商店刷新错误
|
2021-12-24 13:55:03 +08:00 |
yuanshuai
|
93596965dd
|
超值返利网页支付重复购买礼包问题修改
|
2021-12-24 09:49:28 +08:00 |
yuanshuai
|
540e61d512
|
超值返利网页支付bug修改
|
2021-12-23 16:05:15 +08:00 |
yuanshuai
|
5cedfa6e4e
|
命石快速合成bug修改
|
2021-12-23 15:14:43 +08:00 |
yuanshuai
|
9b545e5eea
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
|
2021-12-23 09:53:52 +08:00 |
jiahuiwen
|
7ae3da6636
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-22 10:55:57 +08:00 |
jiahuiwen
|
a9df7aa7e0
|
返还道具bug
|
2021-12-22 10:54:44 +08:00 |
jiahuiwen
|
a800bb8249
|
觉醒将返还道具bug
|
2021-12-22 10:44:46 +08:00 |
xuexinpeng
|
49811877fa
|
战斗星级
|
2021-12-21 19:07:26 +08:00 |
jiahuiwen
|
90e98f6355
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2021-12-21 17:48:01 +08:00 |
jiahuiwen
|
d3b35d55d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 10:50:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
8aba14dbe2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-23 19:13:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
5421882672
|
补充
|
2021-12-23 19:13:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b6f5a8e0c
|
获取活动开启时间
|
2021-12-23 19:01:57 +08:00 |
jiahuiwen
|
bd15f69616
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-21 10:50:43 +08:00 |
jiahuiwen
|
cf91ff167b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 09:55:23 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
b473c1a6ca
|
旧版积天豪礼bug修改
|
2021-12-20 18:52:08 +08:00 |
xuexinpeng
|
048c240cb4
|
礼包刷新
|
2021-12-23 17:21:26 +08:00 |
jiahuiwen
|
fb5036ea29
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:51:23 +08:00 |
xuexinpeng
|
a7ff90e6a7
|
规范代码
|
2021-12-29 00:03:50 +08:00 |
jiahuiwen
|
2596eb08b9
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-20 11:51:13 +08:00 |
jiahuiwen
|
7ea5e79269
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:12:59 +08:00 |
yuanshuai
|
9d7058bec8
|
新版天天尊降世bug修改
|
2021-12-23 11:04:02 +08:00 |
yuanshuai
|
652caf6b5b
|
旧版积天豪礼代码兼容
|
2021-12-31 00:02:41 +08:00 |
jiahuiwen
|
58311e37df
|
心愿抽奖 400 次后不重置剩余保底次数
|
2021-12-20 11:12:47 +08:00 |
jiahuiwen
|
fc01267f37
|
每日豪礼 活动类型 13 不再更新,补发奖励
|
2021-12-20 10:20:31 +08:00 |
jiahuiwen
|
78bf408e42
|
积天豪礼活动已被替换,未参与的玩家不再累计
|
2021-12-17 18:31:52 +08:00 |
jiahuiwen
|
80f48b3f42
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 17:19:57 +08:00 |
jiahuiwen
|
7012d6c647
|
灵兽宝阁特殊使用
|
2021-12-17 17:19:40 +08:00 |
yuanshuai
|
f473965b9d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 16:13:59 +08:00 |
yuanshuai
|
df0059632a
|
新版积天豪礼活动提交
|
2021-12-17 16:13:50 +08:00 |
yuanshuai
|
d814ecb635
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2022-01-03 11:48:04 +08:00 |
yuanshuai
|
b3d5dfc0e6
|
新积天豪礼活动脚本修改提交
|
2022-01-03 11:46:33 +08:00 |
jiahuiwen
|
ebc1106e3c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 15:05:08 +08:00 |
jiahuiwen
|
847efbe252
|
原有罗浮货币登录时转化为逐胜徽章
|
2021-12-17 15:05:01 +08:00 |