Commit Graph

4629 Commits (880d92bed41eca98e76bf5b789a83abaa03dae39)

Author SHA1 Message Date
duhui af1c2fb537 调试日志注销 2021-06-02 11:03:21 +08:00
lvxinran e78e0141a3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 06:26:43 +08:00
lvxinran 5e1abc8359 新任务类型添加 2021-06-08 06:26:36 +08:00
lvxinran 103819f770 清除修改无用日志 2021-06-08 03:08:27 +08:00
lvxinran 0a6bc7deb2 礼包和活动关联修改 2021-06-08 01:29:18 +08:00
lvxinran 59c22520f3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 01:12:13 +08:00
lvxinran a0db1379a9 无尽生成小怪修改 2021-06-08 01:12:03 +08:00
lvxinran d21c4c9249 无用代码删除 2021-06-06 20:51:53 +08:00
lvxinran f53c48e0b0 踏碎凌霄阵容保存 2021-06-06 18:35:46 +08:00
lvxinran ea35f92275 踏碎凌霄保存阵容 2021-06-06 18:03:04 +08:00
mengchengzhen 1c6c979615 五星推送修改 2021-06-01 15:55:56 +08:00
duhui 638b4e1cbd 心愿抽奖,日志 2021-06-11 15:21:34 +08:00
duhui 19f5694fda Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-01 11:42:45 +08:00
duhui bea39c6fc7 Merge branch 'dev_dh_level' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
2021-06-01 11:42:31 +08:00
mengchengzhen 9d35d1b29d 网络不好导致充值失败的问题 2021-06-01 11:41:41 +08:00
mengchengzhen 13fb52cd3a 概率相等红包 2021-06-01 10:08:37 +08:00
mengchengzhen 3742a2aa74 新活动五星推送 2021-05-31 18:37:12 +08:00
mengchengzhen 0370572c7c 活动礼包刷新 2021-05-31 17:55:50 +08:00
duhui 20f6e75d12 修行,名字颜色 2021-05-31 16:21:26 +08:00
duhui d410438f8c 修行:名字颜色 2021-05-31 14:55:38 +08:00
mengchengzhen 2dd6b4c382 直购充值 2021-05-31 12:15:17 +08:00
lvxinran 93fca9a83b 报空修改 2021-06-03 06:34:13 +08:00
lvxinran 363262da61 天宫达人修改 2021-06-06 18:05:11 +08:00
mengchengzhen a0f97e13a6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-31 12:00:09 +08:00
mengchengzhen cfda3f3281 直充弹出 2021-05-31 11:59:56 +08:00
duhui ec6fe92d13 修行:名字颜色 2021-05-31 11:09:13 +08:00
duhui 8769f9334e 心愿抽奖,权重问题处理 2021-06-13 10:53:05 +08:00
xuexinpeng b1029ebb06 山河领奖报空处理 2021-05-29 17:01:07 +08:00
mengchengzhen 4292f3cca2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-29 16:16:30 +08:00
lvxinran 9c6a73551e 失败掉落 2021-06-06 15:59:42 +08:00
lvxinran b419bba13e Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-06 15:06:06 +08:00
lvxinran 67f8873482 踏碎凌霄排行 2021-06-06 15:05:55 +08:00
lvxinran b0da1ab24b 天宫达人修改 2021-06-05 17:36:45 +08:00
mengchengzhen e418082371 福利红包 2021-05-29 16:16:18 +08:00
mengchengzhen c29b7a25cd 福利红包 2021-05-28 18:50:18 +08:00
duhui f2e84cceac 心愿抽奖,消耗物品bug 2021-05-28 18:02:50 +08:00
mengchengzhen 74cc8d53b6 福利红包 2021-05-28 16:59:12 +08:00
duhui df2d2bb6e6 福星高照刷新问题, 心愿抽奖免费抽奖次数优化 2021-06-02 00:01:58 +08:00
xuexinpeng bf54d94986 山河社稷图一些优化 2021-05-28 14:41:28 +08:00
mengchengzhen 87463b9b15 自动封禁 2021-05-28 10:58:57 +08:00
lvxinran 7144d5fcd6 敏感词 2021-05-28 10:51:24 +08:00
duhui a8a013ec5c Merge branch 'dh_dev_activiyDraw' into master_test_gn 2021-05-28 10:10:59 +08:00
duhui ce512050b3 Merge branch 'master_test_gn' into dh_dev_activiyDraw 2021-05-28 10:10:39 +08:00
xuexinpeng c617212ba7 山河社稷 2021-05-27 23:08:20 +08:00
xuexinpeng 1f7ba67aa4 山河社稷 2021-05-31 02:17:18 +08:00
lvxinran 4e969510f5 Merge branch 'master_test_gn' into master_test_gn_endless
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2021-07-03 01:25:41 +08:00
lvxinran 99cd3246f2 无尽副本最后修改 2021-07-03 00:05:36 +08:00
lvxinran de1432222f 无尽提交 2021-06-09 03:46:51 +08:00
lvxinran dfd2bdc968 无尽修改第三版 2021-06-01 00:06:40 +08:00
duhui ab885c392a 心愿抽奖,后端自测完成 2021-05-27 19:35:53 +08:00
xuexinpeng fecbddb920 山河社稷任务 2021-05-27 18:24:07 +08:00
mengchengzhen d01dcff730 灵兽礼包 2021-05-27 17:08:47 +08:00
duhui 8e37bd922c 牛气冲天, 活动结束发送未领取奖励 2021-05-27 16:10:19 +08:00
duhui 2a5d149ac6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-27 16:07:17 +08:00
duhui 839eb2af4f 修行,名字颜色 2021-05-27 16:06:07 +08:00
mengchengzhen cd49002893 福利红包 2021-05-27 15:52:33 +08:00
xuexinpeng e1dbce80cf 山河社稷图排行榜 2021-05-27 14:48:39 +08:00
duhui 2bfb6228b0 牛气冲天活动结束,未发送未领取奖励问题处理 2021-05-27 11:48:59 +08:00
duhui 6214e3d8b8 修行bug处理: 附身神将分解 2021-05-27 10:31:11 +08:00
duhui 829bfccf16 修行: 系统消息添加玩家名字颜色 2021-05-26 18:31:33 +08:00
lvxinran 1d7e46ee36 玩家经验修改 2021-05-26 16:23:24 +08:00
xuexinpeng 62e5fac672 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-26 16:18:33 +08:00
xuexinpeng 945a238748 山河战斗记录修行等级 2021-05-26 16:14:49 +08:00
lvxinran a597b3545e 无尽副本第二版 2021-05-26 16:14:29 +08:00
duhui ee63e36511 修行bug处理, 编队展示错误和不入库问题处理 2021-05-26 16:09:10 +08:00
xuexinpeng 98ee42fb6c Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2021-05-26 11:20:11 +08:00
xuexinpeng 202b170cd5 心魔试炼扫荡,一键扫荡 2021-05-26 11:09:58 +08:00
mengchengzhen 69462d976d 怪物战力计算 2021-05-26 10:38:31 +08:00
mengchengzhen 7da6f963ba 新礼包优化 2021-05-25 20:13:42 +08:00
mengchengzhen f1776030ef 新红包优化 2021-05-25 20:13:30 +08:00
duhui d1a2849a56 心愿抽奖初版,未联调 2021-05-25 18:05:56 +08:00
duhui 66d10040d3 Merge branch 'dh_dev_gm' into master_test_gn
(cherry picked from commit b404814382)
2021-05-25 14:07:59 +08:00
lvxinran 6d76941d51 Merge branch 'master_test_gn' into master_test_gn_endless 2021-05-25 13:37:39 +08:00
lvxinran 7978510f02 分支合并 2021-05-25 11:56:06 +08:00
xuexinpeng e74314c6c7 山河社稷成就任务 心魔试炼扫荡 2021-05-25 11:40:43 +08:00
duhui 3030bb501f 修行: 附身神印展示使用中全部 2021-05-25 11:09:25 +08:00
duhui b404814382 Merge branch 'dh_dev_gm' into master_test_gn 2021-05-25 10:25:12 +08:00
xuexinpeng e74a860a80 特权等级奖励 2021-05-24 18:49:46 +08:00
mengchengzhen 276f842d5c 福利红包 2021-05-24 18:28:24 +08:00
xuexinpeng 3811d59299 山河社稷gm 2021-05-24 15:33:48 +08:00
duhui 96a3844ccc gm公会,信息不入库处理 2021-05-24 15:18:04 +08:00
mengchengzhen afda78f8e0 灵兽礼包 2021-05-24 14:38:22 +08:00
mengchengzhen e5c6a1723a 福利红包 2021-05-24 12:01:34 +08:00
mengchengzhen 2010a1a9ce Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-05-24 11:43:44 +08:00
xuexinpeng c3034285d4 Merge branch 'master_test_mcz_hardstage' into master_test_gn 2021-05-24 11:10:47 +08:00
xuexinpeng fe38e14a1c Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-24 11:06:17 +08:00
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
mengchengzhen 4a2df26e2e 福利红包 2021-05-21 18:52:19 +08:00
xuexinpeng 30c1a61b62 社稷大典邮件内容修改 2021-05-21 18:25:03 +08:00
xuexinpeng 34cd899b6e 山河社稷等级限制数据初始化 2021-05-21 16:29:33 +08:00
duhui 9fced9ba25 gm.修改公会信息 2021-05-21 15:28:16 +08:00
duhui eebf572d7d 自定义礼包码 2021-05-20 18:02:50 +08:00
xuexinpeng 133afbab21 组队类型限制 2021-05-20 17:08:06 +08:00
xuexinpeng 61c2b2b460 战斗lua脚本同步 2021-05-20 16:49:36 +08:00
xuexinpeng 7c7c3e6bb6 特权等级奖励 2021-05-20 15:41:33 +08:00
xuexinpeng a0db7928bf 山河社稷图最小战力回放 2021-05-19 15:27:00 +08:00
mengchengzhen 97d32d93dd 福利红包 2021-05-19 11:18:46 +08:00
duhui 222c10252b 修行3.0
神印展示增加,替换神印逻辑完善
2021-05-19 09:35:00 +08:00
xuexinpeng bc94b6290d 山河社稷图状态显示 2021-05-18 16:51:50 +08:00
xuexinpeng 8423d711dd 山河社稷图 2021-05-18 15:56:26 +08:00