Commit Graph

4777 Commits (eb11dd82d1deb7d3241f652b8fff2e6b688c145c)
 

Author SHA1 Message Date
lvxinran eb11dd82d1 Merge branch 'master_test' into master_test_gn 2021-04-20 10:26:04 +08:00
lvxinran 59a2dfa11a 公会类型排行榜修改 2021-04-20 10:25:38 +08:00
lvxinran 935740a46e 怪物传星级给前端 2021-04-19 15:28:05 +08:00
lvxinran 0f43fb3888 掉落组修改 2021-04-17 18:01:30 +08:00
lvxinran 1b4a0f6386 一键购买添加 2021-04-17 17:39:25 +08:00
lvxinran becc82c425 一件购买修改 2021-04-17 14:22:29 +08:00
mengchengzhen 7c331eef67 装备升星(云游商人) 2021-04-16 18:31:26 +08:00
mengchengzhen 14bb6f1d95 装备升星(云游商人)表格式 2021-04-16 18:02:21 +08:00
mengchengzhen 8af7414ec3 Merge branch 'master_test_gn_mcz2' into master_test_gn 2021-04-16 17:36:19 +08:00
mengchengzhen 423bb145c5 排行榜皮肤 2021-04-16 17:35:53 +08:00
mengchengzhen d94c023327 装备升星 2021-04-16 17:19:10 +08:00
mengchengzhen 92d850c470 装备升星(云游商人) 2021-04-16 17:16:30 +08:00
lvxinran 4d08afb0c9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-16 15:59:21 +08:00
lvxinran 142673a2da 车迟斗法0伤害修改 2021-04-16 15:59:10 +08:00
duhui a3188a2f03 Merge branch 'master_test' into master_test_gn 2021-04-16 14:28:25 +08:00
duhui 6f27a41e03 合成道具消耗问题 2021-04-16 14:28:03 +08:00
mengchengzhen 29ae290630 Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-16 14:02:42 +08:00
mengchengzhen 2cafa21e1d 云游商人 2021-04-16 14:02:11 +08:00
mengchengzhen 87ab7cc69c Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-16 14:01:06 +08:00
lvxinran 6bcd974ef2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-16 11:56:08 +08:00
lvxinran 98be53a50e 大闹天宫圣物重构 2021-04-16 11:56:02 +08:00
duhui 8c3c80de3f Merge branch 'master_test' into master_test_gn 2021-04-16 10:35:02 +08:00
duhui c2cd3b8ebe 计算机器人突破等级 2021-04-16 10:33:33 +08:00
mengchengzhen b6f5926c4b 装备升星 2021-04-15 19:13:56 +08:00
duhui a9dbd45916 Merge branch 'master_test' into master_test_gn 2021-04-15 15:39:21 +08:00
lvxinran fe9e0858e3 车迟斗法修改,处理0伤害 2021-04-15 14:24:04 +08:00
lvxinran 29aa8a6b53 森罗幻境修改 2021-04-15 14:22:56 +08:00
lvxinran 49468dc793 森罗幻境修改 2021-04-15 14:21:18 +08:00
duhui e8e120ccc0 大闹天宫,专属圣物技能问题处理 2021-04-15 09:36:59 +08:00
lvxinran 8fc939ee52 Merge branch 'master_test' into master_test_gn 2021-04-12 19:10:13 +08:00
lvxinran 5b0e09d6be Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-12 17:13:50 +08:00
lvxinran 6742b70568 提示修改 2021-04-12 17:13:38 +08:00
mengchengzhen c0f10f4f49 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-12 15:11:48 +08:00
mengchengzhen 2aa15c7c32 十五日优化 2021-04-12 15:09:43 +08:00
mengchengzhen 8af8ba001c 称号优化 2021-04-12 15:06:14 +08:00
lvxinran a765b7ec45 车迟斗法时间间隔修改 2021-04-12 00:33:31 +08:00
lvxinran be6a1b07d4 主题活动刷新修改 2021-04-12 00:33:17 +08:00
lvxinran b9503983ba 报空修改 2021-04-11 00:00:05 +08:00
lvxinran 153c9d618e 修改报空 2021-04-10 23:43:56 +08:00
lvxinran 94fec0387f 邮件修改 2021-04-12 23:32:38 +08:00
lvxinran 2a1e6d891e Merge branch 'master_test' into master_test_hw 2021-04-12 00:35:09 +08:00
lvxinran 1102c86448 车迟斗法间隔时间修改 2021-04-10 14:27:04 +08:00
duhui 65b0008884 Merge branch 'master_test' into master_test_gn 2021-04-09 15:22:08 +08:00
duhui 3262b65099 gm,扶持功能 2021-04-09 15:21:47 +08:00
duhui 4d393b942f Merge branch 'master_test' into master_test_gn 2021-04-07 14:32:19 +08:00
duhui ad665bf5e5 魂印图鉴,英雄装备中魂印兼容 2021-04-07 14:31:46 +08:00
duhui 523501b6bf Merge branch 'master_test' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-04-07 13:38:27 +08:00
duhui 286f1e42b8 魂印图鉴,旧数据容错处理 2021-04-07 13:34:29 +08:00
duhui 323be12310 魂印图鉴,旧数据容错 2021-04-07 11:52:45 +08:00
mengchengzhen 005dd17fb9 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-06 16:50:01 +08:00