Commit Graph

6587 Commits (5031f7d9e8cbbae74a535d40f1f0afa917d53edf)
 

Author SHA1 Message Date
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 81f4241511 神将回退漏提 2021-12-14 17:59:06 +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