by
|
b53c78cfb3
|
娃娃机心跳包
|
2024-09-11 15:59:09 +08:00 |
|
sk
|
0855fc58f4
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-11 15:29:46 +08:00 |
|
sk
|
3811215f80
|
竞技馆积分可以为负数
|
2024-09-11 15:29:37 +08:00 |
kxdd
|
a5265e5410
|
Merge branch 'develop' into ma
|
2024-09-11 11:08:04 +08:00 |
|
kxdd
|
9d584a8647
|
娃娃机下抓添加防卡死状态保护
|
2024-09-11 11:06:55 +08:00 |
|
by
|
afab279f3c
|
娃娃机与游戏服增加心跳
|
2024-09-10 17:56:32 +08:00 |
|
sk
|
9012b2a4db
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-10 15:04:19 +08:00 |
|
sk
|
288624a55b
|
房间真人数量统计错误
|
2024-09-10 15:04:11 +08:00 |
|
kxdd
|
b57c5b2e41
|
Merge branch 'ma' into develop
|
2024-09-10 15:00:35 +08:00 |
|
kxdd
|
418b16d2e9
|
娃娃机状态修改
|
2024-09-10 14:59:36 +08:00 |
|
by
|
76ba1ff7b7
|
娃娃机修改
|
2024-09-10 11:12:20 +08:00 |
|
sk
|
3a7d3b9f2e
|
房卡返回问题
|
2024-09-09 17:55:13 +08:00 |
|
by
|
18f67b7d22
|
屏蔽自动向前走一步
|
2024-09-09 09:45:15 +08:00 |
|
sk
|
07b985693e
|
代码优化
|
2024-09-07 18:06:05 +08:00 |
|
kxdd
|
13042959c9
|
Merge branch 'ma' into develop
|
2024-09-07 17:37:50 +08:00 |
|
kxdd
|
7991a8044d
|
娃娃机状态调整
|
2024-09-07 17:37:22 +08:00 |
|
kxdd
|
b46db9b36b
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-07 16:59:19 +08:00 |
|
kxdd
|
e690d8da76
|
Merge branch 'develop' into ma
# Conflicts:
# gamesrv/clawdoll/action_clawdoll.go
|
2024-09-07 16:58:17 +08:00 |
|
sk
|
152c60e35f
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-07 16:58:08 +08:00 |
|
sk
|
4eee248f20
|
竞技馆房间解散问题
|
2024-09-07 16:58:01 +08:00 |
|
by
|
d61a153948
|
投币后向前移动一下
|
2024-09-07 16:22:12 +08:00 |
|
kxdd
|
f26cb4d2ff
|
娃娃机playing判定修改
|
2024-09-07 16:08:46 +08:00 |
|
by
|
7099975e9e
|
客户端请求token
|
2024-09-07 14:48:44 +08:00 |
|
by
|
1d98a31bf4
|
token修改
|
2024-09-07 14:29:34 +08:00 |
|
by
|
83d5ec05fb
|
生成token修改
|
2024-09-07 14:04:44 +08:00 |
|
kxdd
|
de339225d2
|
娃娃机获取token修改
|
2024-09-07 11:58:40 +08:00 |
|
by
|
d34473c688
|
token
|
2024-09-07 11:40:04 +08:00 |
|
by
|
59eb4ecc22
|
token
|
2024-09-07 11:17:33 +08:00 |
|
sk
|
053db5b83a
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-07 10:46:47 +08:00 |
|
sk
|
1b67a44d63
|
竞技馆牌局记录
|
2024-09-07 10:46:34 +08:00 |
|
by
|
759c989719
|
获取token
|
2024-09-07 10:43:36 +08:00 |
|
sk
|
cb4b51b4aa
|
竞技馆游戏记录
|
2024-09-07 10:03:50 +08:00 |
|
sk
|
67a85f6535
|
竞技房间没人解散
|
2024-09-06 17:28:10 +08:00 |
|
kxdd
|
8a19cd642f
|
娃娃机通知状态修改
|
2024-09-06 15:36:59 +08:00 |
|
kxdd
|
19dde360d6
|
Merge branch 'ma' into develop
|
2024-09-06 11:58:07 +08:00 |
|
kxdd
|
3ac3f2dea1
|
娃娃机获取视频token修改
|
2024-09-06 11:57:45 +08:00 |
|
kxdd
|
979645567e
|
合并代码
|
2024-09-06 10:08:29 +08:00 |
|
kxdd
|
b74f284654
|
Merge branch 'ma' into develop
# Conflicts:
# gamesrv/clawdoll/scenepolicy_clawdoll.go
|
2024-09-06 10:08:05 +08:00 |
|
kxdd
|
8f59f4d03a
|
娃娃机抓取后结果通知修改
|
2024-09-06 09:41:41 +08:00 |
|
sk
|
33380d1bf8
|
查询房间信息
|
2024-09-05 16:02:50 +08:00 |
|
sk
|
58fe35c90f
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-05 14:51:52 +08:00 |
|
sk
|
3b15a84df3
|
查询房间信息
|
2024-09-05 14:46:43 +08:00 |
|
kxdd
|
2869fb7e3f
|
Merge branch 'ma' into develop
|
2024-09-05 14:46:34 +08:00 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23:36 +08:00 |
|
sk
|
1948560a03
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-05 11:25:13 +08:00 |
|
sk
|
f056014c50
|
玩家游戏数据保存
|
2024-09-05 11:24:46 +08:00 |
|
by
|
68a8e010cf
|
scene只能绑定对应的娃娃机编号
|
2024-09-05 10:28:43 +08:00 |
|
by
|
fb8bfbde87
|
刪除log
|
2024-09-04 14:03:37 +08:00 |
|
by
|
12623d7b94
|
增加log
|
2024-09-04 13:46:10 +08:00 |
|
kxdd
|
4ab95e058e
|
Merge branch 'ma' into develop
# Conflicts:
# data/DB_PropExchange.dat
# data/DB_Task.dat
# public
# xlsx/DB_GameFree.xlsx
|
2024-09-04 11:21:13 +08:00 |
|
kxdd
|
8514f22fc6
|
娃娃机修改
|
2024-09-04 11:18:04 +08:00 |
|
kxdd
|
27eb944329
|
娃娃机配置更新
|
2024-09-04 10:49:16 +08:00 |
|
sk
|
92bf5fe16e
|
review
|
2024-09-03 18:09:09 +08:00 |
|
kxdd
|
c4d58262de
|
娃娃机添加流ID
|
2024-09-03 17:50:19 +08:00 |
|
by
|
c226024401
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-03 17:15:26 +08:00 |
|
by
|
d16c1a1887
|
修改log
|
2024-09-03 17:15:05 +08:00 |
|
sk
|
6c4e49ef44
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-03 16:40:53 +08:00 |
|
kxdd
|
9ef1f9d896
|
娃娃机报错修改
|
2024-09-03 16:09:43 +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 |
|
kxdd
|
ddcaa62f13
|
娃娃机修改
|
2024-09-03 15:10:41 +08:00 |
|
sk
|
034abb64e2
|
牌局回放
|
2024-09-03 11:20:49 +08:00 |
|
sk
|
5c6dce2f4d
|
房卡场中途不能离开房间
|
2024-09-03 10:57:05 +08:00 |
|
kxdd
|
6a9c6a988b
|
娃娃机获取token修改
|
2024-09-02 16:23:45 +08:00 |
|
sk
|
00dcc3199f
|
竞技馆房主付费
|
2024-09-02 16:13:23 +08:00 |
|
sk
|
26db8f4b21
|
竞技馆
|
2024-09-02 14:55:18 +08:00 |
|
sk
|
9f490a7aca
|
竞技馆
|
2024-09-02 11:44:12 +08:00 |
|
sk
|
1d9bfd5802
|
竞技馆
|
2024-09-02 10:08:23 +08:00 |
|
sk
|
b7d4efb7a6
|
代码优化
|
2024-08-30 18:52:11 +08:00 |
|
kxdd
|
fe26aa3d37
|
娃娃机获取视频流修改
|
2024-08-30 18:15:44 +08:00 |
|
by
|
ece16ac947
|
获取token
|
2024-08-30 16:45:07 +08:00 |
|
by
|
3a6e420e98
|
token测试数据
|
2024-08-30 15:34:28 +08:00 |
|
sk
|
fa57f5e8e6
|
保存玩家游戏数据
|
2024-08-30 14:49:55 +08:00 |
|
kxdd
|
958a3b1ba4
|
娃娃机等待玩家添加
|
2024-08-30 11:56:15 +08:00 |
|
sk
|
a77cfa41dd
|
离开房间返回错误码
|
2024-08-29 16:54:30 +08:00 |
|
sk
|
94ca1562e5
|
解决冲突
|
2024-08-29 14:51:32 +08:00 |
|
sk
|
3bff2c17f3
|
review
|
2024-08-29 14:28:54 +08:00 |
|
by
|
ccc0e97635
|
娃娃机etcd配置
|
2024-08-29 11:55:57 +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 |
|
sk
|
9ea57766a4
|
房卡场对局记录
|
2024-08-28 18:18:36 +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 |
|
kxdd
|
cbd00bf0f8
|
娃娃机状态修改
|
2024-08-27 15:13:32 +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 |
|
by
|
ba9dde2005
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-24 16:11:03 +08:00 |
|
by
|
4580f69514
|
请求token注册协议修改
|
2024-08-24 16:10:28 +08:00 |
kxdd
|
aed283b37e
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-24 15:17:17 +08:00 |
|
kxdd
|
87486f1a48
|
娃娃机状态流程修改
|
2024-08-24 15:13:22 +08:00 |
|
sk
|
ab974063e8
|
tienlen比赛场观战发送玩家手牌
|
2024-08-22 17:48:10 +08:00 |
|
by
|
88db5712d8
|
娃娃机获取token
|
2024-08-22 15:43:28 +08:00 |
|
sk
|
71655d8126
|
比赛观战
|
2024-08-22 09:43:10 +08:00 |
|
sk
|
fe8ccec885
|
review
|
2024-08-20 09:46:13 +08:00 |
|
by
|
154a037e08
|
娃娃机监听消息
|
2024-08-15 11:31:45 +08:00 |
|
kxdd
|
f23cfda629
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-14 16:24:31 +08:00 |
|
kxdd
|
a4b4a0b2a0
|
封装移动投币操作
|
2024-08-14 16:23:58 +08:00 |
|
by
|
8ff978db72
|
娃娃机返回操作结果
|
2024-08-14 16:22:57 +08:00 |
|
kxdd
|
2c8ce6a467
|
添加上分投币
|
2024-08-14 15:53:27 +08:00 |