Commit Graph

260 Commits

Author SHA1 Message Date
sk cfa2c003c2 游戏中玩家余额变化 2024-09-13 16:57:37 +08:00
by 31db186564 娃娃机心跳 2024-09-13 10:51:16 +08:00
sk fa1d1648ac Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 16:33:05 +08:00
sk d74c868947 好友进房消耗检查 2024-09-11 16:26:05 +08:00
by b53c78cfb3 娃娃机心跳包 2024-09-11 15:59:09 +08:00
by 791d82c8aa Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-10 17:56:43 +08:00
by afab279f3c 娃娃机与游戏服增加心跳 2024-09-10 17:56:32 +08:00
sk 8d63969701 注释错误 2024-09-10 15:31:46 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
kxdd e690d8da76 Merge branch 'develop' into ma
# Conflicts:
#	gamesrv/clawdoll/action_clawdoll.go
2024-09-07 16:58:17 +08:00
by 1d98a31bf4 token修改 2024-09-07 14:29:34 +08:00
kxdd de339225d2 娃娃机获取token修改 2024-09-07 11:58:40 +08:00
kxdd 3ac3f2dea1 娃娃机获取视频token修改 2024-09-06 11:57:45 +08:00
kxdd e1e805f9d8 娃娃机添加流禁止流恢复功能 2024-09-05 14:23:36 +08:00
kxdd c4d58262de 娃娃机添加流ID 2024-09-03 17:50:19 +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
kxdd ddcaa62f13 娃娃机修改 2024-09-03 15:10:41 +08:00
kxdd 6a9c6a988b 娃娃机获取token修改 2024-09-02 16:23:45 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
kxdd 958a3b1ba4 娃娃机等待玩家添加 2024-08-30 11:56:15 +08:00
sk 94ca1562e5 解决冲突 2024-08-29 14:51:32 +08:00
by 6bd95be413 娃娃机etcd配置 2024-08-29 11:33:52 +08:00
by 94d7e4f45f Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
# Conflicts:
#	protocol/clawdoll/clawdoll.pb.go
2024-08-29 11:33:26 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
kxdd ebe7b1c4c8 娃娃机协议修改 2024-08-28 17:00:31 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 613ed6da76 update excel 2024-08-27 11:05:42 +08:00
sk 466eafe1bc 房间信息添加比赛配置id 2024-08-26 18:13:15 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk f4434bd945 去掉ParamsEx,agentor 2024-08-24 18:22:06 +08:00
sk 4c0c6f7c2b 竞技馆后台协议 2024-08-23 18:11:54 +08:00
sk a13ed034d7 比赛观战错误码 2024-08-23 09:43:51 +08:00
sk ab974063e8 tienlen比赛场观战发送玩家手牌 2024-08-22 17:48:10 +08:00
sk 85ba5689b1 添加tienlen房卡场游戏配置 2024-08-22 16:17:51 +08:00
by 88db5712d8 娃娃机获取token 2024-08-22 15:43:28 +08:00
sk 18e3e5cd7d 比赛观战开关 2024-08-22 13:54:22 +08:00
sk fc29fcddd8 比赛列表返回图标信息 2024-08-20 09:54:57 +08:00
sk e5b80fda16 小精灵功能 2024-08-16 11:28:01 +08:00
sk e93616dcc9 比赛观战 2024-08-15 16:18:22 +08:00
by 8ff978db72 娃娃机返回操作结果 2024-08-14 16:22:57 +08:00
by d2a8b0e618 娃娃机修改 2024-08-14 12:06:15 +08:00
sk 42099b3d59 兑换商品返回商品id 2024-08-13 16:56:32 +08:00
kxdd 49b0c6cc00 下抓通知添加 2024-08-13 15:33:44 +08:00
by d703046f63 娃娃机 2024-08-13 14:47:12 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
sk fd510661b7 兑换商品支持道具数量信息 2024-08-12 14:53:04 +08:00
sk 28826622c8 兑换商品支持道具数量信息 2024-08-12 14:25:26 +08:00
sk e4a43ee469 vip每日奖励 2024-08-12 10:36:45 +08:00
by d232592524 娃娃机主机实现 2024-08-10 15:48:01 +08:00
sk 28622d6ffc vip等级礼包原价参数 2024-08-09 17:14:59 +08:00
sk 16bcd9a858 支付返回参数扩展 2024-08-09 16:37:57 +08:00
sk e49ecbc1a1 vip等级礼包 2024-08-09 11:37:44 +08:00
sk 33f0d7c8aa 添加娃娃机服务 2024-08-08 16:03:59 +08:00
sk a51037b1e7 新手引导 2024-08-08 14:59:42 +08:00
by fa28e3233c 获奖记录修改 2024-08-02 15:26:36 +08:00
sk 8a56eb5776 道具分解 2024-08-01 18:34:17 +08:00
sk 55ed8da8fa update skin 2024-07-31 16:36:26 +08:00
sk 0bb1597aeb update skin 2024-07-31 15:47:28 +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
sk b6796cd8f6 解决冲突 2024-07-29 10:03:18 +08:00
sk 158aea0bf7 皮肤解锁类型新增vip等级解锁 2024-07-27 18:15:48 +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 fff05f7470 渠道活动开关 2024-07-25 16:01:09 +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 699a08f9bb update DB_Skin 2024-07-25 14:24:54 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 5e8c7f2ca0 update excel 2024-07-18 14:40:06 +08:00
sk 3a881657a2 活动开关 2024-07-18 11:15:12 +08:00
sk 7e28a059ae update excel 2024-07-17 11:27:30 +08:00
sk 16fc31fbb0 同步皮肤修改 2024-07-13 09:30:38 +08:00
sk 23c1d1eaab 皮肤功能 2024-07-12 18:05:03 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk 1123fe94ab 赛季挑战任务 2024-07-11 17:23:56 +08:00
sk 7504a2dcdf Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 11:57:04 +08:00
sk 06343ab6fc 通行证活动统计数据 2024-07-11 11:56:34 +08:00
by e326ccdf81 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-11 10:20:25 +08:00
by 240711a0bd 兑换商城修改 2024-07-11 10:20:21 +08:00
sk a28d9163d8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 09:59:05 +08:00
sk b83be4028e update gameitem 2024-07-11 09:58:30 +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