Commit Graph

734 Commits (b7e05622cad27078352e7fabb93dd40e702e658c)

Author SHA1 Message Date
grimm ccb04c698f 特训道具加速 2024-06-13 16:35:35 +08:00
grimm 10e3680e1e 天天0.1折活动bug修复 2024-06-10 18:35:24 +08:00
grimm 0077a33e52 天天0.1折活动bug修复 2024-06-10 17:11:45 +08:00
grimm fd80ebe6d3 主线奖励改直接掉落2 2024-06-03 14:44:04 +08:00
grimm af1b9c065a 优化 2024-05-22 18:23:40 +08:00
grimm fc99dd47a4 天天0.1折活动 2024-05-21 16:43:17 +08:00
grimm 3554d42b82 表异常提示 2024-05-21 15:19:50 +08:00
grimm ab652f028f 天天0.1折功能 2024-05-20 15:22:49 +08:00
grimm 4a1c06bb24 小兵遣散发送招募奖励 2024-05-16 12:38:50 +08:00
grimm 1ccd8f470f 现金点券购买礼包 2024-05-13 17:27:56 +08:00
grimm e2d1096df6 数字小游戏挂机奖励 2024-04-29 20:07:07 +08:00
grimm ee077afb31 比数小游戏挂机奖励 2024-04-28 20:38:06 +08:00
grimm 264cf180fc Merge remote-tracking branch 'origin/master_luofu' into master_xiyou 2024-04-26 19:23:20 +08:00
grimm b4934dafe5 小兵攻击加成 2024-04-27 15:14:15 +08:00
grimm 6857943d6a 罗浮改版第一版 2024-04-20 18:04:17 +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 c4f1d8b620 助阵 2024-04-12 15:40:30 +08:00
grimm 75200c0d51 1. 图鉴加潜能
2. 心愿神话概率修改
2024-04-10 16:27:51 +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 55c742094e 排行榜战力更新 2024-03-28 14:09:14 +08:00
grimm b39e7b37df 小兵功能二版 2024-03-14 15:20:33 +08:00
grimm 3bf535943c 竞技场重写二版微改 2024-02-06 17:24:59 +08:00
grimm f167725b51 竞技场重写二版微改 2024-02-06 16:55:18 +08:00
grimm 6bf881b06d 竞技场重写初版 2024-02-06 14:54:09 +08:00
grimm 19fbf52c46 循环活动初版 2024-01-29 17:25:51 +08:00
grimm 702bc42abd 活动时间类型 2024-01-25 15:32:55 +08:00
grimm 12d46dfacd 未找到英雄异常 2024-01-15 16:24:44 +08:00
grimm 27bf841cb6 新增礼物升星功能 2024-01-05 14:01:08 +08:00
grimm c08fb65fd4 英雄技能允许重复实现 2024-01-03 18:54:26 +08:00
grimm 0eb673e594 添加表内的异常返回类型 2023-12-29 18:39:07 +08:00
grimm 651edbb0cb 修复助战数据异常bug 2023-12-29 14:43:56 +08:00
PC-202302260912\Administrator ad20cec591 法宝聚灵增加属性百分比 2023-12-12 17:38:59 +08:00
PC-202302260912\Administrator e98e3ea8d1 魂印解锁条件修改,redis模糊查询删除 2023-12-04 15:59:53 +08:00
PC-202302260912\Administrator d0af42766c 特训 2023-11-24 17:01:10 +08:00
PC-202302260912\Administrator 02e616fae9 特训初版 2023-11-21 17:59:28 +08:00
PC-202302260912\Administrator 99c7bdf11c 战斗技能修改 2023-11-13 18:21:39 +08:00
PC-202302260912\Administrator 0f51ad7600 礼物和修仙属性修改 2023-11-02 17:52:36 +08:00
PC-202302260912\Administrator 8f44198312 回滚神将修改,法宝抽卡修改 2023-10-27 14:29:04 +08:00
PC-202302260912\Administrator 63f1408a45 回滚神将修改,法宝抽卡修改 2023-10-27 14:26:32 +08:00
PC-202302260912\Administrator 63d10823ee Merge branch 'master_dev' into master_dev_fabao
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2023-10-23 17:58:30 +08:00
PC-202302260912\Administrator 0181282032 注释删除 2023-10-23 14:17:24 +08:00
PC-202302260912\Administrator 85526fac97 法宝初版,删除旧跨服英雄方法 2023-10-19 18:01:47 +08:00
PC-202302260912\Administrator 4b840e5750 潜能战力调整 2023-10-12 17:04:53 +08:00
PC-202302260912\Administrator dee7978c3a 潜能 2023-10-11 18:22:23 +08:00
PC-202302260912\Administrator 89c41eec78 礼物装备 2023-09-13 17:15:03 +08:00
PC-202302260912\Administrator ba818ad0a1 礼物装备 2023-09-13 15:07:45 +08:00
PC-202302260912\Administrator 6372ce36a7 战力扩充为long 2023-09-05 14:40:34 +08:00
PC-202302260912\Administrator 242799ffe2 命石 2023-08-31 14:56:42 +08:00
PC-202302260912\Administrator 6e69024fd4 命格,宝石 2023-08-25 17:27:46 +08:00
PC-202302260912\Administrator 0d5bb21157 战力修改,山河试炼改为开服时间校验 2023-08-21 15:45:18 +08:00