Commit Graph

3895 Commits (d1eccf88b929047287838270e8f22984ccc243cf)
 

Author SHA1 Message Date
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
lvxinran 0c3ddad0e4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 05:29:56 +08:00
lvxinran 502aa7ca45 时间工具方法 2020-08-17 05:29:48 +08:00
lvxinran 7d298ccfbb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 05:08:40 +08:00
lvxinran 6dfd305c73 轩辕宝镜排行发奖 2020-08-17 05:08:35 +08:00
lvxinran cf3704b456 神将合成进阶修改 2020-09-07 14:45:25 +08:00
lvxinran e371b00b38 推送修改 2020-08-26 05:58:13 +08:00
lvxinran 2ba3f2d76f 埋点报错修改 2020-08-26 05:43:23 +08:00
zhangshanxue 31274417cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 15:01:33 +08:00
zhangshanxue 993ad432b2 英雄置换 2020-08-13 15:01:25 +08:00
zhangshanxue b5295969ca 英雄置换 2020-08-13 14:34:05 +08:00
zhangshanxue 53993024b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 12:07:29 +08:00
zhangshanxue 64e4e2911b 英雄置换 2020-08-13 12:07:16 +08:00
zhangshanxue 2b33f18c05 Merge branch 'equip_develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-08-12 15:20:22 +08:00
lvxinran 1bbf5bc010 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-16 14:21:45 +08:00
lvxinran 9934547352 修改装备返还 2020-08-16 14:21:35 +08:00
lvxinran a05812d3e6 修复战斗被动 2020-08-16 12:38:09 +08:00
lvxinran a5d9a17b29 怪物被动修改 2020-08-16 11:27:35 +08:00
lvxinran 5dfcc37f29 判断宝镜 2020-08-15 20:24:41 +08:00
lvxinran 1af2208ab8 修改校验条件 2020-08-15 20:01:33 +08:00
lvxinran 2d92899d8f 打点修改 2020-08-15 19:17:46 +08:00
lvxinran ef2184ac99 二期打点需求 2020-08-15 18:18:32 +08:00