Commit Graph

7880 Commits (a9014b74ca28547318034f7157fef3ddf09cd9af)
 

Author SHA1 Message Date
grimm adc6b73d6b 热更 2024-03-06 16:24:49 +08:00
grimm 221713d2ec 热更 2024-03-06 16:22:49 +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
grimm 707fc9b22f 竞技场重写六版,修改对手匹配机制,尽量匹配真人 2024-02-19 17:43:03 +08:00
grimm 2bd413795e 竞技场重写六版,微调redis缓存 2024-02-19 15:57:07 +08:00
grimm c41462be94 竞技场重写六版,竞技场跨服战斗 2024-02-19 15:10:29 +08:00
grimm 45eb1165f8 竞技场重写五版,刷新对手bug修改 2024-02-19 15:00:55 +08:00
grimm a7cfe8c300 线上热更 2024-02-19 14:11:25 +08:00
grimm 6a47c21db0 线上热更 2024-02-19 14:10:53 +08:00
grimm 7bf8cc4be6 竞技场重写四版,邮件排名信息 2024-02-19 11:49:15 +08:00
grimm 911657915b 竞技场重写四版,领奖报错修改 2024-02-19 11:31:35 +08:00
grimm 9c4b9673bc 竞技场重写四版,gm工具修改,格式优化 2024-02-19 11:12:49 +08:00
grimm 23ad55fdcf 线上热更 2024-02-12 19:13:51 +08:00
grimm 2a1fc6a66d 线上热更 2024-02-12 19:13:11 +08:00
grimm f1f73d205f 线上热更 2024-02-12 19:10:12 +08:00
grimm d5de53e6a6 Merge remote-tracking branch 'origin/master_ob2' into master_ob2 2024-02-12 19:08:58 +08:00
grimm 7b061cf442 线上热更 2024-02-12 19:07:30 +08:00
grimm 9fbfae861a 竞技场重写三版,拍脸推送 2024-02-06 18:24:27 +08:00
grimm 3bf535943c 竞技场重写二版微改 2024-02-06 17:24:59 +08:00
grimm f167725b51 竞技场重写二版微改 2024-02-06 16:55:18 +08:00
grimm d1e1a876ea 战斗同步 2024-02-06 16:40:34 +08:00
grimm 745dde1d59 竞技场重写二版 2024-02-06 15:09:27 +08:00
grimm 6bf881b06d 竞技场重写初版 2024-02-06 14:54:09 +08:00
grimm a3eae1a429 循环周卡 2024-01-29 18:13:54 +08:00
grimm 99b25f9f82 Merge branch 'master_dev' into master_otnew 2024-01-29 17:47:18 +08:00
grimm 9a617bccd6 牛气冲天活动bug修改 2024-01-29 17:38:40 +08:00
grimm 88cd6a2d43 牛气冲天活动bug修改
(cherry picked from commit 6f0a8cda79)
2024-01-29 17:38:08 +08:00
grimm a2b847371b Merge branch 'master_dev' into master_arena 2024-01-29 17:27:01 +08:00
grimm 71931154e5 牛气冲天活动bug修改 2024-01-29 17:18:04 +08:00