lvxinran
|
8b4c3c6703
|
Merge branch 'master_test_hw' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
|
2021-03-18 16:19:50 +08:00 |
duhui
|
29bf5b17be
|
代码修复
|
2021-03-18 16:16:45 +08:00 |
lvxinran
|
129a0cdaa1
|
Merge branch 'master_test_hw' into master_test_gn
|
2021-03-18 15:50:51 +08:00 |
lvxinran
|
5f5562938b
|
贪婪节点英雄信息
|
2021-03-18 15:50:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
530468ba0c
|
大闹天宫,试炼节点调优
|
2021-03-20 02:42:45 +07:00 |
lvxinran
|
ad85797051
|
贪婪节点没有英雄信息
|
2021-03-18 15:48:07 +08:00 |
lvxinran
|
bce5d3c34c
|
buff值代码修改
|
2021-03-18 13:52:12 +08:00 |
lvxinran
|
9c684c7c8f
|
int long 修改
|
2021-03-18 11:55:54 +08:00 |
lvxinran
|
2b61537ab7
|
活跃度修改
|
2021-03-17 16:41:28 +08:00 |
duhui
|
1c518d0f73
|
大闹天宫,怪物魂印逻辑修改
|
2021-03-17 15:10:21 +08:00 |
duhui
|
1cd71db5cb
|
1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
|
2021-03-17 14:09:55 +08:00 |
lvxinran
|
aa9fee7c60
|
buff类型回滚
|
2021-03-16 17:43:22 +08:00 |
duhui
|
bf0ab56a93
|
大闹天宫,随机阵容问题处理
|
2021-03-16 11:14:27 +08:00 |
duhui
|
0567561cee
|
大闹天宫,boos节点和精英节点战力问题解决
|
2021-03-16 09:49:37 +08:00 |
mengchengzhen
|
409b7a3468
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 18:50:19 +08:00 |
mengchengzhen
|
eff18fe054
|
danaotiangong update
|
2021-03-15 18:50:12 +08:00 |
lvxinran
|
6804684744
|
非空判断
|
2021-03-15 11:11:21 +08:00 |
lvxinran
|
8966f25c5b
|
限时神装
|
2021-03-15 11:09:03 +08:00 |
lvxinran
|
72d408063d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 09:52:06 +08:00 |
lvxinran
|
9fbb26d855
|
离线逻辑修改
|
2021-03-15 09:52:01 +08:00 |
mengchengzhen
|
8fa36b3b1a
|
dntg bug
|
2021-03-11 21:01:10 +08:00 |
duhui
|
9e488abe4e
|
鸿蒙阵突破等级
|
2021-03-11 18:34:36 +08:00 |
duhui
|
f086046586
|
符号
|
2021-03-11 18:27:32 +08:00 |
duhui
|
e01097fabc
|
鸿蒙阵突破共鸣问题
|
2021-03-11 18:19:09 +08:00 |
mengchengzhen
|
d4e5a2b6a4
|
holy 37type update
|
2021-03-11 17:02:35 +08:00 |
lvxinran
|
f0abc728be
|
阈值修改提交
|
2021-03-10 17:29:28 +08:00 |
lvxinran
|
dbcb1f98f9
|
阈值修改
|
2021-03-10 16:56:08 +08:00 |
lvxinran
|
5d7fad815e
|
修改阈值冲突
|
2021-03-10 16:16:22 +08:00 |
lvxinran
|
ecde209b04
|
Merge branch 'master_test_gn' into master_test_gn_datatype
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
# tablemanager/src/main/java/config/SCHero.java
|
2021-03-10 16:13:37 +08:00 |
mengchengzhen
|
b83f8583ec
|
danaotiangong battlenode
|
2021-03-10 15:17:47 +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
|
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
|
34b1c6d891
|
阈值修改第一版
|
2021-02-26 15:40:57 +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 |
duhui
|
1099169d1f
|
大闹天宫,初版未完成
|
2021-02-25 10:34:05 +08:00 |
mengchengzhen
|
d8160bdfb0
|
排行榜20位优化
|
2021-02-24 10:27:08 +08:00 |
mengchengzhen
|
91dd46a809
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-24 10:20:07 +08:00 |
mengchengzhen
|
4e82991332
|
新头像
|
2021-02-24 10:19:59 +08:00 |
lvxinran
|
afe20ec571
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-24 00:07:20 +08:00 |
lvxinran
|
5a1f8e8268
|
删除公会 删除排行
|
2021-02-24 00:07:11 +08:00 |
lvxinran
|
bf68a3b434
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-02-23 18:20:04 +08:00 |
whb
|
cc2d7f9064
|
datatype
|
2021-02-23 15:54:00 +08:00 |
duhui
|
f1847c33a0
|
鸿蒙阵,升级返回原始等级
|
2021-02-20 17:20:11 +08:00 |
duhui
|
a4f7cb971f
|
鸿蒙阵,魂宝灵宝计算修改
|
2021-02-20 16:51:30 +08:00 |
duhui
|
944b5d5405
|
鸿蒙阵,魂灵宝bug修改
|
2021-02-19 15:50:46 +08:00 |
duhui
|
256fff3c57
|
鸿蒙阵,鸿蒙守卫魂宝灵宝,等级显示问题处理
|
2021-02-19 15:44:59 +08:00 |
lvxinran
|
371bf21d90
|
释放redis连接池
|
2021-02-19 15:09:46 +08:00 |
lvxinran
|
79902665e7
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-19 14:55:16 +08:00 |
duhui
|
32b5f8d8fd
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
|
2021-02-19 11:06:29 +08:00 |
lvxinran
|
860397c890
|
发奖修改
|
2021-02-05 15:00:12 +08:00 |
lvxinran
|
a4077e200c
|
大闹天宫神将空位逻辑修改
|
2021-02-05 13:58:22 +08:00 |
duhui
|
6ed7ee4b2f
|
挂机奖励,结束时间,内存修改
|
2021-02-02 11:29:56 +08:00 |
duhui
|
751421144b
|
会长转移,空指针修改
|
2021-02-02 10:21:12 +08:00 |
duhui
|
8086106b52
|
挂机奖励修改,随机改一次一次算
|
2021-02-02 11:13:43 +08:00 |
duhui
|
b363301111
|
Merge branch 'dh_dev_guaji' into master_test_hw
|
2021-02-01 22:55:14 +08:00 |
lvxinran
|
3c24ef97fc
|
删除 无用打印
|
2021-02-01 16:52:17 +08:00 |
lvxinran
|
5ed63868e5
|
工会邮件内容修改
|
2021-01-31 14:49:05 +08:00 |
lvxinran
|
5d9812cff2
|
兑换码时间控制
|
2021-01-31 13:55:57 +08:00 |
duhui
|
508eda57d8
|
挂机奖励修改
|
2021-01-29 10:52:56 +08:00 |
lvxinran
|
f72e134f0f
|
抽卡逻辑
|
2021-01-28 17:53:22 +08:00 |
lvxinran
|
a4dca69532
|
抽卡生效次数校验修改
|
2021-01-28 17:19:08 +08:00 |
lvxinran
|
1b2e00e478
|
修改抽卡逻辑
|
2021-01-28 17:05:37 +08:00 |
lvxinran
|
50824acdd9
|
抽卡计次修改
|
2021-01-28 16:41:54 +08:00 |
duhui
|
2fb09e6844
|
轩辕宝镜和逍遥游埋点
|
2021-01-28 15:42:27 +08:00 |
lvxinran
|
674c00ff98
|
工会关联表
|
2021-01-28 15:33:57 +08:00 |
lvxinran
|
e4b32a7b03
|
加入在线判断逻辑
|
2021-02-24 01:23:23 +08:00 |
duhui
|
56048956ea
|
日常任务,隔天在线完成优化
|
2021-01-28 10:00:33 +08:00 |
lvxinran
|
2dbe80f3a5
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-27 16:19:38 +08:00 |
lvxinran
|
f8e47dd12b
|
公会检测修改
|
2021-01-27 16:19:33 +08:00 |
duhui
|
7cb1072126
|
邮件问题状态修改,只保留1和2,1:成功,2:背包已满
|
2021-01-27 16:00:03 +08:00 |
duhui
|
c09cb66fe0
|
天宫密保时间未到计算积分问题处理
|
2021-01-27 15:53:57 +08:00 |
lvxinran
|
633f531425
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-27 15:22:26 +08:00 |
lvxinran
|
ef472bdbd2
|
会长转移初版
|
2021-01-27 15:22:10 +08:00 |
lvxinran
|
47c4bd6818
|
空指针修改
|
2021-01-25 21:22:24 +08:00 |
duhui
|
d736b60c24
|
邮件bug
|
2021-01-25 18:09:40 +08:00 |
duhui
|
07dbb37262
|
一键领取邮件bug处理
|
2021-01-25 16:04:16 +08:00 |
duhui
|
b17a248bb8
|
0127连续签到宝箱重置
|
2021-01-22 16:33:33 +08:00 |
duhui
|
fcbf678d97
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-22 16:18:14 +08:00 |
duhui
|
9317e9ea24
|
0127挂机奖励2.0
|
2021-01-22 16:18:03 +08:00 |
lvxinran
|
ea69d5b7e9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-22 15:32:44 +08:00 |
lvxinran
|
18b4fdfb9c
|
上报战斗修改
|
2021-01-22 15:32:37 +08:00 |
lvxinran
|
0ae007f55f
|
埋点修改
|
2021-01-22 15:32:27 +08:00 |
duhui
|
0a6a81c40c
|
新将来袭战斗超回合
|
2021-01-22 15:13:01 +08:00 |
duhui
|
b019334012
|
0127连续签到推送前端显示
|
2021-01-22 14:09:07 +08:00 |
duhui
|
9eca089593
|
空指针修改
|
2021-01-22 11:26:55 +08:00 |
duhui
|
8bf9552c0c
|
挂机,不足一次的奖励随机
|
2021-01-21 14:37:17 +08:00 |
lvxinran
|
6e396124ec
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-21 11:03:35 +08:00 |
lvxinran
|
ae79e8d410
|
扭转乾坤活动提交
|
2021-01-21 11:03:31 +08:00 |
lvxinran
|
816847c112
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-09 20:13:03 +08:00 |
lvxinran
|
4c0e63ddaf
|
公会boss保底
|
2021-02-09 20:12:54 +08:00 |
duhui
|
91bd1096bd
|
0127极速探索奖励计算
|
2021-01-21 11:01:16 +08:00 |
duhui
|
c4850d97c4
|
共鸣脱装备bug修改
|
2021-01-20 15:20:20 +08:00 |
duhui
|
f5e5bf662b
|
灵兽升级报空处理
|
2021-01-20 15:01:02 +08:00 |
duhui
|
b5f1b291ad
|
无用代码屏蔽
|
2021-01-20 14:53:27 +08:00 |
duhui
|
a200be7f35
|
鸿蒙阵共鸣脱装备bug修改
|
2021-01-20 14:41:04 +08:00 |
duhui
|
36306b509e
|
0127挂机奖励计算
|
2021-01-20 10:05:46 +08:00 |
duhui
|
fd4cd6dd7f
|
0127连续签到奖励
|
2021-01-19 15:19:58 +08:00 |
duhui
|
65e781d66c
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-01-18 17:59:37 +08:00 |
duhui
|
0fd8be20c5
|
限时头像框bug修改
|
2021-02-11 15:09:07 +08:00 |
duhui
|
5bb9c26ed9
|
永久头像框时间bug
|
2021-01-25 10:30:59 +08:00 |
duhui
|
78827a8f33
|
头像框可以重复使用,重置时间
|
2021-01-18 09:57:20 +08:00 |
lvxinran
|
e55325dd14
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-17 14:45:49 +08:00 |
duhui
|
46d3b765e2
|
鸿蒙阵breaId修复
|
2021-01-15 18:54:29 +08:00 |
duhui
|
14ba7c1599
|
限时头像框完善
|
2021-01-15 18:28:43 +08:00 |
duhui
|
664b4c748c
|
限时头像框
|
2021-01-15 17:40:56 +08:00 |
lvxinran
|
6c0c612fae
|
删除无用测试代码
|
2021-01-14 19:59:06 +08:00 |
lvxinran
|
63711469b2
|
删除无用日志
|
2021-01-14 19:46:19 +08:00 |
lvxinran
|
5db99079a1
|
修改测试重发方式
|
2021-01-14 18:53:48 +08:00 |
lvxinran
|
f28fd3a65d
|
抽卡校验修改
|
2021-01-14 17:22:19 +08:00 |
lvxinran
|
934632c4c5
|
森罗幻境超时血量修改
|
2021-01-14 17:18:06 +08:00 |
lvxinran
|
cb739797c8
|
删除模拟重发
|
2021-01-14 16:39:35 +08:00 |
duhui
|
986d8049f1
|
鸿蒙碑初始化breaId
|
2021-01-14 16:39:25 +08:00 |
lvxinran
|
21faa2b905
|
推送重发次数限制,时间限制修改
|
2021-01-14 16:01:39 +08:00 |
lvxinran
|
98fe5af92d
|
模拟重发
|
2021-01-14 15:45:30 +08:00 |
duhui
|
51042972c0
|
幸运转盘保底
|
2021-01-14 15:34:13 +08:00 |
duhui
|
53970cef1a
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-14 14:11:37 +08:00 |
lvxinran
|
2b60d06ff8
|
申请工会修改
|
2021-01-30 15:05:18 +08:00 |
lvxinran
|
984f0f7bae
|
使用道具最后扣除
|
2021-01-30 13:23:34 +08:00 |
lvxinran
|
19dd002643
|
删除多余装备
|
2021-01-17 18:25:08 +08:00 |
duhui
|
4aed4a4592
|
邮件修改
|
2021-01-14 14:11:25 +08:00 |
duhui
|
bce959fd87
|
青龙秘宝,竞技场连胜,被防守失败中断问题修改
|
2021-01-13 16:53:21 +08:00 |
duhui
|
14d06145c9
|
Merge branch 'dh_dev_mail' into master_test_hw
邮件功能合并
|
2021-01-13 16:01:15 +08:00 |
duhui
|
09749e697d
|
已经存在的不变,后续开放的顺延
|
2021-01-13 14:54:06 +08:00 |
duhui
|
6dab85335f
|
鸿蒙阵,breaId补充
|
2021-01-13 13:33:14 +08:00 |
duhui
|
1bc6fe656d
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
0120版本合并
|
2021-01-13 11:44:03 +08:00 |
duhui
|
65c31a8ae6
|
英雄breakid问题处理初版,未解决
|
2021-01-13 11:40:33 +08:00 |
duhui
|
0b580e8ce3
|
0120版本更新
1、竞技场机器人英雄显示bug处理
2、心魔试炼添加排名奖励功能实现
|
2021-01-13 11:38:48 +08:00 |
duhui
|
188952ad47
|
战报功能,好友类型补充和报错修改
|
2021-01-11 17:13:17 +08:00 |
duhui
|
98967d13ce
|
新将打点和奖励计算修改
|
2021-01-11 11:14:27 +08:00 |
lvxinran
|
3d388fcf32
|
Merge branch 'master_test_hw' into master_test_hw_five_to_zero
|
2021-01-16 23:44:37 +08:00 |
lvxinran
|
ef2f1617f3
|
社稷大典开始清除往期道具
|
2021-01-16 21:15:13 +08:00 |
lvxinran
|
9894eab18d
|
活动5点修改
|
2021-01-16 20:24:14 +08:00 |
duhui
|
0c4041c74d
|
车迟斗法优化,根据boss更换排行奖励
|
2021-01-13 21:12:52 +08:00 |
duhui
|
d423925752
|
鸿蒙阵3.2
|
2021-01-08 18:36:58 +08:00 |
duhui
|
70a69c02af
|
邮件bug修改
|
2021-01-08 15:12:33 +08:00 |
lvxinran
|
176d9e122f
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-01-16 00:21:30 +08:00 |
lvxinran
|
4b44ae7d04
|
重置进图点
|
2021-01-16 00:20:28 +08:00 |
lvxinran
|
668501092f
|
Merge branch 'master_test_hw' into master_online_hw
|
2021-01-14 05:08:27 +08:00 |
lvxinran
|
9cc7bf8588
|
暂时不打印无用日志
|
2021-01-08 15:01:21 +08:00 |
lvxinran
|
127a5f4abd
|
0点5点遗留修改
|
2021-01-08 13:58:36 +08:00 |
lvxinran
|
11aa829ae0
|
Merge branch 'master_test_hw' into master_test_hw_five_to_zero
|
2021-01-17 00:29:05 +08:00 |
lvxinran
|
25b2245f5c
|
5点改0点修改
|
2021-01-14 00:08:59 +08:00 |
duhui
|
7c348f0833
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
# tablemanager/src/main/java/config/SItem.java
# tablemanager/src/main/java/config/SJewelConfig.java
|
2021-01-07 14:31:08 +08:00 |
lvxinran
|
ff016668c4
|
报错修改
|
2021-01-06 17:00:19 +08:00 |
lvxinran
|
202943d84f
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-06 16:53:54 +08:00 |
lvxinran
|
03e86acfbe
|
删除无用日志
|
2021-01-06 14:48:04 +08:00 |
lvxinran
|
34d1ce106e
|
日志修改
|
2021-01-06 14:35:31 +08:00 |
lvxinran
|
a3a6d52276
|
活动检测日志
|
2021-01-06 14:23:35 +08:00 |
lvxinran
|
7771e161be
|
添加日志信息
|
2021-01-06 14:00:07 +08:00 |
lvxinran
|
adbe1f5fde
|
删除无用注释 添加异常信息
|
2021-01-06 12:17:25 +08:00 |
lvxinran
|
ff37cd0a76
|
每分钟线程日志修改
|
2021-01-06 12:09:30 +08:00 |
lvxinran
|
c3286931d1
|
日志打印
|
2021-01-06 12:02:49 +08:00 |
duhui
|
5ad536f679
|
鸿蒙阵3.0.1,法宝公告同步
|
2021-01-06 10:20:12 +08:00 |
duhui
|
a1eb022f14
|
鸿蒙阵3.0,成就任务
|
2021-01-05 18:39:35 +08:00 |
duhui
|
6084f9aa96
|
鸿蒙阵2.1
|
2021-01-05 12:15:25 +08:00 |
duhui
|
9c9f43d686
|
鸿蒙阵2.0
|
2021-01-04 15:11:00 +08:00 |
duhui
|
f82b25d392
|
无尽副本,调试日志
|
2021-01-04 11:44:58 +08:00 |
lvxinran
|
f5c70afcb2
|
修改森罗保存阵容
|
2021-01-04 10:10:15 +08:00 |
lvxinran
|
ca822eba4e
|
公会日志打印
|
2020-12-31 18:03:42 +08:00 |
lvxinran
|
9b4b01bedd
|
暂时修改特权到期时间
|
2020-12-31 14:52:21 +08:00 |
lvxinran
|
b69ffd6329
|
打印错误日志
|
2020-12-31 13:54:27 +08:00 |
duhui
|
3a4bceeaca
|
车迟斗法缓存问题修改
|
2021-01-08 10:16:49 +08:00 |
lvxinran
|
f6f5a3c60f
|
打点报错修改
|
2020-12-30 13:47:06 +08:00 |
duhui
|
5037916fd5
|
新将来袭和降妖夺宝埋点添加
|
2020-12-29 14:03:18 +08:00 |
lvxinran
|
4e6d89c062
|
打点单例
|
2020-12-29 10:36:14 +08:00 |
lvxinran
|
661ac71df3
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2020-12-28 13:58:01 +08:00 |
lvxinran
|
41066efe5a
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-09 00:00:16 +08:00 |
lvxinran
|
09b18714f0
|
好友上限申请修改
|
2021-01-09 00:00:00 +08:00 |
lvxinran
|
b603634e6b
|
十绝阵暂时关闭
|
2021-01-01 21:37:04 +08:00 |
lvxinran
|
53b1dc1480
|
森罗小怪红点
|
2021-01-01 19:35:29 +08:00 |
lvxinran
|
46d3d86d68
|
Merge branch 'master_test_hw' into master_test_hw_i18n
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
|
2021-01-01 01:51:02 +08:00 |
lvxinran
|
3e87cb50d6
|
竞技场埋点
|
2021-01-01 01:36:57 +08:00 |
lvxinran
|
9a3c3fc9dc
|
竞技场挑战
|
2021-01-01 01:36:01 +08:00 |
lvxinran
|
7118b6a40c
|
巅峰赛埋点
|
2021-01-01 01:35:18 +08:00 |
duhui
|
1cfc04c82d
|
鸿蒙阵,法宝验证修改1.3
|
2020-12-28 11:30:57 +08:00 |
duhui
|
dffe1b81b9
|
新将血量修改1.1
|
2020-12-28 11:12:16 +08:00 |
duhui
|
225e58e5ee
|
新将,血量计算修改
|
2020-12-28 11:03:39 +08:00 |
duhui
|
73cc224b50
|
鸿蒙阵1.2
|
2020-12-28 09:41:49 +08:00 |
lvxinran
|
ef6347f38d
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
|
2020-12-26 18:37:54 +08:00 |
duhui
|
3834f8321f
|
鸿蒙阵1.1
|
2020-12-25 18:43:55 +08:00 |
duhui
|
e3391faa6e
|
鸿蒙阵1.0,存在bug正在修改
|
2020-12-25 14:21:57 +08:00 |
duhui
|
3a9ab2167d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-25 10:07:42 +08:00 |
duhui
|
a1cea20bdc
|
新将来袭活动结束,清空道具
|
2020-12-25 10:06:22 +08:00 |
duhui
|
41ee275964
|
新将boss,改获取伤害为获取血量
|
2020-12-24 18:53:27 +08:00 |
duhui
|
0e9e5e6502
|
新将伤害溢出问题
|
2020-12-24 18:26:49 +08:00 |
lvxinran
|
fbdad03acd
|
小怪数量修改
|
2021-01-01 00:20:38 +08:00 |
lvxinran
|
8aa67eb6bf
|
森罗 无尽bug修改
|
2021-01-01 00:05:11 +08:00 |
lvxinran
|
d6775fc511
|
跨服十绝阵暂时关闭
|
2021-01-01 00:04:20 +08:00 |
lvxinran
|
afdd25f829
|
怪物战力修改
|
2021-01-01 00:04:06 +08:00 |
zhangshanxue
|
03ea28558f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 23:01:52 +08:00 |
zhangshanxue
|
b17ef4d6f4
|
膜拜limit
|
2021-02-20 20:37:51 +08:00 |
zhangshanxue
|
de27c8aea3
|
跨服提交
|
2021-02-20 20:13:15 +08:00 |
zhangshanxue
|
7f991f8045
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 20:11:01 +08:00 |
zhangshanxue
|
a0486a2da1
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
|
2021-01-18 01:41:19 +08:00 |
zhangshanxue
|
71821d360b
|
跨服服务器
|
2021-01-18 01:40:33 +08:00 |
zhangshanxue
|
c160bca82e
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-02-08 01:28:00 +08:00 |
zhangshanxue
|
e3b2fedbcd
|
跨服服务器
|
2021-02-08 01:25:47 +08:00 |
zhangshanxue
|
fd681d5350
|
Merge branch 'master_test_hw' into master_test_hw_server_arena
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionGuessHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_global_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ArenaRank.java
# tablemanager/src/main/java/config/SPassiveSkillLogicConfig.java
|
2021-02-08 01:17:41 +08:00 |
zhangshanxue
|
e004d4d76c
|
跨服服务器
|
2021-02-08 01:06:51 +08:00 |
zhangshanxue
|
b7b1154a68
|
跨服服务器
|
2021-01-30 00:15:10 +08:00 |
duhui
|
3115844973
|
防止冲突,缓存减少一分钟
|
2020-12-24 16:07:07 +08:00 |
duhui
|
98d95f187a
|
修改proto路径后,合并代码战斗补充
|
2020-12-24 10:09:51 +08:00 |
duhui
|
645718da78
|
Merge branch 'master_test_hw' into dev_dh_chechi
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GmService.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightRecordLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/result/FightResult.java
# tablemanager/src/main/java/config/SGlobalSystemConfig.java
|
2020-12-24 10:04:18 +08:00 |
lvxinran
|
bcf5191e7f
|
协议位置修改
|
2020-12-30 03:11:14 +08:00 |
lvxinran
|
4908ac4145
|
errorcode修改
|
2020-12-30 02:10:45 +08:00 |
lvxinran
|
d872a55549
|
错误提示提交
|
2020-12-30 00:26:13 +08:00 |
lvxinran
|
23f35b428e
|
车迟斗法过时提示
|
2020-12-30 00:25:48 +08:00 |
lvxinran
|
697e2892a8
|
添加好友提示
|
2020-12-30 00:25:26 +08:00 |
lvxinran
|
a520eb96db
|
礼包购买刷新修改0点
|
2020-12-30 00:25:11 +08:00 |
lvxinran
|
3df4fb246d
|
灵兽放生等级限制
|
2020-12-30 00:24:54 +08:00 |