Commit Graph

7929 Commits (69658e1afa9d324da8b91f54383596960cbfddfe)
 

Author SHA1 Message Date
grimm 69658e1afa 日志 2024-04-30 15:28:11 +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 eeded71a3d 小兵战力加成上限 2024-04-26 19:22:24 +08:00
grimm 477f22e7c5 挂机奖励回滚 2024-04-26 18:43:06 +08:00
grimm b4934dafe5 小兵攻击加成 2024-04-27 15:14:15 +08:00
grimm 76907cc43e 关闭极速探索功能 2024-04-27 15:13:53 +08:00
grimm 415df3b213 Merge branch 'master_xiyou' into master_luofu
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ArenaManager.java
2024-04-25 20:19:58 +08:00
grimm afd6cc1736 新竞技场第一次匹配机器人 2024-04-25 19:35:36 +08:00
grimm ae42277f88 规范修正,不涉及代码 2024-04-25 18:56:03 +08:00
grimm d64e3076b2 Merge branch 'master_xiyou' into master_luofu 2024-04-24 18:42:51 +08:00
grimm 355b200d20 小兵关卡推送 2024-04-24 18:42:31 +08:00
grimm 1279ca6cfb error修改 2024-04-24 17:17:37 +08:00
grimm cc3f0286dd Merge branch 'master_xiyou' into master_luofu 2024-04-24 16:41:19 +08:00
grimm 37d70b70fa 小兵关卡相关活动和排行榜修改 2024-04-24 14:20:31 +08:00
grimm 2d76709b52 热更 2024-04-24 11:14:14 +08:00
grimm 0801930225 罗浮,gm功能,交换排名 2024-04-23 18:39:33 +08:00
grimm 71657f7afb 罗浮,gm功能,交换排名 2024-04-23 18:37:31 +08:00
grimm b019268a95 罗浮,第一次机器人删除 2024-04-23 17:21:12 +08:00
grimm 9295289b88 罗浮,bug优化 2024-04-29 00:47:32 +08:00
grimm 0227b97065 战斗同步 2024-04-27 16:28:50 +08:00
grimm 654a73fd1a 罗浮改版,机器人不再改名 2024-04-27 16:28:40 +08:00
grimm 18ff8bb3ea 罗浮改版,初始化和发奖改为线程处理 2024-04-20 18:17:37 +08:00
grimm 6857943d6a 罗浮改版第一版 2024-04-20 18:04:17 +08:00
grimm d607613c18 助阵战力更新 2024-04-17 17:57:30 +08:00
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 24e60ab8c5 热更重置 2024-04-01 13:47:06 +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 b621421917 Merge branch 'master_ob2' into cycle_activity
# Conflicts:
#	conf/c_database_version.json
2024-04-01 13:46:15 +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