mengchengzhen
|
8e5e1dc6b2
|
战斗
|
2021-03-10 11:28:29 +08:00 |
mengchengzhen
|
43f14ff544
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
# luafight/Modules/Battle/Logic/Base/Passivity.lua
|
2021-03-10 11:27:24 +08:00 |
mengchengzhen
|
7bba32a458
|
danaotiangong
|
2021-03-10 11:24:14 +08:00 |
mengchengzhen
|
d31e186de2
|
danaotiangong zhandou
|
2021-03-10 11:22:03 +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 |
lvxinran
|
f2a0fffe24
|
敏感字修改
|
2021-03-09 15:48:48 +08:00 |
lvxinran
|
269d7e07e2
|
越南敏感字
|
2021-03-08 16:00:55 +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 |
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 |
mengchengzhen
|
91e53bdf42
|
zabbix登陆限制监测
|
2021-02-26 14:09:29 +08:00 |
duhui
|
0c84c3f839
|
邮件背包已满提示处理
|
2021-02-26 11:31:50 +08:00 |
duhui
|
2dc01e8b26
|
大闹天宫,遇敌刷新逻辑修改
|
2021-02-26 11:29:44 +08:00 |
lvxinran
|
4a09b99d48
|
回滚临时代码
|
2021-02-26 00:22:20 +08:00 |
lvxinran
|
976e8bcafd
|
初始200级
|
2021-02-26 00:04:03 +08:00 |
lvxinran
|
fc432b013e
|
200人测试
|
2021-02-25 23:59:23 +08:00 |
lvxinran
|
bcc02f5447
|
添加虚拟账号代码
|
2021-02-25 23:56:55 +08:00 |
duhui
|
60231a23a5
|
鸿蒙阵,根据最大星级获取最大等级,走表
|
2021-02-25 11:11:54 +08:00 |