Commit Graph

3869 Commits (31677bdff6862b243b952ff7254c637f87842627)
 

Author SHA1 Message Date
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
lvxinran d46749052d 战斗位置 2020-08-15 17:08:45 +08:00
lvxinran c3aa6aaec9 报空 修改 2020-08-15 16:25:45 +08:00
lvxinran 00198786e9 轩辕宝镜代码提交 2020-08-15 13:42:36 +08:00
lvxinran fffe477523 英雄装备掉落修改 2020-08-13 09:41:07 +08:00
lvxinran 5c23253d5e 轩辕宝镜 2020-08-13 09:37:01 +08:00
zhangshanxue 4e0dd14dce 英雄置换 2020-08-12 14:16:08 +08:00
zhangshanxue efc21ecbf3 英雄置换 2020-08-10 15:26:19 +08:00
lvxinran 424b64e6c9 挑战 扫荡 逻辑 2020-08-07 15:26:25 +08:00
lvxinran b5a0c8de0e 轩辕宝镜接口添加 2020-08-06 22:55:38 +08:00
lvxinran ee0c50242b 轩辕宝镜提交 2020-08-06 22:54:25 +08:00
lvxinran 5cd1a592e0 添加轩辕宝镜功能 2020-08-07 19:29:13 +08:00
lvxinran 96625ede21 法宝归元,秘境时间代码提交 2020-08-07 15:12:49 +08:00
lvxinran d7a98fe7fc 法宝归元 2020-08-05 16:41:42 +08:00
lvxinran 4a50b29266 上报代码提交 2020-08-04 20:37:39 +08:00
lvxinran ebe8ebed4a 暂时删除异常 2020-08-04 17:12:40 +08:00
lvxinran 233c166a8b 森罗幻境修复 2020-08-04 16:23:13 +08:00
lvxinran 7cb039e0fb 修复地图 2020-08-04 09:51:01 +08:00
lvxinran 8b402e70aa 修改部分数据 2020-08-03 21:47:59 +08:00
lvxinran 6895ec3444 Merge branch 'master_test' 2020-08-03 18:06:05 +08:00
lvxinran 52745a48b4 配置不存在,暂时修改 2020-08-03 18:05:32 +08:00
zhangshanxue e0b3889a67 公会经验bug 2020-08-16 20:28:01 +08:00
zhangshanxue 1f59c36e5e Merge branch 'master_test' of http://60.1.1.230/backend/jieling_server into master_test 2020-08-16 20:06:05 +08:00
zhangshanxue db80fca6f0 关闭没用的模块 2020-08-16 18:12:45 +08:00
zhangshanxue 1dee96141d 数据不一致。战斗日志,猎妖积分 2020-08-16 17:49:57 +08:00
zhangshanxue e5ae741308 Merge branch 'master_test' 2020-08-09 22:38:14 +08:00
zhangshanxue a78faa7d4b 玩家清除 和日志打印 2020-08-09 22:37:25 +08:00