Commit Graph

2406 Commits

Author SHA1 Message Date
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
dcbc9b5490 vip 特权 额外增加购买次数 2022-12-21 20:08:56 +08:00
796b23899e 同步代码 2022-12-21 19:42:35 +08:00
liwei1dao
4563606628 武馆需求开发 2022-12-21 10:49:46 +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
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
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
b82bcbaf5e 图鉴 2022-12-20 17:08:49 +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
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
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
liwei1dao
e0c9a544d3 上传世界任务奖励推送 2022-12-19 17:43:32 +08:00
liwei1dao
6ec77156c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:42:12 +08:00
liwei1dao
121dc36216 上传新作图升级代码优化 2022-12-19 16:41:53 +08:00
1532308e51 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:36:56 +08:00
liwei1dao
f89177185e 补充提交代码 2022-12-19 16:29:36 +08:00
liwei1dao
e16a8a971c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:25:38 +08:00
liwei1dao
a499d81135 同步优化日志代码 2022-12-19 16:25:22 +08:00
0e6057ff33 boss 类型修改 2022-12-19 16:20:43 +08:00
20e0f6e0ee 协议字段修改 2022-12-19 16:20:28 +08:00
zhaocy
7b97e81b28 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 15:23:32 +08:00
zhaocy
c9e30f24a0 任务数据状态更新 2022-12-19 15:23:28 +08:00
b45152c2f8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 14:54:06 +08:00
c917a96ced 附魔同步 2022-12-19 14:47:38 +08:00
08dfb99e03 附魔boss 字段修改 2022-12-19 11:12:52 +08:00
liwei1dao
44002c8052 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 10:30:41 +08:00
liwei1dao
c89ad0d2e4 优化广播消息接口 2022-12-19 10:30:30 +08:00
zhaocy
58721927ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 10:25:26 +08:00
zhaocy
ec3b98d6f9 Merge branch '优化任务' into dev 2022-12-19 10:24:12 +08:00
4893f8496b 阵营boss 2022-12-19 10:20:08 +08:00
zhaocy
9acb59b119 任务优化提交 2022-12-19 10:13:12 +08:00
liwei
73b894f1b0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-16 21:43:31 +08:00
840aae0caf update 2022-12-16 18:40:12 +08:00
7c08f2e1bc 优化 2022-12-16 16:39:15 +08:00
f1b4b58460 每日奖励优化 2022-12-16 14:32:29 +08:00
35b11e7247 提交修改 2022-12-16 11:54:09 +08:00
7cfe55f66b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-16 11:31:28 +08:00
liwei1dao
b1be9966dc 上传错误日志优化 2022-12-16 09:51:58 +08:00
f1daed8f9a 月之秘籍返回 2022-12-15 19:16:46 +08:00
liwei1dao
5abc58590e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 18:34:07 +08:00
liwei1dao
b25d0223a9 gm 返回错误码处理 2022-12-15 18:34:03 +08:00
6ea3027c03 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 18:16:43 +08:00
dd5ca57457 特权 vip奖励补发 2022-12-15 18:16:01 +08:00
liwei1dao
9214c2e63e 上传主线和世界任务 触发升级和英雄招募代码 2022-12-15 16:37:52 +08:00
4ecb3bff6c vip每日邮件奖励 2022-12-15 16:23:59 +08:00
liwei1dao
cd13fbc6bf 优化错误日志 2022-12-15 15:33:05 +08:00
liwei1dao
31282c5e18 优化服务错误日志输出 2022-12-15 15:16:34 +08:00
liwei1dao
f63d5d4b72 上传 装备穿戴属性计算错误问题 2022-12-15 15:07:41 +08:00
26262164cd 邮件红点默认值 2022-12-15 14:34:24 +08:00
liwei1dao
0bf03f4d44 上传索引代码 2022-12-15 14:08:01 +08:00
liwei1dao
39d46f3a01 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 14:03:21 +08:00
liwei1dao
cd0c174fff 上传索引错误返回 2022-12-15 14:03:06 +08:00
d1a176cfcf 记录所有首次获的英雄的数据 2022-12-15 14:00:40 +08:00
266520c5a0 记录所有获得的英雄 2022-12-15 14:00:14 +08:00
bf35dce1b2 检查是否是新获得的英雄 2022-12-15 11:36:21 +08:00
b94962d80c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 19:51:39 +08:00
6680f9041a 玩家属性优化+bug 2022-12-14 19:51:23 +08:00
aabd7bacd8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 19:24:06 +08:00
5270f706d3 好友审核修复 2022-12-14 19:24:00 +08:00
16624faeb1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 17:14:36 +08:00
f9f521c6f9 优化特权存储时机+ 过滤 2022-12-14 17:13:21 +08:00
b5954efc8f 修改新用户 2022-12-14 16:17:22 +08:00
11fd4ceb56 特权类型定义 登录补发奖励 2022-12-14 15:14:58 +08:00
67385797e5 vip 特权 2022-12-14 14:27:39 +08:00
36b208f82c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 19:53:37 +08:00
cca6e26626 添加vip信息 2022-12-13 19:50:14 +08:00
liwei1dao
bb449d6cb9 上传战斗对接 2022-12-13 19:26:34 +08:00
d318cdf003 vip 宝箱 2022-12-13 18:26:54 +08:00
36019083b4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 17:16:54 +08:00
b79f3ceeb1 vip等级change 2022-12-13 17:16:33 +08:00
liwei1dao
07b493bfb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 15:06:06 +08:00
liwei1dao
84a846e553 上传战斗测试程序 2022-12-13 15:05:56 +08:00
18b4b318ed 相同资源整合一起 2022-12-13 14:32:23 +08:00
37d7998748 通行证协议修改 2022-12-13 11:59:54 +08:00
dc6a8900cf 优化 2022-12-13 11:45:43 +08:00
29ba901ecb 赛季塔类型修改 2022-12-13 11:17:21 +08:00
02d45f08ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 11:04:52 +08:00
1fd0326701 bingo 直接创建赛季塔数据 2022-12-13 11:04:49 +08:00
liwei1dao
0490d643aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-12 19:49:03 +08:00
liwei1dao
b7667d74ac 上传战斗服务连接消息读取 2022-12-12 19:48:54 +08:00
f829d113d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-12 19:48:21 +08:00
9cb105d75a 错误监听 2022-12-12 19:47:39 +08:00
liwei1dao
6eb1de7b26 上传战斗远程校验 2022-12-12 17:40:55 +08:00
b50c0bfee2 邮件签名 2022-12-12 11:27:53 +08:00
0cf03224a5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-09 22:08:11 +08:00
0618111487 远征购买挑战失败 2022-12-09 22:08:07 +08:00
b1bdde2db9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-09 18:59:41 +08:00
6b33d3704b 英雄优化 2022-12-09 18:59:35 +08:00
b798c860ad 挂机设置 2022-12-09 15:53:29 +08:00
cf44aa9542 rpc 错误日志输出 2022-12-09 10:10:36 +08:00
liwei1dao
8f211c4ee7 月之秘境接口优化 2022-12-09 10:00:57 +08:00
a44595ce31 bingo:成长任务 2022-12-08 19:12:15 +08:00
838ef9e2de 更新世界任务bingo 2022-12-08 18:27:08 +08:00
9223e1648f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-08 18:22:10 +08:00
e86c8baced web 发邮件 worker 通知玩家 2022-12-08 18:19:29 +08:00
a563e3d6e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-08 18:07:56 +08:00
ad17f4a7b8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/gm/module.go
2022-12-08 18:07:24 +08:00
liwei1dao
257860e5f5 上传跨服服务列表同步接口 2022-12-08 18:05:39 +08:00
bb01b9059f 更新bingo世界任务 2022-12-08 18:05:29 +08:00
1829a454fb 更新公会bingo 2022-12-08 18:05:00 +08:00
liwei1dao
23f193ee19 上传项目api文档 2022-12-08 16:48:21 +08:00
d736c7f77d 异常消息监听 2022-12-08 15:51:07 +08:00
a6b30ad1f2 工具优化 2022-12-07 19:19:54 +08:00
158ea726cf web 邮件接口 2022-12-07 11:40:41 +08:00
b7ad761d96 跳过主线优化 2022-12-07 11:06:13 +08:00
d7bfd49267 属性重计算,推送优化 2022-12-07 10:29:06 +08:00
ba4b108a6d bingo 入口 2022-12-07 10:03:25 +08:00
b00fd416f9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-06 19:22:59 +08:00
036b502898 添加章节数据 2022-12-06 19:22:45 +08:00
c5a95372e3 主线跳转 2022-12-06 19:18:03 +08:00
f9b191f173 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-06 18:01:55 +08:00
0d1e3b6284 世界任务bingo接口 2022-12-06 18:01:35 +08:00
65e59a478f 公会bingo接口 2022-12-06 18:01:23 +08:00
608b996728 维京远征设置boss 难度 2022-12-06 17:15:50 +08:00
70f7ab66bd bingo 赛季塔层数 2022-12-06 16:56:30 +08:00
222a70f553 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-06 16:34:23 +08:00
1bcf341af0 获取满级满星满觉醒满共鸣英雄 2022-12-06 16:34:00 +08:00
liwei1dao
7cca06d548 上传月之秘境触发接口 2022-12-06 16:22:10 +08:00
liwei1dao
7801e5c6da 上传竞技场修改积分接口 2022-12-06 15:56:44 +08:00
71875d7312 优化 2022-12-05 16:09:13 +08:00
dece4b19b2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-05 15:18:54 +08:00
bf49318e8d tsak 创建索引 2022-12-05 15:18:38 +08:00
3f5c8b6277 优化任务条件 2022-12-05 11:36:39 +08:00
683913f1aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-05 10:23:29 +08:00
8323ea13ca 移除丢弃的任务条件api和配置 2022-12-05 10:23:21 +08:00
7ec319f40d 数据库加索引 2022-12-05 10:04:48 +08:00
282f3eb1bb update 2022-12-05 08:41:05 +08:00
79a6e8aab7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-02 18:06:32 +08:00
0005a425f5 压测工具输出优化 2022-12-02 18:06:04 +08:00
71fdd8d94f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-02 15:19:20 +08:00
86debd451d 更改资源变化推送顺序 2022-12-02 15:19:13 +08:00
liwei1dao
d6fb8d43c9 调整装备洗练的消耗 2022-12-02 14:25:27 +08:00
d6f686a033 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-02 11:14:13 +08:00
ac7fb4642f 购买挑战卷消耗 2022-12-02 11:13:56 +08:00
liwei1dao
cad863345a 上传进机场币 2022-12-02 11:04:00 +08:00
liwei1dao
aae164bec7 上传竞技场币 2022-12-02 10:57:14 +08:00
23d44b7c00 商店购买打折 2022-12-02 10:26:59 +08:00
1045cca0f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-02 10:07:32 +08:00
5a91f4c70d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-02 10:07:13 +08:00
13bc630296 每日登录邮件只发一次
新增一键删除邮件
2022-12-02 10:07:07 +08:00
a2b0a2505a 更改玩家经验变更算法 2022-12-01 23:35:11 +08:00
445c01521d 红点入口 2022-12-01 19:18:16 +08:00
7f7f264c65 新增远征狩猎红点 2022-12-01 17:34:45 +08:00
c94006ca72 参考拷贝 2022-12-01 14:39:51 +08:00
cfc5d4f396 消耗的资源数正数处理 2022-12-01 14:39:34 +08:00
2c12e6ae26 修复任务条件初始问题 2022-12-01 12:00:08 +08:00
e7c1747751 加日志 2022-12-01 10:43:56 +08:00
16bbe28782 英雄扩展数据记录 2022-12-01 09:43:15 +08:00
7b072c8a09 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-30 19:01:55 +08:00
d3a18884b8 羁绊激活 2022-11-30 19:01:39 +08:00
liwei1dao
e0240c9864 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-30 16:32:00 +08:00
liwei1dao
373a3d2e6e 上传武官协议优化 2022-11-30 16:31:47 +08:00
73ab7486cf 购买返回已购买次数 2022-11-30 13:57:15 +08:00
ea4c8e16fe 推送消息 2022-11-30 13:48:42 +08:00
8eaaece554 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-30 12:21:42 +08:00
3cfefbf017 商店购买配置优化 2022-11-30 12:21:37 +08:00
2f56e52060 当天购买抽卡券次数 2022-11-30 11:44:17 +08:00
36fbe0b647 update 2022-11-30 11:27:38 +08:00
18242a0876 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-30 10:56:13 +08:00
165b7fcf62 激活时重新计算一下羁绊等级 2022-11-30 10:55:46 +08:00
liwei1dao
bfaf7ea954 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-29 21:03:39 +08:00
liwei1dao
86699bfdba 上传配置文件 2022-11-29 21:03:26 +08:00
a3499ec9cc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-29 20:18:18 +08:00
liwei1dao
375017fcc0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-29 19:01:32 +08:00
liwei1dao
18e8b1968a 修复月子秘境战斗异常问题 2022-11-29 19:01:28 +08:00
58bcc8c15d 战斗胜利 2022-11-29 16:28:03 +08:00
86aaa10e1e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-29 15:38:09 +08:00
825c17ba61 发送难度 2022-11-29 15:37:47 +08:00
9aebfd27f5 更新任务类型 2022-11-29 11:37:19 +08:00
d4b2bb13f5 waring处理 2022-11-29 11:19:57 +08:00
ddde857f8b 狩猎购买挑战卷 2022-11-29 11:15:02 +08:00
809d5d2dc5 恢复时间计算 2022-11-28 21:28:37 +08:00
0e539068ae 狩猎挑战次数 2022-11-28 21:05:49 +08:00
ab819cec6a 数据校验 2022-11-28 19:56:16 +08:00
ac247bc78b 数据校验 2022-11-28 19:56:09 +08:00
20293241e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-28 19:08:45 +08:00
9c990f0e38 挑战次数变更道具类型 2022-11-28 19:08:21 +08:00