Commit Graph

2428 Commits

Author SHA1 Message Date
18256d7dc6 合成返回 2022-10-20 09:56:12 +08:00
f34efe5f45 判断是不是跨服 2022-10-20 09:31:00 +08:00
c2f8e28132 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 19:43:53 +08:00
c247137d7e 查询接口调整 2022-10-19 19:43:39 +08:00
232a0fc1e5 一个小bug 2022-10-19 19:39:13 +08:00
liwei
5e429852ae 放开rpc 限制代码 2022-10-19 19:30:16 +08:00
eee83cc6d1 升星精灵升级 需求变更 直接修改英雄id 2022-10-19 18:45:08 +08:00
0c74105f21 英雄合成类型修改 2022-10-19 18:31:06 +08:00
liwei1dao
cbf7198e4a 上传月子秘境代码优化 2022-10-19 18:29:08 +08:00
de42696f16 json 同步 2022-10-19 18:26:17 +08:00
cff8c4e91c pb 同步 2022-10-19 18:05:20 +08:00
2b4a117304 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 18:00:24 +08:00
9138866fad 跨服查询英雄数据 2022-10-19 18:00:09 +08:00
liwei1dao
5237607aba 禁止跨服调用 自己调用自己 2022-10-19 17:54:47 +08:00
liwei1dao
d24e3cc238 上传代码 2022-10-19 17:34:03 +08:00
liwei1dao
d4487ee428 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:29:23 +08:00
liwei1dao
bb2daca70b 移除聊天系统废弃消息 2022-10-19 17:29:09 +08:00
2f6722bc5a 修复跨服好友申请 2022-10-19 17:25:50 +08:00
liwei1dao
e5f8fe912c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:19:20 +08:00
liwei1dao
01b5775dbd 上传聊天系统优化 2022-10-19 17:19:06 +08:00
ddf5d1816f 美食馆人数不够的情况 2022-10-19 16:45:54 +08:00
11f1a08bc3 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 16:09:55 +08:00
d72c9fb67d 获取跨服玩家信息 2022-10-19 16:09:36 +08:00
liwei1dao
2ef57a8f1a rpcx系统日志优化 2022-10-19 15:48:23 +08:00
9e20298edd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-19 15:47:25 +08:00
liwei
06fcf5e491 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2022-10-19 15:41:39 +08:00
liwei1dao
a48e4cca9f 上传聊天频道 2022-10-19 15:39:18 +08:00
3bcc8a7b54 好感度计算 2022-10-19 15:19:39 +08:00
liwei1dao
a48c616907 修复聊天获取消息校验处理 2022-10-19 15:18:26 +08:00
liwei1dao
79785852f6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 15:03:04 +08:00
liwei1dao
26703b7b56 上传gm和rtask 跨服接口 2022-10-19 15:02:51 +08:00
7da9c703ec Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:52:50 +08:00
fe17144107 一个在线也没有 那么 就去随机取指定数量的玩家 2022-10-19 14:52:18 +08:00
liwei
a01af8da67 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:27:14 +08:00
1baeb5cef0 好友跨服修改 2022-10-19 14:23:20 +08:00
liwei1dao
b0eec24368 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:19:41 +08:00
liwei1dao
eb93beb54a 上传 秘境与聊天系统跨服升级 2022-10-19 14:19:23 +08:00
liwei
84037f087b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 13:36:36 +08:00
313927637d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 11:55:04 +08:00
6ef841ed72 增加好感度剧情解锁条件 2022-10-19 11:54:53 +08:00
liwei1dao
1a3030da01 升级聊天私聊频道为跨服系统 2022-10-19 10:08:51 +08:00
fd572e6f92 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 18:02:11 +08:00
85409bd46a 需求变更 增加多个随机剧情奖励。新增好感度奖励 2022-10-18 18:01:55 +08:00
liwei
e8c1c0cf5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 17:57:39 +08:00
7fe93f2bb2 好友跨服处理 2022-10-18 17:56:31 +08:00
e3066d4b19 羁绊领奖协议调整 2022-10-18 16:42:06 +08:00
liwei
0fd5845428 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 15:20:00 +08:00
liwei
9ff08d3012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 15:18:48 +08:00
dbccb138d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-18 15:16:52 +08:00
liwei1dao
3e337be075 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 15:11:44 +08:00