Commit Graph

5521 Commits (b58f2226698792bfc2f5f0e273f0f7c05050673d)

Author SHA1 Message Date
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
duhui 0692f312fa 玲珑宝阁问题修改 2021-11-04 18:04:59 +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
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 fb7ed91a36 新版三界降魔活动提交 2021-10-28 12:05:47 +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
duhui 3179849ffb 超级月卡 2021-10-27 13:49:08 +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 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