Commit Graph

1898 Commits (11af6398d33204d13c14dad4b87cb557d81692dd)

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