Commit Graph

2406 Commits

Author SHA1 Message Date
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
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