Commit Graph

708 Commits (6df338db96bf52e90587615332a128df8e0c4eda)

Author SHA1 Message Date
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
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
lvxinran f5427e27a7 灵兽放生,涅槃 2020-10-22 14:48:26 +08:00
zhangshanxue 6e7465f17d Merge branch 'master_test_hw' into master_test_hw_sheji 2020-10-21 16:27:13 +08:00
lvxinran 64744bb3bb 修改灵兽 2020-10-21 10:21:06 +08:00
jiahuiwen 871ba646e0 异妖可下阵 2020-10-20 20:08:36 +08:00
zhangshanxue 9bc774ef2b 添加新币种 2020-10-19 23:25:14 +08:00
lvxinran 1c0cbabcad 修改灵兽 2020-10-19 19:58:52 +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 663b3c9723 逍遥游逻辑 2020-10-16 14:19:16 +08:00
jiahuiwen 8df6762548 25闯关礼包、26、心魔试炼礼包 触发和推送 2020-10-13 14:58:25 +08:00
lvxinran 166b93b3f7 邮件本地化提交 2020-10-01 00:55:09 +08:00
lvxinran e79d844eec 系统公告本地化修改 2020-12-06 08:57:25 +08:00
lvxinran b3222d42b3 删除无用代码 2020-11-23 21:27:47 +08:00
lvxinran 805ac98057 Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2020-09-25 14:31:42 +08:00
zhangshanxue f24b25419a 热更表日志 2020-09-23 19:20:27 +08:00
lvxinran 175b75a796 免费礼包、达人活动提交 2020-09-25 11:44:36 +08:00
zhangshanxue 0a565bb025 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-15 16:16:07 +08:00
zhangshanxue f4dc939fc2 网页支付玩家定制化商品列表 2020-09-15 16:15:59 +08:00
lvxinran bb6a149f89 天宫秘宝修改 2020-09-15 14:43:13 +08:00
jiahuiwen c3aa0b815f 替换 System.out.println 2020-09-02 16:27:26 +08:00
jiahuiwen d1eccf88b9 代码优化 2020-09-01 17:20:57 +08:00
jiahuiwen c3be084f49 优化代码 2020-09-01 14:45:47 +08:00
jiahuiwen 8e31ca0acf 优化代码 2020-09-01 10:45:16 +08:00
zhangshanxue a1b2d3e3f3 任务类型和充值计费点 2020-09-09 23:22:00 +08:00
lvxinran 5f9b70ea80 天宫秘宝积分购买添加 公会副本击杀奖励修改 2020-10-01 00:40:30 +08:00
zhangshanxue bacd35c48e 测试充值 2020-08-25 18:29:17 +08:00
zhangshanxue 07595796fa 合分支 2020-08-24 23:36:16 +08:00
zhangshanxue 23ade886ae Merge branch 'master' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-08-24 23:16:18 +08:00
zhangshanxue e77644359d 充值价格 2020-08-24 23:14:03 +08:00
lvxinran a57bdbc37f 五星成长礼修改 2020-09-01 22:11:12 +08:00
lvxinran d56aa73460 Merge branch 'master' into 公会副本 2020-08-22 15:39:33 +08:00
lvxinran 146c394e7a 公会副本提交 2020-08-22 15:38:31 +08:00
zhangshanxue 3ef43a64a7 灵动网页支付 2020-08-21 20:31:30 +08:00
lilei 7c7e5cf9f1 破阵诛仙系列任务 2020-08-21 16:36:46 +08:00
lvxinran f7b77d668a 副本提交 2020-08-28 14:38:20 +08:00
lvxinran c6a0354f81 公会副本提交,大闹天宫埋点提交 2020-08-20 23:02:13 +08:00
zhangshanxue b83687ea23 revert 错误合并 2020-08-19 11:16:28 +08:00
lilei 50f33a02c0 Merge branch 'develop_treasure' 2020-08-19 09:47:27 +08:00
lvxinran 1b70b3c73a 公会副本 2020-08-18 19:42:50 +08:00
zhangshanxue 000b4466b3 充值和数据转换 2020-08-18 16:12:54 +08:00
lilei f73829b5d4 青龙秘宝,新增部分任务类型 2020-08-17 15:01:28 +08:00
zhangshanxue 329cb6dcc2 充值类型更换 2020-08-14 23:18:18 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
lvxinran 7c9a366149 限时兑换修改 2020-08-21 11:42:31 +08:00
lvxinran 6dfd305c73 轩辕宝镜排行发奖 2020-08-17 05:08:35 +08:00
zhangshanxue 2b33f18c05 Merge branch 'equip_develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.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
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-08-12 15:20:22 +08:00
lvxinran 00198786e9 轩辕宝镜代码提交 2020-08-15 13:42:36 +08:00
zhangshanxue 4e0dd14dce 英雄置换 2020-08-12 14:16:08 +08:00
zhangshanxue efc21ecbf3 英雄置换 2020-08-10 15:26:19 +08:00
lvxinran b5a0c8de0e 轩辕宝镜接口添加 2020-08-06 22:55:38 +08:00
lvxinran ee0c50242b 轩辕宝镜提交 2020-08-06 22:54:25 +08:00
lvxinran c8722e9047 装备成就修改,地图炸弹添加,全服邮件红点,装备分解归元修改,打点种类添加 2020-07-31 17:37:39 +08:00
zhangshanxue 3ab0b9c3a8 出包前bug 2020-08-02 23:44:02 +08:00
lvxinran f7bdc25b3c 英雄归元、分解修改 2020-07-24 14:34:15 +08:00
lvxinran c525e3e429 英雄分解修改 提交 2020-07-29 20:11:06 +08:00
zhangshanxue 61c961d073 幸运探宝次数 2020-07-20 14:12:07 +08:00
lvxinran deb08dbaf7 战斗 表增加列 2020-07-14 17:24:41 +08:00
lvxinran a8a46da07b 英雄归元,被动技能战力增加 2020-07-13 18:31:42 +08:00
lvxinran 50bc669250 归元修改,打点修改 2020-07-13 17:20:27 +08:00
lvxinran da8d764a75 抽卡活动修改,部分打点类型修改 2020-07-13 14:30:47 +08:00
zhangshanxue e76c60958d Merge branch 'dev_champion'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-07-03 09:56:32 +08:00
zhangshanxue 47595e498f 竞技场奖励 2020-07-03 09:54:09 +08:00
zhangshanxue 2511018c53 Merge branch 'dev_champion' 2020-07-01 18:27:28 +08:00
lvxinran 0d0acca185 日常本战力校验添加 2020-07-04 06:17:57 +08:00
zhangshanxue eba32c1b52 TASK【ID1006427】【ID1006428】【大闹天宫优化】 BUG【ID1008042】【大闹天宫】招募的四星卡,初始是五星,没技能 2020-07-01 18:25:35 +08:00
lvxinran a7346c0837 森罗环境游戏等级限制加入提交 2020-06-25 10:51:28 +08:00
lvxinran 3e3b82ffb7 装备配置修改 2020-07-02 17:32:59 +08:00
lvxinran beb23ae312 日常本修改 2020-06-25 20:14:51 +08:00
lvxinran ae4d30761e 关闭旧公会战 2020-06-19 13:57:45 +08:00
lvxinran f8a2ad6a32 抽卡修改 2020-06-19 13:33:19 +08:00
lvxinran 06ba20787b 抽卡逻辑修改 2020-06-18 20:39:09 +08:00
lvxinran 564e0cfc12 森罗环境表结构修改,英雄信息添加公会技能等级 2020-06-26 04:49:30 +08:00
lvxinran bc08a7f1e5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 19:09:16 +08:00
lvxinran aad4c60747 寻宝首次多个任务 2020-06-17 19:08:50 +08:00
zhangshanxue 6519567756 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 09:40:45 +08:00
zhangshanxue 7225ca8ab4 TASK 【ID1006352】【活动需求】升级礼包推送 2020-06-17 09:40:33 +08:00
lvxinran 480259edf8 商店刷新机制修改提交 2020-06-15 18:20:03 +08:00
lvxinran f25e6a5980 冲突修改 2020-06-12 17:09:03 +08:00
lvxinran 2670dcd04a 等级礼包暂时提交 2020-06-12 17:04:47 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
zhangshanxue 5e550150ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 11:47:48 +08:00
lvxinran 1e56edce3a 试炼buff提交 2020-06-17 10:27:20 +08:00
zhangshanxue 3c5b576b0a TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 11:47:39 +08:00
lvxinran 3a1e16feb6 试炼本重置功能,任务提交 2020-06-10 05:49:14 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
zhangshanxue cdacaa402a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:59:12 +08:00
zhangshanxue dc5792aa0f BUG【ID1007767】【特权】迷宫寻宝未解锁,刷新迷宫寻宝任务完成 2020-06-08 16:59:02 +08:00
zhangshanxue bc00118998 TASK 【ID1006339】日常任务及戒灵秘宝调整 2020-06-07 19:21:41 +08:00
lvxinran e6f8b3973d 排行榜优化,抽卡代码回滚 2020-06-05 15:17:22 +08:00
zhangshanxue a472f6c553 公会漏存 2020-06-03 19:49:56 +08:00
lvxinran 86b864fc45 森罗幻境提交,部分任务添加 2020-06-03 16:13:26 +08:00
lvxinran c012389b87 试炼副本福利层提交 2020-06-09 05:59:01 +08:00
lvxinran 7c36842867 签到优化提交 2020-06-09 05:55:56 +08:00
lvxinran c3eb254132 分支合并提交 2020-06-02 10:57:56 +08:00
lvxinran 0f2bb15952 商店条件添加 2020-06-01 21:11:15 +08:00
lvxinran 407a161831 试炼副本提交 2020-06-01 21:03:48 +08:00
zhangshanxue 094d64f8ad Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:13:25 +08:00
zhangshanxue a6767eb7bf Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:07:46 +08:00
wangyuan f48920d5bc 1.修复活动关闭没有推送新活动开始 2.猎妖之路加被动技能 3.删除无效领取抽卡宝箱奖励 2020-05-16 18:46:14 +08:00
wangyuan 7ad319cd7e random card 2020-05-16 16:56:15 +08:00
zhangshanxue feaa5fb4f5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-16 10:33:02 +08:00
zhangshanxue 238e940beb Task【新战斗版本】公会援助 2020-05-16 10:32:50 +08:00
lvxinran b302bd3601 删除无用代码 2020-05-22 16:20:39 +08:00
lvxinran 886474443e 十绝阵奖励随机提交 2020-05-22 15:51:17 +08:00
lvxinran bab6d9a004 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-18 22:39:22 +08:00
lvxinran 4408cd4a17 十绝阵奖励相关 2020-05-18 22:39:17 +08:00
wangyuan e82caddb52 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-12 16:06:33 +08:00
wangyuan 73e7d662aa 开活动送充值购买权 2020-05-12 16:02:37 +08:00
lvxinran e60facdc36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-15 00:08:14 +08:00
lvxinran 633cf81ee6 十绝阵 时间 阶段修改 2020-05-15 00:07:41 +08:00
zhangshanxue f75b7ad1cc Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 11:37:55 +08:00
wangyuan 8ea7539cdf fix car 2020-05-09 11:39:57 +08:00
lvxinran 6079cc96ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-05-09 09:59:29 +08:00
lvxinran d9696552ff 十绝阵提交 2020-05-09 09:53:45 +08:00
zhangshanxue 964729e36e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
2020-05-07 16:49:06 +08:00
zhangshanxue 9660e22f9c 祭祀 2020-05-07 16:46:21 +08:00
wangyuan a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
lvxinran 0d59731c5c 公会技能 代码提交 2020-05-06 11:53:48 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
lvxinran 3603493efa 宝器相关 2020-04-28 21:22:50 +08:00
lvxinran d4a0550657 宝器 每日副本 代码提交 2020-04-27 15:15:58 +08:00
wangyuan c8fdd5b47d store 2020-04-22 11:28:35 +08:00
wangyuan 12996dc439 装备套装 2020-04-21 11:09:54 +08:00
lvxinran 7d40e3d2fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-16 15:09:03 +08:00
wangyuan 653579444f fix 2020-04-22 15:07:02 +08:00
lvxinran a2b94590ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-04-15 17:20:23 +08:00
lvxinran 7650ddf064 编队修改 2020-04-15 17:19:23 +08:00
wangyuan 322f1735b7 修改魂印计算属性 2020-04-15 14:51:11 +08:00
wangyuan 734b7cb055 fix force 2020-04-15 14:21:26 +08:00
wangyuan 0257faf2d7 fix hero passive 2020-04-13 20:02:56 +08:00
wangyuan 55019f706a check 2020-04-13 11:26:32 +08:00
wangyuan 11b28fab35 fix gamesetting 2020-04-13 11:15:24 +08:00
wangyuan 6f05bae898 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-04-13 11:12:00 +08:00
wangyuan 8372da1907 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	tablemanager/src/main/java/config/SEquipConfig.java
2020-04-13 11:10:52 +08:00
lvxinran bf2cfc3bcf 战斗修改 2020-04-10 14:52:41 +08:00
wangyuan 2c937c623e soul equip 2020-04-09 20:35:50 +08:00
lvxinran fb3c445361 英雄属性公式修改 2020-04-09 19:54:33 +08:00
lvxinran 47dbe898dc 法宝技能添加 2020-04-03 16:59:22 +08:00
lvxinran f08d202d70 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-01 16:15:09 +08:00
lvxinran 586c38221d 特权时间是否可叠加修改,签到bug修改 2020-05-01 16:14:33 +08:00
zhangshanxue 64fabcd9d7 Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-03 11:45:56 +08:00
zhangshanxue 8e8cc31b08 Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-03 11:45:33 +08:00
lvxinran 44f8aa82f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-02 15:14:34 +08:00
lvxinran d1cf55e9ac 法宝重做 2020-04-02 15:14:30 +08:00
zhangshanxue f1da1afbce 【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端 2020-05-04 05:07:01 +08:00
lvxinran 6b9ac180e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-27 14:04:47 +08:00
lvxinran 1588a437b1 回溯、分解英雄 2020-03-27 14:04:42 +08:00
zhangshanxue 20a2a3c495 成就系统 2020-03-26 13:56:07 +08:00
zhangshanxue f8251f06cf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-24 10:59:20 +08:00
zhangshanxue 91593f8fa0 奖励优化 2020-03-24 10:58:52 +08:00
wangyuan f23d6924fd 删除无效代码 2020-03-24 10:57:06 +08:00
wangyuan 651c7697c8 道具直购 2020-03-20 11:00:59 +08:00
wangyuan 978bee312b fix guildbossreward table bug 2020-03-11 17:15:57 +08:00
zhangshanxue 74ee4537ee 远征优化 2020-03-06 13:23:57 +08:00
lvxinran 0846bdfe2d 戒灵秘宝逻辑修改 2020-02-28 12:04:02 +08:00
zhangshanxue c53b6056ed Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组 2020-02-26 16:54:12 +08:00
wangyuan 6a27656717 fix name 2020-02-21 18:04:10 +08:00
wangyuan d9b592cc81 修复功能按类型开 2020-02-21 17:54:41 +08:00
wangyuan d3a84ad2a8 商店刷新 & 工会行走 2020-03-26 00:02:26 +08:00
zhangshanxue 4e5542393c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-02-09 19:53:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
wangyuan 0d64c47eb1 表时间修改 2020-01-16 17:53:38 +08:00
wangyuan fe4f9c64e5 工会boss奖励 2020-01-15 10:23:18 +08:00
lvxinran 27a48fac95 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-09 17:02:03 +08:00
lvxinran 50093c8c58 特权时间修改,点赞物品添加 2020-01-09 17:01:53 +08:00
wangyuan 2596295a30 商品购买和刷新 2020-01-09 16:43:47 +08:00
wangyuan f16f86c7ee Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-08 17:58:46 +08:00
wangyuan cb1954d8a2 vip权限 2020-01-08 17:58:36 +08:00
lvxinran 101d1bcdf3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-08 17:19:28 +08:00
lvxinran 403364b2fd 公会红包提交 2020-01-08 17:19:23 +08:00
duhui a1e4ca3f4c Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-08 10:15:04 +08:00
duhui fc05c6a1cb 1.6版本优化,初版,待测试 2021-01-08 10:14:53 +08:00
lvxinran 0d19dcd30f 战斗里添加job字段 2020-12-31 10:03:05 +08:00
wangyuan a0fe74fa22 vip校验方法名称修改 2020-01-07 19:24:55 +08:00
wangyuan e67f511a4b 2020-01-07 13:57:23 +08:00
lvxinran 2c6eccad1a 排行榜,特权修改 2020-01-03 15:02:54 +08:00
lvxinran 99496504fb 权限修改 2020-01-02 16:57:25 +08:00
zhangshanxue 50e9aee159 Task 【ID1005360】 【达人活动】新增寻宝达人等4项达人活动 2019-12-29 17:24:30 +08:00
lvxinran c6788d47e8 特权表修改 2019-12-27 10:26:20 +08:00
lvxinran 5380c3cc23 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-27 10:24:26 +08:00
zhangshanxue 2c72864fa5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-28 15:38:55 +08:00
lvxinran bcf27e16f9 商店表 2019-12-27 10:22:15 +08:00
wangyuan dc80e9b288 format champion mail content 2019-12-26 10:19:20 +08:00
zhangshanxue 069da0c108 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-26 10:09:12 +08:00
zhangshanxue bb75dfbcfa 【ID1005331】【星级成长礼】 2019-12-26 10:09:06 +08:00
wangyuan a1f98bdc00 add 2019-12-25 17:49:52 +08:00
lvxinran 42d27f48cd 限时抽卡免费次数 2019-12-25 14:07:48 +08:00
lvxinran f0863ffbb8 建号迷宫寻宝任务 2019-12-24 16:00:58 +08:00
wangyuan 8b81a3b77a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-24 14:23:28 +08:00
wangyuan 6b38f4f77e 修改战斗计算结果 2019-12-24 14:23:23 +08:00
lvxinran 5e817c87ff 异妖上阵修改 2019-12-23 18:04:13 +08:00
lvxinran 46a12c155c 抽卡修改 2019-12-21 10:19:18 +08:00
lvxinran 790a0916db 上限修改 2019-12-19 14:48:14 +08:00
zhangshanxue 23b617fcde Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-19 10:36:47 +08:00
zhangshanxue 31c5e9184d Task【ID1005229】【特权调整】 2019-12-19 10:36:35 +08:00
lvxinran 628902282d 迷宫寻宝 2019-12-18 14:06:07 +08:00