Commit Graph

5939 Commits (87bcc6d5d7fe0c7f95345fea809ac2b2f5216ab1)

Author SHA1 Message Date
xuexinpeng 956c9cc2fe 新特惠礼包 2021-12-23 00:17:13 +08:00
jiahuiwen 2715ea64a3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-16 18:19:21 +08:00
jiahuiwen 5ef7afe587 功能开启关闭 2021-12-16 18:19:13 +08:00
yuanshuai d96dc3a63d 新版天尊降世代码提交 2021-12-16 16:39:02 +08:00
jiahuiwen d56b0b6a08 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-16 16:30:06 +08:00
jiahuiwen 701d32c31f 回退bug 2021-12-16 16:29:55 +08:00
yuanshuai 83c72f95ba 道具添加使用等级限制 2021-12-16 15:28:08 +08:00
yuanshuai 93993d8150 挂机收益道具逻辑修改 2021-12-16 11:14:48 +08:00
yuanshuai db39942231 使用资源包道具逻辑完善 2021-12-16 10:44:32 +08:00
jiahuiwen 4ae13de871 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-15 18:42:17 +08:00
jiahuiwen 6f38da5b27 回退修复 2021-12-15 18:42:12 +08:00
yuanshuai 1c3a458869 漏提交关卡限制条件脚本 2021-12-15 13:07:39 +08:00
yuanshuai a5762d9aa9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-15 13:01:53 +08:00
yuanshuai ce4d17763f 新增道具类型 2021-12-15 13:01:44 +08:00
jiahuiwen 3b112b0dff 回退不飘字 2021-12-15 10:57:50 +08:00
jiahuiwen 1f08ca2f33 回退所得神将不更新任务或活动 2021-12-15 09:45:00 +08:00
jiahuiwen edf251cd1f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-14 17:58:42 +08:00
jiahuiwen 53b29d606e 神将回退 2021-12-14 17:58:31 +08:00
yuanshuai 9a02fbc459 使用资源包道具修改脚本提交 2021-12-14 17:40:30 +08:00
yuanshuai b865fac770 新增经验和金币收益道具脚本提交 2021-12-14 17:37:27 +08:00
yuanshuai 23b2c9285e 命石一键合成bug修改 2021-12-14 16:06:41 +08:00
yuanshuai 2fcf50d33e 添加批量删除道具GM 2021-12-14 14:55:59 +08:00
xuexinpeng 8313116aa3 御剑行活动配置 2021-12-14 13:45:12 +08:00
xuexinpeng 0117de31fc 探索地图 2021-12-14 11:45:17 +08:00
yuanshuai 1ee2a60fc0 命石快速合成脚本修改提交 2021-12-13 18:41:46 +08:00
yuanshuai 9a2bf80a9b 脚本优化 2021-12-13 17:34:19 +08:00
yuanshuai 69607c3c66 命石快速合成脚本优化 2021-12-13 16:23:32 +08:00
jiahuiwen bdc1aa723a Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 16:10:24 +08:00
jiahuiwen 9d232a7783 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-13 16:07:02 +08:00
jiahuiwen aa4341c12b 无尽秘宝,英雄升星需要增加数量 2021-12-13 16:06:55 +08:00
yuanshuai ce6b4d239b 关卡限制脚本优化 2021-12-13 14:55:23 +08:00
jiahuiwen 08ca89a90f 开商店 2021-12-13 14:44:08 +08:00
jiahuiwen 586945be2c 删除报错 2021-12-13 14:05:11 +08:00
jiahuiwen 1f952efa98 Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-12-13 14:04:18 +08:00
jiahuiwen bbc555db7c 删活动 2021-12-13 14:04:12 +08:00
yuanshuai 312ad1cd58 主线关卡限制条件增加 2021-12-13 12:04:33 +08:00
jiahuiwen ea6ebeb278 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 11:56:42 +08:00
jiahuiwen 8a5b72f0fa 消除编译错误 2021-12-13 11:55:29 +08:00
jiahuiwen 450ab39a7e Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 11:38:56 +08:00
jiahuiwen 308f406daa Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-13 11:38:23 +08:00
jiahuiwen 292b395dfe 优化 2021-12-13 11:38:12 +08:00
jiahuiwen a19352578e 登录检测已开启的活动,商店是否开启 2021-12-13 11:30:53 +08:00
yuanshuai 0b34d98e99 Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-12-13 10:49:37 +08:00
yuanshuai ea545c50ac 主线关卡限制条件增加 2021-12-13 10:12:29 +08:00
yuanshuai 8a77b7c2d5 添加关卡附加条件功能提交 2021-12-10 18:43:49 +08:00
duhui 9a7a6f71f5 公会boss伤害超上限 2021-12-10 18:27:30 +08:00
duhui 8d7394d1ac 公会boss伤害超上限 2021-12-10 16:44:38 +08:00
duhui 1af8836d72 注释修改 2021-12-10 16:24:53 +08:00
duhui 143c7a5230 招募秘宝 2021-12-10 14:24:47 +08:00
yuanshuai 72637c0ec5 命格脚本修改 2021-12-10 14:03:45 +08:00
yuanshuai 09cd66d6ca 命格脚本优化 2021-12-10 11:03:32 +08:00
yuanshuai 9060e00553 命格脚本优化 2021-12-10 09:55:51 +08:00
jiahuiwen 02807f9c49 关闭 云梦祈福 2021-12-09 16:22:35 +08:00
jiahuiwen 50118efe42 优化打印 2021-12-09 15:34:45 +08:00
jiahuiwen 33546f01b2 增加保存 2021-12-09 15:26:51 +08:00
jiahuiwen 3ba82851fd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-09 14:14:51 +08:00
jiahuiwen afa8040533 竞技试炼 2021-12-09 14:14:39 +08:00
duhui 32a5f49782 连续礼包补充 2021-12-09 11:44:19 +08:00
duhui c555ca977f 连续礼包,礼包id重复问题处理 2021-12-09 11:32:58 +08:00
yuanshuai b8de907745 脚本优化 2021-12-09 10:11:14 +08:00
yuanshuai be54f4627d 整理代码 2021-12-08 17:13:16 +08:00
yuanshuai 1455339b03 添加命格计算战斗力逻辑 2021-12-08 17:03:28 +08:00
yuanshuai 204eb5f959 命格脚本提交 2021-12-08 16:50:41 +08:00
xuexinpeng d69aca969f 删除部分无用log 2021-12-08 13:28:06 +08:00
jiahuiwen e754405dfe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-08 13:20:02 +08:00
jiahuiwen ad85622fe3 竞技试炼 2021-12-08 13:19:21 +08:00
xuexinpeng ca60360b64 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-07 18:38:06 +08:00
xuexinpeng 9d893b37ad 战斗同步 2021-12-07 18:37:27 +08:00
jiahuiwen e6d3b7a85c Merge branch 'master_prb_gn' into master_test_gn 2021-12-07 17:59:54 +08:00
jiahuiwen 426b23d23f Merge branch 'master_prb_gn' into master_test_gn_zf 2021-12-07 17:58:45 +08:00
xuexinpeng c6fc2fd87a 李海洋-gm降关卡 2021-12-07 17:02:43 +08:00
duhui 0914af5631 活动非空判断 2021-12-07 16:08:00 +08:00
duhui 946ae79b7c 补充 2021-12-07 15:24:37 +08:00
duhui aedf20d453 计算机器人星级 2021-12-07 15:24:03 +08:00
duhui 43e355c242 计算机器人星级 2021-12-07 15:04:02 +08:00
xuexinpeng 595735ff93 超值基金加判空操作 2021-12-07 10:28:41 +08:00
duhui 147a3a2368 计算星级 2021-12-06 18:31:53 +08:00
duhui 2c549257e0 机器人星级修改 2021-12-06 17:38:38 +08:00
duhui 92a1305eaf 大闹天宫优化 2021-12-06 15:35:18 +08:00
duhui 0cf8bb430b 连续礼包优化 2021-12-10 00:29:26 +08:00
duhui 257a5afaf8 Merge branch 'master_test_gn' into 开发/dev_dh 2021-12-03 10:05:46 +08:00
jiahuiwen 8157f05b32 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/ActivityLogic.java
2021-12-03 10:03:01 +08:00
jiahuiwen bde0bb4ed2 重置天宫商店 2021-12-03 10:01:07 +08:00
duhui 910670c66c 连续礼包优化,bug修改提交 2021-12-02 16:44:17 +08:00
duhui f0b55b5ffb 四灵试炼,层数刷新日志 2021-12-02 16:16:23 +08:00
duhui 1dc148d469 Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2021-12-02 15:17:41 +08:00
duhui 2717cdefec 连续礼包优化 2021-12-02 15:16:02 +08:00
duhui b418a8e53c 日志管理 2021-12-02 10:20:55 +08:00
jiahuiwen 275426aadc Merge branch 'master_prb_gn' into master_test_gn 2021-12-01 18:49:01 +08:00
jiahuiwen 5c4874ab9e 重置天宫商店 2021-12-01 17:55:46 +08:00
duhui 4e4ed641ca 方寸寻宝活动 2021-12-01 15:25:19 +08:00
duhui c4e252a3ed 礼包活动报错 2021-12-01 07:14:08 +08:00
duhui 345b573ddc 战斗报错 2021-12-01 06:58:13 +08:00
yuanshuai 40ae47feb0 修改异常飘字 2021-11-30 11:25:01 +08:00
duhui d6f16d1f61 变身卡激活消耗道具 2021-11-30 10:09:44 +08:00
yuanshuai d97164a2db 天地洪炉选择up添加限制 2021-12-05 15:05:28 +08:00
duhui c91b204bdc 活动改版,初版 2021-11-29 18:32:14 +08:00
jiahuiwen 1fc0a0a4d3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-27 17:35:16 +08:00
jiahuiwen cff11e010c 剧情关不需要战斗 2021-11-27 17:35:07 +08:00
duhui f119b88123 连续礼包活动 2021-11-27 16:07:55 +08:00