Commit Graph

536 Commits (46e112e56a2d6b1495aced53d19063d614bebfe5)

Author SHA1 Message Date
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
xuexinpeng a1aaf10802 【逐胜之巅优化】功能改为在开服指定天数后开启 2021-07-29 16:02:59 +08:00
duhui d51a4715e0 跨发,十绝阵功能合并 2021-07-28 14:02:13 +08:00
lvxinran 94f9847844 合并分支 2021-07-31 00:01:41 +08:00
duhui b037147e07 记录版本号和重启时间 2021-07-23 13:55:12 +08:00
lvxinran 9a0f8b6395 称号添加 2021-08-01 00:28:27 +08:00
duhui 18df433074 心愿抽卡, 优化提交 2021-07-21 18:21:15 +08:00
lvxinran c414784114 删除多余代码 2021-07-21 13:59:02 +08:00
lvxinran 88871d789a Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-08-01 08:08:27 +08:00
lvxinran b6accfb599 跨服等级关联表,修改奖励 2021-08-01 01:12:10 +08:00
duhui 48617157b8 跨服, 十绝阵 2021-07-21 10:40:24 +08:00
lvxinran 4b641f5109 跨服修改 2021-07-18 23:57:59 +08:00
mengchengzhen 91080b333b Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-15 17:33:45 +08:00
mengchengzhen c87f0e1864 许愿魂印 2021-07-15 17:12:34 +08:00
duhui 5c69363203 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-07-15 16:33:54 +08:00
duhui 8a1b28f04e Merge branch 'dh_dev_qimendunjia' into master_test_gn
奇门遁甲协议合并
2021-07-15 16:33:44 +08:00
duhui 708cc0b718 Merge branch 'dh_dev_fund' into master_test_gn 2021-07-15 16:31:12 +08:00
duhui fd888a7141 奇门遁甲消耗 2021-07-15 16:27:08 +08:00
lvxinran 07fe5c89ed Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-15 04:34:40 +08:00
xuexinpeng af37022e38 战令调整 2021-07-14 17:18:09 +08:00
duhui a4ad63b731 超值基金活动改版 2021-07-14 17:11:57 +08:00
lvxinran ca0fd1e10a 物品获得 2021-07-14 02:31:22 +08:00
duhui 80b1659cb1 心愿抽卡功能优化 2021-07-12 17:45:07 +08:00
lvxinran 58e0f37195 无尽重置获得 2021-07-10 02:00:29 +08:00
lvxinran e086327b3e 日志打印 2021-07-08 02:37:27 +08:00
lvxinran 3294d64d30 热更修改 2021-07-08 02:33:14 +08:00
xuexinpeng 7f0131278d Merge branch 'master_test_gn' into master_test_gn_xxp 2021-08-02 00:07:28 +08:00
xuexinpeng 5fdbf0d978 飘渺之旅 2021-08-02 00:06:50 +08:00
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