Commit Graph

100 Commits

Author SHA1 Message Date
tomas 94e998f790 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-09 08:52:32 +08:00
sk ae3e9d8fd6 rabbitmq优化 2024-10-08 11:07:56 +08:00
tomas 29e9c7bfe8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 08:52:34 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
tomas b83a6d6d5b Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-27 10:49:56 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
tomas d8398465be Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 08:58:26 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
sk df3c4d353e 添加竞技馆获奖记录查询接口 2024-09-23 16:43:35 +08:00
sk 72b8f927b0 登录后根据道具记录恢复道具数量 2024-09-23 11:29:36 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
tomas 99d032dffc Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-21 13:34:21 +08:00
sk 57c58b2fb2 修复v卡掉落问题 2024-09-20 16:53:10 +08:00
tomas 9d164f86da Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-14 09:00:24 +08:00
sk cfa2c003c2 游戏中玩家余额变化 2024-09-13 16:57:37 +08:00
tomas af99918965 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-13 09:01:47 +08:00
sk 09202f60d3 同步道具列表 2024-09-11 18:27:40 +08:00
sk 288624a55b 房间真人数量统计错误 2024-09-10 15:04:11 +08:00
tomas 4ba65f9e87 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-09 10:25:12 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +08:00
sk b61b41313d 解决冲突 2024-09-05 11:28:40 +08:00
sk f056014c50 玩家游戏数据保存 2024-09-05 11:24:46 +08:00
tomas 5418b2bdda Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
#	public
2024-09-05 11:09:14 +08:00
tomas 497be310b3 add dd 2024-09-05 11:05:07 +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
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
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
sk 034abb64e2 牌局回放 2024-09-03 11:20:49 +08:00
sk 9f490a7aca 竞技馆 2024-09-02 11:44:12 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
by ccc0e97635 娃娃机etcd配置 2024-08-29 11:55:57 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +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 71655d8126 比赛观战 2024-08-22 09:43:10 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
sk dc631f4334 比赛场记录机器人皮肤 2024-08-12 16:30:03 +08:00
by d232592524 娃娃机主机实现 2024-08-10 15:48:01 +08:00
sk 33f0d7c8aa 添加娃娃机服务 2024-08-08 16:03:59 +08:00