Commit Graph

4911 Commits

Author SHA1 Message Date
e7e6b6864e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:30:33 +08:00
7a64f0a2a4 上传战令代码 2023-08-09 15:30:31 +08:00
9408a2acfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:17:48 +08:00
2dc5cad9c8 小游戏数据记录问题修复 2023-08-09 15:17:44 +08:00
b63eae8242 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:13:31 +08:00
6bd3a03139 上传战令代码 2023-08-09 15:13:28 +08:00
f6df32fd27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 11:59:46 +08:00
f428579e2a 消耗体力转换活动道具 2023-08-09 11:59:43 +08:00
e82c67e8cd 每日消耗体力转换成活动道具 2023-08-09 11:59:27 +08:00
19cf3de8bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 11:28:38 +08:00
65f23c5973 上传累充一键领取 2023-08-09 11:28:34 +08:00
8040b0df25 迷宫小游戏领奖校验 2023-08-09 10:50:19 +08:00
50a7845250 迷宫小游戏 2023-08-09 10:04:56 +08:00
12adac2095 活动优化 2023-08-08 21:42:48 +08:00
40f4650305 拼图领取进度奖励 2023-08-08 20:52:11 +08:00
68ae59e874 迷宫小游戏 2023-08-08 20:39:51 +08:00
a311fe9572 推送 2023-08-08 20:12:37 +08:00
6a45e51aea 活动变更推送 2023-08-08 19:49:16 +08:00
76f3f39a6c update 2023-08-08 19:00:15 +08:00
8a310420c5 活动bug 2023-08-08 18:40:18 +08:00
eb5ed69bb6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 18:20:26 +08:00
25908393bf 拼图小游戏活动 2023-08-08 18:20:22 +08:00
b6e52bc0c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 18:10:38 +08:00
958191d92f 上传活动列表 2023-08-08 18:10:35 +08:00
64e3110284 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 17:11:04 +08:00
3d765a2486 统计每日体力消耗 2023-08-08 17:11:00 +08:00
45b4198b2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 16:42:29 +08:00
248bfe49c9 上传代码 2023-08-08 16:42:27 +08:00
f30a450339 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 15:49:56 +08:00
6a20b847de 小游戏活动 2023-08-08 15:49:52 +08:00
8a4e1f8dcd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 15:43:26 +08:00
5d2edfd33b 上传剧情活动代码 2023-08-08 15:43:24 +08:00
ba4a095fff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 14:27:32 +08:00
5c6f49ad1f 活动优化 2023-08-08 14:27:29 +08:00
99b42be702 上传购物中心 2023-08-08 14:25:19 +08:00
2dd77e7b20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 13:44:32 +08:00
552841d0f0 上传购物中心 2023-08-08 13:44:30 +08:00
ad79b477e6 庆典活动 2023-08-08 12:51:14 +08:00
eb835f6ae7 解析报错 2023-08-08 12:03:58 +08:00
675cd2525d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 11:53:21 +08:00
d2d710e6c8 登录事件 2023-08-08 11:47:32 +08:00
942253c7e1 上传购物中心优化 2023-08-08 11:44:44 +08:00
2a7ea6dd84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 10:21:03 +08:00
bdef99be51 活动枚举 2023-08-08 10:20:59 +08:00
1e557ed2ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 10:15:12 +08:00
cec5bec0fc 上传商店中心 2023-08-08 10:15:07 +08:00
f017ac5e8d 奖励推送 2023-08-08 10:05:00 +08:00
a71bf2b3ee 活动类型枚举 2023-08-08 09:56:37 +08:00
99c99f0483 转盘获得奖励的数据 2023-08-07 19:32:56 +08:00
216d131096 转盘校验 2023-08-07 18:19:13 +08:00
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