Commit Graph

2368 Commits (29d1439c505e6964e553ea67b5aa8ee0db6e46cd)

Author SHA1 Message Date
lvxinran e8f10f1f04 戒灵秘宝,公会修改 2019-10-14 05:20:05 +08:00
lvxinran a4bed99395 配置回滚 2019-10-13 06:23:58 +08:00
lvxinran c007ac7f3b 公会修改 2019-10-13 06:13:37 +08:00
lvxinran e5f1007862 戒灵秘宝周刷新修改 2019-10-25 05:05:31 +08:00
lvxinran 6983bb86de 修改任务 2019-10-22 03:01:17 +08:00
lvxinran 89ac91c01b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-22 02:53:11 +08:00
lvxinran 4ca3c49ffe 戒灵秘宝开始前重置 2019-10-22 02:53:02 +08:00
zhangshanxue 467024e9bb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-11 19:09:49 +08:00
zhangshanxue 6e6bb5550c 幸运探宝 2019-10-11 19:09:44 +08:00
wangyuan 060e6f1ad3 一键移除 2019-10-11 18:29:16 +08:00
wangyuan 823d0176ce fix fight data 2019-10-11 18:13:16 +08:00
zhangshanxue c9f2e3514d 静态配置 2019-10-11 17:28:45 +08:00
zhangshanxue c3aa2c15f7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-11 16:55:54 +08:00
lvxinran 9476a9b529 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-21 09:45:04 +08:00
lvxinran 28ca7043c7 邮件优化 2019-10-21 09:44:56 +08:00
lvxinran c588030e47 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-14 05:08:41 +08:00
lvxinran 7bfa624269 周刷新 2019-10-14 05:08:20 +08:00
zhangshanxue fb33d6bdb6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2019-10-11 16:55:39 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00
wangyuan 819a7621af Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-11 11:17:15 +08:00
wangyuan 98ea41df73 fix hero level task 2019-10-11 11:16:57 +08:00
wangyuan 06ea43d6bd fix rank 2019-10-11 10:02:01 +08:00
wangyuan 0226f85fec fix recharge 2019-10-10 20:08:29 +08:00
wangyuan a86722392e fix buygoodslogic 2019-10-10 17:52:18 +08:00
wangyuan 51f2865a52 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-10 17:51:26 +08:00
lvxinran 8fd72f8a25 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-15 05:03:25 +08:00
lvxinran 3130428158 戒灵秘宝GM,修改,公会战条件添加 2019-10-15 05:03:20 +08:00
wangyuan f69ee85be1 fix buygoodslogic 2019-10-10 17:51:04 +08:00
wangyuan a45850cfd5 fix bug 2019-10-10 17:23:47 +08:00
wangyuan 23382f5e74 fix bug 2019-10-10 17:08:05 +08:00
wangyuan 3c103fac3e check 2019-10-10 15:55:37 +08:00
wangyuan 698bab2122 fix rank 2019-10-10 15:49:58 +08:00
wangyuan ba4a28d792 fix rank 2019-10-10 14:44:53 +08:00
wangyuan c9d59f06ae Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-10 14:34:19 +08:00
wangyuan ba8cad8cef fix rank 2019-10-10 14:33:57 +08:00
lvxinran 6b0ef26a42 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-10 13:41:35 +08:00
lvxinran 8c73e07e12 戒灵秘宝升级 2019-10-10 13:41:29 +08:00
wangyuan e79303692b fix mainlevle level limit 2019-10-10 11:59:42 +08:00
wangyuan a24369e2f5 漏提 2019-10-10 11:53:07 +08:00
wangyuan 410427b268 fix main level fight 2019-10-10 11:48:30 +08:00
zhangshanxue cea0f58b31 幸运探宝活动奖励领完 重置进度 2019-10-10 11:42:22 +08:00
zhangshanxue 3f6971c071 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-10 11:12:39 +08:00
zhangshanxue 2ff9f1583e 幸运探宝活动奖励领完 重置进度 2019-10-10 11:08:30 +08:00
lvxinran 994f38dd78 Merge branch 'develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
2019-10-10 10:11:24 +08:00
lvxinran ea8ab53cb8 戒灵秘宝 2019-10-10 10:04:02 +08:00
lvxinran a8f94462d7 孙龙宝藏修改不发0等级 2019-10-19 18:57:37 +08:00
lvxinran 138af14f00 孙龙宝藏修改 2019-10-19 16:49:38 +08:00
wangyuan 0de65cad89 fix msg 2019-10-09 19:38:19 +08:00
wangyuan 5c70a649da print log 2019-10-09 18:31:12 +08:00
wangyuan dcc606cb3c fix reason 2019-10-09 18:28:53 +08:00
zhangshanxue 3d769948ad Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 18:16:19 +08:00
zhangshanxue 0ac0b161f5 活动奖励领完 重置进度 2019-10-09 18:16:13 +08:00
wangyuan fc42f6c655 limit 2019-10-09 18:04:36 +08:00
wangyuan f0e4c61ccc reason 2019-10-09 17:36:19 +08:00
zhangshanxue 2062561e7e 热加载新类 2019-10-09 17:03:46 +08:00
wangyuan 2f3701fe49 fix indicaiton 2019-10-09 16:07:27 +08:00
wangyuan 0d58fa4b38 黑名单 2019-10-09 15:58:55 +08:00
zhangshanxue f47b80ea14 幸运探宝 2019-10-09 15:25:06 +08:00
zhangshanxue 5eb8af467a jar中查找类 2019-10-09 15:23:11 +08:00
zhangshanxue e8e1f7b744 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 15:12:16 +08:00
zhangshanxue 981191c053 jar中查找类 2019-10-09 15:12:11 +08:00
wangyuan ee140b7495 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-09 14:38:04 +08:00
wangyuan 81b5ec7236 fix final fight 2019-10-09 14:36:48 +08:00
wangyuan 0e44a8795f fix fastreward & fix especialEquip misison 2019-10-09 14:13:23 +08:00
zhangshanxue c6cf91aa70 非注解handler注入 2019-10-09 10:33:37 +08:00
zhangshanxue f9dab7ddae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-08 18:56:28 +08:00
zhangshanxue 0758d2da32 兽潮快速战斗 2019-10-08 18:56:05 +08:00
wangyuan 03c948bf9a des 2019-10-08 18:06:45 +08:00
wangyuan 29a6ab23a3 des 2019-10-08 16:38:02 +08:00
wangyuan 0da5001de3 battle 2019-10-08 16:35:19 +08:00
wangyuan 65d1405b13 hero lock & fix msg 2019-10-08 16:30:00 +08:00
wangyuan d302e893b4 hero lock 2019-10-08 15:59:36 +08:00
wangyuan 36340f3a18 跑马灯& 回溯 2019-10-08 15:31:28 +08:00
zhangshanxue 6f1972e902 幸运探宝 2019-10-08 10:04:26 +08:00
zhangshanxue dd496531a3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-09-28 11:01:22 +08:00
zhangshanxue 13cb402343 幸运探宝 2019-09-28 11:00:06 +08:00
wangyuan 6cbab124e9 add login white 2019-09-27 18:11:26 +08:00
wangyuan 8d92dcbfdc fix map 2019-09-27 17:38:17 +08:00
lvxinran 162b0880b7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-27 15:02:56 +08:00
lvxinran 4fa201093a 已加入工会提示 2019-09-27 15:02:46 +08:00
wangyuan 9c33a505a6 Merge branch 'project0.93' 2019-09-27 14:58:45 +08:00
wangyuan 3f17df4540 fix gm 2019-09-27 14:53:07 +08:00
wangyuan 85bb61208d upload 2019-09-27 14:17:33 +08:00
wangyuan 7bd4b67364 fix item drop 2019-09-27 14:10:36 +08:00
wangyuan 21dba7ff37 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-27 14:05:50 +08:00
wangyuan 29caa89314 fix bug 2019-09-27 14:05:30 +08:00
lvxinran 8867433bf4 Merge branch 'project0.93' 2019-09-27 13:36:46 +08:00
lvxinran 6e4ba9ed73 公会走路 2019-09-27 13:36:09 +08:00
lvxinran ffc3e7890d 公会战bug 2019-09-29 12:06:40 +08:00
wangyuan 2900cade4c vip特权结算收益 2019-09-27 11:53:56 +08:00
wangyuan 12b13fa6b0 OFFLINE TIME 2019-09-27 11:40:59 +08:00
zhangshanxue b98fd6b273 幸运探宝 2019-09-27 11:16:35 +08:00
wangyuan cc1a749227 好友赠送友情点 2019-09-27 10:38:13 +08:00
wangyuan c70ea68e76 delete log 2019-09-27 10:25:23 +08:00
wangyuan 514a4086b6 fix 2019-09-27 10:22:42 +08:00
wangyuan ac8466f081 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java
2019-09-27 10:21:16 +08:00
wangyuan 405ab16ed0 new fight 2019-09-27 10:18:38 +08:00
lvxinran 0319fcefae 公会优化 2019-09-27 04:52:58 +08:00
lvxinran 9d90c6f661 工会申请列表红点 2019-09-26 17:56:15 +08:00
lvxinran 63687ab6cd Merge branch 'project0.93' 2019-09-27 04:53:12 +08:00
lvxinran ae3e1e9a71 Merge branch 'project0.93' 2019-09-27 04:51:30 +08:00
wangyuan 9357d3e802 fix team id 2019-09-26 15:53:27 +08:00
zhangshanxue aff8be52f7 Merge branch 'project0.94'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java
2019-09-26 14:20:13 +08:00
zhangshanxue f10ff47dc4 gm命令 异步事件分发 探宝活动 2019-09-26 14:18:27 +08:00
wangyuan 24c49c8cfe fix report 2019-09-26 13:44:35 +08:00
wangyuan ae1b86a695 fix 2019-09-26 11:04:43 +08:00
wangyuan cb46ed50c8 Merge branch 'newfight'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/STestWelfare.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2019-09-26 10:36:41 +08:00
wangyuan 201765fd9f fix maxlevel 2019-09-26 10:27:28 +08:00
wangyuan 9067ca3e07 new fight & workshoplevel & herolevel 2019-09-26 10:06:55 +08:00
lvxinran 1cd0fe5ce7 孙龙宝藏重置 2019-09-26 09:54:17 +08:00
zhangshanxue cf8066ae5c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-25 15:39:23 +08:00
zhangshanxue e76e1f93c6 定时系统邮件 2019-09-25 15:39:17 +08:00
lvxinran b5d2808ec8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-25 14:48:00 +08:00
lvxinran 04002b3fac 公会相关 2019-09-25 14:47:54 +08:00
lvxinran ffd91d6adb gm无尽商店 2019-09-28 08:22:40 +08:00
wangyuan 0b2d08276c log 2019-09-25 14:06:58 +08:00
lvxinran c2be0dc3f8 无尽商店 2019-09-25 10:54:27 +08:00
lvxinran 38ff05edb4 怪物战力 2019-09-25 10:53:34 +08:00
wangyuan e0aaca6306 fix 2019-09-25 10:37:14 +08:00
wangyuan a7f07c668e log 2019-09-25 10:34:09 +08:00
lvxinran 7ebb58041c 表格报错 2019-09-25 10:26:52 +08:00
wangyuan 95d82b59bd fix store 2019-09-25 10:14:46 +08:00
wangyuan 20e9b0f8ec new fight 2019-09-25 09:58:02 +08:00
lvxinran c208d37eb5 邮件修改 2019-09-24 21:38:26 +08:00
lvxinran 2cb3065187 无尽地图 2019-09-28 08:09:58 +08:00
lvxinran 63ee75cc2d 地图修改 2019-09-28 07:03:09 +08:00
lvxinran 711ae66483 无尽修改 2019-09-28 07:02:27 +08:00
lvxinran e88fb2a1ec 无尽地图 2019-10-12 11:02:09 +08:00
lvxinran b7d95499b9 无尽出生点 2019-10-12 09:17:18 +08:00
lvxinran 3214ede819 无尽商店 2019-10-05 08:41:39 +08:00
lvxinran 8f20e52680 公会战最终提交。。。 2019-09-24 21:34:38 +08:00
lvxinran 5a6b460d8b Merge branch 'develop' of http://60.1.1.230/backend/jieling_server into develop 2019-09-26 14:30:59 +08:00
lvxinran a2edf93d0a 公会战修改 2019-09-26 14:30:49 +08:00
lvxinran 8e87514b8f 无尽修改 2019-09-27 12:52:28 +08:00
lvxinran f708a2f546 公会战战力修改 2019-09-26 12:56:11 +08:00
lvxinran 494c3dbe17 公会战 2019-09-25 12:41:23 +08:00
lvxinran 0d24ba3784 公会战跨服 2019-09-24 12:45:56 +08:00
zhangshanxue d54dbb502f 占星优化 2019-09-24 11:09:16 +08:00
lvxinran 6cb28477c9 Merge branch 'develop' 2019-09-28 05:59:53 +08:00
wangyuan 08d695dd53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-24 10:23:05 +08:00
wangyuan 90debb83e6 chat type 2019-09-24 10:22:30 +08:00
zhangshanxue aa12e2ecd0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-24 10:21:36 +08:00
zhangshanxue 001bc4bedc 占星优化 2019-09-24 10:21:17 +08:00
wangyuan 54b3b65c51 Merge branch 'develop' 2019-09-24 10:17:20 +08:00
wangyuan 8fe3bf74b0 new fight 2019-09-24 10:17:09 +08:00
zhangshanxue 67590bf4dd 热更后回退 2019-09-23 23:40:04 +08:00
zhangshanxue f28972f9d3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 18:51:35 +08:00
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