Commit Graph

4249 Commits (e80c2b6e030ec35a997a6b3f1e281799b68bbee0)
 

Author SHA1 Message Date
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
zhangshanxue 6e7465f17d Merge branch 'master_test_hw' into master_test_hw_sheji 2020-10-21 16:27:13 +08:00
zhangshanxue 1e6dedddf4 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-10-21 16:24:16 +08:00
zhangshanxue 6878e44257 Revert "no message"
This reverts commit 426cd852de.
2020-10-21 16:23:49 +08:00
zhangshanxue 426cd852de no message 2020-10-21 16:23:07 +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
zhangshanxue 3e1f2e1787 免费礼包无法领取 2020-10-21 11:21:07 +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 1937350c63 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-20 00:35:40 +08:00
lvxinran c38ea8c334 红点修改 2020-10-19 23:41:30 +08:00
zhangshanxue ba006c96d2 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-19 23:25:49 +08:00
zhangshanxue 9bc774ef2b 添加新币种 2020-10-19 23:25:14 +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
lvxinran d307a4a0fc 逍遥游消耗物品 2020-10-19 15:22:22 +08:00
lvxinran 7abd3c2dba 等级校验添加 2020-10-19 14:01:14 +08:00
lvxinran 674e421e27 普通奖励修改 2020-10-19 09:59:56 +08:00
lvxinran 3f862e1ce3 Merge branch 'master_test_hw' into master_test_journey 2020-10-17 18:14:06 +08:00
lvxinran f4c4f22919 逍遥游修改 2020-10-17 18:11:58 +08:00
zhangshanxue 661b8f50c8 社稷大典配置表提交 2020-10-17 15:38:23 +08:00
lvxinran f7c5cfb7c4 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-31 17:26:31 +08:00