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 |
lvxinran
|
d8b4da6473
|
返利等级修改
|
2021-06-08 16:24:38 +08:00 |
lvxinran
|
d330576310
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-06-08 16:17:41 +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
|
fb2d38e908
|
Merge branch 'master_test_gn' into master_prb_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
|
2021-06-08 14:21:50 +08:00 |
mengchengzhen
|
2059071520
|
天眼封禁参数
|
2021-06-12 10:57:55 +08:00 |
mengchengzhen
|
d87554c7a5
|
天眼封禁优化
|
2021-06-12 10:57:37 +08:00 |
lvxinran
|
a3451bb5f3
|
Revert "天眼封禁参数"
This reverts commit 3e8085b3fc .
|
2021-06-12 10:57:18 +08:00 |
mengchengzhen
|
3e8085b3fc
|
天眼封禁参数
|
2021-06-12 10:55:06 +08:00 |
lvxinran
|
c126a79604
|
合并分支
|
2021-06-11 14:29: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 |
duhui
|
4de7b94119
|
公会副本任务添加
|
2021-06-09 00:06:33 +08:00 |
xuexinpeng
|
1b4da6512f
|
魔试炼任务挑战计数,但新加的扫荡功能不计数
|
2021-06-07 11:17:33 +08:00 |
lvxinran
|
ad5b3166f7
|
无尽本士气值判断
|
2021-06-08 15:09:57 +08:00 |
lvxinran
|
ad00a842af
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-08 14:20:04 +08:00 |
lvxinran
|
5feec114b7
|
无尽修改
|
2021-06-08 14:19:59 +08:00 |
lvxinran
|
ad24318ef5
|
无尽本报空判断
|
2021-06-07 19:47:04 +08:00 |
lvxinran
|
da2a2b68ae
|
mongokey初始化
|
2021-06-07 15:13:51 +08:00 |
lvxinran
|
9b0c7b6548
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-07 14:32:32 +08:00 |
lvxinran
|
9c18b8825b
|
mongokey初始化
|
2021-06-07 14:32:27 +08:00 |
duhui
|
91529a13d1
|
gm扶持不进行数据上报
|
2021-06-04 14:10:08 +08:00 |
duhui
|
e1bcb8e739
|
卸载称号
|
2021-06-02 14:25:11 +08:00 |
duhui
|
b879921365
|
排行榜英雄信息,走鸿蒙阵
|
2021-06-02 11:59:53 +08:00 |
duhui
|
af1c2fb537
|
调试日志注销
|
2021-06-02 11:03:21 +08:00 |
mengchengzhen
|
f2156b6f95
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-01 18:29:49 +08:00 |
lvxinran
|
e78e0141a3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-08 06:26:43 +08:00 |
lvxinran
|
5e1abc8359
|
新任务类型添加
|
2021-06-08 06:26:36 +08:00 |
lvxinran
|
103819f770
|
清除修改无用日志
|
2021-06-08 03:08:27 +08:00 |
lvxinran
|
0a6bc7deb2
|
礼包和活动关联修改
|
2021-06-08 01:29:18 +08:00 |
lvxinran
|
59c22520f3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-06-08 01:12:13 +08:00 |
lvxinran
|
a0db1379a9
|
无尽生成小怪修改
|
2021-06-08 01:12:03 +08:00 |
lvxinran
|
d21c4c9249
|
无用代码删除
|
2021-06-06 20:51:53 +08:00 |
lvxinran
|
f53c48e0b0
|
踏碎凌霄阵容保存
|
2021-06-06 18:35:46 +08:00 |