lvxinran
|
9e048deffe
|
巅峰赛分组修改
|
2021-07-02 10:33:15 +08:00 |
lvxinran
|
5515c1b9a1
|
森罗排行修改
|
2021-07-01 15:42:48 +08:00 |
mengchengzhen
|
7ed896b78c
|
推送礼包优化
|
2021-07-01 14:27:56 +08:00 |
duhui
|
a0c902347e
|
心愿抽卡 权重修改
|
2021-07-01 11:54:58 +08:00 |
duhui
|
6bfaa31a8a
|
心愿抽卡, 逻辑封装
|
2021-07-01 11:52:39 +08:00 |
duhui
|
2569029171
|
活动时间冲突处理
|
2021-07-01 11:36:32 +08:00 |
lvxinran
|
a0502dfecd
|
强转报错修改
|
2021-07-01 11:11:33 +08:00 |
duhui
|
35723bfbef
|
心愿, 优化
|
2021-07-01 11:07:30 +08:00 |
duhui
|
58337cc318
|
心愿抽卡,格子权重修改
|
2021-07-01 11:02:01 +08:00 |
duhui
|
afa3958566
|
心愿抽奖重新提交
|
2021-07-01 10:46:44 +08:00 |
duhui
|
2514e19137
|
Merge branch 'dh_dev_seven' into master_test_gn
|
2021-07-01 10:27:21 +08:00 |
lvxinran
|
d69b4f6962
|
查看跨服英雄信息
|
2021-07-01 10:06:34 +08:00 |
xuexinpeng
|
2991256a9c
|
首冲3天 -> 7天 容错
|
2021-06-30 19:10:17 +08:00 |
duhui
|
3a57065e42
|
超惠神装
|
2021-06-30 17:52:50 +08:00 |
lvxinran
|
2682d7fa7d
|
服务器名字修改
|
2021-06-30 17:32:28 +08:00 |
lvxinran
|
dcad481e53
|
查看英雄信息修改
|
2021-06-30 17:20:55 +08:00 |
lvxinran
|
2fe4049b55
|
跨服分布式锁添加
|
2021-07-02 18:21:40 +08:00 |
lvxinran
|
9c3e803af5
|
查看信息修改
|
2021-07-10 03:06:40 +08:00 |
lvxinran
|
e077ac6173
|
rank默认排名修改
|
2021-07-10 02:09:36 +08:00 |
lvxinran
|
f43e032398
|
分组信息直接取redis
|
2021-07-10 01:58:06 +08:00 |
lvxinran
|
51ffb72fe6
|
世界等级计算
|
2021-07-10 01:27:03 +08:00 |
lvxinran
|
1482e79903
|
起服计算世界等级报空修改
|
2021-07-10 01:19:58 +08:00 |
lvxinran
|
99de70fb11
|
休战期处理
|
2021-07-10 00:44:15 +08:00 |
lvxinran
|
9eb6920fe7
|
缓存删除修改
|
2021-07-10 00:27:46 +08:00 |
lvxinran
|
24cc1fbbf1
|
跨服修改
|
2021-07-05 01:27:01 +08:00 |
xuexinpeng
|
28b5ea5250
|
Revert "首冲3天 -> 7天 容错"
This reverts commit 482336919c .
|
2021-06-30 16:50:10 +08:00 |
xuexinpeng
|
482336919c
|
首冲3天 -> 7天 容错
|
2021-06-30 16:45:57 +08:00 |
duhui
|
b9a1a2dee4
|
Merge branch 'dh_dev_wishDrawCard' into master_test_gn
|
2021-06-30 14:44:51 +08:00 |
duhui
|
dc2c2ccd99
|
心愿bug处理
|
2021-06-30 14:22:43 +08:00 |
duhui
|
fb6166b202
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2021-06-30 13:39:19 +08:00 |
duhui
|
2b2ce7ea7f
|
线上日志热更
|
2021-06-30 13:39:07 +08:00 |
duhui
|
3f1ff48f3a
|
心愿抽卡完善
|
2021-06-30 11:40:37 +08:00 |
xuexinpeng
|
c48bf9a268
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java
|
2021-06-30 10:41:46 +08:00 |
lvxinran
|
d72acbcea7
|
奖池修改
|
2021-07-02 20:19:33 +08:00 |
lvxinran
|
90f8cba220
|
抽卡获取同阵营修改
|
2021-07-02 18:22:35 +08:00 |
xuexinpeng
|
abc3321c6b
|
山河试炼注释 暂时不上
|
2021-06-30 10:31:55 +08:00 |
duhui
|
a18cdcf1e5
|
心愿抽卡功能提交
|
2021-06-30 09:47:49 +08:00 |
xuexinpeng
|
d6cf251701
|
山河社稷埋点
|
2021-06-29 14:16:23 +08:00 |
xuexinpeng
|
937cc3d235
|
山河埋点数据
|
2021-06-29 11:36:25 +08:00 |
duhui
|
29df3cbddd
|
奇门遁甲2.0
|
2021-06-29 11:27:28 +08:00 |
duhui
|
3afb198cf9
|
奇门遁甲 协议优化
|
2021-06-28 16:24:05 +08:00 |
duhui
|
24c3c32bb6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-06-28 11:50:43 +08:00 |
duhui
|
b7d90178ee
|
战报功能优化
|
2021-06-28 11:50:12 +08:00 |
xuexinpeng
|
5df1ef37d6
|
站内信
|
2021-06-28 11:32:17 +08:00 |
duhui
|
7cdd1afd84
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-06-28 11:09:56 +08:00 |
duhui
|
b3a35321d6
|
活动非空验证
|
2021-06-28 10:46:27 +08:00 |
duhui
|
d9e4e29bb6
|
惊喜礼盒,bug处理
|
2021-06-27 22:59:52 +08:00 |
lvxinran
|
e0568b2717
|
巅峰赛竞猜币换成邮件转换
|
2021-06-26 14:04:01 +08:00 |
lvxinran
|
bbaf6a1556
|
排名修改
|
2021-06-26 13:54:03 +08:00 |
lvxinran
|
8b8d24f551
|
跨服名次修改
|
2021-07-04 01:00:59 +08:00 |
lvxinran
|
87111d6365
|
Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
|
2021-07-03 22:00:17 +08:00 |
lvxinran
|
356f652cd1
|
暂时修改
|
2021-07-03 22:00:07 +08:00 |
lvxinran
|
39bc93bbca
|
跨服提交
|
2021-07-03 21:36:27 +08:00 |
duhui
|
084758fd99
|
灵兽对象修改,添加位置信息
|
2021-06-25 15:42:25 +08:00 |
duhui
|
29b68a8996
|
英雄属性添加
|
2021-06-25 15:29:26 +08:00 |
mengchengzhen
|
0711bfd752
|
天眼log
|
2021-06-24 11:49:52 +08:00 |
mengchengzhen
|
611dc9cdc8
|
天眼log
|
2021-06-24 11:24:03 +08:00 |
mengchengzhen
|
966351e03c
|
跨服
|
2021-06-23 18:54:37 +08:00 |
lvxinran
|
a7ffcb435b
|
Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
|
2021-06-26 01:58:59 +08:00 |
lvxinran
|
040a412069
|
跨服第一版
|
2021-06-26 01:56:46 +08:00 |
mengchengzhen
|
2e94594960
|
跨服
|
2021-06-23 18:33:14 +08:00 |
mengchengzhen
|
ff2bb3013b
|
福利红包会长新人红包
|
2021-06-23 16:17:47 +08:00 |
xuexinpeng
|
7331168ef5
|
onlineUserReport五分钟上报修改
|
2021-06-23 15:23:48 +08:00 |
mengchengzhen
|
af83955bd5
|
跨服时间状态
|
2021-06-23 14:43:00 +08:00 |
xuexinpeng
|
33bcd9be80
|
appid暂时修改
|
2021-06-23 11:53:57 +08:00 |
duhui
|
a660a1b5bf
|
扶持发奖
|
2021-06-22 17:39:47 +08:00 |
duhui
|
95be325af7
|
扶持发奖
|
2021-06-22 17:37:51 +08:00 |
lvxinran
|
0743dde166
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-06-21 20:29:15 +08:00 |
mengchengzhen
|
e281e93223
|
福利红包离开公会优化
|
2021-06-21 18:49:18 +08:00 |
mengchengzhen
|
d32845a602
|
福利红包优化
|
2021-06-21 17:46:59 +08:00 |
mengchengzhen
|
1413a7ba82
|
热更福利红包工会2Jbug
|
2021-06-21 16:56:54 +08:00 |
mengchengzhen
|
66e33baa24
|
福利红包优化
|
2021-06-21 16:23:17 +08:00 |
lvxinran
|
6a08e5edd1
|
福利红包日志
|
2021-06-21 16:01:02 +08:00 |
mengchengzhen
|
a98918bdf6
|
福利红包
|
2021-06-21 11:23:19 +08:00 |
xuexinpeng
|
186fc06156
|
hardstageBuff表改动相关注释
|
2021-06-19 16:17:41 +08:00 |
xuexinpeng
|
b2ec86a39d
|
策划hardstageBuff 改表需求
|
2021-06-19 15:57:02 +08:00 |
mengchengzhen
|
22b776da9b
|
旧红包bug
|
2021-06-22 18:50:58 +08:00 |
mengchengzhen
|
4bed1f51f9
|
升星活动
|
2021-06-22 18:21:50 +08:00 |
mengchengzhen
|
04001f09b6
|
升星活动
|
2021-06-22 16:30:58 +08:00 |
lvxinran
|
9baf176021
|
巅峰赛ErrorCode添加,日志添加
|
2021-06-23 15:25:50 +08:00 |
duhui
|
93e86b5d88
|
测试代码删除
|
2021-06-18 17:10:29 +08:00 |
duhui
|
7720d73e62
|
Merge branch 'dh_dev_arena' into master_test_gn_arena
|
2021-06-18 17:00:36 +08:00 |
lvxinran
|
90af84ac12
|
发送分组邮件,删除无用代码
|
2021-06-23 16:31:11 +08:00 |
lvxinran
|
e47eaeb8bd
|
跨服分组第一版
|
2021-06-23 14:29:54 +08:00 |
duhui
|
7f7223ee10
|
跨服,玩家信息和排行初版
|
2021-06-18 16:58:32 +08:00 |
duhui
|
62f880ce59
|
惊喜礼盒,开启天数
|
2021-06-18 13:55:35 +08:00 |
duhui
|
bae043a10a
|
惊喜礼盒,bug修改
|
2021-06-18 11:01:16 +08:00 |
mengchengzhen
|
6cd02d8979
|
新活动
|
2021-06-22 10:41:33 +08:00 |
mengchengzhen
|
9193d8b6da
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-22 10:40:03 +08:00 |
mengchengzhen
|
0f6bc679c6
|
礼包代码优化
|
2021-06-22 10:35:06 +08:00 |
duhui
|
04f0303672
|
惊喜礼盒, 活动区服类型,获取时间
|
2021-06-18 10:32:45 +08:00 |
duhui
|
984c6514c7
|
Merge branch 'dh_dev_superbox' into master_test_gn
|
2021-06-18 09:51:02 +08:00 |
xuexinpeng
|
30ad58d7f0
|
山河试炼
|
2021-06-18 00:06:44 +08:00 |
duhui
|
870f5eea52
|
临时保存
|
2021-06-17 15:23:37 +08:00 |
xuexinpeng
|
84ce7b9a1b
|
山河社稷该表容错
|
2021-06-17 15:00:08 +08:00 |
lvxinran
|
c4d6ee097b
|
跨服修改
|
2021-06-16 18:11:23 +08:00 |
mengchengzhen
|
c610caaf41
|
新推送礼包
|
2021-06-16 16:09:20 +08:00 |
lvxinran
|
06fb70ed2a
|
修改无尽副本属性
|
2021-06-15 16:56:00 +08:00 |
lvxinran
|
ed1d5a1dd0
|
战斗属性打印日志
|
2021-06-15 15:47:47 +08:00 |
lvxinran
|
be62050c52
|
尝试修改公会援助
|
2021-06-17 02:45:46 +08:00 |
lvxinran
|
45b5757a1d
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-06-17 02:44:58 +08:00 |
lvxinran
|
66a1236424
|
修复巅峰赛
|
2021-06-17 00:16:46 +08:00 |
duhui
|
16a9d3ae45
|
奇门遁甲协议补充
|
2021-06-15 11:22:06 +08:00 |
duhui
|
374cd9d58d
|
惊喜礼盒,逻辑修改
|
2021-06-12 18:07:13 +08:00 |
duhui
|
8811d07ace
|
惊喜盒子,状态优化
|
2021-06-17 14:21:20 +08:00 |
duhui
|
0b2df1665a
|
Merge branch 'master_test_gn' into dh_dev_superbox
|
2021-06-17 11:16:33 +08:00 |
duhui
|
eac97377b2
|
惊喜礼盒, 零点刷新推送
|
2021-06-17 11:01:57 +08:00 |
duhui
|
7923c95d11
|
惊喜礼盒
|
2021-06-17 10:53:11 +08:00 |
xuexinpeng
|
1224f67b7b
|
山河社稷图优化
|
2021-06-11 18:30:14 +08:00 |
lvxinran
|
880d92bed4
|
报空修改
|
2021-06-13 03:28:40 +08:00 |
mengchengzhen
|
003c644d6c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-11 16:32:57 +08:00 |
lvxinran
|
670e7f0f25
|
报空修改
|
2021-06-13 01:46:33 +08:00 |
lvxinran
|
645d0b00cc
|
工会援助日志
|
2021-06-13 00:11:14 +08:00 |
lvxinran
|
b73f5bcefe
|
公会援助日志
|
2021-06-13 00:09:40 +08:00 |
lvxinran
|
503cae2f46
|
免费礼包
|
2021-06-12 15:37:14 +08:00 |
lvxinran
|
ae78e720ff
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-12 03:33:24 +08:00 |
lvxinran
|
3628b63546
|
无尽小怪替换
|
2021-06-12 03:33:11 +08:00 |
mengchengzhen
|
4160bac4a5
|
福利红包
|
2021-06-11 16:26:37 +08:00 |
xuexinpeng
|
d2bac109f6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-10 18:19:28 +08:00 |
xuexinpeng
|
e150375e8c
|
本地礼包购买
|
2021-06-10 18:18:35 +08:00 |
mengchengzhen
|
5a88bd3ebb
|
福利红包
|
2021-06-10 18:05:56 +08:00 |
mengchengzhen
|
cf5f93ec7d
|
福利红包优化
|
2021-06-10 17:38:56 +08:00 |
xuexinpeng
|
68a935cfb6
|
山河社稷图奖励排序还原
|
2021-06-10 17:14:59 +08:00 |
xuexinpeng
|
50d70c41f9
|
山河社稷图奖励数据排序
|
2021-06-10 16:39:08 +08:00 |
xuexinpeng
|
4d146a767b
|
发货金额校验
|
2021-06-10 14:48:53 +08:00 |
lvxinran
|
17925142bc
|
Merge branch 'master_test_gn' into master_test_gn_getRandomCount
|
2021-06-10 13:49:48 +08:00 |
lvxinran
|
5ff20eccc5
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-06-10 13:48:57 +08:00 |
mengchengzhen
|
17c5c3905f
|
基金优化
|
2021-07-10 16:00:06 +08:00 |
mengchengzhen
|
1feb54097f
|
基金优化
|
2021-07-10 15:46:00 +08:00 |
duhui
|
2b491a250d
|
Merge branch 'dh_dev_gm2' into master_test_gn
|
2021-06-10 10:08:35 +08:00 |
duhui
|
32c074745b
|
竞技场宝箱奖励报送
|
2021-06-09 18:45:44 +08:00 |
mengchengzhen
|
a56e74e306
|
新增福利红包类型
|
2021-06-09 17:49:36 +08:00 |
mengchengzhen
|
689913e17c
|
基金优化
|
2021-07-10 16:13:16 +08:00 |
duhui
|
04f2fef345
|
ccid
|
2021-06-09 15:47:12 +08:00 |
duhui
|
3c48a55f4f
|
主线动态匹配表
|
2021-06-09 15:43:33 +08:00 |
duhui
|
f640e1c690
|
英雄展示,鸿蒙阵突破id
|
2021-06-09 14:27:06 +08:00 |
duhui
|
84969ddd22
|
公会援助记录,修行名字颜色问题
|
2021-06-09 10:57:25 +08:00 |
duhui
|
d6e2f5ffdd
|
事件监听
|
2021-06-08 17:52:23 +08:00 |
duhui
|
2ee83fef78
|
奇门遁甲初版未测试
|
2021-06-08 17:49:21 +08:00 |
duhui
|
4de7b94119
|
公会副本任务添加
|
2021-06-09 00:06:33 +08:00 |
lvxinran
|
c126a79604
|
合并分支
|
2021-06-11 14:29:54 +08:00 |
lvxinran
|
d8b4da6473
|
返利等级修改
|
2021-06-08 16:24:38 +08:00 |
lvxinran
|
fb47673c1d
|
Merge branch 'master_test_gn' into master_test_gn_returnRecharge
|
2021-06-08 16:16:22 +08:00 |
lvxinran
|
8e05075201
|
删除无用代码
|
2021-06-12 10:32:21 +08:00 |
lvxinran
|
d6215bd42b
|
充值返利第二版
|
2021-06-11 18:37:40 +08:00 |
lvxinran
|
8a2c5bd499
|
返利代码第一次提交
|
2021-06-11 14:23:42 +08:00 |
lvxinran
|
0c06c17f5b
|
抽卡次数修改
|
2021-06-08 15:54:54 +08:00 |
mengchengzhen
|
bda5f6a970
|
天眼封禁properties空判断
|
2021-06-08 14:18:08 +08:00 |
mengchengzhen
|
33cbd037da
|
天眼封禁参数
|
2021-06-08 10:42:31 +08:00 |
mengchengzhen
|
962f0641b7
|
天眼封禁优化
|
2021-06-08 10:41:51 +08:00 |