Commit Graph

6676 Commits

Author SHA1 Message Date
919233dc6b 每日随机玩法 并重置时间 2023-11-20 19:03:06 +08:00
liwei1dao
482d16046a 上传竞技场异常修复 2023-11-20 18:02:17 +08:00
liwei1dao
ba09658fda 上传海岛协议代码 2023-11-20 16:03:57 +08:00
liwei1dao
f3262bca38 上传海岛商店代码 2023-11-20 15:39:19 +08:00
84d43ec1b2 失败方没扣卡问题修复 2023-11-20 14:52:17 +08:00
e5b89d4e37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-20 14:21:14 +08:00
76e415ec8c 海盗抽卡调整 2023-11-20 14:21:07 +08:00
liwei1dao
9cc2b1f80f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-20 11:00:09 +08:00
liwei1dao
2cf4d97582 上传大豚鼠修复 2023-11-20 11:00:07 +08:00
f2a3172174 GM 后台封号接口文档说明 2023-11-20 10:50:03 +08:00
c0d02c4907 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-20 10:13:00 +08:00
9ae1c96a6b struct 标签 2023-11-20 10:12:55 +08:00
liwei1dao
40381a363b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-20 10:07:42 +08:00
liwei1dao
8ded35407c 上传打地鼠代码 2023-11-20 10:07:37 +08:00
42de65a78c 全局表字段整理 移除不用的字段 2023-11-17 19:23:48 +08:00
255df66f2f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-17 18:28:35 +08:00
853742995d 三消优化 2023-11-17 18:27:46 +08:00
liwei1dao
96f801d987 上传海岛代码 2023-11-17 18:27:14 +08:00
e2f4c3cc04 update 2023-11-17 16:11:32 +08:00
liwei1dao
17d8af5de1 上传商店不刷新 2023-11-17 14:05:37 +08:00
liwei1dao
eb2034d8ae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-17 09:43:46 +08:00
liwei1dao
76dcbdeef9 上传海岛 2023-11-17 09:43:43 +08:00
26c46e790f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-16 18:10:12 +08:00
69ce1d9c57 封禁处理 2023-11-16 18:09:41 +08:00
liwei1dao
a8a3940c3e 上传资源返回协议 2023-11-16 17:17:44 +08:00
liwei1dao
2e88e07799 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-16 15:29:18 +08:00
liwei1dao
33ca47e77b 上传小游戏离线机制 2023-11-16 15:29:15 +08:00
3e2e6b4e76 Merge branch 'dev' 2023-11-16 14:16:47 +08:00
9d4b7602c7 月明度等级字段由扩展字段移到玩家身上 2023-11-16 11:52:26 +08:00
liwei1dao
a08417a98c 上传主线坐标记录 2023-11-15 18:51:23 +08:00
liwei1dao
d40ff3c239 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 18:38:53 +08:00
liwei1dao
739627ca2a 上传游戏邀请 前后顺序异常问题 2023-11-15 18:38:51 +08:00
f5b710a7e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 18:07:12 +08:00
2796ca5927 三消优化 2023-11-15 18:07:07 +08:00
liwei1dao
e7ae51ec52 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 17:41:59 +08:00
liwei1dao
d21a84e35b 修复猜颜色代码 2023-11-15 17:41:54 +08:00
6d52888ac9 月明度扩展数据 2023-11-15 16:22:49 +08:00
ec3e97fbf5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 15:41:56 +08:00
4d371d5626 护月任务奖励 2023-11-15 15:41:51 +08:00
liwei1dao
5648014558 修复装备穿戴埋点 2023-11-15 15:21:18 +08:00
liwei1dao
27beaff9e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 11:14:37 +08:00
liwei1dao
2d27aa6a63 修改改名逻辑 2023-11-15 11:14:33 +08:00
9226e64c7a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 11:04:59 +08:00
396bd29052 护月等级 作为功能条件开启条件 2023-11-15 11:04:55 +08:00
liwei1dao
2f5825260a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 10:44:48 +08:00
liwei1dao
7444fe03d0 上传主线坐标记录 2023-11-15 10:44:46 +08:00
9f486c4528 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 10:11:45 +08:00
8350d34412 护月等级每个等级任务重置 2023-11-15 10:11:41 +08:00
liwei1dao
13ba664013 上传商店刷新机制 2023-11-15 10:03:26 +08:00
liwei1dao
6480d614d7 上传商店自动刷新机制 2023-11-15 10:01:07 +08:00
liwei1dao
c5ee5ba57a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-15 09:53:07 +08:00
liwei1dao
bb3e87ce15 上传配置表 2023-11-15 09:53:04 +08:00
ed0dafe1d2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-14 20:47:15 +08:00
281ce29748 移除测试函数 2023-11-14 20:47:12 +08:00
liwei1dao
7d95d4523d 上传创号修改 2023-11-14 20:43:15 +08:00
0217d097c5 创角不再校验昵称 2023-11-14 18:54:59 +08:00
30d611525f 创角昵称不做校验 2023-11-14 18:25:15 +08:00
930cc9a4f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-14 18:23:52 +08:00
18778c8a5d 商队赛季数据 2023-11-14 18:23:48 +08:00
liwei1dao
3d291a828d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-14 17:40:27 +08:00
liwei1dao
335ff38ec7 上传商店代码 2023-11-14 17:40:21 +08:00
c7d0db97f9 护月任务成就相关 2023-11-14 16:49:42 +08:00
0fa6eb7406 护月等级配置解析 2023-11-14 15:01:33 +08:00
2aba12b680 护月等级 模块 2023-11-14 14:30:58 +08:00
d84db5f3a4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-14 10:47:08 +08:00
4bb8858cc5 资源类型枚举处理 2023-11-14 10:47:04 +08:00
liwei1dao
86eaf106d5 上传拆颜色奖励 2023-11-14 10:45:14 +08:00
liwei1dao
4fb07bae3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-14 10:25:23 +08:00
liwei1dao
b8f3e1a195 上传代码 2023-11-14 10:25:18 +08:00
9c87a69872 创角之前默认皮肤 2023-11-14 09:59:26 +08:00
e992bce862 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-13 17:20:39 +08:00
8227b25610 资源明细整理 2023-11-13 17:20:35 +08:00
liwei1dao
a28d16b1b9 上传房间处理 2023-11-13 16:03:55 +08:00
liwei1dao
232dc9d051 修复异常 2023-11-13 14:58:08 +08:00
liwei1dao
79d43418ae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-13 14:53:29 +08:00
liwei1dao
f8822fc6be 上传捉虫子代码 2023-11-13 14:53:24 +08:00
6ed182785c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-13 14:23:41 +08:00
c8399347b5 封号禁言状态处理 2023-11-13 14:23:35 +08:00
liwei1dao
569d9774db 上传ai操作错误修复 2023-11-13 13:57:38 +08:00
liwei1dao
e3ae5d11b8 上传捕羊结算协议 2023-11-13 13:52:37 +08:00
liwei1dao
43c899498d 上传捕羊协议 2023-11-13 11:16:58 +08:00
liwei1dao
5ecb4acce3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-10 18:53:33 +08:00
liwei1dao
0464f296e8 上传游戏配置 2023-11-10 18:53:26 +08:00
5dd94cf8ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-10 16:41:27 +08:00
8f28fe41e7 日志记录补充 2023-11-10 16:41:22 +08:00
liwei1dao
3ec6774fca 上传协议修改 2023-11-10 16:41:06 +08:00
liwei1dao
49770c8ba8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-10 16:27:36 +08:00
liwei1dao
567e854ccd 上传菜单配置 2023-11-10 16:27:29 +08:00
dd3a0a9dbb AI 积分波动处理 2023-11-10 16:01:30 +08:00
6715575176 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-10 10:27:36 +08:00
b344f1b983 道具获得消耗来源记录 2023-11-10 10:27:32 +08:00
liwei1dao
fdaea60040 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-09 18:10:59 +08:00
liwei1dao
59eb50d8d2 上传竞技场代码 2023-11-09 18:10:53 +08:00
7201854d7c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-09 17:21:25 +08:00
f0969f7a09 玩家资源变更记录跨服处理 2023-11-09 17:21:21 +08:00
liwei1dao
781dd76e34 修复才颜色代码 2023-11-09 17:02:46 +08:00
liwei1dao
9c89116f83 上传捉虫子ai代码 2023-11-09 17:00:23 +08:00
liwei1dao
70b310fac0 上传颜色游戏协议优化 2023-11-09 14:23:16 +08:00
liwei1dao
303ca5301d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-09 14:05:11 +08:00
liwei1dao
60e8b2b3aa 上传捉虫子代码 2023-11-09 14:05:06 +08:00
d9d1d6a3e9 移除测试数据 2023-11-09 13:39:19 +08:00
16249e20e9 元素蔓延技能 2023-11-09 12:34:19 +08:00
24bfff009d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-09 09:28:25 +08:00
liwei1dao
4032624aa0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-08 21:41:58 +08:00
liwei1dao
97ac1ccace 上传捉虫子 2023-11-08 21:41:51 +08:00
57d06aa890 石阵秘境强化商店随机强化若干buff 修改 2023-11-08 18:14:49 +08:00
7c368f7a41 移除测试代码 2023-11-08 17:28:00 +08:00
7e31b04d51 三消优化 2023-11-08 17:26:36 +08:00
d88d719560 玩家胜利获得积分同步显示 2023-11-08 14:46:51 +08:00
b2386a3a3e update 2023-11-08 13:36:25 +08:00
5bf499430c 龙属性问题 2023-11-08 11:52:28 +08:00
336b60f3f8 成龙 加速槽回复 2023-11-08 11:27:54 +08:00
67e4b39a78 update 2023-11-08 11:06:58 +08:00
0269d5ba8e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-08 11:00:27 +08:00
0ca938652b 增加积分显示 2023-11-08 11:00:23 +08:00
liwei1dao
685bb300e9 上传补羊优化 2023-11-08 10:33:28 +08:00
liwei1dao
594bb731af 上传传功等级修复 2023-11-07 20:42:08 +08:00
liwei1dao
b931ab9da5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-07 20:29:47 +08:00
liwei1dao
928c9d3bdb 上传全满级英雄 出发虚拟等级显示问题 2023-11-07 20:29:41 +08:00
3b549fe732 修复散弹方块 随机带走元素位置不正确bug 2023-11-07 18:25:06 +08:00
25a15adc08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-07 17:49:26 +08:00
86acb03ad9 两个特殊元素在一起也可以消除 2023-11-07 17:48:48 +08:00
22442bfb79 房间数据整理 2023-11-07 16:03:12 +08:00
liwei1dao
6714d58b57 上传补羊成龙过滤代码 2023-11-07 15:27:07 +08:00
dcd4818cb1 房间回收 离线处理 2023-11-07 15:11:36 +08:00
liwei1dao
7f8c62dd81 上传json 2023-11-07 10:25:38 +08:00
liwei1dao
a89d65bdc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 18:26:43 +08:00
liwei1dao
95582456d4 上传用户日志功能实现 2023-11-06 18:26:39 +08:00
ebee3aaa0c 玩法规则带入 2023-11-06 17:56:27 +08:00
da7c4a1bdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 16:12:59 +08:00
5629f5439b 递归消除特殊元素 2023-11-06 16:12:56 +08:00
liwei1dao
a6ae6bf2cb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 16:07:55 +08:00
liwei1dao
daee5fd630 上传竞技场积分计算bug 2023-11-06 16:07:50 +08:00
e3509b4023 玩法临时修改 等最终配置 2023-11-06 15:33:35 +08:00
876a33e84b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 15:19:34 +08:00
9312d422f8 玩法类型3 ,4 带入 2023-11-06 15:19:30 +08:00
liwei1dao
98051b1f38 上传捕羊数据混乱修复 2023-11-06 14:46:50 +08:00
liwei1dao
42090505db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 14:20:59 +08:00
liwei1dao
abf90a7592 上传用户段位错误处理 2023-11-06 14:20:55 +08:00
a180a13972 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 12:07:29 +08:00
5239a6eeab 消息Push 2023-11-06 12:07:25 +08:00
liwei1dao
d7e5929595 上传累计积分 2023-11-06 11:30:27 +08:00
liwei1dao
5711a882c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 10:03:25 +08:00
liwei1dao
592503d08d 上传颜色游戏 2023-11-06 10:03:20 +08:00
4c521fe92e 上传代码 2023-11-04 20:55:35 +08:00
adce173e29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-04 18:10:48 +08:00
15da64c7cd 新增特殊元素炸弹烟花相关消除规则 2023-11-04 18:10:45 +08:00
liwei1dao
8ad90274dd 上传补羊重连机制 2023-11-04 15:40:26 +08:00
liwei1dao
3bb79c6ec7 上传补羊大赛代码 2023-11-04 15:29:37 +08:00
liwei1dao
e172a7cd5d 上传补羊和兔子游戏协议 2023-11-04 15:23:15 +08:00
liwei1dao
fad9238c32 上传补羊大赛游戏优化 2023-11-04 15:00:45 +08:00
liwei1dao
bc01685ba4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 21:34:19 +08:00
liwei1dao
940f4f8681 上传 2023-11-03 21:34:13 +08:00
bfdf47f87f 测试时间 2023-11-03 20:08:20 +08:00
8e3ab8effa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:47:00 +08:00
8d56b0c4a9 游戏结束 销毁房间 2023-11-03 18:46:56 +08:00
liwei1dao
ea8743811c 上传协议提交 2023-11-03 18:42:43 +08:00
liwei1dao
4d996fba1d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:08:44 +08:00
liwei1dao
57f0b8963d 上传兔子猎犬 2023-11-03 18:08:40 +08:00
4c01b7fc75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:05:59 +08:00
96d06af605 三消优化 2023-11-03 18:05:54 +08:00
liwei1dao
a63be757e5 上传取消匹配代码 2023-11-03 17:52:51 +08:00
liwei1dao
25c2739d88 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 15:28:29 +08:00
liwei1dao
af2485fc19 上传关卡编辑器 2023-11-03 15:28:24 +08:00
866b768e96 时间里计时器处理 2023-11-03 09:45:08 +08:00
aff72fa398 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 22:10:06 +08:00
4572cc7f11 update 2023-11-02 22:10:01 +08:00
liwei1dao
dc1fdefcda 上传犬兔游戏调试代码 2023-11-02 21:18:05 +08:00
liwei1dao
3cc0d746f9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 18:00:00 +08:00
liwei1dao
2f1779b311 上传补羊优化 2023-11-02 17:59:54 +08:00
a920f31d81 update 2023-11-02 15:52:25 +08:00
d544c13b64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 15:28:36 +08:00
6197622282 宝箱奖励 2023-11-02 15:28:32 +08:00
liwei1dao
f14bfa7567 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 15:09:22 +08:00
liwei1dao
20e5472621 上传世界任务战斗奖励 2023-11-02 15:09:17 +08:00
977fe8fd34 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 14:38:06 +08:00
b6ab1f6df8 update 2023-11-02 14:38:03 +08:00
liwei1dao
7bc8592e27 上传彩蛋模块 2023-11-02 14:35:04 +08:00
liwei1dao
8ba9dff155 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 14:01:46 +08:00
liwei1dao
c7ed61fb5a 上传走棋游戏代码 2023-11-02 14:01:42 +08:00
9fc5e5815b update 2023-11-02 11:05:17 +08:00
3b673a5b10 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 11:03:16 +08:00
e0b45c9c9c 接口补充通过卡池随机获取指定数量的英雄卡 2023-11-02 11:03:13 +08:00
liwei1dao
5d77d749b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 10:48:22 +08:00
liwei1dao
1bdbc69064 海岛探险代码 2023-11-02 10:48:17 +08:00
dcfde4a766 技能参数带入 2023-11-02 10:12:14 +08:00
223a0dcd1d 技能调整 2023-11-02 10:11:14 +08:00
330301441d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 21:08:59 +08:00
cbf5cd8f3f 英雄技能 2023-11-01 21:08:55 +08:00
liwei1dao
4a9b83f204 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 20:34:22 +08:00
liwei1dao
e0039dcc41 上传代码 2023-11-01 20:34:14 +08:00
03b8514aee 秘境手动结算可以领取之前关卡的奖励 2023-11-01 19:52:23 +08:00
672948eb18 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 19:34:05 +08:00
8f4792ccb7 update 2023-11-01 19:33:56 +08:00
liwei1dao
2d0d9aa0c1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 15:47:59 +08:00
liwei1dao
c98b05e4c6 优化竞技场信息 2023-11-01 15:47:52 +08:00
2a633f9256 超时走配置 2023-11-01 14:51:02 +08:00
4202883df2 测试优化 2023-11-01 14:24:32 +08:00
d675f2099e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 11:48:36 +08:00
11bd3e4742 部分技能不增加积分 2023-11-01 11:48:33 +08:00
liwei1dao
cb91f98843 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 10:41:54 +08:00
liwei1dao
210498560f 上传游戏协议 2023-11-01 10:41:47 +08:00
59e9a20756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 10:01:15 +08:00
54a8f103b6 技能+消除校验 2023-11-01 10:01:11 +08:00
liwei1dao
309d03df18 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 18:10:57 +08:00
liwei1dao
f0c34e5a10 上传资源推送 2023-10-30 18:10:51 +08:00
6d83897951 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 17:54:28 +08:00
bbe346b6b6 房间逻辑完善 2023-10-30 17:54:24 +08:00
liwei1dao
18ccd3ca0d 上传海盗代码 2023-10-30 17:09:32 +08:00
liwei1dao
c889b45192 上传海盗养成 2023-10-30 17:06:21 +08:00
liwei1dao
e003aa156c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 16:31:10 +08:00
liwei1dao
d966496fd2 上传代码 2023-10-30 16:31:04 +08:00
4f9f4ae507 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 15:59:07 +08:00
906ca81ff1 创房 加入 解散 开始 流程 2023-10-30 15:59:04 +08:00
liwei1dao
67cce21c5e 上传头像框 2023-10-30 15:58:50 +08:00
liwei1dao
d0606fdb75 上传皮肤资源 2023-10-30 15:28:19 +08:00
liwei1dao
4f92e94968 上传配置 2023-10-30 15:12:12 +08:00
liwei1dao
4dca086bed 上传皮肤代码 2023-10-30 15:04:23 +08:00
liwei1dao
927df75d9f 上传配置文件 2023-10-30 15:00:56 +08:00
liwei1dao
d4d1549592 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 14:19:40 +08:00
liwei1dao
7096dc4e22 上传协议 2023-10-30 14:19:36 +08:00
5235272d94 每天随机N个类型玩法 2023-10-30 11:10:50 +08:00
liwei1dao
5f6b164aaf 上传商店协议和商品中心协议 2023-10-30 09:44:09 +08:00
db89a8b32e update 2023-10-27 20:07:02 +08:00
90d05da98f 匹配校验卡数量 2023-10-27 19:24:20 +08:00
c8c9fec17d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-27 18:25:52 +08:00
d8fa73a48b 上传代码 2023-10-27 18:25:49 +08:00
liwei1dao
29b4928fd1 上传犬兔大战 2023-10-27 15:46:56 +08:00
liwei1dao
d8a88755a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-27 14:58:44 +08:00
liwei1dao
e677aa468b 上传配置 2023-10-27 14:58:38 +08:00
liwei1dao
c8230de27c 上传配置 2023-10-27 14:58:23 +08:00
9609b8e72a 上传代码 2023-10-27 14:14:38 +08:00
20521ee985 三消外围英雄相关功能 2023-10-27 12:01:56 +08:00
57dc3f721b 地图消除测试修改 2023-10-26 18:53:17 +08:00
d684e12e93 进入游戏随机生成一张不能自消的地图 2023-10-26 18:32:09 +08:00
adcd237cad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 18:12:20 +08:00
0dd61aabb4 三消地图检测是否有交换不能消除的情况 2023-10-26 18:12:17 +08:00
liwei1dao
75491c82d4 上传表格配置 2023-10-26 17:57:11 +08:00
liwei1dao
87c9dbdbfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 17:55:32 +08:00
liwei1dao
b7e0a26fd1 上传犬兔大战 2023-10-26 17:42:56 +08:00
1ce5b473eb 修改表名 2023-10-26 16:15:58 +08:00
4bb4be7204 新增玩家基本信息 2023-10-26 15:33:05 +08:00
liwei1dao
58595c5a9e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 14:13:33 +08:00
liwei1dao
957c6de0cf 上传配置 2023-10-26 14:13:11 +08:00
bcc6e797d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 12:34:37 +08:00
9acdd2b778 配置更新 2023-10-26 12:34:34 +08:00
liwei1dao
110b7386ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 10:29:47 +08:00
liwei1dao
fd270c204b 上传埋点 2023-10-26 10:29:43 +08:00
58898f4d3f xxl发奖校验 如果是AI胜利 不发将 2023-10-26 09:58:48 +08:00
e5f95645e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 09:29:50 +08:00
689b2babbe 取消匹配 2023-10-26 09:29:47 +08:00
liwei1dao
0034cea756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 09:25:30 +08:00
liwei1dao
14a92fe425 上传代码 2023-10-26 09:25:22 +08:00
37d433b09c 游戏结算新增谁赢了 2023-10-25 19:47:45 +08:00
090345b4ac 对战开始初始化满体力 2023-10-25 18:24:37 +08:00
1d4276e6af 接口调整 优化 2023-10-25 18:09:36 +08:00
1d7207461e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 16:07:26 +08:00
f7431e126f xxl匹配 2023-10-25 16:07:22 +08:00
liwei1dao
ab07e59c30 上传藏宝图 2023-10-25 15:00:35 +08:00
liwei1dao
8b79cd7aae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 14:17:07 +08:00
liwei1dao
833312fa68 上传游戏邀请 2023-10-25 14:17:02 +08:00
f406d53316 消除积分改累计值 2023-10-25 14:15:43 +08:00
86ea90004b 技能能量 2023-10-25 13:48:47 +08:00
a404633165 上传代码 2023-10-25 13:41:25 +08:00
a718218993 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 11:10:03 +08:00
a0c6b5485e 完善对战 2023-10-25 11:10:00 +08:00
liwei1dao
52fbce426e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 10:06:39 +08:00
liwei1dao
6d992bd005 上传代码 2023-10-25 10:06:33 +08:00
ad64ecc289 ai 能量进度统计 2023-10-25 09:53:36 +08:00
7822cff7ee 释放技能没有连消的情况 2023-10-24 20:10:26 +08:00
88ab2ea016 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:36:13 +08:00
2377793a98 新增错误 2023-10-24 18:36:10 +08:00
liwei1dao
821367a9e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:17:19 +08:00
liwei1dao
dc1a28339b 上传配置 2023-10-24 18:17:13 +08:00
a640c50d22 玩家技能 2023-10-24 18:09:58 +08:00
88dd4aea0e update 2023-10-24 17:39:14 +08:00
8e97e8d84e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 15:21:28 +08:00
79f58144d5 技能 2023-10-24 15:21:25 +08:00
liwei1dao
0ed81a543b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 14:04:14 +08:00
liwei1dao
ecc9144e42 上传主城同屏 2023-10-24 14:04:08 +08:00
a57f0eeeca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 12:00:21 +08:00
ca2a842154 恢复能量 体力 最大回合数读取配置 2023-10-24 12:00:17 +08:00
liwei1dao
c5db0bf402 上传代码 2023-10-24 11:47:42 +08:00
liwei1dao
c1cdd58324 上传捕羊游戏结束时间配置 2023-10-24 11:07:00 +08:00
liwei1dao
0f546d1be5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 10:55:07 +08:00
liwei1dao
f2dafe1e48 上传捕羊aiCD间隔 2023-10-24 10:55:02 +08:00
eb83dd957a 4消或5消生成新的元素 2023-10-24 10:30:21 +08:00
6cfbac78eb 协议同步 2023-10-24 10:28:39 +08:00
8ea3174625 update 2023-10-24 10:23:44 +08:00
liwei1dao
ed7bbef31f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 09:14:51 +08:00
liwei1dao
bb3a292585 上传猜颜色代码 2023-10-24 09:14:02 +08:00
3f2bf270ae 三消货币 2023-10-23 20:28:46 +08:00
7387b376ed 上传代码 2023-10-23 19:49:13 +08:00
9057112fda 操作结果返回操作动作 2023-10-23 19:05:13 +08:00
c55161fb6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:52:18 +08:00
da4b238cb9 不能交换的情况处理 2023-10-23 16:52:15 +08:00
liwei1dao
f7ac90a153 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:41:26 +08:00
liwei1dao
74344f18ac 上床捕羊匹配优化 2023-10-23 16:41:21 +08:00
90a1daf23a 初始玩家体力 2023-10-23 15:58:02 +08:00
48d84dc0bc 补充消除逻辑 优化权限 2023-10-23 15:32:40 +08:00
6d86f3a05b AI移动元素 2023-10-20 22:55:06 +08:00
1c23a60bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:58:50 +08:00
4504afde92 移除重复代码 2023-10-20 20:58:48 +08:00
liwei1dao
d9cc7346c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:49 +08:00
liwei1dao
125fc9cddd 上传测试服 2023-10-20 20:57:45 +08:00
c214107ff3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:43 +08:00
c8cf135258 update 2023-10-20 20:57:39 +08:00
liwei1dao
4139e2e36c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 18:28:49 +08:00
liwei1dao
d010bb73c3 上传才颜色和好友接口 以及同屏代码 2023-10-20 18:28:44 +08:00
a6aa603dc3 连消优化 2023-10-20 16:26:02 +08:00
e730baf179 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:40 +08:00
70f51721a0 update 2023-10-20 14:13:37 +08:00
liwei1dao
faff6c4269 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:33 +08:00
liwei1dao
7fb5b1963b 上传猜颜色配置读取 2023-10-20 14:13:28 +08:00
36a37c8c7c update 2023-10-20 12:44:36 +08:00
86111c04ea AI计时器整理 2023-10-20 11:37:08 +08:00
1ea7fb31bb 优化 2023-10-20 11:11:29 +08:00
41c5ad951a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 22:13:01 +08:00
236875a380 xxl 优化+测试 2023-10-19 22:12:58 +08:00
liwei1dao
eb000d90b7 上传代码 2023-10-19 18:45:47 +08:00
liwei1dao
daffb7d975 猜颜色 2023-10-19 18:38:23 +08:00
liwei1dao
2d36ac69a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 18:08:15 +08:00
liwei1dao
264ad9411f 上传猜颜色 2023-10-19 18:08:11 +08:00
c1c2790ddd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 16:19:30 +08:00
785b2f7881 规则完善 2023-10-19 16:19:26 +08:00
d89e6b0898 月卡每日奖励发放 2023-10-24 15:53:23 +08:00
liwei1dao
5834494afc 伤处签到和捕羊开启 2023-10-19 16:07:26 +08:00
liwei1dao
59843155f6 上传猜颜色 2023-10-19 15:52:30 +08:00
liwei1dao
5d667c74b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 15:03:01 +08:00
liwei1dao
5efc94222d 上传猜颜色 2023-10-19 15:02:57 +08:00
4ddf74c351 对战计时器+AI逻辑 2023-10-19 11:46:54 +08:00
4a3a03a811 检查月卡每日邮件奖励发放 2023-10-19 19:08:05 +08:00
20480d9104 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 19:00:10 +08:00
c69d00f744 xxl代码 2023-10-18 19:00:06 +08:00
liwei1dao
d28a2f3e65 上传捕羊代码 2023-10-18 18:37:51 +08:00
liwei1dao
d377ecca4b 上传代码 2023-10-18 18:33:23 +08:00
5711dd24ff 普通菜不入图鉴 2023-10-18 18:22:44 +08:00
500202dfe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 11:33:34 +08:00
30970cb7d9 ui小游戏额外奖励 2023-10-18 11:33:13 +08:00
liwei1dao
c7d382fe09 上传聊天信息 2023-10-18 11:30:14 +08:00
liwei1dao
af1884205d 上传头像框信息 2023-10-18 11:05:48 +08:00
8c3fe6c9e2 xxl 规则 2023-10-18 09:40:37 +08:00
f3d5dd51d3 接龙一键领取key修改 2023-10-17 17:44:59 +08:00
52a01ad52d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:17:31 +08:00
2167ade864 接龙新增本周最高记录字段 2023-10-17 16:17:28 +08:00
liwei1dao
976c305d50 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:09:27 +08:00
liwei1dao
f4184e1bcd 同步配置 2023-10-17 16:09:23 +08:00
684892291f update 2023-10-17 15:04:58 +08:00
6f5e36524b update 2023-10-17 14:40:32 +08:00
ed6c8f4171 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:36:29 +08:00
87ae8573e8 接龙增加游戏开始协议 2023-10-17 14:36:26 +08:00
liwei1dao
bfc79ea3ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:17:34 +08:00
liwei1dao
c2e625b3db 上传协议 2023-10-17 14:17:30 +08:00
df1c5e9d5b update 2023-10-17 14:16:51 +08:00
8f75f5a770 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:37 +08:00
dc14a1fa81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:33 +08:00
liwei1dao
eeee4679d8 上传奖励发放 2023-10-17 14:09:17 +08:00
f270d0dcf3 奖励资源统一类型发放 2023-10-17 14:08:20 +08:00
liwei1dao
34e4761b47 上传奖励协议代码 2023-10-17 13:54:53 +08:00
292d007e29 邮件批处理 2023-10-17 11:55:56 +08:00
9df2c3f7b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 11:23:44 +08:00
liwei1dao
a5c989583d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 11:20:56 +08:00
5dcea3a8b1 接龙门票每日恢复处理 2023-10-17 11:20:54 +08:00
liwei1dao
7305c11762 上传资源回报优化 2023-10-17 11:20:52 +08:00
cfbe3558bc 接龙奖励改一键领取 2023-10-17 10:58:27 +08:00
083ed3c371 铁匠铺高星打造调整 2023-10-17 10:26:34 +08:00
liwei1dao
dc424c9cbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 10:22:06 +08:00
liwei1dao
da97665797 上传配置代码 2023-10-17 10:22:02 +08:00
601b6c1f63 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 19:22:19 +08:00
26b14e3db5 消消乐 2023-10-16 19:22:12 +08:00
liwei1dao
b9fbdf2a51 保存体力变化值 2023-10-16 17:31:08 +08:00
liwei1dao
76a39dc594 上传体力优化 2023-10-16 17:10:33 +08:00
liwei1dao
32e2027622 优化体力代码 2023-10-16 17:01:05 +08:00
liwei1dao
fe22b55d46 上传体力修复 2023-10-16 16:46:44 +08:00
liwei1dao
fce803d2ef Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 16:05:18 +08:00
liwei1dao
4aa24af2fd 上传体力红点 2023-10-16 16:05:14 +08:00
1c7edc3687 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 15:35:00 +08:00
68d496d6a3 快速接龙数据配置校验 2023-10-16 15:34:57 +08:00
liwei1dao
866ee2cf9f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 14:57:39 +08:00
liwei1dao
21dd60be53 上传消消乐模块 2023-10-16 14:57:29 +08:00
19dad4d7fa 快速接龙上传 2023-10-13 15:17:24 +08:00
liwei1dao
d2512168fa 上传成就代码 2023-10-13 14:31:23 +08:00
liwei1dao
326df2b8af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-12 19:13:31 +08:00
liwei1dao
1cbfd710e3 上传捕羊匹配逻辑 2023-10-12 19:13:27 +08:00
56ad5f6ba5 创建工会也算完成加入工会任务 2023-10-12 15:25:40 +08:00
a747332c71 快速接龙 2023-10-12 14:33:27 +08:00
liwei1dao
e47d9cbc27 上传通用成就系统 2023-10-12 10:42:54 +08:00
liwei1dao
204e37675c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 18:36:05 +08:00
liwei1dao
da50a328a8 上传代码 2023-10-11 18:36:01 +08:00
d9a92ce0c8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 18:31:47 +08:00
9d19a76668 update 2023-10-11 18:31:43 +08:00
liwei1dao
3200484b8e 上传数据初始化 2023-10-11 18:18:45 +08:00
liwei1dao
8576d54cdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:46:55 +08:00
liwei1dao
d41378285e 上传竞技场npc需求 2023-10-11 17:46:50 +08:00
0792661ab1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:45:37 +08:00
84ff03c2da #36575 任务 【梦工场系统】 <-后端-> 【石阵秘境】强化buff事件新增规则 2023-10-11 17:45:23 +08:00
liwei1dao
cc710d851f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:12:31 +08:00
liwei1dao
4702c4b03f 上传配置文件 2023-10-11 17:12:26 +08:00
1b7e6368a4 埋点236 2023-10-11 15:12:21 +08:00
5066b59911 英雄整理 2023-10-11 13:50:26 +08:00
d56c26255d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-10 19:04:32 +08:00
423b03086c 数组初始化 2023-10-10 19:04:29 +08:00
liwei1dao
537470e227 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-10 18:34:34 +08:00
liwei1dao
c638d3bbce 上传公会弹劾代码修复 2023-10-10 18:34:25 +08:00
d42497f2ea 优化 2023-10-10 14:37:52 +08:00
f2fd4ebb63 商队排行改跨服 2023-10-10 11:49:26 +08:00
8b233d1ea4 一键领取 2023-10-09 18:22:59 +08:00
cbe0c93635 列车结账收益奖励领取 2023-10-09 18:20:42 +08:00
2d233bb2cd GM邮件状态异常修复 2023-10-09 17:45:14 +08:00
0936223d7f 跨服处理 2023-10-09 17:38:09 +08:00
d905751909 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 17:25:51 +08:00
bc5251473a 邮件RPC 通知 2023-10-09 17:25:00 +08:00
liwei1dao
ce50e425c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 17:00:38 +08:00
liwei1dao
0bb2d2493e 上传签名日志输出 2023-10-09 17:00:34 +08:00
f878aed122 首通奖励发放时机调整 2023-10-09 15:44:13 +08:00
03e4d02fbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 15:11:31 +08:00
a69ecd0716 配置解析 2023-10-09 15:11:27 +08:00
liwei1dao
349b637ee5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 12:17:04 +08:00
liwei1dao
96088d49b7 上传代码 2023-10-09 11:56:22 +08:00
67bddca0d4 移除测试代码 2023-10-09 11:50:33 +08:00
3de38ab74c 秘境房间随机规则优化 2023-10-09 10:18:31 +08:00
e6c43b0520 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:55:15 +08:00
823cd28c99 秘境掉落事件配置解析 2023-10-08 18:55:11 +08:00
liwei1dao
64c2205875 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:40:22 +08:00
liwei1dao
c68c0c9730 上传公会问题 2023-10-08 18:40:17 +08:00
cce089ca57 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:06:16 +08:00
b693081cfe 掉落奖励异常修复 2023-10-08 18:06:13 +08:00
liwei1dao
0692d9d7e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 16:48:02 +08:00
liwei1dao
4383d49694 上传会长弹劾 2023-10-08 16:47:58 +08:00
d2ebddf88c 移除测试代码 2023-10-08 16:22:11 +08:00
1bdb587514 卸载称号 2023-10-08 16:16:44 +08:00
5b60d088b8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 16:14:38 +08:00
c26fcf44d7 商队价格走势图 价格调整 2023-10-08 16:14:34 +08:00
liwei1dao
a2fad05df7 上传存钱罐数据被清理的问题 2023-10-08 15:33:29 +08:00
liwei1dao
93972c5b6c 修复代码语法错误 2023-10-08 15:11:55 +08:00
aa4bd8ad9b 排行榜加入 称号数据 2023-10-08 14:07:58 +08:00
f0f24cf4e1 gm 加称号标签 2023-10-07 11:01:30 +08:00
084eb5e275 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-07 10:45:11 +08:00
liwei1dao
0a803ac021 上传升级代码 2023-09-28 16:21:27 +08:00
liwei1dao
d25970f9d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-28 16:16:22 +08:00
liwei1dao
5184a2a4ff 上传用户 2023-09-28 16:16:17 +08:00
3cb3435dd5 移除测试代码 2023-09-28 11:18:29 +08:00
edc97360e5 活动开启通知 2023-09-28 11:13:05 +08:00
e3293d4313 主线功能开启配置 2023-09-28 09:54:05 +08:00
5c8003e0ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 21:06:24 +08:00
54f63eb812 优化 2023-09-27 21:06:20 +08:00
liwei1dao
ca4b21d29d 上传结算处理 2023-09-27 20:18:13 +08:00
liwei1dao
0321057d6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 18:04:51 +08:00
liwei1dao
4d58a75d53 上传武馆红点优化 2023-09-27 18:04:46 +08:00
e9975bb591 战斗校验 2023-09-27 17:38:41 +08:00
5fc2a0bb3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 17:04:28 +08:00
d168499bfb 远征双倍boss类型校验 2023-09-27 17:04:24 +08:00
liwei1dao
226f149d62 上传每日任务红点逻辑代码 2023-09-27 16:55:17 +08:00
liwei1dao
7bfc28c5a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:38:28 +08:00
liwei1dao
8cac73974d 上传升级bug 2023-09-27 15:38:25 +08:00
143d07da94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:24:27 +08:00
3af086d3b8 清理道具推送 2023-09-27 15:24:23 +08:00
liwei1dao
11cfa9b174 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:13:48 +08:00
liwei1dao
f53b3f7d20 上传捕养大赛结算和周长奖励 2023-09-27 15:13:43 +08:00
4f8166850b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 14:40:08 +08:00
e2fb4deb76 【石阵秘境】图鉴点击领取报错 2023-09-27 14:40:04 +08:00
liwei1dao
e4e08a2201 上传竞技场异常问题 2023-09-27 14:11:06 +08:00
liwei1dao
1456fa9f8d 上传传功塔代码 2023-09-27 10:27:14 +08:00
175ba83533 接口调整 2023-09-27 10:15:06 +08:00
4eca46e2a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 10:06:45 +08:00
29f8677fda 获取英雄虚拟等级属性 2023-09-27 10:06:40 +08:00
77f055447a 新增称号资源 2023-09-26 19:06:38 +08:00
liwei1dao
23886a2763 移除废弃表格 2023-09-26 19:04:31 +08:00
liwei1dao
6c1d210184 上传进度解锁 2023-09-26 18:24:10 +08:00
liwei1dao
ea3b997d53 补充战斗校验代码 2023-09-26 17:07:13 +08:00
liwei1dao
1306bead39 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-26 16:06:13 +08:00
liwei1dao
41a038effc 上传主线挂卡进度计算 2023-09-26 16:06:08 +08:00
liwei1dao
c3e87e1f69 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-29 14:09:59 +08:00
liwei1dao
a2a395227d 竞技场埋点补充 2023-09-29 14:09:51 +08:00
2c77138db1 商队协议调整 2023-09-26 15:29:45 +08:00
271b5d319b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-26 14:15:12 +08:00
557c23bfc1 过滤维京远征boss数据 2023-09-26 14:15:09 +08:00
ca4f0faed5 庆典活动调整 2023-09-26 13:42:41 +08:00
a8b73f3b34 商队数据调整 2023-09-25 19:23:22 +08:00
d6f4fee1cd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 17:19:51 +08:00
663b010404 优化 2023-09-25 17:19:47 +08:00
a81132f346 #35642 任务 【梦工场系统】 <-后端-> 【巨怪商队】 - 走势图新增 2023-09-25 16:37:28 +08:00
liwei1dao
0401199c94 上传测试服配置 2023-09-25 15:59:54 +08:00
liwei1dao
c5da477a08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 15:36:03 +08:00
liwei1dao
019455923d 修复代码 2023-09-25 15:35:59 +08:00
f08bc06433 商队等级奖励 手动领取修复 2023-09-25 14:31:05 +08:00
21e5607d2f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 11:29:03 +08:00
be4b752590 需求 屏蔽铁匠铺任务红点 2023-09-25 11:29:00 +08:00
liwei1dao
abaf242108 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:26:48 +08:00
liwei1dao
4deef2c8b6 上传主线经验消耗 2023-09-22 19:26:44 +08:00
3f26279a89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:22:25 +08:00
liwei1dao
4af3391a4d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:15:15 +08:00
liwei1dao
cfe814687e 上传添加体力错误修复 2023-09-22 19:11:48 +08:00
25a7fcf2c0 容错处理 防止玩家数据不多的时候未创角的号入榜 2023-09-22 18:51:55 +08:00
c309920b31 加日志 2023-09-22 17:15:18 +08:00
3af91399dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 16:05:45 +08:00
1ccfb1822c 经验接口调整 2023-09-22 16:05:41 +08:00
liwei1dao
f9865c390b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:55:35 +08:00
liwei1dao
535cb0a9cc 同步事件战斗经验推送 2023-09-22 15:55:31 +08:00
dcdc8252ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:45:03 +08:00
liwei1dao
fb7c10480d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:44:35 +08:00
liwei1dao
4aec88acb9 上传 用户经验满级后处理机制 2023-09-22 15:44:14 +08:00
6dd558df10 更新等级 2023-09-22 15:37:28 +08:00
f7469a9560 商队盈利调整 2023-09-22 15:26:14 +08:00
1cb46ae804 bug 云朵小步层数奖励读取字段错误 2023-09-22 14:16:00 +08:00
b4f3c6e1aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 14:09:01 +08:00
f8ab538b16 排行记录商队等级 2023-09-22 14:08:54 +08:00
liwei1dao
65312b75a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 09:42:45 +08:00
liwei1dao
62aa62f83f 修复用户代理错误导致网关服务崩溃的问题 2023-09-22 09:42:41 +08:00
8288dc1d2a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 19:20:37 +08:00
c072240117 商队盈利收益奖励手动领取 2023-09-21 19:12:57 +08:00
liwei1dao
f8f330cb91 上传世界任务战斗经验不展示 2023-09-21 17:35:22 +08:00
liwei1dao
f5f8ac8f6a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 16:42:41 +08:00
liwei1dao
bd8055d883 上传道具分解错误处理 2023-09-21 16:42:34 +08:00
959a059405 商队 涨跌幅度千分比走区间配置 2023-09-21 15:30:17 +08:00
79f9aeb43a 添加错误输出 2023-09-21 15:15:19 +08:00
a821f8aa6a 道具加成达上限 2023-09-21 15:09:07 +08:00
eef7dc1400 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:53:14 +08:00
e07f9357bf #35313 缺陷 【梦工场系统】 <-后端-> 【玩家信息】储钱罐功能未生效 2023-09-21 14:53:07 +08:00
liwei1dao
d3bfe0480f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:41:37 +08:00
liwei1dao
1d98dfa1b6 上传登录绑定服务节点 2023-09-21 14:41:31 +08:00
9ac37cd500 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:40:56 +08:00
32008bc90e 道具提升修改 2023-09-21 14:40:52 +08:00
liwei1dao
d241547c51 上传网关用户离线通知 2023-09-21 14:33:50 +08:00
liwei1dao
9adbc2492d 上传日常任务功能开启推送 2023-09-21 11:20:45 +08:00
liwei1dao
31157c9154 上传自己的个人信息同步 2023-09-19 16:45:39 +08:00
liwei1dao
37bb93a7b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-19 16:41:59 +08:00
liwei1dao
898822736d 上传日常任务代码 2023-09-19 16:41:41 +08:00
cc818d023f 加日志 2023-09-19 16:39:22 +08:00
cbdab7f6f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-19 15:14:36 +08:00
e69492097c session 绑定之前 数据异常处理 2023-09-19 15:14:21 +08:00
liwei1dao
a2773d3524 上传代码 2023-09-19 11:08:23 +08:00
1ff9bef70c #35016 任务 【梦工场系统】 <-后端-> 【完成条件】 - 驯龙养成等级 2023-09-19 10:34:55 +08:00
8ba44bf097 道具加成条件限制 2023-09-19 10:05:23 +08:00
04ae401832 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 19:19:43 +08:00
c86bf2c37a 初始养成数据 2023-09-18 19:19:39 +08:00
liwei1dao
ac608e99a2 上传错误日志提示 2023-09-18 19:09:43 +08:00
liwei1dao
221ed62dac 上传日常开关限制 2023-09-18 18:24:00 +08:00
liwei1dao
e7be493477 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 17:55:07 +08:00
liwei1dao
0405e8682f 管卡编辑器掉落组修改 2023-09-18 17:55:01 +08:00
b622edae29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 17:49:35 +08:00
9661f12346 #34936 子任务 【梦工场系统】 <-后端-> 【驯龙养成】道具提升 2023-09-18 17:49:14 +08:00
5529d8edb7 错误信息补充 2023-09-18 17:11:54 +08:00
liwei1dao
5019a65824 上传捕羊大赛等级 2023-09-18 16:55:42 +08:00
dad0c67a6a 优化 2023-09-18 14:24:09 +08:00
liwei1dao
fe682f9f39 优化日志输出 2023-09-15 22:23:36 +08:00
liwei1dao
038d417a1d 上传战报信息 2023-09-15 21:36:34 +08:00
liwei1dao
8abb284977 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 17:52:56 +08:00
liwei1dao
5af1eccf79 上传战斗后援占位 2023-09-15 17:52:53 +08:00
4e07455a63 活动修改 2023-09-15 16:35:56 +08:00
e94f325002 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 16:03:04 +08:00
1e20c347e0 活动修改 2023-09-15 16:03:00 +08:00
liwei1dao
326276f337 上传主线失败特殊处理 2023-09-15 16:00:07 +08:00
82d7a728e9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 14:56:15 +08:00
448025b2ac 羁绊优化 2023-09-15 14:56:11 +08:00
liwei1dao
f4c49864dc 上传用户登录代码 2023-09-15 14:40:45 +08:00
liwei1dao
d7d67fbcb6 上传公会boos代码 2023-09-14 17:16:50 +08:00
liwei1dao
2e214bf274 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 16:38:52 +08:00
liwei1dao
e41c99ae84 上传gm命令 2023-09-14 16:38:49 +08:00
a4143f24e3 数据校验 2023-09-14 16:23:47 +08:00
bf2b99fedf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 16:19:23 +08:00
402eb4deed 驯龙数据修复 2023-09-14 16:19:19 +08:00
liwei1dao
0f9525eecb 上传捕羊埋点 2023-09-14 15:39:57 +08:00
liwei1dao
68eb6bb282 上传压测时长显示 2023-09-14 15:24:25 +08:00
d86fb743c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 14:40:35 +08:00
2e0181cc92 商队测试 2023-09-14 14:36:20 +08:00
liwei1dao
4fb3c714fb 上传主线机器人 2023-09-14 14:32:39 +08:00
65524b7008 update 2023-09-14 14:27:17 +08:00
63c615ef43 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 14:23:46 +08:00
b98daf11fa 爬塔前置条件判断 2023-09-14 14:23:43 +08:00
liwei1dao
562f5018e3 上传主线代码 2023-09-14 14:19:05 +08:00
a1f7e39c9e 驯龙养成优化 2023-09-14 11:17:40 +08:00
b49cb804d2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 11:11:31 +08:00
4da2453476 驯龙升阶后重置养成属性次数 2023-09-14 11:11:28 +08:00
liwei1dao
f30ee60e87 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 11:03:18 +08:00
liwei1dao
d3d4998ec7 上传配置 2023-09-14 11:03:14 +08:00
83a5794a4d 功夫塔测试 2023-09-14 10:36:34 +08:00
6f894c14d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 17:41:37 +08:00
5bcdcc4709 随机顾客奖励发放 2023-09-13 17:41:34 +08:00
liwei1dao
77e828e0b4 上传配置 2023-09-13 17:19:03 +08:00
d63f01cdfb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 17:07:47 +08:00
3d3d2f117b 铁匠铺顾客收购装备优化 2023-09-13 17:07:44 +08:00
liwei1dao
ba2f8c4ba2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 16:37:24 +08:00
liwei1dao
b917b9cd72 上传坐骑变更 2023-09-13 16:36:38 +08:00
700a2ce734 update 2023-09-13 16:19:28 +08:00
a7c81df8b9 配置校验 2023-09-13 15:49:39 +08:00
4d1ab8302a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 11:39:44 +08:00
258b44f9e7 模块初始化校验 2023-09-13 11:39:40 +08:00
liwei1dao
fa73f04193 上传创角回应 2023-09-13 11:34:35 +08:00
65e6456f00 update 2023-09-13 11:33:56 +08:00
6784338b43 错误检测 2023-09-13 11:33:47 +08:00
liwei1dao
d0151b0eae 修复爬塔 2023-09-13 11:12:56 +08:00
liwei1dao
9c1b873a97 修复红点 2023-09-13 10:38:39 +08:00
5e87336c24 资源发放错误 2023-09-13 10:34:34 +08:00
b436e3549c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 10:29:37 +08:00
96b7321da5 消息异步处理 2023-09-13 10:29:33 +08:00
liwei1dao
4eab259a14 上传创号优化 2023-09-13 10:27:05 +08:00
liwei1dao
0a1234fd98 上传info还原 2023-09-13 10:17:08 +08:00
liwei1dao
947ffbe74d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 10:14:18 +08:00
liwei1dao
8254a62cfb 上传创号优化 2023-09-13 10:14:13 +08:00
ae92a60cbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 19:11:08 +08:00
fa35943a80 新增gm 解锁 2023-09-12 19:11:03 +08:00
liwei1dao
dec719d2f2 优化登录流程 2023-09-12 19:10:01 +08:00
482112158b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 18:32:17 +08:00
liwei1dao
59ebeeae38 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 18:32:15 +08:00
af5c089189 update 2023-09-12 18:32:13 +08:00
liwei1dao
452d58bfbc 上传异步优化 2023-09-12 18:32:09 +08:00
liwei1dao
e18e23ec95 上传异步处理 2023-09-12 18:25:51 +08:00
765a02c1ff 查询玩家接口调整 2023-09-12 16:26:42 +08:00
5cf344907c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 15:32:16 +08:00
0d8d2e2775 update 2023-09-12 15:32:10 +08:00
liwei1dao
5083db9588 优化redis 缓存过期时间 2023-09-12 15:29:15 +08:00
b2a3a9b49e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 15:14:25 +08:00
6e89c06973 体力恢复调整 2023-09-12 15:14:21 +08:00
liwei1dao
81dd2f0f86 上传代码优化 2023-09-12 15:06:50 +08:00
liwei1dao
a60bbac8f4 上传武官柱子解锁优化 2023-09-12 11:53:51 +08:00
liwei1dao
4f4acd6304 上传代码 2023-09-12 11:22:52 +08:00
liwei1dao
01f6a38cab 上传星座图bug修复 2023-09-12 09:59:20 +08:00
f711ac613c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 09:48:06 +08:00
5ce7e72a8b update 2023-09-12 09:48:03 +08:00
liwei1dao
97ba3aafa2 上传日志补充 2023-09-11 18:32:27 +08:00
liwei1dao
022c51d459 上传代码优化 2023-09-11 17:39:46 +08:00
82f1f44917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:56:33 +08:00
ced15fa917 异常处理 2023-09-11 16:56:30 +08:00
liwei1dao
b39dfb89fa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:54:36 +08:00
liwei1dao
de0aa19c25 上传代码优化 2023-09-11 16:54:31 +08:00
ae3cc9c369 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:48:30 +08:00
564818cc0a 优化 2023-09-11 16:48:26 +08:00
liwei1dao
1955ce04ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:18:53 +08:00
liwei1dao
9bfdbfa20c 上传底层广播消息奔溃处理 2023-09-11 16:18:47 +08:00
01832e0de2 配置同步 2023-09-11 14:53:44 +08:00
c08678a30a 商队测试 + 铁匠铺掉落 2023-09-11 14:43:16 +08:00
liwei1dao
5b41afb95c 上传秘境异常修复 2023-09-08 20:43:12 +08:00
liwei1dao
a71ac34402 上传竞技场错误修复 2023-09-08 20:40:54 +08:00
liwei1dao
40c7889b19 上传pb代码 2023-09-08 18:04:13 +08:00
liwei1dao
a1ceea9b91 上传网关错误信息 2023-09-08 17:56:53 +08:00
1b9c52d6c6 update 2023-09-08 17:49:57 +08:00
d97cc253fa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 17:23:43 +08:00
c638c3ec4a 数据清里 2023-09-08 17:23:39 +08:00
liwei1dao
d8fdd05951 上传机器人代码 2023-09-08 16:07:18 +08:00
liwei1dao
147a02d25c 上传机器人 2023-09-08 15:57:57 +08:00
05c56d6e00 爬塔战斗 2023-09-08 15:43:36 +08:00
a5e480e6ff 测试 2023-09-08 15:31:34 +08:00
liwei1dao
35003a0d66 上传 2023-09-08 15:11:30 +08:00
liwei1dao
203c146049 上传 2023-09-08 15:11:09 +08:00
liwei1dao
5f64da3f34 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 15:08:38 +08:00
liwei1dao
74822bd141 上传新的机器人框架 2023-09-08 15:08:34 +08:00
050d1deb2f update 2023-09-08 15:01:27 +08:00
6a2f3806e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 14:57:20 +08:00
bc97b6dcca 异步调用 session push 2023-09-08 14:57:17 +08:00
liwei1dao
aee3a8d5c9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 14:55:06 +08:00
liwei1dao
59aff5c46b 上传事件 2023-09-08 14:55:02 +08:00
8b26e067ea 条件开启优化 2023-09-08 14:45:25 +08:00
47880f27d5 坐骑资源接口优化 2023-09-08 14:10:15 +08:00
ab9ec2a86b 条件开启功能优化 2023-09-08 11:26:10 +08:00
8767e561ff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 19:17:40 +08:00
4d32a1420c 异常处理 2023-09-07 19:17:36 +08:00
liwei1dao
7a0916b006 上传用户信息 2023-09-07 19:04:08 +08:00
liwei1dao
d5d9fbb785 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 18:59:03 +08:00
liwei1dao
c384360a02 上传 2023-09-07 18:58:43 +08:00
02f60eb381 开启通知接口 2023-09-07 18:57:53 +08:00
1359923623 等级奖励错误修复 2023-09-07 18:37:50 +08:00
1df2df9367 调试上传 2023-09-07 18:31:44 +08:00
bf9a56b291 移除不用定义 2023-09-07 17:47:55 +08:00
758acdce06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 17:44:13 +08:00
a4db4a0fe9 部分活动移除 2023-09-07 17:44:08 +08:00
liwei1dao
9000fc18dd 上传编译代码 2023-09-07 17:08:59 +08:00
liwei1dao
ef8cecd870 优化压测机器人代码 2023-09-07 15:45:42 +08:00
1bb9439b8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 15:37:39 +08:00
cf2e23b8dd 转盘活动改功能 2023-09-07 15:37:21 +08:00
liwei1dao
10e8095c9a 上传结算消息 2023-09-07 14:51:35 +08:00
liwei1dao
116962fb5c 上传初始段位 2023-09-07 14:48:46 +08:00
liwei1dao
ac4f450264 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 14:17:17 +08:00
liwei1dao
84e96db42d 上传补羊结算 2023-09-07 14:17:12 +08:00
0aef4c74c2 解决冲突 2023-09-07 11:14:25 +08:00
25c168a479 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 11:13:29 +08:00
55a616a27c gm 修改坐骑等级 2023-09-07 11:12:57 +08:00
liwei1dao
b15e4e2a3a 上传推送 2023-09-07 10:19:16 +08:00
liwei1dao
816019c108 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 19:02:34 +08:00
liwei1dao
8e579dde24 上传gm命令 2023-09-06 19:02:21 +08:00
ff64c3984a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 18:28:31 +08:00
03b236bed2 测试优化 2023-09-06 18:28:27 +08:00
liwei1dao
22283a26ff 上传服务配置 2023-09-06 16:44:07 +08:00
liwei1dao
d3d0461934 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 15:01:52 +08:00
liwei1dao
fd8f3eef0d 上传机器人输出报表 2023-09-06 15:01:47 +08:00
f2c318f5d0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 11:16:21 +08:00
b1bcfcd1dc 铁匠铺顾客刷新修改 2023-09-06 11:16:17 +08:00
liwei1dao
7efd39ba8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 10:00:17 +08:00
liwei1dao
976e458493 上传boos难度保存 2023-09-06 10:00:12 +08:00
2efcdf34e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 20:08:03 +08:00
a20b9db3a1 通过区服id 和唯一id 查询坐骑信息 批处理 2023-09-05 20:07:59 +08:00
liwei1dao
449fc414ba 上传寻龙代码 2023-09-05 20:03:13 +08:00
217530b674 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 19:59:39 +08:00
9d76ca5ac3 update 2023-09-05 19:59:35 +08:00
liwei1dao
3a82a419f2 上传boos 2023-09-05 19:03:28 +08:00
liwei1dao
46db315d4a 上传boos代码 2023-09-05 19:02:16 +08:00
liwei1dao
dfd123190c 上传机器人代码 2023-09-05 18:44:15 +08:00
liwei1dao
d6c56bbb16 上传主线bug修复 2023-09-05 18:10:33 +08:00
7a5ce064a9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 17:40:53 +08:00
68ea7033ff 铁匠铺 顾客上限 2023-09-05 17:40:49 +08:00
liwei1dao
4d4b2f78d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 17:08:45 +08:00
liwei1dao
19a0b5d06a 上传捕养大赛 2023-09-05 17:08:39 +08:00
b102f80188 通过区服id 和唯一id 查询坐骑信息 2023-09-05 16:48:35 +08:00
ddc9d6d1e3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 16:21:58 +08:00
f769198052 坐骑资源变化推送 2023-09-05 16:21:52 +08:00
liwei1dao
b5edd8bdb0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 15:57:25 +08:00
liwei1dao
d2ba6d407d 上传boos模型代码 2023-09-05 15:57:21 +08:00
f8c118c3bb 铁匠铺藏品图鉴积分 2023-09-05 13:54:38 +08:00
bf96d301b0 #33705 子任务 【梦工场系统】 <-后端-> 【铁匠破】图鉴需要一键激活 2023-09-05 11:43:17 +08:00
4871c79f75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 10:42:49 +08:00
b79d9cb6c0 高品质打造修复 2023-09-05 10:42:45 +08:00
liwei1dao
568ff98d89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 09:55:14 +08:00
liwei1dao
dcbcd100a0 上传主线类型9关卡处理 2023-09-05 09:55:10 +08:00
8668d4a124 gm 加满好感动 2023-09-05 09:53:24 +08:00
cbbc4afea8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 09:27:50 +08:00
94a6ebefc4 update 2023-09-05 09:27:45 +08:00
liwei1dao
4468e48f87 上传服务端代码 2023-09-04 16:34:32 +08:00
liwei1dao
5714107c43 上传进度代码 2023-09-04 16:25:54 +08:00
liwei1dao
2e9045e499 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-04 15:52:55 +08:00
liwei1dao
bc0bed7e94 上传登录排队逻辑 2023-09-04 15:52:47 +08:00
93a9e850e4 养成交互次数所用道具 恢复 2023-09-04 15:01:37 +08:00
e81cbc8096 掉落 2023-09-04 11:57:07 +08:00
4ce720a7f2 掉落组 2023-09-04 11:51:30 +08:00
liwei1dao
f0be3be2bf 上传挤号代码优化 2023-09-01 21:50:31 +08:00
f12695f3de Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 19:38:24 +08:00
36af474469 session 重置 2023-09-01 19:38:20 +08:00
liwei1dao
3d5290fe45 上传配置 2023-09-01 18:29:44 +08:00
liwei1dao
2ed0577e23 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 18:23:02 +08:00
liwei1dao
4cc3749e26 上传代码 2023-09-01 18:22:58 +08:00
e506055534 参数校验 2023-09-01 18:12:40 +08:00
367b03f601 errmessage 返回 2023-09-01 17:40:34 +08:00
0d56de59aa 版署gm 2023-09-01 17:06:44 +08:00
8c759910c8 update 2023-09-01 16:26:25 +08:00
bf08bb5d6c subtype 2023-09-01 16:20:52 +08:00
278f30346a 驯龙接口补充 2023-09-01 15:01:49 +08:00
0d47281050 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 14:52:57 +08:00
a627891dae 训练增加cd 2023-09-01 14:52:51 +08:00
liwei1dao
7006b7cd0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 14:49:30 +08:00
liwei1dao
6a133f07fd 上传新捕养大赛 2023-09-01 14:49:26 +08:00
9662b6f512 坐骑属性 2023-09-01 14:17:53 +08:00
040c5c969e 坐骑属性 2023-09-01 12:28:15 +08:00
13c4c39db6 函数注册 2023-09-01 12:25:36 +08:00
e29b744153 坐骑属性 2023-09-01 12:13:04 +08:00
liwei1dao
5c3768034d 上传修复 2023-09-01 11:56:53 +08:00
liwei1dao
9c27602bbf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 11:54:27 +08:00
liwei1dao
54f2f6f176 上传主线初始化 2023-09-01 11:54:23 +08:00
2935394ebf 配置更新 2023-09-01 11:30:23 +08:00
3f3a8e6ccc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 11:20:34 +08:00
b839fc7d38 坐骑加经验 2023-09-01 11:20:21 +08:00
liwei1dao
bde7f61578 上传主线boos需求 2023-09-01 11:00:13 +08:00
f8b9dba761 推送数据校验 2023-09-01 09:33:15 +08:00
7219bdcb14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 18:42:44 +08:00
6ff124663d 模块注册 2023-08-31 18:42:40 +08:00
liwei1dao
3f3dc26a4c 上传装备技能校验 2023-08-31 18:35:25 +08:00
liwei1dao
562dfe93aa 上传新的捕养模块 2023-08-31 18:19:13 +08:00
d581c883d8 坐骑资源分发 2023-08-31 18:04:28 +08:00
liwei1dao
cff3e80c60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 16:48:30 +08:00
liwei1dao
8b4656e416 上传竞技场派上榜头像问题 2023-08-31 16:48:25 +08:00
24d71fee78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 16:38:29 +08:00
cbe61844e3 坐骑养成 2023-08-31 16:38:25 +08:00
liwei1dao
8acef69bd5 补充机器人的逻辑 2023-08-31 16:37:45 +08:00
liwei1dao
2333e29b5b 上传战斗记录过期时间 2023-08-31 16:18:43 +08:00
liwei1dao
1408f61ddf 上传战斗记录代码 2023-08-31 12:38:21 +08:00
liwei1dao
eeeeca21d9 上传配置 2023-08-31 11:21:25 +08:00
096299c16e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-30 19:41:15 +08:00
bfce8fb1a2 驯龙 2023-08-30 19:40:27 +08:00
liwei1dao
aea2373d29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-30 18:46:21 +08:00
liwei1dao
651669499f 上传周长任务 2023-08-30 18:46:17 +08:00
afdc37a244 209 埋点 2023-08-30 17:03:18 +08:00
fe281176c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 19:11:12 +08:00
39d889e7a7 商队赛季结束 结算并清理相关数据 2023-08-29 19:11:08 +08:00
liwei1dao
b1d2ef7dae 上传任务代码 2023-08-29 17:41:26 +08:00
liwei1dao
0ef53d8ae6 上传周长代码 2023-08-29 16:57:05 +08:00
bc6284afc2 商队等级奖励修复 2023-08-29 16:46:19 +08:00
4c11d7540d 移除调试代码 2023-08-29 16:35:31 +08:00
b941b855cd 商队继续货物修改 2023-08-29 16:29:48 +08:00
fc8826511e Rtype212 商队到达指定城市 2023-08-29 15:46:22 +08:00
338607d7ce 赛季结束 清理商队背包数据 2023-08-29 15:38:45 +08:00
f9b652e280 进度邮件奖励 2023-08-30 01:19:02 +08:00
7e0a0f6641 商队等级奖励改发邮件 2023-08-30 00:24:10 +08:00
8cb9c0f847 第一次创建商队数据 就进行货物刷新 2023-08-30 00:16:08 +08:00
abdc8180ee 商队修改 2023-08-29 14:03:26 +08:00
0d29fc9327 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 10:43:19 +08:00
74c239a721 英雄接口扩展 2023-08-29 10:43:15 +08:00
liwei1dao
0c427a29bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 10:14:14 +08:00
liwei1dao
10461d3d02 上传分享数据补充 2023-08-29 10:14:09 +08:00
f64ffa6b30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 19:42:59 +08:00
ba260707ad AI英雄养成相关 2023-08-28 19:42:55 +08:00
liwei1dao
c206675c48 上传开服活动和累充活动bug 2023-08-28 16:53:34 +08:00
liwei1dao
c3ee1c11cd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 16:12:34 +08:00
liwei1dao
635e82d3d1 上传竞技场段位查找 2023-08-28 16:12:30 +08:00
76bce0d76d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 15:26:17 +08:00
7ecade27a6 英雄养成 2023-08-28 15:26:14 +08:00
liwei1dao
ad3b7b61a2 上传机器人代码 2023-08-28 15:08:02 +08:00
1acf6eafe7 update 2023-08-28 14:17:05 +08:00
1b15516ac3 机器人回响判断 2023-08-28 14:08:27 +08:00
cdc0afecc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 13:49:54 +08:00
9a25a35d78 获取回响信息 2023-08-28 13:49:51 +08:00
liwei1dao
487b691df1 上传机器人 2023-08-28 13:47:05 +08:00
ee20a2db32 check 该英雄天赋满级 2023-08-28 11:40:47 +08:00