Commit Graph

4249 Commits (e80c2b6e030ec35a997a6b3f1e281799b68bbee0)
 

Author SHA1 Message Date
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 aa94e3bc5b 英雄皮肤添加 2020-10-31 09:58:34 +08:00
lvxinran 66c2308952 车迟斗法抢夺匹配修改 2020-10-31 04:54:46 +08:00
lvxinran 4b53c7e5d0 皮肤添加 2020-10-31 04:53:56 +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
lvxinran 9f44b5de2a 无用日志 2020-10-27 13:53:49 +08:00
zhangshanxue 76c082bccc 数数免费礼包不上报 社稷大典排行进度 月礼包 2020-10-26 19:27:16 +08:00
lvxinran 40f12ac7b6 容错代码添加,心魔打点修改 2020-10-26 17:25:52 +08:00
zhangshanxue 2cf701c6eb 数数免费礼包不上报 2020-10-28 12:19:11 +08:00
zhangshanxue ecc95a79a4 社稷大典公会排行 2020-10-28 12:14:06 +08:00
lvxinran 29fadcb9ea 灵兽信息获取 2020-10-26 16:05:50 +08:00
jiahuiwen f62d9b6a13 注释日志 2020-10-26 13:43:56 +08:00
jiahuiwen 1a6a115b1c getStartTime 添加日志 2020-10-26 10:19:20 +08:00
lvxinran 46fee5ae4e 战斗 灵兽修改 2020-10-26 10:05:30 +08:00
zhangshanxue f1d7511218 社稷大典 初始化提交 2020-10-25 18:24:34 +08:00
zhangshanxue df0850d74b Merge branch 'master_test_hw' into master_test_hw_sheji 2020-10-25 17:01:48 +08:00
zhangshanxue 1d9452992c 社稷大典功能提交 2020-10-25 17:00:45 +08:00
zhangshanxue 210f4a1529 社稷大典代码提交 2020-10-25 17:00:00 +08:00