Commit Graph

7175 Commits (e1eb601ec120119f1adfd24338383c300c22617b)

Author SHA1 Message Date
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