Commit Graph

4503 Commits (abb94cdfb17182bda3fcc3b0dd9d5475ae898a41)
 

Author SHA1 Message Date
duhui abb94cdfb1 建木神树和四灵试炼,公告添加 2021-03-01 10:14:49 +08:00
duhui 987e392ae9 四灵试炼,回放战力 2021-02-26 18:22:59 +08:00
duhui 0cca7ec7b4 助战刷新问题处理 2021-02-23 17:44:27 +08:00
duhui fa6937881c redis模糊key,scan方法封装 2021-02-19 15:23:49 +08:00
duhui 8c37ee1338 四灵试炼,小bug修补 2021-02-09 16:07:41 +08:00
duhui 5ca456b0dc 四灵试炼第三版,基本完成 2021-02-08 15:22:38 +08:00
duhui a11a01b363 四灵试炼,第二版,待调试 2021-02-03 10:35:55 +08:00
duhui bca44c2d71 助战系统,初版未完成 2021-01-29 18:25:59 +08:00
duhui 3c83e55d89 四灵试炼,首通和最低记录,排行榜功能实现,未调试 2021-01-27 14:58:19 +08:00
duhui 0633b9ae1c 分支合并 2021-02-12 14:34:48 +08:00
duhui d887ff2d90 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-02-12 14:21:21 +08:00
duhui c2d127e325 注释 2021-02-12 14:11:20 +08:00
duhui ca1b4f3fa8 Merge branch 'dev_dh_tree' into master_test_hw_four_challenge
# Conflicts:
#	luafight/Modules/Battle/Logic/Base/Passivity.lua
#	luafight/Modules/Battle/Logic/Misc/BattleUtil.lua
#	luafight/Modules/Battle/Logic/Role/RoleLogic.lua
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
2021-01-26 11:26:56 +08:00
duhui fa39c7eb9b 四灵试炼添加注释 2021-01-26 11:18:18 +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
lvxinran 4a90d1fa46 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-22 18:11:35 +08:00
lvxinran 9a5d7ba469 战斗同步 2021-01-22 18:11:30 +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
lvxinran 5bd09cb7c7 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-21 16:47:28 +08:00
lvxinran feb641028c 配置提交 2021-01-21 16:00:44 +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 ea3f3b6628 忽略配置文件 2021-01-21 11:02:58 +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 f5e5bf662b 灵兽升级报空处理 2021-01-20 15:01:02 +08:00
duhui b5f1b291ad 无用代码屏蔽 2021-01-20 14:53:27 +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 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