Commit Graph

3846 Commits (8ed8485114cf98a6754985e7967ba15ec7dd17a3)

Author SHA1 Message Date
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 fa68864f62 Revert "巅峰赛临时提交"
This reverts commit c654004bc8.
2020-11-07 12:35:33 +08:00
zhangshanxue c654004bc8 巅峰赛临时提交 2020-11-07 12:28:04 +08:00
zhangshanxue ca17f5d39d Revert "巅峰赛临时提交"
This reverts commit 78dc96b172.
2020-11-07 12:26:15 +08:00
zhangshanxue 78dc96b172 巅峰赛临时提交 2020-11-07 12:16:26 +08:00
lvxinran 17fc7ac344 打点报错信息打印,抽卡打点修改 2020-11-04 14:24:08 +08:00
lvxinran f3af1b0c4b 皮肤修改 2020-11-04 13:50:33 +08:00
lvxinran 93fae4842a 商店try catch 2020-11-04 09:34:50 +08:00
lvxinran 4105cb1292 激活皮肤消耗 2020-11-01 18:50:54 +08:00
lvxinran 7232b8604a 皮肤 头像修改 2020-11-03 05:25:17 +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 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 9a4e721ba7 功能刷新和大闹天宫试炼节点bug 2020-11-04 00:26:44 +08:00
zhangshanxue f9b2a3e52a 修复月卡不触发 2020-11-09 01:11:50 +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 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 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
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 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
zhangshanxue 101c50c28f 社稷大典公会排行 2020-10-31 11:39:15 +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
lvxinran 3dd49ea868 折扣 妖精抽卡次数提交 2020-10-24 15:52:25 +08:00
lvxinran 8a1c93570d 灵兽战斗数据组装 2020-10-23 17:54:22 +08:00
lvxinran 3cece5a571 代码优化 2020-10-23 14:11:02 +08:00
lvxinran 64fcc5a485 修改内存不一致,无尽副本迷雾问题 2020-10-23 14:09:46 +08:00
lvxinran d054d48907 灵兽战斗数据添加 2020-10-23 13:38:08 +08:00
lvxinran bf282624e7 灵兽提交 2020-10-22 20:26:40 +08:00
lvxinran 03069929b7 灵兽代码整理 2020-10-22 14:59:51 +08:00
lvxinran ea949f28e5 Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-10-22 14:57:57 +08:00
lvxinran f5427e27a7 灵兽放生,涅槃 2020-10-22 14:48:26 +08:00
jiahuiwen bc486f6f9b Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-10-21 17:54:16 +08:00
jiahuiwen c8622ee56d 灵兽上阵 2020-10-21 17:52:39 +08:00
lvxinran 9f2f406561 商品空判断 2020-10-21 15:32:49 +08:00
lvxinran c78f778881 灵兽升级 2020-10-21 15:30:47 +08:00
lvxinran fc8401823f 修复十绝阵问题 2020-10-21 14:58:35 +08:00
zhangshanxue 19d6490be2 免费礼包无法领取 2020-10-21 11:22:30 +08:00
lvxinran 64744bb3bb 修改灵兽 2020-10-21 10:21:06 +08:00
jiahuiwen 871ba646e0 异妖可下阵 2020-10-20 20:08:36 +08:00
zhangshanxue 44f3df5fcf 获取玩家信息失败 2020-10-20 19:10:45 +08:00
jiahuiwen defb87c5da 异妖编队修改 2020-10-20 17:56:27 +08:00
zhangshanxue 57f55498ee gm账号添加英雄 2020-10-20 16:44:22 +08:00
lvxinran 34f3d40ee4 商店修改 2020-10-29 04:57:51 +08:00
lvxinran 4ff51ce551 添加特权 2020-10-29 09:29:23 +08:00
lvxinran c38ea8c334 红点修改 2020-10-19 23:41:30 +08:00
lvxinran 947b8f78b5 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-19 23:17:57 +08:00
lvxinran 0a838fffcd 初始化道具修改 2020-10-19 23:17:48 +08:00
zhangshanxue 423787d310 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-19 22:49:16 +08:00
zhangshanxue 9ef34cd692 异步发奖 出错 2020-10-19 22:48:45 +08:00
lvxinran b89fd738ca 添加道具 2020-10-19 22:36:24 +08:00
lvxinran 75d86b8203 逍遥游数据删除 2020-10-19 21:36:23 +08:00
zhangshanxue 005483bbf1 Merge branch 'master_online_hw' into master_test_hw 2020-10-19 21:28:50 +08:00
zhangshanxue e6c6819aae Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-10-19 21:27:08 +08:00
zhangshanxue 8740994520 线上账号登录异常 2020-10-19 21:26:55 +08:00
lvxinran 048c9177fd 逍遥游红点 2020-10-19 20:22:47 +08:00
lvxinran 1c0cbabcad 修改灵兽 2020-10-19 19:58:52 +08:00
lvxinran 42c7e31723 灵兽 结构修改,部分接口修改 2020-10-19 16:36:17 +08:00