Commit Graph

4154 Commits (ca17f5d39d43e28295476b9072b3c51cc88869ca)
 

Author SHA1 Message Date
zhangshanxue ca17f5d39d Revert "巅峰赛临时提交"
This reverts commit 78dc96b172.
2020-11-07 12:26:15 +08:00
lvxinran ffc193d2fe Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-30 03:46:25 +08:00
lvxinran 3ea067d9cb 配置加入 2020-12-30 03:46:13 +08:00
lvxinran da8f86864d 老号特权修改 2020-12-30 02:04:05 +08:00
lvxinran b99117fe0b 默认值修改 2020-12-23 01:16:14 +08:00
lvxinran cda3ad53a7 巅峰赛修改 2020-12-23 01:10:55 +08:00
lvxinran 5dc5ab2ae5 巅峰赛加入灵兽 2020-12-08 23:47:25 +08:00
zhangshanxue 78dc96b172 巅峰赛临时提交 2020-11-07 12:16:26 +08:00
lvxinran aa6133e571 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-01 17:38:13 +08:00
zhangshanxue adc51d3942 战斗日志打印 2020-11-07 01:43:58 +08:00
lvxinran 606753c705 森罗灵兽加成修改,宝物容错加入 2020-11-01 17:38:08 +08:00
lvxinran a10f5b21de 战斗逻辑提交 2020-11-01 16:23:43 +08:00
lvxinran 4c78acd96f 上阵校验 2020-11-03 06:11:39 +08:00
lvxinran 348fff34e4 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-03 05:27:01 +08:00
zhangshanxue 1478f5e48b Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-04 03:34:26 +08:00
zhangshanxue cedf01492c 商店可动态控制栏位显示 2020-11-04 03:34:10 +08:00
lvxinran 51ef8ff581 编队灵兽修改 2020-11-03 05:26:52 +08:00
lvxinran 51dbb4e596 循环最大次数校验 2020-10-31 10:50:25 +08:00
lvxinran d81ab02559 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-31 10:02:42 +08:00
zhangshanxue 345de35e8e Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
#	tablemanager/src/main/java/config/SGodSacrificeSetting.java
2020-11-04 00:32:18 +08:00
zhangshanxue 45f74d5e52 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-04 00:28:11 +08:00
zhangshanxue 9a4e721ba7 功能刷新和大闹天宫试炼节点bug 2020-11-04 00:26:44 +08:00
zhangshanxue f9b2a3e52a 修复月卡不触发 2020-11-09 01:11:50 +08:00
zhangshanxue faf9a8e8db 社稷大典 2020-10-31 13:57:58 +08:00
zhangshanxue 101c50c28f 社稷大典公会排行 2020-10-31 11:39:15 +08:00
zhangshanxue 7c907c8f73 社稷大典个人排行结算限制 2020-11-01 10:04:08 +08:00
zhangshanxue 6d538792e9 Merge branch 'master_online_hw' into master_test_hw 2020-11-01 09:58:23 +08:00
zhangshanxue afe95a16e8 社稷大典 2020-10-31 19:37:33 +08:00
lvxinran 8eb7441775 小游戏内存修改 2020-10-31 10:02:33 +08:00
lvxinran 66c2308952 车迟斗法抢夺匹配修改 2020-10-31 04:54:46 +08:00
lvxinran 74ccf05238 战斗 2020-10-31 04:45:44 +08:00
lvxinran 1ee9ca08fa 逍遥游上个首通的限制 2020-10-30 13:24:31 +08:00
lvxinran f420ebc347 地方teamSkill 2020-10-30 13:14:21 +08:00
lvxinran 8528baa1b4 teamSkill修改 2020-10-30 12:58:04 +08:00
lvxinran 3ac886af17 战斗同步 2020-10-29 16:36:10 +08:00
lvxinran 845376c52c 战斗同步 2020-10-29 15:36:43 +08:00
lvxinran edc1b58d5e 无尽修改坐标 2020-10-29 12:01:44 +08:00
lvxinran 19069e4586 地图修改 2020-10-29 10:29:22 +08:00
lvxinran 161bc6fa52 无尽副本位置弹回 2020-10-28 21:07:49 +08:00
lvxinran f9da69c0a5 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-10-28 16:53:08 +08:00
zhangshanxue d560e2bfee 月卡刷新 2020-11-06 17:35:10 +08:00
zhangshanxue 4b389f5a8f 社稷大典公会排行发奖 2020-10-28 20:24:15 +08:00
zhangshanxue 5fcfaa1f36 社稷大典 2020-10-31 14:06:31 +08:00
zhangshanxue 763872915f 社稷大典公会排行 2020-10-31 14:02:38 +08:00
lvxinran dd2ef8617d 判官笔复活不计入天宫达人,bug修改 2020-10-28 16:52:59 +08:00
lvxinran 4f3c4fc8fb 灵兽系统消息添加 2020-10-28 16:51:51 +08:00
lvxinran 1fa383a2ed 首通奖励添加 2020-10-27 18:28:52 +08:00
lvxinran 89122562b5 怪物组内添加灵兽提交 2020-10-27 17:23:04 +08:00
lvxinran 09d9d1d536 活动抽卡埋点,升星埋点修改,灵兽升级修改 2020-10-27 15:43:28 +08:00
lvxinran c96a16f112 Merge branch 'master_test_hw' into master_test_hw_special_monster
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-10-27 13:56:10 +08:00