Commit Graph

353 Commits

Author SHA1 Message Date
by 8a0502302f 年兽排行榜 2025-01-03 14:09:43 +08:00
sk d63043d3fc 解决冲突 2025-01-02 18:04:24 +08:00
sk 231cff3c4a add 累计消耗活动 2025-01-02 17:57:47 +08:00
sk 53889d6a80 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 16:40:23 +08:00
sk f845409979 add 红包活动 2025-01-02 16:39:56 +08:00
by 36708d2af6 年兽活动 排行榜奖励配置 2025-01-02 16:35:17 +08:00
by e4b85bf503 年兽兑换 2025-01-02 16:14:21 +08:00
by d1c2e2437c 配置文件 2025-01-02 11:31:01 +08:00
by 79e05883db Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	common/constant.go
#	etcd/keyconf.go
#	model/config.go
#	model/player.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
#	worldsrv/welfmgr.go
2025-01-02 11:29:47 +08:00
by 9fd80b867d 年兽活动 2025-01-02 11:18:58 +08:00
sk c9bae9e147 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 09:59:36 +08:00
DESKTOP-45ANQ2C\unis 86ac616d2d 编译错误 2025-01-02 09:58:38 +08:00
sk c00b794dc3 add 红包活动 2025-01-02 09:51:44 +08:00
DESKTOP-45ANQ2C\unis c482f45e70 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/welfare/welfare.pb.go
2025-01-02 09:46:41 +08:00
DESKTOP-45ANQ2C\unis a9cb952e52 存钱罐道具奖励显示添加 2025-01-02 09:43:41 +08:00
sk 7f6b4a86ae add 红包活动 2025-01-02 09:21:40 +08:00
DESKTOP-45ANQ2C\unis 531df8e564 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/server/pbdata.pb.go
2024-12-27 10:05:12 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk 5368460ad3 add 各游戏破产金额 2024-12-26 11:01:17 +08:00
sk bbe6c99209 modify 在线玩家列表 2024-12-21 11:47:30 +08:00
sk b186967189 add 十三张记录分别自动手动摆牌时长 2024-12-20 16:09:26 +08:00
sk e9e0aac833 update data 2024-12-10 15:19:44 +08:00
sk 0143ebbe12 修复dbgamefree协议 2024-12-05 09:42:38 +08:00
sk 2b88155177 添加十三张预选牌功能 2024-12-02 17:57:46 +08:00
sk f532cee29b 更新配置文件 2024-12-02 14:32:55 +08:00
sk 57def951c1 更新配置文件 2024-12-02 13:54:49 +08:00
tomas 5dcd4175f9 add cm goo proto and mouse.go 2024-12-02 10:40:19 +08:00
sk 343a7a7abb 抽奖活动通知获的抽奖码 2024-11-22 17:02:46 +08:00
sk 196d211fff 十三张阶段时间可配置 2024-11-22 16:08:34 +08:00
DESKTOP-45ANQ2C\unis 72ffbf9da3 Merge branch 'dev_compose' into develop 2024-11-22 10:13:11 +08:00
DESKTOP-45ANQ2C\unis 7b76389509 合成功能 2024-11-22 10:06:28 +08:00
sk 1e2eeebfda 竞技馆房间列表返回房主id 2024-11-21 13:22:45 +08:00
tomas aaf417c9fe Merge remote-tracking branch 'origin/develop' into dev_slots 2024-11-19 13:38:20 +08:00
sk 949e6f89e3 添加注释 2024-11-18 18:08:37 +08:00
sk d3f276f0bf 兑换优化 2024-11-14 11:13:47 +08:00
tomas f47cddc7c1 add tiger proto 2024-11-13 10:10:13 +08:00
sk 90e11a0dad 兑换商城地址 2024-11-12 15:08:16 +08:00
sk 0932715970 修改脚本 2024-11-08 11:28:13 +08:00
sk 45e1fd8a80 网页兑换 2024-11-07 17:48:22 +08:00
sk 195a8c4b70 脚本优化 2024-11-06 14:19:02 +08:00
tomas 5e8572632a add proto 2024-11-04 10:31:45 +08:00
by 778de206ca 引導增加url 2024-11-04 09:38:25 +08:00
sk e77714fded 登录返回玩家id 2024-11-04 09:14:11 +08:00
sk e9583d2886 网页登录接口 2024-11-01 17:50:04 +08:00
by 23538c0a35 更新proto 2024-11-01 14:46:12 +08:00
by 6f6926dd9f 引导修改 2024-11-01 14:39:54 +08:00
by 0688dc550a 引导修改 2024-11-01 14:15:47 +08:00
by cdc51a2eba 引导功能实现 2024-11-01 13:59:06 +08:00
sk aab1e45d5f 招募功能协议 2024-11-01 02:46:55 +08:00
sk 85f3dcec6c 招募功能协议 2024-11-01 02:24:19 +08:00