Commit Graph

2502 Commits

Author SHA1 Message Date
liwei1dao
37c52e4f09 竞技场特权添加 2023-01-04 10:25:39 +08:00
ab88daadd0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 10:14:09 +08:00
41e61dd3a5 跨服调用获取特权接口处理 2023-01-04 10:12:43 +08:00
09fb6e67ed 战斗失败战报数据为空 由下层判断输赢 2023-01-04 09:58:12 +08:00
liwei1dao
74b6289258 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 09:57:31 +08:00
liwei1dao
ce91c0a426 上传 战报校验优化 2023-01-04 09:57:24 +08:00
dd5879ff88 指针判空 2023-01-03 18:24:18 +08:00
d89de8a808 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 18:15:39 +08:00
b6526455e9 维京排行优化 2023-01-03 18:15:10 +08:00
7cb0c5afbb 修改协议名 2023-01-03 18:06:12 +08:00
f080a2fa2b 战斗失败处理 2023-01-03 16:44:04 +08:00
0eb8fa425d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-01-03 16:27:35 +08:00
liwei1dao
7e8ad9a4b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 16:15:19 +08:00
liwei1dao
8d4d789f8c 上传批量出售接口 2023-01-03 16:15:07 +08:00
6d7545c8c7 更新初始值 2023-01-03 16:03:10 +08:00
cb9eee35b3 保底逻辑优化 2023-01-03 15:30:41 +08:00
01166edda0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 14:56:05 +08:00
c36437dad9 抽卡优化+维京返还战斗场景信息 2023-01-03 14:55:38 +08:00
liwei1dao
85f6fc5c61 上传体力协议优化 2023-01-03 14:44:55 +08:00
liwei1dao
d1bd0b4669 上传boos 战 2023-01-03 14:39:32 +08:00
3550d7e382 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 14:05:59 +08:00
7f2db5b932 支线任务优化 2023-01-03 14:05:53 +08:00
501f7e3d0c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 10:46:12 +08:00
0077b2fdd5 新增抽卡规则 + 抽卡优化 2022-12-31 19:19:17 +08:00
36c72fafb2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-31 14:56:59 +08:00
ea8007afa0 优化体力自然恢复 2022-12-31 14:56:50 +08:00
53af65a711 战斗开始体力预扣 2022-12-31 14:08:45 +08:00
e97b35ed32 预扣体力 2022-12-31 11:48:36 +08:00
a9964388cf 体力扣除 2022-12-30 18:24:23 +08:00
f011e8b7e9 任务数据埋点 2022-12-30 16:47:07 +08:00
6e1b5bac73 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 16:41:30 +08:00
591b39ea39 英雄模块优化 2022-12-30 16:40:16 +08:00
66f2225b84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 16:36:34 +08:00
5148608d78 支线任务去除锁定约束 2022-12-30 16:36:27 +08:00
liwei1dao
b7ec9ffd24 上传装备模块错误日志补全 2022-12-30 16:34:07 +08:00
829bd9c6fb 自动购买门票 2022-12-30 15:59:19 +08:00
da9fbe2622 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-30 15:23:46 +08:00
liwei1dao
4649797bad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 15:22:29 +08:00
liwei1dao
0438dd9bfb 上传体力购买上限报错处理 2022-12-30 15:22:19 +08:00
aec58a4c2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 15:19:53 +08:00
868edf1e8b session清理优化 2022-12-30 15:13:45 +08:00
d695df321b 星阵图属性计算 2022-12-30 15:10:32 +08:00
liwei1dao
d400023dab 上传套装属性调整 2022-12-30 14:42:50 +08:00
liwei1dao
33b347c305 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 14:03:57 +08:00
liwei1dao
bda90f33cc 上传道具分解接口处理 2022-12-30 14:03:36 +08:00
9a54411eb1 战斗校验 2022-12-30 10:16:13 +08:00
ddb9064f14 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:45:56 +08:00
fd6936fbf4 战斗结束 统计英雄实际获得的经验 2022-12-29 18:44:51 +08:00
liwei1dao
8c7d4d0738 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:36:25 +08:00
be605efc8f 修改命名 2022-12-29 18:29:18 +08:00
liwei1dao
78993b940e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:28:19 +08:00
liwei1dao
7cebfcf2ec 上传背包体力药剂购买接口 2022-12-29 18:27:54 +08:00
a53e7785d1 修改体力常量 2022-12-29 18:25:06 +08:00
b2a6df889a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	comm/imodule.go
#	modules/user/module.go
2022-12-29 17:38:49 +08:00
5b0d6168bb 增加体力接口 2022-12-29 17:36:52 +08:00
liwei1dao
2e12e7e149 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 15:46:38 +08:00
liwei1dao
09efad7ccf 上传装备主属性计算修改 2022-12-29 15:46:26 +08:00
2bd06d6c53 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 15:24:33 +08:00
ef12d49cf8 自动出售满足条件的装备 2022-12-29 15:24:09 +08:00
liwei1dao
4801227b2a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 14:36:05 +08:00
liwei1dao
ebca3dd65d 药剂使用 2022-12-29 14:35:54 +08:00
907c65a656 羁绊剧情pb修改 2022-12-29 14:29:48 +08:00
8812fc78c2 修改vip 等级 2022-12-29 12:01:07 +08:00
3303dac51d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 11:55:53 +08:00
b6e490ee17 获取某种类型所有道具(道具类型,数量) 2022-12-29 11:54:48 +08:00
liwei1dao
2f8095616c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 11:43:39 +08:00
liwei1dao
5306b1eb97 上传装备出售接口 2022-12-29 11:43:28 +08:00
22da54b265 update 2022-12-29 10:17:58 +08:00
liwei1dao
9eda74ffbf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 10:06:28 +08:00
622f5eb2d2 玩家体力自然恢复 2022-12-29 10:05:17 +08:00
liwei1dao
040fb3cace Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 09:54:33 +08:00
liwei1dao
a03004b0f2 上传基础属性扩展 2022-12-29 09:54:19 +08:00
2f52223456 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 19:27:11 +08:00
liwei1dao
e06ca2df71 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 19:05:04 +08:00
liwei1dao
80cf3aa8bc 修复竞技场排名列表bug 2022-12-28 19:04:51 +08:00
003aeb8814 发公告 2022-12-28 19:01:21 +08:00
0c60f0d2ac 获取所有装备 2022-12-28 18:50:49 +08:00
d21a7ab716 bingo 命令扩展 清理背包
模拟充值
2022-12-28 18:36:59 +08:00
c81ca67c5f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 18:04:32 +08:00
f9eb2a3fad 参数优化 2022-12-28 18:04:13 +08:00
liwei1dao
1804e830fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 18:01:31 +08:00
liwei1dao
2d34083ae4 上传gm接口 2022-12-28 18:01:15 +08:00
eea7b83101 战斗协议优化 2022-12-28 17:04:54 +08:00
c9b0cbd0af Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 15:55:12 +08:00
58797027fc 主动结束战斗 2022-12-28 15:54:53 +08:00
0122bd44d5 添加访问控制 2022-12-28 15:53:06 +08:00
1717bd5386 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 11:13:14 +08:00
dac702a58a bingo支持改玩家等级 2022-12-28 11:13:06 +08:00
liwei1dao
91a6ed427c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:43:39 +08:00
liwei1dao
9131789b3d 上传竞技场代码 2022-12-28 10:43:25 +08:00
51e84ab1bf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:39:17 +08:00
07774d0c59 首次获得英雄 推送 2022-12-28 10:38:42 +08:00
liwei1dao
3d87c00b77 修复英雄招募秀代码 2022-12-28 10:16:32 +08:00
2bfc1edce5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:09:13 +08:00
263747a760 bingo玩家lv 2022-12-28 10:09:05 +08:00
d3522c6867 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 18:53:23 +08:00
d5a9944172 自动战斗数据清理
获取vip经验bug
2022-12-27 18:52:39 +08:00
a315cf699c 删除丢弃的方法 2022-12-27 17:57:22 +08:00
dc7a055245 删除丢弃的方法 2022-12-27 17:56:49 +08:00
767b546928 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:48:44 +08:00
fa90b01d8a 补充玩家ID 2022-12-27 17:48:20 +08:00
liwei1dao
4ca0a60c4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:42:48 +08:00
liwei1dao
d8b6e8b010 上传功能开启事件触发 2022-12-27 17:42:33 +08:00
d0c65d3334 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:23:32 +08:00
10c021ffb9 自动战斗 2022-12-27 17:23:14 +08:00
55d0ad643b 功能开发事件 2022-12-27 14:39:03 +08:00
aa66fed5dd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 18:37:38 +08:00
7f57b8521a 自动战斗 2022-12-26 18:37:17 +08:00
316487582e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 18:31:05 +08:00
575e3736d5 更新校验 2022-12-26 18:30:59 +08:00
ad027b9c9e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 15:28:48 +08:00
1005882ef5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-26 15:28:33 +08:00
203e75da21 战斗奖励优化 2022-12-26 15:28:31 +08:00
liwei1dao
99edf41362 上传道具资源接口优化 2022-12-26 15:27:57 +08:00
589f438106 更新配置 2022-12-26 14:23:30 +08:00
a1de2bab58 update sign 2022-12-26 09:53:31 +08:00
8cc6973ac2 去掉waring 2022-12-23 19:56:47 +08:00
f0dcc396d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 18:19:17 +08:00
695fe2f607 远征优化 2022-12-23 18:19:00 +08:00
liwei1dao
c3913c609f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 18:17:52 +08:00
liwei1dao
fbaf35260e 上传战斗怪物 数据属性补充 2022-12-23 18:17:36 +08:00
b2484bb1a1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 16:23:02 +08:00
8195cb6a76 狩猎优化 2022-12-23 16:21:15 +08:00
3ae8b17509 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 14:38:21 +08:00
7a0858de04 维京 初始门票数据 2022-12-23 14:36:04 +08:00
liwei1dao
2e101901dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 12:00:11 +08:00
liwei1dao
b1b582023b 上传装备洗练修复 2022-12-23 11:59:55 +08:00
bf0bc7918a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:24:00 +08:00
b3e5c7c2c7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-23 10:23:38 +08:00
0ad475d152 update 2022-12-23 10:23:32 +08:00
liwei1dao
c039753296 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:15:32 +08:00
liwei1dao
fa4d4a1de2 上传代码 2022-12-23 10:15:13 +08:00
eadc099884 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:01:15 +08:00
a00b8b0aaa Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-23 10:00:54 +08:00
59b0671c26 update 2022-12-23 10:00:51 +08:00
6a553f11e8 修复删除元素的问题 2022-12-22 23:56:40 +08:00
9a17f539bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 20:35:41 +08:00
e332986e66 特权额外获得的属性 2022-12-22 20:35:01 +08:00
liwei1dao
c0e41abefc 优化秘境系统 2022-12-22 20:26:30 +08:00
liwei1dao
741ee32061 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 20:19:21 +08:00
liwei1dao
12299736e0 上传支付补充和优化 2022-12-22 20:19:06 +08:00
28c6133a99 接口调整 2022-12-22 18:57:58 +08:00
0b83a213b3 羁绊剧情任务 2022-12-22 17:57:16 +08:00
bb45eff4d5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-22 11:41:38 +08:00
f8b0f03b75 update 2022-12-22 11:41:31 +08:00
784b8a6be0 积分获取bug 2022-12-22 10:34:50 +08:00
89e636f2a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 10:31:50 +08:00
27745d5d83 副本小怪获取 2022-12-22 10:31:44 +08:00
liwei1dao
499fff37b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-21 21:10:06 +08:00
liwei1dao
1a5f02ed31 上传优化代码 2022-12-21 21:09:55 +08:00