Commit Graph

31 Commits

Author SHA1 Message Date
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 b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
sk a77cfa41dd 离开房间返回错误码 2024-08-29 16:54:30 +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 fe8ccec885 review 2024-08-20 09:46:13 +08:00
by 154a037e08 娃娃机监听消息 2024-08-15 11:31:45 +08:00
by 8ff978db72 娃娃机返回操作结果 2024-08-14 16:22:57 +08:00
by d2a8b0e618 娃娃机修改 2024-08-14 12:06:15 +08:00
by d703046f63 娃娃机 2024-08-13 14:47:12 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
by d232592524 娃娃机主机实现 2024-08-10 15:48:01 +08:00
sk 33f0d7c8aa 添加娃娃机服务 2024-08-08 16:03:59 +08:00
sk 64577b5f2a 记录注册ip 2024-07-13 14:56:09 +08:00
sk 16fc31fbb0 同步皮肤修改 2024-07-13 09:30:38 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk c8be1b9320 etcd,rabbitmq防止在init方法隐式调用 2024-05-22 17:57:42 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop
# Conflicts:
#	model/player.go
2024-05-13 16:07:25 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +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 f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +08:00
sk f4205e72ac no message 2024-04-29 18:20:38 +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 9405ae091e init 2024-04-12 10:35:47 +08:00