by
|
97b5ba9f8a
|
Merge branch 'develop' into machine
# Conflicts:
# gamerule/clawdoll/constants.go
# gamesrv/action/action_machine.go
# gamesrv/clawdoll/player_clawdoll.go
# gamesrv/clawdoll/scene_clawdoll.go
# gamesrv/clawdoll/scenepolicy_clawdoll.go
# protocol/clawdoll/clawdoll.pb.go
# protocol/clawdoll/clawdoll.proto
# public
|
2024-08-13 14:38:46 +08:00 |
|
by
|
6bbe98bd7e
|
proto修改
|
2024-08-13 14:34:57 +08:00 |
|
by
|
bf4ca7477c
|
Merge branch 'machine' of https://git.pogorockgames.com/mango-games/server/game into machine
|
2024-08-13 14:13:06 +08:00 |
|
by
|
1795fdedfa
|
娃娃机状态
|
2024-08-13 14:13:01 +08:00 |
|
sk
|
ed358edfce
|
娃娃机
|
2024-08-13 14:07:28 +08:00 |
|
sk
|
2568b66147
|
娃娃机
|
2024-08-13 14:06:00 +08:00 |
kxdd
|
149d896cc8
|
Merge branch 'machine' of https://git.pogorockgames.com/mango-games/server/game into machine
|
2024-08-13 11:58:29 +08:00 |
|
kxdd
|
8c743fb804
|
添加移动上分
|
2024-08-13 11:58:02 +08:00 |
|
by
|
b8765251cc
|
获取娃娃机标识
|
2024-08-13 11:33:38 +08:00 |
|
by
|
c665fd4816
|
gameserver sendToMachine
|
2024-08-13 10:34:20 +08:00 |
|
by
|
a8f6039fe9
|
娃娃机连接
|
2024-08-13 09:52:39 +08:00 |
|
by
|
af6114e69b
|
娃娃机
|
2024-08-13 09:39:23 +08:00 |
|
kxdd
|
a4f739212c
|
修改娃娃机游戏ID
|
2024-08-13 09:30:50 +08:00 |
|
kxdd
|
028871d79a
|
添加娃娃机协议pb
|
2024-08-12 18:24:55 +08:00 |
|
kxdd
|
6afa58394e
|
娃娃机服务搭建
|
2024-08-12 18:14:32 +08:00 |
|
sk
|
81bf26ffc6
|
添加娃娃机配置
|
2024-08-12 17:39:33 +08:00 |
|
sk
|
a2a70a130b
|
比赛场排名不在有并列的情况积
|
2024-08-12 17:36:04 +08:00 |
|
sk
|
5b399100e1
|
vip等级礼包获得奖励
|
2024-08-12 16:45:12 +08:00 |
|
sk
|
ff086c3de3
|
兑换信息补充
|
2024-08-12 16:37:08 +08:00 |
|
sk
|
dc631f4334
|
比赛场记录机器人皮肤
|
2024-08-12 16:30:03 +08:00 |
|
sk
|
fd510661b7
|
兑换商品支持道具数量信息
|
2024-08-12 14:53:04 +08:00 |
|
sk
|
28826622c8
|
兑换商品支持道具数量信息
|
2024-08-12 14:25:26 +08:00 |
|
sk
|
53022f51d9
|
vip免费比赛次数
|
2024-08-12 11:52:31 +08:00 |
|
sk
|
e4a43ee469
|
vip每日奖励
|
2024-08-12 10:36:45 +08:00 |
|
sk
|
d16e49448f
|
解决冲突
|
2024-08-10 19:14:35 +08:00 |
|
sk
|
7f75f9a0a4
|
比赛场轮次淘汰允许不淘汰人员
|
2024-08-10 19:13:02 +08:00 |
|
by
|
4880d41aa3
|
娃娃机
|
2024-08-10 16:24:10 +08:00 |
|
by
|
d232592524
|
娃娃机主机实现
|
2024-08-10 15:48:01 +08:00 |
|
sk
|
cdc3b3d3da
|
update excel
|
2024-08-10 09:10:44 +08:00 |
|
sk
|
d46bbd65d0
|
update excel
|
2024-08-09 18:33:31 +08:00 |
|
sk
|
b885612d1f
|
public
|
2024-08-09 17:15:50 +08:00 |
|
sk
|
28622d6ffc
|
vip等级礼包原价参数
|
2024-08-09 17:14:59 +08:00 |
|
sk
|
951b23f99d
|
vip礼包领取
|
2024-08-09 16:43:48 +08:00 |
|
sk
|
16bcd9a858
|
支付返回参数扩展
|
2024-08-09 16:37:57 +08:00 |
|
sk
|
9dd4496b55
|
no message
|
2024-08-09 14:27:59 +08:00 |
|
sk
|
427098ee00
|
兑换礼包领取记录
|
2024-08-09 14:25:19 +08:00 |
|
sk
|
e49ecbc1a1
|
vip等级礼包
|
2024-08-09 11:37:44 +08:00 |
|
sk
|
4cf1b00b4d
|
update protocol
|
2024-08-08 18:30:05 +08:00 |
|
sk
|
239c93ea04
|
解决冲突
|
2024-08-08 18:27:31 +08:00 |
|
sk
|
c8ba3b74ee
|
vip特权1数据结构调整
|
2024-08-08 18:25:18 +08:00 |
|
sk
|
1c61b86681
|
新手引导启用时间
|
2024-08-08 17:37:57 +08:00 |
|
sk
|
61523b30d5
|
兑换礼包记录
|
2024-08-08 17:26:30 +08:00 |
|
sk
|
6ab8c5506e
|
兑换礼包记录
|
2024-08-08 16:57:31 +08:00 |
|
sk
|
33f0d7c8aa
|
添加娃娃机服务
|
2024-08-08 16:03:59 +08:00 |
|
sk
|
a51037b1e7
|
新手引导
|
2024-08-08 14:59:42 +08:00 |
|
sk
|
dd0794d0de
|
no message
|
2024-08-07 08:24:28 +08:00 |
|
sk
|
c988804222
|
皮肤红点通知
|
2024-08-06 16:24:07 +08:00 |
|
sk
|
731701832f
|
update develop
|
2024-08-10 01:10:57 +08:00 |
|
sk
|
2e77085fe4
|
update excel
|
2024-08-10 01:10:42 +08:00 |
|
sk
|
95fcaa5977
|
vip升级检查皮肤红点
|
2024-08-10 01:05:28 +08:00 |