Commit Graph

7237 Commits (0c51449a16e8c380a3fca20e9fb75f9364fd17e6)
 

Author SHA1 Message Date
duhui 19573065db 补充2 2022-09-09 18:41:42 +08:00
duhui 62151df478 补充 2022-09-09 18:39:43 +08:00
duhui 5778fe091c 特权经验 2022-09-09 18:18:29 +08:00
duhui 9e6c8637da 活动时间修改 2022-09-09 18:03:57 +08:00
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 e89efa1a76 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-07 15:06:11 +08:00
duhui 5cf5552eb8 神应最大等级 2022-09-07 15:06:04 +08:00
duhui 5aee8e8d6b bt特权 2022-09-07 14:52:05 +08:00
dengdan 16d9af5e3f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-09-07 14:24:40 +08:00
dengdan f2ace7c526 修复玉虚跨服带灵兽的问题 2022-09-07 14:24:14 +08:00
dengdan c10d1193a4 修复玉虚跨服战斗有灵兽的问题 2022-09-14 11:23:52 +08:00
dengdan 26cc5f0ce1 修复查看罗浮,灵脉等信息为玉虚信息的问题 2022-09-14 11:20:21 +08:00
duhui 6ee2ba5d88 变身卡消耗bug 2022-09-07 14:04:03 +08:00
duhui cb2581e5fc 任务兼容 2022-09-07 13:48:21 +08:00
duhui 43b3eaca7f Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-07 13:32:27 +08:00
duhui c1f8088349 跨服用户属性 2022-09-07 13:31:57 +08:00
duhui add9233993 全民福利 2022-09-07 10:36:57 +08:00
duhui 1355645444 宝器bug 2022-09-06 18:27:59 +08:00
duhui 7de75cd738 宝器gm 2022-09-06 17:04:57 +08:00
duhui fa8b30a0ad 本地忽略敏感字服务器 2022-09-06 16:56:11 +08:00
duhui c24fe5768c 宝器合成返回道具,修改 2022-09-06 16:19:56 +08:00
duhui 2df133f4d2 太初特权和刷冲特权用到的特权覆盖 2022-09-06 16:07:21 +08:00
duhui 6a3ef86f79 宝器合成返回道具 2022-09-06 15:30:47 +08:00
duhui 3284203069 牛气冲天活动bug修改,补充 2022-09-06 13:54:57 +08:00
duhui bfdd43d6bd 牛气冲天活动bug修改 2022-09-06 13:45:24 +08:00
duhui 0579b663eb Merge branch 'master_prb_gn' into master_test_gn 2022-09-06 13:30:11 +08:00
duhui d92882cb02 Merge branch 'dev_equip' into master_test_gn 2022-09-06 13:28:53 +08:00
duhui 7f1866406f 建木神树 2022-09-05 15:45:22 +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