Commit Graph

4682 Commits (c6286f1834fca952525ab6bdb7f47e31ac6d68d3)
 

Author SHA1 Message Date
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 b7f10ac10e 战斗同步 2021-01-14 17:18:41 +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
duhui e9f835fdf5 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-14 15:51:50 +08:00
duhui c000672b2f 机器人bug修改 2021-01-14 15:51:34 +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 e0e64e46b3 Merge branch 'master_online_hw' into master_test_hw 2021-01-11 17:50:16 +08:00
lvxinran f6ff2bed3d 打印战斗结果日志 2021-01-18 16:25:55 +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 188952ad47 战报功能,好友类型补充和报错修改 2021-01-11 17:13:17 +08:00
duhui 98967d13ce 新将打点和奖励计算修改 2021-01-11 11:14:27 +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