Commit Graph

1711 Commits (4b3435799d64dc2077d3b106c464ff1db0deb17a)
 

Author SHA1 Message Date
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
zhangshanxue 0e99e8cd5b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-05 17:27:57 +08:00
zhangshanxue 7555d9a08c 忽略配置 2019-08-05 17:27:52 +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 72ac6a9749 删除配置表 2019-08-05 11:29:31 +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 741a182c9a 表格修改 2019-08-03 17:14:19 +08:00
lvxinran 00a2089e6f vip权限修改 2019-08-03 17:05:41 +08:00
lvxinran a055b20adf 提交 2019-08-03 17:05:14 +08:00
lvxinran 13c0173345 配置提交 2019-08-03 16:52:16 +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