Commit Graph

5519 Commits (c7e2243818837a1255435b79fc06d664df5eca75)
 

Author SHA1 Message Date
duhui 16a9d3ae45 奇门遁甲协议补充 2021-06-15 11:22:06 +08:00
duhui 374cd9d58d 惊喜礼盒,逻辑修改 2021-06-12 18:07:13 +08:00
duhui 8811d07ace 惊喜盒子,状态优化 2021-06-17 14:21:20 +08:00
duhui 0b2df1665a Merge branch 'master_test_gn' into dh_dev_superbox 2021-06-17 11:16:33 +08:00
duhui eac97377b2 惊喜礼盒, 零点刷新推送 2021-06-17 11:01:57 +08:00
duhui 7923c95d11 惊喜礼盒 2021-06-17 10:53:11 +08:00
xuexinpeng 1224f67b7b 山河社稷图优化 2021-06-11 18:30:14 +08:00
lvxinran 880d92bed4 报空修改 2021-06-13 03:28:40 +08:00
mengchengzhen 003c644d6c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-11 16:32:57 +08:00
lvxinran 670e7f0f25 报空修改 2021-06-13 01:46:33 +08:00
lvxinran 645d0b00cc 工会援助日志 2021-06-13 00:11:14 +08:00
lvxinran b73f5bcefe 公会援助日志 2021-06-13 00:09:40 +08:00
lvxinran 503cae2f46 免费礼包 2021-06-12 15:37:14 +08:00
lvxinran ae78e720ff Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-12 03:33:24 +08:00
lvxinran 3628b63546 无尽小怪替换 2021-06-12 03:33:11 +08:00
mengchengzhen 4160bac4a5 福利红包 2021-06-11 16:26:37 +08:00
xuexinpeng d2bac109f6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-10 18:19:28 +08:00
xuexinpeng e150375e8c 本地礼包购买 2021-06-10 18:18:35 +08:00
mengchengzhen 5a88bd3ebb 福利红包 2021-06-10 18:05:56 +08:00
mengchengzhen cf5f93ec7d 福利红包优化 2021-06-10 17:38:56 +08:00
xuexinpeng 68a935cfb6 山河社稷图奖励排序还原 2021-06-10 17:14:59 +08:00
xuexinpeng b50ef76173 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-10 16:44:28 +08:00
xuexinpeng 50d70c41f9 山河社稷图奖励数据排序 2021-06-10 16:39:08 +08:00
lvxinran 62ddfec982 删除无用 2021-06-10 16:36:46 +08:00
xuexinpeng 4d146a767b 发货金额校验 2021-06-10 14:48:53 +08:00
lvxinran 17925142bc Merge branch 'master_test_gn' into master_test_gn_getRandomCount 2021-06-10 13:49:48 +08:00
lvxinran 5ff20eccc5 Merge branch 'master_prb_gn' into master_test_gn 2021-06-10 13:48:57 +08:00
mengchengzhen 17c5c3905f 基金优化 2021-07-10 16:00:06 +08:00
mengchengzhen 1feb54097f 基金优化 2021-07-10 15:46:00 +08:00
duhui 2b491a250d Merge branch 'dh_dev_gm2' into master_test_gn 2021-06-10 10:08:35 +08:00
duhui 32c074745b 竞技场宝箱奖励报送 2021-06-09 18:45:44 +08:00
mengchengzhen a56e74e306 新增福利红包类型 2021-06-09 17:49:36 +08:00
mengchengzhen 689913e17c 基金优化 2021-07-10 16:13:16 +08:00
duhui 04f2fef345 ccid 2021-06-09 15:47:12 +08:00
duhui 3c48a55f4f 主线动态匹配表 2021-06-09 15:43:33 +08:00
duhui f640e1c690 英雄展示,鸿蒙阵突破id 2021-06-09 14:27:06 +08:00
duhui 84969ddd22 公会援助记录,修行名字颜色问题 2021-06-09 10:57:25 +08:00
duhui d6e2f5ffdd 事件监听 2021-06-08 17:52:23 +08:00
duhui 2ee83fef78 奇门遁甲初版未测试 2021-06-08 17:49:21 +08:00
duhui 4de7b94119 公会副本任务添加 2021-06-09 00:06:33 +08:00
lvxinran c126a79604 合并分支 2021-06-11 14:29:54 +08:00
lvxinran d8b4da6473 返利等级修改 2021-06-08 16:24:38 +08:00
lvxinran d330576310 Merge branch 'master_test_gn' into master_prb_gn 2021-06-08 16:17:41 +08:00
lvxinran fb47673c1d Merge branch 'master_test_gn' into master_test_gn_returnRecharge 2021-06-08 16:16:22 +08:00
lvxinran 8e05075201 删除无用代码 2021-06-12 10:32:21 +08:00
lvxinran d6215bd42b 充值返利第二版 2021-06-11 18:37:40 +08:00
lvxinran 8a2c5bd499 返利代码第一次提交 2021-06-11 14:23:42 +08:00
lvxinran 0c06c17f5b 抽卡次数修改 2021-06-08 15:54:54 +08:00
mengchengzhen fb2d38e908 Merge branch 'master_test_gn' into master_prb_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
2021-06-08 14:21:50 +08:00
mengchengzhen 2059071520 天眼封禁参数 2021-06-12 10:57:55 +08:00