Commit Graph

53 Commits

Author SHA1 Message Date
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
sk 57c58b2fb2 修复v卡掉落问题 2024-09-20 16:53:10 +08:00
sk 288624a55b 房间真人数量统计错误 2024-09-10 15:04:11 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +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
sk 92bf5fe16e review 2024-09-03 18:09:09 +08:00
kxdd c4d58262de 娃娃机添加流ID 2024-09-03 17:50:19 +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 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
sk 034abb64e2 牌局回放 2024-09-03 11:20:49 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
by ccc0e97635 娃娃机etcd配置 2024-08-29 11:55:57 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk f4434bd945 去掉ParamsEx,agentor 2024-08-24 18:22:06 +08:00
sk 71655d8126 比赛观战 2024-08-22 09:43:10 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 8c622c1d63 v卡掉落调整 2024-07-23 17:19:43 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk 5e0b6139f9 tienlen记录调控信息 2024-06-03 16:54:54 +08:00
sk 60255489d5 预创建房间 2024-05-28 09:58:18 +08:00
sk 97e03e2c22 游戏掉落 2024-05-25 16:32:17 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
sk dcb54a2f58 修改道具掉落功能 2024-05-11 15:54:33 +08:00
sk d7316c0ef2 review 2024-05-10 18:23:03 +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
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +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
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
sk 77fbd7dfba 拉霸数据统计 2024-04-25 16:41:53 +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 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00