Commit Graph

300 Commits (869b8400f05bdf31cf4a7de6e14a3f3dbe71301f)

Author SHA1 Message Date
zhangshanxue efb20d445e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-12 11:04:10 +08:00
lvxinran aa56fb73b7 限时抽卡预告 2019-12-13 17:19:26 +08:00
zhangshanxue 530fc08267 Task【ID1005229】【特权调整】 2019-12-12 10:59:33 +08:00
lvxinran 0d19b9d141 限时抽卡 2019-12-09 17:10:23 +08:00
wangyuan 206aae7aa3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2019-12-06 20:26:50 +08:00
lvxinran 4d4ccd4703 Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-12-08 01:28:38 +08:00
wangyuan b28d31d8ae 巅峰赛 2019-12-06 20:25:52 +08:00
lvxinran 8b0f5aa9c5 配置 2019-12-17 00:09:23 +08:00
wangyuan aaead3ecdb fix stable 2019-11-28 15:50:06 +08:00
lvxinran 2c5148e1ed Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-11-27 16:10:41 +08:00
lvxinran 3eddd7610c 战力排行榜 2019-11-27 15:43:24 +08:00
wangyuan 4f8bc6ba15 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-26 17:42:38 +08:00
wangyuan ad4a55b2ce fight opti 2019-11-26 17:41:38 +08:00
lvxinran 300e03d91a S表初始化修改 2019-11-26 10:59:33 +08:00
zhangshanxue 27d7504a0e Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 20:19:12 +08:00
zhangshanxue 28cb6035d4 五星英雄成长礼 2019-11-25 20:17:30 +08:00
lvxinran 2c35bf1b38 部分表字段初始化代码修改 2019-11-25 17:11:21 +08:00
wangyuan 8807cc06ea 保底 2019-11-25 12:10:05 +08:00
lvxinran 0e18ea70da 字段添加 2019-11-25 11:42:07 +08:00
lvxinran 3c59042b88 合并online分支 2019-11-23 14:11:20 +08:00
wangyuan bda2d610f0 activity 2019-11-24 19:42:22 +08:00
lvxinran 7cd52a347a 巅峰赛类型修改,坐骑升级修改 2019-12-17 02:30:07 +08:00
lvxinran fc7ed5bde3 坐骑、装饰代码提交 2019-11-26 00:12:32 +08:00
wangyuan bbbd0d60d7 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-22 16:41:13 +08:00
lvxinran b00ab56b99 公会改名提交 2019-12-17 22:15:06 +08:00
wangyuan db8aeac335 元素招募 & 新活动(新手福利) 2019-11-22 16:39:54 +08:00
lvxinran d786c79bf7 公会战战斗时长修改 2019-11-19 17:58:06 +08:00
lvxinran 48abd97de8 jackson修改 2019-12-10 04:01:38 +08:00
wangyuan 40611e8205 fix arena & fix mainlevel 2019-11-18 17:26:39 +08:00
zhangshanxue 203c5c8f2c 活动排行榜 2019-10-30 15:25:21 +08:00
zhangshanxue e0eca47ef0 活动配置检查 2019-10-30 14:18:22 +08:00
wangyuan b564b7ae7d componts add 2019-10-29 14:56:37 +08:00
wangyuan 6ce050cbe8 fix rank 2019-10-27 15:28:58 +08:00
wangyuan 8b0480c652 fix fight rank 2019-10-27 12:03:07 +08:00
wangyuan d1f50fddf7 fix fight hero passskill 2019-10-27 11:33:27 +08:00
lvxinran 3fad81a218 公会战安慰奖励 2019-10-24 00:11:43 +08:00
zhangshanxue bfdddc8158 异常和错误提示修改 2019-10-22 11:59:23 +08:00
wangyuan e74583c539 change hero table 2019-10-18 10:13:39 +08:00
wangyuan 8b01d62c24 fix bug 2019-10-17 16:29:14 +08:00
wangyuan 29c503412b fix mainlevel 2019-10-17 13:47:04 +08:00
zhangshanxue aa2d6d0648 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-16 11:25:07 +08:00
zhangshanxue a2ac1eaf28 跑马灯 2019-10-16 11:25:03 +08:00
lvxinran 164a3cb45f 头像提交 2019-10-17 01:00:57 +08:00
wangyuan 8f34ad884a fix activity 2019-10-15 10:22:08 +08:00
wangyuan 8a4efef55c fix open 2019-10-14 20:00:27 +08:00
wangyuan 2acbce61b4 fix store 2019-10-14 16:32:30 +08:00
wangyuan 94ac2788df change classloader 2019-10-14 15:30:13 +08:00
zhangshanxue fb33d6bdb6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2019-10-11 16:55:39 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00