Commit Graph

6708 Commits (1210a307985e0debd588fdcf05101db39e4d4928)
 

Author SHA1 Message Date
duhui ad1cf08eae 【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化 2021-12-27 13:45:47 +08:00
duhui 4e852db95b 【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限 2021-12-27 11:47:40 +08:00
jiahuiwen b88a69ef3a 减少玩家数据在内存时间 2021-12-27 10:25:35 +08:00
xuexinpeng 8f0010b1be Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2021-12-27 10:04:54 +08:00
xuexinpeng 6a6cbaca50 探索 2021-12-27 10:02:59 +08:00
duhui 20b1c958e5 【家园功能1.0.1】任务优化,添加升级取消功能 2021-12-24 18:20:10 +08:00
jiahuiwen c6d13b6685 Merge branch 'master_test_gn' into master_prb_gn 2021-12-24 17:52:59 +08:00
jiahuiwen 4132cd1f80 删除无用代码 2021-12-24 17:52:09 +08:00
duhui 6f3c8768bf 【家园功能1.0】待联调 2021-12-24 17:07:57 +08:00
jiahuiwen 8f47418546 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-24 13:55:10 +08:00
jiahuiwen 0602b9f003 逐胜商店刷新错误 2021-12-24 13:55:03 +08:00
xuexinpeng b9cc3dec5f 探索 2021-12-24 11:29:51 +08:00
yuanshuai 93596965dd 超值返利网页支付重复购买礼包问题修改 2021-12-24 09:49:28 +08:00
yuanshuai 540e61d512 超值返利网页支付bug修改 2021-12-23 16:05:15 +08:00
yuanshuai 5cedfa6e4e 命石快速合成bug修改 2021-12-23 15:14:43 +08:00
yuanshuai 9b545e5eea Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
2021-12-23 09:53:52 +08:00
yuanshuai 4de94d16ea 飞升脚本提交 2021-12-23 09:51:48 +08:00
xuexinpeng 503ef57f57 探索 2021-12-22 18:04:05 +08:00
jiahuiwen 7ae3da6636 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-22 10:55:57 +08:00
jiahuiwen a9df7aa7e0 返还道具bug 2021-12-22 10:54:44 +08:00
jiahuiwen a800bb8249 觉醒将返还道具bug 2021-12-22 10:44:46 +08:00
xuexinpeng 49811877fa 战斗星级 2021-12-21 19:07:26 +08:00
xuexinpeng e683d993d5 探索 战斗 2021-12-21 19:04:56 +08:00
jiahuiwen 90e98f6355 int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度 2021-12-21 17:48:01 +08:00
xuexinpeng 9253e775f0 探索 2021-12-21 16:46:24 +08:00
xuexinpeng db7dbb84c2 探索 2021-12-23 17:19:54 +08:00
jiahuiwen d3b35d55d0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 10:50:52 +08:00
DESKTOP-98AVA47\Administrator 8aba14dbe2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-23 19:13:48 +08:00
DESKTOP-98AVA47\Administrator 5421882672 补充 2021-12-23 19:13:39 +08:00
DESKTOP-98AVA47\Administrator 9b6f5a8e0c 获取活动开启时间 2021-12-23 19:01:57 +08:00
jiahuiwen bd15f69616 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-21 10:50:43 +08:00
jiahuiwen cf91ff167b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 09:55:23 +08:00
jiahuiwen a97bca5c9b 升星配方调整补偿 2021-12-21 09:55:12 +08:00
yuanshuai b473c1a6ca 旧版积天豪礼bug修改 2021-12-20 18:52:08 +08:00
xuexinpeng 048c240cb4 礼包刷新 2021-12-23 17:21:26 +08:00
jiahuiwen fb5036ea29 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-20 11:51:23 +08:00
xuexinpeng a7ff90e6a7 规范代码 2021-12-29 00:03:50 +08:00
jiahuiwen 2596eb08b9 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-20 11:51:13 +08:00
xuexinpeng d9e9f378ef Merge branch 'master_test_gn' into master_test_gn_xxp 2021-12-20 11:31:19 +08:00
jiahuiwen 7ea5e79269 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-20 11:12:59 +08:00
yuanshuai 9d7058bec8 新版天天尊降世bug修改 2021-12-23 11:04:02 +08:00
yuanshuai 652caf6b5b 旧版积天豪礼代码兼容 2021-12-31 00:02:41 +08:00
jiahuiwen 58311e37df 心愿抽奖 400 次后不重置剩余保底次数 2021-12-20 11:12:47 +08:00
jiahuiwen fc01267f37 每日豪礼 活动类型 13 不再更新,补发奖励 2021-12-20 10:20:31 +08:00
jiahuiwen 78bf408e42 积天豪礼活动已被替换,未参与的玩家不再累计 2021-12-17 18:31:52 +08:00
jiahuiwen 80f48b3f42 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 17:19:57 +08:00
jiahuiwen 7012d6c647 灵兽宝阁特殊使用 2021-12-17 17:19:40 +08:00
yuanshuai f473965b9d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 16:13:59 +08:00
yuanshuai df0059632a 新版积天豪礼活动提交 2021-12-17 16:13:50 +08:00
yuanshuai d814ecb635 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2022-01-03 11:48:04 +08:00