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 |
|
kxdd
|
8f59f4d03a
|
娃娃机抓取后结果通知修改
|
2024-09-06 09:41:41 +08:00 |
|
sk
|
fccb385f79
|
竞技馆房间配置包类型校验
|
2024-09-05 18:47:21 +08:00 |
|
sk
|
c4bea18f9f
|
道具交易市场
|
2024-09-05 18:31:04 +08:00 |
|
sk
|
33380d1bf8
|
查询房间信息
|
2024-09-05 16:02:50 +08:00 |
|
sk
|
e39a08bb29
|
Merge branch 'develop' into dev_slots
|
2024-09-05 15:38:07 +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 |
|
sk
|
a126fb81ae
|
修改排位赛奖励
|
2024-09-05 14:31:12 +08:00 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23:36 +08:00 |
|
sk
|
e33fe64bca
|
房间列表查询
|
2024-09-05 14:20:36 +08:00 |
|
sk
|
54c2b0735e
|
Fortune游戏数据存储
|
2024-09-05 11:50:44 +08:00 |
|
sk
|
b61b41313d
|
解决冲突
|
2024-09-05 11:28:40 +08:00 |
|
sk
|
bcac7f06d3
|
update public
|
2024-09-05 11:26:52 +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 |
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
|
68a8e010cf
|
scene只能绑定对应的娃娃机编号
|
2024-09-05 10:28:43 +08:00 |
|
sk
|
88bbca47f1
|
推广渠道
|
2024-09-04 17:24:29 +08:00 |
|
sk
|
4a32df4ecf
|
竞技馆
|
2024-09-04 15:31:35 +08:00 |
|
sk
|
54a13fe8ae
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-04 15:08:22 +08:00 |
|
sk
|
9c1fed84e9
|
竞技馆读取后台配置
|
2024-09-04 14:53:29 +08:00 |
|
sk
|
ac86a5e294
|
删除竞技馆测试配置
|
2024-09-04 14:21:21 +08:00 |
|
by
|
fb8bfbde87
|
刪除log
|
2024-09-04 14:03:37 +08:00 |
|
sk
|
f4143ad6d3
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-04 13:58:30 +08:00 |
|
by
|
12623d7b94
|
增加log
|
2024-09-04 13:46:10 +08:00 |
|
sk
|
5b6a5ad5d3
|
竞技馆房间信息
|
2024-09-04 11:54:59 +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
|
d8f01f39ea
|
娃娃机配置
|
2024-09-04 10:52:45 +08:00 |
|
kxdd
|
9cdc0f24c7
|
娃娃机配置更新
|
2024-09-04 10:49:37 +08:00 |
|
kxdd
|
27eb944329
|
娃娃机配置更新
|
2024-09-04 10:49:16 +08:00 |
|
kxdd
|
c4a0a31df8
|
添加娃娃机ID
|
2024-09-04 10:01:50 +08:00 |
|
kxdd
|
e23f33c569
|
public
|
2024-09-04 10:01:15 +08:00 |
|
sk
|
7c00ec5067
|
道具修改失败返回错误码
|
2024-09-03 18:42:49 +08:00 |
|
sk
|
92bf5fe16e
|
review
|
2024-09-03 18:09:09 +08:00 |
|
kxdd
|
c4d58262de
|
娃娃机添加流ID
|
2024-09-03 17:50:19 +08:00 |
|
tomas
|
bc81ecdfed
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-03 17:16:18 +08:00 |
|
tomas
|
a2e34269fd
|
add test v1 不要合并
|
2024-09-03 17:16:07 +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 |
|
kxdd
|
85a115809c
|
添加娃娃机配置
|
2024-09-03 16:48:21 +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
|
89aefd480a
|
Merge branch 'ma' into develop
|
2024-09-03 16:36:25 +08:00 |
|
sk
|
c3f0f0d9fe
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-03 16:33:59 +08:00 |