grimm
|
4880f59535
|
发奖日志补充
|
2024-05-31 11:06:19 +08:00 |
grimm
|
82656eeda1
|
登陆文件
|
2024-05-24 17:44:11 +08:00 |
grimm
|
d94a14e846
|
gm充值限制
|
2024-05-23 18:59:51 +08:00 |
grimm
|
e926a53c36
|
Merge branch 'refs/heads/master_zzxx' into master_xiyou
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java
|
2024-05-22 18:31:23 +08:00 |
grimm
|
8785a037de
|
消息修改
|
2024-05-22 18:30:38 +08:00 |
grimm
|
b3e2ccf2b7
|
商店兼容
|
2024-05-21 17:11:53 +08:00 |
grimm
|
9b743e7c51
|
天天0.1折活动,任务
|
2024-05-21 17:10:52 +08:00 |
grimm
|
fc99dd47a4
|
天天0.1折活动
|
2024-05-21 16:43:17 +08:00 |
grimm
|
7fe95d4525
|
Merge branch 'refs/heads/master_xiyou' into master_zzxx
|
2024-05-20 18:00:18 +08:00 |
grimm
|
597d1c38ba
|
冲榜奖励
|
2024-05-20 17:59:12 +08:00 |
grimm
|
ab652f028f
|
天天0.1折功能
|
2024-05-20 15:22:49 +08:00 |
grimm
|
312aa58c95
|
多对塔编队
|
2024-05-17 18:37:43 +08:00 |
grimm
|
50ef248574
|
小兵遣散发送招募奖励
|
2024-05-16 11:47:47 +08:00 |
grimm
|
29a14d2796
|
小兵遣散发送招募奖励
|
2024-05-16 11:44:05 +08:00 |
grimm
|
0e7ee94711
|
小兵招募异常修改
|
2024-05-15 15:20:27 +08:00 |
grimm
|
93e91677af
|
现金点券购买礼包,报错提示
|
2024-05-13 17:29:07 +08:00 |
grimm
|
1ccd8f470f
|
现金点券购买礼包
|
2024-05-13 17:27:56 +08:00 |
grimm
|
4da48e9d63
|
规范修改
|
2024-05-22 14:56:40 +08:00 |
grimm
|
5dda33b64f
|
刷冲特权领取累计奖励改为1天
|
2024-05-22 14:38:32 +08:00 |
grimm
|
b6c502c199
|
竞技场报错消耗次数问题修改
|
2024-05-22 14:33:16 +08:00 |
grimm
|
af1962b6a1
|
修改神灵试炼和多对塔挂机奖励异常提示
|
2024-05-20 16:56:49 +08:00 |
grimm
|
1a6f48771f
|
助战注释
|
2024-05-20 16:34:03 +08:00 |
grimm
|
3ce3bc15ef
|
公会副本空指针处理
|
2024-05-20 16:33:54 +08:00 |
grimm
|
04322523e9
|
小兵增伤改为创建时间计算
|
2024-05-09 12:19:26 +08:00 |
grimm
|
204d2f53ba
|
数字游戏
|
2024-05-08 18:22:02 +08:00 |
grimm
|
5c914494a9
|
去除调试日志
|
2024-05-08 15:58:14 +08:00 |
grimm
|
c439582b56
|
小兵战斗校验,攻击力改战斗力
|
2024-05-08 15:57:20 +08:00 |
grimm
|
532cb834e5
|
本地清库脚本修改
|
2024-05-07 17:52:51 +08:00 |
grimm
|
e0b8ebf56c
|
代码整理
|
2024-05-07 17:28:01 +08:00 |
grimm
|
ff8bda897d
|
全民礼包活动rediskey修改
|
2024-05-07 14:02:41 +08:00 |
grimm
|
99f93fe2d6
|
小兵关卡任务
|
2024-05-07 12:09:56 +08:00 |
grimm
|
efd58dc0c0
|
解决累充活动和全民礼包活动处理时间慢得问题
|
2024-05-07 11:47:41 +08:00 |
grimm
|
97a61029f4
|
日志修改
|
2024-05-06 18:50:01 +08:00 |
grimm
|
e279c64bdd
|
注释老合服逻辑,已经不用了
|
2024-05-06 18:09:19 +08:00 |
grimm
|
a346c89c99
|
新竞技场发奖日志修改
|
2024-05-06 17:59:49 +08:00 |
grimm
|
cdeb057ab6
|
竞技场发奖线程池问题修改
|
2024-05-06 17:55:47 +08:00 |
grimm
|
191ef1ff83
|
taskkit 线程池数量由8增加到10
|
2024-05-11 17:45:59 +08:00 |
grimm
|
0a61397686
|
跨服排行榜改为线程池独立运行,相关日志添加
|
2024-05-11 17:43:41 +08:00 |
grimm
|
61b39fe7c3
|
跨服排行榜,代码调整,无逻辑修改
|
2024-05-11 17:28:18 +08:00 |
grimm
|
4073fc2579
|
罗浮逻辑小优化
|
2024-05-11 17:21:32 +08:00 |
grimm
|
f2bc338733
|
活动调试日志删除
|
2024-05-11 17:20:41 +08:00 |
grimm
|
53aa5e74d3
|
删除调试日志
|
2024-05-06 16:28:12 +08:00 |
grimm
|
2899d82441
|
删除无用注释
|
2024-05-06 16:20:12 +08:00 |
grimm
|
b1406255ed
|
礼包购买逻辑优化,添加非空验证
|
2024-05-06 16:14:46 +08:00 |
grimm
|
dac102e271
|
日志修改,和注释无用内容
|
2024-05-06 16:14:23 +08:00 |
grimm
|
ddca7dfd7f
|
用户缓存修改,改为线程安全得
|
2024-05-06 16:13:53 +08:00 |
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
|
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
|
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
|
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 |