Commit Graph

4648 Commits (66bea3f2c5ce9d2f7005b4ef7328ea4dacee2d17)
 

Author SHA1 Message Date
lvxinran 79902665e7 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-19 14:55:16 +08:00
duhui b1cc76ed6a 鸿蒙阵合并后修改 2021-02-19 11:29:56 +08:00
duhui 32b5f8d8fd Merge branch 'master_test_hw' into master_test_hw_hongmeng 2021-02-19 11:06:29 +08:00
lvxinran 860397c890 发奖修改 2021-02-05 15:00:12 +08:00
lvxinran a4077e200c 大闹天宫神将空位逻辑修改 2021-02-05 13:58:22 +08:00
duhui 6ed7ee4b2f 挂机奖励,结束时间,内存修改 2021-02-02 11:29:56 +08:00
duhui 751421144b 会长转移,空指针修改 2021-02-02 10:21:12 +08:00
duhui 8086106b52 挂机奖励修改,随机改一次一次算 2021-02-02 11:13:43 +08:00
duhui b363301111 Merge branch 'dh_dev_guaji' into master_test_hw 2021-02-01 22:55:14 +08:00
lvxinran 3c24ef97fc 删除 无用打印 2021-02-01 16:52:17 +08:00
lvxinran 5ed63868e5 工会邮件内容修改 2021-01-31 14:49:05 +08:00
lvxinran 5d9812cff2 兑换码时间控制 2021-01-31 13:55:57 +08:00
duhui 508eda57d8 挂机奖励修改 2021-01-29 10:52:56 +08:00
lvxinran f72e134f0f 抽卡逻辑 2021-01-28 17:53:22 +08:00
lvxinran a4dca69532 抽卡生效次数校验修改 2021-01-28 17:19:08 +08:00
lvxinran 1b2e00e478 修改抽卡逻辑 2021-01-28 17:05:37 +08:00
lvxinran 50824acdd9 抽卡计次修改 2021-01-28 16:41:54 +08:00
duhui 2fb09e6844 轩辕宝镜和逍遥游埋点 2021-01-28 15:42:27 +08:00
lvxinran 674c00ff98 工会关联表 2021-01-28 15:33:57 +08:00
lvxinran e4b32a7b03 加入在线判断逻辑 2021-02-24 01:23:23 +08:00
duhui 56048956ea 日常任务,隔天在线完成优化 2021-01-28 10:00:33 +08:00
lvxinran 2dbe80f3a5 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-27 16:19:38 +08:00
lvxinran f8e47dd12b 公会检测修改 2021-01-27 16:19:33 +08:00
duhui 7cb1072126 邮件问题状态修改,只保留1和2,1:成功,2:背包已满 2021-01-27 16:00:03 +08:00
duhui c09cb66fe0 天宫密保时间未到计算积分问题处理 2021-01-27 15:53:57 +08:00
lvxinran 633f531425 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-01-27 15:22:26 +08:00
lvxinran ef472bdbd2 会长转移初版 2021-01-27 15:22:10 +08:00
lvxinran 47c4bd6818 空指针修改 2021-01-25 21:22:24 +08:00
duhui d736b60c24 邮件bug 2021-01-25 18:09:40 +08:00
duhui 07dbb37262 一键领取邮件bug处理 2021-01-25 16:04:16 +08:00
lvxinran 4a90d1fa46 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-22 18:11:35 +08:00
lvxinran 9a5d7ba469 战斗同步 2021-01-22 18:11:30 +08:00
duhui b17a248bb8 0127连续签到宝箱重置 2021-01-22 16:33:33 +08:00
duhui fcbf678d97 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-22 16:18:14 +08:00
duhui 9317e9ea24 0127挂机奖励2.0 2021-01-22 16:18:03 +08:00
lvxinran ea69d5b7e9 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-22 15:32:44 +08:00
lvxinran 18b4fdfb9c 上报战斗修改 2021-01-22 15:32:37 +08:00
lvxinran 0ae007f55f 埋点修改 2021-01-22 15:32:27 +08:00
duhui 0a6a81c40c 新将来袭战斗超回合 2021-01-22 15:13:01 +08:00
duhui b019334012 0127连续签到推送前端显示 2021-01-22 14:09:07 +08:00
duhui 9eca089593 空指针修改 2021-01-22 11:26:55 +08:00
lvxinran 5bd09cb7c7 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-21 16:47:28 +08:00
lvxinran feb641028c 配置提交 2021-01-21 16:00:44 +08:00
duhui 8bf9552c0c 挂机,不足一次的奖励随机 2021-01-21 14:37:17 +08:00
lvxinran 6e396124ec Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-01-21 11:03:35 +08:00
lvxinran ae79e8d410 扭转乾坤活动提交 2021-01-21 11:03:31 +08:00
lvxinran ea3f3b6628 忽略配置文件 2021-01-21 11:02:58 +08:00
lvxinran 816847c112 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-09 20:13:03 +08:00
lvxinran 4c0e63ddaf 公会boss保底 2021-02-09 20:12:54 +08:00
duhui 91bd1096bd 0127极速探索奖励计算 2021-01-21 11:01:16 +08:00