Commit Graph

1955 Commits (aaf700ca6c3f3666f0c9df231b59d300eba78d60)
 

Author SHA1 Message Date
zhangshanxue aaf700ca6c 问卷 2019-09-04 14:25:12 +08:00
zhangshanxue 734f47cbdb Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2019-09-04 11:54:13 +08:00
zhangshanxue 14ce0d866c 问卷调查 2019-09-04 11:53:35 +08:00
lvxinran 3f0bc58b51 无尽副本战力显示 2019-09-04 11:46:18 +08:00
lvxinran 4970f48e9d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-04 11:08:51 +08:00
lvxinran 6de5deaa40 我要变强等级限制 2019-09-04 11:08:47 +08:00
wangyuan bf9bf974c6 fix buygood logic 2019-09-04 10:37:12 +08:00
lvxinran a04ab6ee5a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-03 20:49:18 +08:00
lvxinran 3caea6d9d2 我要变强 2019-09-03 20:49:14 +08:00
wangyuan 26ab22db56 activity 2019-09-03 20:16:44 +08:00
lvxinran b782ee0a8a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-03 19:41:11 +08:00
lvxinran 463d63a7fb 法宝 2019-09-03 19:41:07 +08:00
wangyuan 3f16d2c1ca scene 2019-09-03 19:30:40 +08:00
lvxinran c770a95a09 修改提交 2019-09-03 11:18:39 +08:00
lvxinran c5a704d494 法宝表对应 2019-09-03 11:17:52 +08:00
lvxinran bfdfdef554 法宝加成 2019-09-03 10:47:52 +08:00
wangyuan 64afe28900 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-03 10:42:38 +08:00
wangyuan def88c3daf fix 法宝加成 2019-09-03 10:42:19 +08:00
zhangshanxue ea47d19a4d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-03 10:39:21 +08:00
zhangshanxue 34d6559258 绑定手机号 2019-09-03 10:38:06 +08:00
lvxinran 6cd00f0f63 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismana.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismanaRankup.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2019-09-03 10:27:16 +08:00
lvxinran 61cfce258f 无尽副本、法宝 2019-09-03 10:24:04 +08:00
wangyuan 2ed3864e16 store 2019-09-03 10:23:51 +08:00
wangyuan 1b7fd4fb56 monster hp 2019-09-02 20:05:33 +08:00
wangyuan e8b835207b walk 2019-09-02 19:51:20 +08:00
wangyuan c4a7952075 recovery 2019-09-02 16:54:14 +08:00
wangyuan e8d68d8972 luafight 2019-09-02 16:32:32 +08:00
wangyuan f15ecf3ba6 fix differdemon null 2019-09-02 16:12:16 +08:00
wangyuan c785e9b813 fix fight 2019-09-02 15:05:21 +08:00
wangyuan 7b8f7e8f7e fix check fight data 2019-09-02 14:26:21 +08:00
wangyuan 3ee89d5862 add bloody 2019-09-02 14:17:54 +08:00
wangyuan 31bbc0a27c fix fight data 2019-09-02 14:04:53 +08:00
wangyuan 2db0ac3d10 delete log 2019-09-02 13:37:54 +08:00
wangyuan 31ffa233f1 fix pokenmon 2019-09-02 12:07:15 +08:00
zhangshanxue e26857c2a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-02 11:02:58 +08:00
zhangshanxue 3c2d3bad70 新增装备品质 2019-09-02 10:59:22 +08:00
lvxinran 195409ee4e 我要变强、公会修改 2019-09-01 17:47:20 +08:00
wangyuan de2cd9a21a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-31 13:46:04 +08:00
wangyuan 7cea36baab 血战&异妖战斗 2019-08-31 13:45:45 +08:00
lvxinran b9f2d0d096 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-31 20:32:41 +08:00
lvxinran 2d33fbb7f9 公会战、公会功能修改 2019-08-31 20:32:37 +08:00
zhangshanxue efe69e34b7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-30 19:03:11 +08:00
zhangshanxue 3003546116 战力排行头像 2019-08-30 19:03:02 +08:00
zhangshanxue 9eac78b1eb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-30 16:48:05 +08:00
lvxinran ddd512e78e 上报错误修改 2019-09-01 15:01:22 +08:00
lvxinran f92a9499d5 怪物战力显示 2019-09-01 14:49:49 +08:00
lvxinran ab47c25f0c 公会修改、无尽本修改 2019-09-01 14:27:27 +08:00
lvxinran c224a55bfd 战斗同步 2019-09-01 12:11:18 +08:00
zhangshanxue 2acc43c382 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-30 13:51:54 +08:00
zhangshanxue 716567ab68 绑定手机号 2019-08-30 13:51:50 +08:00