Commit Graph

5690 Commits (2050067fb113fbaf8b7ee6b2dfdd2db91c419fa8)
 

Author SHA1 Message Date
mengchengzhen d31e186de2 danaotiangong zhandou 2021-03-10 11:22:03 +08:00
duhui 3ff5d19972 四灵试炼,跑马灯 2021-03-10 11:16:21 +08:00
duhui 06a18387ed Merge branch 'master_test_hw' into dh_dev_HavocInHeaven 2021-03-10 11:02:56 +08:00
mengchengzhen 9fe8dd3e5f 大闹天宫圣物修改 2021-03-10 10:28:59 +08:00
duhui 53aa975368 Revert "查看他人装备共鸣"
This reverts commit 36b669d9e9.
2021-03-09 16:06:17 +08:00
duhui e46c9b42ab 二次提交 2021-03-09 16:04:12 +08:00
duhui 36b669d9e9 查看他人装备共鸣 2021-03-09 16:02:49 +08:00
lvxinran f2a0fffe24 敏感字修改 2021-03-09 15:48:48 +08:00
duhui 0b60f9c4f7 表字段添加,战力排行榜查看他人共鸣熟悉 2021-03-09 15:29:49 +08:00
lvxinran 269d7e07e2 越南敏感字 2021-03-08 16:00:55 +08:00
duhui 3a3b2725e3 redis批量查询key问题处理 2021-03-08 15:29:40 +08:00
duhui 50ce973616 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-03-08 15:21:46 +08:00
duhui cf740db4e4 1.大闹天宫创建节点结构修改,有旧代码删除逻辑
2.公用静态类部分map添加注释,无逻辑修改
3.其他文件无用引导包删除
2021-03-08 15:12:05 +08:00
lvxinran 927d7d3352 邮件移交会长修改 2021-03-07 21:58:14 +08:00
lvxinran 0e1dad5f4a Merge branch 'master_test_hw' into master_test_hw_i18n 2021-03-05 18:17:16 +08:00
lvxinran 3f97a7c4b9 起名修改 2021-03-06 09:51:45 +08:00
lvxinran e52d39d346 邮件本地化修改 2021-03-06 06:48:02 +08:00
duhui c766cc8622 等级上限容错 2021-03-05 16:59:25 +08:00
lvxinran 6b6fc590b0 修改Error 2021-03-05 16:20:21 +08:00
lvxinran 183326536f 错误消息修改 2021-03-05 14:37:38 +08:00
duhui bbf63c4918 试炼节点bug处理 2021-03-05 13:59:51 +08:00
lvxinran a66380f1fc 获得宝物本地化提示修改 2021-03-05 12:36:34 +08:00
whb e0daeb180d 大闹天宫招募2 2021-03-05 11:29:10 +08:00
whb 0ef63cdd79 大闹天宫招募 2021-03-05 10:54:42 +08:00
duhui 9cc1fd8fc9 大闹天宫,获取排行榜速度优化 2021-03-05 10:11:35 +08:00
duhui 25aa13bfd5 大闹天宫,圣物刷新,去除已刷出得圣物 2021-03-04 14:09:35 +08:00
lvxinran 220954d949 Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven 2021-03-05 09:07:33 +08:00
lvxinran bc75aaade9 贪婪节点奖励修改 2021-03-05 09:06:47 +08:00
lvxinran ce12694f5a Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven 2021-03-04 09:48:33 +08:00
lvxinran 52b8d83bab 试炼节点修改 2021-03-04 09:48:27 +08:00
duhui ba269c61b8 大闹天宫,灵兽问题处理 2021-03-03 17:16:03 +08:00
duhui e4e241192a 获取灵兽信息,代码冗余处理 2021-03-03 14:18:27 +08:00
duhui 55500f6aaa 大闹天宫,用户等级修正和遇敌灵兽添加 2021-03-03 13:58:12 +08:00
duhui c99f1bea67 机器人类 2021-03-02 17:54:24 +08:00
duhui 129b9ed2ac 战斗同步 2021-03-02 17:14:52 +08:00
duhui 76b9919dbb Merge branch 'master_online_hw' into master_test_hw 2021-03-02 10:02:45 +08:00
lvxinran 6076d7d47f Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-02 12:11:34 +08:00
lvxinran 63aa8f13f3 断线重连 心跳修改 2021-03-02 12:11:25 +08:00
lvxinran f87beb7368 删除无用日志 2021-03-06 04:44:59 +08:00
duhui 3dbc87013d 邮件,非道具邮件可重复领取问题处理 2021-03-02 10:01:53 +08:00
duhui 78709a72e8 大闹天宫,英雄排序方式优化 2021-03-02 09:50:44 +08:00
duhui bb842b6ea6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-01 11:50:16 +08:00
duhui 11fb77045f 非空验证 2021-03-01 11:50:02 +08:00
duhui 974891f80a 大闹天宫,遇敌 2021-03-01 11:01:24 +08:00
duhui abb94cdfb1 建木神树和四灵试炼,公告添加 2021-03-01 10:14:49 +08:00
lvxinran e59fb7b4d0 Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java
2021-02-28 13:24:55 +08:00
lvxinran d8ef8d9e64 本地化修改 2021-02-27 06:43:48 +08:00
duhui 987e392ae9 四灵试炼,回放战力 2021-02-26 18:22:59 +08:00
lvxinran 34b1c6d891 阈值修改第一版 2021-02-26 15:40:57 +08:00
mengchengzhen 91e53bdf42 zabbix登陆限制监测 2021-02-26 14:09:29 +08:00