Commit Graph

4981 Commits (fecbddb92001f89162c33014e1820d041a40ba1a)
 

Author SHA1 Message Date
xuexinpeng fecbddb920 山河社稷任务 2021-05-27 18:24:07 +08:00
mengchengzhen d01dcff730 灵兽礼包 2021-05-27 17:08:47 +08:00
duhui 8e37bd922c 牛气冲天, 活动结束发送未领取奖励 2021-05-27 16:10:19 +08:00
duhui 2a5d149ac6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-27 16:07:17 +08:00
duhui 839eb2af4f 修行,名字颜色 2021-05-27 16:06:07 +08:00
mengchengzhen cd49002893 福利红包 2021-05-27 15:52:33 +08:00
xuexinpeng e1dbce80cf 山河社稷图排行榜 2021-05-27 14:48:39 +08:00
duhui 2bfb6228b0 牛气冲天活动结束,未发送未领取奖励问题处理 2021-05-27 11:48:59 +08:00
duhui 6214e3d8b8 修行bug处理: 附身神将分解 2021-05-27 10:31:11 +08:00
duhui 829bfccf16 修行: 系统消息添加玩家名字颜色 2021-05-26 18:31:33 +08:00
xuexinpeng 62e5fac672 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-26 16:18:33 +08:00
xuexinpeng 945a238748 山河战斗记录修行等级 2021-05-26 16:14:49 +08:00
duhui ee63e36511 修行bug处理, 编队展示错误和不入库问题处理 2021-05-26 16:09:10 +08:00
xuexinpeng 072001f402 前端战斗数据 2021-05-26 13:32:34 +08:00
xuexinpeng 98ee42fb6c Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2021-05-26 11:20:11 +08:00
xuexinpeng 202b170cd5 心魔试炼扫荡,一键扫荡 2021-05-26 11:09:58 +08:00
mengchengzhen 69462d976d 怪物战力计算 2021-05-26 10:38:31 +08:00
mengchengzhen 7da6f963ba 新礼包优化 2021-05-25 20:13:42 +08:00
mengchengzhen f1776030ef 新红包优化 2021-05-25 20:13:30 +08:00
xuexinpeng e74314c6c7 山河社稷成就任务 心魔试炼扫荡 2021-05-25 11:40:43 +08:00
duhui 3030bb501f 修行: 附身神印展示使用中全部 2021-05-25 11:09:25 +08:00
duhui b404814382 Merge branch 'dh_dev_gm' into master_test_gn 2021-05-25 10:25:12 +08:00
xuexinpeng e74a860a80 特权等级奖励 2021-05-24 18:49:46 +08:00
mengchengzhen 276f842d5c 福利红包 2021-05-24 18:28:24 +08:00
xuexinpeng 3811d59299 山河社稷gm 2021-05-24 15:33:48 +08:00
duhui 96a3844ccc gm公会,信息不入库处理 2021-05-24 15:18:04 +08:00
mengchengzhen afda78f8e0 灵兽礼包 2021-05-24 14:38:22 +08:00
mengchengzhen e5c6a1723a 福利红包 2021-05-24 12:01:34 +08:00
mengchengzhen 2010a1a9ce Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-05-24 11:43:44 +08:00
xuexinpeng c3034285d4 Merge branch 'master_test_mcz_hardstage' into master_test_gn 2021-05-24 11:10:47 +08:00
xuexinpeng fe38e14a1c Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-24 11:06:17 +08:00
mengchengzhen 4a2df26e2e 福利红包 2021-05-21 18:52:19 +08:00
xuexinpeng 30c1a61b62 社稷大典邮件内容修改 2021-05-21 18:25:03 +08:00
xuexinpeng 34cd899b6e 山河社稷等级限制数据初始化 2021-05-21 16:29:33 +08:00
duhui 9fced9ba25 gm.修改公会信息 2021-05-21 15:28:16 +08:00
duhui eebf572d7d 自定义礼包码 2021-05-20 18:02:50 +08:00
xuexinpeng 133afbab21 组队类型限制 2021-05-20 17:08:06 +08:00
xuexinpeng 61c2b2b460 战斗lua脚本同步 2021-05-20 16:49:36 +08:00
xuexinpeng 7c7c3e6bb6 特权等级奖励 2021-05-20 15:41:33 +08:00
xuexinpeng a0db7928bf 山河社稷图最小战力回放 2021-05-19 15:27:00 +08:00
xuexinpeng af20b1f45f 山河社稷图战斗脚本 2021-05-19 14:17:06 +08:00
mengchengzhen 97d32d93dd 福利红包 2021-05-19 11:18:46 +08:00
duhui 222c10252b 修行3.0
神印展示增加,替换神印逻辑完善
2021-05-19 09:35:00 +08:00
xuexinpeng bc94b6290d 山河社稷图状态显示 2021-05-18 16:51:50 +08:00
xuexinpeng 8423d711dd 山河社稷图 2021-05-18 15:56:26 +08:00
xuexinpeng 30ebef6856 山河社稷图优化 2021-05-18 13:57:07 +08:00
xuexinpeng 9cb30eb9da 山河社稷图 2021-05-18 10:13:37 +08:00
lvxinran 78cb70af3a 物品数量修改 2021-05-17 21:09:21 +08:00
xuexinpeng 30115154eb Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-17 18:55:52 +08:00
xuexinpeng bc9bb14dda 山河社稷技能buffer 2021-05-17 18:55:19 +08:00