Commit Graph

4841 Commits (9a0f8b639508abf71790272934b27b05a1c04d1c)

Author SHA1 Message Date
lvxinran 9a0f8b6395 称号添加 2021-08-01 00:28:27 +08:00
lvxinran 8a7eb09fe7 容错计算 2021-07-22 15:22:25 +08:00
lvxinran 88871d789a Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-08-01 08:08:27 +08:00
lvxinran b6accfb599 跨服等级关联表,修改奖励 2021-08-01 01:12:10 +08:00
lvxinran b858575a71 跨服修改 2021-08-01 02:28:08 +08:00
lvxinran 4639b612ea 时间少一周 2021-07-31 21:37:10 +08:00
lvxinran 8828912661 修改错误提示 2021-07-25 23:08:59 +08:00
duhui c708ffd3e6 Revert "超值基金, 老玩家时间兼容问题"
This reverts commit 65326a1808.
2021-07-20 20:49:47 +08:00
duhui 65326a1808 超值基金, 老玩家时间兼容问题 2021-07-20 20:46:59 +08:00
lvxinran 4b7d67c586 Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-20 09:57:02 +08:00
lvxinran 7e93977007 埋点修改 2021-07-20 09:56:10 +08:00
duhui ad6dfd7de6 超值基金bug修改 2021-07-20 09:55:43 +08:00
lvxinran 6e8dc9fb64 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-19 19:40:38 +08:00
xuexinpeng 65fbb27c1b 快速挑战:拍脸 2021-07-19 18:33:28 +08:00
xuexinpeng 83e9c81b8c 山河试炼快速挑战 拍脸 2021-07-19 18:08:08 +08:00
lvxinran 62fe24b3af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:15:09 +08:00
lvxinran 1cdc3e658d 被封禁后不再上报 2021-07-19 17:15:03 +08:00
lvxinran a01d8d6037 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-31 11:46:41 +08:00
lvxinran 37fc2796ce 十绝阵解散修改 2021-07-31 11:46:32 +08:00
lvxinran 20cf1f52b2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-29 23:16:26 +08:00
lvxinran 917331ec42 第一次刷新修改 2021-07-29 23:16:20 +08:00
xuexinpeng 5eb495a8e4 活动类型:5 2021-07-20 16:34:02 +08:00
duhui fca529e5d9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:04:07 +08:00
duhui 567f31c33a 超值基金修改 2021-07-19 17:03:56 +08:00
xuexinpeng 1ac7d8e139 活动类型:5 2021-07-19 16:04:59 +08:00
xuexinpeng 70576ce70a 活动类型:5 2021-07-19 15:46:20 +08:00
duhui 414f2c91db 超值基金活动修改 2021-07-19 13:51:50 +08:00
duhui 3415e92270 超值基金bug修改 2021-07-19 10:57:02 +08:00
lvxinran a9802099c0 跨服修改 2021-07-19 06:07:09 +08:00
lvxinran 4b641f5109 跨服修改 2021-07-18 23:57:59 +08:00
lvxinran cbe1b7753e 封禁提示 2021-07-18 01:26:33 +08:00
xuexinpeng cdaeb7c971 新活动类型:5 2021-07-16 18:56:13 +08:00
xuexinpeng f30d36473d 新加活动类型:5 2021-07-16 17:07:17 +08:00
lvxinran d93d9a1f6a 心愿抽卡发邮件替换 2021-07-16 15:25:15 +08:00
duhui 3000c791f2 Merge branch 'dh_dev_wishDrawCard' into master_test_gn
(cherry picked from commit 5c69363203)
2021-07-16 14:26:33 +08:00
duhui f61b9c81f6 超值基金bug修改 2021-07-16 14:16:46 +08:00
mengchengzhen b2b03eb17a 增加丢失代码 2021-07-15 18:11:47 +08:00
mengchengzhen 91080b333b Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-15 17:33:45 +08:00
mengchengzhen c87f0e1864 许愿魂印 2021-07-15 17:12:34 +08:00
duhui 5c69363203 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-07-15 16:33:54 +08:00
duhui 8a1b28f04e Merge branch 'dh_dev_qimendunjia' into master_test_gn
奇门遁甲协议合并
2021-07-15 16:33:44 +08:00
duhui 708cc0b718 Merge branch 'dh_dev_fund' into master_test_gn 2021-07-15 16:31:12 +08:00
duhui fd888a7141 奇门遁甲消耗 2021-07-15 16:27:08 +08:00
duhui b2f31798b0 心愿抽卡优化 2021-07-15 16:03:04 +08:00
xuexinpeng 83f9c3fe83 热更奖励id变更 bug 2021-07-15 14:06:42 +08:00
lvxinran 07fe5c89ed Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-15 04:34:40 +08:00
lvxinran ef19e67afe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-15 04:01:17 +08:00
lvxinran bd3c9a6abb 福星高照 2021-07-15 04:01:11 +08:00
lvxinran 941839a2c1 活动礼包刷新 2021-07-15 00:11:47 +08:00
lvxinran 37d02a17c9 福星高照暂时关闭 2021-07-15 00:11:29 +08:00