Commit Graph

5225 Commits (e086327b3e847d12a334e865ba4264fd3397be83)
 

Author SHA1 Message Date
duhui dc2c2ccd99 心愿bug处理 2021-06-30 14:22:43 +08:00
duhui fb6166b202 Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-06-30 13:39:19 +08:00
duhui 2b2ce7ea7f 线上日志热更 2021-06-30 13:39:07 +08:00
duhui 3f1ff48f3a 心愿抽卡完善 2021-06-30 11:40:37 +08:00
xuexinpeng c48bf9a268 Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java
2021-06-30 10:41:46 +08:00
lvxinran d72acbcea7 奖池修改 2021-07-02 20:19:33 +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 abc3321c6b 山河试炼注释 暂时不上 2021-06-30 10:31:55 +08:00
duhui a18cdcf1e5 心愿抽卡功能提交 2021-06-30 09:47:49 +08:00
xuexinpeng d6cf251701 山河社稷埋点 2021-06-29 14:16:23 +08:00
xuexinpeng 937cc3d235 山河埋点数据 2021-06-29 11:36:25 +08:00
duhui 24c3c32bb6 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:50:43 +08:00
duhui b7d90178ee 战报功能优化 2021-06-28 11:50:12 +08:00
xuexinpeng 5df1ef37d6 站内信 2021-06-28 11:32:17 +08:00
duhui 7cdd1afd84 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:09:56 +08:00
duhui abec4c1411 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:02:11 +08:00
duhui b3a35321d6 活动非空验证 2021-06-28 10:46:27 +08:00
duhui d9e4e29bb6 惊喜礼盒,bug处理 2021-06-27 22:59:52 +08:00
lvxinran e0568b2717 巅峰赛竞猜币换成邮件转换 2021-06-26 14:04:01 +08:00
mengchengzhen 0711bfd752 天眼log 2021-06-24 11:49:52 +08:00
mengchengzhen 611dc9cdc8 天眼log 2021-06-24 11:24:03 +08:00
mengchengzhen ff2bb3013b 福利红包会长新人红包 2021-06-23 16:17:47 +08:00
xuexinpeng 7331168ef5 onlineUserReport五分钟上报修改 2021-06-23 15:23:48 +08:00
xuexinpeng 33bcd9be80 appid暂时修改 2021-06-23 11:53:57 +08:00
duhui a660a1b5bf 扶持发奖 2021-06-22 17:39:47 +08:00
duhui 95be325af7 扶持发奖 2021-06-22 17:37:51 +08:00
lvxinran 0743dde166 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-21 20:29:15 +08:00
mengchengzhen e281e93223 福利红包离开公会优化 2021-06-21 18:49:18 +08:00
mengchengzhen d32845a602 福利红包优化 2021-06-21 17:46:59 +08:00
mengchengzhen 1413a7ba82 热更福利红包工会2Jbug 2021-06-21 16:56:54 +08:00
mengchengzhen 66e33baa24 福利红包优化 2021-06-21 16:23:17 +08:00
lvxinran 6a08e5edd1 福利红包日志 2021-06-21 16:01:02 +08:00
mengchengzhen a98918bdf6 福利红包 2021-06-21 11:23:19 +08:00
xuexinpeng b042a9c7a4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-19 16:20:03 +08:00
lvxinran 216c3e2a94 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-24 17:01:14 +08:00
xuexinpeng 186fc06156 hardstageBuff表改动相关注释 2021-06-19 16:17:41 +08:00
xuexinpeng b2ec86a39d 策划hardstageBuff 改表需求 2021-06-19 15:57:02 +08:00
mengchengzhen 22b776da9b 旧红包bug 2021-06-22 18:50:58 +08:00
mengchengzhen 4bed1f51f9 升星活动 2021-06-22 18:21:50 +08:00
mengchengzhen 04001f09b6 升星活动 2021-06-22 16:30:58 +08:00
lvxinran 9baf176021 巅峰赛ErrorCode添加,日志添加 2021-06-23 15:25:50 +08:00
duhui 62f880ce59 惊喜礼盒,开启天数 2021-06-18 13:55:35 +08:00
lvxinran 049908d67d 报错日志 2021-06-18 13:01:14 +08:00
duhui bae043a10a 惊喜礼盒,bug修改 2021-06-18 11:01:16 +08:00
mengchengzhen 6cd02d8979 新活动 2021-06-22 10:41:33 +08:00
mengchengzhen 9193d8b6da Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-22 10:40:03 +08:00
mengchengzhen 0f6bc679c6 礼包代码优化 2021-06-22 10:35:06 +08:00
duhui 04f0303672 惊喜礼盒, 活动区服类型,获取时间 2021-06-18 10:32:45 +08:00