Commit Graph

3097 Commits

Author SHA1 Message Date
c79d185619 美食馆材料变更 2022-12-21 17:47:12 +08:00
648bbf0d94 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-21 16:49:20 +08:00
b39cef8fa0 接口补充,通过特权类型获取特权对应功能增加的数量 2022-12-21 16:47:03 +08:00
liwei1dao
aef8fb4152 上传协议代码 2022-12-21 15:45:49 +08:00
93b049704e 狩猎 初始化数据 2022-12-21 15:01:25 +08:00
liwei1dao
4563606628 武馆需求开发 2022-12-21 10:49:46 +08:00
ea0f567361 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-21 10:45:31 +08:00
4d978ef04c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-21 10:45:04 +08:00
ce400d00d3 美食馆 红点规则修改 2022-12-21 10:44:58 +08:00
liwei1dao
265d1e0cdc 上传全局配置 2022-12-21 10:31:51 +08:00
liwei
7a7ab483cb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:39:00 +08:00
liwei
bb323e7a33 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:36:47 +08:00
liwei
338f481ad6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:34:55 +08:00
liwei
4a6f289184 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:34:32 +08:00
liwei1dao
649432c305 修复主线 招募代码 2022-12-20 20:33:12 +08:00
441c7353c4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:02:24 +08:00
4bcd7562fa 附魔入口 2022-12-20 20:01:47 +08:00
liwei1dao
50a6546941 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 19:59:29 +08:00
liwei1dao
638d487181 同步pb文件 2022-12-20 19:59:24 +08:00
adcf597bac 更新世界任务配置 2022-12-20 18:43:32 +08:00
liwei1dao
8b6e0660b6 上传配置代码 2022-12-20 18:13:11 +08:00
liwei1dao
fe15e3e2df 上传支付接口返回调整 2022-12-20 18:01:41 +08:00
liwei1dao
fb3b881945 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:55:37 +08:00
liwei1dao
cc4640574b 上传支付接口完成 2022-12-20 17:55:23 +08:00
9c077aa803 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:16:47 +08:00
f63fdc7484 优化 2022-12-20 17:16:24 +08:00
liwei1dao
80f0744ac5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:13:12 +08:00
liwei1dao
a61b865d6d 上传支付接口调增 2022-12-20 17:12:54 +08:00
a4c6a8a64a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-20 17:08:51 +08:00
b82bcbaf5e 图鉴 2022-12-20 17:08:49 +08:00
a969335216 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:02:04 +08:00
f325fa1f58 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-20 16:13:07 +08:00
3ee4ca9f77 优化 2022-12-20 16:12:57 +08:00
a05f57c626 优化 2022-12-20 16:12:35 +08:00
liwei1dao
b84b75ce8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 16:11:53 +08:00
liwei1dao
f7ef46df42 补充api接口 2022-12-20 16:11:38 +08:00
e3f1336111 update 2022-12-20 15:46:00 +08:00
liwei1dao
2616200338 上传支付代码回应 2022-12-20 15:05:15 +08:00
liwei1dao
7cea922e44 上传服务代码 2022-12-20 15:00:03 +08:00
liwei1dao
b22ff23c4d 上传支付接口调整 2022-12-20 14:30:29 +08:00
liwei1dao
1932877a11 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 14:24:50 +08:00
liwei1dao
ed316ca7bf 上传代码 2022-12-20 14:24:40 +08:00
2589c198a9 修复任务记录 2022-12-20 12:52:55 +08:00
d1fb30e587 去掉debug 数据 2022-12-20 11:50:34 +08:00
8de4cc38c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 21:28:40 +08:00
74c804246c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/rtask/updateHandle.go
#	modules/task/model_task.go
2022-12-19 21:10:44 +08:00
178a325df9 update 2022-12-19 21:00:26 +08:00
7924d07a30 排行数据 2022-12-19 20:30:50 +08:00
5917f78e37 排行数据 2022-12-19 20:30:41 +08:00
f94b9d6117 加新的战斗类型 2022-12-19 18:14:34 +08:00