Commit Graph

1755 Commits (64afe289009a794e3a5d9577e857d854e67279cb)

Author SHA1 Message Date
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