Commit Graph

4682 Commits (d67a15b22c7422948c766d6e1109faa4d5da600c)

Author SHA1 Message Date
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 50d70c41f9 山河社稷图奖励数据排序 2021-06-10 16:39:08 +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
lvxinran d8b4da6473 返利等级修改 2021-06-08 16:24:38 +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 bda5f6a970 天眼封禁properties空判断 2021-06-08 14:18:08 +08:00
mengchengzhen 33cbd037da 天眼封禁参数 2021-06-08 10:42:31 +08:00
mengchengzhen 962f0641b7 天眼封禁优化 2021-06-08 10:41:51 +08:00
duhui 4de7b94119 公会副本任务添加 2021-06-09 00:06:33 +08:00
lvxinran c126a79604 合并分支 2021-06-11 14:29:54 +08:00
xuexinpeng 1b4da6512f 魔试炼任务挑战计数,但新加的扫荡功能不计数 2021-06-07 11:17:33 +08:00
lvxinran ad5b3166f7 无尽本士气值判断 2021-06-08 15:09:57 +08:00
lvxinran ad00a842af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 14:20:04 +08:00
lvxinran 5feec114b7 无尽修改 2021-06-08 14:19:59 +08:00
lvxinran ad24318ef5 无尽本报空判断 2021-06-07 19:47:04 +08:00
lvxinran da2a2b68ae mongokey初始化 2021-06-07 15:13:51 +08:00
lvxinran 9b0c7b6548 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-07 14:32:32 +08:00
lvxinran 9c18b8825b mongokey初始化 2021-06-07 14:32:27 +08:00
duhui 91529a13d1 gm扶持不进行数据上报 2021-06-04 14:10:08 +08:00
duhui e1bcb8e739 卸载称号 2021-06-02 14:25:11 +08:00
duhui b879921365 排行榜英雄信息,走鸿蒙阵 2021-06-02 11:59:53 +08:00
duhui af1c2fb537 调试日志注销 2021-06-02 11:03:21 +08:00
lvxinran e78e0141a3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 06:26:43 +08:00
lvxinran 5e1abc8359 新任务类型添加 2021-06-08 06:26:36 +08:00
lvxinran 103819f770 清除修改无用日志 2021-06-08 03:08:27 +08:00
lvxinran 0a6bc7deb2 礼包和活动关联修改 2021-06-08 01:29:18 +08:00
lvxinran 59c22520f3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 01:12:13 +08:00
lvxinran a0db1379a9 无尽生成小怪修改 2021-06-08 01:12:03 +08:00
lvxinran d21c4c9249 无用代码删除 2021-06-06 20:51:53 +08:00
lvxinran f53c48e0b0 踏碎凌霄阵容保存 2021-06-06 18:35:46 +08:00
lvxinran ea35f92275 踏碎凌霄保存阵容 2021-06-06 18:03:04 +08:00
mengchengzhen 1c6c979615 五星推送修改 2021-06-01 15:55:56 +08:00
duhui 638b4e1cbd 心愿抽奖,日志 2021-06-11 15:21:34 +08:00
duhui 19f5694fda Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-01 11:42:45 +08:00
duhui bea39c6fc7 Merge branch 'dev_dh_level' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
2021-06-01 11:42:31 +08:00
mengchengzhen 9d35d1b29d 网络不好导致充值失败的问题 2021-06-01 11:41:41 +08:00
mengchengzhen 13fb52cd3a 概率相等红包 2021-06-01 10:08:37 +08:00
mengchengzhen 3742a2aa74 新活动五星推送 2021-05-31 18:37:12 +08:00
mengchengzhen 0370572c7c 活动礼包刷新 2021-05-31 17:55:50 +08:00
duhui 20f6e75d12 修行,名字颜色 2021-05-31 16:21:26 +08:00
duhui d410438f8c 修行:名字颜色 2021-05-31 14:55:38 +08:00
mengchengzhen 2dd6b4c382 直购充值 2021-05-31 12:15:17 +08:00
lvxinran 93fca9a83b 报空修改 2021-06-03 06:34:13 +08:00
lvxinran 363262da61 天宫达人修改 2021-06-06 18:05:11 +08:00
mengchengzhen a0f97e13a6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-31 12:00:09 +08:00
mengchengzhen cfda3f3281 直充弹出 2021-05-31 11:59:56 +08:00
duhui ec6fe92d13 修行:名字颜色 2021-05-31 11:09:13 +08:00
duhui 8769f9334e 心愿抽奖,权重问题处理 2021-06-13 10:53:05 +08:00
xuexinpeng b1029ebb06 山河领奖报空处理 2021-05-29 17:01:07 +08:00
mengchengzhen 4292f3cca2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-29 16:16:30 +08:00
lvxinran 9c6a73551e 失败掉落 2021-06-06 15:59:42 +08:00
lvxinran b419bba13e Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-06 15:06:06 +08:00
lvxinran 67f8873482 踏碎凌霄排行 2021-06-06 15:05:55 +08:00
lvxinran b0da1ab24b 天宫达人修改 2021-06-05 17:36:45 +08:00
mengchengzhen e418082371 福利红包 2021-05-29 16:16:18 +08:00
mengchengzhen c29b7a25cd 福利红包 2021-05-28 18:50:18 +08:00
duhui f2e84cceac 心愿抽奖,消耗物品bug 2021-05-28 18:02:50 +08:00
mengchengzhen 74cc8d53b6 福利红包 2021-05-28 16:59:12 +08:00
duhui df2d2bb6e6 福星高照刷新问题, 心愿抽奖免费抽奖次数优化 2021-06-02 00:01:58 +08:00
xuexinpeng bf54d94986 山河社稷图一些优化 2021-05-28 14:41:28 +08:00
mengchengzhen 87463b9b15 自动封禁 2021-05-28 10:58:57 +08:00
lvxinran 7144d5fcd6 敏感词 2021-05-28 10:51:24 +08:00
duhui a8a013ec5c Merge branch 'dh_dev_activiyDraw' into master_test_gn 2021-05-28 10:10:59 +08:00
duhui ce512050b3 Merge branch 'master_test_gn' into dh_dev_activiyDraw 2021-05-28 10:10:39 +08:00
xuexinpeng c617212ba7 山河社稷 2021-05-27 23:08:20 +08:00
xuexinpeng 1f7ba67aa4 山河社稷 2021-05-31 02:17:18 +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 99cd3246f2 无尽副本最后修改 2021-07-03 00:05:36 +08:00