sk
|
aa42eb224c
|
解决冲突
|
2024-10-17 09:20:02 +08:00 |
|
sk
|
4947685627
|
no message
|
2024-10-15 16:22:39 +08:00 |
|
sk
|
db3f7bee67
|
添加调控开关
|
2024-10-15 16:15:04 +08:00 |
|
by
|
05329478ad
|
禁流修改
|
2024-10-15 11:13:09 +08:00 |
tomas
|
2201f656f1
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-10-14 10:24:16 +08:00 |
DESKTOP-45ANQ2C\unis
|
2693793aa9
|
娃娃机结果通知修改
|
2024-10-12 17:46:23 +08:00 |
|
sk
|
98289116a3
|
抽奖活动协议
|
2024-10-12 13:33:40 +08:00 |
|
tomas
|
5165221498
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-10-11 09:00:03 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
03c6852edd
|
娃娃机结算结果修改
|
2024-10-10 11:52:37 +08:00 |
DESKTOP-45ANQ2C\unis
|
a125f5f959
|
娃娃机结算结果修改
|
2024-10-10 10:31:45 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
b0eb952494
|
娃娃机结算结果修改
|
2024-10-09 14:49:21 +08:00 |
|
sk
|
d09d4a4284
|
大厅道具变更同步到游戏
|
2024-10-09 09:18:09 +08:00 |
|
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
|
9770425fba
|
up bet val
|
2024-09-29 17:31:50 +08:00 |
tomas
|
f63c327ffa
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-29 17:29:03 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
a48a9fede4
|
娃娃卡下抓获得娃娃卡改回正常抓取
|
2024-09-28 18:31:09 +08:00 |
|
tomas
|
57d45bd879
|
log
|
2024-09-28 11:11:50 +08:00 |
|
tomas
|
29e9c7bfe8
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-28 08:52:34 +08:00 |
|
sk
|
fd14654c59
|
竞技馆和比赛场关闭斗鸡技能效果
|
2024-09-27 18:02:00 +08:00 |
|
sk
|
2ed8885e18
|
竞技馆炸弹扣分问题
|
2024-09-27 11:38:02 +08:00 |
|
sk
|
53f03c1081
|
no message
|
2024-09-27 11:36:12 +08:00 |
|
tomas
|
489eb61805
|
main add rabbit
|
2024-09-27 10:50:25 +08:00 |
|
tomas
|
b83a6d6d5b
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-27 10:49:56 +08:00 |
|
sk
|
0519dbf82b
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-27 09:28:57 +08:00 |
|
sk
|
824b161a46
|
象棋调试功能
|
2024-09-27 09:16:22 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
027a2c6732
|
娃娃机添加日志
|
2024-09-26 17:21:38 +08:00 |
|
sk
|
7d8eaee2c2
|
竞技馆获奖假数据
|
2024-09-26 16:39:19 +08:00 |
|
sk
|
91bb5820f9
|
no message
|
2024-09-26 10:22:56 +08:00 |
|
tomas
|
d8398465be
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-26 08:58:26 +08:00 |
kxdd
|
bc5c3c3324
|
娃娃机视频流自动关闭打开
|
2024-09-25 15:37:45 +08:00 |
|
kxdd
|
ad8b3fe1ce
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-25 09:22:48 +08:00 |
|
kxdd
|
36a7a61178
|
娃娃机添加抓取记录
|
2024-09-25 09:22:39 +08:00 |
|
sk
|
6684dbcec6
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-24 18:32:14 +08:00 |
|
sk
|
b4cebfd687
|
竞技馆系统房间功能
|
2024-09-24 18:32:00 +08:00 |
|
by
|
b04d422d8b
|
娃娃机离线 踢出房间玩家
|
2024-09-24 16:36:39 +08:00 |
|
sk
|
cd7c3ddebd
|
竞技馆官方房间配置
|
2024-09-23 18:32:50 +08:00 |
|
sk
|
df3c4d353e
|
添加竞技馆获奖记录查询接口
|
2024-09-23 16:43:35 +08:00 |
|
sk
|
4b8f6e6274
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-23 11:30:37 +08:00 |
|
sk
|
72b8f927b0
|
登录后根据道具记录恢复道具数量
|
2024-09-23 11:29:36 +08:00 |
|
kxdd
|
ae085ec661
|
娃娃机后台日志添加场景名字
|
2024-09-23 10:05:40 +08:00 |
|
tomas
|
d5d3c225f2
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-23 08:59:21 +08:00 |
|
kxdd
|
8952d98f7d
|
娃娃机推流修改
|
2024-09-21 17:07:47 +08:00 |
|
sk
|
4c64b96429
|
解决冲突
|
2024-09-21 15:11:40 +08:00 |
|
tomas
|
0fb29e2750
|
action rabbit
|
2024-09-21 15:06:54 +08:00 |
|
tomas
|
99d032dffc
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-21 13:34:21 +08:00 |
|
kxdd
|
2141f00ba9
|
Merge branch 'ma' into develop
|
2024-09-21 11:52:02 +08:00 |
|
kxdd
|
2743f6cfb0
|
娃娃卡记录添加渠道信息
|
2024-09-21 11:51:53 +08:00 |
|
sk
|
eaff0f1308
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-21 11:10:45 +08:00 |
|
tomas
|
348b5fcb90
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-21 10:43:54 +08:00 |
|
kxdd
|
193c7fc3d3
|
Merge branch 'ma' into develop
|
2024-09-20 17:58:34 +08:00 |
|
kxdd
|
81b529d13b
|
娃娃机添加每局日志记录
|
2024-09-20 17:58:10 +08:00 |
|
sk
|
57c58b2fb2
|
修复v卡掉落问题
|
2024-09-20 16:53:10 +08:00 |
|
sk
|
19ebda3832
|
Merge branch 'release' into develop
|
2024-09-20 16:36:32 +08:00 |
|
sk
|
2c6ea1c7e2
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-20 16:36:22 +08:00 |
|
by
|
7d3613ee39
|
娃娃机配置
|
2024-09-20 16:07:10 +08:00 |
|
tomas
|
d0d8008d51
|
fix coin
|
2024-09-20 11:12:31 +08:00 |
|
sk
|
2b0f7b1e28
|
修复绑定手机积分和竞技馆对局记录
|
2024-09-20 10:23:01 +08:00 |
|
sk
|
522b284dd6
|
no message
|
2024-09-20 08:28:01 +08:00 |
|
tomas
|
365ba5edc8
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 19:08:56 +08:00 |
|
tomas
|
05a9c79dc1
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 19:06:57 +08:00 |
|
tomas
|
d62a57375e
|
add rabbit
|
2024-09-19 19:06:46 +08:00 |
|
kxdd
|
8e156dba18
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-19 18:29:01 +08:00 |
|
kxdd
|
7d7f5804f1
|
Merge branch 'develop' into ma
# Conflicts:
# common/constant.go
|
2024-09-19 18:27:45 +08:00 |
|
by
|
9cc5d30032
|
娃娃机配置信息
|
2024-09-19 18:26:27 +08:00 |
|
by
|
02dded9b9a
|
娃娃机配置信息
|
2024-09-19 18:22:35 +08:00 |
|
by
|
3c51f2794d
|
娃娃机配置
|
2024-09-19 18:11:38 +08:00 |
|
sk
|
70d051d938
|
查询房间信息更新道具表
|
2024-09-19 09:21:12 +08:00 |
|
tomas
|
002bf3ec05
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 08:56:17 +08:00 |
|
sk
|
e36c6608c3
|
查询房间信息
|
2024-09-18 18:22:46 +08:00 |
|
sk
|
03e0cdb6d7
|
查询房间信息
|
2024-09-18 18:03:06 +08:00 |
|
sk
|
aa92a9630c
|
竞技馆房主为创建者
|
2024-09-18 16:53:10 +08:00 |
|
sk
|
1b2a9c30e7
|
修复房卡房离开和开始条件
|
2024-09-18 14:59:17 +08:00 |
|
sk
|
0eeaad7caa
|
Merge branch 'develop' into dev_slots
|
2024-09-18 10:58:51 +08:00 |
|
by
|
9aeb5c3d15
|
娃娃机调转方向
|
2024-09-18 09:50:06 +08:00 |
|
tomas
|
984a501087
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-18 09:06:28 +08:00 |
|
sk
|
6240e08abe
|
竞技馆对局记录
|
2024-09-14 17:43:23 +08:00 |
|
tomas
|
9d164f86da
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-14 09:00:24 +08:00 |
|
sk
|
f8a55ec7ba
|
tienlen开发模式控牌
|
2024-09-13 18:19:44 +08:00 |
|
kxdd
|
e7e08755a4
|
娃娃机道具消耗与获得
|
2024-09-13 18:18:01 +08:00 |
|
sk
|
cfa2c003c2
|
游戏中玩家余额变化
|
2024-09-13 16:57:37 +08:00 |
|
by
|
31db186564
|
娃娃机心跳
|
2024-09-13 10:51:16 +08:00 |
|
tomas
|
af99918965
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-13 09:01:47 +08:00 |
|
by
|
d365e9be6a
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-12 09:00:38 +08:00 |
|
by
|
3492ba1631
|
心跳修改
|
2024-09-12 09:00:30 +08:00 |
|
sk
|
09202f60d3
|
同步道具列表
|
2024-09-11 18:27:40 +08:00 |
|
sk
|
4bf11eb1d1
|
竞技馆炸弹积分计算
|
2024-09-11 16:42:47 +08:00 |
|
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 |
|
tomas
|
d79718f0f2
|
fix protoid
|
2024-09-10 16:20:40 +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 |
|
tomas
|
6869021d08
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-10 11:32:14 +08:00 |
|
tomas
|
6e16eb1d52
|
add billed code
|
2024-09-10 11:32:04 +08:00 |
|
by
|
76ba1ff7b7
|
娃娃机修改
|
2024-09-10 11:12:20 +08:00 |
|
sk
|
3a7d3b9f2e
|
房卡返回问题
|
2024-09-09 17:55:13 +08:00 |
|
tomas
|
4ba65f9e87
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-09 10:25:12 +08:00 |
|
tomas
|
e61cc19bce
|
add slots
|
2024-09-09 10:24:59 +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 |
|
tomas
|
94794a4e7c
|
Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
# public
|
2024-09-07 09:00:20 +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
|
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 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23: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
|
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 |
|
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 |