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 |
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 |
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 |
lvxinran
|
2de51c477f
|
忽略协议文件
|
2021-01-01 01:34:58 +08:00 |
duhui
|
869b8400f0
|
战斗同步
|
2020-12-28 12:20:39 +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
|
70dec4bc49
|
战斗同步
|
2020-12-28 10:34:53 +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
|
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 |
lvxinran
|
12b0160f3a
|
表报错修改
|
2021-01-01 00:03:53 +08:00 |
duhui
|
cc10b2aab4
|
战斗同步
|
2020-12-24 17:14:38 +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 |