Commit Graph

4928 Commits (af20b1f45f657db043365c71d175f867ec06434a)
 

Author SHA1 Message Date
xuexinpeng af20b1f45f 山河社稷图战斗脚本 2021-05-19 14:17:06 +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
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
duhui b74e3525a7 修行名字颜色 2021-05-17 17:57:58 +08:00
xuexinpeng c509ed8444 Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-05-17 11:19:30 +08:00
xuexinpeng 41ba1e238c 山河社稷图 2021-05-17 10:28:37 +08:00
duhui 23d1b68080 修行2.0 2021-05-17 09:37:16 +08:00
xuexinpeng e656ac4344 山河社稷 2021-05-15 17:04:02 +08:00
xuexinpeng 7e21e0df43 山河社稷 2021-05-15 15:05:11 +08:00
xuexinpeng a8e76d24db 山河社稷图 2021-05-14 15:36:50 +08:00
duhui b51cd010a3 修行功能1.0 2021-05-14 11:12:47 +08:00
xuexinpeng 972b6dde78 山河社稷 2021-05-13 17:33:19 +08:00
xuexinpeng 0d7d05b70c 山河社稷 2021-05-13 14:43:00 +08:00
xuexinpeng 885e0112ad 山河社稷 2021-05-13 14:39:44 +08:00
duhui e494248bd3 打表工具优化 2021-05-13 11:47:17 +08:00
mengchengzhen 8ab1fafc40 山河社稷图 2021-05-11 21:36:22 +08:00
mengchengzhen f561f686e9 山河社稷图 2021-05-11 21:31:07 +08:00
duhui 1d8fea9f96 修行,未完成提交 2021-05-11 17:59:49 +08:00
mengchengzhen ea4d1e03d6 山河社稷图 2021-05-11 16:25:00 +08:00
xuexinpeng 75e526697a 山河社稷更新星星事件 2021-05-11 15:48:59 +08:00
duhui 9457e48c5c 计算战力方法,部分注释旧逻辑删除,需要可回滚 2021-05-11 14:09:21 +08:00
xuexinpeng e8a6617225 Merge branch 'master_test_mcz_hardstage' of http://60.1.1.230/backend/jieling_server into master_test_mcz_hardstage 2021-05-11 11:38:55 +08:00
xuexinpeng b72978b56e 山河社稷图排行榜 2021-05-11 11:23:19 +08:00
mengchengzhen 3de5a18eb7 山河社稷图 2021-05-11 10:59:59 +08:00
mengchengzhen 79ffc31fa8 山河社稷图 2021-05-11 10:59:39 +08:00
duhui 77c25705f9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-10 16:12:50 +08:00
duhui 88f1036659 等级回滚 2021-05-10 16:12:38 +08:00
mengchengzhen 489529c827 取消灵兽礼包 2021-05-10 16:03:12 +08:00
duhui c66939c575 最高等级 2021-05-10 14:39:38 +08:00
mengchengzhen e0462df216 新礼包灵兽礼包 2021-05-10 09:42:51 +08:00
mengchengzhen a8c23221a0 新礼包超值基金记录领取时间 2021-05-08 17:37:35 +08:00
lvxinran 9f0900a5a2 Merge branch 'master_prb_gn' into master_test_gn 2021-05-08 17:12:59 +08:00
mengchengzhen 8cf73a88c7 新礼包存储 2021-05-08 16:36:18 +08:00
mengchengzhen 87e02201de 工会排行bug 2021-05-13 18:29:49 +08:00
mengchengzhen 6677d92b45 山河社稷图 2021-05-08 16:35:17 +08:00
mengchengzhen 34e86ceb8d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 21:21:17 +08:00
mengchengzhen 2d1a115cf0 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 21:03:39 +08:00
mengchengzhen 8cd82e7325 首冲bug防止问题方法 2021-05-08 21:03:29 +08:00
mengchengzhen c32f1e8fb4 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 20:50:10 +08:00
mengchengzhen f88c84f2dd 新礼包首冲bug 2021-05-08 20:50:00 +08:00
mengchengzhen c9f3eaaaa6 新礼包首冲bug指定时间5月6日18点 2021-05-06 21:21:05 +08:00
mengchengzhen acf6913dbf Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 17:11:43 +08:00
mengchengzhen dd9bc02661 新礼包推送两次bug 2021-05-06 17:11:27 +08:00
mengchengzhen 4eff03208d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 10:07:57 +08:00
mengchengzhen 36fc8911fc 新礼包indexbug修复 2021-05-06 10:06:12 +08:00
mengchengzhen 5363b52f2b 新礼包活动领取优化 2021-05-11 00:10:14 +08:00