Commit Graph

1048 Commits

Author SHA1 Message Date
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 0b91f46fd8 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-07 14:29:50 +08:00
by 1d98a31bf4 token修改 2024-09-07 14:29:34 +08:00
sk d769605d09 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 14:16:31 +08:00
sk 8174e6c406 商店购买备注 2024-09-07 14:15:56 +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
by 9b5dff5f96 上分不走消息隊列 2024-09-07 10:22:55 +08:00
sk cb4b51b4aa 竞技馆游戏记录 2024-09-07 10:03:50 +08:00
sk 1cc5d4f226 添加水池配置 2024-09-07 09:19:51 +08:00
sk ad3e8d4b9f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 18:33:42 +08:00
sk 4da55c9588 游戏中同步实时金币 2024-09-06 18:33:28 +08:00
lihailiang f467753242 Merge branch 'develop' into ma
# Conflicts:
#	.gitmodules
2024-09-06 18:22:21 +08:00
kxdd 8c8ee30ef8 Merge branch 'develop' into ma
# Conflicts:
#	public
2024-09-06 18:20:54 +08:00
by 7889c982ea 娃娃機修改 2024-09-06 18:06:40 +08:00
by 895c673e65 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-06 17:30:39 +08:00
by 892a61aa47 log 2024-09-06 17:30:28 +08:00
sk 67a85f6535 竞技房间没人解散 2024-09-06 17:28:10 +08:00
sk 5bdf3d78df 商店购买 2024-09-06 16:23:57 +08:00
sk b4bab0de1e 删除public子模块 2024-09-06 15:58:06 +08:00
sk 2f74e5bfab Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 15:39:57 +08:00
sk c20f0fa69c 商城购买参数 2024-09-06 15:39:30 +08:00
kxdd 770b9b084a public 2024-09-06 15:39:17 +08:00
kxdd 8a19cd642f 娃娃机通知状态修改 2024-09-06 15:36:59 +08:00
by 83f643a789 Merge branch 'ma' into develop 2024-09-06 14:56:51 +08:00
by 98a834b357 public 2024-09-06 14:56:40 +08:00
by 09dc4f4588 public 2024-09-06 14:55:44 +08:00
kxdd 9a34e32841 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 14:50:50 +08:00
kxdd 4bd2cee327 public 2024-09-06 14:49:51 +08:00
sk 63387ba9b4 商城购买房卡 2024-09-06 14:46:30 +08:00
sk 4b7c552524 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 14:01:34 +08:00
sk fc2db94c86 竞技馆列表刷新 2024-09-06 14:00:34 +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
sk 0fc4b33aa4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 11:25:31 +08:00
sk 82486dd427 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 11:25:15 +08:00
by 3cd2dd06e1 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-06 11:25:14 +08:00
by 82aee49eda 生成token修改 2024-09-06 11:24:35 +08:00
sk 32e8b2f22e 房卡默认加成 2024-09-06 11:22:29 +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
sk 40966b52cb 竞技馆房间配置 2024-09-06 09:50:19 +08:00
kxdd 9963ef130a public 2024-09-06 09:43:14 +08:00