Commit Graph

3866 Commits (30759481473333ad508356fda8ff7217e22e9345)
 

Author SHA1 Message Date
lvxinran 41d73df618 公会副本排行 2020-08-19 09:50:37 +08:00
lilei 50f33a02c0 Merge branch 'develop_treasure' 2020-08-19 09:47:27 +08:00
lilei 2ef8972406 青龙秘宝 2020-08-19 09:47:02 +08:00
zhangshanxue bc50b90957 重连有问题 2020-08-18 22:27:30 +08:00
zhangshanxue 413f84af8a 十绝阵结算 2020-08-18 20:10:12 +08:00
lvxinran 1b70b3c73a 公会副本 2020-08-18 19:42:50 +08:00
lilei f202f73b73 青龙秘宝,工坊合成装备任务改为锻器阁合成装备 2020-08-18 17:10:06 +08:00
zhangshanxue 22aca76856 充值和数据转换 2020-08-18 16:22:38 +08:00
zhangshanxue 000b4466b3 充值和数据转换 2020-08-18 16:12:54 +08:00
lvxinran 38c3cffa54 appId加入 2020-08-21 14:22:14 +08:00
zhangshanxue cc801a8510 充值价格 2020-08-18 11:27:03 +08:00
lilei c18ac44bcf 青龙秘宝 2020-08-18 09:42:32 +08:00
zhangshanxue 024e339bc3 合服 2020-08-17 22:31:25 +08:00
zhangshanxue 90e14e4493 合服 2020-08-17 21:40:49 +08:00
lilei b797c85de6 青龙秘宝,新增任务类型 2020-08-17 19:53:26 +08:00
zhangshanxue d9bd59ea26 合服 2020-08-17 15:30:25 +08:00
lilei f73829b5d4 青龙秘宝,新增部分任务类型 2020-08-17 15:01:28 +08:00
zhangshanxue 29f85c959b 合服 2020-08-17 11:09:35 +08:00
zhangshanxue b643307e5a 合服 2020-08-17 10:26:46 +08:00
lvxinran 588e22626f 修改部分日志 2020-08-17 10:11:27 +08:00
lvxinran 237317a677 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-30 21:15:02 +08:00
lvxinran 8aaf2d698b 十绝阵邮件发奖修改 2020-08-30 21:14:49 +08:00
lvxinran bde18afb04 轩辕宝镜修改推送 2020-08-24 05:02:20 +08:00
zhangshanxue 2826ce87de 合服 2020-08-15 17:28:53 +08:00
zhangshanxue 05a1f88da3 合服 2020-08-15 15:47:51 +08:00
zhangshanxue 7c8743c71e Merge branch 'master_test_combin' of http://60.1.1.230/backend/jieling_server into master_test_combin 2020-08-15 15:41:50 +08:00
zhangshanxue 7c5c28d6a1 Merge branch 'master_test_hw' into master_test_combin 2020-08-15 15:40:46 +08:00
zhangshanxue 68aa9fc53d 合服 2020-08-15 15:25:55 +08:00
zhangshanxue 0a162ccce7 充值类型更换 2020-08-14 23:41:23 +08:00
zhangshanxue 47bfc8c339 充值类型更换 2020-08-14 23:19:12 +08:00
zhangshanxue 329cb6dcc2 充值类型更换 2020-08-14 23:18:18 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
zhangshanxue d3dc23884e 合服 2020-08-14 14:58:10 +08:00
zhangshanxue a2504adc4c 合服 2020-08-14 14:30:31 +08:00
zhangshanxue e81eeb4cf6 英雄创建类型 2020-08-14 14:10:56 +08:00
lvxinran 9a25d556a2 换层清除数据 2020-08-23 07:03:47 +08:00
lvxinran 3b384d0698 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-23 07:02:32 +08:00
lvxinran c0126ead43 线程加入try catch 2020-08-23 07:02:27 +08:00
lvxinran 20a0adb7fe 森罗环境 小怪计血量 2020-08-23 07:02:07 +08:00
lvxinran a8087e7b84 森罗幻境重置商人 2020-08-22 05:02:27 +08:00
lvxinran 7c9a366149 限时兑换修改 2020-08-21 11:42:31 +08:00
lvxinran dbfb8f4110 限时兑换活动物品掉落修改 2020-08-21 11:30:47 +08:00
lilei 517f156037 每日签到宝箱 2020-08-14 09:39:38 +08:00
zhangshanxue ca65ff8689 合服 2020-08-13 21:44:36 +08:00
zhangshanxue 60abb970a9 Merge branch 'master' into master_test_combin
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-08-13 19:28:39 +08:00
zhangshanxue cbde195205 合服 2020-08-13 19:26:18 +08:00
zhangshanxue c36c3abdde 英雄置换 2020-08-13 16:53:56 +08:00
lvxinran eff5b8a1f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 06:21:36 +08:00
lvxinran 315ef31145 车迟斗法打点修改 2020-08-17 06:21:31 +08:00
lvxinran 19ee0348b9 合成英雄修改 2020-08-17 05:36:19 +08:00