Commit Graph

3895 Commits (d1eccf88b929047287838270e8f22984ccc243cf)
 

Author SHA1 Message Date
zhangshanxue cbf8be6c16 Merge branch 'master' into master_test 2020-08-18 01:13:17 +08:00
zhangshanxue 45b304a551 战斗位置 2020-08-18 00:26:07 +08:00
lvxinran 8b47dc9a0e 删除世界等级 2020-08-05 21:22:59 +08:00
lvxinran cb38612620 排行榜长度修改 2020-08-05 18:08:14 +08:00
lvxinran c039722e01 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-29 19:11:16 +08:00
lvxinran 71d6f9ac90 登录加入设置用户名 2020-07-29 19:07:58 +08:00
lvxinran ebe7802660 注册埋点顺序修改 2020-07-28 14:18:04 +08:00
lvxinran 8d1f624561 充值上报修改 2020-07-25 20:12:39 +08:00
lvxinran 300e7e5d17 Merge branch 'master' into master_test 2020-07-25 15:14:26 +08:00
lvxinran dc3a3d8c88 Merge branch 'master' into master_test 2020-07-28 06:37:37 +08:00
lvxinran b8a630ca2d pid gid更改类型 2020-07-28 06:37:19 +08:00
lvxinran c525e3e429 英雄分解修改 提交 2020-07-29 20:11:06 +08:00
lvxinran 4c3f272357 数数打点修改 2020-07-29 20:04:00 +08:00
lvxinran 66eb4711b2 聊天后台entity对象提交 2020-07-30 02:51:09 +08:00
lvxinran abadfaece8 创角打点修改,等级提升打点修改 2020-07-30 02:50:37 +08:00
lvxinran 25f6ba0796 聊天信息管理后台代码提交 2020-07-30 02:49:32 +08:00
lvxinran 2dd2a38fe0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-29 09:01:09 +08:00
lvxinran 4a7b06553a 英雄归元修改 2020-07-29 09:01:04 +08:00
zhangshanxue 5b576dac17 开天日志关闭 2020-07-28 21:01:57 +08:00
lvxinran 2e3dcc5aa0 Merge branch 'master' into master_test 2020-07-28 05:19:47 +08:00
zhangshanxue 8de9d6ad8d Merge branch 'master' into master_test 2020-07-28 21:03:45 +08:00
lvxinran b40e4a57af 删除新手打点 2020-07-25 15:14:06 +08:00
lvxinran acf58d83f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-25 14:39:48 +08:00
zhangshanxue 20d9ebdd48 竞技场提交 2020-08-17 02:45:58 +08:00
zhangshanxue 7dd7e0523e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 02:42:05 +08:00
zhangshanxue 1bab175888 Merge branch 'master' of http://60.1.1.230/backend/jieling_server into robottest 2020-08-17 02:41:43 +08:00
lvxinran 9948be8c18 新手引导改为前端打点 2020-07-25 14:39:42 +08:00
lvxinran 4a64db267f 天宫秘宝购买刷新 2020-07-24 17:19:31 +08:00
lvxinran 4d05697aed 充值上报、新手引导埋点提交 2020-07-24 14:34:56 +08:00
lvxinran f7bdc25b3c 英雄归元、分解修改 2020-07-24 14:34:15 +08:00
lvxinran 7228d149d4 天宫秘宝时间修改 2020-07-24 14:33:37 +08:00
zhangshanxue dcfa14717c 巅峰赛提交 2020-08-14 21:24:04 +08:00
zhangshanxue 4c6fe83533 Merge branch 'master' into dev_champion
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
2020-08-11 09:23:07 +08:00
zhangshanxue cd176b3418 巅峰赛提交 2020-08-11 09:12:09 +08:00
zhangshanxue e505a2e773 幸运探宝次数更新 2020-08-02 22:15:13 +08:00
zhangshanxue f075f592f4 Merge branch 'master' into dev_champion
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-07-25 22:04:28 +08:00
zhangshanxue 5ed7417c70 巅峰赛提交 2020-07-25 22:01:51 +08:00
lvxinran 93020b9205 tapdb上报修改 2020-07-22 10:49:36 +08:00
lvxinran 4eca4ad61d gm生成英雄 突破修改 2020-07-27 14:02:34 +08:00
lvxinran bc5255167a 试炼炸弹使用次数限制 2020-07-20 18:32:41 +08:00
lvxinran 044e43c4ce 十绝阵加入公会本次校验 2020-07-20 18:32:13 +08:00
lvxinran 7c19553f53 tapDB数据打点接入 2020-07-20 18:31:11 +08:00
lvxinran 608bb0592f Merge branch 'master' into master_test 2020-07-20 10:08:46 +08:00
zhangshanxue e5cf5a39c4 灵动sdk接入 2020-07-26 19:36:06 +08:00
lvxinran e3ef96e6ea 上报目录修改 2020-07-20 10:07:55 +08:00
lvxinran 79a223b16e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-17 17:43:33 +08:00
zhangshanxue 77c0597283 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-20 14:12:17 +08:00
zhangshanxue 61c961d073 幸运探宝次数 2020-07-20 14:12:07 +08:00
zhangshanxue 3d619ccf60 上报地址修改 2020-07-20 01:06:39 +08:00
zhangshanxue 12fd0caf99 【ID1007692】【开服狂欢】升级法宝任务不能完成 功能没做 2020-07-20 00:13:10 +08:00