Commit Graph

179 Commits

Author SHA1 Message Date
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