Commit Graph

479 Commits (db8504e51fe6f4a29557e47f59d03fc9195ea624)

Author SHA1 Message Date
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
yuanshuai 0d7c337ced 【四象心法】添加技能属性加成 2021-09-14 11:36:38 +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
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