Commit Graph

565 Commits

Author SHA1 Message Date
e2c1e89ef4 配置更新 2023-03-10 11:00:49 +08:00
1dba115251 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 09:54:13 +08:00
7a927c4f4f 配置同步 2023-03-10 09:53:31 +08:00
liwei
00d84a8de6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/json/game_drawcard.json
	bin/json/game_mainchapter.json
	bin/json/game_mainstage.json
2023-03-09 16:25:35 +08:00
liwei
43069284cb 上传配置 2023-03-09 16:24:49 +08:00
b990e1a43e 配置更新 2023-03-09 10:22:12 +08:00
liwei
1da5a70a17 上传配置 2023-03-08 19:02:27 +08:00
2d72bc5e5f 更新配置 2023-03-08 18:29:30 +08:00
e56446667e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 16:56:59 +08:00
0eeb1799be 3.10公会预创建 2023-03-08 16:56:48 +08:00
6fe3d364b8 好友功能条件开启 2023-03-08 16:08:23 +08:00
c2e1a230fe 创角发欢迎邮件 2023-03-08 11:17:31 +08:00
63291cde10 更新配置 2023-03-07 10:56:58 +08:00
liwei
d5ac3f986e 上传配置文件 2023-03-06 20:28:59 +08:00
ca9d9d4391 图鉴配置新增字段 2023-03-06 20:26:03 +08:00
liwei1dao
4c8d8e2bb4 上传配置代码 2023-03-06 18:16:57 +08:00
liwei
9511d21766 上传配置文件 2023-03-04 16:05:41 +08:00
liwei1dao
8f8b4f612e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-03 15:47:13 +08:00
liwei1dao
05a5135479 上传武馆代码 2023-03-03 15:46:58 +08:00
6d43e69f5f 配置同步 2023-03-03 10:53:21 +08:00
ebb8889403 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:57:43 +08:00
liwei1dao
2bc648ee7f 上传消息分发 2023-03-02 18:55:23 +08:00
9fa2855435 派遣 2023-03-02 18:54:53 +08:00
liwei
462bff3ecd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:50:46 +08:00
liwei
5f79123811 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:50:30 +08:00
liwei
8c15368877 上传配置文件 2023-03-02 18:49:26 +08:00
e1722eca92 跨服创建英雄对象+ 配置更新 2023-03-02 18:46:04 +08:00
liwei1dao
3573a05da9 上传每日一练代码 2023-03-02 16:16:17 +08:00
31abefaa86 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:20:45 +08:00
41a22b3cf0 特殊图鉴手动激活 2023-03-02 14:20:38 +08:00
liwei1dao
2043367dd1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:12:26 +08:00
liwei1dao
fbe1d21ed1 上传柱子解锁接口 2023-03-02 14:12:11 +08:00
9a241060e1 掉落规则修改 + 功夫大师挑战塔 2023-03-01 17:35:23 +08:00
liwei1dao
ae381980a3 上传教习登记 2023-02-28 11:06:54 +08:00
f4ec14b472 派遣 2023-02-24 18:29:46 +08:00
4d810402d9 领奖数据返回 2023-02-24 17:43:18 +08:00
d210e54fc0 工具台升级 条件补充 2023-02-24 11:48:24 +08:00
3387fce2f7 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 09:46:13 +08:00
3f464ddd94 武馆图鉴 2023-02-23 19:07:10 +08:00
liwei1dao
b4b4859458 上传新物管和每日一练 2023-02-23 18:32:45 +08:00
18538be012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 14:16:41 +08:00
ed97958604 装备品质获取 2023-02-23 14:16:36 +08:00
a1e06f4687 添加派遣模块 2023-02-23 11:40:02 +08:00
0c651aee3a 添加武馆派遣表 2023-02-22 17:56:51 +08:00
8a507cda02 代码优化 2023-02-22 17:26:06 +08:00
8d8d2e3c3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 16:50:31 +08:00
8dc4d90270 图鉴积分更新 2023-02-22 16:50:08 +08:00
25ea76c5bc 图鉴任务 2023-02-22 14:50:49 +08:00
d90e938959 配置更新 2023-02-22 12:08:44 +08:00
liwei
aa457067b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/json/game_drawcard.json
	bin/json/game_vikingboss.json
2023-02-21 18:28:49 +08:00