Commit Graph

133 Commits

Author SHA1 Message Date
by e0d414e6af 娃娃后台proto增加字段 2024-09-18 11:28:07 +08:00
by a9de61a96a 协议修改 2024-09-13 18:11:05 +08:00
by f1eccf335f 娃娃兑换商城 2024-09-13 17:56:06 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
by 59535c2015 更新配置 2024-09-03 15:46:54 +08:00
by 981c3860d1 Merge remote-tracking branch 'origin/develop' into ma
# Conflicts:
#	data/DB_GameFree.dat
#	data/DB_PropExchange.dat
#	data/DB_Task.dat
#	etcd/keyconf.go
#	model/config.go
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	protocol/webapi/webapi.proto
#	public
#	xlsx/DB_GameFree.xlsx
2024-09-03 15:46:11 +08:00
by e7a6049341 娃娃机后台配置 增加StreamId字段 2024-09-03 15:12:24 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 4c0c6f7c2b 竞技馆后台协议 2024-08-23 18:11:54 +08:00
sk e5b80fda16 小精灵功能 2024-08-16 11:28:01 +08:00
sk e93616dcc9 比赛观战 2024-08-15 16:18:22 +08:00
sk fd510661b7 兑换商品支持道具数量信息 2024-08-12 14:53:04 +08:00
sk 28826622c8 兑换商品支持道具数量信息 2024-08-12 14:25:26 +08:00
sk e49ecbc1a1 vip等级礼包 2024-08-09 11:37:44 +08:00
sk a51037b1e7 新手引导 2024-08-08 14:59:42 +08:00
by 805c82bdd5 弹窗配置 2024-07-30 16:21:05 +08:00
by a5cd7beeeb 获奖记录 2024-07-30 15:47:35 +08:00
by 7d5085bf11 获奖记录 2024-07-30 15:16:44 +08:00
by fa3e48cd26 获奖记录 2024-07-30 14:40:06 +08:00
by 7e04ceecee 获奖记录 2024-07-27 11:51:53 +08:00
by 6ef6bbe2cd 获奖记录 2024-07-27 11:44:37 +08:00
by a2501eefa4 排行榜代码(已屏蔽) + 获奖记录 2024-07-27 10:48:04 +08:00
sk 9f6e9aa910 解决冲突 2024-07-25 14:49:25 +08:00
by 60709a140f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.proto
2024-07-25 14:39:03 +08:00
by b15fadfcc4 轮播图增加URL 2024-07-25 14:32:55 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 3a881657a2 活动开关 2024-07-18 11:15:12 +08:00
by 240711a0bd 兑换商城修改 2024-07-11 10:20:21 +08:00
by f299b5ca13 钻石抽奖白名单权限 2024-07-10 17:49:46 +08:00
sk b5aba457a0 解决冲突 2024-07-10 15:58:45 +08:00
sk b3d95e3512 玩家信息添加v卡消耗和充值金额 2024-07-10 15:53:06 +08:00
by 9481b8d1ab 兑换商城修改 2024-07-10 11:41:33 +08:00
sk bc679f529e 解决冲突 2024-07-09 19:05:29 +08:00
sk 463117de96 修改protocol导入路径 2024-07-09 19:00:30 +08:00
by e4f993fb8e proto编译文件 2024-07-09 17:46:04 +08:00
by c671da56e6 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	etcd/keyconf.go
#	model/config.go
#	protocol/player/player.pb.go
#	protocol/player/player.proto
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
2024-07-09 17:43:14 +08:00
by 0484f1f47b 钻石抽奖实现 2024-07-09 17:35:55 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
by 0972b85122 proto 2024-07-03 19:13:09 +08:00
by 1c14d96060 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.pb.go
2024-07-03 19:12:22 +08:00
by 007b0c3a5b 比赛场库存 2024-07-03 19:11:49 +08:00
sk 78d6a109fe 赛季通行证 2024-07-02 17:34:44 +08:00
by f68588eaa3 兑换修改 2024-07-02 15:26:54 +08:00
sk c75df5742e 赛季通行证活动 2024-07-02 14:30:49 +08:00
sk 4c7abf167e 赛季通行证 2024-07-02 14:21:24 +08:00
by 20b8fe91a0 兑换商城修改 2024-07-02 11:34:41 +08:00
sk 2805e4ca6c 通行证协议 2024-06-29 15:29:01 +08:00
sk 0c0f270762 邀请活动开关 2024-06-27 16:23:22 +08:00
by 09aa018fec 钻石存钱罐 +获取运营商数据 2024-06-26 16:46:17 +08:00
by ac76712485 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 11:21:59 +08:00
by fdd5e3889e 背包使用兑换功能实现 2024-06-26 11:21:54 +08:00
sk 7ae4392784 新版邀请活动 2024-06-26 11:04:51 +08:00
sk 8eb9a7c7a1 新版邀请活动 2024-06-25 18:06:32 +08:00
by 11d78d2386 累计签到进阶奖励修改增加google渠道区分 2024-06-30 18:10:52 +08:00
by 6985bc0437 累计签到进阶奖励实现 2024-06-24 09:29:56 +08:00
sk c429d41900 比赛添加比赛区分 2024-06-13 13:55:00 +08:00
sk 3526ef069f 解散空闲房间
房间没有真人或观众,并且长时间没有真人进出房间就解散
2024-06-12 14:39:27 +08:00
sk ceac412a25 比赛类型列表 2024-06-11 11:23:43 +08:00
sk 39b71ea93f 比赛时间 2024-06-03 14:23:46 +08:00
sk 35c0e07004 发送邮件添加渠道筛选 2024-06-03 14:23:46 +08:00
sk ef59d75ac5 vip添加比赛场免费次数 2024-05-30 17:33:31 +08:00
sk 63efa84183 update 2024-05-24 16:46:41 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk 11af348377 比赛配置添加手机卡类型 2024-05-17 09:30:03 +08:00
sk d298ed97e8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-16 15:06:25 +08:00
sk 6dfe2301e0 修改游戏入口开关 2024-05-16 15:06:16 +08:00
by 2ecbc2b1cb 后台增加添加道具接口 2024-05-16 09:59:18 +08:00
by e58eb4d672 兑换创建订单增加telcharge字段 2024-05-15 10:12:41 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
sk 267c0492f6 解决冲突 2024-05-10 16:53:42 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
by 16a41fff24 兑换商城 自提功能实现 2024-05-10 16:01:39 +08:00
sk a943492d80 开启兑换渠道控制 2024-05-10 09:17:58 +08:00
sk 7dcd78d3ef 邀请分享链接简化
公告增加渠道参数
2024-05-09 17:18:16 +08:00
sk ebad03fce1 创建订单添加渠道 2024-04-26 15:25:19 +08:00
sk 82b406cbcd 水池添加调节赔率和新手池 2024-04-24 16:26:35 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
sk c1d2925933 update data 2024-04-17 16:59:14 +08:00
sk 0e53147f13 proto生成优化 2024-04-17 16:52:35 +08:00
sk 737fea1e23 活动代码优化 2024-04-16 17:44:56 +08:00
sk 91e798c0c5 init 2024-04-15 11:07:12 +08:00