Commit Graph

1635 Commits

Author SHA1 Message Date
by e58eb4d672 兑换创建订单增加telcharge字段 2024-05-15 10:12:41 +08:00
by 40263b3621 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-14 17:49:23 +08:00
by b0ba8e31ff 商城兑换修改 2024-05-14 17:49:18 +08:00
kxdd d6ce3816f4 Merge branch 'dev_pigbank_n1' into develop 2024-05-14 17:21:30 +08:00
kxdd 1f3133be78 存钱罐配置修改 2024-05-14 17:20:45 +08:00
sk 3e229a4bc9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-14 11:45:46 +08:00
by 756ed06016 比赛log保存数据库修改 2024-05-14 11:44:31 +08:00
sk e2f1e997a0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-14 11:40:01 +08:00
sk d0637ca1ce 更新任务系统配置 2024-05-14 11:39:50 +08:00
by 06695defa6 比赛log保存数据库修改 2024-05-14 11:38:44 +08:00
sk d534e73613 道具日志 2024-05-14 10:26:40 +08:00
sk 0059b6d0c5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-13 18:49:19 +08:00
sk 7cabdd4d14 tienlen记牌器问题 2024-05-13 18:48:44 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
sk bc81c3c204 tienlen记牌器问题 2024-05-13 16:29:20 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop
# Conflicts:
#	model/player.go
2024-05-13 16:07:25 +08:00
kxdd 8a5752bf38 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011279 2024-05-13 16:01:49 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
sk 1de1383383 tienlen排位加成 2024-05-13 12:02:16 +08:00
kxdd 075900766d Merge branch 'dev_newTimeitem' into dev_timeitem_n1 2024-05-13 11:39:21 +08:00
by fb4a82d26f 等级榜修改 2024-05-13 11:09:29 +08:00
by 469a8279fc 等级榜删除无用代码 2024-05-13 11:09:29 +08:00
by 528bccfe0b 玩家等级榜log输出error修改 2024-05-13 11:09:28 +08:00
kxdd 45b05b1fe5 记牌器时间计算bug 2024-05-13 11:07:04 +08:00
kxdd 052cfc1fe1 Merge branch 'dev_newTimeitem' into develop 2024-05-13 11:02:40 +08:00
kxdd a017518652 记牌器时间计算bug 2024-05-13 11:01:02 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
by 384f8b5b9c 删除打印log 2024-05-11 17:59:23 +08:00
by 355c6aae93 比赛场数据统计 2024-05-11 17:10:30 +08:00
sk 0e6487256a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 17:06:58 +08:00
sk 5ac5c633a2 no message 2024-05-11 17:06:49 +08:00
sk 2eb19c9222 修改道具掉落功能 2024-05-11 17:00:47 +08:00
sk 7c02471d2c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 16:54:25 +08:00
sk dcb54a2f58 修改道具掉落功能 2024-05-11 15:54:33 +08:00
sk f2d9d51dd6 好友申请列表 2024-05-11 15:17:02 +08:00
kxdd 579e27e17f --story=1000625 --user=李海亮 存钱罐购买限制补充 https://www.tapd.cn/31044302/s/1011001 2024-05-11 11:59:22 +08:00
sk ff78edf56b update 2024-05-11 11:02:24 +08:00
sk d7316c0ef2 review 2024-05-10 18:23:03 +08:00
sk 995cabbea6 update DB_GameItem.xlsx 2024-05-10 18:04:25 +08:00
sk 0d81105909 添加配置参数
CloseChannelSwitch 关闭渠道开关功能
2024-05-10 17:10:45 +08:00
sk 81f0d0fe43 update DB_GameItem.xlsx 2024-05-10 16:55:33 +08:00
sk 267c0492f6 解决冲突 2024-05-10 16:53:42 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
by 62bacfb0d2 兑换商城 自提功能实现 2024-05-10 16:24:09 +08:00
by b232f44a27 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 16:02:09 +08:00
by 16a41fff24 兑换商城 自提功能实现 2024-05-10 16:01:39 +08:00
sk 32fab5e0ca fix:游戏掉落道具 2024-05-10 15:30:14 +08:00
sk 5c90f2f0b7 fix:游戏掉落道具 2024-05-10 15:29:09 +08:00
sk 65258fe07e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-10 15:15:08 +08:00
sk 085d1ef9b2 update DB_GameItem.xlsx 2024-05-10 15:14:53 +08:00