Commit Graph

513 Commits (659a88a9320ea96cff6c7aaa4c52ec9c1be955ce)

Author SHA1 Message Date
xuexinpeng ecba1854dd Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-10-16 11:44:24 +08:00
jiahuiwen f9eda6dfe0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SAchievementConfig.java
2021-10-15 18:21:48 +08:00
jiahuiwen 7c0c66be39 【成就优化】根据开服时间决定服务器内的成就 2021-10-15 18:20:59 +08:00
duhui 2f4715b599 Merge branch 'dh_dev_cow' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-15 17:18:43 +08:00
duhui 6d8a430fab 牛气冲天兼容 2021-10-15 17:16:17 +08:00
yuanshuai 82dd1bd33e Merge branch 'master_test_gn_push' into master_test_gn 2021-10-15 16:52:58 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +08:00
jiahuiwen 09591d21e0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-14 19:38:11 +08:00
jiahuiwen 44ffcea125 坐骑技能 2021-10-14 19:38:02 +08:00
xuexinpeng e5736e509e yxld10/14 2021-10-14 17:27:59 +08:00
yuanshuai 92b027d90c 根据充值金额推送礼包代码修改 2021-10-14 16:44:14 +08:00
duhui 7ab321cc75 成就任务优化,兼容开服时间条件 2021-10-14 15:36:48 +08:00
yuanshuai 8dceb89111 白金装备提交 2021-10-14 13:47:14 +08:00
xuexinpeng 433e651a6c Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-13 19:58:49 +08:00
xuexinpeng c6d45cbecf yx10.13测试bug 2021-10-13 19:52:46 +08:00
xuexinpeng fef22e4ae3 yx1.匹配规则的修改
2.战斗回放战力显示
    3.玩家初始化积分
2021-10-09 20:24:50 +08:00
xuexinpeng a03ee2095c 玉虚论道10.8 2021-10-09 10:57:12 +08:00
jiahuiwen bb6ef14fcf 点石成金基础收益随着玩家等级提升,玩家等级提升时 发放道具进背包 2021-10-08 11:11:24 +08:00
yuanshuai 235a3d3a8c Merge branch 'master_test_gn_likable' into master_test_gn 2021-09-29 15:45:09 +08:00
xuexinpeng 8437b6f9ea 海洋改掉落 2021-09-29 14:34:00 +08:00
xuexinpeng 4a1f019c1a 玉虚论道 2021-09-28 19:15:13 +08:00
xuexinpeng d20ba835bf Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	fightmanager/src/main/java/com/ljsd/fight/FightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.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/GameGM/GMRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
#	tablemanager/src/main/java/config/SArenaRobotConfig.java
#	tablemanager/src/main/java/config/SMServerArenaSetting.java
#	tablemanager/src/main/java/config/SMServerRankConfig.java
#	tablemanager/src/main/java/config/SMServerRankReward.java
2021-09-28 16:47:44 +08:00
jiahuiwen 77e0ed5e38 注释 SArenaRobotConfig 类中 玉虚论道 相关代码 2021-09-26 22:22:49 +08:00
yuanshuai 970b3911f8 好感度脚本提交 2021-09-26 19:43:02 +08:00
jiahuiwen 8bc3f13117 白金装备技能 2021-09-26 18:50:43 +08:00
duhui a52efb87e1 跨服,返回第几周 2021-10-02 18:44:00 +08:00
yuanshuai c900a018ec 好感度脚本提交 2021-09-24 14:10:02 +08:00
duhui f69e502d39 七界遗物buf修改 2021-09-24 11:51:17 +08:00
yuanshuai 8dc19f2d98 好感度代码提交 2021-09-23 17:22:40 +08:00
duhui ef3c6e81c7 网页支付 2021-09-22 18:34:44 +08:00
yuanshuai db8504e51f Merge branch 'master_test_gn_ys' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java
2021-09-22 15:23:50 +08:00
duhui dfbf4285a0 Merge branch 'dh_dev_qijie' into master_test_gn 2021-09-22 13:57:54 +08:00
jiahuiwen 5d4ef3ac50 BlessingConfigNew 表 basicPoolId 改 String 2021-09-18 10:43:52 +08:00
duhui ff3f04af63 合并代码2 2021-09-17 14:21:01 +08:00
duhui 18f91727e4 第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
2021-09-17 14:13:29 +08:00
xuexinpeng 9b3aaad6ee 玉虚论道 2021-09-15 14:36:21 +08:00
xuexinpeng 96df236aa1 玉虚论道 2021-09-14 19:27:08 +08:00
yuanshuai 0d7c337ced 【四象心法】添加技能属性加成 2021-09-14 11:36:38 +08:00
xuexinpeng d6ffd5e348 玉虚论道第一版 2021-09-11 21:14:25 +08:00
yuanshuai 5e3b41c2df 表字段添加 2021-09-10 14:39:31 +08:00
yuanshuai e819858d77 Revert "四象心法"
This reverts commit 9178024c9f.
2021-09-09 20:25:53 +08:00
yuanshuai 9178024c9f 四象心法 2021-09-09 16:58:28 +08:00
xuexinpeng c367fce248 玉虚论道 2021-09-06 11:33:10 +08:00
jiahuiwen 0cf0f239d0 宝物品质 宝物精炼 轩辕宝境 礼包推送 2021-09-02 13:46:53 +08:00
duhui 19c3a04559 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2 2021-09-02 15:17:00 +08:00
duhui a298850c48 网页支付 2021-08-25 17:32:14 +08:00
duhui 3b843d949b 四灵代码合并 2021-08-31 11:56:33 +08:00
xuexinpeng 2aa6058f2e 首发预约邮件 2021-08-16 16:04:36 +08:00
duhui c5debd98ad Merge branch 'master_test_gn_arena' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-07-30 18:43:07 +08:00
xuexinpeng 744a0d4e5b 【逐胜之巅优化】功能改为在开服指定天数后开启 2021-07-31 10:56:29 +08:00