Commit Graph

3271 Commits (1505163dd00b67b0f6878a8d3d1e068836ac0909)

Author SHA1 Message Date
zhangshanxue bff92f29f0 占星优化 2019-09-23 18:51:31 +08:00
wangyuan 67344d6bf9 Merge branch 'develop' 2019-09-23 18:03:14 +08:00
wangyuan 730bafb538 chat 2019-09-23 18:02:39 +08:00
zhangshanxue 266808f042 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 17:58:45 +08:00
zhangshanxue 68daab49d7 占星优化 2019-09-23 17:58:07 +08:00
wangyuan 388b2e5495 bloody 2019-09-23 17:56:22 +08:00
wangyuan eb6cf6f62b reconnect 2019-09-23 17:39:25 +08:00
wangyuan bdc84eb2fc reconnect 2019-09-23 17:20:02 +08:00
zhangshanxue 9af1ae4196 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 14:22:39 +08:00
zhangshanxue 8b5210be28 占星优化 2019-09-23 14:22:34 +08:00
wangyuan 4872f629d2 delete red 2019-09-23 11:35:51 +08:00
zhangshanxue 9c96318b63 2级 改名卡 2019-09-20 19:52:47 +08:00
zhangshanxue 00e4818aff Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-20 19:40:06 +08:00
zhangshanxue 5af0c05c6b 达人活动 2019-09-20 19:34:41 +08:00
wangyuan 1e6ab3dfa4 fix map null 2019-09-20 23:22:54 +08:00
lvxinran 2d869c875d 无尽修改 2019-09-20 18:34:52 +08:00
lvxinran c2d214d337 无尽地图修改 2019-09-20 18:34:29 +08:00
lvxinran ab11d72809 无尽副本难度添加 2019-09-23 06:02:35 +08:00
lvxinran 60862fa351 无尽提交 2019-10-18 03:13:06 +08:00
wangyuan c399c67a2a fix force 2019-09-20 18:24:34 +08:00
zhangshanxue e1c8e2fdc6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-20 17:40:41 +08:00
zhangshanxue 5d487705da 内存数据修复 2019-09-20 17:39:55 +08:00
wangyuan 6296f1e1ed fix herologic 2019-09-20 17:11:44 +08:00
wangyuan c0aa602e21 fix force 2019-09-20 17:04:52 +08:00
wangyuan 1c7dbd7b4d close activity 2019-09-20 14:02:24 +08:00
zhangshanxue 23cd3657e2 月卡修复 2019-09-19 22:59:44 +08:00
wangyuan d00793e1d8 fix gm 2019-09-20 11:12:16 +08:00
wangyuan 80745fc233 log 2019-09-20 10:56:30 +08:00
wangyuan 144fadf156 log 2019-09-20 10:36:14 +08:00
wangyuan 94451b542c log 2019-09-20 10:35:03 +08:00
wangyuan 1797e04edf fix 2019-09-20 10:05:01 +08:00
zhangshanxue e9d0b2d27f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 21:16:57 +08:00
zhangshanxue 35c64d19e7 月卡修复 2019-09-19 21:16:27 +08:00
wangyuan 2a5d4fe922 log 2019-09-19 20:33:47 +08:00
wangyuan fb7e229a60 fix 2019-09-19 20:31:54 +08:00
wangyuan 7d84edc660 fix reconnect 2019-09-19 20:21:06 +08:00
wangyuan 0f229baaa4 print log 2019-09-19 19:26:46 +08:00
wangyuan 1615f53a15 fix charge 2019-09-19 18:57:47 +08:00
zhangshanxue aad18c8bd6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 18:03:25 +08:00
lvxinran e1b22f1a1d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 06:31:39 +08:00
wangyuan 510ad468b4 gm 2019-09-28 17:31:19 +08:00
lvxinran bb5a8831b6 公会战暂时注释 2019-09-23 06:31:32 +08:00
lvxinran 65676c7931 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 06:01:44 +08:00
wangyuan f596ae7846 close 2019-09-28 16:39:41 +08:00
lvxinran f360226c96 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-01 06:18:25 +08:00
lvxinran cb9a0f555e 无尽修改 2019-10-01 06:18:19 +08:00
lvxinran ebcb4db464 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-01 06:07:37 +08:00
lvxinran 92d8999b7a 无尽踢出图 2019-10-01 06:07:33 +08:00
wangyuan 7aa10156f1 fix user mision 2019-09-28 16:02:59 +08:00
lvxinran bbb56254d5 无尽出图 2019-09-23 06:01:41 +08:00
zhangshanxue 4667c72e15 内存数据修复 2019-09-19 18:03:20 +08:00
wangyuan cf12529bb3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-19 15:15:19 +08:00
wangyuan 4fe443982e send indication 2019-09-19 15:14:55 +08:00
zhangshanxue 583fb7804b 查看内存数据 2019-09-19 15:05:17 +08:00
zhangshanxue a83b68e790 查看内存数据 2019-09-19 14:47:06 +08:00
zhangshanxue f805f83a25 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 11:00:25 +08:00
zhangshanxue 1d2adc565b 累计充值 2019-09-19 10:58:57 +08:00
wangyuan 27d0588bce fix indication 2019-09-19 10:39:52 +08:00
wangyuan 32ba425900 fix 2019-09-18 21:21:02 +08:00
zhangshanxue 5fd1e90b8a 内存战力强制修改 2019-09-18 21:15:38 +08:00
wangyuan 63a587862c fix gm 2019-09-18 20:41:32 +08:00
wangyuan e5578dbab3 fix name 2019-09-18 19:25:34 +08:00
wangyuan a4a81a34f5 test gm 2019-09-18 19:25:12 +08:00
wangyuan d2f70c74c2 test gm 2019-09-18 19:11:32 +08:00
wangyuan f4376dc49c test gm 2019-09-18 19:05:50 +08:00
wangyuan 89efd6a239 test 2019-09-18 19:02:03 +08:00
wangyuan 1368c28d55 fix gm 2019-09-18 18:40:36 +08:00
zhangshanxue 04531d5128 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-18 18:38:43 +08:00
wangyuan 5bfaaea4b6 fix retry 2019-09-18 18:34:34 +08:00
zhangshanxue 16934bfa74 内存战力强制修改 2019-09-18 18:30:38 +08:00
zhangshanxue 51eff6e873 内存战力强制修改 2019-09-18 18:25:39 +08:00
zhangshanxue b84afdf49a Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GmService.java
2019-09-18 18:14:56 +08:00
zhangshanxue fc90b4d129 内存战力强制修改 2019-09-18 18:13:35 +08:00
wangyuan ff30ef0341 fix buy 2019-09-18 18:00:37 +08:00
wangyuan c350f920e5 fix buy 2019-09-18 17:51:35 +08:00
wangyuan e852ef1b31 rollback 2019-09-18 17:42:42 +08:00
wangyuan 474180788b fix buy 2019-09-18 17:22:31 +08:00
wangyuan 54a3e50ae6 fix buy not in mongo 2019-09-18 16:45:04 +08:00
lvxinran 247bcbbcd1 修改 2019-09-23 08:20:37 +08:00
lvxinran cf27447f0d 世界等级 2019-09-23 08:15:44 +08:00
lvxinran 67dc20bd41 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-18 11:35:23 +08:00
lvxinran e10ac1ad61 世界等级修改 2019-09-18 11:34:23 +08:00
wangyuan 7dd95c1cfa delete unuse code 2019-09-18 11:22:29 +08:00
wangyuan 44710613f5 online num 2019-09-18 11:21:56 +08:00
wangyuan 24ee84be59 fix proto 2019-09-18 09:32:18 +08:00
wangyuan 13634f35de delete log 2019-09-18 08:53:11 +08:00
wangyuan d632f72afc test 2019-09-17 20:32:28 +08:00
wangyuan 501f084a03 fix 2019-09-17 19:32:10 +08:00
wangyuan 5048fb2238 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-17 19:31:03 +08:00
wangyuan f9bf1d7a67 print log 2019-09-17 19:30:48 +08:00
lvxinran 7389d9f0a8 敏感词添加 2019-09-17 17:58:48 +08:00
zhangshanxue 1bf2ab65c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 17:42:19 +08:00
zhangshanxue aebb3cb843 openid 2019-09-17 17:42:13 +08:00
lvxinran 5383dbade1 禁言相关修改 2019-09-17 17:41:39 +08:00
lvxinran d26f1239ab Key修改 2019-09-17 16:48:57 +08:00
zhangshanxue 1127ca61ce Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 16:36:26 +08:00
zhangshanxue 7949ee19cd 累计充值重开 2019-09-17 16:36:12 +08:00
lvxinran 611dd26e04 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 15:57:39 +08:00
wangyuan 3086a1f5bc fix bloody 2019-09-19 15:46:26 +08:00
lvxinran 7e87ecd563 消耗道具修改 2019-09-17 15:57:29 +08:00
lvxinran 3698f10c46 上报修改 2019-09-17 15:56:30 +08:00
zhangshanxue 02d5e966bb redis 缓存服务器地址 2019-09-17 15:20:39 +08:00
zhangshanxue 24aa3f8536 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 14:58:41 +08:00
zhangshanxue 6b96021e08 redis 缓存服务器地址 2019-09-17 14:58:30 +08:00
wangyuan 0dfd959d5e delete buy indicaiton 2019-09-17 14:05:16 +08:00
lvxinran 55c8c4bdfd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 11:22:10 +08:00
lvxinran 678bb38395 法宝星级修改 2019-09-17 11:22:06 +08:00
zhangshanxue 4ef73f2406 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 10:35:14 +08:00
zhangshanxue e8041f756a 占星卡池上线通知 2019-09-17 10:35:09 +08:00
wangyuan c18aaed7aa 公式 2019-09-16 22:00:09 +08:00
wangyuan 200905d5a3 fix team 2019-09-16 21:34:32 +08:00
wangyuan dc00f02962 print log 2019-09-16 20:40:49 +08:00
wangyuan 4306b7e518 fix playerlogic 2019-09-16 20:10:13 +08:00
wangyuan 69b64a7f57 fix hot 2019-09-16 19:38:24 +08:00
wangyuan 57ca077510 friend tips 2019-09-16 16:31:05 +08:00
wangyuan c64bf6eee6 view team info 2019-09-16 15:51:27 +08:00
zhangshanxue d5c1d89021 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-16 15:40:28 +08:00
zhangshanxue 9438cd562a 注册服务器信息 2019-09-16 15:40:18 +08:00
wangyuan 95c1506ce1 test hot fix 2019-09-16 14:18:23 +08:00
wangyuan 2f4589af04 chat log 2019-09-16 12:57:35 +08:00
zhangshanxue e1de5c8050 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-16 11:39:17 +08:00
zhangshanxue ce8fffd10c 所有榜单容量不做限制 2019-09-16 11:39:13 +08:00
wangyuan cd0ff0e95d fix login 2019-09-12 18:42:44 +08:00
lvxinran 11af6398d3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:40:45 +08:00
lvxinran f06650a72b 修改 2019-09-12 18:40:41 +08:00
wangyuan 678c06c998 fix reconnect 2019-09-12 18:15:23 +08:00
zhangshanxue e925b88ffd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:06:55 +08:00
zhangshanxue 258c70642c cdk 2019-09-12 18:06:28 +08:00
zhangshanxue 63fc8dbd14 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-20 19:35:00 +08:00
zhangshanxue 01810351bb 招财猫回退 2019-09-20 19:34:42 +08:00
wangyuan d24fce49ab data report 2019-09-12 16:53:06 +08:00
wangyuan 70e62476f5 test 2019-09-12 13:51:19 +08:00
wangyuan 96bf9d7482 fix chat 2019-09-12 11:38:09 +08:00
wangyuan eddd5459e0 fix chat 2019-09-12 10:55:31 +08:00
wangyuan 5a59ae0090 chat 2019-09-12 10:11:35 +08:00
lvxinran a11a644dca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 10:05:35 +08:00
lvxinran 135b9756c6 物品流水日志 2019-09-12 10:05:31 +08:00
wangyuan 001477cbb6 friend limit 2019-09-11 14:27:58 +08:00
lvxinran c032ea2eaa Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 14:22:32 +08:00
lvxinran 4f84f0d815 无尽副本修改 2019-09-11 14:22:28 +08:00
lvxinran 16cbf1c5ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-14 12:26:04 +08:00
lvxinran d5a202d28e 任务修改 2019-09-14 12:26:00 +08:00
lvxinran fb8a4bcc70 法宝任务添加 2019-09-14 11:27:32 +08:00
lvxinran e401393677 任务添加 2019-09-14 11:27:04 +08:00
wangyuan ed379a2524 flushtime 2019-09-11 11:52:31 +08:00
zhangshanxue 521b7d062a 一键装备 2019-09-11 10:51:48 +08:00
zhangshanxue da3ad5f06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 10:23:52 +08:00
zhangshanxue 4481b5a8c0 gm 跑马灯 2019-09-11 10:10:01 +08:00
zhangshanxue 5545dec693 问卷重开 2019-09-10 21:12:26 +08:00
zhangshanxue 049975b931 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 20:41:57 +08:00
zhangshanxue ba608937cc 装备战力 2019-09-10 20:41:50 +08:00
wangyuan f7f54df716 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-10 20:12:30 +08:00
lvxinran 08324adb91 匹配时星数显示 2019-09-13 12:19:12 +08:00
lvxinran d49eb6114b 聊天检测 2019-09-12 12:12:51 +08:00
wangyuan c3dc931ea2 fix 2019-09-10 20:09:30 +08:00
zhangshanxue 952b1dd161 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 18:24:52 +08:00
lvxinran 3ef8b5766b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:44:50 +08:00
lvxinran b52d314375 无尽修改N。。。 2019-09-12 18:44:46 +08:00
lvxinran 4f39ea2210 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 16:19:28 +08:00
lvxinran 713a0b7c04 无尽修改 2019-09-12 16:19:23 +08:00
zhangshanxue de65f12114 在线人数 2019-09-10 18:24:46 +08:00
wangyuan 135450f507 fix network 2019-09-10 16:10:28 +08:00
zhangshanxue dfeaf4bae0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 15:55:46 +08:00
zhangshanxue 14d21eb6ec 移除功能开启检查 2019-09-10 15:55:42 +08:00
zhangshanxue a3b84a9b2d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 14:30:47 +08:00
zhangshanxue 9bb332835e 魂印功能限制 2019-09-10 14:30:42 +08:00
wangyuan 2810683713 fix time 2019-09-10 14:14:32 +08:00
wangyuan 98d92373ac fix table 2019-09-10 14:03:51 +08:00
wangyuan 5633e399e9 fix 2019-09-10 13:50:38 +08:00
wangyuan d1efc48e47 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-09-10 13:49:50 +08:00
zhangshanxue abd7ebd875 观星开启 2019-09-10 13:25:53 +08:00
wangyuan 11376e12b1 fix map team 2019-09-10 12:01:05 +08:00
zhangshanxue f36c71cada 问卷修改 2019-09-10 11:54:20 +08:00
lvxinran 30d56d2ad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 11:08:59 +08:00
lvxinran a1e0d88052 无尽本报错 2019-09-12 11:08:55 +08:00
zhangshanxue 91582654ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 10:21:38 +08:00
zhangshanxue 33d1cf6a03 魂印 2019-09-10 10:21:01 +08:00
wangyuan 2a286218e6 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
2019-09-10 10:07:55 +08:00
wangyuan 4f57f75d6d 增加赛季开启类型 2019-09-10 10:05:03 +08:00
zhangshanxue a51abcbe92 魂印 2019-09-10 10:02:59 +08:00
zhangshanxue f8ab3f7967 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 00:01:38 +08:00
lvxinran 46e7fd5c23 血量修改 2019-09-11 23:29:45 +08:00
lvxinran acbbc8ee4f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 22:21:06 +08:00
lvxinran 9eb7a469ff 法宝、公会战无尽副本修改 2019-09-11 22:21:02 +08:00
zhangshanxue d04f6fe3bf 掉落 2019-09-10 00:01:17 +08:00
zhangshanxue 84104a5971 问卷调查优化 2019-09-09 20:35:00 +08:00
zhangshanxue 2aa64192a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 16:35:15 +08:00
zhangshanxue 08d29d6cce 更新bug 2019-09-09 16:35:03 +08:00
wangyuan f5ec857e24 自动发现服务器 2019-09-09 16:07:11 +08:00
zhangshanxue 5ff27b049c token验证 2019-09-09 15:04:39 +08:00
zhangshanxue 1b61c88da1 token验证 2019-09-09 14:23:29 +08:00
zhangshanxue d0728bae5f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 14:16:28 +08:00
zhangshanxue 967a744a81 掉落 2019-09-09 14:16:23 +08:00
wangyuan f85de0b94c fix random 2019-09-09 12:38:21 +08:00
zhangshanxue 9e8cec3727 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 12:00:11 +08:00
zhangshanxue 88dc18da7b 问卷删除缓存 2019-09-09 11:59:34 +08:00
lvxinran a533fd4c1a 无尽副本血量修改 2019-09-09 11:55:30 +08:00
lvxinran 8285f4363e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:31:57 +08:00
lvxinran 52a27ee882 法宝等级限制,46行为修改 2019-09-09 11:31:51 +08:00
zhangshanxue 8dc4700f13 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:28:52 +08:00
zhangshanxue 2e35ab977e 魂印临时背包掉落 2019-09-09 11:28:46 +08:00
wangyuan cd38e82643 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-09 10:45:03 +08:00
wangyuan fc2994c577 time 2019-09-09 10:42:13 +08:00
lvxinran 7be649a804 无尽副本修改,法宝修改 2019-09-09 10:39:59 +08:00
lvxinran 54ad281831 试炼精气值 2019-09-09 09:58:45 +08:00
wangyuan 2a5490a030 time 2019-09-07 21:40:45 +08:00
wangyuan 78154b6adc Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
2019-09-07 20:05:37 +08:00
wangyuan 0db40f7fde bloody 2019-09-07 20:03:06 +08:00
zhangshanxue 47ac97d2ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:45:34 +08:00
zhangshanxue 5a05c80ef3 魂印掉落 2019-09-07 19:45:30 +08:00
lvxinran 8bfa9dc498 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:26:31 +08:00
lvxinran cb95002a8f 血战时间限制 2019-09-07 19:26:27 +08:00
zhangshanxue 4f9b3404dd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 17:20:46 +08:00
zhangshanxue f5fb83d1b4 token验证 2019-09-07 17:20:41 +08:00
zhangshanxue 91c017cbd5 魂印掉落 2019-09-07 17:18:22 +08:00
lvxinran 3defe3d54c 法宝掉落 2019-09-07 16:31:19 +08:00
lvxinran d88ed321c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 15:03:56 +08:00
lvxinran d6f2b203e0 公会修改、试炼修改 2019-09-07 15:03:33 +08:00
wangyuan e1cbbac567 圣火令 2019-09-07 14:48:08 +08:00
wangyuan 69057cf41b Merge branch 'split'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
2019-09-07 14:15:04 +08:00
wangyuan a5a285f081 血战积分奖励 2019-09-07 14:13:25 +08:00
wangyuan 201f510e38 bloody 2019-09-07 14:12:09 +08:00
lvxinran c7d61c098d 无尽本修改 2019-09-07 13:56:30 +08:00
zhangshanxue 5ef6a8debc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 13:34:41 +08:00
zhangshanxue c8cbfcaa43 魂印掉落 2019-09-07 13:34:36 +08:00
lvxinran d95f112bd0 法宝默认 2019-09-06 20:46:56 +08:00
lvxinran 50c2758b5f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-06 20:41:38 +08:00
lvxinran f16ee71a54 法宝 2019-09-06 20:41:34 +08:00
zhangshanxue c118c195f4 排行榜显示 2019-09-06 14:54:00 +08:00
wangyuan 932a2bfe1b Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
2019-09-06 11:09:05 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00
zhangshanxue 9406f2c28f Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-09-06 11:01:43 +08:00
zhangshanxue 0bc5d8fb90 魂印 2019-09-06 10:59:49 +08:00
lvxinran 1423c2fb3b 多余代码删除 2019-09-05 20:39:12 +08:00
lvxinran 75dec9d9b8 无尽修改 2019-09-05 20:26:26 +08:00
lvxinran 1215fdafdc 无尽设置跳过战斗、科技树修改 2019-09-05 19:51:07 +08:00
lvxinran 0d93202a6c 血战排行榜 2019-09-05 17:34:46 +08:00
lvxinran 702c7c705e 无尽修改 2019-09-05 16:57:16 +08:00
lvxinran b45af85013 GM修改 2019-09-05 14:47:08 +08:00
lvxinran 6030413d3f 血战邮件 2019-09-05 14:15:20 +08:00
lvxinran 8129e8cb2c 血战排行榜 2019-09-05 12:01:47 +08:00
lvxinran f823388c75 无尽副本血量计算 2019-09-05 09:56:18 +08:00
lvxinran a960ad504c 无尽修改血量 2019-09-04 20:50:06 +08:00
lvxinran 489f906a00 法宝升星 2019-09-04 19:08:14 +08:00
lvxinran 2c4a2f2218 48、49行为类型修改 2019-09-04 16:07:13 +08:00
lvxinran 234bddfed8 发货修改 2019-09-04 15:46:49 +08:00
wangyuan bc1c252c02 delete check amount 2019-09-04 15:42:19 +08:00
lvxinran 509878f535 无尽刷小怪 2019-09-04 15:40:50 +08:00
wangyuan aa316cc206 table 2019-09-04 15:01:44 +08:00
lvxinran ea6a775a3b 法宝gm,无尽地图小怪刷新 2019-09-04 15:00:25 +08:00
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 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
zhangshanxue 716567ab68 绑定手机号 2019-08-30 13:51:50 +08:00
zhangshanxue 9c676a4c6f 改名推送 2019-08-29 16:21:50 +08:00
zhangshanxue 48d7ee726c 改名推送 2019-08-29 15:51:19 +08:00
zhangshanxue 49445bf595 玩家改名消耗道具 2019-08-29 15:13:39 +08:00
zhangshanxue 1e02099200 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-29 14:49:18 +08:00
zhangshanxue db52e6b0be gm支持 2019-08-29 14:49:09 +08:00
lvxinran ca28591b48 生成妖灵师资质修改 2019-08-29 11:08:24 +08:00
lvxinran 7f801ad0b3 禁言解禁 2019-08-29 09:44:58 +08:00
lvxinran 215068ee7a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-29 09:41:15 +08:00
lvxinran 1b45fb4710 禁言解禁提交 2019-08-29 09:41:11 +08:00
lvxinran 183e4954c1 无尽副本提交 2019-08-29 05:52:36 +08:00
lvxinran 6bbd27d1f5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-29 05:13:42 +08:00
lvxinran 5d41aff570 function out 2019-08-29 05:13:38 +08:00
lvxinran e7df45c50f 公会战代码重构 2019-08-29 03:58:45 +08:00
lvxinran 37bab876b3 时间工具类修改 2019-08-29 03:00:31 +08:00
lvxinran caa57c1d5d 无尽副本信息,公户战修改 2019-08-29 03:00:03 +08:00
zhangshanxue 3b4bf37a8b gm支持 2019-08-28 20:21:24 +08:00
zhangshanxue 7b09870bb7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-28 19:46:50 +08:00
zhangshanxue bb0cdea20c 封号 2019-08-28 19:46:46 +08:00
dengdan 6f843b3a23 战斗改为多选称,ThreadLocal存储 2019-08-28 15:08:49 +08:00
zhangshanxue 1b7c67346c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-28 11:53:04 +08:00
zhangshanxue 9a5c1ec50b gm支持 2019-08-28 11:53:00 +08:00
wangyuan 7614cf3aaa fix differ 2019-08-28 11:21:35 +08:00
lvxinran 31590ea1c8 公会战代码重构 2019-08-29 00:23:54 +08:00
lvxinran eca20927e6 无尽副本部分修改 2019-08-27 21:03:46 +08:00
wangyuan 43883d4722 reconnect 2019-08-27 17:38:22 +08:00
zhangshanxue 6f1b0dcbf9 协议推送 2019-08-27 16:07:10 +08:00
zhangshanxue 3bb041a711 Merge branch 'project0.92' 2019-08-27 15:05:27 +08:00
wangyuan 5c96eb3756 fix indicaiton 2019-08-27 12:04:05 +08:00
wangyuan af97d1b74b Merge branch 'project0.92' 2019-08-27 11:30:41 +08:00
lvxinran c6321bba2f 公会战标志位修改 2019-09-02 12:54:25 +08:00
lvxinran 7797b5bfff 公会战 2019-09-02 12:13:09 +08:00
wangyuan a173bcc00d delete mail 2019-08-27 10:46:22 +08:00
wangyuan 20a8438465 fix remove store 2019-08-27 10:08:28 +08:00
zhangshanxue 689a227324 合并协议 2019-08-26 21:04:17 +08:00
wangyuan 58f9d17b8f fix mail 2019-08-26 20:53:56 +08:00
zhangshanxue 64e66e941a 背包协议同步合并 2019-08-26 17:17:15 +08:00
wangyuan 08447fdb97 Merge branch 'project0.92'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
2019-08-26 15:31:15 +08:00
wangyuan c78898e0e9 add white & fix curHp 2019-08-26 15:27:50 +08:00
wangyuan 04234ab0fa user from cache 2019-08-26 15:11:09 +08:00
zhangshanxue 9f5600049d Merge branch 'project0.92' of http://60.1.1.230/backend/jieling_server into project0.92 2019-09-02 14:05:23 +08:00
zhangshanxue a1a1a8a49f bug和异常处理 2019-09-02 14:04:50 +08:00
wangyuan c0a45928ba Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-26 14:50:55 +08:00
lvxinran 447445a29f 公会战修改 2019-08-29 12:02:08 +08:00
lvxinran bf36633caf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-31 06:24:20 +08:00
lvxinran 9c6f7c277b 公会战提交 2019-08-31 06:24:15 +08:00
wangyuan 70d2f8165a reconnect server 2019-08-26 14:50:13 +08:00
wangyuan d2b5b95463 buffer effect target 2019-08-26 13:51:30 +08:00
wangyuan cdc13a639a arena rank 2019-08-26 11:43:10 +08:00
zhangshanxue c650902fef bug和异常处理 2019-09-02 11:30:26 +08:00
wangyuan 28067420f0 不推荐自己 2019-08-23 11:31:38 +08:00
zhangshanxue 6fbb86fad2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-30 10:26:23 +08:00
zhangshanxue 7c13d67a5c 升星 2019-08-30 10:26:15 +08:00
zhangshanxue f76a69da1a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-29 19:55:59 +08:00
zhangshanxue 3cfb6564ff 进阶妖灵师返回奖励 2019-08-29 19:53:59 +08:00
zhangshanxue 1e4275aed1 acitvity 2019-09-28 21:48:27 +08:00
zhangshanxue 72d36d633f acitvity 2019-09-28 21:38:01 +08:00
zhangshanxue a2ffa2fbfe acitvity 2019-08-26 21:14:09 +08:00
wangyuan 30afcf32b0 friend 2019-08-23 09:56:17 +08:00
wangyuan 6f2955e08f fix take 2019-08-23 09:50:53 +08:00
wangyuan cf0b06fa8c fix online 2019-08-23 09:41:13 +08:00
wangyuan 08615efd4f fix friend 2019-08-22 20:01:56 +08:00
wangyuan 3a1a415024 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-22 19:59:40 +08:00
wangyuan 1ed2fd4489 check mail 2019-08-22 19:59:23 +08:00
wangyuan 6ee1c9fc4a fix bug 2019-08-22 19:39:57 +08:00
wangyuan 9c6925a159 fix buffer 2019-08-22 18:38:12 +08:00
wangyuan 989d0a2d85 fix activity 2019-08-21 20:59:50 +08:00
wangyuan 7b988d70c2 process openId 2019-08-21 20:31:29 +08:00
wangyuan 2b78ebf9ea fix mail bug 2019-08-21 20:01:14 +08:00
wangyuan 264540e796 虚拟币 2019-08-21 19:45:04 +08:00
zhangshanxue ce71b8a4db 魂晶累计 2019-08-26 19:35:52 +08:00
wangyuan c19d6b2e26 fix mongo url 2019-08-21 19:07:04 +08:00
lvxinran e38fb0f41d 修改 2019-08-21 18:59:03 +08:00
lvxinran 133e0acac7 修改 2019-08-21 18:51:34 +08:00
lvxinran 0b211bbed1 发送邮件,踢下线 2019-08-21 18:42:06 +08:00
wangyuan 6baf3711b1 kt new appid 2019-08-21 18:26:25 +08:00
wangyuan 620b055aad appkey 2019-08-21 17:38:10 +08:00
lvxinran 51b9b1ce7e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 15:55:52 +08:00
lvxinran 3312b7993c 37敏感字校验 2019-08-21 15:55:47 +08:00
wangyuan 9d4473f31d 同步 2019-08-21 15:30:40 +08:00
lvxinran 0f783608d2 敏感字 2019-08-21 15:30:28 +08:00
wangyuan b8cfc5a572 fight 2019-08-21 15:14:43 +08:00
zhangshanxue 1dc59a7af0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 14:52:38 +08:00
zhangshanxue bbc05c8c33 37接口数据 2019-08-21 14:52:08 +08:00
wangyuan c8295ea4e7 mail 2019-08-21 14:50:37 +08:00
lvxinran 58d3b86212 邮件定时发送,37上报控制 2019-08-21 14:45:38 +08:00
zhangshanxue f0443e1a21 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 14:36:54 +08:00
zhangshanxue bb8ad768b5 37接口数据 2019-08-21 14:36:37 +08:00
zhangshanxue 5c9168607d 招财猫 22测试后回退 2019-08-24 20:20:37 +08:00
lvxinran bcfc9a92d6 邮件定时检测发送,工会图腾信息,工会战绩,37敏感字检测 2019-08-21 14:06:02 +08:00
lvxinran 3ba8de06f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2019-08-21 14:03:49 +08:00
lvxinran 668e58147d 加入图腾 2019-08-21 14:02:32 +08:00
wangyuan 7dbcc6e007 head 2019-08-20 20:27:55 +08:00
zhangshanxue 0f9897eeac Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-20 15:47:31 +08:00
zhangshanxue 3e00a693da report 2019-08-20 15:47:13 +08:00
wangyuan 7fb6e6dc95 random 2019-08-20 15:46:16 +08:00
wangyuan 2df1e6b44c battle 2019-08-20 15:38:33 +08:00
lvxinran 622d22d4a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-20 15:10:06 +08:00
lvxinran 785bd98be9 mapLogic 2019-08-20 15:10:02 +08:00
wangyuan fe4e9509e5 fix arena 2019-08-20 15:00:59 +08:00
lvxinran f52d970ea6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-20 14:36:02 +08:00
lvxinran d7e05f0c4d 试炼币修改 2019-08-20 14:35:56 +08:00
zhangshanxue 919c05ae33 兽潮排行榜同波次根据时间排名 2019-08-20 14:15:49 +08:00
wangyuan 1abfb2e66d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-19 20:12:01 +08:00
lvxinran ac1ac7a734 商店修改,公会战信息移除修改 2019-08-27 15:07:44 +08:00
lvxinran 22689acb20 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-26 22:29:12 +08:00
wangyuan 48be1a6fe6 fix activity 2019-09-19 14:15:16 +08:00
lvxinran c9179ffa5b 公会战buff修改 2019-08-26 22:29:08 +08:00
lvxinran a3908a9927 暂时注释 2019-08-21 14:56:01 +08:00
lvxinran 9b63ef108c 修改 2019-08-21 14:09:14 +08:00
lvxinran 7e7d5a2eb4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.ja
2019-08-21 11:11:13 +08:00
lvxinran de6bee5ac6 公会战逻辑 2019-08-21 11:08:31 +08:00
wangyuan b3e7188023 session 2019-08-19 20:11:26 +08:00
wangyuan 69d72692df boss 2019-08-19 20:09:16 +08:00
wangyuan d750f4a5d4 fix days 2019-08-19 13:59:29 +08:00
wangyuan b2c5279b93 sendmail 2019-08-19 13:42:35 +08:00
wangyuan 5f7d6aec18 random 2019-08-19 11:07:51 +08:00
zhangshanxue 7b8fe61d8a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-19 10:43:09 +08:00
zhangshanxue 16a60a6fc6 妖兽gm 2019-08-19 10:42:47 +08:00
zhangshanxue b5932dec2a 战力排行 日志开关 2019-08-21 05:12:50 +08:00
wangyuan 069d544420 random 2019-08-19 10:41:16 +08:00
wangyuan 0a4dc241b3 boss id 2019-08-19 10:19:25 +08:00
wangyuan e2f3dcd278 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-17 18:51:23 +08:00
wangyuan e81666ab37 add task & mail 2019-08-17 18:50:47 +08:00
wangyuan 7b94b53fd9 guild walk 2019-08-17 16:21:23 +08:00
zhangshanxue aded46d464 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-17 15:26:48 +08:00
zhangshanxue 0de3509425 异妖拍脸 2019-08-17 15:26:37 +08:00
wangyuan 4459367da4 Merge branch 'project0.9' 2019-08-17 15:25:32 +08:00
wangyuan 8005f5d2c7 fix type 2019-08-17 15:23:40 +08:00
wangyuan 37d9d36e18 fix protobean 2019-08-17 15:17:48 +08:00
zhangshanxue 9456e7a1cc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-08-17 15:04:21 +08:00
wangyuan 134c51cdfa change adventure 2019-08-17 15:02:36 +08:00
wangyuan 4c9dc4245b fxi store 2019-08-17 14:49:17 +08:00
wangyuan 299f00200d fix store 2019-08-17 14:48:06 +08:00
wangyuan 92df10cfa7 fix bug 2019-08-17 14:44:25 +08:00
zhangshanxue d48947533b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-17 14:16:56 +08:00
zhangshanxue 7e80be3a92 兽潮来袭 37数据上报 2019-08-17 14:16:52 +08:00
zhangshanxue 5ef3705a1d acitvity 2019-08-17 13:46:40 +08:00
zhangshanxue cf4a4a61ab activity bug 2019-08-16 18:29:40 +08:00
wangyuan f154488f7f fix mission 2019-08-16 16:37:57 +08:00
zhangshanxue d83a28c2b3 acitvity 2019-08-16 16:12:51 +08:00
zhangshanxue cf996208a8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2019-08-16 10:10:21 +08:00
zhangshanxue aa102c8d29 妖兽来袭 2019-08-16 10:09:39 +08:00
zhangshanxue d6a6f25e82 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 08:56:11 +08:00
zhangshanxue 10470c3dc8 修复玩家活动数据 2019-08-21 08:56:02 +08:00
zhangshanxue 334083029e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-18 06:06:07 +08:00
zhangshanxue 9f5725f1ef 连续充值bug 2019-08-18 06:06:01 +08:00
wangyuan 37ea59cc50 发送全服数据 2019-08-20 19:43:45 +08:00
wangyuan 1f452b87f1 fix friend 2019-08-20 19:39:44 +08:00
wangyuan cc43c55367 工坊等级限制 2019-08-16 13:49:12 +08:00
lvxinran 0f4ef7a59e 战斗血量修改 2019-08-16 05:03:05 +08:00
wangyuan 87c2c32a44 fix mission 2019-08-15 21:04:40 +08:00
lvxinran ed50688201 公会战 2019-08-16 11:13:52 +08:00
wangyuan 07d68f5c69 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-15 18:30:01 +08:00
lvxinran b7cd108b76 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-20 08:16:58 +08:00
lvxinran ec0000e220 第一次十连抽 2019-08-20 08:16:53 +08:00
wangyuan 714599814e add task 2019-08-15 18:29:46 +08:00
wangyuan 95e7381a2e print tlog 2019-08-15 16:49:19 +08:00
wangyuan 94302befde fix activity 2019-08-14 15:14:29 +08:00
lvxinran 02e214f754 名字修改 2019-08-14 11:56:54 +08:00
lvxinran cd4ad1da3a 日志修改 2019-08-14 11:44:23 +08:00
lvxinran 2e72e3e3f6 名字长度 2019-08-14 11:31:17 +08:00
lvxinran 38715c4bfd 功绩修改 2019-08-14 13:12:54 +08:00
wangyuan f44da1b677 basehandler 构造方法 2019-08-18 18:15:07 +08:00
wangyuan 6046207b77 fix mail & store num & indication user level 2019-08-18 17:21:25 +08:00
zhangshanxue 6631ea50f3 协议解析 2019-08-13 17:11:38 +08:00
wangyuan 4255e37558 reason 2019-08-13 14:35:27 +08:00
lvxinran 80f7c4331e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 14:25:27 +08:00
lvxinran 39efb51a56 功绩难度修改 2019-08-13 14:25:23 +08:00
zhangshanxue 0fac895eb7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 13:18:49 +08:00
wangyuan 20a228b9b9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-19 00:01:07 +08:00
zhangshanxue 1638c42ea1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-13 10:36:03 +08:00
zhangshanxue fd7b37fc4a acitvity 2019-09-13 10:35:54 +08:00
wangyuan c20652705b fix ission 2019-08-19 00:00:56 +08:00
zhangshanxue ab42fa69bf 活动提示 2019-08-13 13:18:42 +08:00
lvxinran 829e51356d RedisUtil 2019-08-13 10:12:13 +08:00
lvxinran 9a1c002c4b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 10:09:37 +08:00
lvxinran 5e5832178d 公会战 2019-08-13 10:09:32 +08:00
lvxinran d301d88bdf 修改名字 2019-08-13 10:08:49 +08:00
wangyuan f16f1dbc99 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-13 10:08:16 +08:00
zhangshanxue 3844229238 acitvity 2019-08-13 10:07:57 +08:00
zhangshanxue 8c5e6a4cba acitvity 2019-09-13 09:35:30 +08:00
zhangshanxue 1d01fcf712 acitvity 2019-09-12 21:54:42 +08:00
zhangshanxue f76ce9cb43 acitvity 2019-09-12 21:39:52 +08:00
zhangshanxue c0293bd314 acitvity 2019-09-12 21:36:54 +08:00
wangyuan 480936bdc5 删除无效日志 2019-08-13 10:07:57 +08:00
zhangshanxue 087d03e8dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 21:07:17 +08:00
lvxinran 7b62901318 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:52:58 +08:00
lvxinran 81a443322a 公会战 2019-08-12 20:52:54 +08:00
zhangshanxue 4b3435799d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:27:43 +08:00
zhangshanxue b2d3f59164 活动结束补发奖励 2019-08-12 20:27:36 +08:00
wangyuan 4cdb969929 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 17:49:35 +08:00
wangyuan db8c4d43d9 同步用户状态 2019-08-12 17:49:20 +08:00
lvxinran f46031890a 上个修改 2019-08-12 17:32:06 +08:00
lvxinran d8fa42b0f4 公会战查看对战信息 2019-08-12 17:31:49 +08:00
lvxinran 9497535341 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 17:23:42 +08:00
lvxinran e27985bab6 功绩17修改 2019-08-12 17:23:38 +08:00
lvxinran 29c22526b5 增加RedisKey 2019-08-12 16:06:06 +08:00
lvxinran 6924500cd1 公会战逻辑修改 2019-08-12 16:05:43 +08:00
zhangshanxue a33043d8de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 16:00:58 +08:00
zhangshanxue c0509d25f2 acitvity 2019-08-12 16:00:36 +08:00
wangyuan a7ee427a08 fix limmit 2019-08-12 15:50:47 +08:00
lvxinran 1fe64c05cb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 14:30:36 +08:00
lvxinran 9364fbda6d 公会战开始战斗提交 2019-08-12 14:30:32 +08:00
wangyuan cbb6178449 delete log 2019-08-12 13:57:51 +08:00
wangyuan a076812220 fix special 2019-08-12 12:16:20 +08:00
zhangshanxue f6e25e2bae acitvity 2019-08-12 12:03:15 +08:00
wangyuan cff26b2110 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 11:15:51 +08:00
wangyuan 968cf84ebd delete unuse log 2019-08-12 11:15:41 +08:00
lvxinran 8395912f43 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 11:15:25 +08:00
lvxinran acc29668bc 编队ID修改 2019-08-12 11:15:21 +08:00
wangyuan 042f9310fe Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 10:29:02 +08:00
wangyuan a4144852d3 mission 合并 2019-08-12 10:28:49 +08:00
lvxinran f8645932db 计算英雄属性加入teamId 2019-08-12 10:28:00 +08:00
lvxinran 50606d6e24 0点刷新 2019-08-12 10:18:07 +08:00
wangyuan e7a8d82ec3 fix pool 2019-08-16 18:38:47 +08:00
wangyuan 25df23fd53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-16 17:46:49 +08:00
zhangshanxue 22b1156d7f acitvity 2019-08-18 05:01:41 +08:00
wangyuan a32e878367 51 task 2019-08-16 17:46:18 +08:00
wangyuan 725910f363 修改进度 2019-08-16 17:33:06 +08:00
wangyuan 64d7de1587 fix time 2019-08-10 17:19:30 +08:00
wangyuan 2011f1426b fix take time 2019-08-10 17:09:25 +08:00
wangyuan 7192faf883 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-10 17:08:46 +08:00
lvxinran eb6cdbc27b 名字限制 2019-08-10 16:36:21 +08:00
lvxinran dcf5a3bcfa 名字限制 2019-08-10 16:09:04 +08:00
wangyuan 975cd3f045 refresh 2019-08-10 15:51:43 +08:00
lvxinran ca477db687 名字限制修改 2019-08-10 15:34:22 +08:00
wangyuan 3719f64ec8 rank 2019-08-10 15:22:14 +08:00
wangyuan 0af7eb4a4c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-10 14:48:20 +08:00
wangyuan 707724627c guild walk 2019-08-10 14:47:56 +08:00
lvxinran cfe7d058f8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 14:46:57 +08:00
lvxinran 6ede1219a9 公会战布防接口 2019-08-10 14:46:53 +08:00
zhangshanxue 7a275f2ae0 签到刷新 2019-08-10 14:34:18 +08:00
zhangshanxue 56017c2dee 签到刷新 2019-10-01 05:01:31 +08:00
wangyuan dd0cab498d log 2019-08-10 12:08:03 +08:00
wangyuan e456ed0bd8 log 2019-08-10 11:57:18 +08:00
wangyuan efcb80483c store 2019-08-10 11:45:40 +08:00
wangyuan c0f7cefaaa store 2019-08-10 11:33:20 +08:00
wangyuan 4fd9a928b8 reward 2019-08-10 11:23:27 +08:00
wangyuan 3a2a281b81 progress 2019-08-10 11:17:03 +08:00
lvxinran 43458f5fc6 公会战 2019-08-10 10:58:30 +08:00
lvxinran 69c4b45ac3 公会战信息类 2019-08-10 10:58:12 +08:00
lvxinran eb040c2818 删除无用语句 2019-08-10 10:54:22 +08:00
lvxinran 4ab8b5f64c 删除防守方法提交 2019-08-10 10:53:29 +08:00
lvxinran 3d76b09eaf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 10:53:02 +08:00
lvxinran 24bcf89270 公会战修改 2019-08-10 10:52:58 +08:00
lvxinran e1824e12d5 个人战力 2019-08-10 10:52:16 +08:00
wangyuan 5d79d6ac4d extra add 2019-08-10 10:35:07 +08:00
zhangshanxue c20d6e97c5 活动开启bug 2019-08-10 21:17:43 +08:00
wangyuan 01c7ac7c8d 商店增益 2019-08-09 17:48:54 +08:00
wangyuan 957664c498 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
2019-08-09 17:17:20 +08:00
wangyuan 15ffc5a164 fix mission & guild walk 2019-08-09 17:14:45 +08:00
lvxinran 65bcc67faf 公会战布防修改 2019-08-09 15:06:00 +08:00
lvxinran 50cb1525c2 公会发送indication 2019-08-09 15:04:12 +08:00
lvxinran e3d9585568 功绩14、18修改 2019-08-09 14:34:30 +08:00
lvxinran 6d79100c20 功绩18修改 2019-08-09 11:43:10 +08:00
wangyuan 516c45c2da fix map mission 2019-08-09 11:14:33 +08:00
lvxinran 727cee1960 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:57:50 +08:00
lvxinran 7831d1bd16 公会信息 2019-08-09 10:57:30 +08:00
wangyuan c7fb73040b fix process 2019-08-09 10:56:00 +08:00
lvxinran 2c89f0782c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:44:49 +08:00
lvxinran e0388232dd RedisUtil冲突修改 2019-08-09 10:44:45 +08:00
lvxinran aaa15e6f29 公会修改 2019-08-09 10:42:37 +08:00
lvxinran da884a9773 功绩14修改 2019-08-09 10:42:09 +08:00
wangyuan 91c54cc985 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-09 10:24:35 +08:00
wangyuan b172a2971e guild 2019-08-09 10:24:17 +08:00
zhangshanxue 8ffaafc666 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:21:25 +08:00
zhangshanxue d325506268 activity 2019-08-09 10:21:15 +08:00
wangyuan aa519b6112 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-09 10:08:07 +08:00
wangyuan e7bcf6f9c0 mission 2019-08-09 10:06:43 +08:00
zhangshanxue 8293f6228f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 20:50:24 +08:00
zhangshanxue b7ef0d56fb activity 2019-08-08 20:50:15 +08:00
zhangshanxue b858e5f40a activity 2019-08-13 06:22:01 +08:00
zhangshanxue d43c1dbb6d activity 2019-08-13 05:13:22 +08:00
zhangshanxue da226e1311 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-15 16:51:35 +08:00
zhangshanxue 00d007663e acitvity 2019-08-09 16:50:55 +08:00
wangyuan b5e8f34b6f 外敌 2019-08-08 16:45:17 +08:00
lvxinran cb51c86ab6 功绩无法完成标识 2019-08-08 16:26:35 +08:00
lvxinran 83adab494f 功绩20修改 2019-08-08 16:22:30 +08:00
lvxinran 49ad73610d 功绩修改 2019-08-08 15:50:56 +08:00
wangyuan b0e090433a fix mission 2019-08-08 13:58:04 +08:00
wangyuan 4cd52c43f9 fix 2019-08-08 13:56:57 +08:00
wangyuan e096e71441 fix mission 2019-08-08 13:55:39 +08:00
wangyuan a58732ac9b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-08 13:52:13 +08:00
zhangshanxue 785fef38e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-08 13:49:41 +08:00
zhangshanxue 183d243708 达人排行 2019-10-08 13:49:37 +08:00
wangyuan 1c420aba0c 扣卷 2019-08-08 13:51:50 +08:00
wangyuan b2a4a89d4c 新手任务 2019-08-08 13:36:53 +08:00
wangyuan 2761bc3b76 fix activity 2019-08-08 11:35:15 +08:00
wangyuan a1250a948b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-08 11:26:22 +08:00
wangyuan ce45828fe4 activity 2019-08-08 11:26:01 +08:00
wangyuan ea1c8e921f default activity 2019-08-10 09:51:38 +08:00
wangyuan e857c31305 add white 2019-08-09 22:01:09 +08:00
lvxinran 007a926278 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 11:20:39 +08:00
lvxinran bef4bdc9b4 21功绩修改 2019-08-08 11:20:35 +08:00
zhangshanxue 1861d13d4e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 10:24:15 +08:00
zhangshanxue fcc7db592b 签到更新 2019-08-08 10:24:09 +08:00
wangyuan 80400ef521 fix taketimes 2019-08-07 21:37:37 +08:00
wangyuan 1d90144fdc fix map position 2019-08-07 20:55:47 +08:00
wangyuan ee127cfa06 recharge 2019-08-07 20:30:55 +08:00
wangyuan fa2f9a71ce maplogic 2019-08-07 19:38:35 +08:00
zhangshanxue d23e966a9f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:35:14 +08:00
zhangshanxue cff3b4acb8 活动事件 2019-08-07 18:35:10 +08:00
lvxinran 6e52113c19 表类提交 2019-08-07 18:18:24 +08:00
lvxinran 9fa5bf9b39 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:17:31 +08:00
lvxinran bf01f7443e 修改 2019-08-07 18:17:27 +08:00
wangyuan c9e4122464 check 2019-08-07 18:04:14 +08:00
zhangshanxue d3636636ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 17:54:24 +08:00
zhangshanxue 7d0388eaed 达人排行榜榜单调整 连续充值周期更新 2019-08-07 17:54:09 +08:00
wangyuan 4105d7359c 活动邮件 2019-08-07 17:32:51 +08:00
wangyuan a1db43c4e3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-07 16:30:39 +08:00
wangyuan b87d7a370e fix 合成英雄 2019-08-07 16:30:09 +08:00
lvxinran 4471d842e1 无尽开启地图 2019-08-07 15:35:34 +08:00
wangyuan 89ffd40206 fix seven time 2019-08-07 14:23:25 +08:00
wangyuan afda3018b4 fix misison 2019-08-07 14:21:09 +08:00
wangyuan 411ce97154 fix map 2019-08-07 13:55:37 +08:00
lvxinran 88d2cea85d 第一编队修改 2019-08-07 12:12:27 +08:00
zhangshanxue 3ea863dc2f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 09:55:28 +08:00
zhangshanxue fe7dabbcff 达人排行发奖 2019-08-10 09:55:24 +08:00
lvxinran 17f30d751a 战斗同步 2019-08-06 20:55:47 +08:00
wangyuan 5855a00391 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 20:27:51 +08:00
wangyuan af0a3f1228 领取奖励 & 修改地图坐标点 2019-08-06 20:27:08 +08:00
lvxinran 9f9166a64b 17功绩 2019-08-06 18:28:09 +08:00
lvxinran 69ca68785c 功绩21 2019-08-06 18:03:16 +08:00
lvxinran bac1c1b85d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 18:01:51 +08:00
lvxinran 9f91ab0331 功绩类型修改 2019-08-06 18:01:47 +08:00
zhangshanxue f3747d0bad Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 17:40:28 +08:00
wangyuan 833b0ae6ae 宗门时间 2019-08-06 17:36:45 +08:00
zhangshanxue d5352f79a7 连续充值 2019-08-06 17:31:59 +08:00
zhangshanxue 797a484250 达人排行榜奖励 2019-08-06 15:28:15 +08:00
wangyuan 24a5ada002 fix task hero type 2019-08-06 15:00:06 +08:00
wangyuan 294cdd8334 修复误删 2019-08-06 14:51:27 +08:00
lvxinran db1471aa13 无尽副本修改 2019-08-06 14:10:17 +08:00
wangyuan 6869a65f46 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 13:56:31 +08:00
wangyuan 2105ba3e50 mission 2019-08-06 13:56:17 +08:00
lvxinran 9c6e93016d 出图清除无尽数据 2019-08-06 11:51:39 +08:00
lvxinran d349910c40 无尽副本最后数据修改 2019-08-06 11:40:04 +08:00
zhangshanxue 61f49b7114 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	.gitignore
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2019-08-06 11:25:51 +08:00
lvxinran 564ee54d2c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 11:25:26 +08:00
lvxinran 25eaa56501 出图修改 2019-08-06 11:25:22 +08:00
zhangshanxue d0e36989e4 达人 每日首冲 连续充值 签到 累计充值 2019-08-06 11:20:46 +08:00
zhangshanxue ad95f83eee price err 2019-08-07 10:28:41 +08:00
wangyuan ac287305bb Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:44:20 +08:00
wangyuan 5988241e6c 周卡 2019-08-06 10:43:36 +08:00
lvxinran f9febb2dcd 获取第一编队修改 2019-08-06 10:36:21 +08:00
lvxinran 30abfc1d1c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 10:30:48 +08:00
lvxinran 3558ad8ec0 无尽副本出图 2019-08-06 10:30:43 +08:00
wangyuan bb3464a4fa Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:23:53 +08:00
wangyuan 5072341a07 guild 2019-08-06 10:22:57 +08:00
lvxinran c647d31458 出图修改 2019-08-05 17:24:50 +08:00
wangyuan 3486dbe98c giftgoods 2019-08-05 17:07:01 +08:00
zhangshanxue add03799c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2019-08-05 17:02:29 +08:00
zhangshanxue 919163f51b 每日首冲和累计充值天数 2019-08-05 17:00:06 +08:00
wangyuan b4e7cf3e5d vip level task 2019-08-05 15:58:48 +08:00
lvxinran 8f588acb05 无尽副本修改 2019-08-05 15:43:29 +08:00
lvxinran 981c3f163a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-05 15:41:08 +08:00
wangyuan f52c4f5462 fix activity flush five 2019-08-05 15:20:12 +08:00
lvxinran fc9e2c54fe 无尽副本修改 2019-08-05 15:09:18 +08:00
wangyuan 7f5ccf558b 活动掉落 2019-08-05 15:07:47 +08:00
wangyuan 54c4f06df1 fix new mission 2019-08-05 11:30:58 +08:00
wangyuan 9cb5277436 new task 2019-08-05 11:27:13 +08:00
wangyuan f90bbee15a 公会 2019-08-05 10:02:29 +08:00
lvxinran bfa231635c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 16:51:21 +08:00
lvxinran f2556361e7 定时 2019-08-03 16:51:12 +08:00
wangyuan eef97e054a fix family & task 2019-08-03 16:49:47 +08:00
wangyuan 703a7686b9 离开公会 2019-08-03 16:15:38 +08:00
lvxinran e5110e48e5 无尽副本,自动回复提交 2019-08-03 15:46:23 +08:00
wangyuan f187a5043b beginner task 2019-08-03 14:59:20 +08:00
zhangshanxue dba41c51a3 活动初始化和漏刷 2019-08-03 11:02:03 +08:00
zhangshanxue b05268b766 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 09:59:45 +08:00
zhangshanxue 3167653418 战力排行 2019-08-03 09:59:18 +08:00
zhangshanxue 5f5c7ba5f1 排行榜 2019-08-02 18:30:13 +08:00
lvxinran 27e3ec0380 无尽副本修改 2019-08-02 14:57:56 +08:00
zhangshanxue f4665ee4c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-02 13:35:33 +08:00
zhangshanxue 3edd6e7ebc 战力排行 2019-08-02 13:34:37 +08:00
wangyuan dfc0ca056c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-02 09:59:09 +08:00
wangyuan d8ce89bd38 family 2019-08-02 09:57:01 +08:00
lvxinran e045241e91 标志修改 2019-08-01 20:57:41 +08:00
lvxinran b3f597083a 设置无尽副本点 2019-08-01 20:45:20 +08:00
lvxinran ab071737d5 代码提交 2019-08-01 18:37:46 +08:00
lvxinran ef94caf44e 无尽副本提交 2019-08-01 18:27:17 +08:00
lvxinran 8e1a7efd45 无尽副本提交 2019-08-01 18:23:49 +08:00
wangyuan 54407dabe6 fix guild 2019-08-01 18:16:03 +08:00
zhangshanxue 0f34c27c48 招财猫 2019-08-01 17:33:30 +08:00
zhangshanxue 75555828e4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-01 14:45:16 +08:00
zhangshanxue 63b7f3ee86 战力排行 2019-08-01 14:15:19 +08:00
wangyuan 7e5eb8ece8 fix map 2019-08-01 11:20:09 +08:00
wangyuan 7131ed8204 s table 2019-08-01 11:11:56 +08:00
wangyuan be43c5af87 fix guild 2019-08-01 11:10:41 +08:00
wangyuan cf006d2184 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-01 10:10:28 +08:00
wangyuan acffeefb07 guild & fix map 2019-08-01 10:09:19 +08:00
zhangshanxue 6a6ca5451c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2019-07-31 18:20:40 +08:00
wangyuan fdc0501110 activity 2019-07-31 17:48:16 +08:00
zhangshanxue b5e8d25658 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
2019-07-31 17:28:10 +08:00
zhangshanxue 3943db124d 招财猫 2019-07-31 17:15:06 +08:00
lvxinran 52f8538e99 gamesetting修改 2019-07-31 10:51:28 +08:00
wangyuan 84c70e7b10 fxi map & serven happy 2019-07-31 10:29:23 +08:00
wangyuan 0ab956e693 急速探险花费道具 2019-07-30 20:05:37 +08:00
wangyuan b34c233a21 fix treasure 2019-07-30 19:49:46 +08:00
wangyuan 6421cedac6 kt upload fix 2019-07-30 18:10:14 +08:00
wangyuan 7bb5acac24 update activity indication 2019-07-30 17:51:04 +08:00
wangyuan 830fc18252 map 2019-07-30 14:33:57 +08:00
wangyuan b5873e24c4 条件类型7 & 跳转类型11 2019-07-30 14:05:55 +08:00
lvxinran 618704add2 45不推任务 2019-07-30 11:46:40 +08:00
wangyuan 982d97cd84 kt parm 2019-07-30 11:18:09 +08:00
lvxinran 4be1818716 图内被动技能清除 2019-07-30 09:58:45 +08:00
wangyuan abd1e46d6e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-29 20:20:36 +08:00
wangyuan 45e38873d9 upload 2019-07-29 19:42:57 +08:00
lvxinran c21467a109 埋点 2019-07-29 19:42:16 +08:00
wangyuan 5851bfde6d createure 2019-07-29 17:31:06 +08:00
lvxinran 69c20ea03c 行为类型提交,试炼副本时间修改 2019-07-29 14:48:10 +08:00
wangyuan 7f384fc087 mapmission 2019-07-29 10:02:24 +08:00
lvxinran 5ce990e6ff 45behaivor 2019-07-29 09:46:02 +08:00
wangyuan 10dfabfd50 arena mail 2019-07-26 18:33:27 +08:00
wangyuan 65d65a597b treasure 2019-07-26 17:27:39 +08:00
wangyuan 09dcb7ffe4 arena score 2019-07-26 17:04:07 +08:00
wangyuan 5950e80017 mission view 2019-07-26 16:43:23 +08:00
lvxinran b3911c9734 behavior7 2019-07-26 16:27:35 +08:00
lvxinran 7622bf801f 类型7 2019-07-26 15:50:06 +08:00
lvxinran b32a06a43e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-26 14:41:55 +08:00
lvxinran 3bb3477357 孙龙宝藏GM 2019-07-26 14:41:47 +08:00
wangyuan f74badcd6d robot force 2019-07-26 14:29:31 +08:00
wangyuan 3347c2f92a pokemon force 2019-07-26 13:35:16 +08:00
lvxinran 2ec53a6b2d 功绩21修改 2019-07-26 11:27:53 +08:00
lvxinran 1b0e077f75 新的功绩类型21 2019-07-26 11:09:39 +08:00
lvxinran 13d00e36d0 云梦祈福刷新修改 2019-07-26 09:53:46 +08:00
lvxinran 9bf412c5c4 云梦祈福修改 2019-07-25 20:37:36 +08:00
wangyuan 2237a35f82 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-25 19:34:37 +08:00
wangyuan cbcb8ae72e time recovery 2019-07-25 19:34:21 +08:00
lvxinran 4b96a91122 装备锁定解锁 2019-07-25 17:46:09 +08:00
lvxinran 00f9935ef8 云梦祈福常量修改 2019-07-25 16:37:35 +08:00
lvxinran 7ff90d3a74 时间修改 2019-07-25 15:44:10 +08:00
wangyuan 77d4d2c791 star reward 2019-07-25 15:22:11 +08:00
wangyuan 2cb68aebbb match 2019-07-25 15:05:30 +08:00
wangyuan f40ed6ea41 精英怪冰冻时间 2019-07-25 13:48:03 +08:00
wangyuan 15a12ec5ca 修复活动数据没有入库 2019-07-25 11:43:33 +08:00
lvxinran 08153b9bfd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-25 11:08:09 +08:00
lvxinran 3d9ee7400a 头像框修改 2019-07-25 11:08:05 +08:00
wangyuan faf64f5339 mission 2019-07-25 11:00:12 +08:00
wangyuan 172ddbbd95 删除红点 2019-07-25 10:29:27 +08:00
wangyuan 212d34ca3f treasure 2019-07-25 10:01:38 +08:00
wangyuan 2f628f1b10 7 2019-07-24 21:56:21 +08:00
lvxinran 668635d0ef 云梦祈福初始化 2019-07-24 21:56:04 +08:00
wangyuan 538f965b32 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-24 20:47:25 +08:00
wangyuan 12448b77c2 item flush 2019-07-24 20:47:11 +08:00
lvxinran e5b63f835e 提交 2019-07-24 19:45:24 +08:00
wangyuan f7f0b30645 item recovey 2019-07-24 19:42:10 +08:00
wangyuan 74aadb0f82 force 2019-07-24 17:51:33 +08:00
lvxinran 9c0b47c8f9 功绩修改 2019-07-24 16:10:53 +08:00
wangyuan 525bf2eafe push mission 2019-07-24 15:49:20 +08:00
wangyuan 5fa727711c 装备邮件 2019-07-24 15:39:13 +08:00
wangyuan e772fe4630 delete log 2019-07-24 15:27:18 +08:00
wangyuan 306e57a1de 公式修改 2019-07-24 15:25:34 +08:00
wangyuan b357fa2aa2 mission 2019-07-24 15:14:14 +08:00
wangyuan 557ac14709 teamid 2019-07-24 15:02:14 +08:00
wangyuan e1b0b71d7f treasure 2019-07-24 15:00:26 +08:00
wangyuan b89aa9a2a0 fix map 2019-07-24 14:43:33 +08:00
wangyuan c1d9f8fdb0 fix 2019-07-24 14:25:48 +08:00
wangyuan 9943d08dba fix hero 2019-07-24 14:24:07 +08:00
wangyuan eca6706f75 item 2019-07-24 13:52:07 +08:00
wangyuan 672b7990c3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-07-24 13:47:27 +08:00
wangyuan 030e0f728e mission & store 2019-07-24 13:46:40 +08:00
lvxinran 4fe6793c59 阵营光环当前生命值修复 2019-07-24 13:42:30 +08:00
lvxinran db732001aa 44行为类型 2019-07-23 21:52:07 +08:00
lvxinran d677a1066c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-23 21:01:46 +08:00
lvxinran d5c4168295 刷新次数修改 2019-07-23 21:01:41 +08:00
wangyuan 26270ae6da Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 20:35:29 +08:00
wangyuan 3e6b25bb3d 孙龙的任务 2019-07-23 20:35:15 +08:00
lvxinran f96932c50a 元素共鸣报错修改 2019-07-23 18:04:16 +08:00
wangyuan 34dac1a17f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 18:03:01 +08:00
wangyuan 4c12b893da mission 2019-07-23 18:00:46 +08:00
lvxinran dda168c324 云梦祈福逻辑提交 2019-07-23 17:41:48 +08:00
lvxinran ea89394c70 云梦祈福结构修改 2019-07-23 11:18:44 +08:00
wangyuan 060e554809 item fresh 2019-07-23 10:01:43 +08:00
wangyuan 4a9d1812af storelogic 2019-07-22 18:18:47 +08:00
wangyuan fbcee502b6 buy goods 2019-07-22 17:42:49 +08:00
wangyuan f814586624 recharge 2019-07-25 07:16:34 +08:00
lvxinran cfbc1eb00e 光环提交 2019-07-22 16:13:15 +08:00
lvxinran 3e70a0384c 阵营光环上线 2019-07-22 15:53:50 +08:00
lvxinran b3db193d36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-22 15:33:49 +08:00
wangyuan 869c9ec15c conf 2019-07-25 06:08:30 +08:00
wangyuan 36acef4ac1 conf 2019-07-25 05:45:58 +08:00
wangyuan 2e49142f07 mision 2019-07-25 05:08:59 +08:00
wangyuan c113ff4481 fix 2019-07-23 13:51:43 +08:00
lvxinran 3b386e47b5 设置teamId 2019-07-22 15:33:45 +08:00
wangyuan e90e414522 buy goods 2019-07-22 13:45:47 +08:00
wangyuan 8ba85e72fc goods 2019-07-22 11:58:41 +08:00
wangyuan f6e9d89873 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-22 11:58:17 +08:00
wangyuan 4cac791acb mail 2019-07-22 11:36:58 +08:00
lvxinran 352472345b 12点事件,头像框提交 2019-07-22 11:11:06 +08:00
wangyuan a5438e7e5c fix goods 2019-07-22 10:32:19 +08:00
wangyuan cf00d2c7de Merge branch 'online1.0' 2019-07-22 10:19:16 +08:00
wangyuan a142e3d3d8 fix goods 2019-07-22 10:16:47 +08:00
wangyuan 5dde031242 blood fix 2019-07-19 16:59:35 +08:00
wangyuan 3b950da80e fix conf 2019-07-19 15:46:09 +08:00
wangyuan a8104095d0 扫荡要加个精英怪信息 2019-07-19 14:53:35 +08:00
wangyuan dd612ca743 秘境奖励首次免费领取 2019-07-19 13:33:41 +08:00
wangyuan c70999553a fix activity 2019-07-18 19:17:36 +08:00
wangyuan d9f193c552 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2019-07-18 19:06:35 +08:00
wangyuan 416f0153b4 gift & battle 2019-07-18 19:04:04 +08:00
lvxinran 35cacefab0 修改 2019-07-18 18:43:15 +08:00
lvxinran 124b7b5e0f 头像框修改、初始化提交 2019-07-18 17:46:17 +08:00
lvxinran a25dc800dc 元素类提交 2019-07-18 12:13:19 +08:00
lvxinran f0e926a3f9 精英本功绩修改,元素共鸣代码提交 2019-07-17 20:15:48 +08:00
wangyuan bed7997dcc Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-17 15:15:41 +08:00
wangyuan eab4d85aa3 礼包 & 血战 2019-07-17 15:15:29 +08:00
lvxinran a4bc032cf2 试炼层级奖励领取 2019-07-17 10:21:11 +08:00
lvxinran 8381fd8008 装备图鉴 2019-07-17 10:14:03 +08:00
wangyuan 07ddd2c06a skip fight snap 2019-07-16 20:24:33 +08:00
wangyuan 885bdebaff match & drop hero per 2019-07-16 18:31:32 +08:00
lvxinran 195535617e 商店修改、表格结构修改 2019-07-16 18:07:23 +08:00
lvxinran bbf6b94cba 功绩类新添加、图鉴添加 2019-07-16 17:39:34 +08:00
wangyuan eaa9ffcd43 血战 2019-07-16 15:21:13 +08:00
wangyuan 96bf0a392e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-16 13:40:17 +08:00
wangyuan 63e131e40f 云游商店 2019-07-16 13:40:05 +08:00
lvxinran aa5d85b68a 战斗逻辑错误修改 2019-07-16 11:26:54 +08:00
wangyuan 63d3168ffa 抽卡送宝箱 2019-07-16 10:58:11 +08:00
wangyuan 405da77bb0 根据数组索引就行随机 2019-07-15 17:41:36 +08:00
wangyuan 28914e672c fix 7 2019-07-15 17:29:51 +08:00
lvxinran 89affcf6c1 位置修改 2019-07-15 17:20:05 +08:00
gaojie 63a9dcbf5e fix 2019-07-15 16:59:48 +08:00
lvxinran c919681cc2 无关注释删除 2019-07-15 16:37:43 +08:00
lvxinran 8e727965dd 精英本扫荡 2019-07-15 16:34:26 +08:00
wangyuan bbbd5d2344 Merge branch 'online1.0' 2019-07-15 15:16:45 +08:00
wangyuan 36b1071efc 行为类型7 2019-07-15 14:35:38 +08:00
wangyuan 534886c920 Merge branch 'online1.0' 2019-07-15 11:00:49 +08:00
wangyuan fb2b2ff379 修改计算 2019-07-15 10:41:36 +08:00
lvxinran 4dfc832ca2 Merge branch 'online1.0' 2019-07-12 18:26:07 +08:00
gaojie 6add54c66b 好友推送状态 2019-07-12 17:29:49 +08:00
gaojie 55c7f19b45 Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0 2019-07-12 16:54:31 +08:00
gaojie 934185db65 删除好友保留之前赠送体力状态 2019-07-12 16:54:27 +08:00
gaojie d73d77c28e 好友赠送体力 2019-07-13 11:56:36 +08:00
wangyuan 956e689396 mission 2019-07-12 16:48:38 +08:00
lvxinran 84654cb0fd Merge branch 'online1.0' 2019-07-12 14:45:56 +08:00
wangyuan 242be06ec4 fix daily mission 2019-07-12 14:44:31 +08:00
lvxinran 6fb6390d60 随机数修改 2019-07-12 13:33:56 +08:00
lvxinran 24eca20b07 功绩事件类型添加 2019-07-12 11:21:33 +08:00
lvxinran 98e2309523 装备特性随机提交 2019-07-12 10:19:23 +08:00
lvxinran 3b2ebae2c5 试炼最高层处理 2019-07-11 17:12:11 +08:00
wangyuan e88a8fd3b5 thread 2019-07-15 16:50:54 +08:00
lvxinran 1e572b1142 日志修改 2019-07-11 15:14:46 +08:00
lvxinran 9c1533621f 试炼重置修改、排行榜协议修改 2019-07-11 14:50:57 +08:00
lvxinran 69da7e98ca 试炼排行榜修改 2019-07-11 11:02:33 +08:00
wangyuan 71e36e025d red & fix vip mission 2019-07-11 10:57:13 +08:00
lvxinran 628ff1a05c 删除无关注释 2019-07-11 10:36:04 +08:00
lvxinran 9b051399b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-11 10:06:09 +08:00
lvxinran 35c69631b2 试炼排行榜实现 2019-07-11 10:06:05 +08:00
gaojie 745ddbeadf 统一线程处理数据 2019-07-11 10:02:18 +08:00
wangyuan 2d11d1485e red point 2019-07-10 19:48:45 +08:00
gaojie bdc04f8046 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-10 15:21:57 +08:00
gaojie cbd0e4d78c 请求所需的时间 2019-07-10 15:21:13 +08:00
lvxinran f602185b16 buff不生效修改 2019-07-10 15:07:43 +08:00
wangyuan 444bcddf9b red 2019-07-18 21:14:47 +08:00
wangyuan aa2396aa44 fix upload 2019-07-09 20:22:16 +08:00
lvxinran fcd3811495 试炼商店修改 2019-07-09 18:25:12 +08:00
wangyuan eed7984934 data upload 2019-07-09 18:03:12 +08:00
lvxinran c8965f70cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-09 17:57:02 +08:00
lvxinran 88eb2cb440 试炼商店修改 2019-07-09 17:56:58 +08:00
gaojie 8e7b04b6a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-09 16:05:14 +08:00
gaojie 55bcdafa24 fix 2019-07-09 16:05:10 +08:00
wangyuan 287f00ef47 delete log 2019-07-09 16:02:44 +08:00
wangyuan 431d82b163 item 2019-07-09 16:00:46 +08:00
lvxinran 4d0a4d312d 五点刷新白名单 2019-07-09 05:06:41 +08:00
lvxinran ed20d889cb 召唤首领修改 2019-07-08 19:56:25 +08:00
lvxinran cab55a367c 爬塔时间修改 2019-07-08 19:54:57 +08:00
wangyuan 1b49020695 hotfix lua 2019-07-08 18:10:40 +08:00
wangyuan e67bf61141 删除完成活动 2019-07-08 17:24:26 +08:00
gaojie db5ddc0fcc fix 2019-07-08 16:58:02 +08:00
wangyuan 96bcf70018 data upload 2019-07-08 15:26:03 +08:00
wangyuan 80bf7abc1a fix time 2019-07-08 13:34:09 +08:00
wangyuan bea4839821 fix 2019-07-08 13:14:40 +08:00
wangyuan 96c2665505 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-08 12:55:40 +08:00
wangyuan 4cd3f99c1c red indition & recharge 2019-07-08 12:51:54 +08:00
gaojie cadbc57677 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
2019-07-08 10:48:23 +08:00
gaojie 21c50c2383 屏蔽敏感校验 2019-07-08 10:47:54 +08:00
wangyuan f3bcc3c516 fix 2019-07-05 20:44:33 +08:00
wangyuan 002557fad1 数据上报 2019-07-05 20:44:18 +08:00
wangyuan c333aade20 delete return 2019-07-05 18:58:46 +08:00
wangyuan 6a7d9a2ba4 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-05 18:19:03 +08:00
wangyuan 1108c04935 kt http upload 2019-07-05 18:18:31 +08:00
jiahuiwen 891bd568b6 热更表版本判断 2019-07-05 16:13:07 +08:00
jiahuiwen 5217601d47 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-05 15:59:00 +08:00
jiahuiwen aeeeb61995 打包版本号 2019-07-05 15:58:53 +08:00
lvxinran 9e2cf35c4e 错误修改 2019-07-05 15:48:32 +08:00
lvxinran 50f3127f01 Data参数提交 2019-07-05 15:00:11 +08:00
jiahuiwen 269d4e0267 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-05 14:53:28 +08:00
jiahuiwen ea12488b93 调用热更新 2019-07-05 14:52:54 +08:00
wangyuan 5b389f9b09 聊天不校验特殊字符 2019-07-05 14:41:15 +08:00
wangyuan 99d2828a6c send http 2019-07-05 14:13:59 +08:00
lvxinran be52cac2bb 登陆数据接收 2019-07-05 13:49:16 +08:00
wangyuan c614a976e0 kt 2019-07-20 16:07:05 +08:00
wangyuan ae717d5caa decompase 2019-07-20 15:07:10 +08:00
wangyuan 4920b68b41 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java
2019-07-20 14:51:01 +08:00
wangyuan 506e1b4277 日志上报动态参数 2019-07-19 13:43:16 +08:00
lvxinran cec1a85669 代码修改提交 2019-07-05 10:15:02 +08:00
wangyuan c0cf345b40 mail red 2019-07-05 03:04:24 +08:00
lvxinran 2416934b0f conf 2019-07-05 02:14:18 +08:00
lvxinran 58c8dfc970 提交 2019-07-05 01:27:59 +08:00
lvxinran 4877b24cc8 conf 2019-07-05 01:12:53 +08:00
wangyuan cb747e49dc delete open server mail 2019-07-04 23:12:58 +08:00
wangyuan b4828b943c fix adventure left 2019-07-04 23:05:37 +08:00
wangyuan 4c799d300a adventure fix 2019-07-04 21:54:41 +08:00
lvxinran 5238704d95 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 21:48:10 +08:00
lvxinran 72a7ef8a1f 修复重置扫荡 2019-07-04 21:46:21 +08:00
wangyuan 16b8210460 fix force 2019-07-04 21:44:13 +08:00
wangyuan a4d3c653fe kt 2019-07-04 21:27:18 +08:00
lvxinran 3870c87694 字段修改 2019-07-04 20:26:26 +08:00
lvxinran 232159bf22 BIReason修改,副本难度暂存修改 2019-07-04 20:19:44 +08:00
lvxinran 1d17e074d1 精英副本难度记录实现 2019-07-04 17:58:37 +08:00
wangyuan 9e74d3dbc4 delete http pool 2019-07-04 17:46:59 +08:00
gaojie 3946bdc27b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 17:27:20 +08:00
gaojie 9547d08080 使用道具 2019-07-04 17:27:16 +08:00
wangyuan f6bb11312f print log 2019-07-07 15:46:49 +08:00
wangyuan 0c11ff2e4d conf & test lua & mission 2019-07-04 17:11:08 +08:00
gaojie ea2353bb06 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 15:43:16 +08:00
gaojie ea09857a64 好友信息 2019-07-04 15:42:57 +08:00
lvxinran a2d5ecd93a 试炼掉出地图重置修改 2019-07-04 15:38:01 +08:00
gaojie 6fafd9c49b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 14:41:52 +08:00
gaojie 788c92b0e8 httppool fix 2019-07-04 14:41:47 +08:00
lvxinran 39825d03cd 开天接数据方法提交 2019-07-04 14:40:01 +08:00
wangyuan 14983f6ccb log 2019-07-06 14:11:52 +08:00
wangyuan a76bfb8249 skip new player 2019-07-06 13:51:13 +08:00
wangyuan f9b7f8b7c2 mail 2019-07-06 12:24:38 +08:00
gaojie 3a73c47823 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 11:33:52 +08:00
wangyuan bf451dd19b log 2019-07-05 22:36:07 +08:00
gaojie 31988bce68 fix 2019-07-04 11:33:18 +08:00
lvxinran 85b0837e31 战斗buff修复 2019-07-03 21:48:06 +08:00
lvxinran 997a6edb3e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 21:47:37 +08:00
lvxinran 1d994ccee2 GM外敌 2019-07-03 21:15:47 +08:00
wangyuan 1f538c8faa conf & map & ktbean 2019-07-03 20:57:47 +08:00
gaojie 19c2e880ee Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-07-03 19:16:48 +08:00
gaojie 134c779373 同步数据 2019-07-03 19:15:54 +08:00
lvxinran 63107c3af7 41行为类型添加 2019-07-03 18:28:04 +08:00
lvxinran 4d4a47dd0f 爬塔奖励第一层修改 2019-07-03 17:00:05 +08:00
lvxinran 24b4080062 扫荡修改 2019-07-03 16:25:25 +08:00
lvxinran 181649ee07 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 16:16:20 +08:00
lvxinran 12bb758a38 试炼奖励修复 2019-07-03 16:16:16 +08:00
wangyuan becff88ad7 kill reward 2019-07-03 14:22:54 +08:00
wangyuan 46e9d4c318 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-03 14:08:59 +08:00
wangyuan bd763bcb1c fix map sweep 2019-07-03 14:08:51 +08:00
lvxinran 78d14781c8 服务器报错修改 2019-07-03 12:14:03 +08:00
gaojie d6079d0964 fix 2019-07-03 11:59:35 +08:00
gaojie 5781cad3f8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:53:35 +08:00
gaojie 6ef92b7d2d 上报数据 2019-07-03 11:53:30 +08:00
lvxinran 5cf515aa1a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:41:03 +08:00
lvxinran 309069c622 试炼精气值修改 2019-07-03 11:40:59 +08:00
gaojie 4bd4b07f88 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:32:48 +08:00
gaojie c76141c21e fix 2019-07-03 11:31:59 +08:00
lvxinran 3e3de9e38d 试炼重置修改 2019-07-03 11:17:41 +08:00
lvxinran 69f2522702 日志打印修改 2019-07-03 10:00:29 +08:00
lvxinran 57d77bea09 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 22:51:11 +08:00
lvxinran ec27295b72 日志修改,重置buff修改 2019-07-02 22:51:07 +08:00
wangyuan c7ef7294ff food buffer 2019-07-02 22:49:27 +08:00
wangyuan 33cd931e82 fix 2019-07-02 22:09:38 +08:00
wangyuan c5261cc9be mapmanager 2019-07-02 21:58:04 +08:00
lvxinran f4f72607cc 爬塔时间修改 2019-07-02 21:37:59 +08:00
wangyuan ab5f807e7d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 21:16:14 +08:00
wangyuan fe3bac1880 rechage 2019-07-02 21:14:48 +08:00
lvxinran 71f01bc239 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 21:10:47 +08:00
lvxinran 8b5daa805d 时间修改 2019-07-02 21:10:42 +08:00
wangyuan 4622b3ff8e Merge branches 'master' and 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 19:54:02 +08:00
wangyuan 4bc16b9c3a 每日任务首次计数 2019-07-02 19:45:52 +08:00
wangyuan 19fcb74513 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 18:57:06 +08:00
jiahuiwen 2cac0935cb 爬塔副本 未初始精英怪bug 2019-07-02 18:12:27 +08:00
gaojie 074cd07972 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 17:52:40 +08:00
gaojie feb2dbe8f4 关卡扫荡 2019-07-02 17:52:31 +08:00
wangyuan 57a9809a48 sweep 2019-07-02 17:19:32 +08:00
lvxinran 07d172257a 爬塔buff修改 2019-07-02 17:12:51 +08:00
wangyuan 659f0f6945 修复迷雾森林 2019-07-02 16:38:11 +08:00
gaojie f834a14c59 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 15:36:31 +08:00
wangyuan 0a832f3e08 修复任务 2019-07-12 15:20:03 +08:00
wangyuan b449d4166e fix daily mission 2019-07-12 15:14:11 +08:00
gaojie 5724c775ec 系统邮件一分钟从数据库中取一次 2019-07-02 15:35:58 +08:00
lvxinran caafce3a02 回滚 2019-07-02 15:01:31 +08:00
lvxinran 02124be971 爬塔商店修改 2019-07-02 13:56:57 +08:00
lvxinran 4e670fea26 fix tower shop 2019-07-02 09:57:19 +08:00
wangyuan ba2a9bf57a mission 2019-07-10 22:37:28 +08:00
wangyuan 8576327656 mission 2019-07-10 22:37:13 +08:00
wangyuan 1e34fc8993 fix 2019-07-08 22:03:17 +08:00
wangyuan b74d2b13b6 fix 2019-07-08 22:02:39 +08:00
wangyuan 4f2b52a685 扫荡计数 2019-07-08 21:22:26 +08:00
wangyuan aaa50d506f fix type 2019-07-08 21:10:37 +08:00
wangyuan ee5a9d752f fix 2019-07-07 21:08:36 +08:00
wangyuan c8b8961ac4 mission open 2019-07-07 21:07:53 +08:00
wangyuan eb81581ee1 fix function type 2019-07-07 20:38:48 +08:00
lvxinran dc92619cbe 爬塔最后一层时间、爬塔扫荡、退出地图修改 2019-07-01 20:28:42 +08:00
wangyuan 1c7be8d183 FIX 2019-07-07 20:22:38 +08:00
wangyuan 38950f5f46 修复体力80问题 2019-07-06 18:51:56 +08:00
wangyuan 7a4ef76467 fix 2019-07-06 18:25:12 +08:00
wangyuan bd54eea409 fix mission 2019-07-06 18:22:14 +08:00
wangyuan 1f4eea88c0 fix hero 2019-07-06 18:04:17 +08:00
lvxinran 1846fed4c9 爬塔修改 2019-07-01 18:00:39 +08:00
lvxinran 58a2d9e87a 试炼更新 2019-07-01 17:29:39 +08:00
wangyuan 6e71bccd2a conf 2019-07-02 13:01:43 +08:00
gaojie fb63575f3f 体力上限 2019-07-01 12:00:55 +08:00
gaojie 681e26ae0a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-01 11:28:24 +08:00
gaojie 4d31031f31 log 2019-07-01 11:26:42 +08:00
wangyuan be4cabc23b fix mission 2019-06-29 16:49:09 +08:00
lvxinran de2b8cf853 试炼副本相关提交 2019-06-29 16:29:28 +08:00
wangyuan 92d17073ae fix force 2019-06-29 16:22:34 +08:00
wangyuan 51257cda85 坐标 2019-06-29 11:06:33 +08:00
lvxinran 4dd64f4237 试炼爬塔副本相关提交 2019-06-29 10:11:52 +08:00
lvxinran 23aa6369c7 Hero信息修改 2019-06-28 19:19:00 +08:00
wangyuan 50fdae30bf fix 2019-06-30 20:14:40 +08:00
wangyuan d064d102ab new event type 2019-06-30 20:11:34 +08:00
wangyuan 0f7550d798 misison 2019-06-30 19:59:49 +08:00
wangyuan f979eb10a2 任务 2019-06-30 19:24:45 +08:00
wangyuan 62340bf943 击杀奖励 2019-06-30 15:39:15 +08:00
wangyuan 8ec7059ba1 fix 2019-06-28 11:54:26 +08:00
wangyuan 1128d19217 领取秘境奖励次数 2019-06-28 11:24:17 +08:00
wangyuan a13cd2de02 fix work shop 2019-06-27 20:50:42 +08:00
wangyuan 0204a27a38 fix skip fight 2019-06-27 19:32:03 +08:00
wangyuan 121c465496 创角时间 2019-06-27 18:06:00 +08:00
wangyuan 18cd2bd4b9 fix 40 2019-06-27 17:45:25 +08:00
wangyuan 82c1fc4dd8 挂机 2019-06-27 17:34:21 +08:00
wangyuan 1655043499 fix skip boss 2019-06-27 17:08:56 +08:00
lvxinran 09a19a126b 表格信息更改 2019-06-27 14:56:23 +08:00
wangyuan e5cf962cee 地图类型40 2019-06-27 14:08:10 +08:00
wangyuan f7ee8b388e 修复日常任务多穿了一个参数 2019-06-26 20:55:11 +08:00
jiahuiwen 2a3c2988f2 删除 2019-06-26 19:01:43 +08:00
jiahuiwen 7cea727ea5 删除多余方法 2019-06-26 18:57:58 +08:00
jiahuiwen 79bc55a648 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-06-26 18:56:47 +08:00
jiahuiwen 6a806eca6d 爬塔副本 2019-06-26 18:56:15 +08:00
wangyuan ec6c26e8a9 自动删除精英怪坐标 2019-06-26 18:04:54 +08:00
wangyuan 5dbcbb4bd3 fix 2019-06-26 16:25:39 +08:00
wangyuan 84093dd1a4 battle 2019-06-26 16:02:31 +08:00
wangyuan 587c317dc4 fix 2019-06-26 15:02:21 +08:00
lvxinran 9245d843b7 线程管理单例修改 2019-06-26 14:49:47 +08:00
lvxinran 7ee6ab2961 修改系统时间延迟修改 2019-06-26 13:40:20 +08:00
wangyuan a9f8d02ece 功绩奖励-》一维数组 2019-06-26 10:36:11 +08:00
jiahuiwen 4b612732ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 20:03:41 +08:00
jiahuiwen d9bf43b0d1 爬塔副本 2019-06-25 20:03:36 +08:00
gaojie 62f5c925e0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 19:41:26 +08:00
gaojie 7fe45e7d71 装备打造跑马灯 2019-06-25 19:41:18 +08:00
jiahuiwen 9c4d61065b 炸弹id 2019-06-25 18:06:16 +08:00
jiahuiwen c010b09b78 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 17:14:15 +08:00
jiahuiwen c3037991e6 爬塔副本 2019-06-25 17:14:08 +08:00
wangyuan 990e3bada9 回复英雄副本时间 2019-06-25 17:06:54 +08:00
wangyuan eb8d6f6038 秘境邮件 2019-06-25 15:59:31 +08:00
wukang a47395fcea add log 2019-06-25 15:37:09 +08:00
wukang 1e6044b691 fix 2019-06-25 15:29:49 +08:00
jiahuiwen ee1234ad2c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-06-25 15:29:36 +08:00
jiahuiwen 505547fa66 爬塔副本信息(试炼副本) 2019-06-25 15:28:07 +08:00
wangyuan 24e9d35228 fix 取mission问题 2019-06-25 14:21:26 +08:00
wangyuan 65f9592f68 2-->3 2019-06-25 13:58:13 +08:00
jiahuiwen 9eeabfdbe7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-06-25 12:08:06 +08:00
jiahuiwen f4e77f9ada 爬塔副本初版 2019-06-25 12:06:41 +08:00
wangyuan 1116f2de9c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-25 12:02:48 +08:00
wangyuan 2b28e768fb 地图任务 2019-06-25 12:02:10 +08:00
wukang 7b51289291 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 10:14:55 +08:00
wukang 7b9eeb78f1 add log 2019-06-25 10:14:36 +08:00
wangyuan c7fdef8058 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-25 10:12:51 +08:00
wangyuan b99522734d 地图探索任务 2019-06-25 10:12:25 +08:00
wukang 7295109844 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 10:06:02 +08:00
wukang 4f5477e3c2 副本星级奖励 2019-06-25 10:05:49 +08:00
wangyuan ba55893b1d 装备属性不进行合并 2019-06-24 19:36:34 +08:00
wangyuan abff2b134e 优化地图探索度 2019-06-24 19:10:24 +08:00
wangyuan 8ad8890274 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-24 12:07:13 +08:00
wangyuan b1e9d4040d fix read s table 2019-06-24 12:06:48 +08:00
gaojie 71f98c4887 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-24 11:44:10 +08:00
gaojie 560b97590a 赠送体力状态刷新 2019-06-24 11:44:06 +08:00
wangyuan 30ceef6fb2 fix 2019-06-24 10:38:20 +08:00
jiahuiwen 3e0801d1ce Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-22 15:56:30 +08:00
jiahuiwen c231cdda2f 删除多个点 2019-06-22 15:56:26 +08:00
wangyuan ea9b1eacca fix bug 2019-06-21 18:32:43 +08:00
wangyuan c66f849854 copy mission 2019-06-21 18:24:40 +08:00
wangyuan c65c4ecd75 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
2019-06-21 18:03:53 +08:00
wangyuan 0e8da41f9c 任务合并 2019-06-21 18:01:22 +08:00
jiahuiwen 1f9144ceef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 17:33:26 +08:00
jiahuiwen fa7c397e5d 领取副本星级奖励 2019-06-21 17:33:19 +08:00
gaojie 4c6485abb8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 15:07:19 +08:00
gaojie 2aa329e4d6 聊天 2019-06-21 15:07:11 +08:00
jiahuiwen 02e2cff56b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 11:40:57 +08:00
jiahuiwen 11e377d066 行为39 2019-06-21 11:40:42 +08:00
wangyuan d0aa5e79a5 lua fight 2019-06-21 11:22:35 +08:00
wangyuan 4fc3cd92c1 fix 2019-06-20 21:07:26 +08:00
wangyuan f1ac732b56 conf 2019-06-20 21:03:59 +08:00
jiahuiwen 4ece82248c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 19:42:21 +08:00
jiahuiwen 3d6690ccab 二维数组赋值 2019-06-20 19:42:17 +08:00
wangyuan 32480ab936 room 2019-06-20 18:17:29 +08:00
gaojie 97241f0f5b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 18:12:24 +08:00
gaojie 17d072baa2 fix 2019-06-20 18:12:09 +08:00
wangyuan 97ce706ddf 精英怪奖励 & 充值通过邮件发送道具 2019-06-20 17:26:39 +08:00
wangyuan 02d683718c s 2019-06-20 16:28:07 +08:00
wangyuan ef76a6fff9 前置节点&修改精英怪战斗结束 2019-06-20 16:26:58 +08:00
wangyuan 1046bcfb85 消耗道具 2019-06-20 16:03:26 +08:00
wangyuan 9836927645 fight 2019-06-20 15:47:36 +08:00
jiahuiwen 6433dc032f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 15:28:28 +08:00
wangyuan 689d3ae255 精英怪 2019-06-20 19:11:00 +08:00
jiahuiwen 17fdfbd6e4 新行为 39 战斗,推任务,生成新的事件点。15 16修改 2019-06-20 15:28:21 +08:00
wangyuan 0983abb99c fix fight key 2019-06-20 11:37:12 +08:00
wangyuan 5b1e55b61e 精英怪 2019-06-20 11:13:55 +08:00
wangyuan eb2c08c614 修复VIP错误 & 精英怪 2019-06-20 10:21:11 +08:00
wangyuan 7b38c5206c 科技树重置 2019-06-19 17:27:55 +08:00
gaojie d6c569bdf4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-19 16:49:34 +08:00
gaojie 178f56bbe5 fix 2019-06-19 16:49:16 +08:00
wangyuan 0913f47f9a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-19 16:43:27 +08:00
wangyuan 8ec551cfc4 battle 2019-06-19 16:43:02 +08:00
gaojie da43de4742 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-19 15:47:23 +08:00
gaojie b156df6fb0 聊天 2019-06-19 15:47:19 +08:00
wangyuan 72bbe0d046 跑马灯 & 工坊科技树 2019-06-19 14:48:51 +08:00
wangyuan aeba5f5237 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-19 12:34:41 +08:00
wangyuan 04f439579e 工坊科技树升级 2019-06-19 12:34:19 +08:00
gaojie 2f2d597546 获得卡牌跑马灯 2019-06-18 20:24:57 +08:00
gaojie 58e335b60e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 20:06:40 +08:00
gaojie 359c250098 跑马灯 2019-06-18 20:06:37 +08:00
lvxinran 011d2dba36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 15:45:53 +08:00
lvxinran 396c8be30c 工坊升级材料方式 2019-06-18 15:45:12 +08:00
gaojie c1c3b15fc9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 14:44:58 +08:00
gaojie b621f90eb9 系统消息 2019-06-18 14:44:53 +08:00
wangyuan 5f2d97cd7a fix 2019-06-18 11:50:37 +08:00
wangyuan aeb701dc14 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-18 11:33:42 +08:00
wangyuan 6513469c64 修复天赋 & match 2019-06-18 11:33:21 +08:00
gaojie 13c81629c6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java
2019-06-18 11:06:23 +08:00
gaojie 37442f8fab 好友 2019-06-18 11:04:50 +08:00
wangyuan 5a7a3f32c7 五点任务刷新 & 血战修改 2019-06-17 10:22:21 +08:00
wangyuan 5eb0b7d467 五点刷新机制 2019-06-15 17:05:50 +08:00
wangyuan d4f86e3d0a 五点刷新 2019-06-15 17:02:34 +08:00
wangyuan 7a6490cf7c fix 2019-06-15 14:50:32 +08:00
wangyuan 15e6c439af Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
2019-06-15 14:44:49 +08:00
wangyuan 6dcba33b6f 每日次数限制统一走vip配置 2019-06-15 14:41:47 +08:00
wangyuan b4fe2a3916 fix 2019-06-14 20:45:51 +08:00
王永芳 9346c5e82b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-14 18:50:01 +08:00
王永芳 547c632e81 在匹配成功,创建房间后发送地图信息 2019-06-14 18:49:22 +08:00
wangyuan c503817091 add 2019-06-14 15:27:26 +08:00
wangyuan 16434c21ce 校验地图操作合法性 2019-06-14 15:24:10 +08:00
wangyuan b0d91d6e6a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-14 14:26:23 +08:00
wangyuan 0d66b7bcfc 修复探索度 2019-06-14 14:25:36 +08:00
王永芳 c62efe0565 实现血战到底的基本逻辑,有待调试 2019-06-14 13:39:46 +08:00
gaojie e6b409644e fix 2019-06-14 10:59:32 +08:00
gaojie fb1ec3aa66 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2019-06-14 10:08:52 +08:00
gaojie b4cdcb2c10 刷新好友状态 2019-06-14 10:07:29 +08:00
wangyuan 58e38789a9 fix 2019-06-13 20:55:56 +08:00
wangyuan 2348065005 fix 2019-06-13 20:46:12 +08:00
wangyuan 378eadb7c1 reason 2019-06-13 19:49:59 +08:00
wangyuan 2038e4704f 消耗道具原因 2019-06-13 19:29:17 +08:00
wangyuan 1f396ec9a0 事件行为38 2019-06-13 15:27:17 +08:00
wangyuan 10f745f37f 修复重启服务器自动清档 2019-06-13 14:27:55 +08:00
wangyuan c92f6cda85 delete log 2019-06-12 20:59:51 +08:00
wangyuan 58e8180120 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-12 20:59:38 +08:00
wangyuan 3eacdc5e9f uid string -> int & 增加天赋异妖 2019-06-12 20:59:00 +08:00
gaojie 9690a3f414 好友 2019-06-12 20:52:19 +08:00
wangyuan 88904dd030 fix 22 2019-06-12 17:19:58 +08:00
gaojie 40d69786a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-12 15:09:19 +08:00
wangyuan aac9c78a2a fix time 2019-06-16 03:13:14 +08:00
gaojie 7b8adf7bac 修改名字GM 2019-06-12 15:09:15 +08:00
wangyuan ef94bde052 fix 2019-06-12 10:46:57 +08:00
wangyuan 5f34470d60 maxforce 2019-06-12 10:05:14 +08:00
wangyuan bb24e8fa25 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-11 20:57:05 +08:00
wangyuan a5d006e619 indication回复 2019-06-11 20:56:31 +08:00
gaojie ebb8c6341c 好友聊天在线好友推送 2019-06-11 18:02:07 +08:00
gaojie da4b5a36d3 好友接口测试 2019-06-11 17:26:05 +08:00
gaojie 6d39b2db5a Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2019-06-11 14:22:10 +08:00
gaojie bb80506568 删除好友,查找好友 2019-06-11 14:21:31 +08:00
wangyuan 5a4308ddb2 data 2019-06-11 14:17:46 +08:00
wangyuan 775a8a4763 券恢复时间 2019-06-11 10:54:27 +08:00
wangyuan f6021d8ddc finish eventtype 22 2019-06-11 10:44:57 +08:00
wangyuan f2955f1e05 fix recharge 2019-06-11 10:21:26 +08:00
wangyuan bc3cbcf40b 精英挑战券 2019-06-10 20:24:08 +08:00
wangyuan 6af0168411 暂时屏蔽 2019-06-10 18:23:20 +08:00
wangyuan 5f92d2f85a 删除无效事件点 2019-06-10 17:41:43 +08:00
gaojie 8c3b106e06 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-10 17:04:01 +08:00
gaojie 1d08720a5a 获取好友申请列表 2019-06-10 17:03:57 +08:00
wangyuan eac6670f19 优化 2019-06-10 11:07:54 +08:00
gaojie 60bd86264b 好友 2019-06-10 10:37:08 +08:00
wangyuan 82aeab166e 记录历史已买礼包 2019-06-06 18:29:41 +08:00
wangyuan d94a0ac92f fix 2019-06-06 17:48:50 +08:00
gaojie e031c72187 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-06 17:24:57 +08:00
gaojie 87c2649232 好友 2019-06-06 17:24:48 +08:00
wangyuan 385ecb048e fix git change 2019-06-06 17:18:46 +08:00
wangyuan 9353c18322 购买商品 2019-06-06 16:53:49 +08:00
wangyuan acdf29d390 data 2019-06-06 15:33:27 +08:00
wangyuan 62bb1ebb3c data 2019-06-06 14:25:51 +08:00
wangyuan 0619b20448 kick 2019-06-05 20:53:05 +08:00
wangyuan 3600ce66db fix 2019-06-05 20:23:56 +08:00
wangyuan 7cbe91a672 修复功能时间 2019-06-05 20:15:56 +08:00
wangyuan 0e8b6eda1d 每日任务 2019-06-05 19:46:31 +08:00
wangyuan 3cf9a1dd10 fix 2019-06-05 17:06:08 +08:00
wangyuan f16ca67657 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 16:37:46 +08:00
wangyuan 9de7dac303 add 2019-06-05 16:34:03 +08:00
wangyuan 0b4ff12894 竞技场 2019-06-05 16:29:48 +08:00
wangyuan 3d32285959 fix抽卡次数限制 2019-06-05 15:29:15 +08:00
wangyuan c3ba340c11 fix 2019-06-05 15:25:06 +08:00
gaojie 39a340d99a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-05 14:37:08 +08:00
gaojie 9b10c7705b 聊天 2019-06-05 14:37:03 +08:00
wangyuan 43103c2138 取消秘盒抽取次数 2019-06-05 11:56:33 +08:00
wangyuan 68ce55cd67 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 11:22:51 +08:00
wangyuan 0699b42f27 删除vip特权 秘盒 2019-06-05 11:22:33 +08:00
wangyuan 682d33f6cd Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 11:20:09 +08:00
wangyuan 36461a5521 fix equip 2019-06-05 11:19:56 +08:00
wangyuan 25af037afd fix 离线时间 2019-06-05 11:18:45 +08:00
wangyuan 1367a2e731 fix gm 2019-06-04 18:27:26 +08:00
wangyuan 60916bfbf4 fix 2019-06-04 15:53:19 +08:00
wangyuan 80d5a64bbe fix data 2019-06-04 15:27:07 +08:00
wangyuan 1d5a206c2c fix 2019-06-04 14:40:33 +08:00
wangyuan e354951bf7 充值活动 2019-06-04 10:12:11 +08:00
wangyuan c70d69a187 fix 2019-06-04 10:07:06 +08:00
wangyuan 90de216e64 关卡数据 2019-06-03 17:26:20 +08:00
wangyuan 454ec22a61 容错 2019-06-03 17:19:31 +08:00
wangyuan 73dcc75efd boss刷新时间 2019-06-03 14:43:43 +08:00
wangyuan 5429baf7a3 luafight打印日志 2019-06-03 13:43:32 +08:00
wangyuan 3069ff56e1 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 10:47:28 +08:00
wangyuan 453b0f58ad 修复扣除道具为0情况 2019-06-05 10:47:15 +08:00
wangyuan 41c2435f5f fix item 2019-06-05 10:25:55 +08:00
wangyuan 7f0b05baec force 2019-06-02 18:47:34 +08:00
jiahuiwen f48f51cc61 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 18:24:22 +08:00
wangyuan 72d2caef50 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-02 17:35:35 +08:00
wangyuan e7a38b5243 fix 2019-06-02 17:35:19 +08:00
wangyuan dfa25dc50e vip mission 2019-06-02 17:30:17 +08:00
wangyuan 3b6c11b70f vip mission 2019-06-02 17:23:56 +08:00
jiahuiwen 2897ad08ba 类型10 特殊处理 2019-05-31 18:24:09 +08:00
jiahuiwen 93239139c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 17:30:55 +08:00
jiahuiwen b229e02637 行为10 支持 快速战斗 2019-05-31 17:30:41 +08:00
jiahuiwen e4c1867bae 参数 2019-05-31 17:01:05 +08:00
jiahuiwen 124272a244 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 16:58:46 +08:00
wangyuan 77f1968fba function control 2019-06-02 16:39:14 +08:00
wangyuan d9e33c228a data 2019-06-02 16:19:12 +08:00
wangyuan e0237b7a93 门票校验 2019-06-02 16:16:04 +08:00
wangyuan 6eee4f5688 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-02 15:23:42 +08:00
wangyuan 5d699a9770 fix bug 2019-06-02 15:23:25 +08:00
wangyuan 562ccc2913 item 2019-06-02 15:22:09 +08:00
jiahuiwen d2107490de 增加新行为 10 2019-05-31 16:58:40 +08:00
wangyuan 1c479f4727 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-05-31 14:07:22 +08:00
wangyuan 9bfb2b61c8 fix 2019-05-31 14:06:18 +08:00
wangyuan 53aa7109e4 cost 2019-05-31 12:30:07 +08:00
wangyuan 17620657b1 fight 2019-05-30 20:39:53 +08:00
wangyuan 693515e205 vip gm 2019-05-30 20:28:33 +08:00
wangyuan b23e76af3a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-05-30 17:49:24 +08:00
wangyuan cab0113763 fix store 2019-05-30 17:48:01 +08:00
wangyuan 58e910f05a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-05-30 17:47:23 +08:00
wangyuan 7ef0ac846c fix 2019-05-30 17:40:03 +08:00
gaojie 6c1eb57c88 失败加一点经验 2019-05-30 16:36:05 +08:00
gaojie 61abedd19c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-30 14:18:41 +08:00
gaojie a538955e6a 刷新商店道具 2019-05-30 14:18:37 +08:00
wangyuan 56455fefbe 计算异妖战力问题 2019-05-30 12:58:11 +08:00
wangyuan 5b977ec2ae fix vip mission 2019-05-30 12:01:33 +08:00
wangyuan 8dc2ac9f1c fix gm 2019-05-30 11:03:45 +08:00
wangyuan ae910bd0a9 mission reward 2019-05-30 10:42:44 +08:00
wangyuan 5117c93a3a 初始化战力 2019-05-30 10:25:33 +08:00
wangyuan 84bcbd902c fix 血量 2019-05-30 10:21:32 +08:00
wangyuan fe567310c5 分解妖灵师 2019-05-29 17:58:02 +08:00
wangyuan 7667d21b8f 云游商店 2019-05-29 17:55:32 +08:00
wangyuan 3d2bcae72f fix 2019-05-29 15:33:11 +08:00
wangyuan 0c21ef4ad6 data 2019-05-29 14:36:50 +08:00
wangyuan ca2386824b vip 2019-05-29 13:55:41 +08:00
wangyuan 65747a5daf 突破返还 2019-05-29 13:31:41 +08:00
wangyuan c3f08b1321 fix bossid 2019-05-28 18:26:14 +08:00
wangyuan 5888a398d7 fix 2019-05-28 18:18:04 +08:00
wangyuan f768d3552f fix 2019-05-28 17:58:59 +08:00
wangyuan 89716f3c90 mission 2019-05-28 17:56:59 +08:00
wangyuan 0b4b87a003 工坊 2019-05-28 16:30:43 +08:00
wangyuan 09608adc81 fix no in db 2019-05-28 13:49:08 +08:00
wangyuan 48251b75a8 data 2019-05-28 13:48:06 +08:00
wangyuan 3d86b7d034 任务 2019-05-28 10:01:23 +08:00
wangyuan 672121e598 任务初版 2019-05-27 15:30:56 +08:00
wangyuan 62d581bf59 暂时删除校验挑战次数 2019-05-27 11:07:00 +08:00
wangyuan 21b245ed82 暂时提交vip相关 2019-05-24 14:12:00 +08:00
wangyuan 5d0c9224b8 挂机 2019-05-24 13:39:04 +08:00
wangyuan 536a5e02f2 广播 2019-05-20 21:24:24 +08:00
jiahuiwen bb7abbe506 @Component 2019-05-20 16:25:00 +08:00
jiahuiwen 03c4fc6e1e 行为类型 36 推任务,消耗道具,删除指定地图点 2019-05-20 16:18:41 +08:00
wangyuan b36f434768 挂机奖励 2019-05-20 15:26:57 +08:00
gaojie 86858a8c25 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-20 14:07:39 +08:00
gaojie ea594dfaa7 商店购买 2019-05-20 14:07:35 +08:00
wangyuan 204e2ef785 robotlevel 2019-05-20 12:00:16 +08:00
wangyuan a33d66e0e7 异妖加载修改 2019-05-20 11:11:29 +08:00
wangyuan 7c537afd21 mail reward 2019-05-18 15:30:11 +08:00
wangyuan a1c4640fcf 异妖 2019-05-18 13:07:25 +08:00
wangyuan af3d862561 修改获取user方式 2019-05-17 13:41:07 +08:00
wangyuan 02f29bd9a0 todo vip fix 2019-05-17 10:36:44 +08:00
wangyuan 18c2b0fc21 秘盒跨赛季不需要重置次数 2019-05-17 10:29:01 +08:00
wangyuan 03468ddcfc 增加怪物是否被击杀 2019-05-16 20:35:04 +08:00
gaojie cdaf854d55 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-16 20:21:11 +08:00
gaojie 0119d33b6b 商店刷新,分解卡牌 2019-05-16 20:21:06 +08:00
wangyuan 2a0368d75e fix 2019-05-16 20:18:03 +08:00
wangyuan 1e46f4db2b 挂机推送 2019-05-16 20:16:46 +08:00
wangyuan 85cceace2b 挂机 2019-05-16 19:24:32 +08:00
wangyuan 544ba36938 挂机 2019-05-16 17:50:40 +08:00
gaojie 48375cd38f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-16 17:36:48 +08:00
gaojie 5a9249d29b log 2019-05-16 17:36:43 +08:00
gaojie 115d68181f 商店刷新 2019-05-16 17:35:32 +08:00
wangyuan b9a5cb43ff delete 2019-05-16 14:52:58 +08:00
wangyuan a9de0f5425 挂机初版 2019-05-16 14:51:05 +08:00
wangyuan 820ba8455b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-05-16 10:02:59 +08:00
wangyuan 068fa31db8 fix hero 2019-05-16 10:02:30 +08:00
jiahuiwen 8548c4f9c2 35 推任务,删除指定地图点,生成新的事件点。 2019-05-15 15:55:46 +08:00
wangyuan 9593836b3c 错误提示信息 2019-05-15 14:01:41 +08:00
wangyuan d0cff52e89 对手分数 2019-05-15 13:54:56 +08:00
wangyuan 55301d2894 fix 2019-05-15 12:25:12 +08:00
wangyuan 8f5c282aaf fix bug 2019-05-14 19:51:02 +08:00
wangyuan 052a589225 fix bug 2019-05-14 19:45:53 +08:00
wangyuan 5ba0990bb0 fix 2019-05-14 19:08:57 +08:00
wangyuan 85cbae09db 计算属性 2019-05-14 18:17:00 +08:00
wangyuan b25d7067ba time control 2019-05-14 16:41:21 +08:00
wangyuan dba44383fe 数据互换 2019-05-14 15:17:51 +08:00
wangyuan b39de8d120 积分变换 2019-05-14 14:50:52 +08:00
wangyuan 6b34c37eaa 时间控制功能 2019-05-14 14:28:47 +08:00
wangyuan 4d0bdf2920 fix 2019-05-14 13:51:15 +08:00
wangyuan e68ea3591e 秘盒 增加今日抽取次数限制 2019-05-14 13:50:34 +08:00
wangyuan 329746439d 零点执行 2019-05-14 11:31:11 +08:00
wangyuan 0d5010107d 竞技场放回数据 2019-05-14 11:12:46 +08:00
wangyuan 27441582f6 score bug 2019-05-13 20:00:54 +08:00
wangyuan deab593bc3 fix null 2019-05-13 18:35:55 +08:00
wangyuan 3fd33d0068 fix redis over times 2019-05-13 18:31:58 +08:00