Commit Graph

4911 Commits

Author SHA1 Message Date
4cd798dca8 大转盘消耗 读价格组 消耗校验 2023-08-07 17:29:17 +08:00
02bc489cd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:42:34 +08:00
7849ef513b 大转盘 返回当前获得奖励的id 2023-08-07 16:42:29 +08:00
599399e11e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:31:41 +08:00
59cbc7eb8b 上传周长任务限制 2023-08-07 16:31:39 +08:00
163317542a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:31:11 +08:00
a065967370 活动领取奖励数据校验 2023-08-07 16:31:07 +08:00
0012758f06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:28:18 +08:00
f73939d0c6 上传周长任务代码 2023-08-07 16:28:13 +08:00
ed86c3b6ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 14:30:27 +08:00
48ad5eeb80 大转盘活动领取校验 2023-08-07 14:30:23 +08:00
efc62cab6e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 09:52:23 +08:00
c51e726398 上传剧情活动类型定义 2023-08-07 09:52:16 +08:00
d8221d1ce9 商队随机事件触发概率问题 2023-08-04 22:12:26 +08:00
5d555698ab 初始门票 2023-08-04 20:34:26 +08:00
297fbdfca6 存储城市刷新时间 2023-08-04 19:12:34 +08:00
a8d8194605 商队修改 2023-08-04 18:46:50 +08:00
781911205e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 17:07:17 +08:00
93b40d4b98 新增工会等级解锁条件 2023-08-04 17:07:14 +08:00
a464b5dbf1 上传竞技场 2023-08-04 16:55:01 +08:00
ace966196f 上传竞技场挑战卷 2023-08-04 16:43:34 +08:00
ed181eea96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 16:30:49 +08:00
13fd75e2e9 上传竞技场代码 2023-08-04 16:30:47 +08:00
073f13b76d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 15:54:32 +08:00
3023f1b107 好感动计算调整 2023-08-04 15:54:28 +08:00
bf5a489cb3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 15:41:02 +08:00
5d67a41e80 上传配置 2023-08-04 15:28:05 +08:00
990d3eafc8 庆典活动数据变化贴推送 2023-08-04 14:47:52 +08:00
e7959048eb 开服庆典活动 2023-08-04 11:43:25 +08:00
a8158f0d1d 转盘活动结束 邮件补发 2023-08-03 18:22:33 +08:00
7eaf52a795 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 18:01:54 +08:00
13ad24eecc 转盘活动结束 抽奖卷转换成其他道具 2023-08-03 18:00:57 +08:00
0b8f65dd3c 上传购物中心添加首充礼包 2023-08-03 17:54:14 +08:00
29a423ae74 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 17:21:57 +08:00
3fc5f15cc9 上传累充积分添加 2023-08-03 17:21:23 +08:00
f9d898d604 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 16:23:31 +08:00
3967a950c1 商队需求改动 2023-08-03 16:23:11 +08:00
a66d962b18 上传日常任务修复 2023-08-03 16:19:22 +08:00
4c3a0f2a88 上传活动指南代码 2023-08-03 11:27:44 +08:00
cf58b1901a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 10:39:43 +08:00
98e903573e 上传红点任务 2023-08-03 10:39:40 +08:00
a8b6ffd38d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 18:54:12 +08:00
2107b54b65 商队结算积分超出部分转其他道具 2023-08-02 18:54:09 +08:00
5dbabf4432 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 18:45:12 +08:00
a8b90eecac 上传红点需求 2023-08-02 18:45:09 +08:00
6f09e9996f 阵营塔红点返回进度信息 2023-08-02 18:18:05 +08:00
be0037cd3b 功能开启主线校验 2023-08-02 18:03:26 +08:00
35b050eb2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 17:39:30 +08:00
44201e1d47 功能开启 主线关卡校验 2023-08-02 17:39:27 +08:00
7d521d84fa 上传日志输出代码 2023-08-02 17:29:47 +08:00
7b1b393922 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 17:11:28 +08:00
2ee68b9822 上传购物中心代码 2023-08-02 17:11:26 +08:00
f624b4caf3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 16:57:59 +08:00
6849c04075 大转盘 2023-08-02 16:57:56 +08:00
d44d6069a9 上传支付系统代码 2023-08-02 16:43:40 +08:00
c38b63a7c6 上传活动接口通知 2023-08-02 16:29:03 +08:00
27908f10f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 16:26:31 +08:00
bf8bd075ac 上传代码 2023-08-02 16:18:53 +08:00
a1f533fa45 红点::29101 种族塔 今日剩余可挑战关卡 2023-08-02 15:36:21 +08:00
420d583445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 15:09:23 +08:00
40c22784b2 活动改造 2023-08-02 15:08:37 +08:00
cafc95a48b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 15:03:46 +08:00
cc022d0ac2 上传代码 2023-08-02 15:03:27 +08:00
7fce25f60e 暂存 2023-08-02 11:45:02 +08:00
29ef73838e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 09:31:13 +08:00
2cb0595452 update 2023-08-02 09:31:10 +08:00
48160400dc 上传开服任务和守护者任务 2023-08-01 17:58:14 +08:00
3cc286864b 商队 取小道消息数据bug 2023-08-01 17:22:01 +08:00
6a6219805e 活动领奖 2023-08-01 15:47:15 +08:00
5b1a020ffa 上传红点进度信息 2023-08-01 13:56:24 +08:00
75d72cd542 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-01 13:45:51 +08:00
37dc040fbe 上传红点进度信息 2023-08-01 13:45:49 +08:00
58dad82fe0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-01 13:45:15 +08:00
26dda9b8b1 活动数据接口 2023-08-01 13:45:13 +08:00
09d202d65d 上传红点信息 2023-08-01 13:40:00 +08:00
32433c9c25 上传红点处理 2023-08-01 11:36:06 +08:00
ef949f0107 上传活动统一接口 2023-07-31 17:38:03 +08:00
3d2c87b003 活动分类 2023-07-31 17:20:11 +08:00
6b093203f3 活动礼包 2023-07-31 17:13:58 +08:00
db2ca38d15 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 17:11:03 +08:00
6cbe07efed 活动通知 2023-07-31 17:11:00 +08:00
7c23eab670 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 16:10:33 +08:00
04b132ce7d 添加复合任务埋点 2023-07-31 16:10:31 +08:00
47d28b4227 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 15:57:11 +08:00
9b6b139483 石阵秘境守护者挂了的数据记录 2023-07-31 15:57:07 +08:00
68fe09c637 上传战斗代码 2023-07-31 15:53:00 +08:00
d764899b85 上传复合调查的协议修复 2023-07-31 15:40:15 +08:00
285e99acc4 保底次数修复 2023-07-31 09:45:51 +08:00
d08d6482a1 石阵秘境血量继承 2023-07-28 22:08:56 +08:00
9a2a02b9dc BattleRole tid 赋值问题 2023-07-28 20:06:47 +08:00
0608014645 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 19:36:28 +08:00
4d51ce4327 战斗传参优化 2023-07-28 19:36:25 +08:00
6dd06f6ed8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 18:22:58 +08:00
e71e47992d 上传代码 2023-07-28 18:22:56 +08:00
855f59a462 空数据过滤 2023-07-28 18:14:13 +08:00
78a28de946 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 17:43:09 +08:00
a1d5836ef1 GM 循环塔跳关 2023-07-28 17:43:05 +08:00
8ee7621236 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 16:52:51 +08:00
88ecdc1fd0 上传每日任务消息推送 2023-07-28 16:52:48 +08:00
1046349550 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 16:08:34 +08:00
fd5c8d73c5 觉醒 pro 属性 2023-07-28 16:08:31 +08:00
c088678d72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 15:51:43 +08:00
336c757bba 上传主线奖励代码 2023-07-28 15:51:41 +08:00
4502137617 觉醒属性配置更改 2023-07-28 15:48:27 +08:00
78b0d60e70 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 15:35:21 +08:00
7b24313cc8 秘境环境buff 带入 2023-07-28 15:32:39 +08:00
1b06e0af29 上传复合调查任务相关 2023-07-28 15:30:48 +08:00
c852f93d64 上传战斗协议 2023-07-28 14:19:52 +08:00
8c8c670279 上传战斗代码 2023-07-28 14:13:12 +08:00
f5a8908f13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 14:10:47 +08:00
9507b8ceaa 上传代码 2023-07-28 12:00:30 +08:00
e78d2590e5 float64 类型转换 2023-07-28 11:50:01 +08:00
41b33e1e86 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 11:35:28 +08:00
b7c529d7c5 秘境战斗相关 2023-07-28 11:35:24 +08:00
8245bed3d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 11:09:33 +08:00
8555b46bcb 上传配置信息 2023-07-28 11:09:29 +08:00
5edbb5c709 战斗事件合并 2023-07-28 10:45:20 +08:00
9d025545f4 战斗结束 发送英雄信息 2023-07-28 09:54:33 +08:00
489d327b54 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 09:45:34 +08:00
9c1ac0abee 英雄血量继承 2023-07-28 09:45:31 +08:00
b3fa33eb10 上传主线代码 2023-07-28 09:44:22 +08:00
0611e6bbc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 09:41:35 +08:00
afecad234c 上传主线代码 2023-07-28 09:41:30 +08:00
91f8df9c0c boss 事件处理 2023-07-27 21:05:12 +08:00
6854378d3b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 20:19:31 +08:00
6f09a394fe buff 三选一 2023-07-27 20:19:28 +08:00
84a1152895 上传武馆修复 2023-07-27 20:16:41 +08:00
5f29818bea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 20:00:37 +08:00
57d52b1fd3 上传代码 2023-07-27 20:00:35 +08:00
317f374799 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 19:09:32 +08:00
4956cc6c9c update 2023-07-27 19:09:29 +08:00
749b210ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 19:09:25 +08:00
c20b66c5cc 上传代码 2023-07-27 19:09:23 +08:00
3cf137827f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:54:26 +08:00
020c01e9c5 update 2023-07-27 18:54:23 +08:00
32d328121b 上传主线代码 2023-07-27 18:39:29 +08:00
6449aa7fdd 上传代码 2023-07-27 18:21:37 +08:00
2acec819af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:08:04 +08:00
9abc06944c 上传兑换任务 2023-07-27 18:08:02 +08:00
79bc9c48a2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:02:07 +08:00
3371001d4c 战斗事件处理 2023-07-27 18:02:01 +08:00
2b138edc69 上传代码 2023-07-27 17:50:51 +08:00
6c99d9da7b 战斗事件校验 校验传送门开启后 触发新的事件导致传送门又关闭 2023-07-27 17:15:24 +08:00
2f3dc0aaa8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 17:04:40 +08:00
3c836e6756 调试bug 2023-07-27 17:04:36 +08:00
cb09010997 上传配置同步代码 2023-07-27 17:02:26 +08:00
0f85389b6e 上传协议 2023-07-27 16:39:24 +08:00
f9fefeaba5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 16:18:33 +08:00
95d906e734 上传战斗同步 2023-07-27 16:18:31 +08:00
e170526f75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 16:10:29 +08:00
c6a52059cb 战斗英雄信息+ 事件校验 2023-07-27 16:10:25 +08:00
a05d0c235f 上传世界任务变化 2023-07-27 15:57:34 +08:00
b83c20ac3c 上传宝箱兑换 2023-07-27 15:51:27 +08:00
a1e7da023d 校验完成事件后导致开启的传送门又关闭了 2023-07-27 15:50:42 +08:00
bc56a6c3ea 上传配置 2023-07-27 15:21:19 +08:00
cc24f33eac 上传任务宝箱领取代码 2023-07-27 15:12:07 +08:00
9d100dbfdb 上传工会消息转发配置 2023-07-27 14:48:30 +08:00
bedef819fe 打印未找到道具配置错误信息 2023-07-27 14:11:38 +08:00
ea907b1764 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 13:57:02 +08:00
bf169a3334 上传代码 2023-07-27 13:56:59 +08:00
9d76abac5e stageid 赋值 2023-07-27 12:01:25 +08:00
6d142ceac4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 11:56:01 +08:00
0daedcbfa7 秘境优化 2023-07-27 11:55:57 +08:00
c0be6359fe 上传主线修复 2023-07-27 11:51:33 +08:00
12d495ef7d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 11:44:32 +08:00
deb7fcc0c4 上传工会boos战代码 2023-07-27 11:44:29 +08:00
dd06dbf02b 报错 2023-07-27 11:23:56 +08:00
696085bb7c 石阵秘境结算rpc 通知 2023-07-27 11:15:05 +08:00
b9b920c844 优化 2023-07-27 11:02:40 +08:00
2c41019dea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 10:15:09 +08:00
aa549856c3 推送关卡boss 房间数据类型调整 2023-07-27 10:14:50 +08:00
fbdc11490b 上传清理排行榜 2023-07-27 10:10:15 +08:00
15a10c074d 上传工会排名数据 2023-07-27 10:08:41 +08:00
5b1085cd04 上传日常任务代码 2023-07-26 22:02:21 +08:00
df522d05f7 上传宝箱入库 2023-07-26 21:02:07 +08:00
f8196891e5 上传配置 2023-07-26 20:54:31 +08:00
deee1f3f15 上传主线和任务相关 2023-07-26 20:50:43 +08:00
22bf7e969c 上传日常任务 2023-07-26 20:39:04 +08:00
2bf552053d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 20:18:24 +08:00
f7329410d7 全服boss 数据生成 2023-07-26 20:18:20 +08:00
12f5f89dea 上传代码 2023-07-26 20:11:09 +08:00
d2cdc79341 命名问题 2023-07-26 19:51:37 +08:00
c3e87890bc update 2023-07-26 19:45:38 +08:00
7afd084cde update 2023-07-26 19:42:48 +08:00
085ffa0b4b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 19:17:15 +08:00
15ebfe8094 上传代码 2023-07-26 19:16:27 +08:00
ef433418d3 战斗事件处理 2023-07-26 19:07:46 +08:00
f3e53499d5 上传主线 2023-07-26 18:48:24 +08:00
50a72efde9 上传宝箱初始化 2023-07-26 17:40:07 +08:00
59e5ad1371 上传世界任务宝箱协议 2023-07-26 17:36:28 +08:00
66ede35f5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 17:04:47 +08:00
cbaeb72171 上传宝箱代码 2023-07-26 17:04:44 +08:00
5574d2affb 石阵数据生成 2023-07-26 16:55:08 +08:00
362d6a72d7 上传世界任务接口同步 2023-07-26 16:48:54 +08:00
419f07ac65 通关条件校验 2023-07-26 15:44:23 +08:00
4c816beaff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 15:42:05 +08:00
edc0ecf7e9 随机我方、敌方buff 2023-07-26 15:42:01 +08:00
47b5bf4c3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 15:15:34 +08:00
b2cb400165 上传工会战斗排名 2023-07-26 15:15:32 +08:00
fa0acb2647 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 14:44:09 +08:00