Commit Graph

1624 Commits (3e00a693da4e772c94925440659044dd73fc4132)

Author SHA1 Message Date
zhangshanxue d23e966a9f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:35:14 +08:00
zhangshanxue cff3b4acb8 活动事件 2019-08-07 18:35:10 +08:00
lvxinran 6e52113c19 表类提交 2019-08-07 18:18:24 +08:00
lvxinran 9fa5bf9b39 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:17:31 +08:00
lvxinran bf01f7443e 修改 2019-08-07 18:17:27 +08:00
wangyuan c9e4122464 check 2019-08-07 18:04:14 +08:00
zhangshanxue d3636636ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 17:54:24 +08:00
zhangshanxue 7d0388eaed 达人排行榜榜单调整 连续充值周期更新 2019-08-07 17:54:09 +08:00
wangyuan 4105d7359c 活动邮件 2019-08-07 17:32:51 +08:00
wangyuan a1db43c4e3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-07 16:30:39 +08:00
wangyuan b87d7a370e fix 合成英雄 2019-08-07 16:30:09 +08:00
lvxinran 4471d842e1 无尽开启地图 2019-08-07 15:35:34 +08:00
wangyuan 89ffd40206 fix seven time 2019-08-07 14:23:25 +08:00
wangyuan afda3018b4 fix misison 2019-08-07 14:21:09 +08:00
wangyuan 411ce97154 fix map 2019-08-07 13:55:37 +08:00
lvxinran 88d2cea85d 第一编队修改 2019-08-07 12:12:27 +08:00
zhangshanxue 3ea863dc2f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 09:55:28 +08:00
zhangshanxue fe7dabbcff 达人排行发奖 2019-08-10 09:55:24 +08:00
lvxinran 17f30d751a 战斗同步 2019-08-06 20:55:47 +08:00
wangyuan 5855a00391 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 20:27:51 +08:00
wangyuan af0a3f1228 领取奖励 & 修改地图坐标点 2019-08-06 20:27:08 +08:00
lvxinran 9f9166a64b 17功绩 2019-08-06 18:28:09 +08:00
lvxinran 69ca68785c 功绩21 2019-08-06 18:03:16 +08:00
lvxinran bac1c1b85d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 18:01:51 +08:00
lvxinran 9f91ab0331 功绩类型修改 2019-08-06 18:01:47 +08:00
zhangshanxue f3747d0bad Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 17:40:28 +08:00
wangyuan 833b0ae6ae 宗门时间 2019-08-06 17:36:45 +08:00
zhangshanxue d5352f79a7 连续充值 2019-08-06 17:31:59 +08:00
zhangshanxue 797a484250 达人排行榜奖励 2019-08-06 15:28:15 +08:00
wangyuan 24a5ada002 fix task hero type 2019-08-06 15:00:06 +08:00
wangyuan 294cdd8334 修复误删 2019-08-06 14:51:27 +08:00
lvxinran db1471aa13 无尽副本修改 2019-08-06 14:10:17 +08:00
wangyuan 6869a65f46 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 13:56:31 +08:00
wangyuan 2105ba3e50 mission 2019-08-06 13:56:17 +08:00
lvxinran 9c6e93016d 出图清除无尽数据 2019-08-06 11:51:39 +08:00
lvxinran d349910c40 无尽副本最后数据修改 2019-08-06 11:40:04 +08:00
zhangshanxue 61f49b7114 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	.gitignore
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2019-08-06 11:25:51 +08:00
lvxinran 564ee54d2c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 11:25:26 +08:00
lvxinran 25eaa56501 出图修改 2019-08-06 11:25:22 +08:00
zhangshanxue d0e36989e4 达人 每日首冲 连续充值 签到 累计充值 2019-08-06 11:20:46 +08:00
zhangshanxue ad95f83eee price err 2019-08-07 10:28:41 +08:00
wangyuan ac287305bb Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:44:20 +08:00
wangyuan 5988241e6c 周卡 2019-08-06 10:43:36 +08:00
lvxinran f9febb2dcd 获取第一编队修改 2019-08-06 10:36:21 +08:00
lvxinran 30abfc1d1c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 10:30:48 +08:00
lvxinran 3558ad8ec0 无尽副本出图 2019-08-06 10:30:43 +08:00
wangyuan bb3464a4fa Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:23:53 +08:00
wangyuan 5072341a07 guild 2019-08-06 10:22:57 +08:00
lvxinran c647d31458 出图修改 2019-08-05 17:24:50 +08:00
wangyuan 3486dbe98c giftgoods 2019-08-05 17:07:01 +08:00
zhangshanxue add03799c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2019-08-05 17:02:29 +08:00
zhangshanxue 919163f51b 每日首冲和累计充值天数 2019-08-05 17:00:06 +08:00
wangyuan b4e7cf3e5d vip level task 2019-08-05 15:58:48 +08:00
lvxinran 8f588acb05 无尽副本修改 2019-08-05 15:43:29 +08:00
lvxinran 981c3f163a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-05 15:41:08 +08:00
wangyuan f52c4f5462 fix activity flush five 2019-08-05 15:20:12 +08:00
lvxinran fc9e2c54fe 无尽副本修改 2019-08-05 15:09:18 +08:00
wangyuan 7f5ccf558b 活动掉落 2019-08-05 15:07:47 +08:00
wangyuan 54c4f06df1 fix new mission 2019-08-05 11:30:58 +08:00
wangyuan 9cb5277436 new task 2019-08-05 11:27:13 +08:00
wangyuan f90bbee15a 公会 2019-08-05 10:02:29 +08:00
lvxinran bfa231635c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 16:51:21 +08:00
lvxinran f2556361e7 定时 2019-08-03 16:51:12 +08:00
wangyuan eef97e054a fix family & task 2019-08-03 16:49:47 +08:00
wangyuan 703a7686b9 离开公会 2019-08-03 16:15:38 +08:00
lvxinran e5110e48e5 无尽副本,自动回复提交 2019-08-03 15:46:23 +08:00
wangyuan f187a5043b beginner task 2019-08-03 14:59:20 +08:00
zhangshanxue dba41c51a3 活动初始化和漏刷 2019-08-03 11:02:03 +08:00
zhangshanxue b05268b766 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 09:59:45 +08:00
zhangshanxue 3167653418 战力排行 2019-08-03 09:59:18 +08:00
zhangshanxue 5f5c7ba5f1 排行榜 2019-08-02 18:30:13 +08:00
lvxinran 27e3ec0380 无尽副本修改 2019-08-02 14:57:56 +08:00
zhangshanxue f4665ee4c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-02 13:35:33 +08:00
zhangshanxue 3edd6e7ebc 战力排行 2019-08-02 13:34:37 +08:00
wangyuan dfc0ca056c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-02 09:59:09 +08:00
wangyuan d8ce89bd38 family 2019-08-02 09:57:01 +08:00
lvxinran e045241e91 标志修改 2019-08-01 20:57:41 +08:00
lvxinran b3f597083a 设置无尽副本点 2019-08-01 20:45:20 +08:00
lvxinran ab071737d5 代码提交 2019-08-01 18:37:46 +08:00
lvxinran ef94caf44e 无尽副本提交 2019-08-01 18:27:17 +08:00
lvxinran 8e1a7efd45 无尽副本提交 2019-08-01 18:23:49 +08:00
wangyuan 54407dabe6 fix guild 2019-08-01 18:16:03 +08:00
zhangshanxue 0f34c27c48 招财猫 2019-08-01 17:33:30 +08:00
zhangshanxue 75555828e4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-01 14:45:16 +08:00
zhangshanxue 63b7f3ee86 战力排行 2019-08-01 14:15:19 +08:00
wangyuan 7e5eb8ece8 fix map 2019-08-01 11:20:09 +08:00
wangyuan 7131ed8204 s table 2019-08-01 11:11:56 +08:00
wangyuan be43c5af87 fix guild 2019-08-01 11:10:41 +08:00
wangyuan cf006d2184 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-01 10:10:28 +08:00
wangyuan acffeefb07 guild & fix map 2019-08-01 10:09:19 +08:00
zhangshanxue 6a6ca5451c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2019-07-31 18:20:40 +08:00
wangyuan fdc0501110 activity 2019-07-31 17:48:16 +08:00
zhangshanxue b5e8d25658 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
2019-07-31 17:28:10 +08:00
zhangshanxue 3943db124d 招财猫 2019-07-31 17:15:06 +08:00
lvxinran 52f8538e99 gamesetting修改 2019-07-31 10:51:28 +08:00
wangyuan 84c70e7b10 fxi map & serven happy 2019-07-31 10:29:23 +08:00
wangyuan 0ab956e693 急速探险花费道具 2019-07-30 20:05:37 +08:00
wangyuan b34c233a21 fix treasure 2019-07-30 19:49:46 +08:00
wangyuan 6421cedac6 kt upload fix 2019-07-30 18:10:14 +08:00
wangyuan 7bb5acac24 update activity indication 2019-07-30 17:51:04 +08:00
wangyuan 830fc18252 map 2019-07-30 14:33:57 +08:00
wangyuan b5873e24c4 条件类型7 & 跳转类型11 2019-07-30 14:05:55 +08:00
lvxinran 618704add2 45不推任务 2019-07-30 11:46:40 +08:00
wangyuan 982d97cd84 kt parm 2019-07-30 11:18:09 +08:00
lvxinran 4be1818716 图内被动技能清除 2019-07-30 09:58:45 +08:00
wangyuan abd1e46d6e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-29 20:20:36 +08:00
wangyuan 45e38873d9 upload 2019-07-29 19:42:57 +08:00
lvxinran c21467a109 埋点 2019-07-29 19:42:16 +08:00
wangyuan 5851bfde6d createure 2019-07-29 17:31:06 +08:00
lvxinran 69c20ea03c 行为类型提交,试炼副本时间修改 2019-07-29 14:48:10 +08:00
wangyuan 7f384fc087 mapmission 2019-07-29 10:02:24 +08:00
lvxinran 5ce990e6ff 45behaivor 2019-07-29 09:46:02 +08:00
wangyuan 10dfabfd50 arena mail 2019-07-26 18:33:27 +08:00
wangyuan 65d65a597b treasure 2019-07-26 17:27:39 +08:00
wangyuan 09dcb7ffe4 arena score 2019-07-26 17:04:07 +08:00
wangyuan 5950e80017 mission view 2019-07-26 16:43:23 +08:00
lvxinran b3911c9734 behavior7 2019-07-26 16:27:35 +08:00
lvxinran 7622bf801f 类型7 2019-07-26 15:50:06 +08:00
lvxinran b32a06a43e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-26 14:41:55 +08:00
lvxinran 3bb3477357 孙龙宝藏GM 2019-07-26 14:41:47 +08:00
wangyuan f74badcd6d robot force 2019-07-26 14:29:31 +08:00
wangyuan 3347c2f92a pokemon force 2019-07-26 13:35:16 +08:00
lvxinran 2ec53a6b2d 功绩21修改 2019-07-26 11:27:53 +08:00
lvxinran 1b0e077f75 新的功绩类型21 2019-07-26 11:09:39 +08:00
lvxinran 13d00e36d0 云梦祈福刷新修改 2019-07-26 09:53:46 +08:00
lvxinran 9bf412c5c4 云梦祈福修改 2019-07-25 20:37:36 +08:00
wangyuan 2237a35f82 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-25 19:34:37 +08:00
wangyuan cbcb8ae72e time recovery 2019-07-25 19:34:21 +08:00
lvxinran 4b96a91122 装备锁定解锁 2019-07-25 17:46:09 +08:00
lvxinran 00f9935ef8 云梦祈福常量修改 2019-07-25 16:37:35 +08:00
lvxinran 7ff90d3a74 时间修改 2019-07-25 15:44:10 +08:00
wangyuan 77d4d2c791 star reward 2019-07-25 15:22:11 +08:00
wangyuan 2cb68aebbb match 2019-07-25 15:05:30 +08:00
wangyuan f40ed6ea41 精英怪冰冻时间 2019-07-25 13:48:03 +08:00
wangyuan 15a12ec5ca 修复活动数据没有入库 2019-07-25 11:43:33 +08:00
lvxinran 08153b9bfd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-25 11:08:09 +08:00
lvxinran 3d9ee7400a 头像框修改 2019-07-25 11:08:05 +08:00
wangyuan faf64f5339 mission 2019-07-25 11:00:12 +08:00
wangyuan 172ddbbd95 删除红点 2019-07-25 10:29:27 +08:00
wangyuan 212d34ca3f treasure 2019-07-25 10:01:38 +08:00
wangyuan 2f628f1b10 7 2019-07-24 21:56:21 +08:00
lvxinran 668635d0ef 云梦祈福初始化 2019-07-24 21:56:04 +08:00
wangyuan 538f965b32 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-24 20:47:25 +08:00
wangyuan 12448b77c2 item flush 2019-07-24 20:47:11 +08:00
lvxinran e5b63f835e 提交 2019-07-24 19:45:24 +08:00
wangyuan f7f0b30645 item recovey 2019-07-24 19:42:10 +08:00
wangyuan 74aadb0f82 force 2019-07-24 17:51:33 +08:00
lvxinran 9c0b47c8f9 功绩修改 2019-07-24 16:10:53 +08:00
wangyuan 525bf2eafe push mission 2019-07-24 15:49:20 +08:00
wangyuan 5fa727711c 装备邮件 2019-07-24 15:39:13 +08:00
wangyuan e772fe4630 delete log 2019-07-24 15:27:18 +08:00
wangyuan 306e57a1de 公式修改 2019-07-24 15:25:34 +08:00
wangyuan b357fa2aa2 mission 2019-07-24 15:14:14 +08:00
wangyuan 557ac14709 teamid 2019-07-24 15:02:14 +08:00
wangyuan e1b0b71d7f treasure 2019-07-24 15:00:26 +08:00
wangyuan b89aa9a2a0 fix map 2019-07-24 14:43:33 +08:00
wangyuan c1d9f8fdb0 fix 2019-07-24 14:25:48 +08:00
wangyuan 9943d08dba fix hero 2019-07-24 14:24:07 +08:00
wangyuan eca6706f75 item 2019-07-24 13:52:07 +08:00
wangyuan 672b7990c3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-07-24 13:47:27 +08:00
wangyuan 030e0f728e mission & store 2019-07-24 13:46:40 +08:00
lvxinran 4fe6793c59 阵营光环当前生命值修复 2019-07-24 13:42:30 +08:00
lvxinran db732001aa 44行为类型 2019-07-23 21:52:07 +08:00
lvxinran d677a1066c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-23 21:01:46 +08:00
lvxinran d5c4168295 刷新次数修改 2019-07-23 21:01:41 +08:00
wangyuan 26270ae6da Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 20:35:29 +08:00
wangyuan 3e6b25bb3d 孙龙的任务 2019-07-23 20:35:15 +08:00
lvxinran f96932c50a 元素共鸣报错修改 2019-07-23 18:04:16 +08:00
wangyuan 34dac1a17f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 18:03:01 +08:00
wangyuan 4c12b893da mission 2019-07-23 18:00:46 +08:00
lvxinran dda168c324 云梦祈福逻辑提交 2019-07-23 17:41:48 +08:00
lvxinran ea89394c70 云梦祈福结构修改 2019-07-23 11:18:44 +08:00
wangyuan 060e554809 item fresh 2019-07-23 10:01:43 +08:00
wangyuan 4a9d1812af storelogic 2019-07-22 18:18:47 +08:00
wangyuan fbcee502b6 buy goods 2019-07-22 17:42:49 +08:00
wangyuan f814586624 recharge 2019-07-25 07:16:34 +08:00
lvxinran cfbc1eb00e 光环提交 2019-07-22 16:13:15 +08:00
lvxinran 3e70a0384c 阵营光环上线 2019-07-22 15:53:50 +08:00
lvxinran b3db193d36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-22 15:33:49 +08:00
wangyuan 869c9ec15c conf 2019-07-25 06:08:30 +08:00
wangyuan 36acef4ac1 conf 2019-07-25 05:45:58 +08:00
wangyuan 2e49142f07 mision 2019-07-25 05:08:59 +08:00
wangyuan c113ff4481 fix 2019-07-23 13:51:43 +08:00
lvxinran 3b386e47b5 设置teamId 2019-07-22 15:33:45 +08:00
wangyuan e90e414522 buy goods 2019-07-22 13:45:47 +08:00
wangyuan 8ba85e72fc goods 2019-07-22 11:58:41 +08:00
wangyuan f6e9d89873 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-22 11:58:17 +08:00
wangyuan 4cac791acb mail 2019-07-22 11:36:58 +08:00
lvxinran 352472345b 12点事件,头像框提交 2019-07-22 11:11:06 +08:00
wangyuan a5438e7e5c fix goods 2019-07-22 10:32:19 +08:00
wangyuan cf00d2c7de Merge branch 'online1.0' 2019-07-22 10:19:16 +08:00
wangyuan a142e3d3d8 fix goods 2019-07-22 10:16:47 +08:00
wangyuan 5dde031242 blood fix 2019-07-19 16:59:35 +08:00
wangyuan 3b950da80e fix conf 2019-07-19 15:46:09 +08:00
wangyuan a8104095d0 扫荡要加个精英怪信息 2019-07-19 14:53:35 +08:00
wangyuan dd612ca743 秘境奖励首次免费领取 2019-07-19 13:33:41 +08:00
wangyuan c70999553a fix activity 2019-07-18 19:17:36 +08:00
wangyuan d9f193c552 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2019-07-18 19:06:35 +08:00
wangyuan 416f0153b4 gift & battle 2019-07-18 19:04:04 +08:00
lvxinran 35cacefab0 修改 2019-07-18 18:43:15 +08:00
lvxinran 124b7b5e0f 头像框修改、初始化提交 2019-07-18 17:46:17 +08:00
lvxinran a25dc800dc 元素类提交 2019-07-18 12:13:19 +08:00
lvxinran f0e926a3f9 精英本功绩修改,元素共鸣代码提交 2019-07-17 20:15:48 +08:00
wangyuan bed7997dcc Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-17 15:15:41 +08:00
wangyuan eab4d85aa3 礼包 & 血战 2019-07-17 15:15:29 +08:00
lvxinran a4bc032cf2 试炼层级奖励领取 2019-07-17 10:21:11 +08:00
lvxinran 8381fd8008 装备图鉴 2019-07-17 10:14:03 +08:00
wangyuan 07ddd2c06a skip fight snap 2019-07-16 20:24:33 +08:00
wangyuan 885bdebaff match & drop hero per 2019-07-16 18:31:32 +08:00
lvxinran 195535617e 商店修改、表格结构修改 2019-07-16 18:07:23 +08:00
lvxinran bbf6b94cba 功绩类新添加、图鉴添加 2019-07-16 17:39:34 +08:00
wangyuan eaa9ffcd43 血战 2019-07-16 15:21:13 +08:00
wangyuan 96bf0a392e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-16 13:40:17 +08:00
wangyuan 63e131e40f 云游商店 2019-07-16 13:40:05 +08:00
lvxinran aa5d85b68a 战斗逻辑错误修改 2019-07-16 11:26:54 +08:00
wangyuan 63d3168ffa 抽卡送宝箱 2019-07-16 10:58:11 +08:00
wangyuan 405da77bb0 根据数组索引就行随机 2019-07-15 17:41:36 +08:00
wangyuan 28914e672c fix 7 2019-07-15 17:29:51 +08:00
lvxinran 89affcf6c1 位置修改 2019-07-15 17:20:05 +08:00
gaojie 63a9dcbf5e fix 2019-07-15 16:59:48 +08:00
lvxinran c919681cc2 无关注释删除 2019-07-15 16:37:43 +08:00
lvxinran 8e727965dd 精英本扫荡 2019-07-15 16:34:26 +08:00
wangyuan bbbd5d2344 Merge branch 'online1.0' 2019-07-15 15:16:45 +08:00
wangyuan 36b1071efc 行为类型7 2019-07-15 14:35:38 +08:00
wangyuan 534886c920 Merge branch 'online1.0' 2019-07-15 11:00:49 +08:00
wangyuan fb2b2ff379 修改计算 2019-07-15 10:41:36 +08:00
lvxinran 4dfc832ca2 Merge branch 'online1.0' 2019-07-12 18:26:07 +08:00
gaojie 6add54c66b 好友推送状态 2019-07-12 17:29:49 +08:00
gaojie 55c7f19b45 Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0 2019-07-12 16:54:31 +08:00
gaojie 934185db65 删除好友保留之前赠送体力状态 2019-07-12 16:54:27 +08:00
gaojie d73d77c28e 好友赠送体力 2019-07-13 11:56:36 +08:00
wangyuan 956e689396 mission 2019-07-12 16:48:38 +08:00
lvxinran 84654cb0fd Merge branch 'online1.0' 2019-07-12 14:45:56 +08:00
wangyuan 242be06ec4 fix daily mission 2019-07-12 14:44:31 +08:00
lvxinran 6fb6390d60 随机数修改 2019-07-12 13:33:56 +08:00
lvxinran 24eca20b07 功绩事件类型添加 2019-07-12 11:21:33 +08:00
lvxinran 98e2309523 装备特性随机提交 2019-07-12 10:19:23 +08:00
lvxinran 3b2ebae2c5 试炼最高层处理 2019-07-11 17:12:11 +08:00
wangyuan e88a8fd3b5 thread 2019-07-15 16:50:54 +08:00
lvxinran 1e572b1142 日志修改 2019-07-11 15:14:46 +08:00
lvxinran 9c1533621f 试炼重置修改、排行榜协议修改 2019-07-11 14:50:57 +08:00
lvxinran 69da7e98ca 试炼排行榜修改 2019-07-11 11:02:33 +08:00
wangyuan 71e36e025d red & fix vip mission 2019-07-11 10:57:13 +08:00
lvxinran 628ff1a05c 删除无关注释 2019-07-11 10:36:04 +08:00
lvxinran 9b051399b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-11 10:06:09 +08:00
lvxinran 35c69631b2 试炼排行榜实现 2019-07-11 10:06:05 +08:00
gaojie 745ddbeadf 统一线程处理数据 2019-07-11 10:02:18 +08:00
wangyuan 2d11d1485e red point 2019-07-10 19:48:45 +08:00
gaojie bdc04f8046 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-10 15:21:57 +08:00
gaojie cbd0e4d78c 请求所需的时间 2019-07-10 15:21:13 +08:00