Commit Graph

5563 Commits (c367fce248d45c4402c9ca6c8240de5227507ac2)
 

Author SHA1 Message Date
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
DESKTOP-98AVA47\Administrator bc3ec7b772 杜辉提交,心愿抽卡主题活动兼容 2021-07-16 00:51:40 +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
duhui 4221f30b3a 战报小问题修改 2021-07-14 17:59:24 +08:00
xuexinpeng af37022e38 战令调整 2021-07-14 17:18:09 +08:00
duhui a4ad63b731 超值基金活动改版 2021-07-14 17:11:57 +08:00
lvxinran ca0fd1e10a 物品获得 2021-07-14 02:31:22 +08:00
xuexinpeng 0092fc6886 山河试炼 2021-07-13 10:30:39 +08:00
lvxinran 3c3299acfa 跨服修改 2021-07-12 19:29:31 +08:00
duhui 80b1659cb1 心愿抽卡功能优化 2021-07-12 17:45:07 +08:00
lvxinran aade43b553 分组修改 2021-07-12 11:46:00 +08:00
lvxinran ce10e5f88a 修改成常量 2021-07-12 11:33:45 +08:00
lvxinran 3d340f2511 时间设置修改 2021-07-12 11:31:21 +08:00
lvxinran 287ef6b01b 修改顺序 2021-07-10 02:03:02 +08:00
lvxinran 58e0f37195 无尽重置获得 2021-07-10 02:00:29 +08:00
lvxinran cf1070855c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-09 16:41:33 +08:00
lvxinran ec22c8f128 无尽副本回血 2021-07-09 16:41:21 +08:00
lvxinran 3400966b7d 容错处理 2021-07-09 16:40:17 +08:00
lvxinran 8cf5eb861f 修改日志位置 2021-07-09 14:30:28 +08:00
duhui e9bf77669d 神将归元, 代码修改. 无影响 2021-07-09 10:19:54 +08:00
duhui d09523bb89 公会技能, 连点升级bug处理 2021-07-08 18:09:14 +08:00
lvxinran b472382f69 修复表问题 2021-07-08 14:00:43 +08:00
lvxinran e086327b3e 日志打印 2021-07-08 02:37:27 +08:00
lvxinran 3294d64d30 热更修改 2021-07-08 02:33:14 +08:00