Commit Graph

7329 Commits (e28e8947234b3ed0191aa356fb81656777020892)

Author SHA1 Message Date
grimm f7fd4e430f 图鉴战力 2024-04-17 17:10:49 +08:00
grimm d71fb15026 图鉴战力 2024-04-17 14:56:26 +08:00
grimm b2223b8a04 新增图鉴类型 2024-04-16 18:47:55 +08:00
grimm e9327ca378 专武活动 2024-04-16 15:09:54 +08:00
grimm e1eb601ec1 Merge branch 'master_dev' into master_assist 2024-04-15 18:00:19 +08:00
grimm 667fd6c85a 助阵修改 2024-04-15 17:54:38 +08:00
grimm bc1e247e2d Merge branch 'master_0.05' into master_dev 2024-04-15 17:54:08 +08:00
grimm 15646fb602 Merge branch 'master_soldier' into master_assist
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/OnlineUserManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2024-04-15 17:52:16 +08:00
grimm da13ea697f 礼物升星 2024-04-15 17:27:00 +08:00
grimm e591edbea1 助阵修改 2024-04-12 18:59:46 +08:00
grimm c4f1d8b620 助阵 2024-04-12 15:40:30 +08:00
grimm e607cb442d 法宝替换修改 2024-04-11 16:17:16 +08:00
grimm a138ec1b4c null处理 2024-04-10 17:30:27 +08:00
grimm 75200c0d51 1. 图鉴加潜能
2. 心愿神话概率修改
2024-04-10 16:27:51 +08:00
grimm 91aa55d295 合并 2024-04-08 11:23:24 +08:00
grimm a9014b74ca Merge branch 'master_0.05' into master_dev
# Conflicts:
#	gamecommon/src/main/java/util/TimeUtils.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java
2024-04-08 11:23:08 +08:00
grimm 8ab3bea32d 小兵属性向上取整 2024-04-07 17:38:16 +08:00
grimm 38c06778f1 公会任命 2024-04-02 16:23:45 +08:00
grimm 0ff0bc218c 助战报错 2024-04-02 16:07:09 +08:00
grimm ad34e05704 小兵通关奖励 2024-04-01 14:32:33 +08:00
grimm e7bec4b926 Merge branch 'cycle_activity' into master_0.05
# Conflicts:
#	conf/c_database_version.json
2024-04-01 13:46:49 +08:00
grimm bbb9d414f8 Merge branch 'master_otnew' into cycle_activity
# Conflicts:
#	conf/c_database_version.json
#	conf/hotfix.json
2024-04-01 13:43:24 +08:00
grimm 8cc94c9051 循环活动,百抽活动 2024-04-03 17:42:44 +08:00
grimm d0784058a3 循环活动,寻宝密宗 2024-04-03 17:24:37 +08:00
grimm c0ddc38d70 礼物升星 2024-04-01 11:36:47 +08:00
grimm d08dea2dd5 循环活动bug处理 2024-03-28 16:45:00 +08:00
grimm 8ab1f93bb5 循环活动bug处理 2024-04-01 16:28:26 +08:00
grimm 99acbb8dad 循环活动bug处理 2024-03-28 16:12:01 +08:00
grimm 7c421103af 循环活动bug处理 2024-04-01 15:02:25 +08:00
grimm 55c742094e 排行榜战力更新 2024-03-28 14:09:14 +08:00
grimm 6624b6162a 循环活动bug处理 2024-03-28 14:03:17 +08:00
grimm ef62916994 日志 2024-03-27 18:07:51 +08:00
grimm e28318ccf3 用户缓存线程修改 2024-03-26 14:35:14 +08:00
grimm c8f47d0a7a 用户缓存线程修改 2024-03-26 14:22:03 +08:00
grimm cec77edb48 Merge branch 'master_0.05' into master_dev 2024-03-22 17:34:35 +08:00
grimm 9c8b2e2aa7 玩家缓存清理线程优化 2024-03-22 15:30:35 +08:00
grimm dfa546ac98 循环活动二改 2024-03-21 18:09:12 +08:00
grimm d6f9889b9e 注释海贼技能处理 2024-03-21 15:42:50 +08:00
grimm b847d03e2b 英雄道具日志 2024-03-21 15:07:42 +08:00
grimm fb67def798 英雄道具日志 2024-03-21 15:06:46 +08:00
grimm b5db821978 Merge branch 'master_0.05' into master_dev
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GmDialActivity.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
2024-03-21 15:02:02 +08:00
grimm b1f60947ca 装备加道具日志 2024-03-21 14:32:32 +08:00
grimm 956c1a0603 小兵功能四版,挂机空奖励处理,异常处理 2024-03-19 17:49:33 +08:00
grimm 6aafcc9cd2 聊天修改 2024-03-18 14:48:48 +08:00
grimm a27e058066 聊天去锁 2024-03-18 13:55:50 +08:00
grimm 7afdf411bf 装备更新修改,数据库存储 2024-03-18 10:30:02 +08:00
grimm 9766c5ccc7 小兵功能四版,小兵等级随机算法完善 2024-03-15 13:40:22 +08:00
grimm 9068f1484a 小兵功能三版,挂机奖励逻辑完善 2024-03-14 17:14:46 +08:00
grimm b39e7b37df 小兵功能二版 2024-03-14 15:20:33 +08:00
grimm bedc8a1c0a 好友推荐优化 2024-03-13 18:11:52 +08:00
grimm 471c6dcbec 小兵功能初版 2024-03-06 16:19:11 +08:00
grimm 7fc1d5c3a9 循环活动临时版 2024-03-06 16:14:32 +08:00
grimm d5d62aaf00 Merge branch 'master_ob2' into cycle_activity_ob2
# Conflicts:
#	conf/c_database_version.json
#	conf/hotfix.json
#	serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
2024-03-05 18:36:47 +08:00
grimm efa47029bc 循环活动结束时间,前端展示 2024-03-05 16:36:48 +08:00
grimm 4fcebd8359 循环活动结束时间,前端展示 2024-03-05 16:32:32 +08:00
grimm 2adb0938be 循环活动结束时间,前端展示 2024-03-05 16:28:34 +08:00
grimm f99362b388 vip刷新逻辑修改 2024-02-27 17:01:04 +08:00
grimm 16e05fd4b7 vip刷新逻辑修改 2024-02-27 16:15:42 +08:00
grimm 0c55069829 线上热更,vip刷新 2024-02-26 14:10:04 +08:00
grimm 1c2a27a128 特权逻辑修改 2024-02-23 23:46:53 +08:00
grimm e3d0b77bac 特权逻辑修改 2024-02-23 18:28:30 +08:00
grimm 5ed94f515c 灵脉挑战失败不扣次数 2024-02-23 18:21:04 +08:00
grimm 05f2ebf7eb 线上热更,vip刷新 2024-02-23 16:37:25 +08:00
grimm aa4cb55b7e vip特权刷新逻辑修改 2024-02-22 16:42:24 +08:00
grimm d122ae17b5 新增活动gm礼包 2024-02-22 11:22:57 +08:00
grimm 23ffa5b58b 竞技场重写8版,初始化竞技场刷新对手 2024-02-21 16:24:34 +08:00
grimm 45d941793b 竞技场重写8版,去除第一名拍脸 2024-02-21 15:10:56 +08:00
grimm 2a9b4f755c gm礼包购买新增逻辑,判断是否购买过礼包 2024-02-21 11:52:49 +08:00
grimm 0a68e0ebc1 竞技场重写七版,本服竞技场和机器人不显示区服名称 2024-02-21 11:47:57 +08:00
grimm 4a0065bfc5 竞技场重写七版,竞技场战斗赢了对面积分为负数 2024-02-20 17:52:38 +08:00
grimm 05c7077b58 竞技场重写七版,竞技场任务 2024-02-20 14:58:11 +08:00
grimm 707fc9b22f 竞技场重写六版,修改对手匹配机制,尽量匹配真人 2024-02-19 17:43:03 +08:00
grimm 2bd413795e 竞技场重写六版,微调redis缓存 2024-02-19 15:57:07 +08:00
grimm c41462be94 竞技场重写六版,竞技场跨服战斗 2024-02-19 15:10:29 +08:00
grimm 45eb1165f8 竞技场重写五版,刷新对手bug修改 2024-02-19 15:00:55 +08:00
grimm 7bf8cc4be6 竞技场重写四版,邮件排名信息 2024-02-19 11:49:15 +08:00
grimm 911657915b 竞技场重写四版,领奖报错修改 2024-02-19 11:31:35 +08:00
grimm 9c4b9673bc 竞技场重写四版,gm工具修改,格式优化 2024-02-19 11:12:49 +08:00
grimm 9fbfae861a 竞技场重写三版,拍脸推送 2024-02-06 18:24:27 +08:00
grimm 745dde1d59 竞技场重写二版 2024-02-06 15:09:27 +08:00
grimm 6bf881b06d 竞技场重写初版 2024-02-06 14:54:09 +08:00
grimm a3eae1a429 循环周卡 2024-01-29 18:13:54 +08:00
grimm 9a617bccd6 牛气冲天活动bug修改 2024-01-29 17:38:40 +08:00
grimm 88cd6a2d43 牛气冲天活动bug修改
(cherry picked from commit 6f0a8cda79)
2024-01-29 17:38:08 +08:00
grimm a2b847371b Merge branch 'master_dev' into master_arena 2024-01-29 17:27:01 +08:00
grimm 71931154e5 牛气冲天活动bug修改 2024-01-29 17:18:04 +08:00
grimm 6f0a8cda79 牛气冲天活动bug修改 2024-01-29 16:29:30 +08:00
grimm 98044a5bce 循环周卡领取bug处理 2024-01-29 16:09:45 +08:00
grimm 8da5ec551c 删除血战到底任务部分逻辑,查询到没有上层调用 2024-01-29 14:34:35 +08:00
grimm 05faac1c8f 牛气冲天活动修改 2024-01-29 14:31:29 +08:00
grimm c15edeff6e 循环活动二版 2024-02-03 18:49:34 +08:00
grimm 5b82fa8fb6 循环活动二版 2024-02-03 18:45:49 +08:00
grimm 065d492cde Merge branch 'master_dev' into cycle_activity 2024-02-03 17:29:37 +08:00
grimm 19fbf52c46 循环活动初版 2024-01-29 17:25:51 +08:00
grimm 37eca15b46 牛气冲天活动 2024-01-25 18:17:27 +08:00
grimm 6ab029cff4 牛气冲天活动 2024-01-25 18:08:18 +08:00
grimm a34c8013d9 经验道具 2024-01-25 17:12:38 +08:00
grimm 0360262525 经验道具 2024-01-25 16:50:07 +08:00
grimm b3e7918545 经验道具 2024-01-25 16:38:14 +08:00
grimm 227f57090d 错误修复 2024-01-25 15:23:53 +08:00
grimm 984a7943df 经验到上限后不发邮件 2024-01-25 10:56:41 +08:00
grimm 49165586a3 经验到上限后不发邮件 2024-01-22 11:28:38 +08:00
grimm 782cd915fd gm功能,修补玩家法相错误数据 2024-01-18 11:16:08 +08:00
grimm 9bdd4163c2 循环活动,time类型为6 2024-01-18 11:15:10 +08:00
grimm f6de5eb7d0 循环活动,time类型为6 2024-01-16 17:19:42 +08:00
grimm fe5bed800a 特训gm 2024-01-16 16:18:45 +08:00
grimm 5101384e3b 连续购买日志 2024-01-16 15:08:59 +08:00
grimm cff23b5715 连续购买日志 2024-01-16 15:06:48 +08:00
grimm 5fb5901b47 连续购买日志 2024-01-16 14:37:28 +08:00
grimm 12d46dfacd 未找到英雄异常 2024-01-15 16:24:44 +08:00
grimm 3147706388 公会名称修改为全渠道唯一 2024-01-11 16:06:15 +08:00
grimm 21fc5dd12b 合服后公会区服id未更正修复 2024-01-11 16:01:13 +08:00
grimm 8a9e97259b 礼物不同种类区分 2024-01-09 17:25:03 +08:00
grimm c738e8fc79 战斗异常修改 2024-01-08 17:00:15 +08:00
grimm 8314f3fe89 修复法宝聚灵技能bug 2024-01-05 18:23:01 +08:00
grimm f66cd81f54 助战英雄克隆修改 2024-01-05 14:38:29 +08:00
grimm 27bf841cb6 新增礼物升星功能 2024-01-05 14:01:08 +08:00
grimm 2421d26bc5 gm 删除道具 2024-01-04 17:42:30 +08:00
grimm fd70aadc15 Merge branch 'master_otnew' into master_dev
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java
2024-01-04 15:13:10 +08:00
grimm 1ad5359982 宝器数据丢失异常处理 2024-01-04 15:07:33 +08:00
grimm 14f65b8f60 宝器数据丢失异常处理 2024-01-04 14:23:58 +08:00
grimm 26fcc0706a 宝器数据丢失异常处理 2024-01-04 14:23:10 +08:00
grimm c1344a761f 海贼战斗 2024-01-04 14:22:26 +08:00
grimm 619e187dc2 Merge branch 'master_dev' into master_otnew 2024-01-03 18:56:16 +08:00
grimm c08fb65fd4 英雄技能允许重复实现 2024-01-03 18:54:26 +08:00
grimm 94a82e4d6e 表已修改,回滚 2024-01-02 11:45:27 +08:00
grimm 5a5a82ea5a Merge branch 'master_dev' into master_otnew 2024-01-02 11:44:48 +08:00
grimm f55d9f3cd6 修改合成限制为只限制英雄 2024-01-02 11:43:05 +08:00
grimm 8a8a8a9831 Merge branch 'master_dev' into master_otnew 2023-12-31 15:36:25 +08:00
grimm ea310891c5 法宝丢失问题,助战克隆导致入库数据异常处理 2023-12-31 15:36:01 +08:00
grimm 9f07006ad2 热更 2023-12-30 15:30:09 +08:00
grimm 0eb673e594 添加表内的异常返回类型 2023-12-29 18:39:07 +08:00
grimm 56460c9458 Merge branch 'master_dev' into master_otnew 2023-12-29 17:40:55 +08:00
grimm 4806c9d71e 法宝限制等级修改 2023-12-29 17:39:49 +08:00
grimm 38cd94dc5e Merge branch 'master_dev' into master_otnew 2023-12-29 15:45:19 +08:00
grimm 8c3ba79471 修复助战数据异常bug 2023-12-29 15:44:41 +08:00
grimm 9aa8d5333f Merge branch 'master_dev' into master_otnew 2023-12-29 15:31:00 +08:00
grimm 1b9cbd6f25 修复助战数据异常bug 2023-12-29 15:30:23 +08:00
grimm ecc76d4e87 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2023-12-29 14:50:18 +08:00
grimm 651edbb0cb 修复助战数据异常bug 2023-12-29 14:43:56 +08:00
grimm 0741a65840 Merge branch 'master_dev' into master_otnew 2023-12-29 12:07:21 +08:00
grimm f746d02aa3 session异常处理回滚 2023-12-29 12:06:50 +08:00
grimm 4ba0957ef8 Merge branch 'master_dev' into master_otnew 2023-12-28 18:24:14 +08:00
grimm ee237b4996 修复特训建筑立刻升级消耗bug 2023-12-28 18:23:27 +08:00
grimm d82304278d Merge branch 'master_dev' into master_otnew 2023-12-28 14:05:06 +08:00
grimm 1566463f65 法宝星级任务功能完善 2023-12-28 14:04:19 +08:00
grimm ce5a23492e 助战异常,宝物报null,已处理 2023-12-28 14:03:23 +08:00
grimm c7c9d73b0e Merge branch 'master_dev' into master_otnew 2023-12-28 11:39:55 +08:00
grimm 73e8edece0 法宝任务bug修改 2023-12-28 11:39:20 +08:00
grimm a28668dc38 Merge branch 'master_dev' into master_otnew 2023-12-28 10:20:06 +08:00
grimm 86025ab785 session index异常返回报错
法宝类型转换异常报错修复
2023-12-28 10:18:00 +08:00
grimm fc35a7624e Merge branch 'master_dev' into master_otnew 2023-12-27 18:54:23 +08:00
grimm de527d2f01 鸿蒙阵bug修复 2023-12-27 18:53:17 +08:00
grimm 416da4f2ad 公会仅剩1人时,立刻解散公会 2023-12-27 16:32:19 +08:00
grimm 7190830e5e 鸿蒙阵bug修复 2023-12-27 10:18:51 +08:00
grimm 45e973a413 Merge branch 'master_dev' into master_otnew 2023-12-26 16:39:33 +08:00
grimm 6de440fb67 灵兽品质修改,推送礼包 2023-12-26 16:38:32 +08:00
grimm 3c5a876c6b 鸿蒙在修复 2023-12-26 15:47:42 +08:00
grimm 8f421d9147 Merge branch 'master_dev' into master_otnew 2023-12-26 12:46:03 +08:00
grimm 0413850fce 用户缓存减容修改为每小时处理一次 2023-12-26 12:44:25 +08:00
grimm 6a087e99bd 主线怪物削弱bug修复 2023-12-25 16:39:16 +08:00
grimm c9bd854717 Merge branch 'master_dev' into master_otnew 2023-12-25 16:40:24 +08:00
grimm dafff04cff 主线怪物削弱bug修复 2023-12-24 14:19:31 +08:00
grimm 1f87c29b53 Merge branch 'master_dev' into master_otnew 2023-12-24 09:43:44 +08:00
grimm 4b606d9af9 新活动,法宝召唤礼包 2023-12-24 09:41:00 +08:00
grimm f9fa6b20b6 Merge branch 'master_dev' into master_otnew 2023-12-22 17:48:12 +08:00
grimm 48f7f40fa5 登陆玩家信息增加距离开服周数 2023-12-22 17:47:49 +08:00
grimm 89a82513e0 Merge branch 'master_dev' into master_otnew 2023-12-22 14:59:51 +08:00
grimm a6cdc946e7 心魔快速战斗适配战力调整机制补充 2023-12-22 14:59:21 +08:00
grimm 3f56e5edd8 心魔快速战斗适配战力调整机制补充 2023-12-22 14:56:24 +08:00
grimm b282cd18ec Merge branch 'master_dev' into master_otnew 2023-12-22 14:47:04 +08:00
grimm a116e412f2 心魔快速战斗适配战力调整机制 2023-12-22 14:46:40 +08:00
grimm b3ef61108e Merge branch 'master_dev' into master_otnew 2023-12-21 18:40:30 +08:00
grimm c1e1eecb53 小调整,不影响逻辑 2023-12-21 18:40:10 +08:00
grimm fefa3f6332 Merge branch 'master_dev' into master_otnew 2023-12-21 18:33:10 +08:00
grimm bb58217020 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2023-12-25 15:48:01 +08:00
grimm 32ce67a2b3 注释 2023-12-25 15:45:44 +08:00
grimm 86ae37c126 特训中的英雄无法做材料消耗或分解 2023-12-25 15:44:21 +08:00
grimm 563d25312d 特训中的英雄无法做材料消耗或分解 2023-12-25 15:41:58 +08:00
grimm d4e1a6cefd Merge branch 'master_dev' into master_otnew 2023-12-23 15:15:00 +08:00
grimm c313d27871 挑战副本奖励算法修改 2023-12-23 15:14:30 +08:00
grimm 1dce1ea964 心魔快速战斗适用战力削弱 2023-12-21 18:32:18 +08:00
PC-202302260912\Administrator bb0372370d 修改 2023-12-19 14:12:18 +08:00
PC-202302260912\Administrator 851f0f51f3 鸿蒙阵bug修改,战斗同步 2023-12-19 11:44:39 +08:00
PC-202302260912\Administrator 988292cb65 Merge branch 'master_dev' into master_otnew 2023-12-15 13:47:46 +08:00
PC-202302260912\Administrator cc37af82c3 罗浮未开启修改 2023-12-15 13:47:02 +08:00
PC-202302260912\Administrator d1410377a6 Merge branch 'master_dev' into master_otnew 2023-12-14 16:23:50 +08:00
PC-202302260912\Administrator 923db41225 鸿蒙阵代码回滚,只保留等级 2023-12-14 15:16:52 +08:00
PC-202302260912\Administrator 6a2210eea3 修复bug 2023-12-14 10:38:46 +08:00
PC-202302260912\Administrator 9da26dd78c Merge branch 'master_dev' into master_otnew 2023-12-13 16:29:27 +08:00
PC-202302260912\Administrator 34c562b72f 法宝聚灵增加属性百分比 2023-12-13 16:28:39 +08:00
PC-202302260912\Administrator be102f70b7 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	luafight/Modules/Battle/Config/Data/CombatControl.lua
#	luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua
#	luafight/Modules/Battle/Config/Data/SkillLogicConfig.lua
#	luafight/Modules/Battle/Readme.txt
2023-12-12 17:41:00 +08:00
PC-202302260912\Administrator ad20cec591 法宝聚灵增加属性百分比 2023-12-12 17:38:59 +08:00
PC-202302260912\Administrator d0d7cfd068 0.1分支战斗处理 2023-12-06 17:28:17 +08:00
PC-202302260912\Administrator daa83310cd 备注修改 2023-12-05 14:30:20 +08:00
PC-202302260912\Administrator e063d4c1da 日志修改 2023-12-05 14:20:01 +08:00
PC-202302260912\Administrator fb8428d254 关卡降低战力 2023-12-05 14:00:24 +08:00
PC-202302260912\Administrator e98e3ea8d1 魂印解锁条件修改,redis模糊查询删除 2023-12-04 15:59:53 +08:00
PC-202302260912\Administrator 0d7d840f20 特训功能补充 2023-11-29 10:54:49 +08:00
PC-202302260912\Administrator 980635e41a 用户缓存逻辑修改 2023-11-28 19:02:27 +08:00