Commit Graph

677 Commits

Author SHA1 Message Date
DESKTOP-45ANQ2C\unis 6ac5d365d5 娃娃卡兑换积分记录修改 2024-09-27 14:30:52 +08:00
sk fcdb12669c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:09:35 +08:00
sk 3519bedc03 no message 2024-09-27 14:08:49 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
DESKTOP-45ANQ2C\unis 6ac1a91320 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 09:33:33 +08:00
DESKTOP-45ANQ2C\unis 41a7fcfe92 娃娃卡添加兑换积分记录 2024-09-27 09:33:26 +08:00
sk 8e25bb52b4 竞技馆系统房间 2024-09-27 09:02:15 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
sk 91bb5820f9 no message 2024-09-26 10:22:56 +08:00
sk 7861f1b7da no message 2024-09-26 09:18:49 +08:00
sk f28377dd05 no message 2024-09-25 18:27:55 +08:00
sk 867df580b5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 17:47:01 +08:00
by fb6fc3920f 获取娃娃商城兑换单独接口修改 2024-09-25 17:46:02 +08:00
sk 8ebad301f2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 17:40:43 +08:00
by ef8cbfaedd 兑换记录修改 2024-09-25 17:38:13 +08:00
sk 52f8b6ad14 no message 2024-09-25 17:31:46 +08:00
by eb32e72916 娃娃兌換記錄 2024-09-25 17:04:26 +08:00
by ef7fdec1fb 娃娃兑换记录修改 2024-09-25 16:46:12 +08:00
sk 1d81754702 no message 2024-09-25 13:43:29 +08:00
sk d269955408 订单回调优化 2024-09-25 11:30:27 +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 5fd2c7c195 娃娃兑换 2024-09-24 17:03:44 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
by 85e173f3f2 proto 2024-09-23 15:38:35 +08:00
sk ef6236e3a8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 14:59:40 +08:00
sk 5ab84bd13e 离线修改道具 2024-09-23 14:56:54 +08:00
by 3c00a7d873 兌換娃娃 2024-09-23 14:22:33 +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 bf1efc0139 娃娃兑换 2024-09-21 15:39:16 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
kxdd 193c7fc3d3 Merge branch 'ma' into develop 2024-09-20 17:58:34 +08:00
kxdd 81b529d13b 娃娃机添加每局日志记录 2024-09-20 17:58:10 +08:00
by 9660136ef0 娃娃机配置 2024-09-20 17:16:25 +08:00
by 3b024058be proto修改 2024-09-20 16:44:56 +08:00
sk 19ebda3832 Merge branch 'release' into develop 2024-09-20 16:36:32 +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
sk 12c38f535b 竞技馆房间列表同步 2024-09-20 14:42:21 +08:00
by 62e2885d05 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-20 11:24:53 +08:00
by fc08fc56be 娃娃机 2024-09-20 11:24:40 +08:00
sk 9a1bdb10c7 no message 2024-09-20 11:23:18 +08:00
kxdd 62981de6cf 娃娃机明细添加道具类型 2024-09-20 11:19:58 +08:00
sk 96f87f8b62 修复绑定手机积分和竞技馆对局记录 2024-09-20 11:11:27 +08:00
sk 2b0f7b1e28 修复绑定手机积分和竞技馆对局记录 2024-09-20 10:23:01 +08:00
sk 522b284dd6 no message 2024-09-20 08:28:01 +08:00
sk 3dab56c03a 修改日志级别 2024-09-20 08:11:53 +08:00
by 4d30e087c6 娃娃兌換記錄修改 2024-09-19 18:33:27 +08:00
kxdd 7d7f5804f1 Merge branch 'develop' into ma
# Conflicts:
#	common/constant.go
2024-09-19 18:27:45 +08:00
kxdd be57df77a1 娃娃机娃娃卡获取明细 2024-09-19 18:22:36 +08:00
sk fafc946f75 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 17:20:52 +08:00
sk d82822c990 后台结算查询不到房间的问题 2024-09-19 17:20:18 +08:00
by d3642c93e4 娃娃兑换 2024-09-19 17:18:16 +08:00
sk ecb9c17920 no message 2024-09-19 14:30:18 +08:00
by 5c4e4d0f4a Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-19 13:35:57 +08:00
by 2925465b41 背包兑换娃娃 2024-09-19 13:35:34 +08:00
sk 6161d2da1c Merge branch 'develop' into review 2024-09-19 11:54:59 +08:00
sk 999eea0766 游戏中增加金币 2024-09-19 11:52:18 +08:00
sk 9c10355acf Merge branch 'develop' into review 2024-09-19 11:48:02 +08:00
sk ba27fa4b3a 金币道具优化 2024-09-19 11:47:43 +08:00
sk 7dd1a191ea 获取游戏记录使用task 2024-09-19 10:35:58 +08:00
sk 2206eba159 房间列表返回房间最大人数配置 2024-09-19 10:03:57 +08:00
sk 97a6d363e7 登录判断玩家是否在比赛场 2024-09-18 10:58:29 +08:00
sk e6105b40b0 重连如果比赛没有开始就退赛 2024-09-14 17:21:28 +08:00
sk f83b22688c 重连如果比赛没有开始就退赛 2024-09-14 16:22:06 +08:00
sk 47f98ad5f8 Merge branch 'develop' into review 2024-09-13 18:28:14 +08:00
kxdd e7e08755a4 娃娃机道具消耗与获得 2024-09-13 18:18:01 +08:00
by f1eccf335f 娃娃兑换商城 2024-09-13 17:56:06 +08:00
sk 5ac106365e 道具修改优化 2024-09-12 18:29:47 +08:00
sk 6eedc84050 竞技馆房主付费 2024-09-11 17:47:44 +08:00
sk ef15347caf 竞技馆房主付费 2024-09-11 17:30:05 +08:00
sk 0df3e0938c 竞技馆房主付费 2024-09-11 17:21:12 +08:00
sk d74c868947 好友进房消耗检查 2024-09-11 16:26:05 +08:00
sk 1063cc8fba 盲盒问题 2024-09-11 16:17:18 +08:00
sk cc882657a4 开发模式每分钟保存一次玩家数据 2024-09-11 13:37:46 +08:00
sk 8dac055bd6 进入房间房卡校验 2024-09-11 09:32:01 +08:00
sk 3b18460edb 房卡是否足够 2024-09-09 18:24:43 +08:00
sk 3a7d3b9f2e 房卡返回问题 2024-09-09 17:55:13 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
sk d27a04020e 好友进房问题 2024-09-09 10:40:26 +08:00
sk ea6ef0be41 房卡扣除问题 2024-09-09 10:24:37 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +08:00
sk 4eee248f20 竞技馆房间解散问题 2024-09-07 16:58:01 +08:00
sk 8174e6c406 商店购买备注 2024-09-07 14:15:56 +08:00
sk 4da55c9588 游戏中同步实时金币 2024-09-06 18:33:28 +08:00
sk 5bdf3d78df 商店购买 2024-09-06 16:23:57 +08:00
sk c20f0fa69c 商城购买参数 2024-09-06 15:39:30 +08:00
sk 63387ba9b4 商城购买房卡 2024-09-06 14:46:30 +08:00
sk fc2db94c86 竞技馆列表刷新 2024-09-06 14:00:34 +08:00
sk 32e8b2f22e 房卡默认加成 2024-09-06 11:22:29 +08:00
sk 40966b52cb 竞技馆房间配置 2024-09-06 09:50:19 +08:00
sk fccb385f79 竞技馆房间配置包类型校验 2024-09-05 18:47:21 +08:00
sk e33fe64bca 房间列表查询 2024-09-05 14:20:36 +08:00
sk f056014c50 玩家游戏数据保存 2024-09-05 11:24:46 +08:00
sk 88bbca47f1 推广渠道 2024-09-04 17:24:29 +08:00
sk 4a32df4ecf 竞技馆 2024-09-04 15:31:35 +08:00
sk 9c1fed84e9 竞技馆读取后台配置 2024-09-04 14:53:29 +08:00
sk ac86a5e294 删除竞技馆测试配置 2024-09-04 14:21:21 +08:00
sk 5b6a5ad5d3 竞技馆房间信息 2024-09-04 11:54:59 +08:00
sk 7c00ec5067 道具修改失败返回错误码 2024-09-03 18:42:49 +08:00
sk 05a54af2db 活动礼包 2024-09-03 10:02:26 +08:00
sk 151a739dab 创建房间参数初始化 2024-09-02 16:26:05 +08:00
sk 00dcc3199f 竞技馆房主付费 2024-09-02 16:13:23 +08:00
sk 04a0772415 竞技馆 2024-09-02 14:35:10 +08:00
sk 9f490a7aca 竞技馆 2024-09-02 11:44:12 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
sk 74efab000e 新增拉霸游戏 2024-08-30 17:19:03 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
sk 33eab3f5bc 竞技馆房间列表变更通知 2024-08-29 16:35:57 +08:00
sk 94ca1562e5 解决冲突 2024-08-29 14:51:32 +08:00
sk 3bff2c17f3 review 2024-08-29 14:28:54 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
sk bfdf500eec 创建房间参数优化 2024-08-28 16:08:55 +08:00
sk 94a4737609 比赛场房间排名 2024-08-28 09:14:02 +08:00
sk cae5536ed3 房卡消耗记录 2024-08-28 09:12:01 +08:00
sk 17c0817dab 游戏服道具变化同步到大厅 2024-08-27 17:05:00 +08:00
sk 466eafe1bc 房间信息添加比赛配置id 2024-08-26 18:13:15 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk 4e6b92cd33 review 2024-08-24 18:26:31 +08:00
sk 7222426469 竞技馆后台配置 2024-08-24 18:25:03 +08:00
sk a040d30354 道具出售金额用int64 2024-08-24 15:49:07 +08:00
sk 4c0c6f7c2b 竞技馆后台协议 2024-08-23 18:11:54 +08:00
sk a13ed034d7 比赛观战错误码 2024-08-23 09:43:51 +08:00
sk 8736f54fe1 现金购买后vip经验获得调整 2024-08-22 16:07:17 +08:00
sk 919129d70f Merge branch 'custom' into develop 2024-08-22 14:49:19 +08:00
sk 7ebe12c3de review 2024-08-22 14:48:06 +08:00
sk 18e3e5cd7d 比赛观战开关 2024-08-22 13:54:22 +08:00
sk 71655d8126 比赛观战 2024-08-22 09:43:10 +08:00
sk 00b0e01000 比赛观战 2024-08-21 11:31:38 +08:00
sk 6153903f31 比赛场比赛中列表 2024-08-20 10:44:42 +08:00
sk fc29fcddd8 比赛列表返回图标信息 2024-08-20 09:54:57 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
sk 96bbac8533 no message 2024-08-19 13:52:09 +08:00
sk 0f7da88dab 新手引导开启时注册的账号才有引导 2024-08-19 10:18:08 +08:00
sk 07150c660d review 2024-08-19 09:56:08 +08:00
sk 159e69094f 小精灵配置 2024-08-16 15:08:44 +08:00
sk e5b80fda16 小精灵功能 2024-08-16 11:28:01 +08:00
sk eba92ed00b 修改ChannelId 2024-08-16 09:51:35 +08:00
sk b1c936fae8 Merge branch 'look' into develop 2024-08-15 16:28:50 +08:00
sk e93616dcc9 比赛观战 2024-08-15 16:18:22 +08:00
sk 514d6fdf37 优化比赛场奖励领取次数限制 2024-08-15 15:54:38 +08:00
sk 28921649c5 删除冗余代码 2024-08-15 15:54:30 +08:00
sk cb907ae642 删除测试代码 2024-08-14 09:25:59 +08:00
sk 42099b3d59 兑换商品返回商品id 2024-08-13 16:56:32 +08:00
sk a2a70a130b 比赛场排名不在有并列的情况积 2024-08-12 17:36:04 +08:00
sk 5b399100e1 vip等级礼包获得奖励 2024-08-12 16:45:12 +08:00
sk ff086c3de3 兑换信息补充 2024-08-12 16:37:08 +08:00
sk dc631f4334 比赛场记录机器人皮肤 2024-08-12 16:30:03 +08:00
sk fd510661b7 兑换商品支持道具数量信息 2024-08-12 14:53:04 +08:00
sk 28826622c8 兑换商品支持道具数量信息 2024-08-12 14:25:26 +08:00
sk 53022f51d9 vip免费比赛次数 2024-08-12 11:52:31 +08:00
sk e4a43ee469 vip每日奖励 2024-08-12 10:36:45 +08:00
sk 7f75f9a0a4 比赛场轮次淘汰允许不淘汰人员 2024-08-10 19:13:02 +08:00
sk 28622d6ffc vip等级礼包原价参数 2024-08-09 17:14:59 +08:00
sk 951b23f99d vip礼包领取 2024-08-09 16:43:48 +08:00
sk 16bcd9a858 支付返回参数扩展 2024-08-09 16:37:57 +08:00
sk 9dd4496b55 no message 2024-08-09 14:27:59 +08:00
sk 427098ee00 兑换礼包领取记录 2024-08-09 14:25:19 +08:00
sk e49ecbc1a1 vip等级礼包 2024-08-09 11:37:44 +08:00
sk c8ba3b74ee vip特权1数据结构调整 2024-08-08 18:25:18 +08:00
sk 61523b30d5 兑换礼包记录 2024-08-08 17:26:30 +08:00
sk a51037b1e7 新手引导 2024-08-08 14:59:42 +08:00
sk c988804222 皮肤红点通知 2024-08-06 16:24:07 +08:00
sk 95fcaa5977 vip升级检查皮肤红点 2024-08-10 01:05:28 +08:00
sk f0c42316f7 vip升级检查皮肤红点 2024-08-10 00:21:12 +08:00
sk 29c71a6efc fix:比赛场积分错误
周卡每日金币不能添加到比赛场
2024-08-10 00:20:47 +08:00
sk 7ceef9878c update excel 2024-08-06 10:27:08 +08:00
sk d6111cc733 update develop 2024-08-06 08:59:50 +08:00
sk fe1e66fec2 皮肤加成 2024-08-05 17:05:03 +08:00
sk 88e34954ad Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-08-05 14:17:05 +08:00
sk 3bc1019fd5 vip每日礼包加成 2024-08-05 14:16:53 +08:00
sk 378b4cc681 update skin 2024-08-05 10:09:10 +08:00
sk c2a5d9b3b9 no message 2024-08-02 17:47:59 +08:00
by fa28e3233c 获奖记录修改 2024-08-02 15:26:36 +08:00
sk 8a56eb5776 道具分解 2024-08-01 18:34:17 +08:00
by 45a5dd6852 获奖记录 删除测试代码 2024-07-31 11:18:39 +08:00
by db01ddcb0d 获奖记录修改 2024-07-31 11:16:36 +08:00
by 36cce9df01 获奖记录修改 2024-07-31 11:15:08 +08:00
by 4d2a136eca 获奖记录修改 2024-07-31 10:09:49 +08:00
by 1136da298c 获奖记录修改 2024-07-31 09:42:41 +08:00
by 195ce9ff69 获奖记录修改 2024-07-31 09:36:57 +08:00
by ac1ee02c4d 获奖记录 2024-07-30 18:44:44 +08:00
sk a7a25ef028 解决冲突 2024-07-30 18:19:13 +08:00
sk 7b05295d67 获奖记录 2024-07-30 17:58:56 +08:00
by e318c85c26 获奖记录 2024-07-30 17:53:37 +08:00
by 107ac98d81 获奖记录 2024-07-30 17:04:41 +08:00
by 805c82bdd5 弹窗配置 2024-07-30 16:21:05 +08:00
by a5cd7beeeb 获奖记录 2024-07-30 15:47:35 +08:00
by 7d5085bf11 获奖记录 2024-07-30 15:16:44 +08:00
by eb3fefb9b8 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-30 14:40:11 +08:00
by fa3e48cd26 获奖记录 2024-07-30 14:40:06 +08:00
sk 86ba780a40 增加道具 2024-07-30 09:25:50 +08:00
sk b6796cd8f6 解决冲突 2024-07-29 10:03:18 +08:00
sk 158aea0bf7 皮肤解锁类型新增vip等级解锁 2024-07-27 18:15:48 +08:00
by 7e04ceecee 获奖记录 2024-07-27 11:51:53 +08:00