Commit Graph

7060 Commits (3f66ac83b5ea7849123b022eb25f87b0a9fe892c)
 

Author SHA1 Message Date
duhui 3f66ac83b5 商店购买提示修改 2022-09-09 17:09:14 +08:00
duhui 85943157a9 刷冲特权活动补充 2022-09-09 15:39:58 +08:00
duhui fad92b7455 刷冲特权活动,无限资源阁活动,每日道具清理 2022-09-09 15:38:17 +08:00
duhui 8c86bb20f7 bt:新增特权 2022-09-08 15:40:52 +08:00
duhui 73a0b91d3e 送无限抽活动 2022-09-07 16:05:52 +08:00
duhui 5aee8e8d6b bt特权 2022-09-07 14:52:05 +08:00
duhui add9233993 全民福利 2022-09-07 10:36:57 +08:00
duhui 2df133f4d2 太初特权和刷冲特权用到的特权覆盖 2022-09-06 16:07:21 +08:00
duhui 6e81f56b7a 跨服展示英雄报错 2022-09-05 13:30:50 +08:00
duhui fabf55e0dc Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-02 13:46:40 +08:00
dengdan 1599f15eae 调整玉虚论道 2022-09-13 12:26:24 +08:00
dengdan abf3c59199 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-09-13 12:20:17 +08:00
dengdan b1e721c96a 调整玉虚论道 2022-09-13 12:19:48 +08:00
dengdan 1a7f39304c 玉虚论道调整为半公平 2022-09-12 11:56:57 +08:00
dengdan 8e93d63e25 玉虚论道玩法调整为半公平竞技 2022-09-12 11:04:11 +08:00
duhui 8bf8d3c9e6 摘星阁,装备重置 2022-09-02 13:46:26 +08:00
duhui fc2eb578d5 冲突解决 2022-09-01 17:16:41 +08:00
duhui 76674db4d5 Merge branch 'dev_equip' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2022-09-01 17:13:34 +08:00
duhui cf6b898585 摘星阁装备强化 2022-09-01 17:08:02 +08:00
DESKTOP-98AVA47\Administrator 67c4ecd512 法宝邮件 2022-08-31 22:36:07 +08:00
duhui e032f25e43 摘星阁装备强化 2022-08-31 15:19:47 +08:00
duhui dd541be780 摘星阁装备强化 2022-08-31 15:18:17 +08:00
duhui 609bdac818 Merge branch 'master_test_gn' into dev_equip
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2022-08-30 16:53:03 +08:00
duhui 23e632dd30 法宝等级上限 2022-08-30 15:59:09 +08:00
duhui a1fcc56f01 灵兽宝阁活动回滚 2022-08-30 11:53:16 +08:00
duhui e1e551f1f1 灵兽宝阁活动冲突 2022-08-29 23:09:58 +08:00
duhui a0050f326b 敏感字检测服未开启默认通过检测,兼容本地测试 2022-08-29 14:25:01 +08:00
duhui 2a51cb6da7 变身卡问题处理 2022-08-26 13:36:42 +08:00
duhui 42b38b25a5 玩家起名问题 2022-08-29 21:43:05 +08:00
duhui f6267ce855 玩家发言问题 2022-08-27 13:52:19 +08:00
duhui f4d4134e69 森罗扫荡,杀敌数问题 2022-08-27 13:26:11 +08:00
duhui 258d1e88ce 代码可读性修改 2022-08-24 09:57:06 +08:00
DESKTOP-98AVA47\Administrator aace2dae75 车迟斗法时间 2022-09-26 15:30:48 +08:00
duhui 4e10dbdae7 车迟斗法挑战记录改为一天的 2022-08-23 17:28:00 +08:00
duhui b0114b8d4c 森罗幻境扫荡,boss杀敌数 2022-08-22 17:43:15 +08:00
duhui 844b0114cd 摘星阁装备调整初版,未联调 2022-08-19 18:12:57 +08:00
duhui 8508c685db 身外化身限制添加 2022-08-18 17:13:35 +08:00
duhui 4904e1fd05 Merge branch 'dev_tower' into master_test_gn 2022-08-18 16:26:15 +08:00
duhui 4c9c1e1841 森罗幻境完成初版2 2022-08-18 16:16:00 +08:00
duhui dcc9f3331d 森罗幻境完成初版 2022-08-18 16:02:48 +08:00
duhui 7903a5d547 装备碎片 2022-08-17 18:11:05 +08:00
duhui 402efe553c 森罗幻境未完成 2022-08-17 18:09:45 +08:00
duhui 19ac577d2f 新活动,寻仙商城 2022-08-17 17:37:33 +08:00
duhui 3df83ecad7 逍遥游修改 2022-08-16 14:59:43 +08:00
duhui ed2bdf5e6d 逍遥游修改 2022-08-16 11:57:52 +08:00
duhui 4d3d9abf1e 逍遥游修改 2022-08-15 13:55:17 +08:00
duhui 8f17bdc655 好感度代码优化 2022-08-12 16:51:23 +08:00
duhui e7751a8e0e 好感度同步问题 2022-08-12 16:41:38 +08:00
duhui ed2ccd969b 装备碎片道具添加 2022-08-11 11:30:53 +08:00
duhui 0530de25b1 好感度碎片道具提交
(cherry picked from commit a3cede0bb8)
2022-08-10 17:19:43 +08:00