Commit Graph

5605 Commits (46e112e56a2d6b1495aced53d19063d614bebfe5)

Author SHA1 Message Date
jiahuiwen 51e47e6588 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 15:25:54 +08:00
duhui 6b577dca45 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 15:00:43 +08:00
duhui 74c7f78291 无尽秘宝网页支付 2021-11-01 15:00:30 +08:00
xuexinpeng 032ce3646d 玉虚三个修改 玉虚赛季发奖时间 挑战后自动换一批 战斗的先后手问题
注释周卡相关
2021-11-01 15:00:09 +08:00
jiahuiwen 77b9fb6426 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 14:23:52 +08:00
duhui 59f9bf9f70 Merge branch 'dh_dev' into master_test_gn 2021-11-01 14:01:20 +08:00
duhui 121c01dce1 道具,坐骑碎片 2021-11-01 14:00:43 +08:00
xuexinpeng fc2d33d4c9 周卡相关 2021-11-01 13:18:29 +08:00
duhui 182244cfb0 好友获取优化 2021-11-07 10:43:49 +08:00
duhui 0692f312fa 玲珑宝阁问题修改 2021-11-04 18:04:59 +08:00
jiahuiwen eadaa7d40e Merge branch 'master_prb_gn' into master_test_gn 2021-11-01 10:07:11 +08:00
jiahuiwen 7747c85c86 罗浮争锋修复bug 2021-10-31 21:28:06 +08:00
jiahuiwen b58f222669 Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-31 16:29:34 +08:00
jiahuiwen 3388120fa1 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-31 16:17:24 +08:00
jiahuiwen dfdd659e0c 优化 2021-10-31 16:17:17 +08:00
jiahuiwen 452462606d 计算世界等级bug 2021-10-30 15:01:52 +08:00
jiahuiwen 29194289cc 分解英雄,和升星吞 2021-10-30 02:20:57 +08:00
jiahuiwen faa21bb46f 白金装备增加过滤掉脱装备获得 2021-10-30 01:43:45 +08:00
duhui cdd3b6b7dd 玲珑宝阁,奖池分活动 2021-10-29 17:19:44 +08:00
jiahuiwen ff57fe280e 修复商店 2021-10-29 16:19:26 +08:00
jiahuiwen 59c91e3233 修复指定活动 2021-10-29 16:10:22 +08:00
jiahuiwen 40ae6b6a1b 添加日志 2021-10-29 16:02:35 +08:00
jiahuiwen de7c59dff1 Merge branch 'master_test_gn_zf' into master_prb_gn 2021-10-29 15:50:00 +08:00
jiahuiwen 97e23512f2 热更修复bug 2021-10-29 15:49:40 +08:00
yuanshuai 3e2455b84a 神魂功能战斗相关修改 2021-10-29 13:26:43 +08:00
yuanshuai f39af137f9 Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-29 11:39:38 +08:00
duhui 3524c6ea23 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-29 11:00:18 +08:00
duhui d6fcda16a0 gm轩辕宝镜跳关 2021-10-29 11:00:03 +08:00
jiahuiwen bf1a911880 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-29 10:53:14 +08:00
jiahuiwen 542563c2c3 删除日志 2021-10-29 10:53:03 +08:00
duhui 17a8cc3811 车迟斗法积分为0处理 2021-10-29 10:51:29 +08:00
duhui 040d8bff45 gm类名修改 2021-10-29 09:48:39 +08:00
duhui 5410f0ecce 测试,gm需求 2021-10-28 18:10:20 +08:00
jiahuiwen 39d1c1242f 优化 2021-10-28 17:44:00 +08:00
duhui eb91e2169d 车迟斗法伤害溢出问题 2021-10-28 16:58:37 +08:00
yuanshuai b0d4de5917 添加跨服相关神将神魂信息 2021-10-28 15:32:36 +08:00
yuanshuai 149b0a2186 神魂技能属性脚本添加 2021-10-28 15:09:51 +08:00
duhui 0cdf8dfe92 异常码 2021-10-28 14:50:02 +08:00
yuanshuai 540018f484 神魂修改 2021-10-28 14:23:27 +08:00
duhui 83501823b7 日志 2021-10-28 13:30:59 +08:00
duhui 0b0f021bf5 天眼日志添加 2021-10-28 13:20:24 +08:00
yuanshuai fb7ed91a36 新版三界降魔活动提交 2021-10-28 12:05:47 +08:00
duhui d5dc87e1cd 天眼,取消旧公会信息兼容 2021-10-28 11:59:22 +08:00
xuexinpeng bb2ace9b66 Merge branch 'master_test_gn_zf' into master_test_gn 2021-10-28 11:31:53 +08:00
xuexinpeng d62ad1c030 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java
2021-10-28 11:22:58 +08:00
duhui 4b0447625d 七界试炼数数埋点 2021-10-28 10:23:14 +08:00
xuexinpeng 61a71d847c 去掉注释 2021-10-27 20:24:44 +08:00
xuexinpeng 18201b0de6 日志 2021-10-27 19:47:27 +08:00
xuexinpeng 6021025dc6 判空操作 2021-10-27 19:39:37 +08:00
xuexinpeng f72b071efd 判空返回 2021-10-27 19:17:58 +08:00
xuexinpeng b66139651f 注释6962 6963礼包 2021-10-27 19:01:09 +08:00
xuexinpeng 7d96a9e494 6962 6963礼包废弃 2021-10-27 18:30:51 +08:00
yuanshuai 947bfcf9e2 新版三界降魔活动提交 2021-10-27 17:41:58 +08:00
xuexinpeng bd08edc34e 7201活动弃用 2021-10-27 17:35:11 +08:00
xuexinpeng 56bd49949d 7201活动弃用 2021-10-27 17:27:59 +08:00
jiahuiwen 5870b939c5 test 2021-10-27 16:56:37 +08:00
xuexinpeng 33ea08343d Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-10-27 16:54:06 +08:00
xuexinpeng 62a1d3e61c 一键领取 2021-10-27 16:52:08 +08:00
duhui c974df9d8e 超级月卡 2021-10-27 16:51:44 +08:00
yuanshuai 434b929b87 神魂功能开启修改 2021-10-27 16:32:09 +08:00
duhui 080e3337b7 天眼公会 2021-10-27 15:54:53 +08:00
duhui 3179849ffb 超级月卡 2021-10-27 13:49:08 +08:00
yuanshuai e16f2947ca 添加神魂等级信息 2021-10-27 13:39:12 +08:00
xuexinpeng ec3ea76864 一键领取代码回滚 2021-10-27 07:44:08 +08:00
xuexinpeng e6ea0e5451 原帅跨服 2021-11-06 01:17:31 +08:00
yuanshuai 004ce5a027 主角技能添加用户等级 2021-10-26 17:57:10 +08:00
yuanshuai 379e85704d 跨服相关主角技能性别字段修改 2021-10-26 17:18:19 +08:00
yuanshuai c366955468 主角技能添加性别字段 2021-10-26 17:06:13 +08:00
yuanshuai 30a3220741 添加神将神魂相关字段 2021-10-26 16:26:35 +08:00
yuanshuai 7a445058d0 Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-26 15:14:15 +08:00
yuanshuai 1ed3adec43 车迟斗法抢夺战斗类型修改 2021-10-26 15:11:58 +08:00
jiahuiwen 872dee96f7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-26 15:00:55 +08:00
jiahuiwen d8f053335e 获取最大战力兼容机器人 2021-10-26 15:00:47 +08:00
xuexinpeng 155dfbd651 飘渺之旅新增绝对日期前后开服两种活动 2021-10-26 11:11:53 +08:00
yuanshuai ee66dc9c25 跨服切磋主角技能bug修改 2021-10-26 10:29:50 +08:00
xuexinpeng ae732cb0fa 跨服参数判空 2021-10-26 10:23:17 +08:00
yuanshuai 08d19e5edd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-25 17:26:39 +08:00
yuanshuai 6fc96e7f71 添加战斗力字段 2021-10-25 17:26:26 +08:00
xuexinpeng 4a1108ae00 yx挑战列表战力为0 2021-10-25 17:15:40 +08:00
yuanshuai 5a11a55629 大闹天宫和七剑试炼开战协议添加战斗力数据字段 2021-10-25 15:32:45 +08:00
yuanshuai ccf037d878 神魂系统功能修改 2021-10-25 15:10:16 +08:00
jiahuiwen d478225c1d 减少聊天记录缓存数量 2021-10-25 13:48:24 +08:00
jiahuiwen 01771b2fde 注释内存中的战斗缓存 2021-10-25 13:17:32 +08:00
xuexinpeng fe14a4230f yx修改 一键领取注掉 2021-10-22 17:46:20 +08:00
yuanshuai 5bee28c52f 后端不做活动兼容了 2021-10-22 17:25:12 +08:00
yuanshuai ea6545ec83 注释至尊降世活动数据兼容(前端做特殊处理了) 2021-10-22 17:21:12 +08:00
yuanshuai 8638f546bd 至尊降世活动任务兼容脚本提交 2021-10-22 17:09:16 +08:00
yuanshuai 048adc9c64 神魂相关脚本提交 2021-10-22 16:56:32 +08:00
duhui 6066375355 御剑行,活动切换修改 2021-10-22 16:24:03 +08:00
jiahuiwen c183c40c81 敏感字服兼容 2021-10-22 16:22:55 +08:00
jiahuiwen 8bdd217c8a Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 16:08:16 +08:00
jiahuiwen ea50ee77d1 Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 15:40:02 +08:00
duhui dc90208c0d 惊喜礼盒类型的活动,添加礼包购买次数校验 2021-10-22 15:36:27 +08:00
duhui a976c38c49 活动初始化清楚老的个人记录 2021-10-22 15:03:35 +08:00
yuanshuai d35f538ad2 Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-22 14:59:57 +08:00
jiahuiwen 967d5dc035 修仙属性flot 改int 2021-10-22 14:56:16 +08:00
duhui 45c95ced6d 竞猜记录 2021-10-22 14:49:35 +08:00
duhui 8c9a4a73d0 结算阶段问题修改 2021-10-22 14:37:36 +08:00
yuanshuai 9d0ff2e1da 山河社稷图副本添加修行技能相关最高战斗力字段数据 2021-10-22 14:36:52 +08:00
yuanshuai d2b1ce8966 神魂代码修改 2021-10-22 14:05:36 +08:00