Commit Graph

316 Commits (bca44c2d711dc539cb5f3bba579b2a203ab77167)

Author SHA1 Message Date
duhui d887ff2d90 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-02-12 14:21:21 +08:00
duhui ca1b4f3fa8 Merge branch 'dev_dh_tree' into master_test_hw_four_challenge
# Conflicts:
#	luafight/Modules/Battle/Logic/Base/Passivity.lua
#	luafight/Modules/Battle/Logic/Misc/BattleUtil.lua
#	luafight/Modules/Battle/Logic/Role/RoleLogic.lua
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
2021-01-26 11:26:56 +08:00
lvxinran 6e396124ec Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-21 11:03:35 +08:00
lvxinran ae79e8d410 扭转乾坤活动提交 2021-01-21 11:03:31 +08:00
duhui 36306b509e 0127挂机奖励计算 2021-01-20 10:05:46 +08:00
duhui 664b4c748c 限时头像框 2021-01-15 17:40:56 +08:00
lvxinran f28fd3a65d 抽卡校验修改 2021-01-14 17:22:19 +08:00
duhui 14d06145c9 Merge branch 'dh_dev_mail' into master_test_hw
邮件功能合并
2021-01-13 16:01:15 +08:00
duhui 0b580e8ce3 0120版本更新
1、竞技场机器人英雄显示bug处理
2、心魔试炼添加排名奖励功能实现
2021-01-13 11:38:48 +08:00
duhui 0c4041c74d 车迟斗法优化,根据boss更换排行奖励 2021-01-13 21:12:52 +08:00
duhui 70a69c02af 邮件bug修改 2021-01-08 15:12:33 +08:00
lvxinran 8394061f97 四灵试炼提交 2020-12-27 19:05:39 +08:00
duhui 813ff75cfb 套装优化 2020-12-11 17:17:12 +08:00
duhui ad8641f96c 建木神树初版,未测试 2020-12-11 11:30:41 +08:00
duhui 97077d9557 新将来袭活动文件补充 2020-12-09 14:01:59 +08:00
lvxinran 44a241b52c Revert "鸿蒙碑初版"
This reverts commit 8057c913bb.
2020-11-27 10:58:29 +08:00
lvxinran e80c2b6e03 Revert "鸿蒙阵"
This reverts commit c1bc98d972.
2020-11-27 10:58:18 +08:00
jiahuiwen c1bc98d972 鸿蒙阵 2020-11-26 20:24:33 +08:00
jiahuiwen 0ad0e87617 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-26 20:06:24 +08:00
jiahuiwen 8057c913bb 鸿蒙碑初版 2020-11-26 20:06:17 +08:00
lvxinran 5640521082 修改表数据 2020-11-23 15:18:28 +08:00
lvxinran a8a99c38e9 技能修改 2020-12-01 04:08:02 +08:00
lvxinran 23bfdbe50f 灵兽抽卡修改 2020-11-16 21:09:43 +08:00
lvxinran 36304b135e 灵兽活动提交 2020-11-16 20:20:45 +08:00
jiahuiwen 5a84536aa6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-11 09:57:25 +08:00
jiahuiwen d646106de5 英雄觉醒飘字 2020-11-11 09:57:11 +08:00
zhangshanxue 16ded73f10 易经宝库道具回收 2020-11-17 16:59:04 +08:00
zhangshanxue cd8fd29036 Merge branch 'master_test_hw' into master_test_hw_sub
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-11-06 16:24:38 +08:00
zhangshanxue 8e3704bf67 易经宝库提交 2020-11-06 16:22:53 +08:00
jiahuiwen d1d38a85a0 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-06 16:12:42 +08:00
jiahuiwen fd8e564a15 英雄觉醒 2020-11-06 16:12:37 +08:00
lvxinran c2e5a9ca5a 类型修改提交 2020-11-06 15:13:06 +08:00
lvxinran 298d799594 技能皮肤修改 2020-11-06 15:11:18 +08:00
lvxinran 01620df5a9 Merge branch 'master_test_hw' into master_test_skin 2020-11-06 10:21:37 +08:00
lvxinran 7232b8604a 皮肤 头像修改 2020-11-03 05:25:17 +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 faf9a8e8db 社稷大典 2020-10-31 13:57:58 +08:00
lvxinran aa94e3bc5b 英雄皮肤添加 2020-10-31 09:58:34 +08:00
zhangshanxue 763872915f 社稷大典公会排行 2020-10-31 14:02:38 +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 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 ecc95a79a4 社稷大典公会排行 2020-10-28 12:14:06 +08:00
zhangshanxue 210f4a1529 社稷大典代码提交 2020-10-25 17:00:00 +08:00
lvxinran 3dd49ea868 折扣 妖精抽卡次数提交 2020-10-24 15:52:25 +08:00
lvxinran d054d48907 灵兽战斗数据添加 2020-10-23 13:38:08 +08:00
lvxinran bf282624e7 灵兽提交 2020-10-22 20:26:40 +08:00