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 |
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
|
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 |
duhui
|
1cfc04c82d
|
鸿蒙阵,法宝验证修改1.3
|
2020-12-28 11:30:57 +08:00 |
duhui
|
73cc224b50
|
鸿蒙阵1.2
|
2020-12-28 09:41:49 +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 |
jiahuiwen
|
58cb744e2e
|
鸿蒙信息单独获取 推送
|
2020-12-21 16:05:19 +08:00 |
jiahuiwen
|
5776065109
|
鸿蒙阵
|
2020-12-21 14:47:20 +08:00 |
jiahuiwen
|
6a1faf574c
|
鸿蒙阵
|
2020-12-17 15:04:46 +08:00 |
lvxinran
|
d2c1b418a9
|
社稷大典埋点
|
2020-12-14 11:42:10 +08:00 |
lvxinran
|
fbc893124f
|
车迟斗法报错
|
2020-12-14 11:41:05 +08:00 |
lvxinran
|
e40d422d55
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-28 16:38:45 +08:00 |
lvxinran
|
d616cdb2d1
|
竞技场埋点 敏感字添加竞技守卫
|
2020-12-28 16:38:39 +08:00 |
duhui
|
0c851e6967
|
新将伤害计算修改1.2
|
2020-12-28 15:07:13 +08:00 |
duhui
|
dffe1b81b9
|
新将血量修改1.1
|
2020-12-28 11:12:16 +08:00 |
duhui
|
225e58e5ee
|
新将,血量计算修改
|
2020-12-28 11:03:39 +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 |
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 |
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 |
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 |