Commit Graph

1741 Commits (02e214f754d52f394a11db8a2f546aa753a7ab72)
 

Author SHA1 Message Date
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
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