Commit Graph

536 Commits (46e112e56a2d6b1495aced53d19063d614bebfe5)

Author SHA1 Message Date
lvxinran d86d08821b 修改启服报错 2021-07-01 18:29:39 +08:00
duhui afa3958566 心愿抽奖重新提交 2021-07-01 10:46:44 +08:00
lvxinran 610087bc1d 注释修改 2021-07-02 18:27:01 +08:00
lvxinran d70deeeed3 同系卡提交 2021-07-02 18:25:31 +08:00
lvxinran 90f8cba220 抽卡获取同阵营修改 2021-07-02 18:22:35 +08:00
xuexinpeng 186fc06156 hardstageBuff表改动相关注释 2021-06-19 16:17:41 +08:00
xuexinpeng b2ec86a39d 策划hardstageBuff 改表需求 2021-06-19 15:57:02 +08:00
lvxinran e47eaeb8bd 跨服分组第一版 2021-06-23 14:29:54 +08:00
duhui 8811d07ace 惊喜盒子,状态优化 2021-06-17 14:21:20 +08:00
duhui 7923c95d11 惊喜礼盒 2021-06-17 10:53:11 +08:00
mengchengzhen 5a88bd3ebb 福利红包 2021-06-10 18:05:56 +08:00
duhui 2ee83fef78 奇门遁甲初版未测试 2021-06-08 17:49:21 +08:00
mengchengzhen 0c6bca8e7f 推送优化 2021-06-01 18:29:40 +08:00
mengchengzhen 0370572c7c 活动礼包刷新 2021-05-31 17:55:50 +08:00
duhui a8a013ec5c Merge branch 'dh_dev_activiyDraw' into master_test_gn 2021-05-28 10:10:59 +08:00
lvxinran 4e969510f5 Merge branch 'master_test_gn' into master_test_gn_endless
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2021-07-03 01:25:41 +08:00
lvxinran dfd2bdc968 无尽修改第三版 2021-06-01 00:06:40 +08:00
duhui ab885c392a 心愿抽奖,后端自测完成 2021-05-27 19:35:53 +08:00
xuexinpeng fecbddb920 山河社稷任务 2021-05-27 18:24:07 +08:00
duhui 829bfccf16 修行: 系统消息添加玩家名字颜色 2021-05-26 18:31:33 +08:00
lvxinran a597b3545e 无尽副本第二版 2021-05-26 16:14:29 +08:00
xuexinpeng 98ee42fb6c Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2021-05-26 11:20:11 +08:00
xuexinpeng 202b170cd5 心魔试炼扫荡,一键扫荡 2021-05-26 11:09:58 +08:00
duhui d1a2849a56 心愿抽奖初版,未联调 2021-05-25 18:05:56 +08:00
lvxinran 7978510f02 分支合并 2021-05-25 11:56:06 +08:00
mengchengzhen 2010a1a9ce Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-05-24 11:43:44 +08:00
xuexinpeng c3034285d4 Merge branch 'master_test_mcz_hardstage' into master_test_gn 2021-05-24 11:10:47 +08:00
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
mengchengzhen 4a2df26e2e 福利红包 2021-05-21 18:52:19 +08:00
xuexinpeng 7c7c3e6bb6 特权等级奖励 2021-05-20 15:41:33 +08:00
mengchengzhen 97d32d93dd 福利红包 2021-05-19 11:18:46 +08:00
xuexinpeng bc9bb14dda 山河社稷技能buffer 2021-05-17 18:55:19 +08:00
xuexinpeng c509ed8444 Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-05-17 11:19:30 +08:00
xuexinpeng a8e76d24db 山河社稷图 2021-05-14 15:36:50 +08:00
lvxinran 0fe6f9bc76 礼包一键 2021-05-14 14:30:35 +08:00
duhui b51cd010a3 修行功能1.0 2021-05-14 11:12:47 +08:00
xuexinpeng 885e0112ad 山河社稷 2021-05-13 14:39:44 +08:00
mengchengzhen ea4d1e03d6 山河社稷图 2021-05-11 16:25:00 +08:00
mengchengzhen 79ffc31fa8 山河社稷图 2021-05-11 10:59:39 +08:00
mengchengzhen c9db588348 新礼包 2021-04-27 19:27:28 +08:00
mengchengzhen f0db839fab Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2021-04-26 19:04:40 +08:00
mengchengzhen 2019129057 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz 2021-04-26 17:29:25 +08:00
mengchengzhen 27aa32bd23 新礼包 2021-04-26 17:27:54 +08:00
xuexinpeng 197616887a Merge branch 'master_test_gn_arean' into master_test_gn 2021-04-26 16:27:19 +08:00
xuexinpeng 7fb75df1b6 踏碎凌霄 2021-04-26 16:25:14 +08:00
lvxinran d1a54c7377 充值 发邮件 发奖修改 2021-04-26 15:40:51 +08:00
mengchengzhen 972806ba8f 新礼包 2021-04-26 13:45:30 +08:00
mengchengzhen 54a3149de6 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
2021-04-26 12:01:08 +08:00
mengchengzhen fca38c08d0 Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-22 17:46:43 +08:00
mengchengzhen 82cc2a5feb Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-28 18:13:51 +08:00
mengchengzhen 2cac69ffcb 新礼包 2021-04-22 17:43:30 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
duhui a41d8fff66 Merge branch 'dh_dev_cn_oblation' into master_test_gn
通用祭品
2021-04-20 14:44:01 +08:00
duhui 174a0f799a 同系祭品 2021-04-19 17:53:44 +08:00
lvxinran 935740a46e 怪物传星级给前端 2021-04-19 15:28:05 +08:00
mengchengzhen dca0a5619e 装备升星(云游商人) 2021-04-19 15:03:05 +08:00
mengchengzhen 4ffb494609 礼包优化1 2021-05-14 17:05:27 +08:00
lvxinran 1b4a0f6386 一键购买添加 2021-04-17 17:39:25 +08:00
mengchengzhen 14bb6f1d95 装备升星(云游商人)表格式 2021-04-16 18:02:21 +08:00
mengchengzhen 92d850c470 装备升星(云游商人) 2021-04-16 17:16:30 +08:00
mengchengzhen 2cafa21e1d 云游商人 2021-04-16 14:02:11 +08:00
duhui 4954417643 通用祭品 2021-04-16 10:31:51 +08:00
mengchengzhen b6f5926c4b 装备升星 2021-04-15 19:13:56 +08:00
mengchengzhen 005dd17fb9 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-06 16:50:01 +08:00
mengchengzhen 00ed0e9988 15 2021-04-06 16:49:40 +08:00
duhui 31da60deef 公会boss血量由int改long 2021-04-06 14:21:14 +08:00
lvxinran 47494f8eb1 觉醒报空容错修改 2021-04-01 16:11:54 +08:00
lvxinran 3f21123535 查找错误日志 2021-04-01 16:05:12 +08:00
lvxinran 15bd393c89 福星高照 2021-05-02 20:26:14 +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 55dc3c50af 牛气冲天 2021-03-25 14:07:35 +08:00
whb 61ffca630c 羁绊激活 2021-03-19 18:41:28 +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
duhui 1cd71db5cb 1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
2021-03-17 14:09:55 +08:00
lvxinran 8966f25c5b 限时神装 2021-03-15 11:09:03 +08:00
mengchengzhen 0173bd1fa0 robotskill update 2021-03-11 15:39:45 +08:00
lvxinran f0abc728be 阈值修改提交 2021-03-10 17:29:28 +08:00
lvxinran dbcb1f98f9 阈值修改 2021-03-10 16:56:08 +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
duhui b1d5c773c2 四灵试炼,跑马灯 2021-03-10 16:09:24 +08:00
duhui 06a18387ed Merge branch 'master_test_hw' into dh_dev_HavocInHeaven 2021-03-10 11:02:56 +08:00
duhui 0b60f9c4f7 表字段添加,战力排行榜查看他人共鸣熟悉 2021-03-09 15:29:49 +08:00
duhui 50ce973616 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-03-08 15:21:46 +08:00
duhui cf740db4e4 1.大闹天宫创建节点结构修改,有旧代码删除逻辑
2.公用静态类部分map添加注释,无逻辑修改
3.其他文件无用引导包删除
2021-03-08 15:12:05 +08:00
lvxinran 0e1dad5f4a Merge branch 'master_test_hw' into master_test_hw_i18n 2021-03-05 18:17:16 +08:00
lvxinran bc75aaade9 贪婪节点奖励修改 2021-03-05 09:06:47 +08:00
duhui c99f1bea67 机器人类 2021-03-02 17:54:24 +08:00
duhui 129b9ed2ac 战斗同步 2021-03-02 17:14:52 +08:00
duhui 974891f80a 大闹天宫,遇敌 2021-03-01 11:01:24 +08:00
duhui abb94cdfb1 建木神树和四灵试炼,公告添加 2021-03-01 10:14:49 +08:00
lvxinran d8ef8d9e64 本地化修改 2021-02-27 06:43:48 +08:00
duhui 2dc01e8b26 大闹天宫,遇敌刷新逻辑修改 2021-02-26 11:29:44 +08:00
duhui 60231a23a5 鸿蒙阵,根据最大星级获取最大等级,走表 2021-02-25 11:11:54 +08:00
duhui 1099169d1f 大闹天宫,初版未完成 2021-02-25 10:34:05 +08:00
lvxinran bf68a3b434 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-02-23 18:20:04 +08:00
lvxinran 0895fd0886 越南语字段 2021-02-23 18:19:32 +08:00
whb cc2d7f9064 datatype 2021-02-23 15:54:00 +08:00
duhui 32b5f8d8fd Merge branch 'master_test_hw' into master_test_hw_hongmeng 2021-02-19 11:06:29 +08:00
duhui a11a01b363 四灵试炼,第二版,待调试 2021-02-03 10:35:55 +08:00
lvxinran 674c00ff98 工会关联表 2021-01-28 15:33:57 +08:00
lvxinran 633f531425 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-01-27 15:22:26 +08:00
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
lvxinran 7b3b844be2 日志打印 2021-01-17 15:26:14 +08:00
lvxinran e55325dd14 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-01-17 14:45:49 +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 6dab85335f 鸿蒙阵,breaId补充 2021-01-13 13:33:14 +08:00
duhui 1bc6fe656d Merge branch 'master_test_hw' into master_test_hw_hongmeng
0120版本合并
2021-01-13 11:44:03 +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 d423925752 鸿蒙阵3.2 2021-01-08 18:36:58 +08:00
duhui 70a69c02af 邮件bug修改 2021-01-08 15:12:33 +08:00
duhui 7c348f0833 Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
#	tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
#	tablemanager/src/main/java/config/SItem.java
#	tablemanager/src/main/java/config/SJewelConfig.java
2021-01-07 14:31:08 +08:00
lvxinran 202943d84f Merge branch 'master_test_hw' into master_test_hw_i18n 2021-01-06 16:53:54 +08:00
duhui a1eb022f14 鸿蒙阵3.0,成就任务 2021-01-05 18:39:35 +08:00
duhui 6084f9aa96 鸿蒙阵2.1 2021-01-05 12:15:25 +08:00
duhui 9c9f43d686 鸿蒙阵2.0 2021-01-04 15:11:00 +08:00
lvxinran 46d3d86d68 Merge branch 'master_test_hw' into master_test_hw_i18n
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
2021-01-01 01:51:02 +08:00
lvxinran 8394061f97 四灵试炼提交 2020-12-27 19:05:39 +08:00
duhui e3391faa6e 鸿蒙阵1.0,存在bug正在修改 2020-12-25 14:21:57 +08:00
lvxinran 12b0160f3a 表报错修改 2021-01-01 00:03:53 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
duhui 645718da78 Merge branch 'master_test_hw' into dev_dh_chechi
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GmService.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightRecordLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/result/FightResult.java
#	tablemanager/src/main/java/config/SGlobalSystemConfig.java
2020-12-24 10:04:18 +08:00
duhui c11dd1b1ce 战报功能二版 2020-12-18 13:50:34 +08:00
duhui 637f25930f 战报和法宝公告功能提交 2020-12-18 11:27:25 +08:00
zhangshanxue c160bca82e Merge branch 'master_online_hw' into master_test_hw 2021-02-08 01:28:00 +08:00
zhangshanxue fd681d5350 Merge branch 'master_test_hw' into master_test_hw_server_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionGuessHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_global_gm.java
#	serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ArenaRank.java
#	tablemanager/src/main/java/config/SPassiveSkillLogicConfig.java
2021-02-08 01:17:41 +08:00
zhangshanxue b7b1154a68 跨服服务器 2021-01-30 00:15:10 +08:00
duhui a52f9e77ca 战报功能二版 2020-12-18 10:01:12 +08:00
duhui 9ea1ceec59 战报功能和法宝公告,初版未测试 2020-12-17 11:17:57 +08:00
duhui 5fce8f9920 神树配置表字段添加 2020-12-15 15:02:44 +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
zhangshanxue 4bce4b8e96 跨服服务器 2020-12-07 14:44:12 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +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
lvxinran 11ac7ec7ad 鸿蒙 切分支 2020-11-27 10:57:42 +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