Commit Graph

153 Commits (7118b6a40c5fc05171d70cced4a62b74b42e69ee)

Author SHA1 Message Date
duhui cc10b2aab4 战斗同步 2020-12-24 17:14:38 +08:00
duhui 86aee0e6ce 战斗同步 2020-12-10 16:32:17 +08:00
lvxinran 0494ff83f2 战斗同步 2020-11-27 16:52:55 +08:00
gaoxin 14c19ca507 战斗逻辑同步v1.0.0 2020-11-04 14:38:54 +08:00
lvxinran a10f5b21de 战斗逻辑提交 2020-11-01 16:23:43 +08:00
lvxinran 74ccf05238 战斗 2020-10-31 04:45:44 +08:00
lvxinran 3ac886af17 战斗同步 2020-10-29 16:36:10 +08:00
lvxinran 845376c52c 战斗同步 2020-10-29 15:36:43 +08:00
lvxinran 2aaf089db6 战斗同步 2020-10-16 11:39:44 +08:00
lvxinran 146c394e7a 公会副本提交 2020-08-22 15:38:31 +08:00
zhangshanxue 1dee96141d 数据不一致。战斗日志,猎妖积分 2020-08-16 17:49:57 +08:00
zhangshanxue 3ab0b9c3a8 出包前bug 2020-08-02 23:44:02 +08:00
zhangshanxue cd176b3418 巅峰赛提交 2020-08-11 09:12:09 +08:00
lvxinran 10924a13a6 战斗同步 2020-07-17 11:54:33 +08:00
zhangshanxue 1f9affbcba 同步战斗 2020-07-18 21:06:17 +08:00
lvxinran fe32e26bfc 战斗同步 2020-06-26 00:42:16 +08:00
zhangshanxue c9f8fe8099 同步战斗 2020-06-17 14:45:45 +08:00
gaoxin 7644fcde13 lua文件提交 2020-05-28 11:05:11 +08:00
lvxinran c31dcffc5d 战斗逻辑 2020-05-24 00:04:06 +08:00
lvxinran ba0f7f91aa 战斗逻辑 2020-05-11 11:53:05 +08:00
lvxinran 6079cc96ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-05-09 09:59:29 +08:00
wangyuan 17751438fd fix car 2020-05-08 14:16:46 +08:00
wangyuan 25392fd49f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-07 16:32:04 +08:00
wangyuan a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
lvxinran 8abd2af09c 战斗逻辑 2020-05-07 15:53:26 +08:00
lvxinran 824c8239c5 战斗逻辑 2020-05-06 19:51:54 +08:00
lvxinran 754bdf965b 战斗逻辑 2020-05-06 16:49:24 +08:00
lvxinran 8c09de153d 战斗同步 2020-05-02 05:12:07 +08:00
lvxinran 00c5976c38 战斗同步 2020-04-23 20:08:25 +08:00
lvxinran 69705d3ba1 战斗同步 2020-04-21 20:51:31 +08:00
wangyuan 34789b6b5f sync battle 2020-04-17 21:35:22 +08:00
wangyuan 5bfdf0486c sync battle 2020-04-17 20:02:49 +08:00
lvxinran 079f317dec 战斗 修改 2020-04-16 16:27:42 +08:00
lvxinran 9fb69b69bf 战斗同步 2020-04-16 15:10:04 +08:00
lvxinran 4320ed3650 战斗修改 2020-04-10 18:04:21 +08:00
lvxinran bf2cfc3bcf 战斗修改 2020-04-10 14:52:41 +08:00
lvxinran e26e4c617a 战斗逻辑 2020-03-19 14:09:18 +08:00
lvxinran 2b6c6496a7 战斗同步 2020-03-08 18:28:09 +08:00
lvxinran d70ce6c1f2 战斗逻辑 2020-02-25 20:09:26 +08:00
wangyuan bd54aea85e fight 2020-02-20 16:06:48 +08:00
wangyuan 763fccdf87 luafight 2020-02-03 11:36:01 +08:00
lvxinran 1de89f726a 战斗逻辑 2020-01-14 16:16:09 +08:00
lvxinran 1e2dd47cc2 战斗逻辑 2020-01-13 11:03:23 +08:00
lvxinran 31f8eb2c02 战斗逻辑 2020-01-10 16:09:06 +08:00
wangyuan cb1954d8a2 vip权限 2020-01-08 17:58:36 +08:00
wangyuan a0fe74fa22 vip校验方法名称修改 2020-01-07 19:24:55 +08:00
lvxinran 37231b6d3f 战斗逻辑 2020-01-07 16:43:24 +08:00
lvxinran 481cda0103 战斗逻辑 2020-01-03 12:22:05 +08:00
lvxinran c52180e981 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-31 17:50:17 +08:00
lvxinran 66e13d239e 战斗逻辑 2019-12-31 17:47:29 +08:00