Commit Graph

8056 Commits (8de2dc78e359b817d541822dd4e0de46616b513d)
 

Author SHA1 Message Date
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 7effc468fe 热更 2024-03-21 14:39:03 +08:00
grimm d48209d657 热更 2024-03-21 14:38:34 +08:00
grimm b1f60947ca 装备加道具日志 2024-03-21 14:32:32 +08:00
grimm d5d2ff3d2a 重置 2024-03-20 13:51:24 +08:00
grimm 956c1a0603 小兵功能四版,挂机空奖励处理,异常处理 2024-03-19 17:49:33 +08:00
grimm 6df338db96 热更 2024-03-18 18:33:05 +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 b6e4cf9f1e 热更 2024-03-15 15:48:44 +08:00
grimm 1d136a81b7 热更 2024-03-15 15:43:43 +08:00
grimm c1f27f9365 热更 2024-03-15 15:22:12 +08:00
grimm 9766c5ccc7 小兵功能四版,小兵等级随机算法完善 2024-03-15 13:40:22 +08:00
grimm 0503da80cb 热更 2024-03-15 11:29:40 +08:00
grimm 9cbb9f06a4 热更 2024-03-15 10:42:04 +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 fc0c3b1250 热更 2024-03-12 15:19:45 +08:00
grimm 5d3b41d7fb 热更 2024-03-12 15:18:57 +08:00
grimm d08b0cb12e 热更 2024-03-06 16:29:58 +08:00
grimm adc6b73d6b 热更 2024-03-06 16:24:49 +08:00
grimm 221713d2ec 热更 2024-03-06 16:22:49 +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 20f77be81d 热更 2024-03-05 17:18:24 +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 66d8a77118 线上热更 2024-02-26 14:11:56 +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