tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,612 Commits 9 Branches 0 Tags 86 MiB
Commit Graph

411 Commits

Author SHA1 Message Date
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
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
sk 6c4e49ef44 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-03 16:40:53 +08:00
kxdd 9ef1f9d896 娃娃机报错修改 2024-09-03 16:09:43 +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
kxdd ddcaa62f13 娃娃机修改 2024-09-03 15:10:41 +08:00
sk 034abb64e2 牌局回放 2024-09-03 11:20:49 +08:00
sk 5c6dce2f4d 房卡场中途不能离开房间 2024-09-03 10:57:05 +08:00
kxdd 6a9c6a988b 娃娃机获取token修改 2024-09-02 16:23:45 +08:00
sk 00dcc3199f 竞技馆房主付费 2024-09-02 16:13:23 +08:00
sk 26db8f4b21 竞技馆 2024-09-02 14:55:18 +08:00
sk 9f490a7aca 竞技馆 2024-09-02 11:44:12 +08:00
sk 1d9bfd5802 竞技馆 2024-09-02 10:08:23 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
by ece16ac947 获取token 2024-08-30 16:45:07 +08:00
by 3a6e420e98 token测试数据 2024-08-30 15:34:28 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
kxdd 958a3b1ba4 娃娃机等待玩家添加 2024-08-30 11:56:15 +08:00
sk a77cfa41dd 离开房间返回错误码 2024-08-29 16:54:30 +08:00
sk 94ca1562e5 解决冲突 2024-08-29 14:51:32 +08:00
sk 3bff2c17f3 review 2024-08-29 14:28:54 +08:00
by ccc0e97635 娃娃机etcd配置 2024-08-29 11:55:57 +08:00
by 94d7e4f45f Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 
# Conflicts:
#	protocol/clawdoll/clawdoll.pb.go
 2024-08-29 11:33:26 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
kxdd ebe7b1c4c8 娃娃机协议修改 2024-08-28 17:00:31 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
kxdd cbd00bf0f8 娃娃机状态修改 2024-08-27 15:13:32 +08:00
sk 466eafe1bc 房间信息添加比赛配置id 2024-08-26 18:13:15 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk f4434bd945 去掉ParamsEx,agentor 2024-08-24 18:22:06 +08:00
by ba9dde2005 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-24 16:11:03 +08:00
by 4580f69514 请求token注册协议修改 2024-08-24 16:10:28 +08:00
kxdd aed283b37e Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-24 15:17:17 +08:00
kxdd 87486f1a48 娃娃机状态流程修改 2024-08-24 15:13:22 +08:00
sk ab974063e8 tienlen比赛场观战发送玩家手牌 2024-08-22 17:48:10 +08:00
by 88db5712d8 娃娃机获取token 2024-08-22 15:43:28 +08:00
sk 71655d8126 比赛观战 2024-08-22 09:43:10 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
by 154a037e08 娃娃机监听消息 2024-08-15 11:31:45 +08:00
kxdd f23cfda629 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-14 16:24:31 +08:00
kxdd a4b4a0b2a0 封装移动投币操作 2024-08-14 16:23:58 +08:00
by 8ff978db72 娃娃机返回操作结果 2024-08-14 16:22:57 +08:00
kxdd 2c8ce6a467 添加上分投币 2024-08-14 15:53:27 +08:00
kxdd ac608b4a44 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-14 14:25:46 +08:00
kxdd 1fff8b2ebb 添加移动响应 2024-08-14 14:09:05 +08:00
by d2a8b0e618 娃娃机修改 2024-08-14 12:06:15 +08:00
kxdd 49b0c6cc00 下抓通知添加 2024-08-13 15:33:44 +08:00
by d703046f63 娃娃机 2024-08-13 14:47:12 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
sk dc631f4334 比赛场记录机器人皮肤 2024-08-12 16:30:03 +08:00
by 4880d41aa3 娃娃机 2024-08-10 16:24:10 +08:00
by d232592524 娃娃机主机实现 2024-08-10 15:48:01 +08:00
sk 33f0d7c8aa 添加娃娃机服务 2024-08-08 16:03:59 +08:00
sk dd0794d0de no message 2024-08-07 08:24:28 +08:00
sk 29c71a6efc fix:比赛场积分错误 
周卡每日金币不能添加到比赛场
 2024-08-10 00:20:47 +08:00
sk e790746f53 比赛场随机发牌 2024-08-05 17:22:15 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 5eaa1e2016 皮肤技能加成 2024-07-25 09:57:31 +08:00
sk 8c622c1d63 v卡掉落调整 2024-07-23 17:19:43 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 64577b5f2a 记录注册ip 2024-07-13 14:56:09 +08:00
sk 16fc31fbb0 同步皮肤修改 2024-07-13 09:30:38 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk 7010f6215e 解决冲突 2024-07-05 09:28:41 +08:00
by 2d7921897a 宠物技能游戏内展示 2024-07-02 11:29:41 +08:00
by b6aaf756e6 宠物技能 2024-07-01 11:47:42 +08:00
sk a67c747a46 解决冲突 2024-06-28 16:58:58 +08:00
by 606aff2240 金币存钱罐BUG修改 2024-06-27 17:12:48 +08:00
sk 2520ec2e7d 解决冲突 2024-06-19 15:26:25 +08:00
sk 2a7ada450a 增加钻石消耗记录类型 2024-06-14 18:35:52 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk 3526ef069f 解散空闲房间 
房间没有真人或观众，并且长时间没有真人进出房间就解散
 2024-06-12 14:39:27 +08:00
sk 604f7099ec 修改HOOK_AFTER_STOP 2024-06-06 16:04:03 +08:00
sk a13390909d 十三张调控记录 2024-06-05 09:14:53 +08:00
sk 5e0b6139f9 tienlen记录调控信息 2024-06-03 16:54:54 +08:00
sk 9177d20d5e 修复空指针异常 2024-05-29 09:17:14 +08:00
sk 60255489d5 预创建房间 2024-05-28 09:58:18 +08:00
sk 97e03e2c22 游戏掉落 2024-05-25 16:32:17 +08:00
sk eddad2e788 解决冲突 2024-05-24 10:48:22 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk 27dfedab18 etcd 2024-05-24 09:37:34 +08:00
sk c8be1b9320 etcd,rabbitmq防止在init方法隐式调用 2024-05-22 17:57:42 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
sk 8fb59d54fc 拉霸奖池金额数据类型错误 2024-05-17 15:44:48 +08:00
sk 393ef19b14 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-17 11:32:17 +08:00
kxdd 9b3a1b4d7c Merge branch 'dev_timeitem_n1' into develop 2024-05-17 11:08:08 +08:00
kxdd c43068db93 记牌器赠送修改 2024-05-17 11:07:45 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 0059b6d0c5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-13 18:49:19 +08:00
sk 7cabdd4d14 tienlen记牌器问题 2024-05-13 18:48:44 +08:00
sk edd992aecd 兑换商城自提，优化道具使用日志 2024-05-13 18:48:44 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop 
# Conflicts:
#	model/player.go
 2024-05-13 16:07:25 +08:00
kxdd 8a5752bf38 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011279 2024-05-13 16:01:49 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
sk 1de1383383 tienlen排位加成 2024-05-13 12:02:16 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
sk dcb54a2f58 修改道具掉落功能 2024-05-11 15:54:33 +08:00
sk d7316c0ef2 review 2024-05-10 18:23:03 +08:00
sk 995cabbea6 update DB_GameItem.xlsx 2024-05-10 18:04:25 +08:00
sk 0d81105909 添加配置参数 
CloseChannelSwitch 关闭渠道开关功能
 2024-05-10 17:10:45 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
sk 9474b0dc30 修改游戏掉落物品配置规则 2024-05-10 14:47:38 +08:00
sk 6bd9d8f6c5 重置水池 2024-05-08 18:49:00 +08:00
sk 05f1e805b5 重置水池 2024-05-08 18:33:33 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00
sk 48456483c7 tienlen牌库随机索引错误 2024-05-07 16:19:03 +08:00
kxdd 04cf926909 Merge branch 'dev_pigbank' into develop 2024-05-07 13:43:15 +08:00
kxdd 7b79b0defd 存钱罐 tienlen场景判断修改 2024-05-07 13:41:24 +08:00
kxdd ad4a424024 Merge branch 'dev_newTimeitem' into develop 
# Conflicts:
#	gamesrv/tienlen/playerdata_tienlen.go
 2024-05-06 18:34:37 +08:00
kxdd 7113465765 记牌器优化 2024-05-06 16:37:09 +08:00
kxdd bbf2e11d8b 记牌器调整添加 
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
 2024-05-06 16:18:11 +08:00
sk 9338164838 兼容以0开头的手机号登录 2024-05-06 15:45:06 +08:00
kxdd 7756f3ae19 还原本来的道具功能 
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
 2024-05-06 13:44:49 +08:00
kxdd 83f571b543 Merge branch 'dev_pigbank' into develop 2024-05-06 10:31:22 +08:00
kxdd 84373d1297 【对局失败后存钱罐内没有存钱】https://www.tapd.cn/31044302/bugtrace/bugs/view?bug_id=1131044302001000241 2024-05-06 10:30:45 +08:00
kxdd 016ea68379 Merge branch 'dev_pigbank' into develop 2024-04-30 18:45:34 +08:00
kxdd 7c689dc6ec 存钱罐修改 2024-04-30 18:44:51 +08:00
sk 1979637197 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-30 17:45:51 +08:00
kxdd 909523ec3e Merge branch 'dev_pigbank' into develop 
# Conflicts:
#	common/constant.go
#	data/DB_Pigbank_Prop.dat
#	data/DB_Pigbank_Prop.json
#	gamesrv/tienlen/playerdata_tienlen.go
#	protocol/server/pbdata.pb.go
#	xlsx/DB_Pigbank_Prop.xls
存钱罐功能
 2024-04-30 14:22:18 +08:00
kxdd b10cf493b5 存钱罐添加日志 2024-04-30 14:05:36 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
sk f4205e72ac no message 2024-04-29 18:20:38 +08:00
sk bd92567666 解决冲突 2024-04-29 17:20:53 +08:00
lihailiang 03a67c3778 Merge branch 'dev_timeitem' into develop 
# Conflicts:
#	common/constant.go
#	data/DB_GameItem.dat
#	protocol/server/pbdata.pb.go
#	protocol/server/server.pb.go
#	tools/xlsx2binary/agc.go
#	xlsx/DB_GameItem.xlsx
 2024-04-28 18:23:13 +08:00
kxdd a7ec02b38e 1.记牌器道具时限修改 
2.存钱罐数据创建
 2024-04-28 17:36:08 +08:00
sk 40822ad4d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 15:11:01 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk 2fe90f46a5 游戏牌局统计 2024-04-26 14:51:37 +08:00
lihailiang e2e2a446bf tienlen时效类道具控制 2024-04-26 10:08:55 +08:00
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
sk 2e0e6c72d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-25 16:44:11 +08:00
sk 77fbd7dfba 拉霸数据统计 2024-04-25 16:41:53 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk 82b406cbcd 水池添加调节赔率和新手池 2024-04-24 16:26:35 +08:00
by 9f4d1089cb Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-23 10:29:21 +08:00
by 91ec9259bb 玩家等级排行榜 2024-04-23 09:58:57 +08:00
sk 12383a1e20 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-23 09:05:26 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
kxdd 5c37af3fe1 添加记牌器 2024-04-22 18:36:04 +08:00
sk 9a9c62c1da etcd优化 2024-04-20 10:20:22 +08:00
sk 65aa4efebb fix:个人水池全局配置读取失败 2024-04-19 17:55:05 +08:00
sk 33a087d1d7 开启拉霸游戏 2024-04-19 11:43:13 +08:00
sk aadfc98306 no message 2024-04-19 09:57:48 +08:00
sk 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk 8ac802e2a3 fix:道具数量同步错误 2024-04-17 17:49:34 +08:00
kxdd d792e0ceb1 【高棉象棋的每步时长优化】 
https://www.tapd.cn/31044302/prong/stories/view/1131044302001000540
 2024-04-17 14:48:40 +08:00
sk c6799597c3 rename 2024-04-17 10:19:01 +08:00
sk 4702c2d8bb 过滤rabbitmq机器人消息 2024-04-17 09:15:07 +08:00
sk 737fea1e23 活动代码优化 2024-04-16 17:44:56 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk 84dd2bdc79 init 2024-04-15 15:12:47 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00