Commit Graph

4338 Commits (c05d0ea2b6800d4a8708b3f9d7ab9c15b3a60c53)

Author SHA1 Message Date
duhui 4d393b942f Merge branch 'master_test' into master_test_gn 2021-04-07 14:32:19 +08:00
duhui ad665bf5e5 魂印图鉴,英雄装备中魂印兼容 2021-04-07 14:31:46 +08:00
duhui 523501b6bf Merge branch 'master_test' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-04-07 13:38:27 +08:00
duhui 286f1e42b8 魂印图鉴,旧数据容错处理 2021-04-07 13:34:29 +08:00
duhui 323be12310 魂印图鉴,旧数据容错 2021-04-07 11:52:45 +08:00
mengchengzhen bce07ebf64 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-06 15:54:48 +08:00
mengchengzhen b6031f08de 排行榜战力刷新优化 2021-04-06 15:53:00 +08:00
mengchengzhen b4029e7fd9 15 2021-04-06 15:51:32 +08:00
mengchengzhen 12a6f5d580 15 2021-04-16 20:47:46 +08:00
whb 8acb5abc25 天书秘卷 2021-04-02 10:36:36 +08:00
mengchengzhen 6b7a26a1e0 战力更新 2021-04-16 20:48:57 +08:00
lvxinran f6f0a20294 删除无用打印 2021-04-01 16:16:57 +08:00
mengchengzhen f07c099715 Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2021-04-01 13:45:41 +08:00
lvxinran ee53f583f5 归元修改 2021-05-19 00:18:01 +08:00
lvxinran 448c13c550 福星高照计时修改 2021-05-19 00:01:18 +08:00
lvxinran 15bd393c89 福星高照 2021-05-02 20:26:14 +08:00
lvxinran 0228b97402 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-01 13:57:43 +08:00
lvxinran bfe16940b2 储值活动、聊天修改 提交 2021-04-01 13:57:12 +08:00
lvxinran c4b4415e00 活动类型添加 2021-03-31 21:40:07 +08:00
mengchengzhen 859daed04b 15 2021-03-30 16:41:53 +08:00
whb 3db8b587be Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
2021-03-30 13:50:29 +08:00
mengchengzhen 2d9ad53842 Merge branch 'master_test_gn' into master_test_gn_mcz 2021-03-29 18:09:37 +08:00
mengchengzhen c6df17e07b 坐骑,皮肤,称号 2021-03-29 18:02:38 +08:00
duhui 24323d620d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-03-29 15:53:55 +08:00
lvxinran 80df35b883 头像入库修改 2021-04-01 15:12:08 +08:00
lvxinran 638dc34630 删除无用日志 2021-04-01 15:00:30 +08:00
lvxinran 723d4336db 大闹天宫首次刷新bug修改 2021-04-01 14:03:19 +08:00
duhui 63b0989a9e 三界降魔发放奖励 2021-03-29 15:52:29 +08:00
lvxinran e39ac0cd61 冲突修改 2021-03-29 14:29:35 +08:00
lvxinran d080a9a0d8 Merge branch 'master_online_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java
2021-03-29 14:26:02 +08:00
lvxinran ad35dedf3b 0元不算首冲修改,公会副本推送修改 2021-03-31 09:13:49 +08:00
lvxinran 1b472203e7 报错修改 2021-03-27 18:45:00 +08:00
lvxinran 4fa6b8e8af 冲突修改 2021-03-27 16:43:49 +08:00
lvxinran 2b06894b07 merge2 2021-03-27 16:40:32 +08:00
lvxinran 5f335130c9 merge 2021-03-27 16:30:56 +08:00
whb 7c14f87a04 图鉴 2021-03-25 16:05:35 +08:00
duhui 55dc3c50af 牛气冲天 2021-03-25 14:07:35 +08:00
lvxinran 4c0ce0872c 工会副本修改 2021-03-23 03:30:42 +08:00
lvxinran 6f8e28efcd 充值成功indication 2021-03-20 21:17:16 +08:00
lvxinran 70c50ed74b 删除无用日志 2021-03-20 14:59:55 +08:00
lvxinran 58713e49da 添加日志 2021-04-02 00:24:40 +08:00
lvxinran 97b65368e2 添加日志 2021-04-02 00:10:33 +08:00
lvxinran c6286f1834 添加日志 2021-04-01 23:51:00 +08:00
lvxinran 4f9f8a76eb 删除无用公会代码 2021-03-19 23:26:07 +08:00
whb 61ffca630c 羁绊激活 2021-03-19 18:41:28 +08:00
lvxinran 6907229c3f 修复代码 2021-03-19 17:49:49 +08:00
duhui 63a8cc5b33 Merge branch 'master_test' into master_test_gn 2021-03-19 17:26:26 +08:00
duhui 7786fa994a 大闹天宫,星级突破修改 2021-03-19 17:25:40 +08:00
duhui ba5554e271 Merge branch 'master_test' into master_test_gn 2021-03-19 16:58:18 +08:00
duhui 206a9496d5 星级突破等级上限修改 2021-03-19 16:54:43 +08:00
lvxinran 888c11dde2 国服设置第十四天后开启天宫秘宝 2021-03-19 16:43:04 +08:00
duhui ce52e73800 Merge branch 'master_test' into master_test_gn 2021-03-19 16:30:58 +08:00
duhui 47ac15c42f 修改求平均等级逻辑 2021-03-19 16:30:39 +08:00
duhui 88fba2ddb6 Merge branch 'master_test' into master_test_gn 2021-03-19 16:25:15 +08:00
duhui 5bec625ba5 大闹天宫,招募英雄限制最大星级和最低等级 2021-03-19 16:18:24 +08:00
mengchengzhen 1a197070ca Merge branch 'master_test' into master_test_gn 2021-03-19 15:11:07 +08:00
mengchengzhen 54dabc2564 大闹天宫优化 2021-03-19 15:10:36 +08:00
lvxinran 39e39e3ef6 tapdb参数修改 2021-03-19 14:12:43 +08:00
mengchengzhen baeb7e03cd Merge branch 'master_test' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java
2021-03-19 14:06:44 +08:00
mengchengzhen 66bea3f2c5 大闹天宫优化 2021-03-19 14:05:16 +08:00
mengchengzhen 86103f1067 大闹天宫 优化 2021-03-19 13:43:45 +08:00
lvxinran 1c97143e97 大闹天宫修改 2021-03-18 22:35:49 +08:00
lvxinran f0677a6706 节点信息修改 2021-03-18 18:55:47 +08:00
lvxinran 3905b8b26d Merge branch 'master_test' into master_test_gn 2021-03-18 18:01:51 +08:00
lvxinran dc3cb7f760 大闹天宫保存血量 2021-03-18 18:01:35 +08:00
lvxinran 889b1d0513 Merge branch 'master_test' into master_test_gn 2021-03-18 16:58:21 +08:00
lvxinran 8f0f004ec6 血量修改 2021-03-18 16:57:42 +08:00
lvxinran 8b4c3c6703 Merge branch 'master_test_hw' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
2021-03-18 16:19:50 +08:00
duhui 29bf5b17be 代码修复 2021-03-18 16:16:45 +08:00
lvxinran 129a0cdaa1 Merge branch 'master_test_hw' into master_test_gn 2021-03-18 15:50:51 +08:00
lvxinran 5f5562938b 贪婪节点英雄信息 2021-03-18 15:50:35 +08:00
DESKTOP-98AVA47\Administrator 530468ba0c 大闹天宫,试炼节点调优 2021-03-20 02:42:45 +07:00
lvxinran ad85797051 贪婪节点没有英雄信息 2021-03-18 15:48:07 +08:00
lvxinran bce5d3c34c buff值代码修改 2021-03-18 13:52:12 +08:00
lvxinran 9c684c7c8f int long 修改 2021-03-18 11:55:54 +08:00
lvxinran 2b61537ab7 活跃度修改 2021-03-17 16:41:28 +08:00
duhui 1c518d0f73 大闹天宫,怪物魂印逻辑修改 2021-03-17 15:10:21 +08:00
duhui 1cd71db5cb 1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
2021-03-17 14:09:55 +08:00
lvxinran aa9fee7c60 buff类型回滚 2021-03-16 17:43:22 +08:00
duhui bf0ab56a93 大闹天宫,随机阵容问题处理 2021-03-16 11:14:27 +08:00
duhui 0567561cee 大闹天宫,boos节点和精英节点战力问题解决 2021-03-16 09:49:37 +08:00
mengchengzhen 409b7a3468 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-15 18:50:19 +08:00
mengchengzhen eff18fe054 danaotiangong update 2021-03-15 18:50:12 +08:00
lvxinran 6804684744 非空判断 2021-03-15 11:11:21 +08:00
lvxinran 8966f25c5b 限时神装 2021-03-15 11:09:03 +08:00
lvxinran 72d408063d Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-15 09:52:06 +08:00
lvxinran 9fbb26d855 离线逻辑修改 2021-03-15 09:52:01 +08:00
mengchengzhen 8fa36b3b1a dntg bug 2021-03-11 21:01:10 +08:00
duhui 9e488abe4e 鸿蒙阵突破等级 2021-03-11 18:34:36 +08:00
duhui f086046586 符号 2021-03-11 18:27:32 +08:00
duhui e01097fabc 鸿蒙阵突破共鸣问题 2021-03-11 18:19:09 +08:00
mengchengzhen d4e5a2b6a4 holy 37type update 2021-03-11 17:02:35 +08:00
lvxinran f0abc728be 阈值修改提交 2021-03-10 17:29:28 +08:00
lvxinran dbcb1f98f9 阈值修改 2021-03-10 16:56:08 +08:00
lvxinran 5d7fad815e 修改阈值冲突 2021-03-10 16:16:22 +08:00
lvxinran ecde209b04 Merge branch 'master_test_gn' into master_test_gn_datatype
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
#	tablemanager/src/main/java/config/SCHero.java
2021-03-10 16:13:37 +08:00
mengchengzhen b83f8583ec danaotiangong battlenode 2021-03-10 15:17:47 +08:00
duhui 06a18387ed Merge branch 'master_test_hw' into dh_dev_HavocInHeaven 2021-03-10 11:02:56 +08:00
mengchengzhen 9fe8dd3e5f 大闹天宫圣物修改 2021-03-10 10:28:59 +08:00
lvxinran f2a0fffe24 敏感字修改 2021-03-09 15:48:48 +08:00