Commit Graph

3755 Commits (aa94e3bc5b7c19196be29565eb596f0110ec6c99)

Author SHA1 Message Date
lvxinran 28d2780c3b 车迟斗法排行日志 2020-09-16 05:16:02 +08:00
lvxinran cb75ce8f9d 破阵诛仙活动 刷新修改 2020-09-16 05:03:09 +08:00
lvxinran 64e67ae8a1 大闹天宫打点 2020-09-15 20:52:46 +08:00
lvxinran 7b33db16df Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-15 18:49:27 +08:00
lvxinran 8bc3d089dd 大闹天宫埋点修改 2020-09-15 18:49:17 +08:00
jiahuiwen ff1271b151 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-15 16:44:32 +08:00
jiahuiwen a4d8819350 规范日志 2020-09-15 16:44:15 +08:00
lvxinran a9c7040dc9 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-15 16:19:35 +08:00
zhangshanxue 0a565bb025 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-15 16:16:07 +08:00
zhangshanxue f4dc939fc2 网页支付玩家定制化商品列表 2020-09-15 16:15:59 +08:00
lvxinran ff8772dd4f 工会副本buff修改 2020-09-15 16:15:56 +08:00
lvxinran bb6a149f89 天宫秘宝修改 2020-09-15 14:43:13 +08:00
lvxinran d0aebf10f3 数据上报字段修改,森罗环境层数排行修改 2020-09-15 13:47:04 +08:00
lvxinran 3328d48b41 重置最高层减1 2020-09-15 11:02:02 +08:00
jiahuiwen 33bd562ea6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-11 10:05:49 +08:00
lvxinran a1b7bc9e68 tapdb货币类型 2020-09-17 16:12:13 +08:00
jiahuiwen 5c4d7e49e2 添加空判断 2020-09-11 10:05:43 +08:00
lvxinran ccc1011023 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-10 15:17:12 +08:00
lvxinran 644632f740 心魔、日常打点修改 2020-09-10 15:17:04 +08:00
lvxinran 4b0083bea9 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-25 10:32:14 +08:00
lvxinran 066de19115 天宫秘宝修改 2020-09-25 10:32:09 +08:00
zhangshanxue d2c5509766 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-09 15:06:55 +08:00
zhangshanxue 7aad0e485b 商品id未赋值 2020-09-09 15:06:48 +08:00
zhangshanxue 70d170c341 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-07 18:13:05 +08:00
zhangshanxue eb37e958f6 充值上报汇率 2020-09-07 18:12:26 +08:00
lvxinran 9e32a22e06 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-20 20:55:38 +08:00
lvxinran d00c9f8c64 cdk 服务器id添加 2020-09-20 20:55:04 +08:00
lvxinran 834f6e303e 八日登录修改,公会副本边界,不发排行奖励修改 2020-09-09 08:13:51 +08:00
lvxinran 2d788828d5 0消耗判断 2020-09-07 17:31:46 +08:00
lvxinran 897563644f 魂印战力修改 2020-09-07 16:23:38 +08:00
lvxinran 324a93d144 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-07 15:51:49 +08:00
lvxinran 51ca7053a1 购买buff修改,魂印基础战力 2020-09-07 15:51:44 +08:00
lvxinran 748f792faa 工会副本修改 2020-09-17 19:18:08 +08:00
lvxinran 09a07cd559 修改副本 2020-09-17 19:06:11 +08:00
lvxinran 92ed17c747 保存编队修改 2020-09-17 02:40:36 +08:00
lvxinran 13ca97db1c 代码回滚 2020-09-17 01:41:58 +08:00
lvxinran 80bdaf491e 删除无用buff 2020-09-17 01:41:16 +08:00
lvxinran 99febadec7 清除无用buff点 2020-09-17 01:40:38 +08:00
DESKTOP-98AVA47\Administrator 5cf95e7e09 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-07 10:28:48 +08:00
lvxinran 2b16cf567b Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-19 08:15:03 +08:00
lvxinran de8524d70a 暂时修改工会副本 2020-09-19 08:14:27 +08:00
lvxinran fcc07cc679 森罗幻境埋点 2020-09-19 07:56:53 +08:00
lvxinran e2ab570525 打点修改 工会副本5点刷新伤害 2020-09-19 06:59:17 +08:00
lvxinran 28d42eb762 破阵诛仙任务读表修改 2021-01-17 05:02:58 +08:00
lvxinran ade62badfa 论数修改 2021-01-17 05:02:10 +08:00
zhangshanxue 6125cbcb65 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-14 17:52:49 +08:00
zhangshanxue 048d00080e 网页支付玩家商品信息获取 2020-09-14 17:52:00 +08:00
lvxinran 37735820ef 日常副本打点修改 2020-09-14 09:49:16 +08:00
lvxinran 556fe1e95b 本地服修改 2020-09-11 13:52:51 +08:00
lvxinran 9256a17ef9 本地服修改 2020-09-11 12:20:04 +08:00
lvxinran 2f4c29045b 打点修改,道具流水修改,天宫秘宝修改 2020-09-11 11:50:10 +08:00
DESKTOP-98AVA47\Administrator 5fe1028faf redis key错误 2020-09-07 10:28:28 +08:00
lvxinran d37d1176ed 修改森罗环境卡牌被分解不能战斗 2020-09-04 11:57:02 +08:00
jiahuiwen 2982500416 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-04 10:31:26 +08:00
jiahuiwen b5feff687e 消耗增加负值判断 2020-09-04 10:31:21 +08:00
lvxinran 612a407006 打点修改 2020-09-03 10:58:07 +08:00
jiahuiwen c3aa0b815f 替换 System.out.println 2020-09-02 16:27:26 +08:00
jiahuiwen d1eccf88b9 代码优化 2020-09-01 17:20:57 +08:00
jiahuiwen c3be084f49 优化代码 2020-09-01 14:45:47 +08:00
jiahuiwen f6d885559b Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-01 10:45:21 +08:00
jiahuiwen 8e31ca0acf 优化代码 2020-09-01 10:45:16 +08:00
lvxinran f223f8217c 血量战斗修改 2020-08-28 05:26:02 +08:00
lvxinran e4fd71e3a5 无尽本修改 2020-08-28 04:45:17 +08:00
lvxinran 3a2d1001aa 打印日志 2020-08-28 04:37:22 +08:00
lvxinran b96da4ee17 无尽修改 2020-08-28 04:29:41 +08:00
lvxinran f078d184f0 副本修改 2020-08-28 04:10:01 +08:00
lvxinran 064d737212 云梦祈福 修改状态 2020-08-28 03:06:54 +08:00
lvxinran 87955174a7 上报修改 2020-08-28 01:34:47 +08:00
lvxinran 8c917c414b 进阶编队校验修改 2020-09-10 05:35:54 +08:00
lvxinran 9c658b6acd Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-10 05:15:01 +08:00
lvxinran 8b5fd5bc20 五星任务 2020-09-10 05:14:50 +08:00
lvxinran 9ccd699d8b 天宫秘宝修改 2020-09-20 04:24:44 +08:00
zhangshanxue a1b2d3e3f3 任务类型和充值计费点 2020-09-09 23:22:00 +08:00
lvxinran e45c58c3d1 云梦祈福修改 2020-09-04 03:37:06 +08:00
lvxinran 7d141098f9 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-04 02:15:02 +08:00
lvxinran 8bd27071d3 副本修改 2020-09-04 02:14:54 +08:00
lvxinran f6d757aa16 吃装备计数修改 2020-09-03 15:30:10 +08:00
lvxinran 445f0a4965 天宫7天限制 2020-09-03 15:29:48 +08:00
zhangshanxue be086265c7 上报报错 2020-08-28 20:46:06 +08:00
zhangshanxue 5ff3eb46ba Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-28 18:02:29 +08:00
zhangshanxue 31677bdff6 任务累充金额 2020-08-28 18:02:16 +08:00
lvxinran 62fbd0f9b8 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-27 13:32:01 +08:00
zhangshanxue 3075948147 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-28 11:00:40 +08:00
lvxinran c8cc9af30e Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-04 10:38:01 +08:00
lvxinran 32aab7a641 竞技场排行榜 2020-09-04 10:37:36 +08:00
lvxinran fbb03e44f8 森罗修改 2020-10-05 02:11:20 +08:00
lvxinran 5f9b70ea80 天宫秘宝积分购买添加 公会副本击杀奖励修改 2020-10-01 00:40:30 +08:00
lvxinran e0e89d377e 公会副本排行奖励 2020-10-01 00:19:39 +08:00
lvxinran f0f28b8fa6 世界等级 物品掉落 宝物战力修改 2020-09-10 17:46:14 +08:00
lvxinran 77098ce6a1 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-10 16:25:09 +08:00
lvxinran ce9370be4a 基金修改 2020-09-10 16:25:00 +08:00
lvxinran 656e089d0f 公会副本修改 2020-09-10 15:10:04 +08:00
lvxinran d4ee477baa 云梦祈福刷新 2020-09-10 11:19:40 +08:00
zhangshanxue 9fd22f7623 巅峰赛名次任务 2020-08-28 11:00:12 +08:00
zhangshanxue 0417a4c728 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-27 21:09:08 +08:00
zhangshanxue 8b01414491 先后手 2020-08-27 21:08:56 +08:00
lvxinran 85c45138da 排行修改 2020-08-27 13:31:49 +08:00
zhangshanxue 8257fbe430 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-26 15:43:58 +08:00
zhangshanxue 7f55f8cbc4 浮点精度 2020-08-26 15:43:42 +08:00
lvxinran f1d88626b6 森罗环境修改 2020-09-10 18:17:09 +08:00
lvxinran 330e7c105a 青龙秘宝修改 2020-09-10 17:59:38 +08:00
lvxinran bcf288b69f Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-08-25 15:11:31 +08:00
lvxinran 793be7aeb2 修改青龙礼包合公会副本经验 2020-08-25 15:11:20 +08:00
zhangshanxue 459ef26b50 测试充值 2020-08-25 14:50:19 +08:00
zhangshanxue 07595796fa 合分支 2020-08-24 23:36:16 +08:00
zhangshanxue 23ade886ae Merge branch 'master' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-08-24 23:16:18 +08:00
zhangshanxue e77644359d 充值价格 2020-08-24 23:14:03 +08:00
lvxinran a57bdbc37f 五星成长礼修改 2020-09-01 22:11:12 +08:00
lvxinran 10858c2606 剑影仙踪活动修改 2020-09-01 18:30:29 +08:00
lvxinran b586b0c502 时间5天改成30天 2020-09-01 14:55:09 +08:00
lvxinran cc3f0d662d 公会副本次数修改 2020-09-01 14:14:26 +08:00
lvxinran c98aa7f20d 公会副本次数修改 2020-09-01 22:30:59 +08:00
lvxinran 57057330aa 上报乘100修改 2020-08-22 16:57:01 +08:00
lvxinran d56aa73460 Merge branch 'master' into 公会副本 2020-08-22 15:39:33 +08:00
lvxinran 146c394e7a 公会副本提交 2020-08-22 15:38:31 +08:00
lvxinran 86eee21319 怪物战力修改表数据 2020-08-21 20:53:26 +08:00
zhangshanxue 3ef43a64a7 灵动网页支付 2020-08-21 20:31:30 +08:00
lvxinran 26e02ac204 无尽修改 2020-08-21 19:25:31 +08:00
lvxinran 388a28507b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-21 18:46:55 +08:00
lvxinran e9fe5e2992 礼包修改 2020-08-21 18:46:49 +08:00
lvxinran f7b77d668a 副本提交 2020-08-28 14:38:20 +08:00
lilei 80bd02138f 破阵诛仙累冲任务修正 2020-08-21 18:00:07 +08:00
lilei 7c7e5cf9f1 破阵诛仙系列任务 2020-08-21 16:36:46 +08:00
lvxinran c6a0354f81 公会副本提交,大闹天宫埋点提交 2020-08-20 23:02:13 +08:00
lvxinran 95375eab26 公会副本提交 2020-08-27 19:49:57 +08:00
lilei 2cdf521ce3 探索达人替换为极速达人,增加探索次数特权逻辑 2020-08-20 14:06:48 +08:00
lilei bf1ef4c1a3 活动热更延期增加遗留数据清理 2020-08-19 20:36:18 +08:00
zhangshanxue b83687ea23 revert 错误合并 2020-08-19 11:16:28 +08:00
lvxinran ec758ee011 公会副本排行榜 2020-08-19 09:58:33 +08:00
lvxinran 41d73df618 公会副本排行 2020-08-19 09:50:37 +08:00
lilei 50f33a02c0 Merge branch 'develop_treasure' 2020-08-19 09:47:27 +08:00
lilei 2ef8972406 青龙秘宝 2020-08-19 09:47:02 +08:00
zhangshanxue bc50b90957 重连有问题 2020-08-18 22:27:30 +08:00
zhangshanxue 413f84af8a 十绝阵结算 2020-08-18 20:10:12 +08:00
lvxinran 1b70b3c73a 公会副本 2020-08-18 19:42:50 +08:00
lilei f202f73b73 青龙秘宝,工坊合成装备任务改为锻器阁合成装备 2020-08-18 17:10:06 +08:00
zhangshanxue 22aca76856 充值和数据转换 2020-08-18 16:22:38 +08:00
zhangshanxue 000b4466b3 充值和数据转换 2020-08-18 16:12:54 +08:00
lvxinran 38c3cffa54 appId加入 2020-08-21 14:22:14 +08:00
zhangshanxue cc801a8510 充值价格 2020-08-18 11:27:03 +08:00
lilei c18ac44bcf 青龙秘宝 2020-08-18 09:42:32 +08:00
zhangshanxue 024e339bc3 合服 2020-08-17 22:31:25 +08:00
zhangshanxue 90e14e4493 合服 2020-08-17 21:40:49 +08:00
lilei b797c85de6 青龙秘宝,新增任务类型 2020-08-17 19:53:26 +08:00
zhangshanxue d9bd59ea26 合服 2020-08-17 15:30:25 +08:00
lilei f73829b5d4 青龙秘宝,新增部分任务类型 2020-08-17 15:01:28 +08:00
zhangshanxue 29f85c959b 合服 2020-08-17 11:09:35 +08:00
zhangshanxue b643307e5a 合服 2020-08-17 10:26:46 +08:00
lvxinran 588e22626f 修改部分日志 2020-08-17 10:11:27 +08:00
lvxinran 237317a677 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-30 21:15:02 +08:00
lvxinran 8aaf2d698b 十绝阵邮件发奖修改 2020-08-30 21:14:49 +08:00
lvxinran bde18afb04 轩辕宝镜修改推送 2020-08-24 05:02:20 +08:00
zhangshanxue 2826ce87de 合服 2020-08-15 17:28:53 +08:00
zhangshanxue 05a1f88da3 合服 2020-08-15 15:47:51 +08:00
zhangshanxue 7c8743c71e Merge branch 'master_test_combin' of http://60.1.1.230/backend/jieling_server into master_test_combin 2020-08-15 15:41:50 +08:00
zhangshanxue 7c5c28d6a1 Merge branch 'master_test_hw' into master_test_combin 2020-08-15 15:40:46 +08:00
zhangshanxue 68aa9fc53d 合服 2020-08-15 15:25:55 +08:00
zhangshanxue 0a162ccce7 充值类型更换 2020-08-14 23:41:23 +08:00
zhangshanxue 47bfc8c339 充值类型更换 2020-08-14 23:19:12 +08:00
zhangshanxue 329cb6dcc2 充值类型更换 2020-08-14 23:18:18 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
zhangshanxue a2504adc4c 合服 2020-08-14 14:30:31 +08:00
zhangshanxue e81eeb4cf6 英雄创建类型 2020-08-14 14:10:56 +08:00
lvxinran 9a25d556a2 换层清除数据 2020-08-23 07:03:47 +08:00
lvxinran 3b384d0698 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-23 07:02:32 +08:00
lvxinran c0126ead43 线程加入try catch 2020-08-23 07:02:27 +08:00
lvxinran 20a0adb7fe 森罗环境 小怪计血量 2020-08-23 07:02:07 +08:00
lvxinran a8087e7b84 森罗幻境重置商人 2020-08-22 05:02:27 +08:00
lvxinran dbfb8f4110 限时兑换活动物品掉落修改 2020-08-21 11:30:47 +08:00
lilei 517f156037 每日签到宝箱 2020-08-14 09:39:38 +08:00
zhangshanxue ca65ff8689 合服 2020-08-13 21:44:36 +08:00
zhangshanxue 60abb970a9 Merge branch 'master' into master_test_combin
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-08-13 19:28:39 +08:00
zhangshanxue cbde195205 合服 2020-08-13 19:26:18 +08:00
zhangshanxue c36c3abdde 英雄置换 2020-08-13 16:53:56 +08:00
lvxinran eff5b8a1f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 06:21:36 +08:00
lvxinran 315ef31145 车迟斗法打点修改 2020-08-17 06:21:31 +08:00
lvxinran 19ee0348b9 合成英雄修改 2020-08-17 05:36:19 +08:00
zhangshanxue 31274417cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 15:01:33 +08:00
zhangshanxue 993ad432b2 英雄置换 2020-08-13 15:01:25 +08:00
zhangshanxue b5295969ca 英雄置换 2020-08-13 14:34:05 +08:00
lvxinran 7d298ccfbb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 05:08:40 +08:00
lvxinran 6dfd305c73 轩辕宝镜排行发奖 2020-08-17 05:08:35 +08:00
lvxinran cf3704b456 神将合成进阶修改 2020-09-07 14:45:25 +08:00
lvxinran e371b00b38 推送修改 2020-08-26 05:58:13 +08:00
lvxinran 2ba3f2d76f 埋点报错修改 2020-08-26 05:43:23 +08:00
zhangshanxue 53993024b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 12:07:29 +08:00
zhangshanxue 64e4e2911b 英雄置换 2020-08-13 12:07:16 +08:00
zhangshanxue 2b33f18c05 Merge branch 'equip_develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-08-12 15:20:22 +08:00
lvxinran 1bbf5bc010 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-16 14:21:45 +08:00
lvxinran 9934547352 修改装备返还 2020-08-16 14:21:35 +08:00
lvxinran a05812d3e6 修复战斗被动 2020-08-16 12:38:09 +08:00
lvxinran a5d9a17b29 怪物被动修改 2020-08-16 11:27:35 +08:00
lvxinran 5dfcc37f29 判断宝镜 2020-08-15 20:24:41 +08:00
lvxinran 1af2208ab8 修改校验条件 2020-08-15 20:01:33 +08:00
lvxinran 2d92899d8f 打点修改 2020-08-15 19:17:46 +08:00
lvxinran ef2184ac99 二期打点需求 2020-08-15 18:18:32 +08:00
lvxinran d46749052d 战斗位置 2020-08-15 17:08:45 +08:00
lvxinran c3aa6aaec9 报空 修改 2020-08-15 16:25:45 +08:00
lvxinran 00198786e9 轩辕宝镜代码提交 2020-08-15 13:42:36 +08:00
lvxinran fffe477523 英雄装备掉落修改 2020-08-13 09:41:07 +08:00