Commit Graph

4648 Commits (66bea3f2c5ce9d2f7005b4ef7328ea4dacee2d17)
 

Author SHA1 Message Date
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
lvxinran 2de51c477f 忽略协议文件 2021-01-01 01:34:58 +08:00
duhui 869b8400f0 战斗同步 2020-12-28 12:20:39 +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 70dec4bc49 战斗同步 2020-12-28 10:34:53 +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