Commit Graph

208 Commits (master_otnew)

Author SHA1 Message Date
duhui 32b5f8d8fd Merge branch 'master_test_hw' into master_test_hw_hongmeng 2021-02-19 11:06:29 +08:00
lvxinran 9a5d7ba469 战斗同步 2021-01-22 18:11:30 +08:00
lvxinran b7f10ac10e 战斗同步 2021-01-14 17:18:41 +08:00
duhui 869b8400f0 战斗同步 2020-12-28 12:20:39 +08:00
duhui 70dec4bc49 战斗同步 2020-12-28 10:34:53 +08:00
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
lvxinran 2f9fb3c349 战斗逻辑 2019-12-31 16:35:42 +08:00
wangyuan ec9b9a67e4 battlemain 异妖 2019-12-26 17:39:02 +08:00
wangyuan 3b52fbfa63 fix globaldata & champion in redis 2019-12-12 11:42:56 +08:00
wangyuan 106af8c853 luafight 2019-12-02 10:11:58 +08:00
wangyuan 02c9baf2a3 luafight 2019-11-27 10:40:20 +08:00
lvxinran d7817a55a7 战斗逻辑 2019-11-13 19:06:21 +08:00
lvxinran e1fc69d05c 战斗逻辑 2019-11-06 18:54:36 +08:00
wangyuan abc9fbaec3 luafight 2019-11-03 10:40:52 +08:00
lvxinran 7f9e88d0e3 战斗逻辑 2019-10-31 14:49:48 +08:00
lvxinran fb67d6253a 战斗逻辑 2019-10-30 18:59:11 +08:00
lvxinran 46d1d8b00c 战斗逻辑 2019-10-30 15:59:45 +08:00
wangyuan fab234e810 battle & fix export excel 2019-10-29 13:51:59 +08:00
lvxinran a35eefefac 战斗同步 2019-10-28 12:05:04 +08:00
wangyuan 2ec9009738 luafight 2019-10-27 14:56:13 +08:00
lvxinran b2404f1326 战斗逻辑 2019-10-24 15:24:18 +08:00
lvxinran e5a1eb23cf 战斗同步0.94 2019-10-23 23:37:04 +08:00
wangyuan 53821ad34c luafight 2019-10-21 14:25:32 +08:00
lvxinran 25339d3188 0.94战斗同步 2019-10-23 13:40:57 +08:00
wangyuan afafa4fd38 battle 2019-10-10 11:03:42 +08:00
wangyuan 90b95dfef4 battle 2019-09-16 21:41:43 +08:00
lvxinran b5b563c2dc 战斗修改 2019-09-12 12:34:43 +08:00
lvxinran 6741c28aea 战斗同步后端 2019-09-09 10:14:21 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00
wangyuan e8d68d8972 luafight 2019-09-02 16:32:32 +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 c224a55bfd 战斗同步 2019-09-01 12:11:18 +08:00
lvxinran a32cad16a0 0.93同步战斗 2019-08-29 11:03:18 +08:00
lvxinran e9855c6eba 战斗 2019-08-27 16:08:26 +08:00
lvxinran 4475c6a233 战斗同步 2019-09-02 13:16:49 +08:00
wangyuan 2df1e6b44c battle 2019-08-20 15:38:33 +08:00
wangyuan afd51eb5b1 battle 2019-08-19 10:54:08 +08:00
lvxinran 17f30d751a 战斗同步 2019-08-06 20:55:47 +08:00
wangyuan 1bc6ece387 lua fight 2019-08-06 14:37:17 +08:00
wangyuan b4e7cf3e5d vip level task 2019-08-05 15:58:48 +08:00
lvxinran 7d68e534e7 同战斗逻辑 2019-07-25 16:20:33 +08:00
lvxinran 2a13db9fe3 战斗时间 2019-07-23 05:12:58 +08:00
lvxinran 43f978e9b4 战斗逻辑修改 2019-07-16 10:59:40 +08:00
lvxinran 91d33e56ed 同步战斗逻辑 2019-07-15 19:25:22 +08:00
lvxinran 5445cc3699 战斗修改 2019-07-11 15:18:00 +08:00
lvxinran c946d3d106 战斗提交 2019-07-09 11:28:55 +08:00
lvxinran 0eb96961a8 战斗修改 2019-07-08 10:25:43 +08:00
wangyuan b0b08481d4 fight 2019-07-12 15:29:53 +08:00
wangyuan b449d4166e fix daily mission 2019-07-12 15:14:11 +08:00
wangyuan 803850c4ea fight 2019-07-02 13:32:16 +08:00