Commit Graph

390 Commits

Author SHA1 Message Date
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
sk 5747ad0380 抽奖活动开奖剩余时间 2024-10-31 09:12:09 +08:00
sk 825c1ca667 抽奖活动上期中奖信息 2024-10-30 09:43:41 +08:00
sk f87ab997aa 邀请好友进房失败信息 2024-10-29 13:23:57 +08:00
sk cc8df988bd 请求好友进房卡场 2024-10-29 11:03:28 +08:00
sk 27c4fc5bf9 竞技馆添加赢家信息 2024-10-29 10:44:17 +08:00
sk 11ce50e0df 邀请好友进房卡房返回需要房卡数量 2024-10-29 10:24:05 +08:00
sk d8a6246f93 竞技馆中奖广播 2024-10-29 10:11:33 +08:00
sk 0333ef441e 抽奖中奖历史显示问题 2024-10-26 17:50:21 +08:00
sk 1e186dba66 抽奖活动随机开奖码 2024-10-25 13:47:50 +08:00
sk 9f511e35eb 抽奖活动中奖历史记录玩家头像 2024-10-25 10:47:44 +08:00
sk 9cc386b25f 抽奖活动跨天重置 2024-10-26 00:17:46 +08:00
sk 7e52629091 竞技馆抽奖活动图片视频资源设置 2024-10-23 18:04:14 +08:00
sk 8b1ae79c9b no message 2024-10-23 10:57:50 +08:00
sk c8a39f2d1f 解决冲突 2024-10-23 10:56:07 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
tomas 259519bae5 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-18 13:34:38 +08:00
DESKTOP-45ANQ2C\unis 083dccffb9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-18 11:48:26 +08:00
DESKTOP-45ANQ2C\unis 1ad97c27a7 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-18 11:48:04 +08:00
by 8d9ef2a928 创建订单增加购买类型 2024-10-18 10:33:31 +08:00
tomas ce931c98b6 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-17 17:05:53 +08:00
sk eff3cad970 竞技馆抽奖活动协议 2024-10-17 13:05:36 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk 4947685627 no message 2024-10-15 16:22:39 +08:00
sk db3f7bee67 添加调控开关 2024-10-15 16:15:04 +08:00
by 8ee0093ccf 后台弹窗配置 2024-10-15 14:18:16 +08:00
tomas 2201f656f1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-14 10:24:16 +08:00
sk 98289116a3 抽奖活动协议 2024-10-12 13:33:40 +08:00
tomas 5165221498 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-11 09:00:03 +08:00
sk e5378e46f9 首冲加赠是否翻倍 2024-10-10 17:50:19 +08:00
sk 4c4af75a76 客户端升级奖励 2024-10-10 15:27:21 +08:00
sk 948f90be29 客户端版本校验 2024-10-09 17:11:26 +08:00
sk d09d4a4284 大厅道具变更同步到游戏 2024-10-09 09:18:09 +08:00
tomas 29e9c7bfe8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 08:52:34 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
tomas b83a6d6d5b Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-27 10:49:56 +08:00
DESKTOP-45ANQ2C\unis 41a7fcfe92 娃娃卡添加兑换积分记录 2024-09-27 09:33:26 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
tomas d8398465be Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 08:58:26 +08:00
by ef7fdec1fb 娃娃兑换记录修改 2024-09-25 16:46:12 +08:00
by 532ff64d3b 商城兑换娃娃 2024-09-25 09:47:40 +08:00
kxdd ad8b3fe1ce Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 09:22:48 +08:00
kxdd 36a7a61178 娃娃机添加抓取记录 2024-09-25 09:22:39 +08:00
sk 6684dbcec6 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-24 18:32:14 +08:00
sk b4cebfd687 竞技馆系统房间功能 2024-09-24 18:32:00 +08:00
by b04d422d8b 娃娃机离线 踢出房间玩家 2024-09-24 16:36:39 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
sk 9190e5a19b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 16:55:42 +08:00
sk df3c4d353e 添加竞技馆获奖记录查询接口 2024-09-23 16:43:35 +08:00
by 85e173f3f2 proto 2024-09-23 15:38:35 +08:00
sk 4b8f6e6274 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 11:30:37 +08:00
sk 72b8f927b0 登录后根据道具记录恢复道具数量 2024-09-23 11:29:36 +08:00
by e6aa0dd1a9 proto 2024-09-23 10:03:53 +08:00
by 020e9b9664 娃娃机后台配置 2024-09-23 09:58:33 +08:00
tomas d5d3c225f2 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-23 08:59:21 +08:00
by 68f0ac9f06 proto 2024-09-21 17:44:30 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
tomas 348b5fcb90 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-21 10:43:54 +08:00
by 3b024058be proto修改 2024-09-20 16:44:56 +08:00
by 2749862be9 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-20 16:36:38 +08:00
by 4581f41fb8 proto 2024-09-20 16:36:25 +08:00
sk 2c6ea1c7e2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-20 16:36:22 +08:00
by 7d3613ee39 娃娃机配置 2024-09-20 16:07:10 +08:00
sk bc5df2cd0f 商品分类添加显示位置配置 2024-09-20 15:14:27 +08:00