Commit Graph

5495 Commits

Author SHA1 Message Date
b206bc1b38 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 14:51:08 +08:00
61fd442257 update config 2023-06-26 14:50:56 +08:00
081657a4b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-06-26 14:49:33 +08:00
cbda3c4c10 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 14:23:36 +08:00
0daa74e069 上传装备洗练和道具添加优化 2023-06-26 14:23:31 +08:00
d86d604769 移除维京manexp 字段 主角经验改用消耗体力转换经验 2023-06-26 12:06:20 +08:00
29e3ddcfa7 解决冲突 2023-06-26 11:42:54 +08:00
f64144f8f3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 11:42:31 +08:00
d629f702fb 配置同步 2023-06-26 11:41:40 +08:00
a3bec23bf2 上传配置 2023-06-25 21:46:04 +08:00
3136587f7b 上传配置 2023-06-25 21:21:05 +08:00
5cc7164a74 上传配置 2023-06-25 20:59:18 +08:00
734a03e56d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 20:57:33 +08:00
355df5e380 上传bug修复代码 2023-06-25 20:57:30 +08:00
aa1fff7273 从掉落表获得的数据也插入到获得道具中,并通知客户端 2023-06-25 18:54:46 +08:00
14c145bc4f 维京战斗 获得英雄经验还是用map 类型 2023-06-25 18:45:55 +08:00
b773c55d60 英雄经验类型调整 2023-06-25 18:33:49 +08:00
98877c7ffe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 18:27:13 +08:00
f7ab12e4fd 增加战斗结束英雄经验推送 2023-06-25 18:27:02 +08:00
10c5a1d705 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 18:21:58 +08:00
820d37b2d1 补充屏蔽词库 2023-06-25 18:21:55 +08:00
894d7ce1b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 17:48:46 +08:00
6e61f6220a 掉落优化 2023-06-25 17:48:40 +08:00
acbf0e2f27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 17:36:28 +08:00
3cdaf7611e 同步配置和洗练 2023-06-25 17:36:24 +08:00
ed188b41d2 推送炉温恢复满时间 2023-06-25 17:01:08 +08:00
8329525333 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 16:44:11 +08:00
284ce9af60 用户活动数据 2023-06-25 16:44:07 +08:00
3c8a57841b 上传错误吗信息 2023-06-25 16:24:55 +08:00
9ea4ec24ad 添加铭感词 2023-06-25 15:39:56 +08:00
8333760e92 上传pb文件 2023-06-25 14:57:40 +08:00
c15b96b3ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:52:05 +08:00
2043d4f468 上传工会创建时铭感词校验 2023-06-25 14:52:02 +08:00
d6d0cb80cf 主线106奖励 2023-06-25 14:48:36 +08:00
afad9578de Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:25:34 +08:00
76f87a8787 配置更新 2023-06-25 14:25:28 +08:00
cf6f80a7d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:15:38 +08:00
5ab8508a76 上传装备主属性升级带啊吗 2023-06-25 14:15:36 +08:00
fff5836c03 输出详细的报错信息 2023-06-25 11:31:42 +08:00
60e7d6e5ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 11:19:51 +08:00
5b014ef141 Rtype200 任务 2023-06-25 11:19:47 +08:00
57dfa2a138 上传代码 2023-06-25 11:19:37 +08:00
b8d56fcd26 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 10:40:05 +08:00
5dc8f1fd31 同步配置表 2023-06-25 10:40:03 +08:00
58c2b97ae5 配置同步 2023-06-21 19:57:17 +08:00
942b04cb78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-21 19:47:10 +08:00
098e4752f6 配置同步 2023-06-21 19:47:07 +08:00
cf927144c7 上传配置 2023-06-21 19:24:22 +08:00
d223ccb513 update 2023-06-21 19:09:36 +08:00
f56be5e9d3 配置同步 2023-06-21 18:26:23 +08:00