Commit Graph

6503 Commits (a61999d664336e3ae9da12e73b038b7924ffaee9)
 

Author SHA1 Message Date
duhui a61999d664 【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
2021-12-30 15:21:27 +08:00
duhui 6b139b482e 【家园功能1.1.3】
1、装备强化验证bug修改
2021-12-30 13:51:29 +08:00
duhui 7c19af673d 【家园功能1.1.2】
1、装备强化表数据修改
2021-12-29 18:20:43 +08:00
duhui dc71d70ad2 【家园功能1.1.1】
1、建筑解锁修改
2021-12-29 17:08:18 +08:00
duhui 07dfc01d30 【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
2021-12-29 15:12:02 +08:00
duhui e5fc1ea28c 【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化 2021-12-28 17:39:20 +08:00
duhui ee97a40004 【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑 2021-12-28 14:59:59 +08:00
ZhangBiao 304d1da7ef [家园功能1.0.7]建筑解锁Indication修改 2021-12-28 11:52:54 +08:00
ZhangBiao c7a22e0787 [家园功能1.0.6]建筑收益bug修改 2021-12-28 11:12:31 +08:00
duhui 937c740ebd 【家园功能1.0.5】建筑升级前置条件判断,添加长度验证 2021-12-27 16:56:32 +08:00
duhui bee333690e 【家园功能1.0.4】无用代码删除,不影响原有逻辑 2021-12-27 14:57:24 +08:00
duhui fed5fcf59b 【家园功能1.0.4】日志完善内容 2021-12-27 14:01:55 +08:00
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
duhui 20b1c958e5 【家园功能1.0.1】任务优化,添加升级取消功能 2021-12-24 18:20:10 +08:00
duhui 6f3c8768bf 【家园功能1.0】待联调 2021-12-24 17:07:57 +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
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
jiahuiwen 90e98f6355 int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度 2021-12-21 17:48:01 +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
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
yuanshuai b3d5dfc0e6 新积天豪礼活动脚本修改提交 2022-01-03 11:46:33 +08:00
jiahuiwen ebc1106e3c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 15:05:08 +08:00
jiahuiwen 847efbe252 原有罗浮货币登录时转化为逐胜徽章 2021-12-17 15:05:01 +08:00
jiahuiwen 87f073bb89 新人商城活动 2021-12-17 10:52:19 +08:00