Commit Graph

5389 Commits

Author SHA1 Message Date
17fe93ae21 Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28 2023-06-29 18:25:59 +08:00
45633d0c6a update 2023-06-29 18:24:50 +08:00
4f005f8506 Merge branch 'bs_2.0.6.28' of http://git.legu.cc/liwei_3d/go_dreamfactory into bs_2.0.6.28 2023-06-29 18:17:55 +08:00
b58aa941b0 版署商队结算限制 2023-06-29 18:17:50 +08:00
d5b15ce0f7 同步 2023-06-29 09:33:02 +08:00
59a355bf29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 09:02:23 +08:00
817f678d5d 百分比数值计算问题 2023-06-29 09:02:19 +08:00
4bd509d69d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 20:08:29 +08:00
aa4175812b 上传配置文件 2023-06-28 20:03:55 +08:00
5347cca64e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 18:22:39 +08:00
3f7ccf4b4a update config 2023-06-28 18:22:32 +08:00
2884bf156f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 18:15:18 +08:00
d169f9f25e 新需求 守护者之心获得设置上限 2023-06-28 18:15:14 +08:00
7437087b27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 17:53:40 +08:00
bf39578c22 update config 2023-06-28 17:53:35 +08:00
42d7ca6764 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 17:35:49 +08:00
b765c8d03f 上传竞技场代码 2023-06-28 17:35:46 +08:00
03e7b66d1b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 16:35:24 +08:00
89246eccab update global conf 2023-06-28 16:35:17 +08:00
f0c15515ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 16:09:27 +08:00
24eda00128 上传同步用户竞技场名称 2023-06-28 16:09:23 +08:00
0465ffb114 错误日志输出 2023-06-28 15:52:39 +08:00
c64d82abab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 15:21:34 +08:00
5b0e69c440 updateps 2023-06-28 15:21:28 +08:00
d5217953dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 14:42:07 +08:00
25a5ef9dc1 配置更新 2023-06-28 14:42:04 +08:00
f359fd0629 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 13:59:09 +08:00
803700c43c 更新配置 2023-06-28 13:58:51 +08:00
b328df88f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:53:34 +08:00
7a7c076dec 上传随机宝箱批量使用代码 2023-06-28 11:53:32 +08:00
2de1ce8161 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:49:22 +08:00
37f64eee7b 抽卡每日次数校验 2023-06-28 11:49:18 +08:00
926b45ffde 上传代码 2023-06-28 11:47:01 +08:00
37b01c0f3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:25:21 +08:00
6351e3df70 修复世界任务战斗奖励发放bug 2023-06-28 11:25:15 +08:00
b416a9679b 赛季重置优化 2023-06-28 10:54:13 +08:00
3a4597d6b3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 09:40:31 +08:00
551bd600e1 配置同步 2023-06-28 09:40:28 +08:00
b20bc4fdb8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 20:50:17 +08:00
8ddea83622 上传配置 2023-06-27 20:50:14 +08:00
8a6595dffe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 17:40:35 +08:00
4eb37bc7a2 单日抽卡上限 2023-06-27 17:40:30 +08:00
f6692be368 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 17:38:31 +08:00
a023dc65f9 公会任务激活 2023-06-27 17:38:24 +08:00
d98d6faf95 上传宝箱代码 2023-06-27 17:37:09 +08:00
e26f48d2c8 上传使用代码 2023-06-27 17:31:40 +08:00
bc662e1986 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 16:58:32 +08:00
83ca8bb39f 上传配置 2023-06-27 16:58:29 +08:00
e92fa0bfb4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 16:31:21 +08:00
dc50d95199 铁匠铺交易字段错误 2023-06-27 16:31:13 +08:00