Compare commits

...

1695 Commits

Author SHA1 Message Date
DESKTOP-45ANQ2C\unis 73b3337888 时限类道具功能修改 2024-12-25 10:54:08 +08:00
DESKTOP-45ANQ2C\unis a0884972d3 道具索引id修改为字符串 2024-12-23 18:10:37 +08:00
sk 68f51d0c5d add 拉霸游戏时长 2024-12-21 16:45:25 +08:00
sk 142b2f0ba5 no message 2024-12-21 15:21:26 +08:00
sk 696267d954 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-21 11:48:32 +08:00
sk bbe6c99209 modify 在线玩家列表 2024-12-21 11:47:30 +08:00
tomas 71bc527f96 del free betlimit 2024-12-21 10:12:16 +08:00
sk 1235383c87 no message 2024-12-21 09:46:34 +08:00
sk 8177397b26 add 统计十三张自动手动摆牌时间 2024-12-21 09:13:01 +08:00
sk 694e8a5992 modify 十三张手动摆牌 2024-12-21 09:05:08 +08:00
sk b186967189 add 十三张记录分别自动手动摆牌时长 2024-12-20 16:09:26 +08:00
sk d82c5ed055 modify mq 2024-12-20 10:43:12 +08:00
sk e044a590d4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-20 09:21:40 +08:00
sk 39890efbfa add:破产记录添加游戏组id 2024-12-20 09:21:24 +08:00
by 09a609b1b3 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-12-19 18:03:03 +08:00
by e2095d6878 后台补单 2024-12-19 18:02:51 +08:00
sk bb8af52a6b modify:平均游戏时长查询优化 2024-12-19 17:52:33 +08:00
sk 08023bcdea fix:游戏分组统计数据 2024-12-19 17:50:49 +08:00
sk 893bc4cbbb modify:房费扣除 2024-12-19 17:23:46 +08:00
sk a9efaed491 fix:tienlen调试发牌修改 2024-12-19 14:40:00 +08:00
sk 88b4c08740 fix:tienlen调试发牌修改 2024-12-19 14:36:42 +08:00
sk 167e1e9c10 add:tienlen调试发牌修改 2024-12-19 14:07:18 +08:00
sk 1ed0d5b4d7 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-19 13:47:49 +08:00
sk 7a7baa9568 modify:十三张牌型预选
支持清空预选
空位随机补牌
2024-12-19 13:47:29 +08:00
sk 30d3ba1cc0 add:查询平均游戏时长 2024-12-19 11:48:56 +08:00
by 9b59039d4b 后台补单 2024-12-18 09:31:49 +08:00
by 7d0d5e9509 后台补单log 2024-12-18 09:19:57 +08:00
sk 93792b3e38 add:添加日志 2024-12-17 14:25:11 +08:00
sk f4964a57a2 fix:统计游戏组数据 2024-12-17 14:12:52 +08:00
sk 0c65af22ea add:对局中玩家人数上报 2024-12-17 13:29:50 +08:00
sk 1f24dd29b6 no message 2024-12-17 10:35:21 +08:00
sk 4b29c43709 modify:.gitignore 2024-12-17 10:34:55 +08:00
sk 4e59c6600c 道具记录记录gamedif 2024-12-16 17:51:21 +08:00
sk 442801fc9a 游戏记录添加游戏组首次游戏时间和游戏次数 2024-12-16 16:33:41 +08:00
sk 490576b1dc 游戏记录添加gamedif 2024-12-16 15:47:26 +08:00
sk 2c48adeca7 Merge branch 'develop' into sk 2024-12-16 15:33:06 +08:00
sk bcbc162549 解决冲突 2024-12-16 11:17:11 +08:00
by 4d65851083 后台补单BUG修改 2024-12-16 10:16:55 +08:00
by 8b40eb3c49 后台补单BUG修改 2024-12-16 10:10:45 +08:00
by d791c4d02c 后台补单BUG修改 2024-12-16 10:03:36 +08:00
by d6bfa73d70 充值增加log 2024-12-13 17:55:37 +08:00
by a4ebed8fc9 充值增加log 2024-12-13 17:54:41 +08:00
by db24cf0620 充值增加log 2024-12-13 17:53:13 +08:00
by 7d6ee4c3bd 充值增加log 2024-12-13 17:51:59 +08:00
by 5c64d97728 报错修改 2024-12-13 17:42:45 +08:00
sk 5ca1048b18 Merge branch 'release' into develop 2024-12-13 11:16:09 +08:00
sk 9c3f3ea191 fix:机器人服务房间管理器房间删除 2024-12-13 11:15:43 +08:00
sk cab63a8bf9 add:游戏记录上报数据添加唯一id 2024-12-12 16:08:22 +08:00
sk 500fed59dd modify:游戏记录上报 2024-12-12 16:03:11 +08:00
sk bf636de73a fix:机器人离场金币 2024-12-12 09:34:13 +08:00
sk 95650519e8 fix:etcd配置 2024-12-12 08:43:43 +08:00
sk 8021f554f2 Merge branch 'release' into develop 2024-12-12 08:42:06 +08:00
sk acd3f4f676 机器人添加状态日志 2024-12-11 17:17:23 +08:00
sk 13e03f7428 fix:金币存钱罐跨天重置 2024-12-11 16:10:39 +08:00
tomas d672b91174 fix totalbet mouse tiger 2024-12-11 11:15:03 +08:00
tomas 1ca0213301 fix idx 2024-12-11 09:09:16 +08:00
tomas 0c3b7ebed3 fix index 2024-12-11 09:09:15 +08:00
tomas d6989f42ea Merge branch 'dev_slots' into develop 2024-12-10 20:43:26 +08:00
tomas 684d05642e fix idx 2024-12-10 20:42:55 +08:00
tomas 72b287ebfa fix index 2024-12-10 20:40:50 +08:00
sk 3104e68bb9 Merge branch 'release' into develop 2024-12-10 15:20:21 +08:00
sk e9e0aac833 update data 2024-12-10 15:19:44 +08:00
by 34062ef47e 娃娃机调整 2024-12-10 10:49:21 +08:00
sk 53ebe7bbdc 系统赠送记录破产补助 2024-12-10 10:49:10 +08:00
sk 7198f8c99f 十三张花色比牌添加单元测试 2024-12-10 10:46:19 +08:00
sk ee94c94fb7 十三张比牌包含花色 2024-12-10 10:45:53 +08:00
sk 43c3d3571b Merge branch 'develop' into sk 2024-12-10 10:40:27 +08:00
sk 779d8a64a4 拉霸缓存游戏记录 2024-12-09 16:51:53 +08:00
sk 3e853c2434 十三张手动摆牌不算特殊牌型 2024-12-09 16:14:31 +08:00
sk 343d2466ef 十三张调试发牌 2024-12-09 16:14:05 +08:00
DESKTOP-45ANQ2C\unis 3e97f97d38 十三水测试牌型比率 2024-12-09 16:13:40 +08:00
sk b56a874b36 修改十三张全垒打分数 2024-12-09 16:13:34 +08:00
sk ccd3481b06 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-09 13:12:35 +08:00
sk c8b7647695 Merge branch 'sk' into develop 2024-12-09 13:11:57 +08:00
sk b342e0ad61 十三张手动摆牌不算特殊牌型 2024-12-09 11:56:46 +08:00
by 4671d33f67 娃娃机调整 2024-12-09 10:30:37 +08:00
sk 886bf444c3 十三张花色比牌添加单元测试 2024-12-09 09:55:15 +08:00
sk 945bf3c829 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-07 18:06:00 +08:00
sk ea41d7f379 十三张调试发牌 2024-12-07 18:05:37 +08:00
DESKTOP-45ANQ2C\unis 2f8123333c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-07 17:19:52 +08:00
DESKTOP-45ANQ2C\unis 51b946bc0b 十三水测试牌型比率 2024-12-07 17:18:25 +08:00
sk 690a5f1a08 十三张比牌包含花色 2024-12-07 17:09:19 +08:00
sk 52b4994de3 修改十三张全垒打分数 2024-12-07 10:20:06 +08:00
sk 766d30d7ca Merge branch 'develop' into sk 2024-12-06 17:07:45 +08:00
sk 6adba98ddb 监控消息注册 2024-12-06 16:00:43 +08:00
sk 4fc2019770 update statistics 2024-12-06 10:15:17 +08:00
sk 6923ed95f1 系统赠送记录破产补助 2024-12-06 09:59:10 +08:00
sk 027b4caf81 Merge branch 'dev_slots' into develop 2024-12-05 13:46:25 +08:00
sk 4675e0ff58 Merge branch 'dev_slots' into release 2024-12-05 13:46:07 +08:00
tomas 53f6aae1c6 add totalbet rec 2024-12-05 13:42:21 +08:00
sk 0143ebbe12 修复dbgamefree协议 2024-12-05 09:42:38 +08:00
sk 2ea5226a14 no message 2024-12-04 17:40:39 +08:00
sk a9fdefceb7 Merge branch 'release' into develop 2024-12-04 17:12:34 +08:00
sk d82b029a06 Merge branch 'sk' into develop 2024-12-04 16:48:02 +08:00
sk f78b1edfb3 修复依赖包引用错误 2024-12-04 16:47:38 +08:00
sk 22dc0a767a 自定义配置参数不区分大小写 2024-12-04 16:35:50 +08:00
sk 85679c8b42 Merge branch 'sk' into develop 2024-12-04 10:07:29 +08:00
sk fc3a539e29 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-12-04 10:07:18 +08:00
sk 5a67d8f073 修改十三张记分显示 2024-12-04 10:06:59 +08:00
sk 3f35e67a40 创建游戏对局记录缓存对象 2024-12-03 15:08:08 +08:00
tomas 9354ada850 fix betmode 2024-12-03 14:21:21 +08:00
tomas fd43d57ca4 fix betmode 2024-12-03 14:14:12 +08:00
sk 7a9bf671eb 解决冲突 2024-12-03 13:19:33 +08:00
sk 801200f4bd add statistics 2024-12-03 13:14:43 +08:00
tomas e13e239897 add mouse 2024-12-03 11:22:12 +08:00
tomas 2ab2ffafdd Merge remote-tracking branch 'origin/develop' into dev_slots 2024-12-03 11:13:33 +08:00
tomas db73856059 fix tiger 2024-12-03 11:13:17 +08:00
sk ae42673224 fix 十三张牌局记录税收比例 2024-12-03 10:54:36 +08:00
sk 383716741c fix游戏时长 2024-12-03 10:54:34 +08:00
sk 80c191ec98 修改牌局记录 2024-12-03 10:54:33 +08:00
sk 8e5f5e4e47 修改牌局记录 2024-12-03 10:54:31 +08:00
sk 2b88155177 添加十三张预选牌功能 2024-12-02 17:57:46 +08:00
sk bdac067402 添加十三张预选牌功能 2024-12-02 17:53:07 +08:00
sk b1d365e030 好友申请数据修复 2024-12-02 17:10:19 +08:00
sk c7ca731c33 牌局记录 2024-12-02 16:29:40 +08:00
sk 744d52226c 修改十三张打枪时长 2024-12-02 15:58:56 +08:00
sk 2d43a4153a fix同意好友申请申请记录没有删除 2024-12-02 15:53:42 +08:00
sk 4d9dd37713 Merge branch 'sk' into develop 2024-12-02 14:58:42 +08:00
sk 8a9a4f0c2d fix同意好友申请申请记录没有删除 2024-12-02 14:58:23 +08:00
sk f532cee29b 更新配置文件 2024-12-02 14:32:55 +08:00
sk 0fe7ee6d4c fix 十三张牌局记录税收比例 2024-12-02 14:11:39 +08:00
sk 5d90c143c8 Merge branch 'sk' into develop 2024-12-02 14:06:40 +08:00
sk 1477611d4a fix游戏时长 2024-12-02 14:06:15 +08:00
sk 57def951c1 更新配置文件 2024-12-02 13:54:49 +08:00
sk 73157b41cf Merge branch 'sk' into develop 2024-12-02 13:44:41 +08:00
sk fbc14799c1 修改牌局记录 2024-12-02 13:44:26 +08:00
sk 6b83e85469 Merge branch 'sk' into develop 2024-12-02 13:17:13 +08:00
sk fe88981e9d 修改牌局记录 2024-12-02 13:06:07 +08:00
tomas 83db9ddddc fix ox 营收 2024-12-02 10:44:26 +08:00
tomas 5dcd4175f9 add cm goo proto and mouse.go 2024-12-02 10:40:19 +08:00
tomas 126f9579c5 fix ox 营收 2024-12-02 10:26:47 +08:00
sk 2fb75da43e 修改十三张推荐牌型算法 2024-11-29 18:01:19 +08:00
DESKTOP-45ANQ2C\unis 86bbeb8c9b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-29 13:55:09 +08:00
skeleton 353c1904e9 更新.gitlab-ci.yml文件 2024-11-29 03:40:45 +00:00
skeleton 37d2c02b98 更新.gitlab-ci.yml文件 2024-11-29 03:27:58 +00:00
sk 2d12390882 修改ci文件 2024-11-29 11:25:49 +08:00
sk 1ade65ba36 Revert "十三张比牌时间增加"
This reverts commit de7712d4e3.
2024-11-29 11:10:49 +08:00
sk de7712d4e3 十三张比牌时间增加 2024-11-29 10:53:33 +08:00
sk 61515fb4e0 十三张有倒水比牌加1秒 2024-11-29 09:17:59 +08:00
sk 10d494e9a8 修改fortune牌局记录 2024-11-28 18:08:49 +08:00
sk ce5e66b148 修改兔子拉霸游戏记录 2024-11-28 18:08:47 +08:00
sk b3798d54b8 修改兔子拉霸游戏记录 2024-11-28 18:08:45 +08:00
sk fecb462d49 修改兔子拉霸游戏记录 2024-11-28 18:08:44 +08:00
sk 3c72d93448 修改fortune牌局记录 2024-11-28 17:48:56 +08:00
sk 345e4db7a5 修改兔子拉霸游戏记录 2024-11-28 17:45:25 +08:00
sk bcb97edff2 修改兔子拉霸游戏记录 2024-11-28 16:39:46 +08:00
sk d96cc23c84 修改兔子拉霸游戏记录 2024-11-28 15:48:39 +08:00
sk 794880b644 添加注释 2024-11-27 16:31:47 +08:00
sk a8d78d5480 删除mysql包 2024-11-27 14:35:56 +08:00
sk 1d89c089c1 修改日志级别 2024-11-27 13:42:07 +08:00
sk 27f70e1a94 解决冲突 2024-11-27 10:31:06 +08:00
sk f71ea6ca19 修改日志 2024-11-27 10:04:09 +08:00
sk d28d1a2cde Merge branch 'release' of git.pogorockgames.com:mango-games/server/game into release 2024-11-27 07:08:50 +08:00
skeleton 5f31432a2c 还原十三张阶段时间和比牌时间 2024-11-26 20:54:31 +08:00
sk 9629db34e6 修复玩家缓存释放 2024-11-26 20:19:12 +08:00
sk 3db93982bf 修复玩家缓存释放 2024-11-26 20:11:26 +08:00
sk 616ee8369c 不保存游戏对局的调试日志 2024-11-26 19:20:39 +08:00
DESKTOP-45ANQ2C\unis 1c800d794f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-26 17:20:45 +08:00
sk 9643c40d35 添加todo文件 2024-11-26 16:40:53 +08:00
DESKTOP-45ANQ2C\unis f25bef6555 道具表更新 2024-11-26 14:42:58 +08:00
sk ff3de2f2a0 修复牌库发牌问题 2024-11-26 14:41:26 +08:00
sk 5a9325a2ce no message 2024-11-26 14:41:09 +08:00
DESKTOP-45ANQ2C\unis 9b3d0aeb6e 道具合成修改活动日志 2024-11-26 14:40:57 +08:00
sk dd43f9ea1e 修复牌库发牌问题 2024-11-25 17:49:26 +08:00
DESKTOP-45ANQ2C\unis 70ddc7e6b2 道具表格更新 2024-11-25 11:39:42 +08:00
DESKTOP-45ANQ2C\unis 8255d754b2 道具表更新 2024-11-25 09:39:55 +08:00
DESKTOP-45ANQ2C\unis 2ac9bbfee5 道具合成修改活动日志 2024-11-23 16:59:22 +08:00
sk 44cf7fb7b2 十三张超时配置 2024-11-23 16:06:55 +08:00
sk 68f2a3bb80 十三张玩家状态同步 2024-11-23 15:56:40 +08:00
sk 053484de8e 十三张比牌时间 2024-11-23 11:25:59 +08:00
sk 1d1bf56695 no message 2024-11-23 09:09:48 +08:00
sk 343a7a7abb 抽奖活动通知获的抽奖码 2024-11-22 17:02:46 +08:00
sk 196d211fff 十三张阶段时间可配置 2024-11-22 16:08:34 +08:00
sk 3840ec99a2 十三张开牌前允许加入游戏 2024-11-22 14:24:59 +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 9f6b5469fa 好友进房卡场房卡余额检测 2024-11-21 15:27:58 +08:00
sk 538a920a4d 竞技馆房卡扣除问题 2024-11-21 14:19:19 +08:00
sk 1e2eeebfda 竞技馆房间列表返回房主id 2024-11-21 13:22:45 +08:00
sk c737007e20 修改房卡扣除和招募 2024-11-21 11:38:06 +08:00
sk a9ffcb1c4a 修改竞技馆房间列表排序 2024-11-20 18:31:22 +08:00
sk eb265f69e8 在线人数过滤超管平台 2024-11-20 10:39:40 +08:00
tomas aaf417c9fe Merge remote-tracking branch 'origin/develop' into dev_slots 2024-11-19 13:38:20 +08:00
tomas f1b86a3913 data up 2024-11-19 13:33:06 +08:00
sk 9906c0fb80 no message 2024-11-19 10:36:22 +08:00
sk 46ad7ea75f 玩家游戏记录上报 2024-11-19 10:29:34 +08:00
sk 949e6f89e3 添加注释 2024-11-18 18:08:37 +08:00
sk fb02fa630e 十三张参数修改 2024-11-18 09:58:51 +08:00
sk 0f1f8a03c2 系统房奖品价值缺失 2024-11-15 16:43:37 +08:00
sk 1d89a8c36e 格式化代码 2024-11-15 15:29:00 +08:00
sk b52f84d182 statistics 2024-11-15 15:21:01 +08:00
sk e686334c57 Merge branch 'develop' into release 2024-11-15 11:18:46 +08:00
sk b497bd103a 玩家缓存释放问题 2024-11-15 11:18:28 +08:00
sk 00d4f328c7 Merge branch 'develop' into release 2024-11-14 17:39:52 +08:00
sk d0072d40b4 抽奖活动房卡消耗统计问题 2024-11-14 17:39:35 +08:00
sk 29a264d789 Merge branch 'develop' into release 2024-11-14 17:33:32 +08:00
sk 009e3bbc70 Merge branch 'develop' into release 2024-11-17 15:23:35 +08:00
sk 0585fe236d 修复登出时间错误 2024-11-17 15:20:35 +08:00
sk dfe093b03e no message 2024-11-14 15:23:40 +08:00
sk 3bcc944417 tienlen房卡场不能中途离开 2024-11-14 15:09:38 +08:00
sk f989492019 tienlen房卡场不能中途离开 2024-11-14 15:07:51 +08:00
sk 10ce982a14 tienlen房卡场不能中途离开 2024-11-14 14:26:31 +08:00
sk 1db15bd6f3 no message 2024-11-14 11:54:38 +08:00
DESKTOP-AFIIIDT\Administrator 62f31c2460 up main ox 2024-11-14 11:41:25 +08:00
DESKTOP-AFIIIDT\Administrator 68e84e6233 up main ttiger 2024-11-14 11:39:46 +08:00
sk d3f276f0bf 兑换优化 2024-11-14 11:13:47 +08:00
sk 28b6cb6a85 抽奖活动机器人发奖调整 2024-11-13 11:17:07 +08:00
tomas f9605e9f26 add tiger game test 2024-11-13 10:11:12 +08:00
tomas f47cddc7c1 add tiger proto 2024-11-13 10:10:13 +08:00
sk f0e18b16d0 删除测试代码 2024-11-13 09:22:01 +08:00
sk 1f6bb826c9 Merge branch 'develop' into release 2024-11-12 18:05:56 +08:00
sk 3cc2aa1ac6 隐藏关闭的竞技馆房间 2024-11-12 18:03:39 +08:00
sk 2f3fa1d739 Merge branch 'develop' into release 2024-11-12 16:58:09 +08:00
sk 1acfab2ac7 修复jwt超时设置 2024-11-12 16:47:37 +08:00
sk 3eb997c7c3 隐藏关闭的竞技馆配置房间 2024-11-12 16:13:13 +08:00
sk 310156dd35 兑换商城地址 2024-11-12 15:56:27 +08:00
sk 90e11a0dad 兑换商城地址 2024-11-12 15:08:16 +08:00
sk 4da947cd56 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-12 13:11:40 +08:00
sk d1afed32c2 缓存优化 2024-11-12 10:51:04 +08:00
tomas 64c5617bd8 Merge branch 'develop' into dev_slots 2024-11-11 11:59:42 +08:00
tomas c5922dc4fa add 11 2024-11-11 11:51:36 +08:00
sk 8aaf1b40f3 rename 2024-11-11 11:44:20 +08:00
sk 71f6b0246b 竞技馆引导 2024-11-11 11:37:32 +08:00
tomas f8e8a34780 fix basebet 2024-11-11 11:36:21 +08:00
tomas 872d46a580 fix import 2024-11-11 11:33:45 +08:00
tomas b7b38d53ae add cm 2024-11-11 11:30:51 +08:00
sk efb440d6a9 Merge branch 'develop' into release 2024-11-11 10:09:24 +08:00
sk a9d67662b3 gamedata空指针 2024-11-09 14:09:39 +08:00
sk 14f8211ea1 修复房间解散失败问题 2024-11-09 14:03:27 +08:00
sk 19b4f0447b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-08 14:51:09 +08:00
sk 752ef5d6e0 no message 2024-11-08 14:50:21 +08:00
sk 8866473467 no message 2024-11-08 14:38:39 +08:00
sk 970db216f4 兑换问题 2024-11-08 14:25:53 +08:00
sk 81a0e50bca mongoctl工具 2024-11-08 11:55:33 +08:00
sk 94ad9f9835 网页登录 2024-11-08 11:51:23 +08:00
sk 30714f03a3 Merge branch 'develop' into release 2024-11-08 11:33:43 +08:00
sk 2b800c1e8b 修改.gitlab-ci.yml 2024-11-08 11:32:36 +08:00
sk 559f48d018 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-08 11:28:23 +08:00
sk 0932715970 修改脚本 2024-11-08 11:28:13 +08:00
tomas 211cd3dfcc respin fix val 2024-11-08 11:26:50 +08:00
tomas 3b364a545e Merge remote-tracking branch 'origin/develop' into dev_slots 2024-11-08 10:47:41 +08:00
tomas bab26915f2 ox fix 2024-11-08 10:44:37 +08:00
tomas 8fd017f1b0 freespin sts fix 2024-11-08 10:40:38 +08:00
sk c3ff0dc8ef 关闭等级排行榜 2024-11-08 10:40:36 +08:00
sk 40257f34a1 Merge branch 'develop' into release 2024-11-08 09:15:10 +08:00
sk 60b69e84d4 Merge branch 'dev_slots' into develop 2024-11-08 09:14:47 +08:00
sk 560d4e783e db库 2024-11-08 09:14:25 +08:00
tomas 09ea901321 addcoin fix dragon 2024-11-08 09:09:44 +08:00
sk 45e1fd8a80 网页兑换 2024-11-07 17:48:22 +08:00
sk 195a8c4b70 脚本优化 2024-11-06 14:19:02 +08:00
sk 2bbb23e3c7 Merge branch 'develop' into release 2024-11-06 10:44:07 +08:00
sk e1f8b98cfd 更新.gitlab-ci.yml 2024-11-06 10:43:42 +08:00
skeleton d5566d6181 更新.gitlab-ci.yml文件 2024-11-06 02:33:57 +00:00
skeleton fab70856c5 更新.gitlab-ci.yml文件 2024-11-06 02:31:35 +00:00
skeleton cf0cba428a 更新.gitlab-ci.yml文件 2024-11-06 02:15:34 +00:00
skeleton 22b5227cca 更新.gitlab-ci.yml文件 2024-11-06 02:03:01 +00:00
skeleton 44f0a7d451 更新.gitlab-ci.yml文件 2024-11-06 01:58:35 +00:00
skeleton ebb127fc4b 更新.gitlab-ci.yml文件 2024-11-06 01:54:56 +00:00
skeleton 05bab06da1 更新.gitlab-ci.yml文件 2024-11-06 01:49:02 +00:00
by c67fc81182 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-11-06 09:27:44 +08:00
by 869801ff59 金币存钱罐 2024-11-06 09:27:28 +08:00
skeleton 6c7fba3be2 更新.gitlab-ci.yml文件 2024-11-06 01:26:48 +00:00
skeleton 989354dd4a 更新.gitlab-ci.yml文件 2024-11-06 01:25:07 +00:00
by af0e29fc1a 金币存钱罐 2024-11-06 09:23:51 +08:00
skeleton 6cdc64f5e6 更新.gitlab-ci.yml文件 2024-11-06 01:23:13 +00:00
skeleton 5ddb0e08d6 更新.gitlab-ci.yml文件 2024-11-06 01:08:11 +00:00
skeleton d044890e26 更新.gitlab-ci.yml文件 2024-11-06 01:04:01 +00:00
skeleton a6db38c3fc 更新.gitlab-ci.yml文件 2024-11-05 09:59:04 +00:00
skeleton 48a87660ea 更新.gitlab-ci.yml文件 2024-11-05 09:47:39 +00:00
skeleton f63f3bb5f9 更新.gitlab-ci.yml文件 2024-11-05 09:44:12 +00:00
sk b21bafe1aa 修改gitlab-ci.yml 2024-11-05 17:27:09 +08:00
sk 8444db2e85 修改房间推荐算法每次推荐不同房间 2024-11-05 17:08:39 +08:00
sk 0176f59e76 删除测试代码 2024-11-05 16:42:08 +08:00
sk 904f30ee8c 招募房间推荐规则修改 2024-11-05 15:21:57 +08:00
sk 49a8c41908 抽奖房卡消耗数量 2024-11-05 15:19:55 +08:00
sk 9e85b4a1a7 新手引导测试代码 2024-11-05 14:48:59 +08:00
sk be6a9981cb mongodb 2024-11-05 14:30:21 +08:00
sk 5fdd7fe91d 修复登录异常 2024-11-05 10:17:42 +08:00
sk 61040aaac8 Merge branch 'develop' into release 2024-11-04 14:34:29 +08:00
sk f10e70317c 修改.gitlab-ci.yml 2024-11-04 14:25:22 +08:00
sk ad54e9c7f6 修改.gitlab-ci.yml 2024-11-04 14:24:13 +08:00
sk 160a126b29 Merge branch 'develop' into release 2024-11-04 14:04:17 +08:00
sk 23ea951eb0 使用go module 2024-11-04 14:02:22 +08:00
sk 31ea4d698a Merge branch 'develop' into release 2024-11-04 11:11:04 +08:00
sk 147e3b2a9e Merge branch 'dev_slots' into develop 2024-11-04 11:10:46 +08:00
tomas 5e8572632a add proto 2024-11-04 10:31:45 +08:00
sk 7d9477b53c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-04 10:28:18 +08:00
sk 4de80e3e74 修复新手引导 2024-11-04 10:25:52 +08:00
tomas 636082a69b surewin 2024-11-04 09:39:35 +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 53c94f47fc 游戏中不允许接口扣道具 2024-11-01 18:03:11 +08:00
sk e9583d2886 网页登录接口 2024-11-01 17:50:04 +08:00
sk bd531df9a3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-01 15:25:34 +08:00
sk 0cc4009858 引导奖励统计系统赠送 2024-11-01 15:25:27 +08:00
by 7066908dfd 引导修改 2024-11-01 15:15:51 +08:00
sk fd2e1b3cad Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-01 14:47:22 +08:00
by 23538c0a35 更新proto 2024-11-01 14:46:12 +08:00
sk 848d7485a7 竞技馆招募功能 2024-11-01 14:44:17 +08:00
by 7ec2df8381 引导修改 2024-11-01 14:43:44 +08:00
by 6f6926dd9f 引导修改 2024-11-01 14:39:54 +08:00
by 01bc6bfd63 引导修改 2024-11-01 14:29:07 +08:00
by cbfb53a8f1 引导修改 2024-11-01 14:26:41 +08:00
by c724b12182 引导修改 2024-11-01 14:24:33 +08:00
by 0688dc550a 引导修改 2024-11-01 14:15:47 +08:00
by cdc51a2eba 引导功能实现 2024-11-01 13:59:06 +08:00
sk a128325e09 解决冲突 2024-11-01 11:55:43 +08:00
skeleton d30de2a458 更新.gitlab-ci.yml文件 2024-11-01 03:34:49 +00:00
skeleton 9f35e077f0 更新.gitlab-ci.yml文件 2024-11-01 03:27:16 +00:00
skeleton bc6fc55028 更新.gitlab-ci.yml文件 2024-10-31 09:49:04 +00:00
sk a279eaad4c 修复连续充值中断功能 2024-11-08 00:02:39 +08:00
sk aab1e45d5f 招募功能协议 2024-11-01 02:46:55 +08:00
sk 85f3dcec6c 招募功能协议 2024-11-01 02:24:19 +08:00
sk 4082fc11f2 抽奖活动开奖剩余时间 2024-10-31 11:10:15 +08:00
sk 5747ad0380 抽奖活动开奖剩余时间 2024-10-31 09:12:09 +08:00
sk 3e02f7ba03 抽奖活动日志 2024-10-30 16:22:37 +08:00
sk 6a9c97c77c Merge branch 'dev_slots' into develop 2024-10-30 16:17:25 +08:00
tomas a10ff0ecc7 fix coin 2024-10-30 16:36:29 +08:00
sk 505b0f01ef 抽奖活动日志 2024-10-30 16:16:58 +08:00
sk 995a9e010a 官方房间标记 2024-10-30 11:38:05 +08:00
sk fc16304b20 官方房间标记 2024-10-30 11:14:30 +08:00
sk d5fcc0acfd 官方房间标记 2024-10-30 10:27:05 +08:00
sk 825c1ca667 抽奖活动上期中奖信息 2024-10-30 09:43:41 +08:00
sk f08fdc1309 update ci 2024-10-29 15:07:50 +08:00
sk 239d88d4ad update ci 2024-10-29 14:55:08 +08:00
sk eb7d3f00c8 Merge branch 'develop' into release 2024-10-29 14:47:05 +08:00
sk 24ee078fdf update ci 2024-10-29 14:46:41 +08:00
sk 13040896b9 防止重复发奖 2024-10-29 14:14:59 +08:00
sk 30cd6ef592 tienlen结算后可以离开房间 2024-10-29 17:44:38 +08:00
sk 84a9e39a26 tienlen结算后可以离开房间 2024-10-29 17:09:36 +08:00
sk 5944345434 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-29 16:45:03 +08:00
sk 5486a6abc3 update ci 2024-10-29 16:44:34 +08:00
by 294e9e6326 周卡购买记录修改 2024-10-29 16:35:25 +08:00
sk 75b178ba3c 竞技馆抽奖活动 2024-10-29 16:34:43 +08:00
sk c5a651c88d update ci 2024-10-29 16:20:55 +08:00
skeleton dfeefbd6f2 更新.gitlab-ci.yml文件 2024-10-29 07:04:12 +00:00
skeleton 80a22cd0db 更新.gitlab-ci.yml文件 2024-10-29 06:52:09 +00:00
tomas 11dddfcec5 fix totalout 2024-10-29 13:36:58 +08:00
sk f87ab997aa 邀请好友进房失败信息 2024-10-29 13:23:57 +08:00
sk ca8a8dfb7e 修复竞技馆抽奖必中玩家昵称错误 2024-10-29 11:17:50 +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 0a67496d50 防止重复抽奖 2024-10-29 09:07:15 +08:00
sk 0333ef441e 抽奖中奖历史显示问题 2024-10-26 17:50:21 +08:00
sk e82177b32a update_deploy.bat 2024-10-26 17:23:35 +08:00
sk 3bbced02e0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-26 17:22:50 +08:00
sk 258fd69a9e 抽奖内定期数问题 2024-10-26 17:22:23 +08:00
by 7d73f2036d 机器人随机范围修改 2024-10-26 13:44:21 +08:00
by af119ebf55 邀请积分排行榜机器人名字 2024-10-26 10:48:03 +08:00
sk 2429264cfb Merge branch 'develop' into release 2024-10-26 10:34:32 +08:00
sk 342d2fde1f 修复抽奖奖励邮件 2024-10-26 10:31:53 +08:00
sk ba552f830b no message 2024-10-26 09:03:27 +08:00
sk 17d216e07c 解决冲突 2024-10-25 18:01:56 +08:00
sk 7e80a3d37b 隐藏未开奖的中奖信息 2024-10-25 17:20:28 +08:00
sk 721ff30fb8 抽奖活动中奖广播 2024-10-25 16:17:13 +08:00
sk 016406407e Merge branch 'dev_slots' into develop 2024-10-25 15:04:44 +08:00
skeleton fed8a2d0a0 更新.gitlab-ci.yml文件 2024-10-25 07:03:03 +00:00
tomas 2d76ef963f Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-25 14:58:01 +08:00
tomas 64b6af0313 fix init coin 2024-10-25 14:57:40 +08:00
sk e20a82fba6 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-25 13:50:38 +08:00
sk 1e186dba66 抽奖活动随机开奖码 2024-10-25 13:47:50 +08:00
tomas e7f37542cb needcoid val fix 2024-10-25 11:57:11 +08:00
by 8ab8cbacfe 邀请积分排行榜修改 2024-10-25 10:56:55 +08:00
sk 9f511e35eb 抽奖活动中奖历史记录玩家头像 2024-10-25 10:47:44 +08:00
sk 3bfd8f30df 抽奖活动跨天重置 2024-10-25 10:35:53 +08:00
sk 9cc386b25f 抽奖活动跨天重置 2024-10-26 00:17:46 +08:00
sk 6b51e16c77 no message 2024-10-24 16:46:28 +08:00
sk b345f7cae4 no message 2024-10-24 16:30:47 +08:00
sk 0a4217b200 竞技馆抽奖活动参与人数 2024-10-24 16:01:11 +08:00
sk dd7663b3c9 竞技馆抽奖活动 2024-10-24 14:16:05 +08:00
sk 20f0ee30bd 竞技馆抽奖活动 2024-10-24 11:02:57 +08:00
sk 6693bf7438 no message 2024-10-24 10:24:47 +08:00
tomas 07e252aa1d add rabbitlog 2024-10-24 13:03:49 +08:00
tomas 662c0beaa7 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-24 13:03:17 +08:00
sk 92b17fdee9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-24 12:00:17 +08:00
sk 900a54d64d 修复竞技馆抽奖活动问题 2024-10-24 11:59:46 +08:00
by 0d2c090dc8 随机次数修改 2024-10-24 11:33:03 +08:00
by 1e426d20a1 tienlen纯随机发牌 2024-10-24 10:08:16 +08:00
sk 7e52629091 竞技馆抽奖活动图片视频资源设置 2024-10-23 18:04:14 +08:00
skeleton 2ab1a20900 更新.gitlab-ci.yml文件 2024-10-23 05:42:00 +00:00
sk 8fff399bd9 竞技馆抽奖活动必中玩家开奖 2024-10-23 11:50:53 +08:00
sk 1171f06cfe 竞技馆抽奖活动必中玩家开奖 2024-10-23 11:41:33 +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 4ed1048131 limt coin 2024-10-23 10:51:41 +08:00
tomas 90fa5e63a9 spin and leave limit 2024-10-23 10:02:10 +08:00
tomas 61fee546df del log 2024-10-22 17:55:41 +08:00
sk 19a85d0e7e 修改脚本 2024-10-22 17:18:49 +08:00
sk f47a9dcc9a no message 2024-10-22 16:07:46 +08:00
tomas 2bc052cba2 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-22 16:03:33 +08:00
tomas d92c2e1a43 fix coin 2024-10-22 16:03:23 +08:00
by 45f96be153 删除无用log 2024-10-22 11:21:41 +08:00
by 8ebbb86d3b 邀请积分排行榜 机器人随机 2024-10-22 11:16:03 +08:00
tomas 0d132fa803 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-22 10:23:13 +08:00
DESKTOP-45ANQ2C\unis e13dc580b6 解决冲突 2024-10-21 15:38:46 +08:00
DESKTOP-45ANQ2C\unis 944dba45d8 娃娃机添加日志 2024-10-21 15:15:12 +08:00
DESKTOP-45ANQ2C\unis 5807aebce0 娃娃机添加日志 2024-10-21 15:13:22 +08:00
DESKTOP-45ANQ2C\unis 521a1e1c58 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:48:37 +08:00
DESKTOP-45ANQ2C\unis 7e8164b1d9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-21 14:45:01 +08:00
DESKTOP-45ANQ2C\unis 7343ab7ec0 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:42:29 +08:00
sk a20383ff3b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-21 14:35:55 +08:00
sk 50e9d45693 创建订单发送活动mq消息 2024-10-21 14:35:18 +08:00
DESKTOP-45ANQ2C\unis dde83e46a6 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:30:53 +08:00
DESKTOP-45ANQ2C\unis 147f956857 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 13:54:36 +08:00
by 69caf19491 娃娃机 2024-10-21 11:40:58 +08:00
by 046461d4ac 开启礼盒 2024-10-21 10:52:17 +08:00
tomas c387511e68 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-21 10:37:47 +08:00
by c6a6d9b08f log类型修改 2024-10-21 09:48:14 +08:00
DESKTOP-45ANQ2C\unis 43a04acdff 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001302
2024-10-18 17:43:32 +08:00
tomas 259519bae5 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-18 13:34:38 +08:00
by e476a7e74b 后台活动记录 2024-10-18 13:32:26 +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
sk 7bb11cd169 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-18 10:27:32 +08:00
sk 7591d58829 修复拉霸入场限额 2024-10-18 10:27:22 +08:00
tomas 104ed2fbba update rabbit bet 2024-10-18 10:01:29 +08:00
tomas 53e02f9c1f Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-18 09:23:41 +08:00
by 9196e235d8 发牌调控还原 使用之前的发牌模式 2024-10-17 17:33:30 +08:00
sk ce1e3d4474 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-17 17:09:16 +08:00
sk c7cdb49a7b 修复游戏服同步道具问题 2024-10-17 17:07:41 +08:00
tomas ce931c98b6 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-17 17:05:53 +08:00
tomas 99f899e0c0 canchange 2024-10-17 17:05:36 +08:00
by 79636e8619 删除测试代码 2024-10-17 14:18:48 +08:00
by d2c6d702e8 测试随机发牌代码 2024-10-17 13:59:56 +08:00
sk eff3cad970 竞技馆抽奖活动协议 2024-10-17 13:05:36 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk 5ee2dd9eac 修复机器人标记 2024-10-16 17:15:46 +08:00
sk a61fdc3a7f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-16 16:29:33 +08:00
skeleton 0ae60f1f2d 更新.gitlab-ci.yml文件 2024-10-16 08:28:57 +00:00
skeleton ab2221f7ea 更新.gitlab-ci.yml文件 2024-10-16 08:18:52 +00:00
skeleton 3252b0bbb3 更新.gitlab-ci.yml文件 2024-10-16 08:08:09 +00:00
skeleton 5d63c3ce5b 更新.gitlab-ci.yml文件 2024-10-16 07:59:47 +00:00
skeleton b86ce547aa 更新.gitlab-ci.yml文件 2024-10-16 07:57:07 +00:00
skeleton f4d924b9ad 更新.gitlab-ci.yml文件 2024-10-16 07:28:47 +00:00
skeleton 5022481ed2 更新.gitlab-ci.yml文件 2024-10-16 07:26:58 +00:00
skeleton d4430fc78d 更新.gitlab-ci.yml文件 2024-10-16 07:23:53 +00:00
skeleton 7d05aefe37 更新.gitlab-ci.yml文件 2024-10-16 07:18:16 +00:00
skeleton bf05bda12a 更新.gitlab-ci.yml文件 2024-10-16 07:13:19 +00:00
skeleton 8689199e01 更新.gitlab-ci.yml文件 2024-10-16 07:11:56 +00:00
skeleton aa046ec0e2 更新.gitlab-ci.yml文件 2024-10-16 07:02:38 +00:00
sk b07e90ee47 ci配置文件 2024-10-16 14:39:41 +08:00
sk 8df77a8f9c ci配置文件 2024-10-16 14:30:08 +08:00
sk c568a3f9b0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-16 14:07:23 +08:00
sk 13e44216be db空指针 2024-10-16 14:07:14 +08:00
by e672cb58be db优化 2024-10-16 14:02:26 +08:00
sk b08113a339 db空指针 2024-10-16 13:20:43 +08:00
sk 5619d9c95d Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-16 11:52:22 +08:00
sk c9b17478ed ci配置 2024-10-16 11:52:12 +08:00
skeleton 16c4f270e5 更新.gitlab-ci.yml文件 2024-10-16 01:57:11 +00:00
skeleton 69c4bbf011 更新.gitlab-ci.yml文件 2024-10-16 01:39:51 +00:00
skeleton 0f04aa40e2 更新.gitlab-ci.yml文件 2024-10-16 01:32:31 +00:00
skeleton 5ff7b463c2 更新.gitlab-ci.yml文件 2024-10-16 01:24:54 +00:00
skeleton d3e0e4958c 更新.gitlab-ci.yml文件 2024-10-16 01:21:48 +00:00
skeleton 216d84c669 更新.gitlab-ci.yml文件 2024-10-16 01:08:21 +00:00
skeleton a4f6aab012 更新.gitlab-ci.yml文件 2024-10-15 14:27:50 +00:00
skeleton 52a19245b7 更新.gitlab-ci.yml文件 2024-10-15 14:16:30 +00:00
skeleton f9996389d4 更新.gitlab-ci.yml文件 2024-10-15 13:23:51 +00:00
skeleton aa1fa6d1d7 更新.gitlab-ci.yml文件 2024-10-15 13:21:09 +00:00
skeleton 1fa6e1bb5f 更新.gitlab-ci.yml文件 2024-10-15 13:19:44 +00:00
skeleton 93a2435983 更新.gitlab-ci.yml文件 2024-10-15 13:18:57 +00:00
skeleton 37407d45ad 更新.gitlab-ci.yml文件 2024-10-15 13:15:55 +00:00
skeleton 61a37386e4 更新.gitlab-ci.yml文件 2024-10-15 10:17:12 +00:00
skeleton 2ee789d927 更新.gitlab-ci.yml文件 2024-10-15 10:15:59 +00:00
skeleton ae4a44a1b3 更新.gitlab-ci.yml文件 2024-10-15 10:07:28 +00:00
skeleton c7a1e607cf 更新.gitlab-ci.yml文件 2024-10-15 10:07:10 +00:00
skeleton f9d780a8a8 更新.gitlab-ci.yml文件 2024-10-15 10:05:13 +00:00
skeleton 052c8e96f5 更新.gitlab-ci.yml文件 2024-10-15 10:04:32 +00:00
skeleton 44404279dd 更新.gitlab-ci.yml文件 2024-10-15 09:58:22 +00:00
skeleton e6404f6dee 更新.gitlab-ci.yml文件 2024-10-15 09:53:29 +00:00
skeleton e6299e8626 更新.gitlab-ci.yml文件 2024-10-15 09:52:56 +00:00
skeleton cb527866c8 更新.gitlab-ci.yml文件 2024-10-15 09:50:41 +00:00
skeleton 8f59323549 更新.gitlab-ci.yml文件 2024-10-15 09:45:18 +00:00
sk 5979797c01 no message 2024-10-15 17:02:19 +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
by 5b7710eaa4 机器人AI测试强度代码修改 2024-10-15 11:40:52 +08:00
by e9d0578dfb 机器人AI测试强度代码修改 2024-10-15 11:37:26 +08:00
by a896874219 机器人AI 测试强度 2024-10-15 11:36:44 +08:00
by 6334846cdf 娃娃机线上 2024-10-15 11:22:14 +08:00
by 05329478ad 禁流修改 2024-10-15 11:13:09 +08:00
sk 72b1faa2ce Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-15 10:00:55 +08:00
sk fd064ddb00 修复聊天 2024-10-15 10:00:39 +08:00
by 5697afed33 娃娃机 2024-10-15 09:05:27 +08:00
sk 6071106264 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-15 08:57:50 +08:00
sk fc05bd3ee5 系统赠送统计重复 2024-10-15 08:57:04 +08:00
skeleton 85d1456623 更新.gitlab-ci.yml文件 2024-10-14 11:48:42 +00:00
skeleton 0207cb2f53 更新.gitlab-ci.yml文件 2024-10-14 11:44:43 +00:00
skeleton 9075f60b3f 更新.gitlab-ci.yml文件 2024-10-14 11:42:36 +00:00
skeleton e6b7fa1fea 更新.gitlab-ci.yml文件 2024-10-14 10:16:57 +00:00
skeleton beb0137480 更新.gitlab-ci.yml文件 2024-10-14 10:12:57 +00:00
skeleton 72b8443372 更新.gitlab-ci.yml文件 2024-10-14 10:03:44 +00:00
skeleton 83baeae566 更新.gitlab-ci.yml文件 2024-10-14 09:51:11 +00:00
sk 28022634a6 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-14 17:49:16 +08:00
sk db8506f8b7 百人场房间删除 2024-10-14 17:44:05 +08:00
skeleton b6b0377be9 更新.gitlab-ci.yml文件 2024-10-14 05:54:06 +00:00
skeleton 9de6ddc3d7 更新.gitlab-ci.yml文件 2024-10-14 05:45:28 +00:00
skeleton 8d51143e18 更新.gitlab-ci.yml文件 2024-10-14 05:42:57 +00:00
skeleton 17c29b246e 更新.gitlab-ci.yml文件 2024-10-14 05:41:34 +00:00
skeleton 8df42379e2 更新.gitlab-ci.yml文件 2024-10-14 05:40:39 +00:00
skeleton 8214650eef 更新.gitlab-ci.yml文件 2024-10-14 05:37:32 +00:00
skeleton ce2ecdc8f6 更新.gitlab-ci.yml文件 2024-10-14 05:33:49 +00:00
sk 368a6e29a5 gitlab ci 2024-10-14 13:32:58 +08:00
sk d1e380d9bb 客户端升级奖励记录系统赠送 2024-10-14 13:09:51 +08:00
tomas 2201f656f1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-14 10:24:16 +08:00
skeleton c65bf7958f 更新.gitlab-ci.yml文件 2024-10-13 07:11:34 +00:00
skeleton cc3018cb55 更新.gitlab-ci.yml文件 2024-10-13 07:00:07 +00:00
skeleton 6967481dca 更新.gitlab-ci.yml文件 2024-10-13 06:58:05 +00:00
skeleton fd1ca07c01 更新.gitlab-ci.yml文件 2024-10-12 10:24:12 +00:00
skeleton 4bf88226ab 更新.gitlab-ci.yml文件 2024-10-12 10:22:39 +00:00
DESKTOP-45ANQ2C\unis a842987444 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-12 17:46:42 +08:00
DESKTOP-45ANQ2C\unis 2693793aa9 娃娃机结果通知修改 2024-10-12 17:46:23 +08:00
sk 368cb70732 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-12 17:39:18 +08:00
by 41ddf30336 娃娃机修改 2024-10-12 17:38:56 +08:00
sk 548681d435 客户端升级奖励 2024-10-12 17:02:39 +08:00
sk 16c5dbcab6 Merge branch 'develop' into release 2024-10-12 16:00:57 +08:00
sk 6a5eef06ea no message 2024-10-12 13:40:50 +08:00
sk 8210803b99 no message 2024-10-12 13:39:52 +08:00
sk d9f0c18658 mongodb库升级包 2024-10-12 13:39:52 +08:00
sk 98289116a3 抽奖活动协议 2024-10-12 13:33:40 +08:00
sk 8e936336e8 no message 2024-10-12 09:43:36 +08:00
sk f918baed78 mongodb库升级包 2024-10-12 08:59:37 +08:00
sk 5c38610b55 mongodb库升级包 2024-10-11 14:01:15 +08:00
sk 9a376b06c0 客户端升级统计 2024-10-11 10:57:29 +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 e32cd1a6bd 删除测试代码 2024-10-10 17:02:21 +08:00
sk f0f2831ba0 比赛场优化 2024-10-10 18:03:42 +08:00
sk 4c4af75a76 客户端升级奖励 2024-10-10 15:27:21 +08:00
DESKTOP-45ANQ2C\unis 03c6852edd 娃娃机结算结果修改 2024-10-10 11:52:37 +08:00
DESKTOP-45ANQ2C\unis a125f5f959 娃娃机结算结果修改 2024-10-10 10:31:45 +08:00
sk e38523c745 no message 2024-10-09 17:51:38 +08:00
sk 373dd36b31 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-09 17:12:29 +08:00
sk 948f90be29 客户端版本校验 2024-10-09 17:11:26 +08:00
DESKTOP-45ANQ2C\unis b0eb952494 娃娃机结算结果修改 2024-10-09 14:49:21 +08:00
sk 28982e018c 存钱罐空指针异常 2024-10-09 12:01:01 +08:00
sk bb978907d0 no message 2024-10-09 10:59:19 +08:00
sk e0a40ee830 Merge branch 'develop' into release 2024-10-09 09:18:28 +08:00
sk d09d4a4284 大厅道具变更同步到游戏 2024-10-09 09:18:09 +08:00
tomas 94e998f790 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-09 08:52:32 +08:00
sk fadd085e36 Merge branch 'develop' into release 2024-10-08 16:11:40 +08:00
sk d5332ddb34 no message 2024-10-08 16:05:47 +08:00
sk e224d2a4bd no message 2024-10-08 15:44:16 +08:00
sk 055a15b481 Merge branch 'develop' into release 2024-10-08 15:42:34 +08:00
sk 7ac2bf59bd 道具变更记录 2024-10-08 15:39:12 +08:00
sk d108cfd186 道具变更记录 2024-10-08 15:38:45 +08:00
sk 1f8f7b0f22 赛季积分重置修复 2024-10-08 14:51:45 +08:00
sk ae3e9d8fd6 rabbitmq优化 2024-10-08 11:07:56 +08:00
tomas 9770425fba up bet val 2024-09-29 17:31:50 +08:00
tomas f63c327ffa Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-29 17:29:03 +08:00
sk a38f8fa366 rabbitmq优化 2024-09-29 17:01:36 +08:00
sk c628f8876f 比赛场优化 2024-09-29 13:52:25 +08:00
sk 622d622194 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-29 11:22:12 +08:00
sk e07963720d 竞技馆奖励记录最新50条 2024-09-29 11:21:04 +08:00
sk e8c4f4489f no message 2024-09-29 10:16:57 +08:00
sk 025dbd8691 Merge branch 'release' into develop 2024-09-29 09:55:49 +08:00
sk bcdcc1cc47 修复比赛场id重复问题 2024-09-29 09:55:34 +08:00
DESKTOP-45ANQ2C\unis a48a9fede4 娃娃卡下抓获得娃娃卡改回正常抓取 2024-09-28 18:31:09 +08:00
DESKTOP-45ANQ2C\unis bbae2da8da 娃娃机兑换记录优化 2024-09-28 17:48:48 +08:00
sk f6804c4cd9 比赛场获奖记录 2024-09-28 15:36:31 +08:00
by f642c32631 删除无用log 2024-09-28 14:32:54 +08:00
by b5099d9c37 兑换记录BUG修改 2024-09-28 12:02:57 +08:00
tomas 8fcb9c856d Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 11:19:59 +08:00
tomas 57d45bd879 log 2024-09-28 11:11:50 +08:00
DESKTOP-45ANQ2C\unis a49b02d3a9 娃娃机充值记录bug修改 2024-09-28 10:32:40 +08:00
sk 0e794ac6c3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-28 10:12:23 +08:00
sk c24d622bb9 update gameitem 2024-09-28 10:12:14 +08:00
DESKTOP-45ANQ2C\unis e47ee084d3 娃娃卡充值记录 typeid GainWay_Shop_Buy = 35 //购买记录 换成 : GainWay_ShopBuy = 10 //商城购买或者兑换 2024-09-28 10:05:06 +08:00
sk 6f700f9ef6 no message 2024-09-28 10:03:29 +08:00
tomas 29e9c7bfe8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 08:52:34 +08:00
DESKTOP-45ANQ2C\unis 8935f29b22 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 18:28:34 +08:00
DESKTOP-45ANQ2C\unis b18e2393b0 娃娃机积分兑换修改bug 2024-09-27 18:28:06 +08:00
sk 69a2ecad41 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 18:03:35 +08:00
sk fd14654c59 竞技馆和比赛场关闭斗鸡技能效果 2024-09-27 18:02:00 +08:00
DESKTOP-45ANQ2C\unis b6a8789fdb 娃娃卡积分兑换记录调整 2024-09-27 16:57:11 +08:00
sk 81417088fd Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 15:34:02 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
sk 93134b7f57 no message 2024-09-27 14:31:16 +08:00
DESKTOP-45ANQ2C\unis 74c36f4083 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:30:58 +08:00
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 2ed8885e18 竞技馆炸弹扣分问题 2024-09-27 11:38:02 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
by fbacc4d57b 配置文件更新 2024-09-27 11:35:07 +08:00
tomas 489eb61805 main add rabbit 2024-09-27 10:50:25 +08:00
tomas b83a6d6d5b Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-27 10:49:56 +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 0519dbf82b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 09:28:57 +08:00
sk 824b161a46 象棋调试功能 2024-09-27 09:16:22 +08:00
sk 8e25bb52b4 竞技馆系统房间 2024-09-27 09:02:15 +08:00
DESKTOP-45ANQ2C\unis 027a2c6732 娃娃机添加日志 2024-09-26 17:21:38 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
sk 91bb5820f9 no message 2024-09-26 10:22:56 +08:00
tomas c811047626 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 09:28:48 +08:00
sk 557d4ff8ca no message 2024-09-26 09:27:54 +08:00
tomas 0550310342 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 09:20:09 +08:00
sk d977286b60 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-26 09:19:02 +08:00
sk 7861f1b7da no message 2024-09-26 09:18:49 +08:00
tomas d8398465be Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 08:58:26 +08:00
sk f28377dd05 no message 2024-09-25 18:27:55 +08:00
kxdd 12bdcf9ec3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 18:22:14 +08:00
kxdd 19be365291 娃娃机抓取记录日志修改 2024-09-25 18:22:08 +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
sk ceec89fc6b no message 2024-09-25 17:46:51 +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 65e3d614a6 no message 2024-09-25 15:57:05 +08:00
sk d155818a4e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 15:40:36 +08:00
sk 04a832a595 提交bin目录 2024-09-25 15:39:46 +08:00
kxdd bc5c3c3324 娃娃机视频流自动关闭打开 2024-09-25 15:37:45 +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
by b04d422d8b 娃娃机离线 踢出房间玩家 2024-09-24 16:36:39 +08:00
by 1714948491 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-24 13:47:29 +08:00
by b871576fe9 娃娃机log 2024-09-24 13:47:16 +08:00
sk 8125bf01e4 解决冲突 2024-09-24 09:10:56 +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 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 ecf47d9f55 后台撤销娃娃兑换订单类型 2024-09-23 14:25:04 +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
kxdd ae085ec661 娃娃机后台日志添加场景名字 2024-09-23 10:05:40 +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
kxdd 8952d98f7d 娃娃机推流修改 2024-09-21 17:07:47 +08:00
by bf1efc0139 娃娃兑换 2024-09-21 15:39:16 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
tomas 0fb29e2750 action rabbit 2024-09-21 15:06:54 +08:00
tomas 99d032dffc Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-21 13:34:21 +08:00
kxdd 2141f00ba9 Merge branch 'ma' into develop 2024-09-21 11:52:02 +08:00
kxdd 2743f6cfb0 娃娃卡记录添加渠道信息 2024-09-21 11:51:53 +08:00
sk eaff0f1308 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-21 11:10:45 +08:00
tomas 348b5fcb90 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-21 10:43:54 +08:00
by ac8b4ee47d 娃娃机屏蔽无用代码 2024-09-21 10:41:13 +08:00
by 254af4e5fb 娃娃机屏蔽无用代码 2024-09-21 10:37:14 +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
sk a18dabeaeb 修复v卡掉落问题 2024-09-20 16:53:55 +08:00
sk 57c58b2fb2 修复v卡掉落问题 2024-09-20 16:53:10 +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
sk 19ebda3832 Merge branch 'release' into develop 2024-09-20 16:36:32 +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
sk 12c38f535b 竞技馆房间列表同步 2024-09-20 14:42:21 +08:00
by 67a5912db5 更新配置表 2024-09-20 13:44:37 +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
tomas d0d8008d51 fix coin 2024-09-20 11:12:31 +08:00
sk 96f87f8b62 修复绑定手机积分和竞技馆对局记录 2024-09-20 11:11:27 +08:00
sk 2b0f7b1e28 修复绑定手机积分和竞技馆对局记录 2024-09-20 10:23:01 +08:00
tomas 23487532df Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-20 09:00:35 +08:00
sk 522b284dd6 no message 2024-09-20 08:28:01 +08:00
sk 3dab56c03a 修改日志级别 2024-09-20 08:11:53 +08:00
sk 0ff33ee6a4 恢复代码 2024-09-20 07:21:07 +08:00
tomas 365ba5edc8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-19 19:08:56 +08:00
tomas 05a9c79dc1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-19 19:06:57 +08:00
tomas d62a57375e add rabbit 2024-09-19 19:06:46 +08:00
sk d9d78d2f13 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 18:36:04 +08:00
sk ff7452d335 客户端日志添加渠道信息 2024-09-19 18:35:30 +08:00
by 4d30e087c6 娃娃兌換記錄修改 2024-09-19 18:33:27 +08:00
by 24dd497af4 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-19 18:31:23 +08:00
by f2497b77d3 娃娃兌換記錄修改 2024-09-19 18:31:12 +08:00
kxdd 8e156dba18 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 18:29:01 +08:00
kxdd 7d7f5804f1 Merge branch 'develop' into ma
# Conflicts:
#	common/constant.go
2024-09-19 18:27:45 +08:00
by 9cc5d30032 娃娃机配置信息 2024-09-19 18:26:27 +08:00
kxdd be57df77a1 娃娃机娃娃卡获取明细 2024-09-19 18:22:36 +08:00
by 02dded9b9a 娃娃机配置信息 2024-09-19 18:22:35 +08:00
by 3c51f2794d 娃娃机配置 2024-09-19 18:11:38 +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 0e84e74049 Merge branch 'develop' into release 2024-09-19 17:20:41 +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 7e8ceebbf7 proto 2024-09-19 13:36:43 +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 79915a49e1 Merge branch 'develop' into release 2024-09-19 11:52:32 +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 8aa5fd7c56 Merge branch 'develop' into release 2024-09-19 10:37:41 +08:00
sk 7dd1a191ea 获取游戏记录使用task 2024-09-19 10:35:58 +08:00
sk e636afc4aa Merge branch 'develop' into release 2024-09-19 10:04:46 +08:00
sk 2206eba159 房间列表返回房间最大人数配置 2024-09-19 10:03:57 +08:00
sk 46081a862a Merge branch 'develop' into release 2024-09-19 09:55:14 +08:00
sk e479b2e6fd no message 2024-09-19 09:55:02 +08:00
sk cca29b64c6 Merge branch 'develop' into release 2024-09-19 09:39:31 +08:00
sk 692cf306f5 no message 2024-09-19 09:37:52 +08:00
sk e1f5447da0 解决冲突 2024-09-19 09:25:13 +08:00
sk 70d051d938 查询房间信息更新道具表 2024-09-19 09:21:12 +08:00
tomas a3741fd685 add rabbit proto 2024-09-19 09:04:46 +08:00
tomas 002bf3ec05 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-19 08:56:17 +08:00
sk 2629c16689 查询房间信息 2024-09-18 18:42:44 +08:00
sk 3da6a1a667 查询房间信息 2024-09-18 18:35:01 +08:00
sk e36c6608c3 查询房间信息 2024-09-18 18:22:46 +08:00
sk 03e0cdb6d7 查询房间信息 2024-09-18 18:03:06 +08:00
sk ca5d442874 查询房间信息 2024-09-18 18:02:40 +08:00
sk 90b8b5c113 竞技馆房主为创建者 2024-09-18 16:55:03 +08:00
sk aa92a9630c 竞技馆房主为创建者 2024-09-18 16:53:10 +08:00
sk 02365888a1 update excel 2024-09-18 15:30:43 +08:00
sk fc0321afdc Merge branch 'develop' into release 2024-09-18 15:01:36 +08:00
sk a98d7ac0b4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-18 14:59:45 +08:00
sk 1b2a9c30e7 修复房卡房离开和开始条件 2024-09-18 14:59:17 +08:00
by e0d414e6af 娃娃后台proto增加字段 2024-09-18 11:28:07 +08:00
by d2a64cb8ae 娃娃卡积分40004 2024-09-18 11:19:14 +08:00
sk 0eeaad7caa Merge branch 'develop' into dev_slots 2024-09-18 10:58:51 +08:00
sk 97a6d363e7 登录判断玩家是否在比赛场 2024-09-18 10:58:29 +08:00
sk 8865dc49da Merge branch 'develop' into release 2024-09-18 10:00:48 +08:00
sk df5de58f46 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-18 10:00:36 +08:00
sk 60ce6ed085 添加索引 2024-09-18 09:55:33 +08:00
by 9aeb5c3d15 娃娃机调转方向 2024-09-18 09:50:06 +08:00
tomas 984a501087 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-18 09:06:28 +08:00
sk e0640c7fd5 Merge branch 'develop' into release 2024-09-14 17:47:26 +08:00
sk 6240e08abe 竞技馆对局记录 2024-09-14 17:43:23 +08:00
sk ec0d5b3f94 Merge branch 'develop' into release 2024-09-14 17:22:01 +08:00
sk e6105b40b0 重连如果比赛没有开始就退赛 2024-09-14 17:21:28 +08:00
sk a647da01aa Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-14 16:22:22 +08:00
sk f83b22688c 重连如果比赛没有开始就退赛 2024-09-14 16:22:06 +08:00
by 7668ddcd93 娃娃机调转方向 2024-09-14 15:55:37 +08:00
by 72edbbdd4b 娃娃机调转方向 2024-09-14 15:54:38 +08:00
by a314c42d6c 娃娃机调转方向 2024-09-14 15:53:03 +08:00
tomas 9d164f86da Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-14 09:00:24 +08:00
sk 47f98ad5f8 Merge branch 'develop' into review 2024-09-13 18:28:14 +08:00
sk c0941e43e7 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-13 18:26:20 +08:00
sk f8a55ec7ba tienlen开发模式控牌 2024-09-13 18:19:44 +08:00
kxdd e7e08755a4 娃娃机道具消耗与获得 2024-09-13 18:18:01 +08:00
by a9de61a96a 协议修改 2024-09-13 18:11:05 +08:00
by 1b3b98e359 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-13 17:56:47 +08:00
by f1eccf335f 娃娃兑换商城 2024-09-13 17:56:06 +08:00
sk 09c8a1dd40 Merge branch 'develop' into release 2024-09-13 16:57:56 +08:00
sk cfa2c003c2 游戏中玩家余额变化 2024-09-13 16:57:37 +08:00
sk d1276464b5 Merge branch 'develop' into release 2024-09-13 14:11:09 +08:00
sk 48ccfebe34 Merge branch 'develop' into release 2024-09-13 13:52:38 +08:00
by 31db186564 娃娃机心跳 2024-09-13 10:51:16 +08:00
by 3c3fcbb920 娃娃机打包 2024-09-13 09:51:41 +08:00
by 58d15e767d 娃娃机修改 2024-09-13 09:38:58 +08:00
tomas af99918965 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-13 09:01:47 +08:00
sk 5ac106365e 道具修改优化 2024-09-12 18:29:47 +08:00
by d365e9be6a Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-12 09:00:38 +08:00
by 3492ba1631 心跳修改 2024-09-12 09:00:30 +08:00
sk 09202f60d3 同步道具列表 2024-09-11 18:27:40 +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 4bf11eb1d1 竞技馆炸弹积分计算 2024-09-11 16:42:47 +08:00
sk fa1d1648ac Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 16:33:05 +08:00
sk d74c868947 好友进房消耗检查 2024-09-11 16:26:05 +08:00
sk 1063cc8fba 盲盒问题 2024-09-11 16:17:18 +08:00
by b53c78cfb3 娃娃机心跳包 2024-09-11 15:59:09 +08:00
sk 0855fc58f4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 15:29:46 +08:00
sk 3811215f80 竞技馆积分可以为负数 2024-09-11 15:29:37 +08:00
sk cc882657a4 开发模式每分钟保存一次玩家数据 2024-09-11 13:37:46 +08:00
kxdd a5265e5410 Merge branch 'develop' into ma 2024-09-11 11:08:04 +08:00
kxdd 9d584a8647 娃娃机下抓添加防卡死状态保护 2024-09-11 11:06:55 +08:00
by be703582f6 修改娃娃机链接 2024-09-11 11:01:08 +08:00
sk 07bea1ac2f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 09:32:13 +08:00
sk 8dac055bd6 进入房间房卡校验 2024-09-11 09:32:01 +08:00
by 791d82c8aa Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-10 17:56:43 +08:00
by afab279f3c 娃娃机与游戏服增加心跳 2024-09-10 17:56:32 +08:00
tomas d79718f0f2 fix protoid 2024-09-10 16:20:40 +08:00
sk 8d63969701 注释错误 2024-09-10 15:31:46 +08:00
sk 9012b2a4db Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-10 15:04:19 +08:00
sk 288624a55b 房间真人数量统计错误 2024-09-10 15:04:11 +08:00
kxdd b57c5b2e41 Merge branch 'ma' into develop 2024-09-10 15:00:35 +08:00
kxdd 418b16d2e9 娃娃机状态修改 2024-09-10 14:59:36 +08:00
tomas 6869021d08 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-10 11:32:14 +08:00
tomas 6e16eb1d52 add billed code 2024-09-10 11:32:04 +08:00
by 76ba1ff7b7 娃娃机修改 2024-09-10 11:12:20 +08:00
sk 3b18460edb 房卡是否足够 2024-09-09 18:24:43 +08:00
sk 70673450df Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 17:55:39 +08:00
sk 3a7d3b9f2e 房卡返回问题 2024-09-09 17:55:13 +08:00
by 1961caad12 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-09 16:47:09 +08:00
by 96268bf86f 娃娃机屏蔽心跳检测 2024-09-09 16:46:58 +08:00
sk c5610f58dc 解决冲突 2024-09-09 14:09:11 +08:00
sk 4cfd64dbed Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 14:05:16 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
by 6c65a442db 娃娃机修改 2024-09-09 11:24:14 +08:00
sk d27a04020e 好友进房问题 2024-09-09 10:40:26 +08:00
sk eb791c364e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 10:25:54 +08:00
tomas 4ba65f9e87 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-09 10:25:12 +08:00
tomas e61cc19bce add slots 2024-09-09 10:24:59 +08:00
sk ea6ef0be41 房卡扣除问题 2024-09-09 10:24:37 +08:00
by 18f67b7d22 屏蔽自动向前走一步 2024-09-09 09:45:15 +08:00
by 1a14a35da9 下抓不走消息队列 2024-09-09 09:29:51 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +08:00
kxdd 13042959c9 Merge branch 'ma' into develop 2024-09-07 17:37:50 +08:00
kxdd 7991a8044d 娃娃机状态调整 2024-09-07 17:37:22 +08:00
kxdd b46db9b36b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 16:59:19 +08:00
kxdd e690d8da76 Merge branch 'develop' into ma
# Conflicts:
#	gamesrv/clawdoll/action_clawdoll.go
2024-09-07 16:58:17 +08:00
sk 152c60e35f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 16:58:08 +08:00
sk 4eee248f20 竞技馆房间解散问题 2024-09-07 16:58:01 +08:00
by d61a153948 投币后向前移动一下 2024-09-07 16:22:12 +08:00
kxdd f26cb4d2ff 娃娃机playing判定修改 2024-09-07 16:08:46 +08:00
by 7099975e9e 客户端请求token 2024-09-07 14:48:44 +08:00
by 0b91f46fd8 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-07 14:29:50 +08:00
by 1d98a31bf4 token修改 2024-09-07 14:29:34 +08:00
sk d769605d09 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 14:16:31 +08:00
sk 8174e6c406 商店购买备注 2024-09-07 14:15:56 +08:00
by 83d5ec05fb 生成token修改 2024-09-07 14:04:44 +08:00
kxdd de339225d2 娃娃机获取token修改 2024-09-07 11:58:40 +08:00
by d34473c688 token 2024-09-07 11:40:04 +08:00
by 59eb4ecc22 token 2024-09-07 11:17:33 +08:00
sk 053db5b83a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 10:46:47 +08:00
sk 1b67a44d63 竞技馆牌局记录 2024-09-07 10:46:34 +08:00
by 759c989719 获取token 2024-09-07 10:43:36 +08:00
by 9b5dff5f96 上分不走消息隊列 2024-09-07 10:22:55 +08:00
sk cb4b51b4aa 竞技馆游戏记录 2024-09-07 10:03:50 +08:00
sk da9efde313 Merge branch 'develop' into dev_slots 2024-09-07 09:21:15 +08:00
sk 1cc5d4f226 添加水池配置 2024-09-07 09:19:51 +08:00
tomas 7a039096ca del public 2024-09-07 09:01:50 +08:00
tomas 94794a4e7c Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
#	public
2024-09-07 09:00:20 +08:00
sk ad3e8d4b9f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 18:33:42 +08:00
sk 4da55c9588 游戏中同步实时金币 2024-09-06 18:33:28 +08:00
lihailiang f467753242 Merge branch 'develop' into ma
# Conflicts:
#	.gitmodules
2024-09-06 18:22:21 +08:00
kxdd 8c8ee30ef8 Merge branch 'develop' into ma
# Conflicts:
#	public
2024-09-06 18:20:54 +08:00
by 7889c982ea 娃娃機修改 2024-09-06 18:06:40 +08:00
by 895c673e65 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-06 17:30:39 +08:00
by 892a61aa47 log 2024-09-06 17:30:28 +08:00
sk 67a85f6535 竞技房间没人解散 2024-09-06 17:28:10 +08:00
sk 5bdf3d78df 商店购买 2024-09-06 16:23:57 +08:00
sk b4bab0de1e 删除public子模块 2024-09-06 15:58:06 +08:00
sk 2f74e5bfab Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 15:39:57 +08:00
sk c20f0fa69c 商城购买参数 2024-09-06 15:39:30 +08:00
kxdd 770b9b084a public 2024-09-06 15:39:17 +08:00
kxdd 8a19cd642f 娃娃机通知状态修改 2024-09-06 15:36:59 +08:00
by 83f643a789 Merge branch 'ma' into develop 2024-09-06 14:56:51 +08:00
by 98a834b357 public 2024-09-06 14:56:40 +08:00
by 09dc4f4588 public 2024-09-06 14:55:44 +08:00
kxdd 9a34e32841 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 14:50:50 +08:00
kxdd 4bd2cee327 public 2024-09-06 14:49:51 +08:00
sk 63387ba9b4 商城购买房卡 2024-09-06 14:46:30 +08:00
sk 4b7c552524 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 14:01:34 +08:00
sk fc2db94c86 竞技馆列表刷新 2024-09-06 14:00:34 +08:00
kxdd 19dde360d6 Merge branch 'ma' into develop 2024-09-06 11:58:07 +08:00
kxdd 3ac3f2dea1 娃娃机获取视频token修改 2024-09-06 11:57:45 +08:00
sk 0fc4b33aa4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 11:25:31 +08:00
sk 82486dd427 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 11:25:15 +08:00
by 3cd2dd06e1 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-06 11:25:14 +08:00
by 82aee49eda 生成token修改 2024-09-06 11:24:35 +08:00
sk 32e8b2f22e 房卡默认加成 2024-09-06 11:22:29 +08:00
kxdd 979645567e 合并代码 2024-09-06 10:08:29 +08:00
kxdd b74f284654 Merge branch 'ma' into develop
# Conflicts:
#	gamesrv/clawdoll/scenepolicy_clawdoll.go
2024-09-06 10:08:05 +08:00
sk 40966b52cb 竞技馆房间配置 2024-09-06 09:50:19 +08:00
kxdd 9963ef130a public 2024-09-06 09:43:14 +08:00
kxdd 8f59f4d03a 娃娃机抓取后结果通知修改 2024-09-06 09:41:41 +08:00
sk fccb385f79 竞技馆房间配置包类型校验 2024-09-05 18:47:21 +08:00
sk c4bea18f9f 道具交易市场 2024-09-05 18:31:04 +08:00
sk 33380d1bf8 查询房间信息 2024-09-05 16:02:50 +08:00
sk e39a08bb29 Merge branch 'develop' into dev_slots 2024-09-05 15:38:07 +08:00
sk 58fe35c90f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-05 14:51:52 +08:00
sk 3b15a84df3 查询房间信息 2024-09-05 14:46:43 +08:00
kxdd 2869fb7e3f Merge branch 'ma' into develop 2024-09-05 14:46:34 +08:00
sk a126fb81ae 修改排位赛奖励 2024-09-05 14:31:12 +08:00
kxdd e1e805f9d8 娃娃机添加流禁止流恢复功能 2024-09-05 14:23:36 +08:00
sk e33fe64bca 房间列表查询 2024-09-05 14:20:36 +08:00
sk 54c2b0735e Fortune游戏数据存储 2024-09-05 11:50:44 +08:00
sk b61b41313d 解决冲突 2024-09-05 11:28:40 +08:00
sk bcac7f06d3 update public 2024-09-05 11:26:52 +08:00
sk 1948560a03 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-05 11:25:13 +08:00
sk f056014c50 玩家游戏数据保存 2024-09-05 11:24:46 +08:00
tomas 5418b2bdda Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
#	public
2024-09-05 11:09:14 +08:00
tomas 497be310b3 add dd 2024-09-05 11:05:07 +08:00
by 68a8e010cf scene只能绑定对应的娃娃机编号 2024-09-05 10:28:43 +08:00
sk 88bbca47f1 推广渠道 2024-09-04 17:24:29 +08:00
sk 4a32df4ecf 竞技馆 2024-09-04 15:31:35 +08:00
sk 54a13fe8ae Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-04 15:08:22 +08:00
sk 9c1fed84e9 竞技馆读取后台配置 2024-09-04 14:53:29 +08:00
sk ac86a5e294 删除竞技馆测试配置 2024-09-04 14:21:21 +08:00
by fb8bfbde87 刪除log 2024-09-04 14:03:37 +08:00
sk f4143ad6d3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-04 13:58:30 +08:00
by 12623d7b94 增加log 2024-09-04 13:46:10 +08:00
sk 5b6a5ad5d3 竞技馆房间信息 2024-09-04 11:54:59 +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
kxdd 8514f22fc6 娃娃机修改 2024-09-04 11:18:04 +08:00
kxdd d8f01f39ea 娃娃机配置 2024-09-04 10:52:45 +08:00
kxdd 9cdc0f24c7 娃娃机配置更新 2024-09-04 10:49:37 +08:00
kxdd 27eb944329 娃娃机配置更新 2024-09-04 10:49:16 +08:00
kxdd c4a0a31df8 添加娃娃机ID 2024-09-04 10:01:50 +08:00
kxdd e23f33c569 public 2024-09-04 10:01:15 +08:00
sk 7c00ec5067 道具修改失败返回错误码 2024-09-03 18:42:49 +08:00
sk 92bf5fe16e review 2024-09-03 18:09:09 +08:00
kxdd c4d58262de 娃娃机添加流ID 2024-09-03 17:50:19 +08:00
tomas bc81ecdfed Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-03 17:16:18 +08:00
tomas a2e34269fd add test v1 不要合并 2024-09-03 17:16:07 +08:00
by c226024401 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-03 17:15:26 +08:00
by d16c1a1887 修改log 2024-09-03 17:15:05 +08:00
kxdd 85a115809c 添加娃娃机配置 2024-09-03 16:48:21 +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 89aefd480a Merge branch 'ma' into develop 2024-09-03 16:36:25 +08:00
sk c3f0f0d9fe Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-03 16:33:59 +08:00
by 36edf8ba7b Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-09-03 16:22:59 +08:00
by fe375fb15f 删除无用代码 2024-09-03 16:22:47 +08:00
kxdd 9ef1f9d896 娃娃机报错修改 2024-09-03 16:09:43 +08:00
by 429c5e0a31 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	public
2024-09-03 15:54:22 +08:00
by df04ede671 public 2024-09-03 15:53:09 +08:00
kxdd da83b674d2 public 提交 2024-09-03 15:48:23 +08:00
by 59535c2015 更新配置 2024-09-03 15:46:54 +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
by e7a6049341 娃娃机后台配置 增加StreamId字段 2024-09-03 15:12:24 +08:00
kxdd ddcaa62f13 娃娃机修改 2024-09-03 15:10:41 +08:00
sk 034abb64e2 牌局回放 2024-09-03 11:20:49 +08:00
sk 5c6dce2f4d 房卡场中途不能离开房间 2024-09-03 10:57:05 +08:00
sk d292cbc118 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-03 10:04:13 +08:00
sk 05a54af2db 活动礼包 2024-09-03 10:02:26 +08:00
sk d2c5c4f159 活动礼包 2024-09-02 17:31:45 +08:00
sk 151a739dab 创建房间参数初始化 2024-09-02 16:26:05 +08:00
kxdd 6a9c6a988b 娃娃机获取token修改 2024-09-02 16:23:45 +08:00
sk 00dcc3199f 竞技馆房主付费 2024-09-02 16:13:23 +08:00
sk 26db8f4b21 竞技馆 2024-09-02 14:55:18 +08:00
sk 04a0772415 竞技馆 2024-09-02 14:35:10 +08:00
sk 9f490a7aca 竞技馆 2024-09-02 11:44:12 +08:00
sk 03cd5dda2b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-02 10:08:35 +08:00
sk 1d9bfd5802 竞技馆 2024-09-02 10:08:23 +08:00
tomas 77748f066f Merge branch 'develop' into dev_slots 2024-09-02 09:32:56 +08:00
sk b7d4efb7a6 代码优化 2024-08-30 18:52:11 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
sk 89bdfac420 新增拉霸游戏 2024-08-30 17:53:42 +08:00
sk 0ba53df8ec 新增拉霸游戏 2024-08-30 17:29:11 +08:00
sk 74efab000e 新增拉霸游戏 2024-08-30 17:19:03 +08:00
sk 9ab3da69a4 新增拉霸游戏 2024-08-30 17:18:06 +08:00
by ece16ac947 获取token 2024-08-30 16:45:07 +08:00
tomas 18a884da43 11 2024-08-30 15:59:55 +08:00
by 3a6e420e98 token测试数据 2024-08-30 15:34:28 +08:00
sk fa57f5e8e6 保存玩家游戏数据 2024-08-30 14:49:55 +08:00
kxdd 958a3b1ba4 娃娃机等待玩家添加 2024-08-30 11:56:15 +08:00
sk 15014b54bb update excel 2024-08-30 09:34:45 +08:00
sk 00f0ecd750 update excel 2024-08-30 09:34:27 +08:00
sk 1b2b3fdc5d 竞技馆后台协议 2024-08-29 18:20:43 +08:00
sk a77cfa41dd 离开房间返回错误码 2024-08-29 16:54:30 +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
by ccc0e97635 娃娃机etcd配置 2024-08-29 11:55:57 +08:00
by 6bd95be413 娃娃机etcd配置 2024-08-29 11:33:52 +08:00
by 94d7e4f45f Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
# Conflicts:
#	protocol/clawdoll/clawdoll.pb.go
2024-08-29 11:33:26 +08:00
by 46c68b9785 娃娃机etcd配置 2024-08-29 11:32:55 +08:00
sk c14c15e18b Merge branch 'develop' into release 2024-08-29 09:03:31 +08:00
sk 49c2d8baac 房卡场房间id范围 2024-08-29 09:00:58 +08:00
sk 9ea57766a4 房卡场对局记录 2024-08-28 18:18:36 +08:00
kxdd ebe7b1c4c8 娃娃机协议修改 2024-08-28 17:00:31 +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
by 14b78495f6 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-27 16:03:34 +08:00
by 0792e35863 开启甩抓 2024-08-27 16:03:07 +08:00
kxdd cbd00bf0f8 娃娃机状态修改 2024-08-27 15:13:32 +08:00
sk 1db69f8df3 update excel 2024-08-27 14:51:30 +08:00
sk f782b799ab update excel 2024-08-27 11:06:02 +08:00
sk 613ed6da76 update excel 2024-08-27 11:05:42 +08:00
sk 466eafe1bc 房间信息添加比赛配置id 2024-08-26 18:13:15 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
by dcc68130d2 log修改 2024-08-26 10:53:25 +08:00
by 377482ce6d 娃娃机log打印修改 2024-08-26 10:50:03 +08:00
sk 4e6b92cd33 review 2024-08-24 18:26:31 +08:00
sk 7222426469 竞技馆后台配置 2024-08-24 18:25:03 +08:00
sk 1db62f9d90 gameconfig 2024-08-24 18:23:47 +08:00
sk f4434bd945 去掉ParamsEx,agentor 2024-08-24 18:22:06 +08:00
by ba9dde2005 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-24 16:11:03 +08:00
by 4580f69514 请求token注册协议修改 2024-08-24 16:10:28 +08:00
sk a040d30354 道具出售金额用int64 2024-08-24 15:49:07 +08:00
kxdd aed283b37e Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-24 15:17:17 +08:00
kxdd 87486f1a48 娃娃机状态流程修改 2024-08-24 15:13:22 +08:00
by c6ee48573b 电压设置 2024-08-24 12:03:54 +08:00
sk 4c0c6f7c2b 竞技馆后台协议 2024-08-23 18:11:54 +08:00
by b98b2246eb 娃娃机获取token 2024-08-23 16:35:58 +08:00
sk a13ed034d7 比赛观战错误码 2024-08-23 09:43:51 +08:00
sk 825f22a3bf update public 2024-08-22 17:51:13 +08:00
sk 3f95d10437 Merge branch 'custom' into develop 2024-08-22 17:48:48 +08:00
sk ab974063e8 tienlen比赛场观战发送玩家手牌 2024-08-22 17:48:10 +08:00
sk 85ba5689b1 添加tienlen房卡场游戏配置 2024-08-22 16:17:51 +08:00
sk 8736f54fe1 现金购买后vip经验获得调整 2024-08-22 16:07:17 +08:00
by 88db5712d8 娃娃机获取token 2024-08-22 15:43:28 +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 e419902ac1 Merge branch 'develop' into release 2024-08-20 14:52:21 +08:00
sk cd321a3f55 update excel 2024-08-20 14:41:38 +08:00
sk 4ce799b314 Merge branch 'develop' into release 2024-08-20 14:29:28 +08:00
sk 8df3978077 update excel 2024-08-20 14:14:55 +08:00
sk 6153903f31 比赛场比赛中列表 2024-08-20 10:44:42 +08:00
sk 15d0d2be78 update public 2024-08-20 10:19:08 +08:00
sk fc29fcddd8 比赛列表返回图标信息 2024-08-20 09:54:57 +08:00
sk fe8ccec885 review 2024-08-20 09:46:13 +08:00
sk 50da2721fb Merge branch 'develop' into release 2024-08-19 13:52:37 +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
by b5e23404c0 设置音乐关闭 2024-08-16 18:24:05 +08:00
by 33e82b0095 娃娃机 2024-08-16 18:05:45 +08:00
sk 159e69094f 小精灵配置 2024-08-16 15:08:44 +08:00
sk e5b80fda16 小精灵功能 2024-08-16 11:28:01 +08:00
by 3b2c207627 娃娃机基础配置 2024-08-16 10:58:45 +08:00
sk eba92ed00b 修改ChannelId 2024-08-16 09:51:35 +08:00
by 7a2c11d92e 娃娃机数据清理 2024-08-16 09:10:15 +08:00
by 37f6b4163e 娃娃机数据清理 2024-08-15 18:35:22 +08:00
sk 821f3d7274 update public 2024-08-15 16:30:53 +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
by 6b8e24cba3 娃娃机投币消息加入消息队列 2024-08-15 16:07:50 +08:00
sk 514d6fdf37 优化比赛场奖励领取次数限制 2024-08-15 15:54:38 +08:00
sk 28921649c5 删除冗余代码 2024-08-15 15:54:30 +08:00
by 5e60434b60 娃娃机代码整理 2024-08-15 14:38:21 +08:00
by afe8d3f0b1 娃娃机使用消息队列处理消息 2024-08-15 14:37:08 +08:00
by 154a037e08 娃娃机监听消息 2024-08-15 11:31:45 +08:00
kxdd f23cfda629 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-14 16:24:31 +08:00
by 4dc78ff468 娃娃机返回操作结果 2024-08-14 16:23:59 +08:00
kxdd a4b4a0b2a0 封装移动投币操作 2024-08-14 16:23:58 +08:00
by 8ff978db72 娃娃机返回操作结果 2024-08-14 16:22:57 +08:00
kxdd ae4ab17075 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-14 15:54:38 +08:00
kxdd 2c8ce6a467 添加上分投币 2024-08-14 15:53:27 +08:00
by db82eabb7c 娃娃机 2024-08-14 14:48:28 +08:00
by 4a86c552f5 配置文件 2024-08-14 14:42:20 +08:00
kxdd ac608b4a44 Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma 2024-08-14 14:25:46 +08:00
kxdd 1fff8b2ebb 添加移动响应 2024-08-14 14:09:05 +08:00
by b9191e0538 娃娃机 2024-08-14 13:43:42 +08:00
by d2a8b0e618 娃娃机修改 2024-08-14 12:06:15 +08:00
by 6ea5fb3943 娃娃机投币 2024-08-14 11:37:03 +08:00
by 775280e03f 娃娃机 2024-08-14 11:33:03 +08:00
sk cb907ae642 删除测试代码 2024-08-14 09:25:59 +08:00
sk da90adb309 update public 2024-08-13 16:57:45 +08:00
sk 42099b3d59 兑换商品返回商品id 2024-08-13 16:56:32 +08:00
kxdd 49b0c6cc00 下抓通知添加 2024-08-13 15:33:44 +08:00
by d703046f63 娃娃机 2024-08-13 14:47:12 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
sk 2568b66147 娃娃机 2024-08-13 14:06:00 +08:00
sk 81bf26ffc6 添加娃娃机配置 2024-08-12 17:39:33 +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 d16e49448f 解决冲突 2024-08-10 19:14:35 +08:00
sk 7f75f9a0a4 比赛场轮次淘汰允许不淘汰人员 2024-08-10 19:13:02 +08:00
by 4880d41aa3 娃娃机 2024-08-10 16:24:10 +08:00
by d232592524 娃娃机主机实现 2024-08-10 15:48:01 +08:00
sk cdc3b3d3da update excel 2024-08-10 09:10:44 +08:00
sk d46bbd65d0 update excel 2024-08-09 18:33:31 +08:00
sk b885612d1f public 2024-08-09 17:15:50 +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 4cf1b00b4d update protocol 2024-08-08 18:30:05 +08:00
sk 239c93ea04 解决冲突 2024-08-08 18:27:31 +08:00
sk c8ba3b74ee vip特权1数据结构调整 2024-08-08 18:25:18 +08:00
sk 1c61b86681 新手引导启用时间 2024-08-08 17:37:57 +08:00
sk 61523b30d5 兑换礼包记录 2024-08-08 17:26:30 +08:00
sk 6ab8c5506e 兑换礼包记录 2024-08-08 16:57:31 +08:00
sk 33f0d7c8aa 添加娃娃机服务 2024-08-08 16:03:59 +08:00
sk a51037b1e7 新手引导 2024-08-08 14:59:42 +08:00
sk dd0794d0de no message 2024-08-07 08:24:28 +08:00
sk 7d92e5a94c Merge branch 'develop' into release 2024-08-06 16:24:25 +08:00
sk 6442841899 Merge branch 'develop' into release 2024-08-10 01:10:57 +08:00
sk 731701832f update develop 2024-08-10 01:10:57 +08:00
sk 2e77085fe4 update excel 2024-08-10 01:10:42 +08:00
sk 0bff759477 Merge branch 'develop' into release 2024-08-10 01:05:44 +08:00
sk 95fcaa5977 vip升级检查皮肤红点 2024-08-10 01:05:28 +08:00
sk 3796a77bbb Merge branch 'develop' into release 2024-08-10 00:32:42 +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 c988804222 皮肤红点通知 2024-08-06 16:24:07 +08:00
sk ab481509e5 Merge branch 'develop' into release 2024-08-06 10:27:33 +08:00
sk 7ceef9878c update excel 2024-08-06 10:27:08 +08:00
sk 840e8f5973 Merge branch 'develop' into release 2024-08-06 08:59:51 +08:00
sk d6111cc733 update develop 2024-08-06 08:59:50 +08:00
sk e790746f53 比赛场随机发牌 2024-08-05 17:22:15 +08:00
sk fe1e66fec2 皮肤加成 2024-08-05 17:05:03 +08:00
sk d3c40dde03 update 2024-08-05 14:55:29 +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 a227b67976 no message 2024-08-05 10:11:58 +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
sk 0372450f1a fix:查询玩家信息 2024-08-01 14:39:24 +08:00
sk 95a258a1a2 fix:查询玩家信息 2024-08-01 14:29:06 +08:00
sk 55ed8da8fa update skin 2024-07-31 16:36:26 +08:00
sk 0bb1597aeb update skin 2024-07-31 15:47:28 +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 e638f43619 fix:dbproxy异常 2024-07-29 18:15:42 +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
by 6ef6bbe2cd 获奖记录 2024-07-27 11:44:37 +08:00
by a2501eefa4 排行榜代码(已屏蔽) + 获奖记录 2024-07-27 10:48:04 +08:00
sk 33c3e14e8b 随机机器人皮肤 2024-07-27 09:27:07 +08:00
sk 61b78ce88a update excel 2024-07-26 15:37:30 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 25c7f68dac 道具空指针异常 2024-07-25 15:11:07 +08:00
sk 857f052728 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-25 14:49:36 +08:00
sk 9f6e9aa910 解决冲突 2024-07-25 14:49:25 +08:00
by 4bd50fa76a proto提交 2024-07-25 14:47:49 +08:00
sk 550e5eb690 fix:模型初始化 2024-07-25 14:46:47 +08:00
by 60709a140f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.proto
2024-07-25 14:39:03 +08:00
by b15fadfcc4 轮播图增加URL 2024-07-25 14:32:55 +08:00
sk 699a08f9bb update DB_Skin 2024-07-25 14:24:54 +08:00
sk ca9827db16 首充支持道具 2024-07-25 14:03:44 +08:00
sk 675a1cb078 update public 2024-07-25 11:43:57 +08:00
sk 22cc427ea5 皮肤技能加成 2024-07-25 11:26:32 +08:00
sk f1a6cd7389 Merge branch 'skin' into develop 2024-07-25 10:19:35 +08:00
sk 5eaa1e2016 皮肤技能加成 2024-07-25 09:57:31 +08:00
sk d6419d973b Merge branch 'develop' into release 2024-07-24 18:38:17 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
by e60e272a9a 随机机器人宠物技能等级修改 2024-07-24 15:18:45 +08:00
sk d8825c650d Merge branch 'develop' into release 2024-07-24 09:10:20 +08:00
sk ad116c9cd4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-23 17:20:41 +08:00
sk 8c622c1d63 v卡掉落调整 2024-07-23 17:19:43 +08:00
by 77c2e5683c 随机机器人宠物技能等级 2024-07-23 15:11:49 +08:00
by 1322a09297 随机机器人宠物技能等级 2024-07-23 15:11:00 +08:00
by b6477c60ef 随机机器人宠物技能等级 2024-07-23 14:57:55 +08:00
by dcaf24653b Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-23 14:36:20 +08:00
by c024df9386 随机机器人宠物技能等级 2024-07-23 14:36:16 +08:00
sk e4afc80be9 修复赛季积分重置问题 2024-07-23 11:24:13 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk b6b7ff4035 Merge branch 'develop' into release 2024-07-19 10:45:58 +08:00
sk 8e880d65b1 道具兑换撤单 2024-07-19 10:21:12 +08:00
sk f637724a61 道具兑换撤单 2024-07-19 09:30:19 +08:00
sk 5e8c7f2ca0 update excel 2024-07-18 14:40:06 +08:00
sk 25618c0289 update excel 2024-07-18 14:32:51 +08:00
sk bcc677ed87 Merge branch 'develop' into release 2024-07-18 14:19:21 +08:00
sk 152f41e317 update excel 2024-07-18 14:16:31 +08:00
by 49b10d0a99 钻石抽奖信息渠道修改 2024-07-18 11:44:49 +08:00
sk c5886c22b0 Merge branch 'develop' into release 2024-07-18 11:28:12 +08:00
sk 99b25fa635 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-18 11:27:37 +08:00
sk 3a881657a2 活动开关 2024-07-18 11:15:12 +08:00
sk 1253ba8cc4 Merge branch 'develop' into release 2024-07-17 18:32:31 +08:00
by da8a0f1a45 钻石抽奖权重计算修改 2024-07-17 15:17:15 +08:00
by 116d521789 钻石抽奖权重计算修改 2024-07-17 14:56:43 +08:00
by 84ffbd61c9 钻石抽奖权重计算修改 2024-07-17 14:56:20 +08:00
sk 7e28a059ae update excel 2024-07-17 11:27:30 +08:00
sk 39e84031ae 邮件红点 2024-07-16 11:29:52 +08:00
sk bf08bbbfbd 获得道具记录消耗 2024-07-15 17:12:05 +08:00
sk 4118164692 Merge branch 'develop' into release 2024-07-15 15:55:47 +08:00
sk ea7e0a29b5 update develop 2024-07-15 15:55:46 +08:00
sk 8391b159ea Merge branch 'develop' into release 2024-07-15 15:33:56 +08:00
sk 45f1393600 update develop 2024-07-15 15:33:56 +08:00
sk ae2042bf4d 皮肤自动使用 2024-07-15 15:30:55 +08:00
sk 8f24ca5592 Merge branch 'develop' into release 2024-07-15 11:15:15 +08:00
sk 985c52ce0d update develop 2024-07-15 11:15:15 +08:00
sk 7f2f1eeedf update excel 2024-07-13 18:16:19 +08:00
sk 64577b5f2a 记录注册ip 2024-07-13 14:56:09 +08:00
sk 16fc31fbb0 同步皮肤修改 2024-07-13 09:30:38 +08:00
by 3fc151e340 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-12 18:11:03 +08:00
by 152ad64263 兑换商城判断是否显示判断 2024-07-12 18:10:17 +08:00
sk 23c1d1eaab 皮肤功能 2024-07-12 18:05:03 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk 29a8319849 update excel 2024-07-11 18:35:30 +08:00
sk 1c502d603c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 18:34:48 +08:00
sk 4fc7e30647 update excel 2024-07-11 18:33:02 +08:00
by a9b6d1a020 更新配置表 2024-07-11 18:31:51 +08:00
sk db8388c7bc update excel 2024-07-11 18:31:43 +08:00
sk 17b2cd0a64 update excel 2024-07-11 18:30:43 +08:00
sk 7e4be48aff update excel 2024-07-11 18:29:04 +08:00
by 81340b3787 更新配置表 2024-07-11 18:08:50 +08:00
by a8f44cdf47 更新配置表 2024-07-11 18:08:03 +08:00
by e53e94eb4c Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	data/DB_GameItem.dat
#	data/DB_PropExchange.dat
#	data/DB_Task.dat
#	public
#	xlsx/DB_GameItem.xlsx
2024-07-11 18:04:54 +08:00
by e5a6ebfe76 更新配置表 2024-07-11 18:03:04 +08:00
by edf83e6e41 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-14 17:22:40 +08:00
by 34af2110e2 累计签到红点BUG修改 2024-07-14 17:22:29 +08:00
sk 56934264a3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 17:24:06 +08:00
sk 1123fe94ab 赛季挑战任务 2024-07-11 17:23:56 +08:00
sk 7504a2dcdf Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 11:57:04 +08:00
sk 06343ab6fc 通行证活动统计数据 2024-07-11 11:56:34 +08:00
by e326ccdf81 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-11 10:20:25 +08:00
by 240711a0bd 兑换商城修改 2024-07-11 10:20:21 +08:00
sk a28d9163d8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-11 09:59:05 +08:00
sk b83be4028e update gameitem 2024-07-11 09:58:30 +08:00
by 8f55c7cb3d 删除测试代码 2024-07-10 17:53:15 +08:00
by f299b5ca13 钻石抽奖白名单权限 2024-07-10 17:49:46 +08:00
by 351d5979ba Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-10 16:34:40 +08:00
by 9636dccb99 钻石抽奖 2024-07-10 16:34:10 +08:00
sk d0f388e46b 充值金额统计 2024-07-10 16:23:23 +08:00
sk c21dd8e565 v卡兑换消耗统计 2024-07-10 16:17:51 +08:00
sk b5aba457a0 解决冲突 2024-07-10 15:58:45 +08:00
sk b3d95e3512 玩家信息添加v卡消耗和充值金额 2024-07-10 15:53:06 +08:00
by 1c6706d014 钻石抽奖 2024-07-10 15:26:03 +08:00
sk 3c910a4ad7 初始化充值金额 2024-07-10 15:16:09 +08:00
sk 8c843ecf0b 后台道具配置 2024-07-10 14:16:27 +08:00
sk 68ca6af923 增加日志 2024-07-10 14:05:30 +08:00
by 55e6142f60 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-10 11:41:47 +08:00
by 9481b8d1ab 兑换商城修改 2024-07-10 11:41:33 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
sk bc679f529e 解决冲突 2024-07-09 19:05:29 +08:00
sk 463117de96 修改protocol导入路径 2024-07-09 19:00:30 +08:00
by e19d9e29fe config还原 2024-07-09 17:48:17 +08:00
by e4f993fb8e proto编译文件 2024-07-09 17:46:04 +08:00
by c671da56e6 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	etcd/keyconf.go
#	model/config.go
#	protocol/player/player.pb.go
#	protocol/player/player.proto
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
2024-07-09 17:43:14 +08:00
by 0484f1f47b 钻石抽奖实现 2024-07-09 17:35:55 +08:00
sk d29c485c87 记录注册ip和登录id 2024-07-09 15:49:51 +08:00
sk 7a0500c5eb 道具记录增加消耗道具数量 2024-07-09 15:20:44 +08:00
sk e9b80f805e 增加赠送奖励记录 2024-07-09 11:35:15 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk 515de3a987 消耗钻石比赛开始再统计 2024-07-09 09:10:33 +08:00
sk 3d96c347d1 消耗钻石比赛开始再统计 2024-07-08 16:52:32 +08:00
sk b9fbedee9e update develop 2024-07-08 11:55:00 +08:00
sk 432de00d12 update deploy.bat 2024-07-08 11:54:23 +08:00
sk 1fcf9aa6d2 update develop 2024-07-08 11:51:13 +08:00
sk 4cf89236a8 update deploy.bat 2024-07-08 11:48:46 +08:00
sk 0bf6976352 任务变更通知 2024-07-08 11:46:19 +08:00
sk cdd855bfb2 修改构建脚本 2024-07-08 11:34:19 +08:00
sk 0f2404bf12 修改构建脚本 2024-07-05 18:42:51 +08:00
sk ea80d6e89c update game_item 2024-07-05 16:31:06 +08:00
sk d785e80622 update game_item 2024-07-05 16:27:00 +08:00
sk a9b8b5af02 update task 2024-07-05 15:51:07 +08:00
by fb3d73f61f 比赛场每日库存BUG修改 2024-07-05 15:43:12 +08:00
sk bc4c7c11aa update public 2024-07-05 15:03:13 +08:00
sk 78feeb2595 玩家信息初始化 2024-07-05 11:37:14 +08:00
sk ce2c857ff3 角色红点 2024-07-05 10:49:28 +08:00
sk 0ccfff81de 邮件红点问题 2024-07-05 10:05:55 +08:00
sk 42c1f5d79f 解决冲突 2024-07-05 09:29:03 +08:00
sk 7010f6215e 解决冲突 2024-07-05 09:28:41 +08:00
sk 19d8ed6cc5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-18 00:20:51 +08:00
sk 090d8ba723 赛季通行证邮件翻译 2024-07-18 00:20:37 +08:00
sk 4f9e3b87ca Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-10 00:01:29 +08:00
sk c7992f9fc0 赛季通行证任务 2024-07-10 00:01:12 +08:00
by 538698be07 宠物技能红点提示 2024-07-04 17:10:31 +08:00
by 802f67cb7a Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-04 16:52:09 +08:00
by 1d99e5f794 宠物技能红点 补提 2024-07-04 16:51:57 +08:00
by b93901f765 宠物技能红点提示 2024-07-04 16:23:19 +08:00
sk 36d77da2fe 赛季通行证任务 2024-07-04 16:13:23 +08:00
sk 4d1e89cf91 赛季通行证兑换开关 2024-07-06 01:28:45 +08:00
sk 279b5b84cb Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-06 01:28:31 +08:00
sk aabf20da2c 赛季通行证兑换开关 2024-07-06 01:22:36 +08:00
by 76d95282ca Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-07-04 15:02:02 +08:00
by a5082f50e5 比赛场库存修改 2024-07-04 15:01:50 +08:00
sk 49bd65a05c 赛季通行证加成 2024-07-04 15:00:57 +08:00
sk cc656a5bbc 赛季通行证重置 2024-07-04 14:51:57 +08:00
sk 5eb468c7ff 邀请好友游戏任务 2024-07-04 11:20:00 +08:00
sk 9379613ae8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-04 11:12:23 +08:00
sk 938aa9d1dd 邀请好友游戏任务 2024-07-04 11:00:16 +08:00
by b28218b753 比赛场每日库存修改 2024-07-04 10:47:19 +08:00
sk 8de4b80458 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-04 10:24:01 +08:00
sk 2922689951 赛季通行证兑换记录 2024-07-04 10:23:41 +08:00
by bd3871aa10 比赛场数据 2024-07-04 10:22:00 +08:00
sk b5ce35eb68 赛季通行证兑换记录 2024-07-04 10:21:38 +08:00
sk 0b2fb94e69 赛季通行证兑换记录 2024-07-04 10:21:31 +08:00
by ee16983eaf 更新配置表 2024-07-04 10:12:41 +08:00
sk f25adaf3e9 赛季通行证兑换记录 2024-07-04 10:07:23 +08:00
by a757b4bbf9 比赛场数据保存 2024-07-04 09:55:54 +08:00
by 0e372fea74 屏蔽测试代码 2024-07-03 19:20:33 +08:00
by e68803b14a 同步宠物技能表 2024-07-03 19:15:18 +08:00
by 0972b85122 proto 2024-07-03 19:13:09 +08:00
by 1c14d96060 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	protocol/webapi/common.pb.go
2024-07-03 19:12:22 +08:00
by 007b0c3a5b 比赛场库存 2024-07-03 19:11:49 +08:00
sk 182d4e9612 赛季通行证 2024-07-03 19:11:27 +08:00
sk 87a9186ae3 赛季通行证数据记录 2024-07-03 17:26:12 +08:00
sk e2d18f491b 赛季通行证排行榜 2024-07-03 15:25:33 +08:00
sk 0c45f9c44a update data 2024-07-03 15:12:55 +08:00
sk 1f8b7e1d70 打印rabbitmq日志 2024-07-03 14:47:07 +08:00
sk 8117f1af54 赛季通行证数据记录 2024-07-03 10:08:04 +08:00
sk 2e34c33768 赛季通行证账变记录 2024-07-02 20:51:10 +08:00
sk 83cfbe6381 赛季通行证排行榜奖励发放 2024-07-02 20:30:35 +08:00
sk aaf15d2b3d 龙币变化通知 2024-07-02 18:34:25 +08:00
sk 78d6a109fe 赛季通行证 2024-07-02 17:34:44 +08:00
by f68588eaa3 兑换修改 2024-07-02 15:26:54 +08:00
sk 972861ee83 update public 2024-07-02 14:36:08 +08:00
sk c75df5742e 赛季通行证活动 2024-07-02 14:30:49 +08:00
sk 4c7abf167e 赛季通行证 2024-07-02 14:21:24 +08:00
by 20b8fe91a0 兑换商城修改 2024-07-02 11:34:41 +08:00
by 2d7921897a 宠物技能游戏内展示 2024-07-02 11:29:41 +08:00
by 072c83c34c 广告任务 2024-07-02 09:02:59 +08:00
by b6aaf756e6 宠物技能 2024-07-01 11:47:42 +08:00
sk fde4187f5b Merge branch 'develop' into release 2024-06-29 18:58:24 +08:00
by 299c6502a6 解决钻石存钱罐发送数据自动补位问题 2024-06-29 18:56:51 +08:00
sk 74b868460b Merge branch 'develop' into release 2024-06-29 18:29:15 +08:00
by 6495a96f4e 钻石存钱罐需求更改只在tienlen中增加钻石 2024-06-29 18:28:33 +08:00
sk 7e80facc24 Merge branch 'develop' into release 2024-06-29 18:25:48 +08:00
by 8199231ac7 钻石存钱罐需求更改只在tienlen中增加钻石 2024-06-29 18:24:50 +08:00
by d11f7f75c2 钻石存钱罐 BUG修改只保留小数点后4位 2024-06-29 18:03:56 +08:00
sk 2805e4ca6c 通行证协议 2024-06-29 15:29:01 +08:00
sk 655fe2ff96 Merge branch 'develop' into release 2024-06-29 11:35:41 +08:00
sk 087bff7a13 邀请活动充值加积分 2024-06-29 11:33:03 +08:00
sk b4427a1459 Merge branch 'develop' into release 2024-06-28 18:58:09 +08:00
sk 1fcb3031ed 解决冲突 2024-06-28 18:57:13 +08:00
sk 446e696d7e 新邀请活动 2024-06-28 18:52:15 +08:00
sk f1ebe57d04 新邀请活动 2024-06-28 18:37:07 +08:00
sk a67c747a46 解决冲突 2024-06-28 16:58:58 +08:00
sk 3d80c1b9bb public 2024-06-28 16:56:02 +08:00
sk 57bc29a2d6 update data 2024-07-01 18:45:45 +08:00
sk 808a2458fe Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-07-01 18:43:26 +08:00
sk 9a6ced171b 跨周问题 2024-07-01 18:43:00 +08:00
by 5c9fec6e36 钻石存钱罐修改 2024-06-28 16:08:52 +08:00
sk b067f07b2c 新邀请活动 2024-06-28 15:33:09 +08:00
sk 303f0817ca mongodb事务 2024-06-28 15:07:57 +08:00
by 44ff58675d 钻石存储罐 领取次数达到上限 不增加钻石 2024-06-28 11:48:01 +08:00
by 7146df070c 增加背包兑换话费码操作返回结果 2024-06-28 10:53:55 +08:00
by 2b75df2e38 增加背包兑换话费码操作返回结果 2024-06-28 10:38:14 +08:00
by d4d8816a8b 钻石存钱罐修改 2024-06-28 09:52:47 +08:00
sk 70768089da 跨周根据所在时区计算日期 2024-06-28 09:14:11 +08:00
by d6a15311f7 钻石存钱罐修改 2024-06-27 18:55:51 +08:00
by 8d8031759d 钻石存储罐上线问题修改 2024-06-27 18:39:48 +08:00
sk 7688583735 邀请任务跨周积分重置 2024-06-27 18:25:12 +08:00
sk 291b1cee4f 邀请任务跨周积分重置 2024-06-27 18:23:39 +08:00
sk bdbf908e36 任务系统赠送金币记录 2024-06-27 17:53:53 +08:00
sk 235082c338 邀请活动渠道开关 2024-06-27 17:39:44 +08:00
sk 7786aeac9c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-27 17:32:15 +08:00
by 606aff2240 金币存钱罐BUG修改 2024-06-27 17:12:48 +08:00
by ead0abf6b6 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-08-16 16:28:07 +08:00
by fa581628f3 七日签到修改 2024-08-16 16:27:37 +08:00
sk 0c0f270762 邀请活动开关 2024-06-27 16:23:22 +08:00
sk 32323aa1e8 新版邀请活动 2024-06-27 16:05:46 +08:00
sk 0eb4b826a5 新版邀请活动 2024-06-27 14:17:45 +08:00
sk c763d90325 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-27 11:43:35 +08:00
by b9ef093b18 宠物技能配置文件修改 2024-06-27 11:34:13 +08:00
by ae0ac2dbaf 钻石存储罐修改 2024-06-27 10:57:57 +08:00
sk bc3be9673d 新版邀请活动 2024-06-27 10:55:11 +08:00
by 0d11c2a79f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-27 10:50:02 +08:00
by c2a7fa3834 修改钻石存储罐计算保留后4位小数 2024-06-27 10:49:51 +08:00
sk 79e207ebf9 新版邀请活动充值给自己加积分 2024-06-26 18:37:47 +08:00
sk 670726980e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-26 17:50:16 +08:00
sk 9b50471d61 新版邀请活动充值给自己加积分 2024-06-26 17:50:08 +08:00
by c845dcad4e 配置表修改 2024-06-26 17:28:24 +08:00
by 20ebed0347 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 16:59:00 +08:00
by 3a60afc0d0 金币存钱罐修改 2024-06-26 16:58:50 +08:00
sk 1edaac6773 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-26 16:55:07 +08:00
sk 523ed5b296 新版邀请活动离线积分计算 2024-06-26 16:50:47 +08:00
by 09aa018fec 钻石存钱罐 +获取运营商数据 2024-06-26 16:46:17 +08:00
sk e0f2f76322 新版邀请活动 2024-06-26 14:30:06 +08:00
sk 5058d2aba1 新版邀请活动 2024-06-26 12:07:55 +08:00
sk 754f94abbd 添加日志 2024-06-26 11:50:55 +08:00
sk 96599507b8 添加日志 2024-06-26 11:46:16 +08:00
sk f771238b5e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-26 11:26:02 +08:00
sk 77b8fdf0e9 新版邀请活动 2024-06-26 11:25:51 +08:00
by ac76712485 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 11:21:59 +08:00
by fdd5e3889e 背包使用兑换功能实现 2024-06-26 11:21:54 +08:00
sk 0c846595eb 解决冲突 2024-06-26 11:14:00 +08:00
sk 42efa82c2f update public 2024-06-26 11:05:44 +08:00
sk 7ae4392784 新版邀请活动 2024-06-26 11:04:51 +08:00
by 9ed4f708bc 备注信息修改 2024-06-26 09:38:59 +08:00
by 9ef37b0bce 备注信息修改 2024-06-26 09:29:12 +08:00
by 7d98b14f5b 钻石存钱罐更新 2024-06-25 18:42:42 +08:00
sk 8eb9a7c7a1 新版邀请活动 2024-06-25 18:06:32 +08:00
by f24d6c740b 删除测试代码 2024-06-25 17:52:12 +08:00
by 7e05717d2e 同步表 2024-06-25 17:48:10 +08:00
by da249ec436 同步表+钻石存储罐功能实现+七日签到进阶奖励修改 2024-06-25 17:31:41 +08:00
by 11d78d2386 累计签到进阶奖励修改增加google渠道区分 2024-06-30 18:10:52 +08:00
by c61c88266b 累计签到进阶奖励修改 2024-06-25 10:48:36 +08:00
by a6d76b3f94 累计签到进阶奖励更新 2024-06-24 09:42:37 +08:00
by 6985bc0437 累计签到进阶奖励实现 2024-06-24 09:29:56 +08:00
sk 56fb4612c7 比赛场开赛时间判断 2024-06-19 21:02:00 +08:00
sk 992ccb280e 比赛场开赛时间判断 2024-06-19 21:01:17 +08:00
sk 4f6222cdc5 比赛场开赛时间判断 2024-06-19 20:15:31 +08:00
sk 573a59045b Merge branch 'develop' into release 2024-06-19 19:43:35 +08:00
sk 168c2cc8c3 比赛场开赛时间判断 2024-06-19 19:04:51 +08:00
sk 2520ec2e7d 解决冲突 2024-06-19 15:26:25 +08:00
sk 9d246dcba3 排位赛赛季信息添加待领取奖励信息 2024-06-18 15:34:26 +08:00
sk a2584b22bc 钻石消耗记录 2024-06-15 18:24:39 +08:00
sk af7572f923 索引优化 2024-06-15 10:33:20 +08:00
sk 2a7ada450a 增加钻石消耗记录类型 2024-06-14 18:35:52 +08:00
by 5e212ae658 周卡续费BUG修改 2024-06-14 13:29:58 +08:00
by d57909b05a 删除无用代码 2024-06-14 11:41:18 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk f1dee4a54a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-14 09:31:37 +08:00
by feda7fd5c1 删除无用代码 2024-06-24 17:11:56 +08:00
sk c429d41900 比赛添加比赛区分 2024-06-13 13:55:00 +08:00
by a8500da1a7 周卡续费BUG修改 2024-06-12 16:44:59 +08:00
sk 3526ef069f 解散空闲房间
房间没有真人或观众,并且长时间没有真人进出房间就解散
2024-06-12 14:39:27 +08:00
sk 699596d022 update public 2024-06-11 11:35:22 +08:00
sk ceac412a25 比赛类型列表 2024-06-11 11:23:43 +08:00
sk 4ec8d6bc22 mongodb索引优化 2024-06-11 09:13:31 +08:00
sk c72b74824e 修改邀请绑定数量 2024-06-11 09:13:31 +08:00
sk 41361621ef 比赛日志用开始比赛时备份的配置不能用最新配置 2024-06-11 09:13:31 +08:00
sk d7b72cd6ea 对战场统计数据版本 2024-06-06 16:21:54 +08:00
sk 869a2c91d2 邀请积分排行榜 2024-06-06 16:09:14 +08:00
sk 604f7099ec 修改HOOK_AFTER_STOP 2024-06-06 16:04:03 +08:00
sk aee5f99d9d 重置个人水池调控数据 2024-06-06 14:22:18 +08:00
sk 8eea14794d Merge branch 'develop' into release 2024-06-05 15:25:03 +08:00
sk 14ee52a532 道具变化类型修改 2024-06-05 15:22:05 +08:00
sk 871c6ed72f Merge branch 'develop' into release 2024-06-05 09:18:49 +08:00
sk a13390909d 十三张调控记录 2024-06-05 09:14:53 +08:00
sk 5d113056c8 查询私人房列表 2024-06-04 15:41:10 +08:00
sk 3c3b6f7376 修复跨天检测错误 2024-06-04 15:39:38 +08:00
sk 46a4255273 Merge branch 'develop' into release 2024-06-04 09:27:19 +08:00
sk 776ba8a19c 进入好友房 2024-06-03 18:36:06 +08:00
sk 5e0b6139f9 tienlen记录调控信息 2024-06-03 16:54:54 +08:00
sk 39b71ea93f 比赛时间 2024-06-03 14:23:46 +08:00
sk 35c0e07004 发送邮件添加渠道筛选 2024-06-03 14:23:46 +08:00
sk e1812b5ecf vip添加比赛场免费次数 2024-05-31 09:58:00 +08:00
sk ef59d75ac5 vip添加比赛场免费次数 2024-05-30 17:33:31 +08:00
sk 7da2fd393b update DB_CollectBox 2024-05-29 17:29:19 +08:00
sk 9177d20d5e 修复空指针异常 2024-05-29 09:17:14 +08:00
sk b9c1b85193 玩家信息接口道具列表 2024-05-28 14:51:21 +08:00
sk bfbe02be66 道具变化添加后台操作类型 2024-05-28 14:49:20 +08:00
sk 3feb728527 update data 2024-05-28 11:16:34 +08:00
sk 60255489d5 预创建房间 2024-05-28 09:58:18 +08:00
sk 8b478a9f33 解决冲突 2024-05-28 09:26:18 +08:00
sk 516ab3f811 修复预创建房间问题 2024-05-28 09:24:14 +08:00
sk d3fb69d198 更新DB_CollectBox 2024-05-27 11:43:39 +08:00
sk 29745d23c2 渠道开关 2024-05-25 18:24:21 +08:00
sk d529ec2fed update 2024-05-25 17:56:03 +08:00
sk 97e03e2c22 游戏掉落 2024-05-25 16:32:17 +08:00
sk da5bb97469 review 2024-05-25 15:45:59 +08:00
sk 481860d9bc 修改注释 2024-05-25 15:03:17 +08:00
sk 0d252cebc5 添加道具类型 2024-05-25 14:47:23 +08:00
sk 63efa84183 update 2024-05-24 16:46:41 +08:00
sk a0050bd44d 离线加币问题 2024-05-24 15:23:29 +08:00
sk 7de9e8f939 rabbitmq 2024-05-24 15:13:16 +08:00
sk 6f0906c7c0 no message 2024-05-24 13:53:58 +08:00
sk d27c0270f8 no message 2024-05-24 12:00:32 +08:00
sk eddad2e788 解决冲突 2024-05-24 10:48:22 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk 2cbd5d46a0 dbproxy读取配置文件 2024-05-24 10:00:15 +08:00
sk 5ffd4d849b dbproxy读取配置文件 2024-05-24 09:58:51 +08:00
sk 27dfedab18 etcd 2024-05-24 09:37:34 +08:00
sk 898f915542 dbproxy 2024-05-23 16:05:38 +08:00
sk a6c1b37e0c Merge branch 'match' into develop 2024-05-22 18:33:04 +08:00
sk 2f749646ab 解决冲突 2024-05-22 18:12:18 +08:00
sk eba76584ce update 2024-05-22 18:09:46 +08:00
sk 0fab663f61 update 2024-05-22 18:08:29 +08:00
sk e12bc1b03c Merge branch 'release' into develop 2024-05-22 18:02:07 +08:00
sk c8be1b9320 etcd,rabbitmq防止在init方法隐式调用 2024-05-22 17:57:42 +08:00
sk 489395ebb1 删除比赛场段位 2024-05-22 17:57:42 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
sk b1c74ab992 update data 2024-05-21 09:38:27 +08:00
by 4254d08e38 兑换增加错误码返回 2024-05-20 14:50:11 +08:00
by e9c29f1442 背包修改 2024-05-20 10:36:48 +08:00
by 64bcbb896e 添加道具接口增加扣除道具检测 2024-05-20 10:09:48 +08:00
kxdd a9aeb01e99 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-17 17:09:22 +08:00
kxdd cb873bde49 配置表更新 2024-05-17 17:09:13 +08:00
sk a7b7d8f22d update DB_GameItem.xlsx 2024-05-17 15:59:38 +08:00
sk c8d380c587 update DB_GameItem.xlsx 2024-05-17 15:58:51 +08:00
sk ed1aa36815 拉霸奖池金额数据类型错误 2024-05-17 15:46:01 +08:00
sk 8fb59d54fc 拉霸奖池金额数据类型错误 2024-05-17 15:44:48 +08:00
sk 8bdd4f09dc 绑定人数统计问题 2024-05-17 14:16:56 +08:00
sk 1857c82cb8 no message 2024-05-17 11:36:27 +08:00
sk 393ef19b14 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-17 11:32:17 +08:00
sk fa34c9c8b2 绑定邀请人任务 2024-05-17 11:31:27 +08:00
kxdd 9b3a1b4d7c Merge branch 'dev_timeitem_n1' into develop 2024-05-17 11:08:08 +08:00
kxdd c43068db93 记牌器赠送修改 2024-05-17 11:07:45 +08:00
sk 11af348377 比赛配置添加手机卡类型 2024-05-17 09:30:03 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 3828311520 邀请分享链接 2024-05-16 15:22:26 +08:00
sk d298ed97e8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-16 15:06:25 +08:00
sk 6dfe2301e0 修改游戏入口开关 2024-05-16 15:06:16 +08:00
by f1308bbb09 后台增加添加道具接口 2024-05-16 13:54:52 +08:00
by 5eb29259c1 后台增加添加道具接口 2024-05-16 11:59:52 +08:00
by 2ecbc2b1cb 后台增加添加道具接口 2024-05-16 09:59:18 +08:00
by 478ab9ea0a 兑换自提 添加道具走后台 2024-05-15 18:04:39 +08:00
kxdd f95eb75eb8 drop表格修改 2024-05-15 11:47:55 +08:00
by e58eb4d672 兑换创建订单增加telcharge字段 2024-05-15 10:12:41 +08:00
by 40263b3621 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-14 17:49:23 +08:00
by b0ba8e31ff 商城兑换修改 2024-05-14 17:49:18 +08:00
kxdd d6ce3816f4 Merge branch 'dev_pigbank_n1' into develop 2024-05-14 17:21:30 +08:00
kxdd 1f3133be78 存钱罐配置修改 2024-05-14 17:20:45 +08:00
sk 3e229a4bc9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-14 11:45:46 +08:00
by 756ed06016 比赛log保存数据库修改 2024-05-14 11:44:31 +08:00
sk e2f1e997a0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-14 11:40:01 +08:00
sk d0637ca1ce 更新任务系统配置 2024-05-14 11:39:50 +08:00
by 06695defa6 比赛log保存数据库修改 2024-05-14 11:38:44 +08:00
sk d534e73613 道具日志 2024-05-14 10:26:40 +08:00
sk 0059b6d0c5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-13 18:49:19 +08:00
sk 7cabdd4d14 tienlen记牌器问题 2024-05-13 18:48:44 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
sk bc81c3c204 tienlen记牌器问题 2024-05-13 16:29:20 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop
# Conflicts:
#	model/player.go
2024-05-13 16:07:25 +08:00
kxdd 8a5752bf38 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011279 2024-05-13 16:01:49 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
sk 1de1383383 tienlen排位加成 2024-05-13 12:02:16 +08:00
kxdd 075900766d Merge branch 'dev_newTimeitem' into dev_timeitem_n1 2024-05-13 11:39:21 +08:00
by fb4a82d26f 等级榜修改 2024-05-13 11:09:29 +08:00
by 469a8279fc 等级榜删除无用代码 2024-05-13 11:09:29 +08:00
by 528bccfe0b 玩家等级榜log输出error修改 2024-05-13 11:09:28 +08:00
kxdd 45b05b1fe5 记牌器时间计算bug 2024-05-13 11:07:04 +08:00
kxdd 052cfc1fe1 Merge branch 'dev_newTimeitem' into develop 2024-05-13 11:02:40 +08:00
kxdd a017518652 记牌器时间计算bug 2024-05-13 11:01:02 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
by 384f8b5b9c 删除打印log 2024-05-11 17:59:23 +08:00
by 355c6aae93 比赛场数据统计 2024-05-11 17:10:30 +08:00
sk 0e6487256a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 17:06:58 +08:00
sk 5ac5c633a2 no message 2024-05-11 17:06:49 +08:00
sk 2eb19c9222 修改道具掉落功能 2024-05-11 17:00:47 +08:00
sk 7c02471d2c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 16:54:25 +08:00
sk dcb54a2f58 修改道具掉落功能 2024-05-11 15:54:33 +08:00
sk f2d9d51dd6 好友申请列表 2024-05-11 15:17:02 +08:00
kxdd 579e27e17f --story=1000625 --user=李海亮 存钱罐购买限制补充 https://www.tapd.cn/31044302/s/1011001 2024-05-11 11:59:22 +08:00
sk ff78edf56b update 2024-05-11 11:02:24 +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 0d81105909 添加配置参数
CloseChannelSwitch 关闭渠道开关功能
2024-05-10 17:10:45 +08:00
sk 81f0d0fe43 update DB_GameItem.xlsx 2024-05-10 16:55:33 +08:00
sk 267c0492f6 解决冲突 2024-05-10 16:53:42 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
by 62bacfb0d2 兑换商城 自提功能实现 2024-05-10 16:24:09 +08:00
by b232f44a27 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 16:02:09 +08:00
by 16a41fff24 兑换商城 自提功能实现 2024-05-10 16:01:39 +08:00
sk 32fab5e0ca fix:游戏掉落道具 2024-05-10 15:30:14 +08:00
sk 5c90f2f0b7 fix:游戏掉落道具 2024-05-10 15:29:09 +08:00
sk 65258fe07e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-10 15:15:08 +08:00
sk 085d1ef9b2 update DB_GameItem.xlsx 2024-05-10 15:14:53 +08:00
by 4553558144 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 15:13:31 +08:00
by 8c432f6f4e 好友申请记录 2024-05-10 15:13:25 +08:00
sk 9474b0dc30 修改游戏掉落物品配置规则 2024-05-10 14:47:38 +08:00
sk 061ee27ab7 update DB_GameItem.xlsx 2024-05-10 13:55:20 +08:00
sk 22dbae7f80 被邀请人充值任务 2024-05-10 11:44:58 +08:00
sk a943492d80 开启兑换渠道控制 2024-05-10 09:17:58 +08:00
sk 7dcd78d3ef 邀请分享链接简化
公告增加渠道参数
2024-05-09 17:18:16 +08:00
sk 5b758cdb80 update 2024-05-09 10:41:17 +08:00
sk 672881b9d2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-08 18:49:23 +08:00
sk 6bd9d8f6c5 重置水池 2024-05-08 18:49:00 +08:00
sk c09c059b79 重置水池 2024-05-08 18:48:27 +08:00
sk 7219ddaed8 重置水池 2024-05-08 18:34:02 +08:00
sk 05f1e805b5 重置水池 2024-05-08 18:33:33 +08:00
sk 4753b4a71a 在线统计接口 2024-05-08 18:17:35 +08:00
by 666cbf64eb 等级榜修改 2024-05-08 18:07:07 +08:00
by 5eeec8469f 等级榜删除无用代码 2024-05-08 17:38:34 +08:00
by b000a8b05d 玩家等级榜log输出error修改 2024-05-08 17:36:14 +08:00
sk 64a1df39c5 代码优化 2024-05-08 16:36:07 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00
sk 1c80a73741 Merge branch 'develop' into release 2024-05-07 18:09:20 +08:00
sk c1a15c59c3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-07 18:09:07 +08:00
sk f3b757d0bc 比赛场优化 2024-05-07 18:09:01 +08:00
kxdd 2904be27f4 Merge branch 'dev_pigbank' into develop 2024-05-07 17:49:10 +08:00
kxdd 464f112038 存钱罐优化最大值 2024-05-07 17:48:35 +08:00
sk 48456483c7 tienlen牌库随机索引错误 2024-05-07 16:19:03 +08:00
sk e6240f1796 Merge branch 'develop' into release 2024-05-07 16:04:08 +08:00
kxdd 54eed8a7fc Merge branch 'dev_pigbank' into develop 2024-05-07 16:03:25 +08:00
kxdd 28bfd15336 存钱罐数据修改 2024-05-07 16:02:58 +08:00
sk 71b5e2599d Merge branch 'release' into 0507 2024-05-07 13:46:54 +08:00
sk cb1a157813 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-07 13:42:27 +08:00
kxdd 04cf926909 Merge branch 'dev_pigbank' into develop 2024-05-07 13:43:15 +08:00
kxdd 7b79b0defd 存钱罐 tienlen场景判断修改 2024-05-07 13:41:24 +08:00
sk 6aed244c8c update data
还原
DB_Createroom.xlsx
DB_Game_Drop.xlsx
2024-05-07 09:53:38 +08:00
kxdd ad4a424024 Merge branch 'dev_newTimeitem' into develop
# Conflicts:
#	gamesrv/tienlen/playerdata_tienlen.go
2024-05-06 18:34:37 +08:00
sk 6ffe1d5375 更新v卡掉落表 2024-05-06 17:55:32 +08:00
kxdd e6b3084bc5 Merge branch 'dev_pigbank' into develop 2024-05-06 17:15:37 +08:00
kxdd 161d215ffd --bug=1000247 --user=李海亮 存钱罐购买后相关问题 https://www.tapd.cn/31044302/s/1010551 2024-05-06 17:14:59 +08:00
kxdd 7113465765 记牌器优化 2024-05-06 16:37:09 +08:00
kxdd bbf2e11d8b 记牌器调整添加
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
2024-05-06 16:18:11 +08:00
sk 1430e96752 update data 2024-05-06 16:09:25 +08:00
sk 9338164838 兼容以0开头的手机号登录 2024-05-06 15:45:06 +08:00
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +08:00
sk 23b44237d8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-06 11:32:29 +08:00
sk d6cb1f3266 兼容以0开头的手机号登录 2024-05-06 11:19:41 +08:00
sk 404017c33e no message 2024-05-06 11:19:41 +08:00
kxdd 83f571b543 Merge branch 'dev_pigbank' into develop 2024-05-06 10:31:22 +08:00
kxdd 84373d1297 【对局失败后存钱罐内没有存钱】https://www.tapd.cn/31044302/bugtrace/bugs/view?bug_id=1131044302001000241 2024-05-06 10:30:45 +08:00
kxdd 016ea68379 Merge branch 'dev_pigbank' into develop 2024-04-30 18:45:34 +08:00
kxdd 7c689dc6ec 存钱罐修改 2024-04-30 18:44:51 +08:00
sk 1979637197 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-30 17:45:51 +08:00
kxdd eaf8dd734f Merge branch 'dev_pigbank' into develop 2024-04-30 17:33:39 +08:00
kxdd 72b5f14b62 存钱罐修改 2024-04-30 17:32:57 +08:00
kxdd 909523ec3e Merge branch 'dev_pigbank' into develop
# Conflicts:
#	common/constant.go
#	data/DB_Pigbank_Prop.dat
#	data/DB_Pigbank_Prop.json
#	gamesrv/tienlen/playerdata_tienlen.go
#	protocol/server/pbdata.pb.go
#	xlsx/DB_Pigbank_Prop.xls
存钱罐功能
2024-04-30 14:22:18 +08:00
kxdd b10cf493b5 存钱罐添加日志 2024-04-30 14:05:36 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
sk f4205e72ac no message 2024-04-29 18:20:38 +08:00
sk bd92567666 解决冲突 2024-04-29 17:20:53 +08:00
sk 1231f711dc xlsx工具支持索引 2024-04-29 16:50:35 +08:00
sk c6c507ecb0 修复手机号登录问题 2024-04-29 16:47:05 +08:00
kxdd a01eba7242 Merge branch 'dev_timeitem' into develop 2024-04-29 11:40:17 +08:00
kxdd 2fbb9d0d0e 记牌器时效道具修改 2024-04-29 11:39:50 +08:00
lihailiang f7ae511332 存钱罐数据添加 2024-04-29 11:33:53 +08:00
lihailiang c65946aec0 Merge branch 'dev_timeitem' into develop 2024-04-29 10:10:06 +08:00
kxdd 4b04e554f8 记牌器配置修改 2024-04-29 09:54:43 +08:00
kxdd a2bfdd1d01 合并代码 2024-04-28 18:30:00 +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
sk cad0f24bd8 机器人比赛场数量参数 2024-04-28 18:02:16 +08:00
kxdd a7ec02b38e 1.记牌器道具时限修改
2.存钱罐数据创建
2024-04-28 17:36:08 +08:00
kxdd a6a255f04b 1.记牌器时限修改
2.存钱罐配置数据
2024-04-28 17:34:49 +08:00
by 95701368a6 上传服务器脚本提交 2024-04-28 17:30:08 +08:00
sk 0cc96a5747 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-28 16:47:49 +08:00
sk 3bfcaaf110 修复钻石账变记录 2024-04-28 16:47:41 +08:00
by cfa469a02e log修改 2024-04-28 15:51:13 +08:00
sk 0da4aa2f09 evt_online临时删除 2024-04-28 15:28:55 +08:00
sk cc4125fee5 机器人互动表情 2024-04-28 14:59:13 +08:00
sk 2e6928f317 添加渠道信息 2024-04-28 11:45:43 +08:00
sk 4d9fee9b11 机器人互动表情 2024-04-28 11:34:37 +08:00
sk 864074490b 忽略xlsx2binary 2024-04-26 18:22:42 +08:00
kxdd ec0d303cb6 道具时限类道具修改 2024-04-26 17:46:21 +08:00
sk 23621acfbf 提交public仓库 2024-04-26 17:11:41 +08:00
sk 05844ea78d update 2024-04-26 16:36:56 +08:00
sk 4ac9879f72 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 16:32:49 +08:00
by 42302a32a5 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-06 00:00:47 +08:00
by 948c209a2c 周卡礼包 2024-05-06 00:00:35 +08:00
sk 853e7771f9 登录返回服务器时间戳 2024-04-26 16:32:40 +08:00
sk ebad03fce1 创建订单添加渠道 2024-04-26 15:25:19 +08:00
sk 40822ad4d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 15:11:01 +08:00
by 0595d999f4 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-26 14:58:36 +08:00
by 06d5ac5fad 周卡礼包需求修改 2024-04-26 14:58:31 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk 2fe90f46a5 游戏牌局统计 2024-04-26 14:51:37 +08:00
sk fe0904c4fb 破产消息添加渠道 2024-04-26 13:51:36 +08:00
sk c40b779c39 成就任务 2024-04-26 13:40:47 +08:00
sk 7c11fc955b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 11:42:03 +08:00
sk a6e65f236f 成就任务 2024-04-26 11:18:56 +08:00
by feeb04a7ed 周卡礼包 2024-04-26 10:21:36 +08:00
lihailiang e2e2a446bf tienlen时效类道具控制 2024-04-26 10:08:55 +08:00
sk b6aa7bec3c 任务系统优化 2024-04-26 09:44:25 +08:00
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
sk 2e0e6c72d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-25 16:44:11 +08:00
sk 77fbd7dfba 拉霸数据统计 2024-04-25 16:41:53 +08:00
by 60145c2325 log类型修改 2024-04-25 15:29:14 +08:00
sk ec635783c4 evt_online添加渠道信息 2024-04-25 13:34:23 +08:00
by f54082163b 周卡礼包 2024-04-25 11:45:32 +08:00
by d8e03cf53d 删除周卡测试代码 2024-04-25 11:40:17 +08:00
by aa79d36e9f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-25 11:39:29 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk aa3a713699 evt_online添加渠道信息 2024-04-25 09:46:57 +08:00
sk 0cba0b0b25 Merge branch 'develop' into tongji 2024-04-24 17:22:25 +08:00
sk 5be9e98ae0 update_public.bat 2024-04-24 16:57:28 +08:00
sk 4e32e4861e no message 2024-04-24 16:49:54 +08:00
sk 88f9723217 update 2024-04-24 16:41:44 +08:00
sk 65d206eae0 水池添加调节赔率和新手池 2024-04-24 16:26:57 +08:00
sk 82b406cbcd 水池添加调节赔率和新手池 2024-04-24 16:26:35 +08:00
sk f81781f92d update 2024-04-24 16:02:23 +08:00
sk 456744f16a update data 2024-04-24 15:57:06 +08:00
sk b5c44ff2bb 复仇者联盟 2024-04-24 15:54:49 +08:00
sk 3a5039727b 优化账号表 2024-04-23 15:10:48 +08:00
WIN-20240218AEU\Administrator ebd1653b86 log修改 2024-04-23 15:08:43 +08:00
sk 7ecebe62e6 账号表补充渠道信息 2024-04-23 14:28:13 +08:00
by b15f3a250b git public 提交 2024-04-23 11:39:24 +08:00
by dc8b4a5baa proto编辑提交 2024-04-23 10:30:53 +08:00
by 9f4d1089cb Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-23 10:29:21 +08:00
by 91ec9259bb 玩家等级排行榜 2024-04-23 09:58:57 +08:00
sk df9ebec2e2 update data 2024-04-23 09:16:24 +08:00
sk 12383a1e20 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-23 09:05:26 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
kxdd 5c37af3fe1 添加记牌器 2024-04-22 18:36:04 +08:00
sk a3b95947b0 添加注释 2024-04-22 14:19:16 +08:00
sk ac7492c2db no message 2024-04-22 11:06:22 +08:00
sk 663b93d52d update_deploy.bat 2024-04-22 10:45:10 +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 3d653d6413 道具使用优化 2024-04-19 14:55:10 +08:00
sk 33a087d1d7 开启拉霸游戏 2024-04-19 11:43:13 +08:00
sk aadfc98306 no message 2024-04-19 09:57:48 +08:00
sk 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk c45f5457ab no message 2024-04-17 18:32:32 +08:00
sk c8cf242a09 delete gen_web.bat 2024-04-17 18:10:06 +08:00
sk b0315b0e70 update_public.bat 2024-04-17 18:04:54 +08:00
sk 8418435068 fix:触发转盘签到事件 2024-04-17 17:59:35 +08:00
sk 8ac802e2a3 fix:道具数量同步错误 2024-04-17 17:49:34 +08:00
sk d632386936 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-17 17:02:23 +08:00
sk c1d2925933 update data 2024-04-17 16:59:14 +08:00
sk 71ad21de65 update_public.bat 2024-04-17 16:56:07 +08:00
sk b4765bf686 update_public.bat 2024-04-17 16:55:03 +08:00
sk 4745a067aa 集卡活动 2024-04-17 16:53:01 +08:00
sk 0e53147f13 proto生成优化 2024-04-17 16:52:35 +08:00
kxdd d792e0ceb1 【高棉象棋的每步时长优化】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001000540
2024-04-17 14:48:40 +08:00
sk 79ace9a7bf update .gitignore 2024-04-17 11:07:58 +08:00
sk ad363f7d85 代码上传工具
tools/upload
2024-04-17 10:50:00 +08:00
1311 changed files with 177004 additions and 134489 deletions

16
.gitignore vendored
View File

@ -6,6 +6,10 @@
# Folders
_obj
_test
**/backup
/bin/*
!/bin/protoc*
/deploy/*
# Architecture specific extensions/prefixes
*.[568vq]
@ -18,8 +22,10 @@ _cgo_gotypes.go
_cgo_export.*
_testmain.go
tools/xlsx2binary/agc.go
*.exe
!/bin/protoc-gen-go.exe
*.exe~
*.test
*.log
@ -35,11 +41,11 @@ _testmain.go
/dbproxy/dbproxy
/mgrsrv/mgrsrv
/gatesrv/gatesrv
/gamesrv/gamesrv
/worldsrv/worldsrv
/gamesrv/gamesrv
/robot/robot
/schedulesrv/schedulesrv
/ranksrv/ranksrv
/bin/*
**/backup
/schedulesrv/schedulesrv
/machine/machine
/statistics/statistics
/statistics/task/task*

141
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,141 @@
stages:
- lock
- build
- save
- sync
- unlock
variables:
ProjectPath: "mongo.games.com/game" # 项目相对于GOPATH的路径
BetaBinPath: "/home/game/" # beta环境部署路径
DevelopBinPath: "/home/game/" # develop环境部署路径
default:
tags:
- gitlab
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- ${GOPATH}/pkg/mod
- ${GOPATH}/bin
# 锁定作业,防止并发流水线执行
lock_job:
stage: lock
script:
- |
if [ -f /tmp/ci_lock ]; then
echo "流水线已在运行,等待..."
exit 1
else
touch /tmp/ci_lock
echo "获得锁定,开始流水线。"
fi
build-job:
stage: build
only:
- develop
- release
script:
- git checkout $CI_COMMIT_REF_NAME
- git pull origin $CI_COMMIT_REF_NAME
- if [ ! -z "$(git status --porcelain go.mod go.sum)" ]; then
GOMODTIDY=1;
fi
# 拷贝到GOPATH
- echo '拷贝到GOPATH'
- rsync -rvc --no-perms --delete ./* $GOPATH/src/$ProjectPath
# 进入项目目录
- cd $GOPATH/src/$ProjectPath
# 编译
- echo '编译'
- if [ "$GOMODTIDY" == 1 ]; then
go mod tidy;
fi
- |
while IFS= read -r line || [[ -n $line ]]
do
cd $line
echo "编译 $line"
go build -v
cd ..
done < ./programs.txt
save-job:
stage: save
only:
- develop
- release
script:
- cd $GOPATH/src/$ProjectPath
# 拷贝文件
- echo '拷贝文件'
- rm -rf ./temp
- mkdir ./temp
- mkdir ./temp/data
- cp -rfp ./data/* ./temp/data
# 删除自定义配置
- echo '删除自定义配置'
- |
while IFS= read -r line || [[ -n $line ]]
do
echo "删除 $line 配置"
rm ./temp/data/$line
done < ./exclude.txt
# 拷贝可执行程序
- echo '拷贝可执行程序'
- |
while IFS= read -r line || [[ -n $line ]]
do
echo "拷贝 $line"
mv ./$line/$line ./temp/$line
done < ./programs.txt
sync_job:
stage: sync
only:
- develop
- release
script:
- cd $GOPATH/src/$ProjectPath
- if [ "$CI_COMMIT_BRANCH" == "develop" ]; then
SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP";
REMOTE_HOST="$REMOTE_HOST_DEVELOP";
REMOTE_USER="$REMOTE_USER_DEVELOP";
ServerName="develop";
BinPath="$DevelopBinPath";
elif [ "$CI_COMMIT_BRANCH" == "release" ]; then
SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA";
REMOTE_HOST="$REMOTE_HOST_BETA";
REMOTE_USER="$REMOTE_USER_BETA";
ServerName="beta";
BinPath="$BetaBinPath";
else
echo "不支持的分支";
exit 1;
fi
# 设置 .ssh 目录并写入 SSH 私钥
- echo "设置 SSH keys..."
- mkdir -p ~/.ssh
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- ssh-keyscan -H "$REMOTE_HOST" >> ~/.ssh/known_hosts
# 使用 rsync 将文件同步到远程服务器
- echo "同步到服务器"
- echo "Deploying to remote server using rsync... $BinPath"
- rsync -rvz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$BinPath
# 触发部署
- "curl -X POST --fail -F token=$SERVER_CI_TOKEN -F ref=release -F variables[ServerName]=$ServerName https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline"
# 解锁作业,释放锁定
unlock_job:
stage: unlock
script:
- rm -f /tmp/ci_lock
- echo "释放锁定,流水线结束。"
when: always

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "public"]
path = public
url = git@git.pogorockgames.com:mango-games/server/public.git

View File

@ -2,36 +2,12 @@
游戏业务代码
### 子仓库
public子仓库本项目本身并没有使用只是用来暴露部分公共代码供其他项目使用。
例如:
1.客户端同步通信协议
2.客户端同步游戏配置
#### 初始化子仓库
```
git submodule update --init --recursive
```
#### 更新子仓库
```
git submodule update --remote
```
#### 更新并提交子仓库代码
```
update_public.sh
```
### 脚本
#### gen_data.bat
xlsx文件转换为json,dat文件,生成pbdata.proto,生成srvdata包
#### gen_go.bat
proto文件生成go文件
#### gen_web.bat
proto文件生成go文件
#### build.bat
生成可执行文件

10
bin/build.bat Normal file
View File

@ -0,0 +1,10 @@
@echo off
xcopy ..\data\* .\data\ /s /e /y /exclude:..\exclude.txt
for /f %%i in (../programs.txt) do (
echo go build %%i
go build -o ./%%i/%%i.exe ../%%i/
)
pause

12
bin/clean.bat Normal file
View File

@ -0,0 +1,12 @@
@echo off
for /f "tokens=*" %%a in (../shell/programs.txt) do (
if exist "%%a\*.log" del /q "%%a\*.log"
if exist "%%a\*.log.*" del /q "%%a\*.log.*"
if exist "%%a\backup" rmdir /s /q "%%a\backup"
if exist "%%a\log" rmdir /s /q "%%a\log"
echo "clean logs: %%a"
)
pause

Binary file not shown.

View File

@ -0,0 +1,158 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option go_package = "google.golang.org/protobuf/types/known/anypb";
option java_package = "com.google.protobuf";
option java_outer_classname = "AnyProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// `Any` contains an arbitrary serialized protocol buffer message along with a
// URL that describes the type of the serialized message.
//
// Protobuf library provides support to pack/unpack Any values in the form
// of utility functions or additional generated methods of the Any type.
//
// Example 1: Pack and unpack a message in C++.
//
// Foo foo = ...;
// Any any;
// any.PackFrom(foo);
// ...
// if (any.UnpackTo(&foo)) {
// ...
// }
//
// Example 2: Pack and unpack a message in Java.
//
// Foo foo = ...;
// Any any = Any.pack(foo);
// ...
// if (any.is(Foo.class)) {
// foo = any.unpack(Foo.class);
// }
//
// Example 3: Pack and unpack a message in Python.
//
// foo = Foo(...)
// any = Any()
// any.Pack(foo)
// ...
// if any.Is(Foo.DESCRIPTOR):
// any.Unpack(foo)
// ...
//
// Example 4: Pack and unpack a message in Go
//
// foo := &pb.Foo{...}
// any, err := anypb.New(foo)
// if err != nil {
// ...
// }
// ...
// foo := &pb.Foo{}
// if err := any.UnmarshalTo(foo); err != nil {
// ...
// }
//
// The pack methods provided by protobuf library will by default use
// 'type.googleapis.com/full.type.name' as the type URL and the unpack
// methods only use the fully qualified type name after the last '/'
// in the type URL, for example "foo.bar.com/x/y.z" will yield type
// name "y.z".
//
//
// JSON
// ====
// The JSON representation of an `Any` value uses the regular
// representation of the deserialized, embedded message, with an
// additional field `@type` which contains the type URL. Example:
//
// package google.profile;
// message Person {
// string first_name = 1;
// string last_name = 2;
// }
//
// {
// "@type": "type.googleapis.com/google.profile.Person",
// "firstName": <string>,
// "lastName": <string>
// }
//
// If the embedded message type is well-known and has a custom JSON
// representation, that representation will be embedded adding a field
// `value` which holds the custom JSON in addition to the `@type`
// field. Example (for message [google.protobuf.Duration][]):
//
// {
// "@type": "type.googleapis.com/google.protobuf.Duration",
// "value": "1.212s"
// }
//
message Any {
// A URL/resource name that uniquely identifies the type of the serialized
// protocol buffer message. This string must contain at least
// one "/" character. The last segment of the URL's path must represent
// the fully qualified name of the type (as in
// `path/google.protobuf.Duration`). The name should be in a canonical form
// (e.g., leading "." is not accepted).
//
// In practice, teams usually precompile into the binary all types that they
// expect it to use in the context of Any. However, for URLs which use the
// scheme `http`, `https`, or no scheme, one can optionally set up a type
// server that maps type URLs to message definitions as follows:
//
// * If no scheme is provided, `https` is assumed.
// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
// value in binary format, or produce an error.
// * Applications are allowed to cache lookup results based on the
// URL, or have them precompiled into a binary to avoid any
// lookup. Therefore, binary compatibility needs to be preserved
// on changes to types. (Use versioned type names to manage
// breaking changes.)
//
// Note: this functionality is not currently available in the official
// protobuf release, and it is not used for type URLs beginning with
// type.googleapis.com.
//
// Schemes other than `http`, `https` (or the empty scheme) might be
// used with implementation specific semantics.
//
string type_url = 1;
// Must be a valid serialized protocol buffer of the above specified type.
bytes value = 2;
}

View File

@ -0,0 +1,208 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
import "google/protobuf/source_context.proto";
import "google/protobuf/type.proto";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "ApiProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/apipb";
// Api is a light-weight descriptor for an API Interface.
//
// Interfaces are also described as "protocol buffer services" in some contexts,
// such as by the "service" keyword in a .proto file, but they are different
// from API Services, which represent a concrete implementation of an interface
// as opposed to simply a description of methods and bindings. They are also
// sometimes simply referred to as "APIs" in other contexts, such as the name of
// this message itself. See https://cloud.google.com/apis/design/glossary for
// detailed terminology.
message Api {
// The fully qualified name of this interface, including package name
// followed by the interface's simple name.
string name = 1;
// The methods of this interface, in unspecified order.
repeated Method methods = 2;
// Any metadata attached to the interface.
repeated Option options = 3;
// A version string for this interface. If specified, must have the form
// `major-version.minor-version`, as in `1.10`. If the minor version is
// omitted, it defaults to zero. If the entire version field is empty, the
// major version is derived from the package name, as outlined below. If the
// field is not empty, the version in the package name will be verified to be
// consistent with what is provided here.
//
// The versioning schema uses [semantic
// versioning](http://semver.org) where the major version number
// indicates a breaking change and the minor version an additive,
// non-breaking change. Both version numbers are signals to users
// what to expect from different versions, and should be carefully
// chosen based on the product plan.
//
// The major version is also reflected in the package name of the
// interface, which must end in `v<major-version>`, as in
// `google.feature.v1`. For major versions 0 and 1, the suffix can
// be omitted. Zero major versions must only be used for
// experimental, non-GA interfaces.
//
//
string version = 4;
// Source context for the protocol buffer service represented by this
// message.
SourceContext source_context = 5;
// Included interfaces. See [Mixin][].
repeated Mixin mixins = 6;
// The source syntax of the service.
Syntax syntax = 7;
}
// Method represents a method of an API interface.
message Method {
// The simple name of this method.
string name = 1;
// A URL of the input message type.
string request_type_url = 2;
// If true, the request is streamed.
bool request_streaming = 3;
// The URL of the output message type.
string response_type_url = 4;
// If true, the response is streamed.
bool response_streaming = 5;
// Any metadata attached to the method.
repeated Option options = 6;
// The source syntax of this method.
Syntax syntax = 7;
}
// Declares an API Interface to be included in this interface. The including
// interface must redeclare all the methods from the included interface, but
// documentation and options are inherited as follows:
//
// - If after comment and whitespace stripping, the documentation
// string of the redeclared method is empty, it will be inherited
// from the original method.
//
// - Each annotation belonging to the service config (http,
// visibility) which is not set in the redeclared method will be
// inherited.
//
// - If an http annotation is inherited, the path pattern will be
// modified as follows. Any version prefix will be replaced by the
// version of the including interface plus the [root][] path if
// specified.
//
// Example of a simple mixin:
//
// package google.acl.v1;
// service AccessControl {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v1/{resource=**}:getAcl";
// }
// }
//
// package google.storage.v2;
// service Storage {
// rpc GetAcl(GetAclRequest) returns (Acl);
//
// // Get a data record.
// rpc GetData(GetDataRequest) returns (Data) {
// option (google.api.http).get = "/v2/{resource=**}";
// }
// }
//
// Example of a mixin configuration:
//
// apis:
// - name: google.storage.v2.Storage
// mixins:
// - name: google.acl.v1.AccessControl
//
// The mixin construct implies that all methods in `AccessControl` are
// also declared with same name and request/response types in
// `Storage`. A documentation generator or annotation processor will
// see the effective `Storage.GetAcl` method after inheriting
// documentation and annotations as follows:
//
// service Storage {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v2/{resource=**}:getAcl";
// }
// ...
// }
//
// Note how the version in the path pattern changed from `v1` to `v2`.
//
// If the `root` field in the mixin is specified, it should be a
// relative path under which inherited HTTP paths are placed. Example:
//
// apis:
// - name: google.storage.v2.Storage
// mixins:
// - name: google.acl.v1.AccessControl
// root: acls
//
// This implies the following inherited HTTP annotation:
//
// service Storage {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
// }
// ...
// }
message Mixin {
// The fully qualified name of the interface which is included.
string name = 1;
// If non-empty specifies a path under which inherited HTTP paths
// are rooted.
string root = 2;
}

View File

@ -0,0 +1,183 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Author: kenton@google.com (Kenton Varda)
//
// WARNING: The plugin interface is currently EXPERIMENTAL and is subject to
// change.
//
// protoc (aka the Protocol Compiler) can be extended via plugins. A plugin is
// just a program that reads a CodeGeneratorRequest from stdin and writes a
// CodeGeneratorResponse to stdout.
//
// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead
// of dealing with the raw protocol defined here.
//
// A plugin executable needs only to be placed somewhere in the path. The
// plugin should be named "protoc-gen-$NAME", and will then be used when the
// flag "--${NAME}_out" is passed to protoc.
syntax = "proto2";
package google.protobuf.compiler;
option java_package = "com.google.protobuf.compiler";
option java_outer_classname = "PluginProtos";
option go_package = "google.golang.org/protobuf/types/pluginpb";
import "google/protobuf/descriptor.proto";
// The version number of protocol compiler.
message Version {
optional int32 major = 1;
optional int32 minor = 2;
optional int32 patch = 3;
// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
// be empty for mainline stable releases.
optional string suffix = 4;
}
// An encoded CodeGeneratorRequest is written to the plugin's stdin.
message CodeGeneratorRequest {
// The .proto files that were explicitly listed on the command-line. The
// code generator should generate code only for these files. Each file's
// descriptor will be included in proto_file, below.
repeated string file_to_generate = 1;
// The generator parameter passed on the command-line.
optional string parameter = 2;
// FileDescriptorProtos for all files in files_to_generate and everything
// they import. The files will appear in topological order, so each file
// appears before any file that imports it.
//
// protoc guarantees that all proto_files will be written after
// the fields above, even though this is not technically guaranteed by the
// protobuf wire format. This theoretically could allow a plugin to stream
// in the FileDescriptorProtos and handle them one by one rather than read
// the entire set into memory at once. However, as of this writing, this
// is not similarly optimized on protoc's end -- it will store all fields in
// memory at once before sending them to the plugin.
//
// Type names of fields and extensions in the FileDescriptorProto are always
// fully qualified.
repeated FileDescriptorProto proto_file = 15;
// The version number of protocol compiler.
optional Version compiler_version = 3;
}
// The plugin writes an encoded CodeGeneratorResponse to stdout.
message CodeGeneratorResponse {
// Error message. If non-empty, code generation failed. The plugin process
// should exit with status code zero even if it reports an error in this way.
//
// This should be used to indicate errors in .proto files which prevent the
// code generator from generating correct code. Errors which indicate a
// problem in protoc itself -- such as the input CodeGeneratorRequest being
// unparseable -- should be reported by writing a message to stderr and
// exiting with a non-zero status code.
optional string error = 1;
// A bitmask of supported features that the code generator supports.
// This is a bitwise "or" of values from the Feature enum.
optional uint64 supported_features = 2;
// Sync with code_generator.h.
enum Feature {
FEATURE_NONE = 0;
FEATURE_PROTO3_OPTIONAL = 1;
}
// Represents a single generated file.
message File {
// The file name, relative to the output directory. The name must not
// contain "." or ".." components and must be relative, not be absolute (so,
// the file cannot lie outside the output directory). "/" must be used as
// the path separator, not "\".
//
// If the name is omitted, the content will be appended to the previous
// file. This allows the generator to break large files into small chunks,
// and allows the generated text to be streamed back to protoc so that large
// files need not reside completely in memory at one time. Note that as of
// this writing protoc does not optimize for this -- it will read the entire
// CodeGeneratorResponse before writing files to disk.
optional string name = 1;
// If non-empty, indicates that the named file should already exist, and the
// content here is to be inserted into that file at a defined insertion
// point. This feature allows a code generator to extend the output
// produced by another code generator. The original generator may provide
// insertion points by placing special annotations in the file that look
// like:
// @@protoc_insertion_point(NAME)
// The annotation can have arbitrary text before and after it on the line,
// which allows it to be placed in a comment. NAME should be replaced with
// an identifier naming the point -- this is what other generators will use
// as the insertion_point. Code inserted at this point will be placed
// immediately above the line containing the insertion point (thus multiple
// insertions to the same point will come out in the order they were added).
// The double-@ is intended to make it unlikely that the generated code
// could contain things that look like insertion points by accident.
//
// For example, the C++ code generator places the following line in the
// .pb.h files that it generates:
// // @@protoc_insertion_point(namespace_scope)
// This line appears within the scope of the file's package namespace, but
// outside of any particular class. Another plugin can then specify the
// insertion_point "namespace_scope" to generate additional classes or
// other declarations that should be placed in this scope.
//
// Note that if the line containing the insertion point begins with
// whitespace, the same whitespace will be added to every line of the
// inserted text. This is useful for languages like Python, where
// indentation matters. In these languages, the insertion point comment
// should be indented the same amount as any inserted code will need to be
// in order to work correctly in that context.
//
// The code generator that generates the initial file and the one which
// inserts into it must both run as part of a single invocation of protoc.
// Code generators are executed in the order in which they appear on the
// command line.
//
// If |insertion_point| is present, |name| must also be present.
optional string insertion_point = 2;
// The file contents.
optional string content = 15;
// Information describing the file content being inserted. If an insertion
// point is used, this information will be appropriately offset and inserted
// into the code generation metadata for the generated files.
optional GeneratedCodeInfo generated_code_info = 16;
}
repeated File file = 15;
}

View File

@ -0,0 +1,911 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Author: kenton@google.com (Kenton Varda)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
//
// The messages in this file describe the definitions found in .proto files.
// A valid .proto file can be translated directly to a FileDescriptorProto
// without any other information (e.g. without reading its imports).
syntax = "proto2";
package google.protobuf;
option go_package = "google.golang.org/protobuf/types/descriptorpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
option csharp_namespace = "Google.Protobuf.Reflection";
option objc_class_prefix = "GPB";
option cc_enable_arenas = true;
// descriptor.proto must be optimized for speed because reflection-based
// algorithms don't work during bootstrapping.
option optimize_for = SPEED;
// The protocol compiler can output a FileDescriptorSet containing the .proto
// files it parses.
message FileDescriptorSet {
repeated FileDescriptorProto file = 1;
}
// Describes a complete .proto file.
message FileDescriptorProto {
optional string name = 1; // file name, relative to root of source tree
optional string package = 2; // e.g. "foo", "foo.bar", etc.
// Names of files imported by this file.
repeated string dependency = 3;
// Indexes of the public imported files in the dependency list above.
repeated int32 public_dependency = 10;
// Indexes of the weak imported files in the dependency list.
// For Google-internal migration only. Do not use.
repeated int32 weak_dependency = 11;
// All top-level definitions in this file.
repeated DescriptorProto message_type = 4;
repeated EnumDescriptorProto enum_type = 5;
repeated ServiceDescriptorProto service = 6;
repeated FieldDescriptorProto extension = 7;
optional FileOptions options = 8;
// This field contains optional information about the original source code.
// You may safely remove this entire field without harming runtime
// functionality of the descriptors -- the information is needed only by
// development tools.
optional SourceCodeInfo source_code_info = 9;
// The syntax of the proto file.
// The supported values are "proto2" and "proto3".
optional string syntax = 12;
}
// Describes a message type.
message DescriptorProto {
optional string name = 1;
repeated FieldDescriptorProto field = 2;
repeated FieldDescriptorProto extension = 6;
repeated DescriptorProto nested_type = 3;
repeated EnumDescriptorProto enum_type = 4;
message ExtensionRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Exclusive.
optional ExtensionRangeOptions options = 3;
}
repeated ExtensionRange extension_range = 5;
repeated OneofDescriptorProto oneof_decl = 8;
optional MessageOptions options = 7;
// Range of reserved tag numbers. Reserved tag numbers may not be used by
// fields or extension ranges in the same message. Reserved ranges may
// not overlap.
message ReservedRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Exclusive.
}
repeated ReservedRange reserved_range = 9;
// Reserved field names, which may not be used by fields in the same message.
// A given name may only be reserved once.
repeated string reserved_name = 10;
}
message ExtensionRangeOptions {
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
// Describes a field within a message.
message FieldDescriptorProto {
enum Type {
// 0 is reserved for errors.
// Order is weird for historical reasons.
TYPE_DOUBLE = 1;
TYPE_FLOAT = 2;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if
// negative values are likely.
TYPE_INT64 = 3;
TYPE_UINT64 = 4;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if
// negative values are likely.
TYPE_INT32 = 5;
TYPE_FIXED64 = 6;
TYPE_FIXED32 = 7;
TYPE_BOOL = 8;
TYPE_STRING = 9;
// Tag-delimited aggregate.
// Group type is deprecated and not supported in proto3. However, Proto3
// implementations should still be able to parse the group wire format and
// treat group fields as unknown fields.
TYPE_GROUP = 10;
TYPE_MESSAGE = 11; // Length-delimited aggregate.
// New in version 2.
TYPE_BYTES = 12;
TYPE_UINT32 = 13;
TYPE_ENUM = 14;
TYPE_SFIXED32 = 15;
TYPE_SFIXED64 = 16;
TYPE_SINT32 = 17; // Uses ZigZag encoding.
TYPE_SINT64 = 18; // Uses ZigZag encoding.
}
enum Label {
// 0 is reserved for errors
LABEL_OPTIONAL = 1;
LABEL_REQUIRED = 2;
LABEL_REPEATED = 3;
}
optional string name = 1;
optional int32 number = 3;
optional Label label = 4;
// If type_name is set, this need not be set. If both this and type_name
// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
optional Type type = 5;
// For message and enum types, this is the name of the type. If the name
// starts with a '.', it is fully-qualified. Otherwise, C++-like scoping
// rules are used to find the type (i.e. first the nested types within this
// message are searched, then within the parent, on up to the root
// namespace).
optional string type_name = 6;
// For extensions, this is the name of the type being extended. It is
// resolved in the same manner as type_name.
optional string extendee = 2;
// For numeric types, contains the original text representation of the value.
// For booleans, "true" or "false".
// For strings, contains the default text contents (not escaped in any way).
// For bytes, contains the C escaped value. All bytes >= 128 are escaped.
// TODO(kenton): Base-64 encode?
optional string default_value = 7;
// If set, gives the index of a oneof in the containing type's oneof_decl
// list. This field is a member of that oneof.
optional int32 oneof_index = 9;
// JSON name of this field. The value is set by protocol compiler. If the
// user has set a "json_name" option on this field, that option's value
// will be used. Otherwise, it's deduced from the field's name by converting
// it to camelCase.
optional string json_name = 10;
optional FieldOptions options = 8;
// If true, this is a proto3 "optional". When a proto3 field is optional, it
// tracks presence regardless of field type.
//
// When proto3_optional is true, this field must be belong to a oneof to
// signal to old proto3 clients that presence is tracked for this field. This
// oneof is known as a "synthetic" oneof, and this field must be its sole
// member (each proto3 optional field gets its own synthetic oneof). Synthetic
// oneofs exist in the descriptor only, and do not generate any API. Synthetic
// oneofs must be ordered after all "real" oneofs.
//
// For message fields, proto3_optional doesn't create any semantic change,
// since non-repeated message fields always track presence. However it still
// indicates the semantic detail of whether the user wrote "optional" or not.
// This can be useful for round-tripping the .proto file. For consistency we
// give message fields a synthetic oneof also, even though it is not required
// to track presence. This is especially important because the parser can't
// tell if a field is a message or an enum, so it must always create a
// synthetic oneof.
//
// Proto2 optional fields do not set this flag, because they already indicate
// optional with `LABEL_OPTIONAL`.
optional bool proto3_optional = 17;
}
// Describes a oneof.
message OneofDescriptorProto {
optional string name = 1;
optional OneofOptions options = 2;
}
// Describes an enum type.
message EnumDescriptorProto {
optional string name = 1;
repeated EnumValueDescriptorProto value = 2;
optional EnumOptions options = 3;
// Range of reserved numeric values. Reserved values may not be used by
// entries in the same enum. Reserved ranges may not overlap.
//
// Note that this is distinct from DescriptorProto.ReservedRange in that it
// is inclusive such that it can appropriately represent the entire int32
// domain.
message EnumReservedRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Inclusive.
}
// Range of reserved numeric values. Reserved numeric values may not be used
// by enum values in the same enum declaration. Reserved ranges may not
// overlap.
repeated EnumReservedRange reserved_range = 4;
// Reserved enum value names, which may not be reused. A given name may only
// be reserved once.
repeated string reserved_name = 5;
}
// Describes a value within an enum.
message EnumValueDescriptorProto {
optional string name = 1;
optional int32 number = 2;
optional EnumValueOptions options = 3;
}
// Describes a service.
message ServiceDescriptorProto {
optional string name = 1;
repeated MethodDescriptorProto method = 2;
optional ServiceOptions options = 3;
}
// Describes a method of a service.
message MethodDescriptorProto {
optional string name = 1;
// Input and output type names. These are resolved in the same way as
// FieldDescriptorProto.type_name, but must refer to a message type.
optional string input_type = 2;
optional string output_type = 3;
optional MethodOptions options = 4;
// Identifies if client streams multiple client messages
optional bool client_streaming = 5 [default = false];
// Identifies if server streams multiple server messages
optional bool server_streaming = 6 [default = false];
}
// ===================================================================
// Options
// Each of the definitions above may have "options" attached. These are
// just annotations which may cause code to be generated slightly differently
// or may contain hints for code that manipulates protocol messages.
//
// Clients may define custom options as extensions of the *Options messages.
// These extensions may not yet be known at parsing time, so the parser cannot
// store the values in them. Instead it stores them in a field in the *Options
// message called uninterpreted_option. This field must have the same name
// across all *Options messages. We then use this field to populate the
// extensions when we build a descriptor, at which point all protos have been
// parsed and so all extensions are known.
//
// Extension numbers for custom options may be chosen as follows:
// * For options which will only be used within a single application or
// organization, or for experimental options, use field numbers 50000
// through 99999. It is up to you to ensure that you do not use the
// same number for multiple options.
// * For options which will be published and used publicly by multiple
// independent entities, e-mail protobuf-global-extension-registry@google.com
// to reserve extension numbers. Simply provide your project name (e.g.
// Objective-C plugin) and your project website (if available) -- there's no
// need to explain how you intend to use them. Usually you only need one
// extension number. You can declare multiple options with only one extension
// number by putting them in a sub-message. See the Custom Options section of
// the docs for examples:
// https://developers.google.com/protocol-buffers/docs/proto#options
// If this turns out to be popular, a web service will be set up
// to automatically assign option numbers.
message FileOptions {
// Sets the Java package where classes generated from this .proto will be
// placed. By default, the proto package is used, but this is often
// inappropriate because proto packages do not normally start with backwards
// domain names.
optional string java_package = 1;
// Controls the name of the wrapper Java class generated for the .proto file.
// That class will always contain the .proto file's getDescriptor() method as
// well as any top-level extensions defined in the .proto file.
// If java_multiple_files is disabled, then all the other classes from the
// .proto file will be nested inside the single wrapper outer class.
optional string java_outer_classname = 8;
// If enabled, then the Java code generator will generate a separate .java
// file for each top-level message, enum, and service defined in the .proto
// file. Thus, these types will *not* be nested inside the wrapper class
// named by java_outer_classname. However, the wrapper class will still be
// generated to contain the file's getDescriptor() method as well as any
// top-level extensions defined in the file.
optional bool java_multiple_files = 10 [default = false];
// This option does nothing.
optional bool java_generate_equals_and_hash = 20 [deprecated=true];
// If set true, then the Java2 code generator will generate code that
// throws an exception whenever an attempt is made to assign a non-UTF-8
// byte sequence to a string field.
// Message reflection will do the same.
// However, an extension field still accepts non-UTF-8 byte sequences.
// This option has no effect on when used with the lite runtime.
optional bool java_string_check_utf8 = 27 [default = false];
// Generated classes can be optimized for speed or code size.
enum OptimizeMode {
SPEED = 1; // Generate complete code for parsing, serialization,
// etc.
CODE_SIZE = 2; // Use ReflectionOps to implement these methods.
LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
}
optional OptimizeMode optimize_for = 9 [default = SPEED];
// Sets the Go package where structs generated from this .proto will be
// placed. If omitted, the Go package will be derived from the following:
// - The basename of the package import path, if provided.
// - Otherwise, the package statement in the .proto file, if present.
// - Otherwise, the basename of the .proto file, without extension.
optional string go_package = 11;
// Should generic services be generated in each language? "Generic" services
// are not specific to any particular RPC system. They are generated by the
// main code generators in each language (without additional plugins).
// Generic services were the only kind of service generation supported by
// early versions of google.protobuf.
//
// Generic services are now considered deprecated in favor of using plugins
// that generate code specific to your particular RPC system. Therefore,
// these default to false. Old code which depends on generic services should
// explicitly set them to true.
optional bool cc_generic_services = 16 [default = false];
optional bool java_generic_services = 17 [default = false];
optional bool py_generic_services = 18 [default = false];
optional bool php_generic_services = 42 [default = false];
// Is this file deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for everything in the file, or it will be completely ignored; in the very
// least, this is a formalization for deprecating files.
optional bool deprecated = 23 [default = false];
// Enables the use of arenas for the proto messages in this file. This applies
// only to generated classes for C++.
optional bool cc_enable_arenas = 31 [default = true];
// Sets the objective c class prefix which is prepended to all objective c
// generated classes from this .proto. There is no default.
optional string objc_class_prefix = 36;
// Namespace for generated classes; defaults to the package.
optional string csharp_namespace = 37;
// By default Swift generators will take the proto package and CamelCase it
// replacing '.' with underscore and use that to prefix the types/symbols
// defined. When this options is provided, they will use this value instead
// to prefix the types/symbols defined.
optional string swift_prefix = 39;
// Sets the php class prefix which is prepended to all php generated classes
// from this .proto. Default is empty.
optional string php_class_prefix = 40;
// Use this option to change the namespace of php generated classes. Default
// is empty. When this option is empty, the package name will be used for
// determining the namespace.
optional string php_namespace = 41;
// Use this option to change the namespace of php generated metadata classes.
// Default is empty. When this option is empty, the proto file name will be
// used for determining the namespace.
optional string php_metadata_namespace = 44;
// Use this option to change the package of ruby generated classes. Default
// is empty. When this option is not set, the package name will be used for
// determining the ruby package.
optional string ruby_package = 45;
// The parser stores options it doesn't recognize here.
// See the documentation for the "Options" section above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message.
// See the documentation for the "Options" section above.
extensions 1000 to max;
reserved 38;
}
message MessageOptions {
// Set true to use the old proto1 MessageSet wire format for extensions.
// This is provided for backwards-compatibility with the MessageSet wire
// format. You should not use this for any other reason: It's less
// efficient, has fewer features, and is more complicated.
//
// The message must be defined exactly as follows:
// message Foo {
// option message_set_wire_format = true;
// extensions 4 to max;
// }
// Note that the message cannot have any defined fields; MessageSets only
// have extensions.
//
// All extensions of your type must be singular messages; e.g. they cannot
// be int32s, enums, or repeated messages.
//
// Because this is an option, the above two restrictions are not enforced by
// the protocol compiler.
optional bool message_set_wire_format = 1 [default = false];
// Disables the generation of the standard "descriptor()" accessor, which can
// conflict with a field of the same name. This is meant to make migration
// from proto1 easier; new code should avoid fields named "descriptor".
optional bool no_standard_descriptor_accessor = 2 [default = false];
// Is this message deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the message, or it will be completely ignored; in the very least,
// this is a formalization for deprecating messages.
optional bool deprecated = 3 [default = false];
reserved 4, 5, 6;
// Whether the message is an automatically generated map entry type for the
// maps field.
//
// For maps fields:
// map<KeyType, ValueType> map_field = 1;
// The parsed descriptor looks like:
// message MapFieldEntry {
// option map_entry = true;
// optional KeyType key = 1;
// optional ValueType value = 2;
// }
// repeated MapFieldEntry map_field = 1;
//
// Implementations may choose not to generate the map_entry=true message, but
// use a native map in the target language to hold the keys and values.
// The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
// instead. The option should only be implicitly set by the proto compiler
// parser.
optional bool map_entry = 7;
reserved 8; // javalite_serializable
reserved 9; // javanano_as_lite
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message FieldOptions {
// The ctype option instructs the C++ code generator to use a different
// representation of the field than it normally would. See the specific
// options below. This option is not yet implemented in the open source
// release -- sorry, we'll try to include it in a future version!
optional CType ctype = 1 [default = STRING];
enum CType {
// Default mode.
STRING = 0;
CORD = 1;
STRING_PIECE = 2;
}
// The packed option can be enabled for repeated primitive fields to enable
// a more efficient representation on the wire. Rather than repeatedly
// writing the tag and type for each element, the entire array is encoded as
// a single length-delimited blob. In proto3, only explicit setting it to
// false will avoid using packed encoding.
optional bool packed = 2;
// The jstype option determines the JavaScript type used for values of the
// field. The option is permitted only for 64 bit integral and fixed types
// (int64, uint64, sint64, fixed64, sfixed64). A field with jstype JS_STRING
// is represented as JavaScript string, which avoids loss of precision that
// can happen when a large value is converted to a floating point JavaScript.
// Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
// use the JavaScript "number" type. The behavior of the default option
// JS_NORMAL is implementation dependent.
//
// This option is an enum to permit additional types to be added, e.g.
// goog.math.Integer.
optional JSType jstype = 6 [default = JS_NORMAL];
enum JSType {
// Use the default type.
JS_NORMAL = 0;
// Use JavaScript strings.
JS_STRING = 1;
// Use JavaScript numbers.
JS_NUMBER = 2;
}
// Should this field be parsed lazily? Lazy applies only to message-type
// fields. It means that when the outer message is initially parsed, the
// inner message's contents will not be parsed but instead stored in encoded
// form. The inner message will actually be parsed when it is first accessed.
//
// This is only a hint. Implementations are free to choose whether to use
// eager or lazy parsing regardless of the value of this option. However,
// setting this option true suggests that the protocol author believes that
// using lazy parsing on this field is worth the additional bookkeeping
// overhead typically needed to implement it.
//
// This option does not affect the public interface of any generated code;
// all method signatures remain the same. Furthermore, thread-safety of the
// interface is not affected by this option; const methods remain safe to
// call from multiple threads concurrently, while non-const methods continue
// to require exclusive access.
//
//
// Note that implementations may choose not to check required fields within
// a lazy sub-message. That is, calling IsInitialized() on the outer message
// may return true even if the inner message has missing required fields.
// This is necessary because otherwise the inner message would have to be
// parsed in order to perform the check, defeating the purpose of lazy
// parsing. An implementation which chooses not to check required fields
// must be consistent about it. That is, for any particular sub-message, the
// implementation must either *always* check its required fields, or *never*
// check its required fields, regardless of whether or not the message has
// been parsed.
optional bool lazy = 5 [default = false];
// Is this field deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for accessors, or it will be completely ignored; in the very least, this
// is a formalization for deprecating fields.
optional bool deprecated = 3 [default = false];
// For Google-internal migration only. Do not use.
optional bool weak = 10 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
reserved 4; // removed jtype
}
message OneofOptions {
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message EnumOptions {
// Set this option to true to allow mapping different tag names to the same
// value.
optional bool allow_alias = 2;
// Is this enum deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the enum, or it will be completely ignored; in the very least, this
// is a formalization for deprecating enums.
optional bool deprecated = 3 [default = false];
reserved 5; // javanano_as_lite
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message EnumValueOptions {
// Is this enum value deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the enum value, or it will be completely ignored; in the very least,
// this is a formalization for deprecating enum values.
optional bool deprecated = 1 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message ServiceOptions {
// Note: Field numbers 1 through 32 are reserved for Google's internal RPC
// framework. We apologize for hoarding these numbers to ourselves, but
// we were already using them long before we decided to release Protocol
// Buffers.
// Is this service deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the service, or it will be completely ignored; in the very least,
// this is a formalization for deprecating services.
optional bool deprecated = 33 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message MethodOptions {
// Note: Field numbers 1 through 32 are reserved for Google's internal RPC
// framework. We apologize for hoarding these numbers to ourselves, but
// we were already using them long before we decided to release Protocol
// Buffers.
// Is this method deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the method, or it will be completely ignored; in the very least,
// this is a formalization for deprecating methods.
optional bool deprecated = 33 [default = false];
// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
// or neither? HTTP based RPC implementation may choose GET verb for safe
// methods, and PUT verb for idempotent methods instead of the default POST.
enum IdempotencyLevel {
IDEMPOTENCY_UNKNOWN = 0;
NO_SIDE_EFFECTS = 1; // implies idempotent
IDEMPOTENT = 2; // idempotent, but may have side effects
}
optional IdempotencyLevel idempotency_level = 34
[default = IDEMPOTENCY_UNKNOWN];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
// A message representing a option the parser does not recognize. This only
// appears in options protos created by the compiler::Parser class.
// DescriptorPool resolves these when building Descriptor objects. Therefore,
// options protos in descriptor objects (e.g. returned by Descriptor::options(),
// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
// in them.
message UninterpretedOption {
// The name of the uninterpreted option. Each string represents a segment in
// a dot-separated name. is_extension is true iff a segment represents an
// extension (denoted with parentheses in options specs in .proto files).
// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
// "foo.(bar.baz).qux".
message NamePart {
required string name_part = 1;
required bool is_extension = 2;
}
repeated NamePart name = 2;
// The value of the uninterpreted option, in whatever type the tokenizer
// identified it as during parsing. Exactly one of these should be set.
optional string identifier_value = 3;
optional uint64 positive_int_value = 4;
optional int64 negative_int_value = 5;
optional double double_value = 6;
optional bytes string_value = 7;
optional string aggregate_value = 8;
}
// ===================================================================
// Optional source code info
// Encapsulates information about the original source file from which a
// FileDescriptorProto was generated.
message SourceCodeInfo {
// A Location identifies a piece of source code in a .proto file which
// corresponds to a particular definition. This information is intended
// to be useful to IDEs, code indexers, documentation generators, and similar
// tools.
//
// For example, say we have a file like:
// message Foo {
// optional string foo = 1;
// }
// Let's look at just the field definition:
// optional string foo = 1;
// ^ ^^ ^^ ^ ^^^
// a bc de f ghi
// We have the following locations:
// span path represents
// [a,i) [ 4, 0, 2, 0 ] The whole field definition.
// [a,b) [ 4, 0, 2, 0, 4 ] The label (optional).
// [c,d) [ 4, 0, 2, 0, 5 ] The type (string).
// [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
// [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
//
// Notes:
// - A location may refer to a repeated field itself (i.e. not to any
// particular index within it). This is used whenever a set of elements are
// logically enclosed in a single code segment. For example, an entire
// extend block (possibly containing multiple extension definitions) will
// have an outer location whose path refers to the "extensions" repeated
// field without an index.
// - Multiple locations may have the same path. This happens when a single
// logical declaration is spread out across multiple places. The most
// obvious example is the "extend" block again -- there may be multiple
// extend blocks in the same scope, each of which will have the same path.
// - A location's span is not always a subset of its parent's span. For
// example, the "extendee" of an extension declaration appears at the
// beginning of the "extend" block and is shared by all extensions within
// the block.
// - Just because a location's span is a subset of some other location's span
// does not mean that it is a descendant. For example, a "group" defines
// both a type and a field in a single declaration. Thus, the locations
// corresponding to the type and field and their components will overlap.
// - Code which tries to interpret locations should probably be designed to
// ignore those that it doesn't understand, as more types of locations could
// be recorded in the future.
repeated Location location = 1;
message Location {
// Identifies which part of the FileDescriptorProto was defined at this
// location.
//
// Each element is a field number or an index. They form a path from
// the root FileDescriptorProto to the place where the definition. For
// example, this path:
// [ 4, 3, 2, 7, 1 ]
// refers to:
// file.message_type(3) // 4, 3
// .field(7) // 2, 7
// .name() // 1
// This is because FileDescriptorProto.message_type has field number 4:
// repeated DescriptorProto message_type = 4;
// and DescriptorProto.field has field number 2:
// repeated FieldDescriptorProto field = 2;
// and FieldDescriptorProto.name has field number 1:
// optional string name = 1;
//
// Thus, the above path gives the location of a field name. If we removed
// the last element:
// [ 4, 3, 2, 7 ]
// this path refers to the whole field declaration (from the beginning
// of the label to the terminating semicolon).
repeated int32 path = 1 [packed = true];
// Always has exactly three or four elements: start line, start column,
// end line (optional, otherwise assumed same as start line), end column.
// These are packed into a single field for efficiency. Note that line
// and column numbers are zero-based -- typically you will want to add
// 1 to each before displaying to a user.
repeated int32 span = 2 [packed = true];
// If this SourceCodeInfo represents a complete declaration, these are any
// comments appearing before and after the declaration which appear to be
// attached to the declaration.
//
// A series of line comments appearing on consecutive lines, with no other
// tokens appearing on those lines, will be treated as a single comment.
//
// leading_detached_comments will keep paragraphs of comments that appear
// before (but not connected to) the current element. Each paragraph,
// separated by empty lines, will be one comment element in the repeated
// field.
//
// Only the comment content is provided; comment markers (e.g. //) are
// stripped out. For block comments, leading whitespace and an asterisk
// will be stripped from the beginning of each line other than the first.
// Newlines are included in the output.
//
// Examples:
//
// optional int32 foo = 1; // Comment attached to foo.
// // Comment attached to bar.
// optional int32 bar = 2;
//
// optional string baz = 3;
// // Comment attached to baz.
// // Another line attached to baz.
//
// // Comment attached to qux.
// //
// // Another line attached to qux.
// optional double qux = 4;
//
// // Detached comment for corge. This is not leading or trailing comments
// // to qux or corge because there are blank lines separating it from
// // both.
//
// // Detached comment for corge paragraph 2.
//
// optional string corge = 5;
// /* Block comment attached
// * to corge. Leading asterisks
// * will be removed. */
// /* Block comment attached to
// * grault. */
// optional int32 grault = 6;
//
// // ignored detached comments.
optional string leading_comments = 3;
optional string trailing_comments = 4;
repeated string leading_detached_comments = 6;
}
}
// Describes the relationship between generated code and its original source
// file. A GeneratedCodeInfo message is associated with only one generated
// source file, but may contain references to different source .proto files.
message GeneratedCodeInfo {
// An Annotation connects some span of text in generated code to an element
// of its generating .proto file.
repeated Annotation annotation = 1;
message Annotation {
// Identifies the element in the original source .proto file. This field
// is formatted the same as SourceCodeInfo.Location.path.
repeated int32 path = 1 [packed = true];
// Identifies the filesystem path to the original source .proto.
optional string source_file = 2;
// Identifies the starting offset in bytes in the generated code
// that relates to the identified object.
optional int32 begin = 3;
// Identifies the ending offset in bytes in the generated code that
// relates to the identified offset. The end offset should be one past
// the last relevant byte (so the length of the text = end - begin).
optional int32 end = 4;
}
}

View File

@ -0,0 +1,116 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/durationpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "DurationProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// A Duration represents a signed, fixed-length span of time represented
// as a count of seconds and fractions of seconds at nanosecond
// resolution. It is independent of any calendar and concepts like "day"
// or "month". It is related to Timestamp in that the difference between
// two Timestamp values is a Duration and it can be added or subtracted
// from a Timestamp. Range is approximately +-10,000 years.
//
// # Examples
//
// Example 1: Compute Duration from two Timestamps in pseudo code.
//
// Timestamp start = ...;
// Timestamp end = ...;
// Duration duration = ...;
//
// duration.seconds = end.seconds - start.seconds;
// duration.nanos = end.nanos - start.nanos;
//
// if (duration.seconds < 0 && duration.nanos > 0) {
// duration.seconds += 1;
// duration.nanos -= 1000000000;
// } else if (duration.seconds > 0 && duration.nanos < 0) {
// duration.seconds -= 1;
// duration.nanos += 1000000000;
// }
//
// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
//
// Timestamp start = ...;
// Duration duration = ...;
// Timestamp end = ...;
//
// end.seconds = start.seconds + duration.seconds;
// end.nanos = start.nanos + duration.nanos;
//
// if (end.nanos < 0) {
// end.seconds -= 1;
// end.nanos += 1000000000;
// } else if (end.nanos >= 1000000000) {
// end.seconds += 1;
// end.nanos -= 1000000000;
// }
//
// Example 3: Compute Duration from datetime.timedelta in Python.
//
// td = datetime.timedelta(days=3, minutes=10)
// duration = Duration()
// duration.FromTimedelta(td)
//
// # JSON Mapping
//
// In JSON format, the Duration type is encoded as a string rather than an
// object, where the string ends in the suffix "s" (indicating seconds) and
// is preceded by the number of seconds, with nanoseconds expressed as
// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
// microsecond should be expressed in JSON format as "3.000001s".
//
//
message Duration {
// Signed seconds of the span of time. Must be from -315,576,000,000
// to +315,576,000,000 inclusive. Note: these bounds are computed from:
// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
int64 seconds = 1;
// Signed fractions of a second at nanosecond resolution of the span
// of time. Durations less than one second are represented with a 0
// `seconds` field and a positive or negative `nanos` field. For durations
// of one second or more, a non-zero value for the `nanos` field must be
// of the same sign as the `seconds` field. Must be from -999,999,999
// to +999,999,999 inclusive.
int32 nanos = 2;
}

View File

@ -0,0 +1,52 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option go_package = "google.golang.org/protobuf/types/known/emptypb";
option java_package = "com.google.protobuf";
option java_outer_classname = "EmptyProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option cc_enable_arenas = true;
// A generic empty message that you can re-use to avoid defining duplicated
// empty messages in your APIs. A typical example is to use it as the request
// or the response type of an API method. For instance:
//
// service Foo {
// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
// }
//
// The JSON representation for `Empty` is empty JSON object `{}`.
message Empty {}

View File

@ -0,0 +1,245 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "FieldMaskProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/fieldmaskpb";
option cc_enable_arenas = true;
// `FieldMask` represents a set of symbolic field paths, for example:
//
// paths: "f.a"
// paths: "f.b.d"
//
// Here `f` represents a field in some root message, `a` and `b`
// fields in the message found in `f`, and `d` a field found in the
// message in `f.b`.
//
// Field masks are used to specify a subset of fields that should be
// returned by a get operation or modified by an update operation.
// Field masks also have a custom JSON encoding (see below).
//
// # Field Masks in Projections
//
// When used in the context of a projection, a response message or
// sub-message is filtered by the API to only contain those fields as
// specified in the mask. For example, if the mask in the previous
// example is applied to a response message as follows:
//
// f {
// a : 22
// b {
// d : 1
// x : 2
// }
// y : 13
// }
// z: 8
//
// The result will not contain specific values for fields x,y and z
// (their value will be set to the default, and omitted in proto text
// output):
//
//
// f {
// a : 22
// b {
// d : 1
// }
// }
//
// A repeated field is not allowed except at the last position of a
// paths string.
//
// If a FieldMask object is not present in a get operation, the
// operation applies to all fields (as if a FieldMask of all fields
// had been specified).
//
// Note that a field mask does not necessarily apply to the
// top-level response message. In case of a REST get operation, the
// field mask applies directly to the response, but in case of a REST
// list operation, the mask instead applies to each individual message
// in the returned resource list. In case of a REST custom method,
// other definitions may be used. Where the mask applies will be
// clearly documented together with its declaration in the API. In
// any case, the effect on the returned resource/resources is required
// behavior for APIs.
//
// # Field Masks in Update Operations
//
// A field mask in update operations specifies which fields of the
// targeted resource are going to be updated. The API is required
// to only change the values of the fields as specified in the mask
// and leave the others untouched. If a resource is passed in to
// describe the updated values, the API ignores the values of all
// fields not covered by the mask.
//
// If a repeated field is specified for an update operation, new values will
// be appended to the existing repeated field in the target resource. Note that
// a repeated field is only allowed in the last position of a `paths` string.
//
// If a sub-message is specified in the last position of the field mask for an
// update operation, then new value will be merged into the existing sub-message
// in the target resource.
//
// For example, given the target message:
//
// f {
// b {
// d: 1
// x: 2
// }
// c: [1]
// }
//
// And an update message:
//
// f {
// b {
// d: 10
// }
// c: [2]
// }
//
// then if the field mask is:
//
// paths: ["f.b", "f.c"]
//
// then the result will be:
//
// f {
// b {
// d: 10
// x: 2
// }
// c: [1, 2]
// }
//
// An implementation may provide options to override this default behavior for
// repeated and message fields.
//
// In order to reset a field's value to the default, the field must
// be in the mask and set to the default value in the provided resource.
// Hence, in order to reset all fields of a resource, provide a default
// instance of the resource and set all fields in the mask, or do
// not provide a mask as described below.
//
// If a field mask is not present on update, the operation applies to
// all fields (as if a field mask of all fields has been specified).
// Note that in the presence of schema evolution, this may mean that
// fields the client does not know and has therefore not filled into
// the request will be reset to their default. If this is unwanted
// behavior, a specific service may require a client to always specify
// a field mask, producing an error if not.
//
// As with get operations, the location of the resource which
// describes the updated values in the request message depends on the
// operation kind. In any case, the effect of the field mask is
// required to be honored by the API.
//
// ## Considerations for HTTP REST
//
// The HTTP kind of an update operation which uses a field mask must
// be set to PATCH instead of PUT in order to satisfy HTTP semantics
// (PUT must only be used for full updates).
//
// # JSON Encoding of Field Masks
//
// In JSON, a field mask is encoded as a single string where paths are
// separated by a comma. Fields name in each path are converted
// to/from lower-camel naming conventions.
//
// As an example, consider the following message declarations:
//
// message Profile {
// User user = 1;
// Photo photo = 2;
// }
// message User {
// string display_name = 1;
// string address = 2;
// }
//
// In proto a field mask for `Profile` may look as such:
//
// mask {
// paths: "user.display_name"
// paths: "photo"
// }
//
// In JSON, the same mask is represented as below:
//
// {
// mask: "user.displayName,photo"
// }
//
// # Field Masks and Oneof Fields
//
// Field masks treat fields in oneofs just as regular fields. Consider the
// following message:
//
// message SampleMessage {
// oneof test_oneof {
// string name = 4;
// SubMessage sub_message = 9;
// }
// }
//
// The field mask can be:
//
// mask {
// paths: "name"
// }
//
// Or:
//
// mask {
// paths: "sub_message"
// }
//
// Note that oneof type names ("test_oneof" in this case) cannot be used in
// paths.
//
// ## Field Mask Verification
//
// The implementation of any API method which has a FieldMask type field in the
// request should verify the included field paths, and return an
// `INVALID_ARGUMENT` error if any path is unmappable.
message FieldMask {
// The set of field mask paths.
repeated string paths = 1;
}

View File

@ -0,0 +1,48 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "SourceContextProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/sourcecontextpb";
// `SourceContext` represents information about the source of a
// protobuf element, like the file in which it is defined.
message SourceContext {
// The path-qualified name of the .proto file that contained the associated
// protobuf element. For example: `"google/protobuf/source_context.proto"`.
string file_name = 1;
}

View File

@ -0,0 +1,95 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/structpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "StructProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// `Struct` represents a structured data value, consisting of fields
// which map to dynamically typed values. In some languages, `Struct`
// might be supported by a native representation. For example, in
// scripting languages like JS a struct is represented as an
// object. The details of that representation are described together
// with the proto support for the language.
//
// The JSON representation for `Struct` is JSON object.
message Struct {
// Unordered map of dynamically typed values.
map<string, Value> fields = 1;
}
// `Value` represents a dynamically typed value which can be either
// null, a number, a string, a boolean, a recursive struct value, or a
// list of values. A producer of value is expected to set one of these
// variants. Absence of any variant indicates an error.
//
// The JSON representation for `Value` is JSON value.
message Value {
// The kind of value.
oneof kind {
// Represents a null value.
NullValue null_value = 1;
// Represents a double value.
double number_value = 2;
// Represents a string value.
string string_value = 3;
// Represents a boolean value.
bool bool_value = 4;
// Represents a structured value.
Struct struct_value = 5;
// Represents a repeated `Value`.
ListValue list_value = 6;
}
}
// `NullValue` is a singleton enumeration to represent the null value for the
// `Value` type union.
//
// The JSON representation for `NullValue` is JSON `null`.
enum NullValue {
// Null value.
NULL_VALUE = 0;
}
// `ListValue` is a wrapper around a repeated field of values.
//
// The JSON representation for `ListValue` is JSON array.
message ListValue {
// Repeated field of dynamically typed values.
repeated Value values = 1;
}

View File

@ -0,0 +1,147 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/timestamppb";
option java_package = "com.google.protobuf";
option java_outer_classname = "TimestampProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// A Timestamp represents a point in time independent of any time zone or local
// calendar, encoded as a count of seconds and fractions of seconds at
// nanosecond resolution. The count is relative to an epoch at UTC midnight on
// January 1, 1970, in the proleptic Gregorian calendar which extends the
// Gregorian calendar backwards to year one.
//
// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
// second table is needed for interpretation, using a [24-hour linear
// smear](https://developers.google.com/time/smear).
//
// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
// restricting to that range, we ensure that we can convert to and from [RFC
// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
//
// # Examples
//
// Example 1: Compute Timestamp from POSIX `time()`.
//
// Timestamp timestamp;
// timestamp.set_seconds(time(NULL));
// timestamp.set_nanos(0);
//
// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
//
// struct timeval tv;
// gettimeofday(&tv, NULL);
//
// Timestamp timestamp;
// timestamp.set_seconds(tv.tv_sec);
// timestamp.set_nanos(tv.tv_usec * 1000);
//
// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
//
// FILETIME ft;
// GetSystemTimeAsFileTime(&ft);
// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
//
// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
// Timestamp timestamp;
// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
//
// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
//
// long millis = System.currentTimeMillis();
//
// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
// .setNanos((int) ((millis % 1000) * 1000000)).build();
//
//
// Example 5: Compute Timestamp from Java `Instant.now()`.
//
// Instant now = Instant.now();
//
// Timestamp timestamp =
// Timestamp.newBuilder().setSeconds(now.getEpochSecond())
// .setNanos(now.getNano()).build();
//
//
// Example 6: Compute Timestamp from current time in Python.
//
// timestamp = Timestamp()
// timestamp.GetCurrentTime()
//
// # JSON Mapping
//
// In JSON format, the Timestamp type is encoded as a string in the
// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
// where {year} is always expressed using four digits while {month}, {day},
// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
// is required. A proto3 JSON serializer should always use UTC (as indicated by
// "Z") when printing the Timestamp type and a proto3 JSON parser should be
// able to accept both UTC and other timezones (as indicated by an offset).
//
// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
// 01:30 UTC on January 15, 2017.
//
// In JavaScript, one can convert a Date object to this format using the
// standard
// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
// method. In Python, a standard `datetime.datetime` object can be converted
// to this format using
// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
// the Joda Time's [`ISODateTimeFormat.dateTime()`](
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
// ) to obtain a formatter capable of generating timestamps in this format.
//
//
message Timestamp {
// Represents seconds of UTC time since Unix epoch
// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
// 9999-12-31T23:59:59Z inclusive.
int64 seconds = 1;
// Non-negative fractions of a second at nanosecond resolution. Negative
// second values with fractions must still have non-negative nanos values
// that count forward in time. Must be from 0 to 999,999,999
// inclusive.
int32 nanos = 2;
}

View File

@ -0,0 +1,187 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
import "google/protobuf/any.proto";
import "google/protobuf/source_context.proto";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option java_package = "com.google.protobuf";
option java_outer_classname = "TypeProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/typepb";
// A protocol buffer message type.
message Type {
// The fully qualified message name.
string name = 1;
// The list of fields.
repeated Field fields = 2;
// The list of types appearing in `oneof` definitions in this type.
repeated string oneofs = 3;
// The protocol buffer options.
repeated Option options = 4;
// The source context.
SourceContext source_context = 5;
// The source syntax.
Syntax syntax = 6;
}
// A single field of a message type.
message Field {
// Basic field types.
enum Kind {
// Field type unknown.
TYPE_UNKNOWN = 0;
// Field type double.
TYPE_DOUBLE = 1;
// Field type float.
TYPE_FLOAT = 2;
// Field type int64.
TYPE_INT64 = 3;
// Field type uint64.
TYPE_UINT64 = 4;
// Field type int32.
TYPE_INT32 = 5;
// Field type fixed64.
TYPE_FIXED64 = 6;
// Field type fixed32.
TYPE_FIXED32 = 7;
// Field type bool.
TYPE_BOOL = 8;
// Field type string.
TYPE_STRING = 9;
// Field type group. Proto2 syntax only, and deprecated.
TYPE_GROUP = 10;
// Field type message.
TYPE_MESSAGE = 11;
// Field type bytes.
TYPE_BYTES = 12;
// Field type uint32.
TYPE_UINT32 = 13;
// Field type enum.
TYPE_ENUM = 14;
// Field type sfixed32.
TYPE_SFIXED32 = 15;
// Field type sfixed64.
TYPE_SFIXED64 = 16;
// Field type sint32.
TYPE_SINT32 = 17;
// Field type sint64.
TYPE_SINT64 = 18;
}
// Whether a field is optional, required, or repeated.
enum Cardinality {
// For fields with unknown cardinality.
CARDINALITY_UNKNOWN = 0;
// For optional fields.
CARDINALITY_OPTIONAL = 1;
// For required fields. Proto2 syntax only.
CARDINALITY_REQUIRED = 2;
// For repeated fields.
CARDINALITY_REPEATED = 3;
}
// The field type.
Kind kind = 1;
// The field cardinality.
Cardinality cardinality = 2;
// The field number.
int32 number = 3;
// The field name.
string name = 4;
// The field type URL, without the scheme, for message or enumeration
// types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
string type_url = 6;
// The index of the field type in `Type.oneofs`, for message or enumeration
// types. The first type has index 1; zero means the type is not in the list.
int32 oneof_index = 7;
// Whether to use alternative packed wire representation.
bool packed = 8;
// The protocol buffer options.
repeated Option options = 9;
// The field JSON name.
string json_name = 10;
// The string value of the default value of this field. Proto2 syntax only.
string default_value = 11;
}
// Enum type definition.
message Enum {
// Enum type name.
string name = 1;
// Enum value definitions.
repeated EnumValue enumvalue = 2;
// Protocol buffer options.
repeated Option options = 3;
// The source context.
SourceContext source_context = 4;
// The source syntax.
Syntax syntax = 5;
}
// Enum value definition.
message EnumValue {
// Enum value name.
string name = 1;
// Enum value number.
int32 number = 2;
// Protocol buffer options.
repeated Option options = 3;
}
// A protocol buffer option, which can be attached to a message, field,
// enumeration, etc.
message Option {
// The option's name. For protobuf built-in options (options defined in
// descriptor.proto), this is the short name. For example, `"map_entry"`.
// For custom options, it should be the fully-qualified name. For example,
// `"google.api.http"`.
string name = 1;
// The option's value packed in an Any message. If the value is a primitive,
// the corresponding wrapper type defined in google/protobuf/wrappers.proto
// should be used. If the value is an enum, it should be stored as an int32
// value using the google.protobuf.Int32Value type.
Any value = 2;
}
// The syntax in which a protocol buffer element is defined.
enum Syntax {
// Syntax `proto2`.
SYNTAX_PROTO2 = 0;
// Syntax `proto3`.
SYNTAX_PROTO3 = 1;
}

View File

@ -0,0 +1,123 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Wrappers for primitive (non-message) types. These types are useful
// for embedding primitives in the `google.protobuf.Any` type and for places
// where we need to distinguish between the absence of a primitive
// typed field and its default value.
//
// These wrappers have no meaningful use within repeated fields as they lack
// the ability to detect presence on individual elements.
// These wrappers have no meaningful use within a map or a oneof since
// individual entries of a map or fields of a oneof can already detect presence.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/wrapperspb";
option java_package = "com.google.protobuf";
option java_outer_classname = "WrappersProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// Wrapper message for `double`.
//
// The JSON representation for `DoubleValue` is JSON number.
message DoubleValue {
// The double value.
double value = 1;
}
// Wrapper message for `float`.
//
// The JSON representation for `FloatValue` is JSON number.
message FloatValue {
// The float value.
float value = 1;
}
// Wrapper message for `int64`.
//
// The JSON representation for `Int64Value` is JSON string.
message Int64Value {
// The int64 value.
int64 value = 1;
}
// Wrapper message for `uint64`.
//
// The JSON representation for `UInt64Value` is JSON string.
message UInt64Value {
// The uint64 value.
uint64 value = 1;
}
// Wrapper message for `int32`.
//
// The JSON representation for `Int32Value` is JSON number.
message Int32Value {
// The int32 value.
int32 value = 1;
}
// Wrapper message for `uint32`.
//
// The JSON representation for `UInt32Value` is JSON number.
message UInt32Value {
// The uint32 value.
uint32 value = 1;
}
// Wrapper message for `bool`.
//
// The JSON representation for `BoolValue` is JSON `true` and `false`.
message BoolValue {
// The bool value.
bool value = 1;
}
// Wrapper message for `string`.
//
// The JSON representation for `StringValue` is JSON string.
message StringValue {
// The string value.
string value = 1;
}
// Wrapper message for `bytes`.
//
// The JSON representation for `BytesValue` is JSON string.
message BytesValue {
// The bytes value.
bytes value = 1;
}

View File

@ -0,0 +1,15 @@
Protocol Buffers - Google's data interchange format
Copyright 2008 Google Inc.
https://developers.google.com/protocol-buffers/
This package contains a precompiled binary version of the protocol buffer
compiler (protoc). This binary is intended for users who want to use Protocol
Buffers in languages other than C++ but do not want to compile protoc
themselves. To install, simply place this binary somewhere in your PATH.
If you intend to use the included well known types then don't forget to
copy the contents of the 'include' directory somewhere as well, for example
into '/usr/local/include/'.
Please refer to our official github site for more installation instructions:
https://github.com/protocolbuffers/protobuf

View File

@ -0,0 +1,158 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option go_package = "google.golang.org/protobuf/types/known/anypb";
option java_package = "com.google.protobuf";
option java_outer_classname = "AnyProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// `Any` contains an arbitrary serialized protocol buffer message along with a
// URL that describes the type of the serialized message.
//
// Protobuf library provides support to pack/unpack Any values in the form
// of utility functions or additional generated methods of the Any type.
//
// Example 1: Pack and unpack a message in C++.
//
// Foo foo = ...;
// Any any;
// any.PackFrom(foo);
// ...
// if (any.UnpackTo(&foo)) {
// ...
// }
//
// Example 2: Pack and unpack a message in Java.
//
// Foo foo = ...;
// Any any = Any.pack(foo);
// ...
// if (any.is(Foo.class)) {
// foo = any.unpack(Foo.class);
// }
//
// Example 3: Pack and unpack a message in Python.
//
// foo = Foo(...)
// any = Any()
// any.Pack(foo)
// ...
// if any.Is(Foo.DESCRIPTOR):
// any.Unpack(foo)
// ...
//
// Example 4: Pack and unpack a message in Go
//
// foo := &pb.Foo{...}
// any, err := anypb.New(foo)
// if err != nil {
// ...
// }
// ...
// foo := &pb.Foo{}
// if err := any.UnmarshalTo(foo); err != nil {
// ...
// }
//
// The pack methods provided by protobuf library will by default use
// 'type.googleapis.com/full.type.name' as the type URL and the unpack
// methods only use the fully qualified type name after the last '/'
// in the type URL, for example "foo.bar.com/x/y.z" will yield type
// name "y.z".
//
//
// JSON
// ====
// The JSON representation of an `Any` value uses the regular
// representation of the deserialized, embedded message, with an
// additional field `@type` which contains the type URL. Example:
//
// package google.profile;
// message Person {
// string first_name = 1;
// string last_name = 2;
// }
//
// {
// "@type": "type.googleapis.com/google.profile.Person",
// "firstName": <string>,
// "lastName": <string>
// }
//
// If the embedded message type is well-known and has a custom JSON
// representation, that representation will be embedded adding a field
// `value` which holds the custom JSON in addition to the `@type`
// field. Example (for message [google.protobuf.Duration][]):
//
// {
// "@type": "type.googleapis.com/google.protobuf.Duration",
// "value": "1.212s"
// }
//
message Any {
// A URL/resource name that uniquely identifies the type of the serialized
// protocol buffer message. This string must contain at least
// one "/" character. The last segment of the URL's path must represent
// the fully qualified name of the type (as in
// `path/google.protobuf.Duration`). The name should be in a canonical form
// (e.g., leading "." is not accepted).
//
// In practice, teams usually precompile into the binary all types that they
// expect it to use in the context of Any. However, for URLs which use the
// scheme `http`, `https`, or no scheme, one can optionally set up a type
// server that maps type URLs to message definitions as follows:
//
// * If no scheme is provided, `https` is assumed.
// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
// value in binary format, or produce an error.
// * Applications are allowed to cache lookup results based on the
// URL, or have them precompiled into a binary to avoid any
// lookup. Therefore, binary compatibility needs to be preserved
// on changes to types. (Use versioned type names to manage
// breaking changes.)
//
// Note: this functionality is not currently available in the official
// protobuf release, and it is not used for type URLs beginning with
// type.googleapis.com.
//
// Schemes other than `http`, `https` (or the empty scheme) might be
// used with implementation specific semantics.
//
string type_url = 1;
// Must be a valid serialized protocol buffer of the above specified type.
bytes value = 2;
}

View File

@ -0,0 +1,208 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
import "google/protobuf/source_context.proto";
import "google/protobuf/type.proto";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "ApiProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/apipb";
// Api is a light-weight descriptor for an API Interface.
//
// Interfaces are also described as "protocol buffer services" in some contexts,
// such as by the "service" keyword in a .proto file, but they are different
// from API Services, which represent a concrete implementation of an interface
// as opposed to simply a description of methods and bindings. They are also
// sometimes simply referred to as "APIs" in other contexts, such as the name of
// this message itself. See https://cloud.google.com/apis/design/glossary for
// detailed terminology.
message Api {
// The fully qualified name of this interface, including package name
// followed by the interface's simple name.
string name = 1;
// The methods of this interface, in unspecified order.
repeated Method methods = 2;
// Any metadata attached to the interface.
repeated Option options = 3;
// A version string for this interface. If specified, must have the form
// `major-version.minor-version`, as in `1.10`. If the minor version is
// omitted, it defaults to zero. If the entire version field is empty, the
// major version is derived from the package name, as outlined below. If the
// field is not empty, the version in the package name will be verified to be
// consistent with what is provided here.
//
// The versioning schema uses [semantic
// versioning](http://semver.org) where the major version number
// indicates a breaking change and the minor version an additive,
// non-breaking change. Both version numbers are signals to users
// what to expect from different versions, and should be carefully
// chosen based on the product plan.
//
// The major version is also reflected in the package name of the
// interface, which must end in `v<major-version>`, as in
// `google.feature.v1`. For major versions 0 and 1, the suffix can
// be omitted. Zero major versions must only be used for
// experimental, non-GA interfaces.
//
//
string version = 4;
// Source context for the protocol buffer service represented by this
// message.
SourceContext source_context = 5;
// Included interfaces. See [Mixin][].
repeated Mixin mixins = 6;
// The source syntax of the service.
Syntax syntax = 7;
}
// Method represents a method of an API interface.
message Method {
// The simple name of this method.
string name = 1;
// A URL of the input message type.
string request_type_url = 2;
// If true, the request is streamed.
bool request_streaming = 3;
// The URL of the output message type.
string response_type_url = 4;
// If true, the response is streamed.
bool response_streaming = 5;
// Any metadata attached to the method.
repeated Option options = 6;
// The source syntax of this method.
Syntax syntax = 7;
}
// Declares an API Interface to be included in this interface. The including
// interface must redeclare all the methods from the included interface, but
// documentation and options are inherited as follows:
//
// - If after comment and whitespace stripping, the documentation
// string of the redeclared method is empty, it will be inherited
// from the original method.
//
// - Each annotation belonging to the service config (http,
// visibility) which is not set in the redeclared method will be
// inherited.
//
// - If an http annotation is inherited, the path pattern will be
// modified as follows. Any version prefix will be replaced by the
// version of the including interface plus the [root][] path if
// specified.
//
// Example of a simple mixin:
//
// package google.acl.v1;
// service AccessControl {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v1/{resource=**}:getAcl";
// }
// }
//
// package google.storage.v2;
// service Storage {
// rpc GetAcl(GetAclRequest) returns (Acl);
//
// // Get a data record.
// rpc GetData(GetDataRequest) returns (Data) {
// option (google.api.http).get = "/v2/{resource=**}";
// }
// }
//
// Example of a mixin configuration:
//
// apis:
// - name: google.storage.v2.Storage
// mixins:
// - name: google.acl.v1.AccessControl
//
// The mixin construct implies that all methods in `AccessControl` are
// also declared with same name and request/response types in
// `Storage`. A documentation generator or annotation processor will
// see the effective `Storage.GetAcl` method after inheriting
// documentation and annotations as follows:
//
// service Storage {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v2/{resource=**}:getAcl";
// }
// ...
// }
//
// Note how the version in the path pattern changed from `v1` to `v2`.
//
// If the `root` field in the mixin is specified, it should be a
// relative path under which inherited HTTP paths are placed. Example:
//
// apis:
// - name: google.storage.v2.Storage
// mixins:
// - name: google.acl.v1.AccessControl
// root: acls
//
// This implies the following inherited HTTP annotation:
//
// service Storage {
// // Get the underlying ACL object.
// rpc GetAcl(GetAclRequest) returns (Acl) {
// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
// }
// ...
// }
message Mixin {
// The fully qualified name of the interface which is included.
string name = 1;
// If non-empty specifies a path under which inherited HTTP paths
// are rooted.
string root = 2;
}

View File

@ -0,0 +1,183 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Author: kenton@google.com (Kenton Varda)
//
// WARNING: The plugin interface is currently EXPERIMENTAL and is subject to
// change.
//
// protoc (aka the Protocol Compiler) can be extended via plugins. A plugin is
// just a program that reads a CodeGeneratorRequest from stdin and writes a
// CodeGeneratorResponse to stdout.
//
// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead
// of dealing with the raw protocol defined here.
//
// A plugin executable needs only to be placed somewhere in the path. The
// plugin should be named "protoc-gen-$NAME", and will then be used when the
// flag "--${NAME}_out" is passed to protoc.
syntax = "proto2";
package google.protobuf.compiler;
option java_package = "com.google.protobuf.compiler";
option java_outer_classname = "PluginProtos";
option go_package = "google.golang.org/protobuf/types/pluginpb";
import "google/protobuf/descriptor.proto";
// The version number of protocol compiler.
message Version {
optional int32 major = 1;
optional int32 minor = 2;
optional int32 patch = 3;
// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
// be empty for mainline stable releases.
optional string suffix = 4;
}
// An encoded CodeGeneratorRequest is written to the plugin's stdin.
message CodeGeneratorRequest {
// The .proto files that were explicitly listed on the command-line. The
// code generator should generate code only for these files. Each file's
// descriptor will be included in proto_file, below.
repeated string file_to_generate = 1;
// The generator parameter passed on the command-line.
optional string parameter = 2;
// FileDescriptorProtos for all files in files_to_generate and everything
// they import. The files will appear in topological order, so each file
// appears before any file that imports it.
//
// protoc guarantees that all proto_files will be written after
// the fields above, even though this is not technically guaranteed by the
// protobuf wire format. This theoretically could allow a plugin to stream
// in the FileDescriptorProtos and handle them one by one rather than read
// the entire set into memory at once. However, as of this writing, this
// is not similarly optimized on protoc's end -- it will store all fields in
// memory at once before sending them to the plugin.
//
// Type names of fields and extensions in the FileDescriptorProto are always
// fully qualified.
repeated FileDescriptorProto proto_file = 15;
// The version number of protocol compiler.
optional Version compiler_version = 3;
}
// The plugin writes an encoded CodeGeneratorResponse to stdout.
message CodeGeneratorResponse {
// Error message. If non-empty, code generation failed. The plugin process
// should exit with status code zero even if it reports an error in this way.
//
// This should be used to indicate errors in .proto files which prevent the
// code generator from generating correct code. Errors which indicate a
// problem in protoc itself -- such as the input CodeGeneratorRequest being
// unparseable -- should be reported by writing a message to stderr and
// exiting with a non-zero status code.
optional string error = 1;
// A bitmask of supported features that the code generator supports.
// This is a bitwise "or" of values from the Feature enum.
optional uint64 supported_features = 2;
// Sync with code_generator.h.
enum Feature {
FEATURE_NONE = 0;
FEATURE_PROTO3_OPTIONAL = 1;
}
// Represents a single generated file.
message File {
// The file name, relative to the output directory. The name must not
// contain "." or ".." components and must be relative, not be absolute (so,
// the file cannot lie outside the output directory). "/" must be used as
// the path separator, not "\".
//
// If the name is omitted, the content will be appended to the previous
// file. This allows the generator to break large files into small chunks,
// and allows the generated text to be streamed back to protoc so that large
// files need not reside completely in memory at one time. Note that as of
// this writing protoc does not optimize for this -- it will read the entire
// CodeGeneratorResponse before writing files to disk.
optional string name = 1;
// If non-empty, indicates that the named file should already exist, and the
// content here is to be inserted into that file at a defined insertion
// point. This feature allows a code generator to extend the output
// produced by another code generator. The original generator may provide
// insertion points by placing special annotations in the file that look
// like:
// @@protoc_insertion_point(NAME)
// The annotation can have arbitrary text before and after it on the line,
// which allows it to be placed in a comment. NAME should be replaced with
// an identifier naming the point -- this is what other generators will use
// as the insertion_point. Code inserted at this point will be placed
// immediately above the line containing the insertion point (thus multiple
// insertions to the same point will come out in the order they were added).
// The double-@ is intended to make it unlikely that the generated code
// could contain things that look like insertion points by accident.
//
// For example, the C++ code generator places the following line in the
// .pb.h files that it generates:
// // @@protoc_insertion_point(namespace_scope)
// This line appears within the scope of the file's package namespace, but
// outside of any particular class. Another plugin can then specify the
// insertion_point "namespace_scope" to generate additional classes or
// other declarations that should be placed in this scope.
//
// Note that if the line containing the insertion point begins with
// whitespace, the same whitespace will be added to every line of the
// inserted text. This is useful for languages like Python, where
// indentation matters. In these languages, the insertion point comment
// should be indented the same amount as any inserted code will need to be
// in order to work correctly in that context.
//
// The code generator that generates the initial file and the one which
// inserts into it must both run as part of a single invocation of protoc.
// Code generators are executed in the order in which they appear on the
// command line.
//
// If |insertion_point| is present, |name| must also be present.
optional string insertion_point = 2;
// The file contents.
optional string content = 15;
// Information describing the file content being inserted. If an insertion
// point is used, this information will be appropriately offset and inserted
// into the code generation metadata for the generated files.
optional GeneratedCodeInfo generated_code_info = 16;
}
repeated File file = 15;
}

View File

@ -0,0 +1,911 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Author: kenton@google.com (Kenton Varda)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
//
// The messages in this file describe the definitions found in .proto files.
// A valid .proto file can be translated directly to a FileDescriptorProto
// without any other information (e.g. without reading its imports).
syntax = "proto2";
package google.protobuf;
option go_package = "google.golang.org/protobuf/types/descriptorpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "DescriptorProtos";
option csharp_namespace = "Google.Protobuf.Reflection";
option objc_class_prefix = "GPB";
option cc_enable_arenas = true;
// descriptor.proto must be optimized for speed because reflection-based
// algorithms don't work during bootstrapping.
option optimize_for = SPEED;
// The protocol compiler can output a FileDescriptorSet containing the .proto
// files it parses.
message FileDescriptorSet {
repeated FileDescriptorProto file = 1;
}
// Describes a complete .proto file.
message FileDescriptorProto {
optional string name = 1; // file name, relative to root of source tree
optional string package = 2; // e.g. "foo", "foo.bar", etc.
// Names of files imported by this file.
repeated string dependency = 3;
// Indexes of the public imported files in the dependency list above.
repeated int32 public_dependency = 10;
// Indexes of the weak imported files in the dependency list.
// For Google-internal migration only. Do not use.
repeated int32 weak_dependency = 11;
// All top-level definitions in this file.
repeated DescriptorProto message_type = 4;
repeated EnumDescriptorProto enum_type = 5;
repeated ServiceDescriptorProto service = 6;
repeated FieldDescriptorProto extension = 7;
optional FileOptions options = 8;
// This field contains optional information about the original source code.
// You may safely remove this entire field without harming runtime
// functionality of the descriptors -- the information is needed only by
// development tools.
optional SourceCodeInfo source_code_info = 9;
// The syntax of the proto file.
// The supported values are "proto2" and "proto3".
optional string syntax = 12;
}
// Describes a message type.
message DescriptorProto {
optional string name = 1;
repeated FieldDescriptorProto field = 2;
repeated FieldDescriptorProto extension = 6;
repeated DescriptorProto nested_type = 3;
repeated EnumDescriptorProto enum_type = 4;
message ExtensionRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Exclusive.
optional ExtensionRangeOptions options = 3;
}
repeated ExtensionRange extension_range = 5;
repeated OneofDescriptorProto oneof_decl = 8;
optional MessageOptions options = 7;
// Range of reserved tag numbers. Reserved tag numbers may not be used by
// fields or extension ranges in the same message. Reserved ranges may
// not overlap.
message ReservedRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Exclusive.
}
repeated ReservedRange reserved_range = 9;
// Reserved field names, which may not be used by fields in the same message.
// A given name may only be reserved once.
repeated string reserved_name = 10;
}
message ExtensionRangeOptions {
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
// Describes a field within a message.
message FieldDescriptorProto {
enum Type {
// 0 is reserved for errors.
// Order is weird for historical reasons.
TYPE_DOUBLE = 1;
TYPE_FLOAT = 2;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if
// negative values are likely.
TYPE_INT64 = 3;
TYPE_UINT64 = 4;
// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if
// negative values are likely.
TYPE_INT32 = 5;
TYPE_FIXED64 = 6;
TYPE_FIXED32 = 7;
TYPE_BOOL = 8;
TYPE_STRING = 9;
// Tag-delimited aggregate.
// Group type is deprecated and not supported in proto3. However, Proto3
// implementations should still be able to parse the group wire format and
// treat group fields as unknown fields.
TYPE_GROUP = 10;
TYPE_MESSAGE = 11; // Length-delimited aggregate.
// New in version 2.
TYPE_BYTES = 12;
TYPE_UINT32 = 13;
TYPE_ENUM = 14;
TYPE_SFIXED32 = 15;
TYPE_SFIXED64 = 16;
TYPE_SINT32 = 17; // Uses ZigZag encoding.
TYPE_SINT64 = 18; // Uses ZigZag encoding.
}
enum Label {
// 0 is reserved for errors
LABEL_OPTIONAL = 1;
LABEL_REQUIRED = 2;
LABEL_REPEATED = 3;
}
optional string name = 1;
optional int32 number = 3;
optional Label label = 4;
// If type_name is set, this need not be set. If both this and type_name
// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
optional Type type = 5;
// For message and enum types, this is the name of the type. If the name
// starts with a '.', it is fully-qualified. Otherwise, C++-like scoping
// rules are used to find the type (i.e. first the nested types within this
// message are searched, then within the parent, on up to the root
// namespace).
optional string type_name = 6;
// For extensions, this is the name of the type being extended. It is
// resolved in the same manner as type_name.
optional string extendee = 2;
// For numeric types, contains the original text representation of the value.
// For booleans, "true" or "false".
// For strings, contains the default text contents (not escaped in any way).
// For bytes, contains the C escaped value. All bytes >= 128 are escaped.
// TODO(kenton): Base-64 encode?
optional string default_value = 7;
// If set, gives the index of a oneof in the containing type's oneof_decl
// list. This field is a member of that oneof.
optional int32 oneof_index = 9;
// JSON name of this field. The value is set by protocol compiler. If the
// user has set a "json_name" option on this field, that option's value
// will be used. Otherwise, it's deduced from the field's name by converting
// it to camelCase.
optional string json_name = 10;
optional FieldOptions options = 8;
// If true, this is a proto3 "optional". When a proto3 field is optional, it
// tracks presence regardless of field type.
//
// When proto3_optional is true, this field must be belong to a oneof to
// signal to old proto3 clients that presence is tracked for this field. This
// oneof is known as a "synthetic" oneof, and this field must be its sole
// member (each proto3 optional field gets its own synthetic oneof). Synthetic
// oneofs exist in the descriptor only, and do not generate any API. Synthetic
// oneofs must be ordered after all "real" oneofs.
//
// For message fields, proto3_optional doesn't create any semantic change,
// since non-repeated message fields always track presence. However it still
// indicates the semantic detail of whether the user wrote "optional" or not.
// This can be useful for round-tripping the .proto file. For consistency we
// give message fields a synthetic oneof also, even though it is not required
// to track presence. This is especially important because the parser can't
// tell if a field is a message or an enum, so it must always create a
// synthetic oneof.
//
// Proto2 optional fields do not set this flag, because they already indicate
// optional with `LABEL_OPTIONAL`.
optional bool proto3_optional = 17;
}
// Describes a oneof.
message OneofDescriptorProto {
optional string name = 1;
optional OneofOptions options = 2;
}
// Describes an enum type.
message EnumDescriptorProto {
optional string name = 1;
repeated EnumValueDescriptorProto value = 2;
optional EnumOptions options = 3;
// Range of reserved numeric values. Reserved values may not be used by
// entries in the same enum. Reserved ranges may not overlap.
//
// Note that this is distinct from DescriptorProto.ReservedRange in that it
// is inclusive such that it can appropriately represent the entire int32
// domain.
message EnumReservedRange {
optional int32 start = 1; // Inclusive.
optional int32 end = 2; // Inclusive.
}
// Range of reserved numeric values. Reserved numeric values may not be used
// by enum values in the same enum declaration. Reserved ranges may not
// overlap.
repeated EnumReservedRange reserved_range = 4;
// Reserved enum value names, which may not be reused. A given name may only
// be reserved once.
repeated string reserved_name = 5;
}
// Describes a value within an enum.
message EnumValueDescriptorProto {
optional string name = 1;
optional int32 number = 2;
optional EnumValueOptions options = 3;
}
// Describes a service.
message ServiceDescriptorProto {
optional string name = 1;
repeated MethodDescriptorProto method = 2;
optional ServiceOptions options = 3;
}
// Describes a method of a service.
message MethodDescriptorProto {
optional string name = 1;
// Input and output type names. These are resolved in the same way as
// FieldDescriptorProto.type_name, but must refer to a message type.
optional string input_type = 2;
optional string output_type = 3;
optional MethodOptions options = 4;
// Identifies if client streams multiple client messages
optional bool client_streaming = 5 [default = false];
// Identifies if server streams multiple server messages
optional bool server_streaming = 6 [default = false];
}
// ===================================================================
// Options
// Each of the definitions above may have "options" attached. These are
// just annotations which may cause code to be generated slightly differently
// or may contain hints for code that manipulates protocol messages.
//
// Clients may define custom options as extensions of the *Options messages.
// These extensions may not yet be known at parsing time, so the parser cannot
// store the values in them. Instead it stores them in a field in the *Options
// message called uninterpreted_option. This field must have the same name
// across all *Options messages. We then use this field to populate the
// extensions when we build a descriptor, at which point all protos have been
// parsed and so all extensions are known.
//
// Extension numbers for custom options may be chosen as follows:
// * For options which will only be used within a single application or
// organization, or for experimental options, use field numbers 50000
// through 99999. It is up to you to ensure that you do not use the
// same number for multiple options.
// * For options which will be published and used publicly by multiple
// independent entities, e-mail protobuf-global-extension-registry@google.com
// to reserve extension numbers. Simply provide your project name (e.g.
// Objective-C plugin) and your project website (if available) -- there's no
// need to explain how you intend to use them. Usually you only need one
// extension number. You can declare multiple options with only one extension
// number by putting them in a sub-message. See the Custom Options section of
// the docs for examples:
// https://developers.google.com/protocol-buffers/docs/proto#options
// If this turns out to be popular, a web service will be set up
// to automatically assign option numbers.
message FileOptions {
// Sets the Java package where classes generated from this .proto will be
// placed. By default, the proto package is used, but this is often
// inappropriate because proto packages do not normally start with backwards
// domain names.
optional string java_package = 1;
// Controls the name of the wrapper Java class generated for the .proto file.
// That class will always contain the .proto file's getDescriptor() method as
// well as any top-level extensions defined in the .proto file.
// If java_multiple_files is disabled, then all the other classes from the
// .proto file will be nested inside the single wrapper outer class.
optional string java_outer_classname = 8;
// If enabled, then the Java code generator will generate a separate .java
// file for each top-level message, enum, and service defined in the .proto
// file. Thus, these types will *not* be nested inside the wrapper class
// named by java_outer_classname. However, the wrapper class will still be
// generated to contain the file's getDescriptor() method as well as any
// top-level extensions defined in the file.
optional bool java_multiple_files = 10 [default = false];
// This option does nothing.
optional bool java_generate_equals_and_hash = 20 [deprecated=true];
// If set true, then the Java2 code generator will generate code that
// throws an exception whenever an attempt is made to assign a non-UTF-8
// byte sequence to a string field.
// Message reflection will do the same.
// However, an extension field still accepts non-UTF-8 byte sequences.
// This option has no effect on when used with the lite runtime.
optional bool java_string_check_utf8 = 27 [default = false];
// Generated classes can be optimized for speed or code size.
enum OptimizeMode {
SPEED = 1; // Generate complete code for parsing, serialization,
// etc.
CODE_SIZE = 2; // Use ReflectionOps to implement these methods.
LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
}
optional OptimizeMode optimize_for = 9 [default = SPEED];
// Sets the Go package where structs generated from this .proto will be
// placed. If omitted, the Go package will be derived from the following:
// - The basename of the package import path, if provided.
// - Otherwise, the package statement in the .proto file, if present.
// - Otherwise, the basename of the .proto file, without extension.
optional string go_package = 11;
// Should generic services be generated in each language? "Generic" services
// are not specific to any particular RPC system. They are generated by the
// main code generators in each language (without additional plugins).
// Generic services were the only kind of service generation supported by
// early versions of google.protobuf.
//
// Generic services are now considered deprecated in favor of using plugins
// that generate code specific to your particular RPC system. Therefore,
// these default to false. Old code which depends on generic services should
// explicitly set them to true.
optional bool cc_generic_services = 16 [default = false];
optional bool java_generic_services = 17 [default = false];
optional bool py_generic_services = 18 [default = false];
optional bool php_generic_services = 42 [default = false];
// Is this file deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for everything in the file, or it will be completely ignored; in the very
// least, this is a formalization for deprecating files.
optional bool deprecated = 23 [default = false];
// Enables the use of arenas for the proto messages in this file. This applies
// only to generated classes for C++.
optional bool cc_enable_arenas = 31 [default = true];
// Sets the objective c class prefix which is prepended to all objective c
// generated classes from this .proto. There is no default.
optional string objc_class_prefix = 36;
// Namespace for generated classes; defaults to the package.
optional string csharp_namespace = 37;
// By default Swift generators will take the proto package and CamelCase it
// replacing '.' with underscore and use that to prefix the types/symbols
// defined. When this options is provided, they will use this value instead
// to prefix the types/symbols defined.
optional string swift_prefix = 39;
// Sets the php class prefix which is prepended to all php generated classes
// from this .proto. Default is empty.
optional string php_class_prefix = 40;
// Use this option to change the namespace of php generated classes. Default
// is empty. When this option is empty, the package name will be used for
// determining the namespace.
optional string php_namespace = 41;
// Use this option to change the namespace of php generated metadata classes.
// Default is empty. When this option is empty, the proto file name will be
// used for determining the namespace.
optional string php_metadata_namespace = 44;
// Use this option to change the package of ruby generated classes. Default
// is empty. When this option is not set, the package name will be used for
// determining the ruby package.
optional string ruby_package = 45;
// The parser stores options it doesn't recognize here.
// See the documentation for the "Options" section above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message.
// See the documentation for the "Options" section above.
extensions 1000 to max;
reserved 38;
}
message MessageOptions {
// Set true to use the old proto1 MessageSet wire format for extensions.
// This is provided for backwards-compatibility with the MessageSet wire
// format. You should not use this for any other reason: It's less
// efficient, has fewer features, and is more complicated.
//
// The message must be defined exactly as follows:
// message Foo {
// option message_set_wire_format = true;
// extensions 4 to max;
// }
// Note that the message cannot have any defined fields; MessageSets only
// have extensions.
//
// All extensions of your type must be singular messages; e.g. they cannot
// be int32s, enums, or repeated messages.
//
// Because this is an option, the above two restrictions are not enforced by
// the protocol compiler.
optional bool message_set_wire_format = 1 [default = false];
// Disables the generation of the standard "descriptor()" accessor, which can
// conflict with a field of the same name. This is meant to make migration
// from proto1 easier; new code should avoid fields named "descriptor".
optional bool no_standard_descriptor_accessor = 2 [default = false];
// Is this message deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the message, or it will be completely ignored; in the very least,
// this is a formalization for deprecating messages.
optional bool deprecated = 3 [default = false];
reserved 4, 5, 6;
// Whether the message is an automatically generated map entry type for the
// maps field.
//
// For maps fields:
// map<KeyType, ValueType> map_field = 1;
// The parsed descriptor looks like:
// message MapFieldEntry {
// option map_entry = true;
// optional KeyType key = 1;
// optional ValueType value = 2;
// }
// repeated MapFieldEntry map_field = 1;
//
// Implementations may choose not to generate the map_entry=true message, but
// use a native map in the target language to hold the keys and values.
// The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
//
// NOTE: Do not set the option in .proto files. Always use the maps syntax
// instead. The option should only be implicitly set by the proto compiler
// parser.
optional bool map_entry = 7;
reserved 8; // javalite_serializable
reserved 9; // javanano_as_lite
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message FieldOptions {
// The ctype option instructs the C++ code generator to use a different
// representation of the field than it normally would. See the specific
// options below. This option is not yet implemented in the open source
// release -- sorry, we'll try to include it in a future version!
optional CType ctype = 1 [default = STRING];
enum CType {
// Default mode.
STRING = 0;
CORD = 1;
STRING_PIECE = 2;
}
// The packed option can be enabled for repeated primitive fields to enable
// a more efficient representation on the wire. Rather than repeatedly
// writing the tag and type for each element, the entire array is encoded as
// a single length-delimited blob. In proto3, only explicit setting it to
// false will avoid using packed encoding.
optional bool packed = 2;
// The jstype option determines the JavaScript type used for values of the
// field. The option is permitted only for 64 bit integral and fixed types
// (int64, uint64, sint64, fixed64, sfixed64). A field with jstype JS_STRING
// is represented as JavaScript string, which avoids loss of precision that
// can happen when a large value is converted to a floating point JavaScript.
// Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
// use the JavaScript "number" type. The behavior of the default option
// JS_NORMAL is implementation dependent.
//
// This option is an enum to permit additional types to be added, e.g.
// goog.math.Integer.
optional JSType jstype = 6 [default = JS_NORMAL];
enum JSType {
// Use the default type.
JS_NORMAL = 0;
// Use JavaScript strings.
JS_STRING = 1;
// Use JavaScript numbers.
JS_NUMBER = 2;
}
// Should this field be parsed lazily? Lazy applies only to message-type
// fields. It means that when the outer message is initially parsed, the
// inner message's contents will not be parsed but instead stored in encoded
// form. The inner message will actually be parsed when it is first accessed.
//
// This is only a hint. Implementations are free to choose whether to use
// eager or lazy parsing regardless of the value of this option. However,
// setting this option true suggests that the protocol author believes that
// using lazy parsing on this field is worth the additional bookkeeping
// overhead typically needed to implement it.
//
// This option does not affect the public interface of any generated code;
// all method signatures remain the same. Furthermore, thread-safety of the
// interface is not affected by this option; const methods remain safe to
// call from multiple threads concurrently, while non-const methods continue
// to require exclusive access.
//
//
// Note that implementations may choose not to check required fields within
// a lazy sub-message. That is, calling IsInitialized() on the outer message
// may return true even if the inner message has missing required fields.
// This is necessary because otherwise the inner message would have to be
// parsed in order to perform the check, defeating the purpose of lazy
// parsing. An implementation which chooses not to check required fields
// must be consistent about it. That is, for any particular sub-message, the
// implementation must either *always* check its required fields, or *never*
// check its required fields, regardless of whether or not the message has
// been parsed.
optional bool lazy = 5 [default = false];
// Is this field deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for accessors, or it will be completely ignored; in the very least, this
// is a formalization for deprecating fields.
optional bool deprecated = 3 [default = false];
// For Google-internal migration only. Do not use.
optional bool weak = 10 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
reserved 4; // removed jtype
}
message OneofOptions {
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message EnumOptions {
// Set this option to true to allow mapping different tag names to the same
// value.
optional bool allow_alias = 2;
// Is this enum deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the enum, or it will be completely ignored; in the very least, this
// is a formalization for deprecating enums.
optional bool deprecated = 3 [default = false];
reserved 5; // javanano_as_lite
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message EnumValueOptions {
// Is this enum value deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the enum value, or it will be completely ignored; in the very least,
// this is a formalization for deprecating enum values.
optional bool deprecated = 1 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message ServiceOptions {
// Note: Field numbers 1 through 32 are reserved for Google's internal RPC
// framework. We apologize for hoarding these numbers to ourselves, but
// we were already using them long before we decided to release Protocol
// Buffers.
// Is this service deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the service, or it will be completely ignored; in the very least,
// this is a formalization for deprecating services.
optional bool deprecated = 33 [default = false];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
message MethodOptions {
// Note: Field numbers 1 through 32 are reserved for Google's internal RPC
// framework. We apologize for hoarding these numbers to ourselves, but
// we were already using them long before we decided to release Protocol
// Buffers.
// Is this method deprecated?
// Depending on the target platform, this can emit Deprecated annotations
// for the method, or it will be completely ignored; in the very least,
// this is a formalization for deprecating methods.
optional bool deprecated = 33 [default = false];
// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
// or neither? HTTP based RPC implementation may choose GET verb for safe
// methods, and PUT verb for idempotent methods instead of the default POST.
enum IdempotencyLevel {
IDEMPOTENCY_UNKNOWN = 0;
NO_SIDE_EFFECTS = 1; // implies idempotent
IDEMPOTENT = 2; // idempotent, but may have side effects
}
optional IdempotencyLevel idempotency_level = 34
[default = IDEMPOTENCY_UNKNOWN];
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;
// Clients can define custom options in extensions of this message. See above.
extensions 1000 to max;
}
// A message representing a option the parser does not recognize. This only
// appears in options protos created by the compiler::Parser class.
// DescriptorPool resolves these when building Descriptor objects. Therefore,
// options protos in descriptor objects (e.g. returned by Descriptor::options(),
// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
// in them.
message UninterpretedOption {
// The name of the uninterpreted option. Each string represents a segment in
// a dot-separated name. is_extension is true iff a segment represents an
// extension (denoted with parentheses in options specs in .proto files).
// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
// "foo.(bar.baz).qux".
message NamePart {
required string name_part = 1;
required bool is_extension = 2;
}
repeated NamePart name = 2;
// The value of the uninterpreted option, in whatever type the tokenizer
// identified it as during parsing. Exactly one of these should be set.
optional string identifier_value = 3;
optional uint64 positive_int_value = 4;
optional int64 negative_int_value = 5;
optional double double_value = 6;
optional bytes string_value = 7;
optional string aggregate_value = 8;
}
// ===================================================================
// Optional source code info
// Encapsulates information about the original source file from which a
// FileDescriptorProto was generated.
message SourceCodeInfo {
// A Location identifies a piece of source code in a .proto file which
// corresponds to a particular definition. This information is intended
// to be useful to IDEs, code indexers, documentation generators, and similar
// tools.
//
// For example, say we have a file like:
// message Foo {
// optional string foo = 1;
// }
// Let's look at just the field definition:
// optional string foo = 1;
// ^ ^^ ^^ ^ ^^^
// a bc de f ghi
// We have the following locations:
// span path represents
// [a,i) [ 4, 0, 2, 0 ] The whole field definition.
// [a,b) [ 4, 0, 2, 0, 4 ] The label (optional).
// [c,d) [ 4, 0, 2, 0, 5 ] The type (string).
// [e,f) [ 4, 0, 2, 0, 1 ] The name (foo).
// [g,h) [ 4, 0, 2, 0, 3 ] The number (1).
//
// Notes:
// - A location may refer to a repeated field itself (i.e. not to any
// particular index within it). This is used whenever a set of elements are
// logically enclosed in a single code segment. For example, an entire
// extend block (possibly containing multiple extension definitions) will
// have an outer location whose path refers to the "extensions" repeated
// field without an index.
// - Multiple locations may have the same path. This happens when a single
// logical declaration is spread out across multiple places. The most
// obvious example is the "extend" block again -- there may be multiple
// extend blocks in the same scope, each of which will have the same path.
// - A location's span is not always a subset of its parent's span. For
// example, the "extendee" of an extension declaration appears at the
// beginning of the "extend" block and is shared by all extensions within
// the block.
// - Just because a location's span is a subset of some other location's span
// does not mean that it is a descendant. For example, a "group" defines
// both a type and a field in a single declaration. Thus, the locations
// corresponding to the type and field and their components will overlap.
// - Code which tries to interpret locations should probably be designed to
// ignore those that it doesn't understand, as more types of locations could
// be recorded in the future.
repeated Location location = 1;
message Location {
// Identifies which part of the FileDescriptorProto was defined at this
// location.
//
// Each element is a field number or an index. They form a path from
// the root FileDescriptorProto to the place where the definition. For
// example, this path:
// [ 4, 3, 2, 7, 1 ]
// refers to:
// file.message_type(3) // 4, 3
// .field(7) // 2, 7
// .name() // 1
// This is because FileDescriptorProto.message_type has field number 4:
// repeated DescriptorProto message_type = 4;
// and DescriptorProto.field has field number 2:
// repeated FieldDescriptorProto field = 2;
// and FieldDescriptorProto.name has field number 1:
// optional string name = 1;
//
// Thus, the above path gives the location of a field name. If we removed
// the last element:
// [ 4, 3, 2, 7 ]
// this path refers to the whole field declaration (from the beginning
// of the label to the terminating semicolon).
repeated int32 path = 1 [packed = true];
// Always has exactly three or four elements: start line, start column,
// end line (optional, otherwise assumed same as start line), end column.
// These are packed into a single field for efficiency. Note that line
// and column numbers are zero-based -- typically you will want to add
// 1 to each before displaying to a user.
repeated int32 span = 2 [packed = true];
// If this SourceCodeInfo represents a complete declaration, these are any
// comments appearing before and after the declaration which appear to be
// attached to the declaration.
//
// A series of line comments appearing on consecutive lines, with no other
// tokens appearing on those lines, will be treated as a single comment.
//
// leading_detached_comments will keep paragraphs of comments that appear
// before (but not connected to) the current element. Each paragraph,
// separated by empty lines, will be one comment element in the repeated
// field.
//
// Only the comment content is provided; comment markers (e.g. //) are
// stripped out. For block comments, leading whitespace and an asterisk
// will be stripped from the beginning of each line other than the first.
// Newlines are included in the output.
//
// Examples:
//
// optional int32 foo = 1; // Comment attached to foo.
// // Comment attached to bar.
// optional int32 bar = 2;
//
// optional string baz = 3;
// // Comment attached to baz.
// // Another line attached to baz.
//
// // Comment attached to qux.
// //
// // Another line attached to qux.
// optional double qux = 4;
//
// // Detached comment for corge. This is not leading or trailing comments
// // to qux or corge because there are blank lines separating it from
// // both.
//
// // Detached comment for corge paragraph 2.
//
// optional string corge = 5;
// /* Block comment attached
// * to corge. Leading asterisks
// * will be removed. */
// /* Block comment attached to
// * grault. */
// optional int32 grault = 6;
//
// // ignored detached comments.
optional string leading_comments = 3;
optional string trailing_comments = 4;
repeated string leading_detached_comments = 6;
}
}
// Describes the relationship between generated code and its original source
// file. A GeneratedCodeInfo message is associated with only one generated
// source file, but may contain references to different source .proto files.
message GeneratedCodeInfo {
// An Annotation connects some span of text in generated code to an element
// of its generating .proto file.
repeated Annotation annotation = 1;
message Annotation {
// Identifies the element in the original source .proto file. This field
// is formatted the same as SourceCodeInfo.Location.path.
repeated int32 path = 1 [packed = true];
// Identifies the filesystem path to the original source .proto.
optional string source_file = 2;
// Identifies the starting offset in bytes in the generated code
// that relates to the identified object.
optional int32 begin = 3;
// Identifies the ending offset in bytes in the generated code that
// relates to the identified offset. The end offset should be one past
// the last relevant byte (so the length of the text = end - begin).
optional int32 end = 4;
}
}

View File

@ -0,0 +1,116 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/durationpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "DurationProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// A Duration represents a signed, fixed-length span of time represented
// as a count of seconds and fractions of seconds at nanosecond
// resolution. It is independent of any calendar and concepts like "day"
// or "month". It is related to Timestamp in that the difference between
// two Timestamp values is a Duration and it can be added or subtracted
// from a Timestamp. Range is approximately +-10,000 years.
//
// # Examples
//
// Example 1: Compute Duration from two Timestamps in pseudo code.
//
// Timestamp start = ...;
// Timestamp end = ...;
// Duration duration = ...;
//
// duration.seconds = end.seconds - start.seconds;
// duration.nanos = end.nanos - start.nanos;
//
// if (duration.seconds < 0 && duration.nanos > 0) {
// duration.seconds += 1;
// duration.nanos -= 1000000000;
// } else if (duration.seconds > 0 && duration.nanos < 0) {
// duration.seconds -= 1;
// duration.nanos += 1000000000;
// }
//
// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
//
// Timestamp start = ...;
// Duration duration = ...;
// Timestamp end = ...;
//
// end.seconds = start.seconds + duration.seconds;
// end.nanos = start.nanos + duration.nanos;
//
// if (end.nanos < 0) {
// end.seconds -= 1;
// end.nanos += 1000000000;
// } else if (end.nanos >= 1000000000) {
// end.seconds += 1;
// end.nanos -= 1000000000;
// }
//
// Example 3: Compute Duration from datetime.timedelta in Python.
//
// td = datetime.timedelta(days=3, minutes=10)
// duration = Duration()
// duration.FromTimedelta(td)
//
// # JSON Mapping
//
// In JSON format, the Duration type is encoded as a string rather than an
// object, where the string ends in the suffix "s" (indicating seconds) and
// is preceded by the number of seconds, with nanoseconds expressed as
// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
// microsecond should be expressed in JSON format as "3.000001s".
//
//
message Duration {
// Signed seconds of the span of time. Must be from -315,576,000,000
// to +315,576,000,000 inclusive. Note: these bounds are computed from:
// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
int64 seconds = 1;
// Signed fractions of a second at nanosecond resolution of the span
// of time. Durations less than one second are represented with a 0
// `seconds` field and a positive or negative `nanos` field. For durations
// of one second or more, a non-zero value for the `nanos` field must be
// of the same sign as the `seconds` field. Must be from -999,999,999
// to +999,999,999 inclusive.
int32 nanos = 2;
}

View File

@ -0,0 +1,52 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option go_package = "google.golang.org/protobuf/types/known/emptypb";
option java_package = "com.google.protobuf";
option java_outer_classname = "EmptyProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option cc_enable_arenas = true;
// A generic empty message that you can re-use to avoid defining duplicated
// empty messages in your APIs. A typical example is to use it as the request
// or the response type of an API method. For instance:
//
// service Foo {
// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
// }
//
// The JSON representation for `Empty` is empty JSON object `{}`.
message Empty {}

View File

@ -0,0 +1,245 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "FieldMaskProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/fieldmaskpb";
option cc_enable_arenas = true;
// `FieldMask` represents a set of symbolic field paths, for example:
//
// paths: "f.a"
// paths: "f.b.d"
//
// Here `f` represents a field in some root message, `a` and `b`
// fields in the message found in `f`, and `d` a field found in the
// message in `f.b`.
//
// Field masks are used to specify a subset of fields that should be
// returned by a get operation or modified by an update operation.
// Field masks also have a custom JSON encoding (see below).
//
// # Field Masks in Projections
//
// When used in the context of a projection, a response message or
// sub-message is filtered by the API to only contain those fields as
// specified in the mask. For example, if the mask in the previous
// example is applied to a response message as follows:
//
// f {
// a : 22
// b {
// d : 1
// x : 2
// }
// y : 13
// }
// z: 8
//
// The result will not contain specific values for fields x,y and z
// (their value will be set to the default, and omitted in proto text
// output):
//
//
// f {
// a : 22
// b {
// d : 1
// }
// }
//
// A repeated field is not allowed except at the last position of a
// paths string.
//
// If a FieldMask object is not present in a get operation, the
// operation applies to all fields (as if a FieldMask of all fields
// had been specified).
//
// Note that a field mask does not necessarily apply to the
// top-level response message. In case of a REST get operation, the
// field mask applies directly to the response, but in case of a REST
// list operation, the mask instead applies to each individual message
// in the returned resource list. In case of a REST custom method,
// other definitions may be used. Where the mask applies will be
// clearly documented together with its declaration in the API. In
// any case, the effect on the returned resource/resources is required
// behavior for APIs.
//
// # Field Masks in Update Operations
//
// A field mask in update operations specifies which fields of the
// targeted resource are going to be updated. The API is required
// to only change the values of the fields as specified in the mask
// and leave the others untouched. If a resource is passed in to
// describe the updated values, the API ignores the values of all
// fields not covered by the mask.
//
// If a repeated field is specified for an update operation, new values will
// be appended to the existing repeated field in the target resource. Note that
// a repeated field is only allowed in the last position of a `paths` string.
//
// If a sub-message is specified in the last position of the field mask for an
// update operation, then new value will be merged into the existing sub-message
// in the target resource.
//
// For example, given the target message:
//
// f {
// b {
// d: 1
// x: 2
// }
// c: [1]
// }
//
// And an update message:
//
// f {
// b {
// d: 10
// }
// c: [2]
// }
//
// then if the field mask is:
//
// paths: ["f.b", "f.c"]
//
// then the result will be:
//
// f {
// b {
// d: 10
// x: 2
// }
// c: [1, 2]
// }
//
// An implementation may provide options to override this default behavior for
// repeated and message fields.
//
// In order to reset a field's value to the default, the field must
// be in the mask and set to the default value in the provided resource.
// Hence, in order to reset all fields of a resource, provide a default
// instance of the resource and set all fields in the mask, or do
// not provide a mask as described below.
//
// If a field mask is not present on update, the operation applies to
// all fields (as if a field mask of all fields has been specified).
// Note that in the presence of schema evolution, this may mean that
// fields the client does not know and has therefore not filled into
// the request will be reset to their default. If this is unwanted
// behavior, a specific service may require a client to always specify
// a field mask, producing an error if not.
//
// As with get operations, the location of the resource which
// describes the updated values in the request message depends on the
// operation kind. In any case, the effect of the field mask is
// required to be honored by the API.
//
// ## Considerations for HTTP REST
//
// The HTTP kind of an update operation which uses a field mask must
// be set to PATCH instead of PUT in order to satisfy HTTP semantics
// (PUT must only be used for full updates).
//
// # JSON Encoding of Field Masks
//
// In JSON, a field mask is encoded as a single string where paths are
// separated by a comma. Fields name in each path are converted
// to/from lower-camel naming conventions.
//
// As an example, consider the following message declarations:
//
// message Profile {
// User user = 1;
// Photo photo = 2;
// }
// message User {
// string display_name = 1;
// string address = 2;
// }
//
// In proto a field mask for `Profile` may look as such:
//
// mask {
// paths: "user.display_name"
// paths: "photo"
// }
//
// In JSON, the same mask is represented as below:
//
// {
// mask: "user.displayName,photo"
// }
//
// # Field Masks and Oneof Fields
//
// Field masks treat fields in oneofs just as regular fields. Consider the
// following message:
//
// message SampleMessage {
// oneof test_oneof {
// string name = 4;
// SubMessage sub_message = 9;
// }
// }
//
// The field mask can be:
//
// mask {
// paths: "name"
// }
//
// Or:
//
// mask {
// paths: "sub_message"
// }
//
// Note that oneof type names ("test_oneof" in this case) cannot be used in
// paths.
//
// ## Field Mask Verification
//
// The implementation of any API method which has a FieldMask type field in the
// request should verify the included field paths, and return an
// `INVALID_ARGUMENT` error if any path is unmappable.
message FieldMask {
// The set of field mask paths.
repeated string paths = 1;
}

View File

@ -0,0 +1,48 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option java_package = "com.google.protobuf";
option java_outer_classname = "SourceContextProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/sourcecontextpb";
// `SourceContext` represents information about the source of a
// protobuf element, like the file in which it is defined.
message SourceContext {
// The path-qualified name of the .proto file that contained the associated
// protobuf element. For example: `"google/protobuf/source_context.proto"`.
string file_name = 1;
}

View File

@ -0,0 +1,95 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/structpb";
option java_package = "com.google.protobuf";
option java_outer_classname = "StructProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// `Struct` represents a structured data value, consisting of fields
// which map to dynamically typed values. In some languages, `Struct`
// might be supported by a native representation. For example, in
// scripting languages like JS a struct is represented as an
// object. The details of that representation are described together
// with the proto support for the language.
//
// The JSON representation for `Struct` is JSON object.
message Struct {
// Unordered map of dynamically typed values.
map<string, Value> fields = 1;
}
// `Value` represents a dynamically typed value which can be either
// null, a number, a string, a boolean, a recursive struct value, or a
// list of values. A producer of value is expected to set one of these
// variants. Absence of any variant indicates an error.
//
// The JSON representation for `Value` is JSON value.
message Value {
// The kind of value.
oneof kind {
// Represents a null value.
NullValue null_value = 1;
// Represents a double value.
double number_value = 2;
// Represents a string value.
string string_value = 3;
// Represents a boolean value.
bool bool_value = 4;
// Represents a structured value.
Struct struct_value = 5;
// Represents a repeated `Value`.
ListValue list_value = 6;
}
}
// `NullValue` is a singleton enumeration to represent the null value for the
// `Value` type union.
//
// The JSON representation for `NullValue` is JSON `null`.
enum NullValue {
// Null value.
NULL_VALUE = 0;
}
// `ListValue` is a wrapper around a repeated field of values.
//
// The JSON representation for `ListValue` is JSON array.
message ListValue {
// Repeated field of dynamically typed values.
repeated Value values = 1;
}

View File

@ -0,0 +1,147 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/timestamppb";
option java_package = "com.google.protobuf";
option java_outer_classname = "TimestampProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// A Timestamp represents a point in time independent of any time zone or local
// calendar, encoded as a count of seconds and fractions of seconds at
// nanosecond resolution. The count is relative to an epoch at UTC midnight on
// January 1, 1970, in the proleptic Gregorian calendar which extends the
// Gregorian calendar backwards to year one.
//
// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
// second table is needed for interpretation, using a [24-hour linear
// smear](https://developers.google.com/time/smear).
//
// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
// restricting to that range, we ensure that we can convert to and from [RFC
// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
//
// # Examples
//
// Example 1: Compute Timestamp from POSIX `time()`.
//
// Timestamp timestamp;
// timestamp.set_seconds(time(NULL));
// timestamp.set_nanos(0);
//
// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
//
// struct timeval tv;
// gettimeofday(&tv, NULL);
//
// Timestamp timestamp;
// timestamp.set_seconds(tv.tv_sec);
// timestamp.set_nanos(tv.tv_usec * 1000);
//
// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
//
// FILETIME ft;
// GetSystemTimeAsFileTime(&ft);
// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
//
// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
// Timestamp timestamp;
// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
//
// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
//
// long millis = System.currentTimeMillis();
//
// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
// .setNanos((int) ((millis % 1000) * 1000000)).build();
//
//
// Example 5: Compute Timestamp from Java `Instant.now()`.
//
// Instant now = Instant.now();
//
// Timestamp timestamp =
// Timestamp.newBuilder().setSeconds(now.getEpochSecond())
// .setNanos(now.getNano()).build();
//
//
// Example 6: Compute Timestamp from current time in Python.
//
// timestamp = Timestamp()
// timestamp.GetCurrentTime()
//
// # JSON Mapping
//
// In JSON format, the Timestamp type is encoded as a string in the
// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
// where {year} is always expressed using four digits while {month}, {day},
// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
// is required. A proto3 JSON serializer should always use UTC (as indicated by
// "Z") when printing the Timestamp type and a proto3 JSON parser should be
// able to accept both UTC and other timezones (as indicated by an offset).
//
// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
// 01:30 UTC on January 15, 2017.
//
// In JavaScript, one can convert a Date object to this format using the
// standard
// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
// method. In Python, a standard `datetime.datetime` object can be converted
// to this format using
// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
// the Joda Time's [`ISODateTimeFormat.dateTime()`](
// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
// ) to obtain a formatter capable of generating timestamps in this format.
//
//
message Timestamp {
// Represents seconds of UTC time since Unix epoch
// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
// 9999-12-31T23:59:59Z inclusive.
int64 seconds = 1;
// Non-negative fractions of a second at nanosecond resolution. Negative
// second values with fractions must still have non-negative nanos values
// that count forward in time. Must be from 0 to 999,999,999
// inclusive.
int32 nanos = 2;
}

View File

@ -0,0 +1,187 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
syntax = "proto3";
package google.protobuf;
import "google/protobuf/any.proto";
import "google/protobuf/source_context.proto";
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option java_package = "com.google.protobuf";
option java_outer_classname = "TypeProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
option go_package = "google.golang.org/protobuf/types/known/typepb";
// A protocol buffer message type.
message Type {
// The fully qualified message name.
string name = 1;
// The list of fields.
repeated Field fields = 2;
// The list of types appearing in `oneof` definitions in this type.
repeated string oneofs = 3;
// The protocol buffer options.
repeated Option options = 4;
// The source context.
SourceContext source_context = 5;
// The source syntax.
Syntax syntax = 6;
}
// A single field of a message type.
message Field {
// Basic field types.
enum Kind {
// Field type unknown.
TYPE_UNKNOWN = 0;
// Field type double.
TYPE_DOUBLE = 1;
// Field type float.
TYPE_FLOAT = 2;
// Field type int64.
TYPE_INT64 = 3;
// Field type uint64.
TYPE_UINT64 = 4;
// Field type int32.
TYPE_INT32 = 5;
// Field type fixed64.
TYPE_FIXED64 = 6;
// Field type fixed32.
TYPE_FIXED32 = 7;
// Field type bool.
TYPE_BOOL = 8;
// Field type string.
TYPE_STRING = 9;
// Field type group. Proto2 syntax only, and deprecated.
TYPE_GROUP = 10;
// Field type message.
TYPE_MESSAGE = 11;
// Field type bytes.
TYPE_BYTES = 12;
// Field type uint32.
TYPE_UINT32 = 13;
// Field type enum.
TYPE_ENUM = 14;
// Field type sfixed32.
TYPE_SFIXED32 = 15;
// Field type sfixed64.
TYPE_SFIXED64 = 16;
// Field type sint32.
TYPE_SINT32 = 17;
// Field type sint64.
TYPE_SINT64 = 18;
}
// Whether a field is optional, required, or repeated.
enum Cardinality {
// For fields with unknown cardinality.
CARDINALITY_UNKNOWN = 0;
// For optional fields.
CARDINALITY_OPTIONAL = 1;
// For required fields. Proto2 syntax only.
CARDINALITY_REQUIRED = 2;
// For repeated fields.
CARDINALITY_REPEATED = 3;
}
// The field type.
Kind kind = 1;
// The field cardinality.
Cardinality cardinality = 2;
// The field number.
int32 number = 3;
// The field name.
string name = 4;
// The field type URL, without the scheme, for message or enumeration
// types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
string type_url = 6;
// The index of the field type in `Type.oneofs`, for message or enumeration
// types. The first type has index 1; zero means the type is not in the list.
int32 oneof_index = 7;
// Whether to use alternative packed wire representation.
bool packed = 8;
// The protocol buffer options.
repeated Option options = 9;
// The field JSON name.
string json_name = 10;
// The string value of the default value of this field. Proto2 syntax only.
string default_value = 11;
}
// Enum type definition.
message Enum {
// Enum type name.
string name = 1;
// Enum value definitions.
repeated EnumValue enumvalue = 2;
// Protocol buffer options.
repeated Option options = 3;
// The source context.
SourceContext source_context = 4;
// The source syntax.
Syntax syntax = 5;
}
// Enum value definition.
message EnumValue {
// Enum value name.
string name = 1;
// Enum value number.
int32 number = 2;
// Protocol buffer options.
repeated Option options = 3;
}
// A protocol buffer option, which can be attached to a message, field,
// enumeration, etc.
message Option {
// The option's name. For protobuf built-in options (options defined in
// descriptor.proto), this is the short name. For example, `"map_entry"`.
// For custom options, it should be the fully-qualified name. For example,
// `"google.api.http"`.
string name = 1;
// The option's value packed in an Any message. If the value is a primitive,
// the corresponding wrapper type defined in google/protobuf/wrappers.proto
// should be used. If the value is an enum, it should be stored as an int32
// value using the google.protobuf.Int32Value type.
Any value = 2;
}
// The syntax in which a protocol buffer element is defined.
enum Syntax {
// Syntax `proto2`.
SYNTAX_PROTO2 = 0;
// Syntax `proto3`.
SYNTAX_PROTO3 = 1;
}

View File

@ -0,0 +1,123 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Wrappers for primitive (non-message) types. These types are useful
// for embedding primitives in the `google.protobuf.Any` type and for places
// where we need to distinguish between the absence of a primitive
// typed field and its default value.
//
// These wrappers have no meaningful use within repeated fields as they lack
// the ability to detect presence on individual elements.
// These wrappers have no meaningful use within a map or a oneof since
// individual entries of a map or fields of a oneof can already detect presence.
syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
option cc_enable_arenas = true;
option go_package = "google.golang.org/protobuf/types/known/wrapperspb";
option java_package = "com.google.protobuf";
option java_outer_classname = "WrappersProto";
option java_multiple_files = true;
option objc_class_prefix = "GPB";
// Wrapper message for `double`.
//
// The JSON representation for `DoubleValue` is JSON number.
message DoubleValue {
// The double value.
double value = 1;
}
// Wrapper message for `float`.
//
// The JSON representation for `FloatValue` is JSON number.
message FloatValue {
// The float value.
float value = 1;
}
// Wrapper message for `int64`.
//
// The JSON representation for `Int64Value` is JSON string.
message Int64Value {
// The int64 value.
int64 value = 1;
}
// Wrapper message for `uint64`.
//
// The JSON representation for `UInt64Value` is JSON string.
message UInt64Value {
// The uint64 value.
uint64 value = 1;
}
// Wrapper message for `int32`.
//
// The JSON representation for `Int32Value` is JSON number.
message Int32Value {
// The int32 value.
int32 value = 1;
}
// Wrapper message for `uint32`.
//
// The JSON representation for `UInt32Value` is JSON number.
message UInt32Value {
// The uint32 value.
uint32 value = 1;
}
// Wrapper message for `bool`.
//
// The JSON representation for `BoolValue` is JSON `true` and `false`.
message BoolValue {
// The bool value.
bool value = 1;
}
// Wrapper message for `string`.
//
// The JSON representation for `StringValue` is JSON string.
message StringValue {
// The string value.
string value = 1;
}
// Wrapper message for `bytes`.
//
// The JSON representation for `BytesValue` is JSON string.
message BytesValue {
// The bytes value.
bytes value = 1;
}

View File

@ -0,0 +1,15 @@
Protocol Buffers - Google's data interchange format
Copyright 2008 Google Inc.
https://developers.google.com/protocol-buffers/
This package contains a precompiled binary version of the protocol buffer
compiler (protoc). This binary is intended for users who want to use Protocol
Buffers in languages other than C++ but do not want to compile protoc
themselves. To install, simply place this binary somewhere in your PATH.
If you intend to use the included well known types then don't forget to
copy the contents of the 'include' directory somewhere as well, for example
into '/usr/local/include/'.
Please refer to our official github site for more installation instructions:
https://github.com/protocolbuffers/protobuf

BIN
bin/protoc-gen-go Normal file

Binary file not shown.

BIN
bin/protoc-gen-go.exe Normal file

Binary file not shown.

21
bin/startup.bat Normal file
View File

@ -0,0 +1,21 @@
set GODEBUG=gctrace=1
cd dbproxy
start dbproxy.exe
cd ../mgrsrv
start mgrsrv.exe
cd ../gatesrv
start gatesrv.exe
cd ../worldsrv
start worldsrv.exe
cd ../gamesrv
start gamesrv.exe
cd ../ranksrv
start ranksrv.exe
cd ../robot
start robot.exe

View File

@ -1,13 +0,0 @@
@echo off
echo Build %1 task!
cd %1
go fmt
go vet
go build -v
echo errorlevel:%errorlevel%
if "%errorlevel%"=="0" exit
if not "%errorlevel%"=="0" echo %1 build failed!
pause
exit

View File

@ -1,30 +1,5 @@
go env -w GO111MODULE=off
@echo "go fmt common..."
cd common
go fmt
@echo off
@echo "go fmt api3th..."
cd ../api3th
go fmt
@echo "go fmt model..."
cd ../model
go fmt
@echo "go fmt webapi..."
cd ../webapi
go fmt
@echo "go fmt lib complete!"
cd ..
start build-sub.bat dbproxy
start build-sub.bat mgrsrv
start build-sub.bat gatesrv
start build-sub.bat worldsrv
start build-sub.bat gamesrv
start build-sub.bat robot
start build-sub.bat ranksrv
@echo "Wait all build task complete!"
pause
for /f %%i in (programs.txt) do (
start "%%i" cmd /c "build_sub.bat %%i"
)

View File

@ -2,9 +2,4 @@ set CGO_ENABLED=0
set GOOS=linux
set GOARCH=amd64
go env -w GO111MODULE=off
build.bat
@echo "complete"
pause
call build.bat

View File

@ -1,10 +0,0 @@
set CGO_ENABLED=0
set GOOS=darwin
set GOARCH=amd64
go env -w GO111MODULE=off
build.bat
@echo "complete"
pause

11
build_sub.bat Normal file
View File

@ -0,0 +1,11 @@
@echo off
cd %1
go fmt
go vet
go build -v
if %errorlevel% neq 0 (
echo Build failed %1.
pause
)

10
clean.bat Normal file
View File

@ -0,0 +1,10 @@
@echo off
for /f "tokens=*" %%a in (programs.txt) do (
if exist "%%a\*.log" del /q "%%a\*.log"
if exist "%%a\*.log.*" del /q "%%a\*.log.*"
echo "clean logs: %%a"
)
echo "clean logs complete!"

View File

@ -1,9 +1,7 @@
TASKKILL /F /IM dbproxy.exe
TASKKILL /F /IM mgrsrv.exe
TASKKILL /F /IM gatesrv.exe
TASKKILL /F /IM worldsrv.exe
TASKKILL /F /IM gamesrv.exe
TASKKILL /F /IM robot.exe
TASKKILL /F /IM ranksrv.exe
@echo off
clrlogs.bat
for /f %%i in (programs.txt) do (
taskkill /F /IM %%i.exe
)
echo "close complete!"

View File

@ -1,14 +0,0 @@
del /F/S dbproxy\*.log
del /F/S dbproxy\*.log.*
del /F/S mgrsrv\*.log
del /F/S mgrsrv\*.log.*
del /F/S gatesrv\*.log
del /F/S gatesrv\*.log.*
del /F/S worldsrv\*.log
del /F/S worldsrv\*.log.*
del /F/S gamesrv\*.log
del /F/S gamesrv\*.log.*
del /F/S robot\*.log
del /F/S robot\*.log.*
del /F/S ranksrv\*.log
del /F/S ranksrv\*.log.*

View File

@ -1,54 +0,0 @@
package common
import (
"mongo.games.com/goserver/core/logger"
)
const (
A_USER_BLACK = 1 //增加黑名单
)
type Action struct {
ActionID int //执行id
ActionParamInt64 []int //整形参数
ActionParamFloat []float64 //浮点参数
ActionParamString []string //字符串参数
}
var ActionMgrSington = &ActionMgr{
pool: make(map[int]ActionBase),
}
func init() {
}
type ActionMgr struct {
pool map[int]ActionBase
}
func (this *ActionMgr) ActionGroup(need interface{}, action []*Action) bool {
for i := 0; i < len(action); i++ {
this.action(need, action[i])
}
return true
}
func (this *ActionMgr) action(need interface{}, action *Action) bool {
a, ok := this.pool[action.ActionID]
if !ok {
logger.Logger.Warnf("no this action %v", action.ActionID)
return false
}
return a.Action(need, action)
}
func (this *ActionMgr) Register(cid int, c ActionBase) {
this.pool[cid] = c
}
type ActionBase interface {
Action(need interface{}, action *Action) bool
}

View File

@ -1,54 +1,55 @@
package common
import (
"mongo.games.com/game/protocol/server"
"mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/module"
"mongo.games.com/goserver/core/mongo"
"mongo.games.com/goserver/core/netlib"
"mongo.games.com/game/protocol/server"
)
// GameSessState 服务状态
type GameSessState int
const (
GAME_SESS_STATE_OFF GameSessState = iota //关闭状态
GAME_SESS_STATE_ON //开启状态
GameSessStateOff GameSessState = iota //关闭状态
GameSessStateOn //开启状态
)
var ServerCtrlCallback func(int32)
var SrvIsMaintaining = true
func RegisteServerCtrlCallback(cb func(int32)) {
var ServerCtrlCallback func(msg *server.ServerCtrl)
func RegisterServerCtrlCallback(cb func(msg *server.ServerCtrl)) {
ServerCtrlCallback = cb
}
type ServerCtrlPacketFactory struct {
func init() {
netlib.Register(int(server.SSPacketID_PACKET_MS_SRVCTRL), &server.ServerCtrl{}, ServerCtrlHandler)
}
type ServerCtrlHandler struct {
}
// ServerCtrlHandler 服务器控制,通用事件
func ServerCtrlHandler(s *netlib.Session, packetid int, data interface{}) error {
logger.Logger.Infof("ServerCtrlHandler %v", data)
msg, ok := data.(*server.ServerCtrl)
if !ok {
return nil
}
switch msg.GetCtrlCode() {
case SrvCtrlCloseCode:
module.Stop()
func (this *ServerCtrlPacketFactory) CreatePacket() interface{} {
pack := &server.ServerCtrl{}
return pack
}
case SrvCtrlResetMgoSession:
mongo.ResetAllSession()
func (this *ServerCtrlHandler) Process(s *netlib.Session, packetid int, data interface{}) error {
default:
logger.Logger.Errorf("unknow server ctrl %v", msg)
}
if sc, ok := data.(*server.ServerCtrl); ok {
logger.Logger.Trace("ServerCtrlHandler.Process== ", *sc)
switch sc.GetCtrlCode() {
case SrvCtrlCloseCode:
module.Stop()
}
//回调
if ServerCtrlCallback != nil {
ServerCtrlCallback(sc.GetCtrlCode())
}
// 服务自己处理的特殊事件
if ServerCtrlCallback != nil {
ServerCtrlCallback(msg)
}
return nil
}
func init() {
netlib.RegisterHandler(int(server.SSPacketID_PACKET_MS_SRVCTRL), &ServerCtrlHandler{})
netlib.RegisterFactory(int(server.SSPacketID_PACKET_MS_SRVCTRL), &ServerCtrlPacketFactory{})
}

View File

@ -1,172 +0,0 @@
package common
import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"fmt"
"mongo.games.com/goserver/core/logger"
"regexp"
"strconv"
)
var key = []byte("kjh-vgjhhionoommmkokmokoo$%JH")
// 加密
func EnCrypt(orig []byte) (str string) {
defer func() {
err := recover()
if err != nil {
logger.Logger.Errorf("EnCrypt %v Error %v", string(orig), err)
str = string(orig)
}
}()
//将秘钥中的每个字节累加,通过sum实现orig的加密工作
sum := 0
for i := 0; i < len(key); i++ {
sum += int(key[0])
}
//给明文补码
var pkcs_code = PKCS5Padding(orig, 8)
//通过秘钥,对补码后的明文进行加密
for j := 0; j < len(pkcs_code); j++ {
pkcs_code[j] += byte(sum)
}
//base64.URLEncoding.EncodeToString()
return base64.URLEncoding.EncodeToString(pkcs_code)
}
// 补码
func PKCS5Padding(orig []byte, size int) []byte {
//计算明文的长度
length := len(orig)
padding := size - length%size
//向byte类型的数组中重复添加padding
repeats := bytes.Repeat([]byte{byte(padding)}, padding)
return append(orig, repeats...)
}
// 解密
func DeCrypt(text string) (str string) {
defer func() {
err := recover()
if err != nil {
logger.Logger.Errorf("DeCrypt %v Error %v", text, err)
str = text
}
}()
//orig, err := base64.StdEncoding.DecodeString(text)
orig, err := base64.URLEncoding.DecodeString(text)
if err != nil {
return "密文类型错误"
}
sum := 0
for i := 0; i < len(key); i++ {
sum += int(key[0])
}
//解密
for j := 0; j < len(orig); j++ {
orig[j] -= byte(sum)
}
//去码
var pkcs_unCode = PKCS5UnPadding(orig)
return string(pkcs_unCode)
}
// 去码
func PKCS5UnPadding(orig []byte) []byte {
//获取最后一位补码的数字
var tail = int(orig[len(orig)-1])
return orig[:(len(orig) - tail)]
}
var aesRule, _ = regexp.Compile(`^[0-9]+$`)
const (
aeskey = "DoNotEditThisKeyDoNotEditThisKey" // 加密的密钥,绝不可以更改
)
// 下面的字符串,也绝不可以更改
var defaultLetters = []rune("idjGfiRogsFnkdKgokdfgdow07u6978uxcvvLiPiDfjafOd2fuFJYYGBJuykbvfk")
func AesEncrypt(origDataStr string) (str string) {
defer func() {
err := recover()
if err != nil {
logger.Logger.Errorf("AesEncrypt %v Error %v", origDataStr, err)
str = origDataStr
}
}()
strlen := len(origDataStr)
b := aesRule.MatchString(origDataStr)
//不全是数字,或长度为零,不加密
if !b || strlen == 0 {
return origDataStr
}
phonenum, errint := strconv.Atoi(origDataStr)
if errint != nil {
return origDataStr
}
text := []byte(origDataStr)
//指定加密、解密算法为AES返回一个AES的Block接口对象
block, err := aes.NewCipher([]byte(aeskey))
if err != nil {
panic(err)
}
//指定计数器,长度必须等于block的块尺寸
iv := string(defaultLetters[phonenum%(len(defaultLetters))])
count := []byte(fmt.Sprintf("%016v", iv))
//指定分组模式
blockMode := cipher.NewCTR(block, count)
//执行加密、解密操作
message := make([]byte, len(text))
blockMode.XORKeyStream(message, text)
//返回明文或密文
return fmt.Sprintf("%v%v", iv, base64.StdEncoding.EncodeToString(message))
//return base64.StdEncoding.EncodeToString(message)
}
func AesDecrypt(cryptedstr string) (str string) {
defer func() {
err := recover()
if err != nil {
logger.Logger.Errorf("AesDecrypt %v Error %v", cryptedstr, err)
str = cryptedstr
}
}()
strlen := len(cryptedstr)
b := aesRule.MatchString(cryptedstr)
//全是数字,或长度为零,不解密
if b || strlen == 0 {
return cryptedstr
}
iv := cryptedstr[:1]
str = cryptedstr[1:]
text, err := base64.StdEncoding.DecodeString(str)
if err != nil {
logger.Logger.Errorf("AesDecrypt %v Err:%v", cryptedstr, err)
return cryptedstr
}
//指定加密、解密算法为AES返回一个AES的Block接口对象
block, err := aes.NewCipher([]byte(aeskey))
if err != nil {
panic(err)
}
//指定计数器,长度必须等于block的块尺寸
count := []byte(fmt.Sprintf("%016v", iv))
//指定分组模式
blockMode := cipher.NewCTR(block, count)
//执行加密、解密操作
message := make([]byte, len(text))
blockMode.XORKeyStream(message, text)
//返回明文或密文
return string(message)
}

View File

@ -1,4 +1,4 @@
package main
package common
import (
"time"
@ -6,21 +6,29 @@ import (
"mongo.games.com/goserver/core/module"
)
var ClockMgrSington = &ClockMgr{
/*
时钟
*/
func init() {
module.RegisteModule(ClockMgrSingleton, time.Millisecond*500, 0)
}
var ClockMgrSingleton = &ClockMgr{
LastHour: -1,
LastDay: -1,
Notifying: false,
}
const (
CLOCK_EVENT_SECOND int = iota
CLOCK_EVENT_MINUTE
CLOCK_EVENT_HOUR
CLOCK_EVENT_DAY
CLOCK_EVENT_WEEK
CLOCK_EVENT_MONTH
CLOCK_EVENT_SHUTDOWN
CLOCK_EVENT_MAX
ClockEventSecond int = iota
ClockEventMinute
ClockEventHour
ClockEventDay
ClockEventWeek
ClockEventMonth
ClockEventShutdown
ClockEventMax
)
type ClockSinker interface {
@ -37,7 +45,7 @@ type ClockSinker interface {
type BaseClockSinker struct {
}
func (s *BaseClockSinker) InterestClockEvent() int { return (1 << CLOCK_EVENT_MAX) - 1 }
func (s *BaseClockSinker) InterestClockEvent() int { return (1 << ClockEventMax) - 1 }
func (s *BaseClockSinker) OnSecTimer() {}
func (s *BaseClockSinker) OnMiniTimer() {}
func (s *BaseClockSinker) OnHourTimer() {}
@ -47,7 +55,7 @@ func (s *BaseClockSinker) OnMonthTimer() {}
func (s *BaseClockSinker) OnShutdown() {}
type ClockMgr struct {
sinkers [CLOCK_EVENT_MAX][]ClockSinker
sinkers [ClockEventMax][]ClockSinker
LastTickTime time.Time
LastMonth time.Month
LastWeek int
@ -59,9 +67,9 @@ type ClockMgr struct {
LastFiveMin int
}
func (this *ClockMgr) RegisteSinker(sinker ClockSinker) {
func (this *ClockMgr) RegisterSinker(sinker ClockSinker) {
interest := sinker.InterestClockEvent()
for i := 0; i < CLOCK_EVENT_MAX; i++ {
for i := 0; i < ClockEventMax; i++ {
if (1<<i)&interest != 0 {
found := false
ss := this.sinkers[i]
@ -99,9 +107,9 @@ func (this *ClockMgr) Update() {
this.LastSec = sec
this.fireSecondEvent()
min := tNow.Minute()
if min != this.LastMini {
this.LastMini = min
minute := tNow.Minute()
if minute != this.LastMini {
this.LastMini = minute
this.fireMinuteEvent()
hour := tNow.Hour()
@ -114,9 +122,9 @@ func (this *ClockMgr) Update() {
this.LastDay = day
this.fireDayEvent()
_, week := tNow.ISOWeek()
if week != this.LastWeek {
this.LastWeek = week
week := GetWeekStartTs(tNow.Unix())
if week != int64(this.LastWeek) {
this.LastWeek = int(week)
this.fireWeekEvent()
}
@ -137,43 +145,43 @@ func (this *ClockMgr) Shutdown() {
}
func (this *ClockMgr) fireSecondEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_SECOND] {
for _, s := range this.sinkers[ClockEventSecond] {
s.OnSecTimer()
}
}
func (this *ClockMgr) fireMinuteEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_MINUTE] {
for _, s := range this.sinkers[ClockEventMinute] {
s.OnMiniTimer()
}
}
func (this *ClockMgr) fireHourEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_HOUR] {
for _, s := range this.sinkers[ClockEventHour] {
s.OnHourTimer()
}
}
func (this *ClockMgr) fireDayEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_DAY] {
for _, s := range this.sinkers[ClockEventDay] {
s.OnDayTimer()
}
}
func (this *ClockMgr) fireWeekEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_WEEK] {
for _, s := range this.sinkers[ClockEventWeek] {
s.OnWeekTimer()
}
}
func (this *ClockMgr) fireMonthEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_MONTH] {
for _, s := range this.sinkers[ClockEventMonth] {
s.OnMonthTimer()
}
}
func (this *ClockMgr) fireShutdownEvent() {
for _, s := range this.sinkers[CLOCK_EVENT_SHUTDOWN] {
for _, s := range this.sinkers[ClockEventShutdown] {
s.OnShutdown()
}
}
@ -182,6 +190,92 @@ func (this *ClockMgr) GetLast() (int, int, int, int, int, int) {
return this.LastSec, this.LastMini, this.LastHour, this.LastDay, this.LastWeek, int(this.LastMonth)
}
func init() {
module.RegisteModule(ClockMgrSington, time.Millisecond*500, 0)
type ClockFunc struct {
event int
OnSecTimerFunc func()
OnMiniTimerFunc func()
OnHourTimerFunc func()
OnDayTimerFunc func()
OnWeekTimerFunc func()
OnMonthTimerFunc func()
OnShutdownFunc func()
}
func (s *ClockFunc) InterestClockEvent() int { return s.event }
func (s *ClockFunc) OnSecTimer() {
if s.OnSecTimerFunc != nil {
s.OnSecTimerFunc()
}
}
func (s *ClockFunc) OnMiniTimer() {
if s.OnMiniTimerFunc != nil {
s.OnMiniTimerFunc()
}
}
func (s *ClockFunc) OnHourTimer() {
if s.OnHourTimerFunc != nil {
s.OnHourTimerFunc()
}
}
func (s *ClockFunc) OnDayTimer() {
if s.OnDayTimerFunc != nil {
s.OnDayTimerFunc()
}
}
func (s *ClockFunc) OnWeekTimer() {
if s.OnWeekTimerFunc != nil {
s.OnWeekTimerFunc()
}
}
func (s *ClockFunc) OnMonthTimer() {
if s.OnMonthTimerFunc != nil {
s.OnMonthTimerFunc()
}
}
func (s *ClockFunc) OnShutdown() {
if s.OnShutdownFunc != nil {
s.OnShutdownFunc()
}
}
// RegisterClockFunc 注册时钟事件
func RegisterClockFunc(fs *ClockFunc) {
if fs == nil {
return
}
if fs.OnSecTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventSecond
}
if fs.OnMiniTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventMinute
}
if fs.OnHourTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventHour
}
if fs.OnDayTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventDay
}
if fs.OnWeekTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventWeek
}
if fs.OnMonthTimerFunc != nil {
fs.event = fs.event | 1<<ClockEventMonth
}
if fs.OnShutdownFunc != nil {
fs.event = fs.event | 1<<ClockEventShutdown
}
if fs.event == 0 {
return
}
ClockMgrSingleton.RegisterSinker(fs)
}

View File

@ -6,7 +6,6 @@ import (
protocol_game "mongo.games.com/game/protocol/server"
"mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib"
"mongo.games.com/goserver/srvlib"
"mongo.games.com/goserver/srvlib/protocol"
)
@ -45,11 +44,11 @@ func createMulticastPacket(packetid int, data interface{}, sis ...*protocol.MCSe
return pack, nil
}
func SendToGate(sid int64, packetid int, rawpack interface{}, s *netlib.Session) bool {
if s == nil || rawpack == nil || sid == 0 {
func SendToGate(sid int64, packetId int, pack interface{}, s *netlib.Session) bool {
if s == nil || pack == nil || sid == 0 {
return false
}
pack, err := createMulticastPacket(packetid, rawpack,
pack, err := createMulticastPacket(packetId, pack,
&protocol.MCSessionUnion{
Mccs: &protocol.MCClientSession{
SId: proto.Int64(sid)}})
@ -63,25 +62,17 @@ func SendToGate(sid int64, packetid int, rawpack interface{}, s *netlib.Session)
return false
}
func SendToActThrSrv(packetid int, rawpack interface{}) bool {
if rawpack == nil {
return false
}
replaySess := srvlib.ServerSessionMgrSington.GetSession(GetSelfAreaId(), ActThrServerType, ActThrServerID)
if replaySess != nil {
return replaySess.Send(int(packetid), rawpack)
}
return false
}
func TransmitToServer(sid int64, packetid int, rawpack interface{}, s *netlib.Session) bool {
if d, err := netlib.MarshalPacket(packetid, rawpack); err == nil {
// TransmitToServer 转发消息到指定服务器
// sid: 客户端连接标识
// packetId: 消息id
// pack: 消息内容
// s: 接收消息的服务器连接
func TransmitToServer(sid int64, packetId int, pack interface{}, s *netlib.Session) bool {
if d, err := netlib.MarshalPacket(packetId, pack); err == nil {
pack := &protocol_game.SSTransmit{
PacketData: d,
SessionId: sid,
}
proto.SetDefaults(pack)
return s.Send(int(protocol_game.TransmitPacketID_PACKET_SS_PACKET_TRANSMIT), pack, true)
} else {
logger.Logger.Warn("TransmitToServer err:", err)

View File

@ -2,6 +2,7 @@ package common
import (
"encoding/json"
"strings"
"mongo.games.com/goserver/core"
)
@ -53,6 +54,13 @@ func (this *CustomConfiguration) GetString(key string) string {
return str
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if str, ok := v.(string); ok {
return str
}
}
return ""
}
@ -67,6 +75,18 @@ func (this *CustomConfiguration) GetStrings(key string) (strs []string) {
return
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if vals, ok := v.([]interface{}); ok {
for _, s := range vals {
if str, ok := s.(string); ok {
strs = append(strs, str)
}
}
return
}
}
return
}
@ -86,6 +106,23 @@ func (this *CustomConfiguration) GetCustomCfgs(key string) (strs []*CustomConfig
return
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if vals, ok := v.([]interface{}); ok {
for _, s := range vals {
if data, ok := s.(map[string]interface{}); ok {
var pkg *CustomConfiguration
modelBuff, _ := json.Marshal(data)
err := json.Unmarshal(modelBuff, &pkg)
if err == nil {
strs = append(strs, pkg)
}
}
}
return
}
}
return
}
@ -100,6 +137,18 @@ func (this *CustomConfiguration) GetInts(key string) (strs []int) {
return
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if vals, ok := v.([]interface{}); ok {
for _, s := range vals {
if str, ok := s.(float64); ok {
strs = append(strs, int(str))
}
}
return
}
}
return
}
func (this *CustomConfiguration) GetInt(key string) int {
@ -108,6 +157,12 @@ func (this *CustomConfiguration) GetInt(key string) int {
return int(val)
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if val, ok := v.(float64); ok {
return int(val)
}
}
return 0
}
@ -117,5 +172,10 @@ func (this *CustomConfiguration) GetBool(key string) bool {
return val
}
}
if v, exist := (*this)[strings.ToLower(key)]; exist {
if val, ok := v.(bool); ok {
return val
}
}
return false
}

View File

@ -3,6 +3,7 @@ package common
import (
"fmt"
"strings"
"time"
)
// todo
@ -66,14 +67,25 @@ const (
GameID_Thirteen8 = 212 // 十三张(八人场)
GameID_ThirteenFree = 213 // 十三张(自由场经典场)
GameID_ThirteenFreeLaiZi = 214 // 十三张(自由场癞子场)
GameId_TienLenCustom = 215 // tienlen房卡经典版
GameId_TienLenCustom_yl = 216 // tienlen房卡娱乐版
GameId_TienLenCustom_toend = 217 // tienlen房卡典版打到底
GameId_TienLenCustom_yl_toend = 218 // tienlen房卡娱乐版打到底
__GameId_Slot_Min__ = 300 //################拉霸类################
GameId_CaiShen = 301 //财神
GameId_Avengers = 302 //复仇者联盟
GameId_EasterIsland = 303 //复活岛
GameId_IceAge = 304 //冰河世纪
GameId_TamQuoc = 305 //百战成神
GameId_Fruits = 306 //水果拉霸
GameId_Richblessed = 307 //多福多财
GameId_CaiShen = 301 // 财神
GameId_Avengers = 302 // 复仇者联盟
GameId_EasterIsland = 303 // 复活岛
GameId_IceAge = 304 // 冰河世纪
GameId_TamQuoc = 305 // 百战成神
GameId_Fruits = 306 // 水果拉霸
GameId_Richblessed = 307 // 多福
GameId_FortuneTiger = 308 // FortuneTiger
GameId_FortuneDragon = 309 // FortuneDragon
GameId_FortuneRabbit = 310 // FortuneRabbit
GameId_FortuneOx = 311 // FortuneOx
GameId_FortuneMouse = 312 // FortuneMouse
GameId_CashMania = 313 // CashMania
GameId_GatesOfOlympus = 314 // GatesOfOlympus
__GameId_Fishing_Min__ = 400 //################捕鱼类################
GameId_HFishing = 401 //欢乐捕鱼
GameId_TFishing = 402 //天天捕鱼
@ -86,28 +98,27 @@ const (
GameId_CaoThap = 605 //CaoThap
GameId_AngerUncle = 606 // 愤怒大叔
GameId_SmallRoket = 607 // 小火箭
GameId_Clawdoll = 608 // 娃娃机
__GameId_ThrGame_Min__ = 700 //################三方类################
GameId_Thr_Dg = 701 //DG Game
GameId_Thr_XHJ = 901 //DG Game
GameId_Thr_XHJ = 901 ///DG Game
)
// IsTienLen TienLen游戏
func IsTienLen(gameId int) bool {
return InSliceInt32(GetTienlenGameID(), int32(gameId))
}
func GetTienlenGameID() []int32 {
//todo 还要维护游戏id,好麻烦,还容易忘
return []int32{
GameId_TienLen, GameId_TienLen_yl,
GameId_TienLen_toend, GameId_TienLen_yl_toend,
GameId_TienLen_m, GameId_TienLen_m_toend,
GameId_TienLenSelect, GameId_TienLenSelect_toend,
GameId_TienLenSelect_yl, GameId_TienLenSelect_yl_toend,
GameId_TienLenRank, GameId_TienLenRank_toend,
GameId_TienLenRank_yl, GameId_TienLenRank_yl_toend,
}
}
const (
GameDifTienlen = "207" // tienlen
GameDifThirteen = "211" // 十三张
GameDifChess = "521" // 象棋
GameDifFish = "401" // 捕鱼
GameDifRocket = "607" // 小火箭
GameDifCaiShen = "301" // 财神
GameDifAvengers = "302" // 复仇者联盟
GameDifEaster = "303" // 复活节岛
GameDifIceAge = "304" // 冰河世纪
GameDifTamQuoc = "305" // 百战成神
GameDifFruits = "306" // 水果机
GameDifRichblessed = "307" // 多彩多福
GameDifClawdoll = "608" // 娃娃机
)
// IsTienLenYuLe TienLen娱乐
func IsTienLenYuLe(gameId int) bool {
@ -117,7 +128,9 @@ func IsTienLenYuLe(gameId int) bool {
GameId_TienLenSelect_yl,
GameId_TienLenRank_yl,
GameId_TienLenSelect_yl_toend,
GameId_TienLenRank_yl_toend:
GameId_TienLenRank_yl_toend,
GameId_TienLenCustom_yl,
GameId_TienLenCustom_yl_toend:
return true
}
return false
@ -132,40 +145,9 @@ func IsTienLenToEnd(gameId int) bool {
GameId_TienLenSelect_toend,
GameId_TienLenSelect_yl_toend,
GameId_TienLenRank_toend,
GameId_TienLenRank_yl_toend:
return true
}
return false
}
// IsChess 象棋游戏
func IsChess(gameId int) bool {
switch gameId {
case GameId_Chesstitians,
GameId_ChesstitiansMakruk,
GameId_ChesstitiansCambodian,
GameId_ChesstitiansCambodianRobot:
return true
}
return false
}
// IsThirteen 十三张游戏
func IsThirteen(gameId int) bool {
switch gameId {
case GameID_Thirteen4,
GameID_Thirteen8,
GameID_ThirteenFree,
GameID_ThirteenFreeLaiZi:
return true
}
return false
}
// IsThirteen 十三张游戏
func IsSmallRocket(gameId int) bool {
switch gameId {
case GameId_SmallRoket:
GameId_TienLenRank_yl_toend,
GameId_TienLenCustom_toend,
GameId_TienLenCustom_yl_toend:
return true
}
return false
@ -185,9 +167,11 @@ func IsLocalGame(gameId int) bool {
return false
}
// IsPlayerPool 需要统计在个人水池的游戏
func IsPlayerPool(gameId int) bool {
if IsTienLen(gameId) || IsThirteen(gameId) {
func IsDaZhong(gameId int) bool {
switch gameId {
case GameId_TienLenSelect,
GameId_TienLenSelect_yl, GameId_TienLenSelect_toend,
GameId_TienLenSelect_yl_toend:
return true
}
return false
@ -195,47 +179,26 @@ func IsPlayerPool(gameId int) bool {
// 房间编号区间
const (
PrivateSceneStartId = 10000000
PrivateSceneMaxId = 99999999
MatchSceneStartId = 100000000
MatchSceneMaxId = 199999999
HundredSceneStartId = 200000000
HundredSceneMaxId = 299999999
HallSceneStartId = 300000000
HallSceneMaxId = 399999999
MiniGameSceneStartId = 400000000
MiniGameSceneMaxId = 409999999
CoinSceneStartId = 1000000000 //区间预留大点,因为队列匹配比较耗id,假定一天100w牌局,那么这个id区间够用1000天
CoinSceneMaxId = 1999999999
DgSceneId = 99
PrivateSceneStartId = 100000
PrivateSceneMaxId = 999999
MatchSceneStartId = 100000000
MatchSceneMaxId = 199999999
HundredSceneStartId = 200000000
HundredSceneMaxId = 299999999
CoinSceneStartId = 1000000000
CoinSceneMaxId = 1999999999
DgSceneId = 99
)
// 房间模式
const (
SceneMode_Public = iota //公共房间
SceneMode_Club //俱乐部房间
SceneMode_Private //私人房间
SceneMode_Match //赛事房间
SceneMode_Thr //三方房间
SceneModePublic = 0 // 公共房间
SceneModePrivate = 2 // 私人房间
SceneModeMatch = 3 // 赛事房间
SceneModeThr = 4 // 三方房间
SceneModePrivateMatch = 5 // 竞技馆房间
)
// 场景级别
//const (
// SceneLvl_Test = -1 // 试玩场(不要钱)
// SceneLvl_Experience = 0 // 体验场(花小钱)
// SceneLvl_Primary = 1 // 初级场
// SceneLvl_Middle = 2 // 中级场
// SceneLvl_Senior = 3 // 高级场
// SceneLvl_Professor = 4 // 专家场
//)
// 房费选项
//const (
// RoomFee_Owner int32 = iota //房主
// RoomFee_AA //AA
// RoomFee_Max
//)
const (
Platform_Rob = "__$G_P$__"
Platform_Sys = "0"
@ -248,71 +211,123 @@ const (
)
const (
GainWay_NewPlayer int32 = 0 //0.新建角色
GainWay_Pay = 1 //1.后台增加(主要是充值)
GainWay_ByPMCmd = 2 //2.pm命令
GainWay_MatchBreakBack = 3 //3.退赛退还
GainWay_MatchSystemSupply = 4 //4.比赛奖励
GainWay_Exchange = 5 //5.兑换
GainWay_ServiceFee = 6 //6.桌费
GainWay_CoinSceneWin = 7 //7.金豆场赢取
GainWay_CoinSceneLost = 8 //8.金豆场输
GainWay_CoinSceneEnter = 9 //9.进入金币场预扣
GainWay_ShopBuy = 10 //10.商城购买或者兑换
GainWay_CoinSceneLeave = 11 //11.金豆场回兑
GainWay_HundredSceneWin = 12 //12.万人场赢取
GainWay_HundredSceneLost = 13 //13.万人场输
GainWay_MessageAttach = 14 //14.邮件
GainWay_SafeBoxSave = 15 //15.保险箱存入
GainWay_SafeBoxTakeOut = 16 //16.保险箱取出
GainWay_Fishing = 17 //17.捕鱼
GainWay_CoinSceneExchange = 18 //18.金豆场兑换
GainWay_UpgradeAccount = 19 //19.升级账号
GainWay_API_AddCoin = 20 //20.API操作钱包
GainWay_GoldCome = 21 //21.财神降临
GainWay_Transfer_System2Thrid = 22 //22.系统平台转入到第三方平台的金币
GainWay_Transfer_Thrid2System = 23 //23.第三方平台转入到系统平台的金币
GainWay_RebateTask = 24 //24.返利获取
GainWay_IOSINSTALLSTABLE = 25 //25.ios安装奖励
GainWay_VirtualChange = 26 //26.德州虚拟账变
GainWay_CreatePrivateScene = 27 //27.创建私有房间
GainWay_PrivateSceneReturn = 28 //28.解散私有房间返还
GainWay_OnlineRandCoin = 29 //29.红包雨
GainWay_Expire = 30 //30.到期清理
GainWay_PromoterBind = 31 //31.手动绑定推广员
GainWay_GradeShopReturn = 32 //32.积分商城撤单退还积分
GainWay_Api_In = 33 //33.转移金币
GainWay_Api_Out = 34 //34.转移金币
GainWay_Shop_Buy = 35 //35.购买记录
GainWay_MAIL_MTEM = 36 //36.邮件领取道具
GainWay_Item_Sale = 37 //37.道具出售
GainWay_ReliefFund = 38 //38.领取救济金
GainWay_Shop_Revoke = 39 //39.撤单
GainWay_ActSign = 40 //40.签到
GainWay_MatchSignup = 41 //比赛报名费用
GainWay_MatchSeason = 42 //比赛赛季奖励
GainWay_ActSignNew = 43 //43.新签到
GainWay_ActTurnplate = 44 //44.轮盘
GainWay_ActBlindBox = 45 //45.盲盒
GainWay_ActFirstPay = 46 //46.首充
GainWay_VIPGift = 47 //47.vip礼包
GainWay_ActContinuousPay = 48 //48.连续充值
GainWay_ActJybAward = 49 //49.礼包码兑换
GainWay_LeaveDeduct = 50 //50.离开扣分
GainWay_LeaveCombat = 51 //51.离开补偿
GainWay_RankMatch = 52 //52.排位赛段位奖励
GainWay_AddBag = 53 //53 增加背包接口调用
GainWay_SmallRocket = 54 //54.小火箭收入
GainWay_BindTel = 55 //55.绑定手机号
GainWay_ReliefFund2 = 56 //56.救济金看视频双倍领取
GainWay_ActTurnplate2 = 57 //57.轮盘看视频双倍领取
GainWay_ActSignNew2 = 58 //58.签到看视频双倍领取
GainWay_ItemUse = 59 //59.道具使用
GainWay_PhoneScore = 60 //60.积分抽奖活动
GainWay_RankReward = 61 //61.段位奖励
GainWay_TaskReward = 62 //62.任务奖励
GainWay_Interact = 63 //63.房间内互动效果
GainWay_Collect = 64 //64.集卡活动
GainWay_NewPlayer int32 = 0 //新建角色
GainWay_Pay = 1 //后台增加(主要是充值)
GainWay_ByPMCmd = 2 //pm命令
GainWay_MatchBreakBack = 3 //退赛退还
GainWay_MatchSystemSupply = 4 //比赛奖励
GainWay_Exchange = 5 //兑换
GainWay_ServiceFee = 6 //桌费
GainWay_CoinSceneWin = 7 //金豆场赢取
GainWay_CoinSceneLost = 8 //金豆场输
GainWay_CoinSceneEnter = 9 //进入金币场预扣
GainWay_ShopBuy = 10 //商城购买或者兑换
GainWay_CoinSceneLeave = 11 //金豆场回兑
GainWay_HundredSceneWin = 12 //万人场赢取
GainWay_HundredSceneLost = 13 //万人场输
GainWay_MessageAttach = 14 //邮件
GainWay_SafeBoxSave = 15 //保险箱存入
GainWay_SafeBoxTakeOut = 16 //保险箱取出
GainWay_Fishing = 17 //捕鱼
GainWay_CoinSceneExchange = 18 //金豆场兑换
GainWay_UpgradeAccount = 19 //升级账号
GainWay_API_AddCoin = 20 //API操作钱包
GainWay_GoldCome = 21 //财神降临
GainWay_Transfer_System2Thrid = 22 //系统平台转入到第三方平台的金币
GainWay_Transfer_Thrid2System = 23 //第三方平台转入到系统平台的金币
GainWay_RebateTask = 24 //返利获取
GainWay_IOSINSTALLSTABLE = 25 //ios安装奖励
GainWay_VirtualChange = 26 //德州虚拟账变
GainWay_CreatePrivateScene = 27 //创建私有房间
GainWay_PrivateSceneReturn = 28 //解散私有房间返还
GainWay_OnlineRandCoin = 29 //红包雨
GainWay_Expire = 30 //到期清理
GainWay_PromoterBind = 31 //手动绑定推广员
GainWay_GradeShopReturn = 32 //积分商城撤单退还积分
GainWay_Api_In = 33 //转移金币
GainWay_Api_Out = 34 //转移金币
GainWay_Shop_Buy = 35 //购买记录
GainWay_MAIL_MTEM = 36 //邮件领取道具
GainWay_Item_Sale = 37 //道具出售
GainWay_ReliefFund = 38 //领取救济金
GainWay_Shop_Revoke = 39 //撤单
GainWay_ActSign = 40 //
GainWay_MatchSignup = 41 //比赛报名费用
GainWay_MatchSeason = 42 //比赛赛季奖励
GainWay_ActSignNew = 43 //新签到
GainWay_ActTurnplate = 44 //轮盘
GainWay_ActBlindBox = 45 //盲盒
GainWay_ActFirstPay = 46 //首充
GainWay_VIPGift = 47 //vip礼包
GainWay_ActContinuousPay = 48 //连续充值
GainWay_ActJybAward = 49 //礼包码兑换
GainWay_LeaveDeduct = 50 //离开扣分
GainWay_LeaveCombat = 51 //离开补偿
GainWay_RankMatch = 52 //排位赛段位奖励
GainWay_AddBag = 53 //增加背包接口调用
GainWay_SmallRocket = 54 //小火箭收入
GainWay_BindTel = 55 //绑定手机号
GainWay_ReliefFund2 = 56 //救济金看视频双倍领取
GainWay_ActTurnplate2 = 57 //轮盘看视频双倍领取
GainWay_ActSignNew2 = 58 //签到看视频双倍领取
GainWay_ItemUse = 59 //道具使用
GainWay_PhoneScore = 60 //手机积分活动
GainWay_RankReward = 61 //排位奖励
GainWay_TaskReward = 62 //任务奖励
GainWay_Interact = 63 //房间内互动效果
GainWayItemCollectExchange = 64 //集卡活动兑换
GainWay_WeekCardAward = 65 //周卡奖励
GainWay_PigrankTakeCoin = 66 //存钱罐领取耗费钻石
GainWay_PigrankGainCoin = 67 //存钱罐打开获取金币
GainWay_ItemMove = 68 //道具赠送
GainWay_RoleUpgrade = 69 //角色升级
GainWay_PetUpgrade = 70 //宠物升级
GainWay_Game = 71 //游戏掉落
GainWayItemCollectLogin = 73 //集卡活动登录
GainWay_Collect = 74 //集卡活动
GainWayItemPhoneScoreExchange = 75 //抽手机活动兑换
GainWayItemTaskInvite = 78 //邀请任务
GainWayItemTaskNewPlayer = 79 //新手任务
GainWayItemTaskAchievement = 80 //成就任务
GainWayItemTaskEveryDay = 81 //每日任务
GainWayItemWeekActive = 82 //周活跃奖励
GainWayContinueSign = 83 //累计签到
GainWayBackend = 84 // 后台操作
GainWayBuyCoin = 85 // 商城购买金币
GainWayBuyItem = 86 // 商城购买道具
GainWayBuyWeekCard = 87 // 商城购买周卡
GainWayVipBuyCoin = 88 // vip商城购买金币
GainWaySign7Con = 89 // 累计签到进阶奖励消耗
GainWay_PigrankGainDiamond = 90 //存钱罐打开获取钻石
GainWaySign7Add = 91 // 累计签到进阶奖励获得
GainWayItemChange = 92 //背包内使用道具兑换话费
GainWayPetSkillLevelUp = 93 //宠物技能升级
GainWayPermitAward = 94 // 赛季通行证等级奖励
GainWayItemPermitRank = 95 // 赛季通行证排行奖励
GainWayPermitExchangeCost = 96 // 赛季通行证兑换消耗
GainWayPermitExchangeGain = 97 // 赛季通行证兑换获得
GainWayItemTaskPermit = 98 // 赛季通行证任务
GainWayDiamondLottery = 99 //钻石抽奖
GainWaySkinUnLock = 100 // 皮肤解锁消耗
GainWaySkinUpGrade = 101 // 皮肤升级消耗
GainWayItemFen = 102 // 道具分解消耗
GainWayItemFenGain = 103 // 道具分解获得
GainWayGuide = 104 //新手引导奖励
GainWayVipGift9 = 105 //vip等级礼包
GainWayRoomCost = 106 //房费消耗
GainWayRoomGain = 107 //房卡场获得
GainWayItemShop = 108 // 交易市场道具交易
GainWayClawdollCostItem = 109 // 娃娃机上分扣道具
GainWayItemShopChangeDoll = 110 // 商城兑换娃娃
GainWayItemBagChangeDoll = 111 // 背包内兑换娃娃
GainWayClawdollCatch = 112 // 娃娃机抓取到娃娃获取卡
GainWayItemBagChangeDollRevocation = 113 //娃娃兑换后台撤销
GainWayPermitReset = 114 //赛季通行证积分重置
GainWayClientUpgrade = 115 //客户端升级奖励
GainWayLottery = 116 //开奖码抽奖
GainWayGuide2 = 117 // 竞技馆引导奖励
GainWayCompound = 118 // 道具合成消耗
GainWayCompoundGain = 119 // 道具合成获得
)
// 后台选择 金币变化类型 的充值 类型id号起始
@ -355,30 +370,6 @@ const (
PlayerLeaveReason_AutoState //托管状态踢出房间
)
// 万分比
const RATE_BASE_VALUE int32 = 10000
const (
SceneState_Normal int = iota
SceneState_Fishing //鱼潮
)
const (
PlayerType_Rob int32 = 0
PlayerType_Undefine = 1
PlayerType_Black = -1
PlayerType_White = -2
)
const (
CoinPoolAIModel_Default int32 = iota //默认
CoinPoolAIModel_Normal //正常模式
CoinPoolAIModel_ShouFen //收分模式
CoinPoolAIModel_ZheZhong //折中模式
CoinPoolAIModel_TuFen //吐分
CoinPoolAIModel_Max //
)
const (
RobotServerType int = 9
RobotServerId = 901
@ -461,12 +452,6 @@ const (
MatchTrueMan_Priority = 1 //优先匹配真人
)
const (
SingleAdjustModeNormal = 0
SingleAdjustModeWin = 1
SingleAdjustModeLose = 2
)
// 自动化标签(程序里产生的全部<0)
const (
AutomaticTag_QZNN_Smart int32 = -1
@ -511,35 +496,6 @@ const (
CodeTypeNo = 3 // 不使用验证码
)
const (
ActId_Share int = iota //0.微信分享
ActId_OnlineReward //1.在线奖励
ActId_UpgradeAccount //2.升级账号
ActId_GoldTask //3.财神任务
ActId_GoldCome //4.财神降临
ActId_LuckyTurntable //5.转盘活动
ActId_Yeb //6.余额宝
ActId_Card //7.周卡月卡
ActId_RebateTask //8.返利获取
ActId_IOSINSTALLSTABLE //9.ios安装奖励
ActId_VipLevelBonus //10.vip日周月等级奖励
ActId_LoginRandCoin //11.登录红包
ActId_OnlineRandCoin //12.红包雨
ActId_MatchSwitch //13.比赛开关
ActId_PromoterBind //14.手动绑定推广员
ActId_Lottery //15.彩金池
ActId_Task //16.活跃任务
ActId_PROMOTER //17.全民推广
ActId_Activity //18.活动界面
ActId_NewYear //19.新年暗号红包活动
ActId_Guess //20.猜灯谜活动
ActId_Sign //21.七日签到
ExchangeId_Alipay //22.兑换到支付宝
ExchangeId_Bank //23.兑换到银行卡
ExchangeId_Wechat //24.兑换到微信
ActId_Max
)
// 匹配模式
const (
MatchMode_Normal int32 = iota //普通匹配
@ -612,6 +568,19 @@ const (
ItemIDWeekScore = 100004 // 周活跃积分
ItemIDGiftBox = 50001 // 碎片礼盒
ItemIDCollectBox = 50002 // 集卡礼盒
ItemIDLike = 100007 // 点赞
ItemIDCoffee = 100008 // 咖啡
ItemIDBucket = 100009 // 水桶
ItemIDSlippers = 100010 // 拖鞋
ItemIDPermit = 100011 // 赛季通行证积分
ItemIDLong = 50013 // 龙币
ItemIDPetSkill = 11001 //宠物技能升级道具
ItemIDVCard = 30001 // v卡
ItemIDJCard = 30002 // 金券
ItemDiamondScore = 100012 //钻石积分
ItemIDClawdoll = 40003 // 娃娃卡
ItemDollCard = 40004 // 娃娃卡积分
ItemIDRoomCard = 40002 // 房卡
)
func ToItemId(id int32) int32 {
@ -638,6 +607,12 @@ const (
ItemTypeVipExp = 10 //VIP经验
ItemTypeShopScore = 11 //积分
ItemTypeInteract = 12 // 互动表情
ItemTypeExpireTime = 15 // 时效类道具
ItemTypeObjective = 16 // 目标类道具
ItemTypeChange = 17 // 兑换话费
ItemTypeSkinChip = 22 // 皮肤碎片
ItemTypeDoll = 26 //娃娃兑换
ItemTypeSeasonPicket = 28 //赛季凭证
)
func GetKeyNoviceGameId(gameId int) string {
@ -680,30 +655,44 @@ func GetImageCodeKey(key string) string {
}
const (
SMSCodeValidTime = 60 // 访问频率限制
SMSCodeValidTimeTelBind = 60 // 绑定手机号验证码有效期,单位秒
SMSCodeValidTimeTelLogin = 600 // 手机号登录验证码有效期,单位秒
SMSCodeValidTime = 60 * time.Second // 访问频率限制
SMSCodeValidTimeTelBind = 60 * time.Second // 绑定手机号验证码有效期,单位秒
SMSCodeValidTimeTelLogin = 600 * time.Second // 手机号登录验证码有效期,单位秒
)
// 活动,任务类型
const (
TaskTypeAdv = 1 // 看广告次数
TaskTypeBuyCoin = 2 // 买金币次数
TaskTypeLogin = 3 // 登录次数
TaskTypeWinTimes = 4 // 赢游戏次数
TaskTypePlayTimes = 5 // 玩游戏次数
TaskTypeRankMatchTimes = 6 // 排位赛次数
TaskTypePay = 7 // 充值金额
TaskTypeWinOrLose = 8 // 游戏输赢金币数量
TaskTypeTienlenCount = 9 // tienlen游戏场次
TaskTypeBindInviter = 10 // 绑定邀请人数量
TaskTypeWinCoin = 11 // 赢取金币数量
TaskTypeTienlenWinTimes = 12 // tienlen游戏赢取次数
TaskTypeInviteScore = 13 // 邀请积分
TaskTypeActivityScore = 14 // 周活跃积分数量
TaskTypeFirstLogin = 15 // 每日首次登录
TaskTypeInviteNum = 16 // 邀请绑定数量
TaskTypeTurnplate = 17 // 转盘抽奖次数
TaskTypeAdv = 1 // 看广告次数
TaskTypeBuyCoin = 2 // 买金币次数
TaskTypeLogin = 3 // 登录次数
TaskTypeWinTimes = 4 // 赢游戏次数
TaskTypePlayTimes = 5 // 玩游戏次数
TaskTypeRankMatchTimes = 6 // 排位赛次数
TaskTypePay = 7 // 充值金额
TaskTypeWinOrLose = 8 // 游戏输赢金币数量
TaskTypeTienlenCount = 9 // tienlen游戏场次
TaskTypeBindInviter = 10 // 绑定邀请人数量*
TaskTypeWinCoin = 11 // 赢取金币数量
TaskTypeTienlenWinTimes = 12 // tienlen游戏赢取次数
TaskTypeInviteScore = 13 // 邀请积分*
TaskTypeActivityScore = 14 // 周活跃积分数量
TaskTypeFirstLogin = 15 // 每日首次登录
TaskTypeInviteNum = 16 // 邀请绑定数量*
TaskTypeTurnplate = 17 // 转盘抽奖次数
TaskTypeInviteRecharge = 18 // 被邀请人充值金额*
TaskTypeLoseCoin = 19 // 输的金币数量
TaskType20 = 20 // 未使用
TaskTypeOnlineTs = 21 // 在线时长,秒
TaskTypeBuyPig = 22 // 购买任意存钱罐
TaskTypeDaZhong = 23 // 大众场胜利
TaskTypeInvitePlay = 24 // 邀请好友私人桌对局
TaskTypeJoinMatch = 25 // 参与比赛场
TaskTypeMatchRank10 = 26 // 比赛场前10名
TaskTypeCostDiamond = 27 // 消耗钻石数量
TaskTypeTienlenLoseCoin = 28 // Tienlen输的金币数量
TaskTypeTienlenWinCoin = 29 // Tienlen赢取金币数量
TaskTypeRankMatchWinTimes = 30 // 排位胜利次数
TaskTypeBuyPermit = 31 // 购买典藏通行证
)
const (
@ -714,26 +703,26 @@ const (
)
const (
TaskActivityTypeEveryDay = 1 // 每日任务
TaskActivityTypeWeek = 2 // 每周任务
TaskActivityTypeNovice = 3 // 新手任务
TaskActivityTypeInvite = 4 // 邀请任务
TaskActivityTypeEveryDay = 1 // 每日任务
TaskActivityTypeWeek = 2 // 每周任务
TaskActivityTypeNovice = 3 // 新手任务
TaskActivityTypeInvite = 4 // 邀请任务
TaskActivityTypeAchieve = 5 // 成就任务
TaskActivityTypePermitEveryDay = 6 // 赛季通行证每日任务
TaskActivityTypePermit = 7 // 赛季通行证任务
)
const HeadRange = 3 // 机器人头像id范围
const (
InviteScoreTypeBind = 1 // 绑定邀请码
InviteScoreTypeLogin = 2 // 每日登录
InviteScoreTypePlayTimes = 3 // 每日参与任意游戏
InviteScoreTypeRecharge = 4 // 充值
InviteScoreTypeGameTimes = 5 // 每局游戏
InviteScoreCheckWeek = -1 // 跨周
InviteScoreTypeBind = 1 // 绑定邀请码
InviteScoreTypePay = 2 // 充值
InviteScoreTypeRecharge = 3 // 充值完成
InviteScoreTypePayMe = 4 // 充值(给自己)
InviteScoreTypeBindTel = 5 // 绑定手机号
)
const TaskIDInvitePlayGame = 1000001
const TaskIDInviteRecharge = 1000002
const TaskIDInviteFirstLogin = 1000003
func InMatchChannel(ls []string, n string) bool {
if n == "" || len(ls) == 0 {
return false
@ -782,3 +771,139 @@ const (
)
var PetIDs = []int32{PetIDChicken}
const (
ChannelSwitchExchange = 1 // 兑换商城开关
ChannelSwitchDropItem = 2 // v卡掉落开关
ChannelSwitchInvite = 3 // 邀请开关
ChannelSwitchPermit = 4 // 典藏通行证开关
ChannelSwitchDiamondLottery = 5 // 钻石抽奖开关
)
// 特殊商品id
const (
ShopIdWeekCard = 970001 // 周卡
ShopIdPermit = 990001 // 典藏通行证
)
const PermitStartTsKey = "permit_start_ts"
const PermitAdd = 0.2 // 典藏通行证赛季积分多加,百分比
const (
SkinGetAuto = 1
SkinGetItem = 2
SkinGetVip = 3
)
const (
SkillIdRankScore = 30002 // 排位积分加成百分比
SkillIdVipTimes = 30003 // VIP赛每日免费报名次数
SkillIdVipGift = 30004 // VIP每日礼包金币奖励提升百分比
SkillIdTask = 30005 // 每日任务金币奖励提升百分比
SkillIdDiamondLottery = 30007 // 每次钻石抽奖幸运值提升百分比
)
var (
SkinRandom = []int32{300001, 300002, 300007, 300006, 300005, 300004, 300003}
SkinWeightMap = map[int32]int{
300001: 20,
300002: 40,
300007: 40,
300006: 50,
300005: 40,
300004: 60,
300003: 70,
}
)
const (
AttributeGuideStep = 1 // 引导步骤
AttributeGuideSkip = 2 // 跳过引导
AttributeGuideTest = 3 // 测试引导
AttributeGuideCustom = 4 // 竞技馆引导页
)
const (
On = 1 // 开启
Off = 2 // 关闭
)
const (
DataConfigAll = 0 // 全部配置
DataConfigSprite = 1 // 精灵配置
DataConfigMatchAudience = 2 // 赛事观战开关
)
// 房间状态
const (
SceneStateWaite = 0 // 等待
SceneStateStart = 1 // 开始
SceneStateEnd = 2 // 结束
)
const (
// PlayerHistoryModel .
PlayerHistoryModel = iota + 1
// BIGWIN_HISTORY_MODEL .
BIGWIN_HISTORY_MODEL
// GameHistoryModel .
GameHistoryModel
)
type ListOpType int // 列表操作类型
const (
ListModify ListOpType = 1 // 修改
ListAdd ListOpType = 2 // 增加
ListDel ListOpType = 3 // 减少
ListFind ListOpType = 4 // 查询
)
type NotifyType int // 通知类型
const (
NotifyPrivateRoomList NotifyType = 1 // 私人房间列表
)
// SCPlayerCoinChange 中数值类型
const (
PlayerChangeTypeCoin = 0 // 金币
PlayerChangeTypeNum = 1 // 积分
)
// 玩家状态标记
const (
PlayerFlagsGuideCustom = 1 << iota // 竞技馆引导页关闭状态
)
const (
LotteryStateOver = 1 // 抽奖结束
LotteryStateRun = 2 // 抽奖进行中
LotteryStateNoStart = 3 // 抽奖未开始
)
const (
NoticeTypeCustomAward = 1 + iota // 房卡场获奖通知
)
const (
GuideIdNewPlayer = 1 // 新手引导
GuideIdCustom = 2 // 竞技馆引导
)
// 引导奖励账变类型
var GuideIdToGainWay = map[int]int{
GuideIdNewPlayer: GainWayGuide,
GuideIdCustom: GainWayGuide2,
}
func GetKeyGameDif(gamedif string) string {
return fmt.Sprintf("gamedif-%v", gamedif)
}
func GetItemUniqueId(itemId int32, snid int32) string {
return fmt.Sprintf("%v.%v.%v.%v", itemId, snid, time.Now().Unix(), RandInt(1, 10000))
}

View File

@ -95,17 +95,9 @@ func GetIntegerBit(num int32, index int32) bool {
}
// 校验身份证是否合法
var IDReg, _ = regexp.Compile(`(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)`)
var REGEXP_IPRule, _ = regexp.Compile(`^(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$`)
var REGEXP_IPRule, _ = regexp.Compile(`^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){6}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^::([\da-fA-F]{1,4}:){0,4}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:):([\da-fA-F]{1,4}:){0,3}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){2}:([\da-fA-F]{1,4}:){0,2}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){3}:([\da-fA-F]{1,4}:){0,1}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){4}:((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){7}[\da-fA-F]{1,4}$|^:((:[\da-fA-F]{1,4}){1,6}|:)$|^[\da-fA-F]{1,4}:((:[\da-fA-F]{1,4}){1,5}|:)$|^([\da-fA-F]{1,4}:){2}((:[\da-fA-F]{1,4}){1,4}|:)$|^([\da-fA-F]{1,4}:){3}((:[\da-fA-F]{1,4}){1,3}|:)$|^([\da-fA-F]{1,4}:){4}((:[\da-fA-F]{1,4}){1,2}|:)$|^([\da-fA-F]{1,4}:){5}:([\da-fA-F]{1,4})?$|^([\da-fA-F]{1,4}:){6}:$`)
var ClubNameRule, _ = regexp.Compile("^[\u4e00-\u9fa5a-zA-Z-z0-9]+$")
func IsValidID(id string) bool {
if IDReg != nil {
return IDReg.Match([]byte(id))
}
return false
}
func IsValidIP(Ip string) bool {
const UNKNOWIP = "0.0.0.0"
if Ip == "" || Ip == UNKNOWIP {

29
common/functions.go Normal file
View File

@ -0,0 +1,29 @@
package common
import (
"fmt"
"github.com/spf13/viper"
)
var paths = []string{
".",
"./etc",
"./config",
}
func GetViper(name, filetype string) *viper.Viper {
vp := viper.New()
// 配置文件
vp.SetConfigName(name)
vp.SetConfigType(filetype)
for _, v := range paths {
vp.AddConfigPath(v)
}
err := vp.ReadInConfig()
if err != nil {
panic(fmt.Errorf("fatal error config file: %w", err))
}
return vp
}

View File

@ -19,6 +19,8 @@ func (hw HandlerWrapper) Process(s *netlib.Session, packetid int, data interface
return hw(s, packetid, data, sid)
}
// RegisterHandler 消息注册
// Deprecated: use [common.Register] instead
func RegisterHandler(packetId int, h Handler) {
if _, ok := handlers[packetId]; ok {
panic(fmt.Sprintf("repeate register handler: %v Handler type=%v", packetId, reflect.TypeOf(h)))
@ -36,7 +38,11 @@ func GetHandler(packetId int) Handler {
}
func Register(mainId int, msgType interface{}, h func(s *netlib.Session, packetId int, data interface{}, sid int64) error) {
RegisterHandler(mainId, HandlerWrapper(h))
if _, ok := handlers[mainId]; ok {
panic(fmt.Sprintf("repeate register handler: %v Handler type=%v", mainId, reflect.TypeOf(h)))
}
handlers[mainId] = HandlerWrapper(h)
f := func() interface{} {
tp := reflect.TypeOf(msgType)
if tp.Kind() == reflect.Ptr {

9
common/id.go Normal file
View File

@ -0,0 +1,9 @@
package common
import "github.com/bwmarrin/snowflake"
var IdNode, _ = snowflake.NewNode(int64(GetSelfSrvId()))
func GetId() int64 {
return IdNode.Generate().Int64()
}

View File

@ -5,13 +5,12 @@ import (
"path/filepath"
"github.com/howeyc/fsnotify"
"mongo.games.com/goserver/core"
"mongo.games.com/goserver/core/basic"
"mongo.games.com/goserver/core/logger"
)
var LastModifyConfig int64
func init() {
core.RegisteHook(core.HOOK_BEFORE_START, func() error {
var err error
@ -62,7 +61,7 @@ type loggerParamModifiedCommand struct {
}
func (lmc *loggerParamModifiedCommand) Done(o *basic.Object) error {
logger.Logger.Info("===reload ", lmc.fileName)
logger.Logger.Info("reload logger.xml:", lmc.fileName)
data, err := os.ReadFile(lmc.fileName)
if err != nil {
return err
@ -70,7 +69,7 @@ func (lmc *loggerParamModifiedCommand) Done(o *basic.Object) error {
if len(data) != 0 {
err = logger.Reload(lmc.fileName)
if err != nil {
logger.Logger.Warn("===reload ", lmc.fileName, err)
logger.Logger.Warnf("reload logger.xml %v err: %v", lmc.fileName, err)
}
}
return err

20
common/password.go Normal file
View File

@ -0,0 +1,20 @@
package common
import (
"crypto/md5"
"encoding/hex"
"fmt"
"io"
)
func GetRawPassword(pwd string, ts ...int64) string {
var raw string
if len(ts) > 0 {
raw = fmt.Sprintf("%v%v%v", pwd, GetAppId(), ts[0])
} else {
raw = fmt.Sprintf("%v%v", pwd, GetAppId())
}
ht := md5.New()
io.WriteString(ht, raw)
return hex.EncodeToString(ht.Sum(nil))
}

View File

@ -348,3 +348,7 @@ func GetBElementFromA(A []interface{}, B int) []interface{} {
}
}
}
func RandFloat(min, max float64) float64 {
return min + rand.Float64()*(max-min)
}

View File

@ -40,6 +40,18 @@ func CopySliceIntToInt32(s []int) []int32 {
return nil
}
func CopySliceInt64ToInt32(s []int64) []int32 {
n := len(s)
if n != 0 {
temp := make([]int32, n)
for i := 0; i < n; i++ {
temp[i] = int32(s[i])
}
return temp
}
return nil
}
func CopySliceInt32ToInt(s []int32) []int {
n := len(s)
if n != 0 {
@ -440,6 +452,22 @@ func SliceValueWeight(sl []int, index int) float64 {
return float64(value) / float64(totle)
}
func GetMapKeys[K comparable, V any](data map[K]V) []K {
var ret []K
for k := range data {
ret = append(ret, k)
}
return ret
}
func GetMapValues[K comparable, V any](data map[K]V) []V {
var ret []V
for _, v := range data {
ret = append(ret, v)
}
return ret
}
type Int32Slice []int32
func (p Int32Slice) Len() int { return len(p) }

View File

@ -56,22 +56,22 @@ func (this *SSTransmitHandler) Process(s *netlib.Session, packetid int, data int
if transmitPack, ok := data.(*server.SSTransmit); ok {
pd := transmitPack.GetPacketData()
sid := transmitPack.GetSessionId()
packetid, packet, err := netlib.UnmarshalPacket(pd)
packetId, packet, err := netlib.UnmarshalPacket(pd)
if err == nil {
h := GetHandler(packetid)
h := GetHandler(packetId)
if h != nil {
utils.DumpStackIfPanic(fmt.Sprintf("SSTransmitHandler.Process error, packetid:%v", packetid))
watch := profile.TimeStatisticMgr.WatchStart(fmt.Sprintf("/action/packet:%v", packetid), profile.TIME_ELEMENT_ACTION)
err := h.Process(s, packetid, packet, sid)
utils.DumpStackIfPanic(fmt.Sprintf("SSTransmitHandler.Process error, packetId:%v", packetId))
watch := profile.TimeStatisticMgr.WatchStart(fmt.Sprintf("/action/packet:%v", packetId), profile.TIME_ELEMENT_ACTION)
err := h.Process(s, packetId, packet, sid)
if watch != nil {
watch.Stop()
}
if err != nil {
logger.Logger.Tracef("Packet [%d] error:", packetid, err)
logger.Logger.Tracef("Packet [%d] error: %v", packetId, err)
}
return err
} else {
logger.Logger.Tracef("Packet %v not find handler.", packetid)
logger.Logger.Tracef("Packet %v not find handler.", packetId)
}
} else {
logger.Logger.Trace("SSTransmitHandler process err:", err)

View File

@ -76,17 +76,15 @@ func InSameWeek(tNow, tPre time.Time) bool {
return true
}
preYear, preWeek := tPre.ISOWeek()
nowYear, nowWeek := tNow.ISOWeek()
if preYear == nowYear && preWeek == nowWeek {
if GetWeekStartTs(tNow.Unix()) == GetWeekStartTs(tPre.Unix()) {
return true
}
return false
}
func TsInSameWeek(tsNow, tsPre int64) bool {
tNow := time.Unix(tsNow, 0)
tPre := time.Unix(tsPre, 0)
tNow := time.Unix(tsNow, 0).Local()
tPre := time.Unix(tsPre, 0).Local()
return InSameWeek(tNow, tPre)
}
@ -132,6 +130,7 @@ func TsToStrTime(tc int64) string {
//return time.Now().Format("2018-07-02 19:14:00")
return time.Unix(tc, 0).Format("2006-01-02 15:04:05")
}
func TsToStrDateTime(tc int64) string {
//return time.Now().Format("2018-07-02 19:14:00")
return time.Unix(tc, 0).Format("2006-01-02")
@ -143,3 +142,70 @@ func InTimeRange(beginHour, beginMinute, endHour, endMinute, checkHour, checkMin
checkTime := checkHour*100 + checkMinute
return beginTime <= checkTime && checkTime <= endTime
}
// GetWeekStartTs 获取本周开始的时间戳,周一为周的开始
func GetWeekStartTs(ts int64) int64 {
now := time.Unix(ts, 0).Local()
year, month, day := now.Date()
today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
n := today.Weekday()
if today.Weekday() == 0 {
n = 7
}
st := today.AddDate(0, 0, -int(n-1)).Unix()
return st
}
func GetDayStartTs(ts int64) int64 {
now := time.Unix(ts, 0).Local()
year, month, day := now.Date()
today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
return today.Unix()
}
func GetDayNextStartTs(ts int64) int64 {
return GetDayStartTs(ts) + 86400
}
func GetMonthTimestamp() []int64 {
now := time.Now().Local()
year, month, _ := now.Date()
// 本月起始日期
st := time.Date(year, month, 1, 0, 0, 0, 0, time.Local).Unix()
// 计算下个月的年和月
if month == time.December {
year = year + 1
month = time.January
} else {
month = month + 1
}
// 构建下个月的第一天的时间
et := time.Date(year, month, 1, 0, 0, 0, 0, now.Location()).Unix()
return []int64{st, et}
}
// HMSToTime 将时分秒转换为今天的time
// h: 时
// m: 分
// s: 秒
func HMSToTime(h, m, s int) time.Time {
now := time.Now().Local()
year, month, day := now.Date()
return time.Date(year, month, day, h, m, s, 0, now.Location())
}
// IntToTime 将int转换为time
// n: 时*10000 + 分*100 + 秒
func IntToTime(n int) time.Time {
return HMSToTime(n/10000, n%10000/100, n%100)
}
func StrTimeToTime(s string) time.Time {
t, _ := time.ParseInLocation("2006-01-02 15:04:05", s, time.Local)
return t
}
func StrRFC3339TimeToTime(s string) time.Time {
t, _ := time.Parse(time.RFC3339, s)
return t
}

View File

@ -5,23 +5,24 @@ import (
)
const (
TransType_Login transact.TransType = 1000
TransType_Logout = 1001
TransType_WebTrascate = 1002
TransType_AddCoin = 1003
TransType_ViewData = 1004
TransType_DayTimeChange = 1005
TransType_CoinSceneChange = 1006
TransType_WebApi = 1007
TransType_WebApi_ForRank = 1101
TransType_GameSrvWebApi = 1008
TransType_QueryCoinPool = 1009
TransType_StopServer = 1010
TransType_QueryAllCoinPool = 1011
TransType_ActThrSrvWebApi = 1012
TransType_MatchSceneChange = 1013
TransType_MiniGameAddCoin = 1014
TransType_ServerCtrl = 1015
TransTypeLogin transact.TransType = 1000
TransTypeLogout = 1001
TransTypeWebTransact = 1002
TransTypeAddCoin = 1003
TransTypeViewData = 1004
TransTypeDayTimeChange = 1005
TransTypeCoinSceneChange = 1006
TransTypeWebApi = 1007
TransTypeWebApiForRank = 1101
TransTypeGameSrvWebApi = 1008
TransTypeQueryCoinPool = 1009
TransTypeStopServer = 1010
TransTypeQueryAllCoinPool = 1011
TransTypeActThrSrvWebApi = 1012
TransTypeMatchSceneChange = 1013
TransTypeMiniGameAddCoin = 1014
TransTypeServerCtrl = 1015
TranTypeAddItem = 1016 // 道具修改
)
type M2GWebTrascate struct {

View File

@ -1,16 +1,15 @@
ъУ†
ъФ†
ъХ†
ъЦ†
ъЧ†
ИШ†
ИЩ†
ИЪ†
 ИЫ†
иУ†
иФ†
иХ†
иЦ†
ЮЧ†
2Ш†
2Щ†
2Ъ†
 2Ы†


Ь†
 2ЎЌђN
 ¬ЎЌР†
 2ЎЌ Ќ
Ь†
 фЎЌђN
 dЎЌР†
 ЎЌ Ќ

View File

@ -2,91 +2,91 @@
"Arr": [
{
"Id": 1,
"Rate": 250,
"Rate": 1000,
"ItemID": {
"50003": 1
}
},
{
"Id": 2,
"Rate": 250,
"Rate": 1000,
"ItemID": {
"50004": 1
}
},
{
"Id": 3,
"Rate": 250,
"Rate": 1000,
"ItemID": {
"50005": 1
}
},
{
"Id": 4,
"Rate": 250,
"Rate": 1000,
"ItemID": {
"50006": 1
}
},
{
"Id": 5,
"Rate": 250,
"Rate": 350,
"ItemID": {
"50007": 1
}
},
{
"Id": 6,
"Rate": 200,
"Rate": 50,
"ItemID": {
"50008": 1
}
},
{
"Id": 7,
"Rate": 200,
"Rate": 50,
"ItemID": {
"50009": 1
}
},
{
"Id": 8,
"Rate": 200,
"Rate": 50,
"ItemID": {
"50010": 1
}
},
{
"Id": 9,
"Rate": 200,
"Rate": 50,
"ItemID": {
"50011": 1
}
},
{
"Id": 10,
"Rate": 10,
"Rate": 1,
"ItemID": {
"50012": 1
}
},
{
"Id": 11,
"Rate": 50,
"Rate": 500,
"ItemID": {
"100001": 10000
}
},
{
"Id": 12,
"Rate": 300,
"Rate": 100,
"ItemID": {
"100001": 50000
}
},
{
"Id": 13,
"Rate": 50,
"Rate": 20,
"ItemID": {
"100001": 100000
}

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,17 @@
 红米手机 æÑ(
é‡å¸<C3A5> ¡<>( Â
 酷帕碎片 ¡œ(
积分 ¬<>(20Þ
!2å…ƒè¯<C3A8>è´¹ç´å…券 ¹ê(0,
é‡å¸<C3A5> ¡<>(€­â0X
魔法师碎片 £œ(
哈奴曼啤酒 ©º(0
 积分 ¬<>(d0ï

 è<>¶å¥³ç¢Žç‰‡ ¢œ(
 钻石 ¢<>(
! 5å…ƒè¯<C3A8>è´¹ç´å…券 ºê(0
 钻石 ¢<>(0¸
积分 ¬<>0¸
1å…ƒè¯<C3A8>è´¹ç´å…券 ¸ê(

122
data/DB_DiamondLottery.json Normal file
View File

@ -0,0 +1,122 @@
{
"Arr": [
{
"Id": 1,
"Type": 1,
"Name": "红米手机",
"Item_Id": 76006,
"Grade": 1
},
{
"Id": 2,
"Type": 1,
"Name": "金币",
"Item_Id": 100001,
"Grade": 500000,
"Oddrate": 1758
},
{
"Id": 3,
"Type": 1,
"Name": "酷帕碎片",
"Item_Id": 20001,
"Grade": 1,
"Oddrate": 879
},
{
"Id": 4,
"Type": 1,
"Name": "积分",
"Item_Id": 100012,
"Grade": 50,
"Oddrate": 1758
},
{
"Id": 5,
"Type": 1,
"Name": "2元话费直兑券",
"Item_Id": 30009,
"Grade": 1,
"Oddrate": 44
},
{
"Id": 6,
"Type": 1,
"Name": "金币",
"Item_Id": 100001,
"Grade": 10000000,
"Oddrate": 88
},
{
"Id": 7,
"Type": 1,
"Name": "魔法师碎片",
"Item_Id": 20003,
"Grade": 1,
"Oddrate": 176
},
{
"Id": 8,
"Type": 1,
"Name": "哈奴曼啤酒",
"Item_Id": 73001,
"Grade": 1,
"Oddrate": 5
},
{
"Id": 9,
"Type": 1,
"Name": "积分",
"Item_Id": 100012,
"Grade": 100,
"Oddrate": 879
},
{
"Id": 10,
"Type": 1,
"Name": "蝶女碎片",
"Item_Id": 20002,
"Grade": 1,
"Oddrate": 1758
},
{
"Id": 11,
"Type": 1,
"Name": "钻石",
"Item_Id": 100002,
"Grade": 5,
"Oddrate": 1758
},
{
"Id": 12,
"Type": 1,
"Name": "5元话费直兑券",
"Item_Id": 30010,
"Grade": 1,
"Oddrate": 17
},
{
"Id": 13,
"Type": 1,
"Name": "钻石",
"Item_Id": 100002,
"Grade": 20,
"Oddrate": 440
},
{
"Id": 14,
"Type": 1,
"Name": "积分",
"Item_Id": 100012,
"Grade": 200,
"Oddrate": 440
},
{
"Id": 15,
"Type": 2,
"Name": "1元话费直兑券",
"Item_Id": 30008,
"Grade": 1
}
]
}

View File

@ -76,4 +76,35 @@
9ѓр<D193><18> ПЕџџџџ <20><>пРJ(<28>ЈжЙ0d8 @<40>џџџџџџџџHрљџџџџџџџP
:єр<D194><18>АЄМ<D084>§џџџ <20>алУє(<28>ШЏ %0d8 @<40>џџџџџџџџHрљџџџџџџџP
;ѕр<D195><18>Е­Йёџџџ <20><>ЪвЦ(<28>шэЁК0d8 @<40>џџџџџџџџHрљџџџџџџџP
;öà–€À×µåÅÿÿÿ €À¨Êš:(€ ·‡é0d8 @œÿÿÿÿÿÿÿÿHàùÿÿÿÿÿÿÿP
;öà–€À×µåÅÿÿÿ €À¨Êš:(€ ·‡é0d8 @œÿÿÿÿÿÿÿÿHàùÿÿÿÿÿÿÿP
ÑÛ·€ŽÎ€áë €„¯_XÈ`À¤ÿ
ÒÛ·€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
ÓÛ·€¼Á– €ò‹¨ €È¯ %XÈ`€¡Ü<C2A1>
ÔÛ·€ø‚­€ä—Ð<>ßÀJXÈ`€Â¸›
᩸€ŽÎ€áë €„¯_XÈ`À¤ÿ
⩸€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
㩸€¼Á– €ò‹¨ €È¯ %XÈ`€¡Ü<C2A1>
䩸€ø‚­€ä—Ð<>ßÀJXÈ`€Â¸›
ñ÷¸€ŽÎ€áë €„¯_XÈ`À¤ÿ
ò÷¸€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
ó÷¸€¼Á– €ò‹¨ €È¯ %XÈ`€¡Ü<C2A1>
ô÷¸€ø‚­€ä—Ð<>ßÀJXÈ`€Â¸›
<08>ƹ€ŽÎ€áë €¨Ö¹`À¤ÿ
‚ƹ€¼Á– €ò‹¨ €È¯ %XÈ`€¡Ü<C2A1>
ƒÆ¹€ø‚­€ä—Ð<>ßÀJXÈ`€Â¸›
‘”º€ŽÎ€áë €¨Ö¹`À¤ÿ
’”º€¼Á– €ò‹¨ €È¯ %XÈ`€¡Ü<C2A1>
“”º€ø‚­€ä—Ð<>ßÀJXÈ`€Â¸›
¡âº€›îÀ–± €ÚÄ XÈ` ÝŒ
¢âº€ŽÎ€áë €„¯_XÈ`À¤ÿ
£âº€Æ†<C386>€åšw €”ëÜ`À¶üš
¤âº€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
±°»€›îÀ–± €ÚÄ XÈ` ÝŒ
²°»€ŽÎ€áë €„¯_XÈ`À¤ÿ
³°»€Æ†<C386>€åšw €”ëÜ`À¶üš
´°»€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
Áþ»€›îÀ–± €ÚÄ XÈ` ÝŒ
Ñ̼€ŽÎ€áë €„¯_XÈ`À¤ÿ
áš½€Æ†<C386>€åšw €”ëÜ`À¶üš
ñè½€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ
<08>·¾€Œ<E282AC>ž€Êµî €¨Ö¹`€íøµ

View File

@ -857,6 +857,254 @@
"LowerOdds": -100,
"LowerOddsMax": -800,
"ProfitRate": 20
},
{
"Id": 3010001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3010002,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3010003,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3010004,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000000
},
{
"Id": 3020001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3020002,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3020003,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3020004,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000000
},
{
"Id": 3030001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3030002,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3030003,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3030004,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000000
},
{
"Id": 3040001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3040002,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3040003,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000000
},
{
"Id": 3050001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3050002,
"InitValue": 3000000000,
"LowerLimit": 2500000000,
"UpperLimit": 10000000000,
"CtrlRate": 200,
"InitNovicValue": 3250000000
},
{
"Id": 3050003,
"InitValue": 6000000000,
"LowerLimit": 5000000000,
"UpperLimit": 20000000000,
"CtrlRate": 200,
"InitNovicValue": 6500000000
},
{
"Id": 3060001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
},
{
"Id": 3060002,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3060003,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
},
{
"Id": 3060004,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3070001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
},
{
"Id": 3070002,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3070003,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
},
{
"Id": 3070004,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3080001,
"InitValue": 6000000,
"LowerLimit": 5000000,
"UpperLimit": 20000000,
"CtrlRate": 200,
"InitNovicValue": 6500000
},
{
"Id": 3090001,
"InitValue": 60000000,
"LowerLimit": 50000000,
"UpperLimit": 200000000,
"CtrlRate": 200,
"InitNovicValue": 65000000
},
{
"Id": 3100001,
"InitValue": 300000000,
"LowerLimit": 250000000,
"UpperLimit": 1000000000,
"CtrlRate": 200,
"InitNovicValue": 325000000
},
{
"Id": 3110001,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
},
{
"Id": 3120001,
"InitValue": 600000000,
"LowerLimit": 500000000,
"UpperLimit": 2000000000,
"CtrlRate": 200,
"InitNovicValue": 650000000
}
]
}

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -10,43 +10,43 @@
"Id": 20800,
"Name": "Tienlen自由桌娱乐场-WTA",
"GameId": 208,
"GameDif": "208"
"GameDif": "207"
},
{
"Id": 20900,
"Name": "Tienlen自由桌经典场(打到底)",
"GameId": 209,
"GameDif": "209"
"GameDif": "207"
},
{
"Id": 21000,
"Name": "Tienlen自由桌娱乐场(打到底)",
"GameId": 210,
"GameDif": "210"
"GameDif": "207"
},
{
"Id": 24000,
"Name": "Tienlen经典场-WTA",
"GameId": 240,
"GameDif": "240"
"GameDif": "207"
},
{
"Id": 24400,
"Name": "Tienlen经典场打到底",
"GameId": 244,
"GameDif": "244"
"GameDif": "207"
},
{
"Id": 24100,
"Name": "Tienlen娱乐场-WTA",
"GameId": 241,
"GameDif": "241"
"GameDif": "207"
},
{
"Id": 24500,
"Name": "tienlen娱乐版打到底",
"GameId": 245,
"GameDif": "245"
"GameDif": "207"
},
{
"Id": 40100,
@ -54,18 +54,6 @@
"GameId": 401,
"GameDif": "401"
},
{
"Id": 30600,
"Name": "水果拉霸",
"GameId": 306,
"GameDif": "306"
},
{
"Id": 30400,
"Name": "冰河世纪",
"GameId": 304,
"GameDif": "304"
},
{
"Id": 52100,
"Name": "ChessCambodian",
@ -76,14 +64,14 @@
"Id": 52200,
"Name": "ChessCambodianRobot",
"GameId": 522,
"GameDif": "522"
"GameDif": "521"
},
{
"Id": 21100,
"Name": "十三张(四人场)",
"GameId": 211,
"Params": [
0,
4,
0,
30,
50,
@ -96,20 +84,20 @@
"Name": "十三张(八人场)",
"GameId": 212,
"Params": [
1,
8,
0,
30,
50,
0
],
"GameDif": "212"
"GameDif": "211"
},
{
"Id": 21300,
"Name": "十三张(自由场经典场)",
"GameId": 213,
"Params": [
1,
8,
0,
30,
50,
@ -122,7 +110,7 @@
"Name": "十三张(自由场癞子场)",
"GameId": 214,
"Params": [
1,
8,
0,
30,
50,
@ -134,25 +122,49 @@
"Id": 24200,
"Name": "Tienlen排位赛经典场-WTA",
"GameId": 242,
"GameDif": "242"
"GameDif": "207"
},
{
"Id": 24600,
"Name": "Tienlen排位赛经典场打到底",
"GameId": 246,
"GameDif": "246"
"GameDif": "207"
},
{
"Id": 24300,
"Name": "Tienlen排位赛娱乐场-WTA",
"GameId": 243,
"GameDif": "243"
"GameDif": "207"
},
{
"Id": 24700,
"Name": "tienlen排位赛娱乐打到底",
"GameId": 247,
"GameDif": "247"
"GameDif": "207"
},
{
"Id": 21500,
"Name": "tienlen房卡经典",
"GameId": 215,
"GameDif": "207"
},
{
"Id": 21600,
"Name": "tienlen房卡娱乐",
"GameId": 216,
"GameDif": "207"
},
{
"Id": 21700,
"Name": "tienlen房卡经典打到底",
"GameId": 217,
"GameDif": "207"
},
{
"Id": 21800,
"Name": "tienlen房卡娱乐打到底",
"GameId": 218,
"GameDif": "207"
},
{
"Id": 60600,
@ -165,6 +177,96 @@
"Name": "小火箭",
"GameId": 607,
"GameDif": "607"
},
{
"Id": 30100,
"Name": "财运神",
"GameId": 301,
"GameDif": "301"
},
{
"Id": 30200,
"Name": "复仇者联盟",
"GameId": 302,
"GameDif": "302"
},
{
"Id": 30300,
"Name": "复活节岛",
"GameId": 303,
"GameDif": "303"
},
{
"Id": 30400,
"Name": "冰河世纪",
"GameId": 304,
"GameDif": "304"
},
{
"Id": 30500,
"Name": "百战成神",
"GameId": 305,
"GameDif": "305"
},
{
"Id": 30600,
"Name": "水果拉霸",
"GameId": 306,
"GameDif": "306"
},
{
"Id": 30700,
"Name": "多财多福",
"GameId": 307,
"GameDif": "307"
},
{
"Id": 30800,
"Name": "FortuneTiger",
"GameId": 308,
"GameDif": "308"
},
{
"Id": 30900,
"Name": "FortuneDragon",
"GameId": 309,
"GameDif": "309"
},
{
"Id": 31000,
"Name": "FortuneRabbit",
"GameId": 310,
"GameDif": "310"
},
{
"Id": 31100,
"Name": "FortuneOx",
"GameId": 311,
"GameDif": "311"
},
{
"Id": 31200,
"Name": "FortuneMouse",
"GameId": 312,
"GameDif": "312"
},
{
"Id": 31300,
"Name": "CashMania",
"GameId": 313,
"GameDif": "313"
},
{
"Id": 31400,
"Name": "GatesOfOlympus",
"GameId": 314,
"GameDif": "314"
},
{
"Id": 60800,
"Name": "娃娃机",
"GameId": 608,
"GameDif": "608"
}
]
}

View File

@ -1,210 +1,55 @@
Яа(Бъ:
Я<18>'(Бъ:
Я<18>N(Бъ:
Я<18>u(Бъ:
Я <>(Бъ:
ЯЈУ(Бъ:
ЯАъ(Бъ:
ЯИ<>(Бъ:
 ЯРИ(Бъ:
Ð ±ê(2
ˆ' ±ê(12
<10>N ±ê(c2
˜u ±ê(•2
 œ ±ê2
¨Ã ±ê2
°ê ±ê2
¸ ±ê2
 À¸ ±ê2

ЯШп(Бъ:
 Яа<>(Бъ:
 Яи­(Бъ:
 Ярд(Бъ:
Яшћ(Бъ:
Я№Ђ(Бъ:
ЯјЩ(Бъ:
Я<18>ё(Бъ:
Я<18><>(Бъ:
Я<18>П(Бъ:
Я<18>ц(Бъ:
Я <>(Бъ:
Я<> (Бъ:
ЯР<> (Бъ:
Я<18>Ё(Бъ:
ЯрЇ(Бъ:
ЯАЎ(Бъ:
Я<18>Е(Бъ:
ЯаЛ(Бъ:
Я Т(Бъ:
Я№Ш!(Бъ:
ЯРЯ$(Бъ:
 Я<18>ж'(Бъ:
!Ярм*(Бъ:
"ЯАу-(Бъ:
#Я<18>ъ0(Бъ:
$Яа№3(Бъ:
%Я ї6(Бъ:
&Я№§9(Бъ:
'ЯР<>=(Бъ:
(Я<18><>z(Бъ:
)ЯР<>Б(Бъ:

*Я<18>­т(Бъ:2
+ЯРУ<D0A0>(Бъ:2K
,Я<18>кФ (Бъ:Kd
-ЯР№ѕ (Бъ:d}
.Я<18><>Ї(Бъ:}<7D>
/ЯР<>и(Бъ:<04>Џ
0Я<18>Д<EFBFBD>(Бъ:ЏШ
1ЯРЪК(Бъ:Шс
2Я<18>сы(Бъ:сњ
3аа(Бъ:
4а<18>'(Бъ:
5а<18>N(Бъ:
6а<18>u(Бъ:
7а <>(Бъ:
8аЈУ(Бъ:
9аАъ(Бъ:
:аИ<>(Бъ:
;аРИ(Бъ:
<аШп(Бъ:
=аа<>(Бъ:
>аи­(Бъ:
?ард(Бъ:
@ашћ(Бъ:
Aа№Ђ(Бъ:
BајЩ(Бъ:
Cа<18>ё(Бъ:
Dа<18><>(Бъ:
Eа<18>П(Бъ:
Fа<18>ц(Бъ:
Gа <>(Бъ:
Hа<> (Бъ:
IаР<> (Бъ:
Jа<18>Ё(Бъ:
KарЇ(Бъ:
LаАЎ(Бъ:
Mа<18>Е(Бъ:
NааЛ(Бъ:
Oа Т(Бъ:
Pа№Ш!(Бъ:
QаРЯ$(Бъ:
Rа<18>ж'(Бъ:
Sарм*(Бъ:
TаАу-(Бъ:
Uа<18>ъ0(Бъ:
Vаа№3(Бъ:
Wа ї6(Бъ:
Xа№§9(Бъ:
YаР<>=(Бъ:
Zа<18><>z(Бъ:
[аР<>Б(Бъ:

\а<18>­т(Бъ:2
]аРУ<D0A0>(Бъ:2K
^а<18>кФ (Бъ:Kd
_аР№ѕ (Бъ:d}
`а<18><>Ї(Бъ:}<7D>
aаР<>и(Бъ:<04>Џ
bа<18>Д<EFBFBD>(Бъ:ЏШ
cаРЪК(Бъ:Шс
dа<18>сы(Бъ:сњ
eба(Бъ:
fб<18>'(Бъ:
gб<18>N(Бъ:
hб<18>u(Бъ:
iб <>(Бъ:
jбЈУ(Бъ:
kбАъ(Бъ:
lбИ<>(Бъ:
mбРИ(Бъ:
nбШп(Бъ:
oба<>(Бъ:
pби­(Бъ:
qбрд(Бъ:
rбшћ(Бъ:
sб№Ђ(Бъ:
tбјЩ(Бъ:
uб<18>ё(Бъ:
vб<18><>(Бъ:
wб<18>П(Бъ:
xб<18>ц(Бъ:
yб <>(Бъ:
zб<> (Бъ:
{бР<> (Бъ:
|б<18>Ё(Бъ:
}брЇ(Бъ:
~бАЎ(Бъ:
б<18>Е(Бъ:
<08>баЛ(Бъ:
<08>б Т(Бъ:
<08>б№Ш!(Бъ:
<08>бРЯ$(Бъ:
<08>б<18>ж'(Бъ:
<08>брм*(Бъ:
<08>бАу-(Бъ:
<08>б<18>ъ0(Бъ:
<08>ба№3(Бъ:
<08>б ї6(Бъ:
<08>б№§9(Бъ:
<08>бР<>=(Бъ:
<08>б<18><>z(Бъ:
<08>бР<>Б(Бъ:

<08>б<18>­т(Бъ:2
<08>бРУ<D0A0>(Бъ:2K
<08>б<18>кФ (Бъ:Kd
<08>бР№ѕ (Бъ:d}
<08>б<18><>Ї(Бъ:}<7D>
<08>бР<>и(Бъ:<04>Џ
<08>б<18>Д<EFBFBD>(Бъ:ЏШ
<08>бРЪК(Бъ:Шс
<08>б<18>сы(Бъ:сњ
<08>ва(Бъ:
<08>в<18>'(Бъ:
<08>в<18>N(Бъ:
<08>в<18>u(Бъ:
<08>в <>(Бъ:
<08>вЈУ(Бъ:
<08>вАъ(Бъ:
<08>вИ<>(Бъ:
<08>вРИ(Бъ:
 вШп(Бъ:
Ёва<>(Бъ:
Ђви­(Бъ:
Ѓврд(Бъ:
Євшћ(Бъ:
Ѕв№Ђ(Бъ:
ІвјЩ(Бъ:
Їв<18>ё(Бъ:
Јв<18><>(Бъ:
Љв<18>П(Бъ:
Њв<18>ц(Бъ:
Ћв <>(Бъ:
Ќв<> (Бъ:
­вР<> (Бъ:
Ўв<18>Ё(Бъ:
ЏврЇ(Бъ:
АвАЎ(Бъ:
Бв<18>Е(Бъ:
ВваЛ(Бъ:
Гв Т(Бъ:
Дв№Ш!(Бъ:
ЕвРЯ$(Бъ:
Жв<18>ж'(Бъ:
Зврм*(Бъ:
ИвАу-(Бъ:
Йв<18>ъ0(Бъ:
Ква№3(Бъ:
Лв ї6(Бъ:
Мв№§9(Бъ:
НвР<>=(Бъ:
Ов<18><>z(Бъ:
ПвР<>Б(Бъ:

Рв<18>­т(Бъ:2
СвРУ<D0A0>(Бъ:2K
Тв<18>кФ (Бъ:Kd
УвР№ѕ (Бъ:d}
Фв<18><>Ї(Бъ:}<7D>
ХвР<>и(Бъ:<04>Џ
Цв<18>Д<EFBFBD>(Бъ:ЏШ
ЧвРЪК(Бъ:Шс
Шв<18>сы(Бъ:сњ
Èß ±ê2
 І ±ê2
 Ø­ ±ê2
 àÔ ±ê2
èû ±ê2
𢠱ê2
øÉ ±ê2
€ñ ±ê(˜2
ˆ˜ ±ê2
<10>¿ ±ê2
˜æ ±ê(­2
 <> ±ê2
ð“ ±ê 2
Àš ±ê2
<10>¡ ±ê2
à§ ±ê2
°® ±ê(‰2
€µ ±ê2
л ±ê(ç"2
 Â ±ê(Ö&2
ðÈ! ±ê(Å*2
ÀÏ$ ±ê(´.2
 <10>Ö' ±ê(£22
!àÜ* ±ê(ë32
"°ã- ±ê(³52
#€ê0 ±ê(û62
$Ðð3 ±ê(Ã82
% ÷6 ±ê(:2
&ðý9 ±ê(Ó;2
'À„= ±ê(=2
(€‰z ±ê(ã>2
)À–± ±ê(«@2
*€­â ±ê(<28>N2
+ÀÓ ±ê(<28>N2
,€ÚÄ ±ê(<28>N2
-Àðõ ±ê(<28>N2
.€‡§ ±ê(<28>N2$
/À<>Ø ±ê(<28>N2$*
0€´‰ ±ê(<28>N2)0
1Àʺ ±ê(<28>N2.6
2€áë ±ê(<28>N23<
3€Â×/ ±ê(<28>N2e{
4€£ÃG ±ê(<28>N2¤
5€„¯_ ±ê(<28>N2Çö

File diff suppressed because it is too large Load Diff

BIN
data/DB_GiftCard.dat Normal file

Binary file not shown.

20
data/DB_GiftCard.json Normal file
View File

@ -0,0 +1,20 @@
{
"Arr": [
{
"Id": 1,
"ShopID": 970001,
"Name": "7日礼品卡",
"Rewards": {
"100001": 5000000,
"50001": 10
},
"DayRewards": {
"100001": 1000000
},
"Time": 7,
"Equity": [
0
]
}
]
}

5
data/DB_PassShow.dat Normal file
View File

@ -0,0 +1,5 @@
<18>‰z Łś
N N
â§

21
data/DB_PassShow.json Normal file
View File

@ -0,0 +1,21 @@
{
"Arr": [
{
"Id": 1,
"ShowType": 1,
"ShowVolume": 2000003,
"Location": 20003
},
{
"Id": 2,
"ShowType": 2,
"ShowVolume": 10001,
"Location": 10001
},
{
"Id": 3,
"ShowType": 3,
"ShowVolume": 300002
}
]
}

14
data/DB_PetSkill.dat Normal file
View File

@ -0,0 +1,14 @@
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>"
W<>=(2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@J<08>7
W <>=( 2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@ J<08>Y
X
<>=(
2 驥鷹ク。螳亥梱:1蝨ィ陲ォ轤ク蠑ケ譏守。ョ謾サ蜃サ譌カ{0}%讎ら紫螳悟<E89EB3>蜈咲稔@
J<08><10>

134
data/DB_PetSkill.json Normal file
View File

@ -0,0 +1,134 @@
{
"Arr": [
{
"Id": 1,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 1,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 1,
"ItemConsum": {
"11001": 20
}
},
{
"Id": 2,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 2,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 2,
"ItemConsum": {
"11001": 3
}
},
{
"Id": 3,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 3,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 3,
"ItemConsum": {
"11001": 5
}
},
{
"Id": 4,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 4,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 4,
"ItemConsum": {
"11001": 8
}
},
{
"Id": 5,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 5,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 5,
"ItemConsum": {
"11001": 13
}
},
{
"Id": 6,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 6,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 6,
"ItemConsum": {
"11001": 21
}
},
{
"Id": 7,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 7,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 7,
"ItemConsum": {
"11001": 34
}
},
{
"Id": 8,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 8,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 8,
"ItemConsum": {
"11001": 55
}
},
{
"Id": 9,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 9,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 9,
"ItemConsum": {
"11001": 89
}
},
{
"Id": 10,
"SkillId": 10001,
"SkillType": 1,
"PetId": 1000001,
"SkillLevel": 10,
"SkillName": "金鸡守卫",
"SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫",
"SKillValue": 10,
"ItemConsum": {
"11001": 144
}
}
]
}

View File

@ -0,0 +1,4 @@
 (Ђ­в08Ўи;@dHPc
 ((Ђ­в8ўи;@dH¬PЗ
яБЧ/ 2(Ђ­в0о8Ји;@dHоPу

View File

@ -0,0 +1,40 @@
{
"Arr": [
{
"Id": 1,
"BuyCountMin": 1,
"BuyCountMax": 1,
"CostDiamond": 30,
"MaxGold": 10000000,
"MaxDiamond": 150,
"DiamondId": 980001,
"CoinPrice": 100,
"DiamondPrice": 150,
"DiamondNowPrice": 99
},
{
"Id": 2,
"BuyCountMin": 2,
"BuyCountMax": 2,
"CostDiamond": 40,
"MaxGold": 10000000,
"MaxDiamond": 300,
"DiamondId": 980002,
"CoinPrice": 100,
"DiamondPrice": 300,
"DiamondNowPrice": 199
},
{
"Id": 3,
"BuyCountMin": 3,
"BuyCountMax": 99999999,
"CostDiamond": 50,
"MaxGold": 10000000,
"MaxDiamond": 750,
"DiamondId": 980003,
"CoinPrice": 100,
"DiamondPrice": 750,
"DiamondNowPrice": 499
}
]
}

9
data/DB_Pigbank_Prop.dat Normal file
View File

@ -0,0 +1,9 @@
 WinCoinRate
 LoseCoinRate
 DayBuyMaxCnt
WinCoinRateDiamond
LoseCoinRateDiamond
DayBuyMaxCntDiamond

34
data/DB_Pigbank_Prop.json Normal file
View File

@ -0,0 +1,34 @@
{
"Arr": [
{
"Id": 1,
"PorpName": "WinCoinRate",
"PropValue": 5
},
{
"Id": 2,
"PorpName": "LoseCoinRate",
"PropValue": 10
},
{
"Id": 3,
"PorpName": "DayBuyMaxCnt",
"PropValue": 3
},
{
"Id": 4,
"PorpName": "WinCoinRateDiamond",
"PropValue": 5
},
{
"Id": 5,
"PorpName": "LoseCoinRateDiamond",
"PropValue": 10
},
{
"Id": 6,
"PorpName": "DayBuyMaxCntDiamond",
"PropValue": 3
}
]
}

Binary file not shown.

View File

@ -63,6 +63,54 @@
"Gain": {
"100002": 500
}
}
},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{},
{}
]
}

View File

@ -1,8 +1,9 @@
$0@HЂ‡§
0@HЂЪД
0@­в
0@HЂк0
08@H В
 08d@Hа§
082@HАљ
$0@HЂ‡§
08d@HЂЪД
08<@­в
08(@HЂк0
08@H В
 08@Hа§
08
@HАљ

View File

@ -5,7 +5,7 @@
"RankType": 1,
"Level": 36,
"Award2Id": 2,
"Award2Num": 1000,
"Award2Num": 200,
"Award3Id": 1,
"Award3Num": 30000000
},
@ -14,7 +14,7 @@
"RankType": 1,
"Level": 31,
"Award2Id": 2,
"Award2Num": 500,
"Award2Num": 100,
"Award3Id": 1,
"Award3Num": 20000000
},
@ -23,7 +23,7 @@
"RankType": 1,
"Level": 26,
"Award2Id": 2,
"Award2Num": 300,
"Award2Num": 60,
"Award3Id": 1,
"Award3Num": 10000000
},
@ -32,7 +32,7 @@
"RankType": 1,
"Level": 21,
"Award2Id": 2,
"Award2Num": 200,
"Award2Num": 40,
"Award3Id": 1,
"Award3Num": 800000
},
@ -41,7 +41,7 @@
"RankType": 1,
"Level": 16,
"Award2Id": 2,
"Award2Num": 150,
"Award2Num": 30,
"Award3Id": 1,
"Award3Num": 500000
},
@ -50,7 +50,7 @@
"RankType": 1,
"Level": 11,
"Award2Id": 2,
"Award2Num": 100,
"Award2Num": 20,
"Award3Id": 1,
"Award3Num": 300000
},
@ -59,7 +59,7 @@
"RankType": 1,
"Level": 6,
"Award2Id": 2,
"Award2Num": 50,
"Award2Num": 10,
"Award3Id": 1,
"Award3Num": 200000
}

BIN
data/DB_Skin.dat Normal file

Binary file not shown.

147
data/DB_Skin.json Normal file
View File

@ -0,0 +1,147 @@
{
"Arr": [
{
"Id": 300001,
"SkinClass": 4,
"Model": "juese",
"SkinPic": "icon_300001",
"SkinName": "活力-黄",
"SkinType": "mg_01",
"SkinSkillName": "0",
"SkinSkillIcon": "0",
"SkinSkillDes": "0",
"Turn": [
0
],
"TurnKey": [
"0"
]
},
{
"Id": 300002,
"SkinClass": 2,
"Model": "juese",
"SkinPic": "icon_300002",
"SkinName": "财神送福",
"SkinType": "mg_06",
"UnlockType": 2,
"UnlockItem": {
"310002": 20
},
"SkinSkillName": "福气东来",
"SkinSkillIcon": "SkillIcon-30002",
"SkinSkillDes": "排位赛积分提升",
"Turn": [
1
],
"TurnKey": [
"DBSkinUnlock_300002_t1"
]
},
{
"Id": 300003,
"SkinClass": 2,
"Model": "juese",
"SkinPic": "icon_300003",
"SkinName": "活力-粉",
"SkinType": "mg_02",
"UnlockType": 2,
"UnlockItem": {
"310003": 20
},
"SkinSkillName": "活力满满",
"SkinSkillIcon": "SkillIcon-30003",
"SkinSkillDes": "VIP赛每日免费报名次数提升",
"Turn": [
2
],
"TurnKey": [
"DBSkinUnlock_300003_t1"
]
},
{
"Id": 300004,
"SkinClass": 2,
"Model": "juese",
"SkinPic": "icon_300004",
"SkinName": "活力-青",
"SkinType": "mg_03",
"UnlockType": 2,
"UnlockItem": {
"310004": 20
},
"SkinSkillName": "金币满满",
"SkinSkillIcon": "SkillIcon-30004",
"SkinSkillDes": "每日礼包金币奖励提升",
"Turn": [
2
],
"TurnKey": [
"DBSkinUnlock_300004_t1"
]
},
{
"Id": 300005,
"SkinClass": 2,
"Model": "juese",
"SkinPic": "icon_300005",
"SkinName": "摇滚小子",
"SkinType": "mg_04",
"UnlockType": 2,
"UnlockItem": {
"310005": 20
},
"SkinSkillName": "金币加成",
"SkinSkillIcon": "SkillIcon-30005",
"SkinSkillDes": "每日任务金币奖励加成",
"Turn": [
3
],
"TurnKey": [
"DBSkinUnlock_300005_t1"
]
},
{
"Id": 300006,
"SkinClass": 4,
"Model": "juese",
"SkinPic": "icon_300006",
"SkinName": "潜水员",
"SkinType": "mg_05",
"UnlockType": 2,
"UnlockItem": {
"310006": 20
},
"SkinSkillName": "0",
"SkinSkillIcon": "0",
"SkinSkillDes": "0",
"Turn": [
4
],
"TurnKey": [
"DBSkinUnlock_300006_t1"
]
},
{
"Id": 300007,
"SkinClass": 2,
"Model": "juese",
"SkinPic": "icon_300007",
"SkinName": "冲浪健将",
"SkinType": "mg_07",
"UnlockType": 2,
"UnlockItem": {
"310007": 20
},
"SkinSkillName": "好运加成",
"SkinSkillIcon": "SkillIcon-30007",
"SkinSkillDes": "每次钻石抽奖幸运值提升",
"Turn": [
5
],
"TurnKey": [
"DBSkinUnlock_300007_t1"
]
}
]
}

89
data/DB_SkinLevel.dat Normal file
View File

@ -0,0 +1,89 @@
á§B0
á§"ñõB0
á§"ñõB0
á§"ñõB0
á§"ñõ B0
á§"ñõB0
á§"ñõ"B0
á§"ñõ7B0
 á§ "ñõYB0

á§
"ñõ<10>B0
+ â§(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3 â§"òõ(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3 â§"òõ(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§"òõ(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§"òõ (²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§"òõ(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§"òõ"(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§"òõ7(²ê08BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
3â§ "òõY(²ê0 8 BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
4â§
"òõ<10>(²ê0
8
BæŽä½<C3A4>èµç§¯åˆ†æ<E280A0><C3A6>å<EFBFBD>‡{0}%
9ã§(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ (³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ"(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§"óõ7(³ê08B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Aã§ "óõY(³ê0 8 B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
Bã§
"óõ<10>(³ê0
8
B'VIPèµæ¯<C3A6>æ—¥å…<C3A5>费报å<C2A5><C3A5>次数æ<C2B0><C3A6>å<EFBFBD>‡{0}
4ä§(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
< ä§"ôõ(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<!ä§"ôõ(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<"ä§"ôõ(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<#ä§"ôõ (´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<$ä§"ôõ(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<%ä§"ôõ"(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<&ä§"ôõ7(´ê08B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<'ä§ "ôõY(´ê0 8 B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
=(ä§
"ôõ<10>(´ê0
8
B"æ¯<C3A6>日礼包é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
4)å§(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<*å§"õõ(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<+å§"õõ(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<,å§"õõ(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<-å§"õõ (µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<.å§"õõ(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
</å§"õõ"(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<0å§"õõ7(µê08B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
<1å§ "õõY(µê0 8 B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
=2å§
"õõ<10>(µê0
8
B"æ¯<C3A6>日任务é‡å¸<C3A5>å¥åбæ<C2B1><C3A6>å<EFBFBD>‡{0}%
3æ§B0
4æ§"öõB0
5æ§"öõB0
6æ§"öõB0
7æ§"öõ B0
8æ§"öõB0
9æ§"öõ"B0
:æ§"öõ7B0
;æ§ "öõYB0
<æ§
"öõ<10>B0
7=ç§(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?>ç§"÷õ(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
??ç§"÷õ(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?@ç§"÷õ(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?Aç§"÷õ (·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?Bç§"÷õ(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?Cç§"÷õ"(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?Dç§"÷õ7(·ê08B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
?Eç§ "÷õY(·ê0 8 B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%
@Fç§
"÷õ<10>(·ê0
8
B%æ¯<C3A6>次é»çŸ³æŠ½å¥å¹¸è¿<C3A8>值æ<C2BC><C3A6>å<EFBFBD>‡{0}%

763
data/DB_SkinLevel.json Normal file
View File

@ -0,0 +1,763 @@
{
"Arr": [
{
"Id": 1,
"SkinId": 300001,
"Level": 1,
"SkinSkillDes": "0"
},
{
"Id": 2,
"SkinId": 300001,
"Level": 2,
"UpItem": {
"310001": 3
},
"SkinSkillDes": "0"
},
{
"Id": 3,
"SkinId": 300001,
"Level": 3,
"UpItem": {
"310001": 5
},
"SkinSkillDes": "0"
},
{
"Id": 4,
"SkinId": 300001,
"Level": 4,
"UpItem": {
"310001": 8
},
"SkinSkillDes": "0"
},
{
"Id": 5,
"SkinId": 300001,
"Level": 5,
"UpItem": {
"310001": 13
},
"SkinSkillDes": "0"
},
{
"Id": 6,
"SkinId": 300001,
"Level": 6,
"UpItem": {
"310001": 21
},
"SkinSkillDes": "0"
},
{
"Id": 7,
"SkinId": 300001,
"Level": 7,
"UpItem": {
"310001": 34
},
"SkinSkillDes": "0"
},
{
"Id": 8,
"SkinId": 300001,
"Level": 8,
"UpItem": {
"310001": 55
},
"SkinSkillDes": "0"
},
{
"Id": 9,
"SkinId": 300001,
"Level": 9,
"UpItem": {
"310001": 89
},
"SkinSkillDes": "0"
},
{
"Id": 10,
"SkinId": 300001,
"Level": 10,
"UpItem": {
"310001": 144
},
"SkinSkillDes": "0"
},
{
"Id": 11,
"SkinId": 300002,
"Level": 1,
"SkinSkillId": 30002,
"SkinSkillLevel": 1,
"SkinSkillValue": 1,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 12,
"SkinId": 300002,
"Level": 2,
"UpItem": {
"310002": 3
},
"SkinSkillId": 30002,
"SkinSkillLevel": 2,
"SkinSkillValue": 2,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 13,
"SkinId": 300002,
"Level": 3,
"UpItem": {
"310002": 5
},
"SkinSkillId": 30002,
"SkinSkillLevel": 3,
"SkinSkillValue": 3,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 14,
"SkinId": 300002,
"Level": 4,
"UpItem": {
"310002": 8
},
"SkinSkillId": 30002,
"SkinSkillLevel": 4,
"SkinSkillValue": 4,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 15,
"SkinId": 300002,
"Level": 5,
"UpItem": {
"310002": 13
},
"SkinSkillId": 30002,
"SkinSkillLevel": 5,
"SkinSkillValue": 5,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 16,
"SkinId": 300002,
"Level": 6,
"UpItem": {
"310002": 21
},
"SkinSkillId": 30002,
"SkinSkillLevel": 6,
"SkinSkillValue": 6,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 17,
"SkinId": 300002,
"Level": 7,
"UpItem": {
"310002": 34
},
"SkinSkillId": 30002,
"SkinSkillLevel": 7,
"SkinSkillValue": 7,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 18,
"SkinId": 300002,
"Level": 8,
"UpItem": {
"310002": 55
},
"SkinSkillId": 30002,
"SkinSkillLevel": 8,
"SkinSkillValue": 8,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 19,
"SkinId": 300002,
"Level": 9,
"UpItem": {
"310002": 89
},
"SkinSkillId": 30002,
"SkinSkillLevel": 9,
"SkinSkillValue": 9,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 20,
"SkinId": 300002,
"Level": 10,
"UpItem": {
"310002": 144
},
"SkinSkillId": 30002,
"SkinSkillLevel": 10,
"SkinSkillValue": 10,
"SkinSkillDes": "排位赛积分提升{0}%"
},
{
"Id": 21,
"SkinId": 300003,
"Level": 1,
"SkinSkillId": 30003,
"SkinSkillLevel": 1,
"SkinSkillValue": 1,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 22,
"SkinId": 300003,
"Level": 2,
"UpItem": {
"310003": 3
},
"SkinSkillId": 30003,
"SkinSkillLevel": 2,
"SkinSkillValue": 2,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 23,
"SkinId": 300003,
"Level": 3,
"UpItem": {
"310003": 5
},
"SkinSkillId": 30003,
"SkinSkillLevel": 3,
"SkinSkillValue": 3,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 24,
"SkinId": 300003,
"Level": 4,
"UpItem": {
"310003": 8
},
"SkinSkillId": 30003,
"SkinSkillLevel": 4,
"SkinSkillValue": 4,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 25,
"SkinId": 300003,
"Level": 5,
"UpItem": {
"310003": 13
},
"SkinSkillId": 30003,
"SkinSkillLevel": 5,
"SkinSkillValue": 5,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 26,
"SkinId": 300003,
"Level": 6,
"UpItem": {
"310003": 21
},
"SkinSkillId": 30003,
"SkinSkillLevel": 6,
"SkinSkillValue": 6,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 27,
"SkinId": 300003,
"Level": 7,
"UpItem": {
"310003": 34
},
"SkinSkillId": 30003,
"SkinSkillLevel": 7,
"SkinSkillValue": 7,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 28,
"SkinId": 300003,
"Level": 8,
"UpItem": {
"310003": 55
},
"SkinSkillId": 30003,
"SkinSkillLevel": 8,
"SkinSkillValue": 8,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 29,
"SkinId": 300003,
"Level": 9,
"UpItem": {
"310003": 89
},
"SkinSkillId": 30003,
"SkinSkillLevel": 9,
"SkinSkillValue": 9,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 30,
"SkinId": 300003,
"Level": 10,
"UpItem": {
"310003": 144
},
"SkinSkillId": 30003,
"SkinSkillLevel": 10,
"SkinSkillValue": 10,
"SkinSkillDes": "VIP赛每日免费报名次数提升{0}"
},
{
"Id": 31,
"SkinId": 300004,
"Level": 1,
"SkinSkillId": 30004,
"SkinSkillLevel": 1,
"SkinSkillValue": 1,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 32,
"SkinId": 300004,
"Level": 2,
"UpItem": {
"310004": 3
},
"SkinSkillId": 30004,
"SkinSkillLevel": 2,
"SkinSkillValue": 2,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 33,
"SkinId": 300004,
"Level": 3,
"UpItem": {
"310004": 5
},
"SkinSkillId": 30004,
"SkinSkillLevel": 3,
"SkinSkillValue": 3,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 34,
"SkinId": 300004,
"Level": 4,
"UpItem": {
"310004": 8
},
"SkinSkillId": 30004,
"SkinSkillLevel": 4,
"SkinSkillValue": 4,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 35,
"SkinId": 300004,
"Level": 5,
"UpItem": {
"310004": 13
},
"SkinSkillId": 30004,
"SkinSkillLevel": 5,
"SkinSkillValue": 5,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 36,
"SkinId": 300004,
"Level": 6,
"UpItem": {
"310004": 21
},
"SkinSkillId": 30004,
"SkinSkillLevel": 6,
"SkinSkillValue": 6,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 37,
"SkinId": 300004,
"Level": 7,
"UpItem": {
"310004": 34
},
"SkinSkillId": 30004,
"SkinSkillLevel": 7,
"SkinSkillValue": 7,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 38,
"SkinId": 300004,
"Level": 8,
"UpItem": {
"310004": 55
},
"SkinSkillId": 30004,
"SkinSkillLevel": 8,
"SkinSkillValue": 8,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 39,
"SkinId": 300004,
"Level": 9,
"UpItem": {
"310004": 89
},
"SkinSkillId": 30004,
"SkinSkillLevel": 9,
"SkinSkillValue": 9,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 40,
"SkinId": 300004,
"Level": 10,
"UpItem": {
"310004": 144
},
"SkinSkillId": 30004,
"SkinSkillLevel": 10,
"SkinSkillValue": 10,
"SkinSkillDes": "每日礼包金币奖励提升{0}%"
},
{
"Id": 41,
"SkinId": 300005,
"Level": 1,
"SkinSkillId": 30005,
"SkinSkillLevel": 1,
"SkinSkillValue": 1,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 42,
"SkinId": 300005,
"Level": 2,
"UpItem": {
"310005": 3
},
"SkinSkillId": 30005,
"SkinSkillLevel": 2,
"SkinSkillValue": 2,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 43,
"SkinId": 300005,
"Level": 3,
"UpItem": {
"310005": 5
},
"SkinSkillId": 30005,
"SkinSkillLevel": 3,
"SkinSkillValue": 3,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 44,
"SkinId": 300005,
"Level": 4,
"UpItem": {
"310005": 8
},
"SkinSkillId": 30005,
"SkinSkillLevel": 4,
"SkinSkillValue": 4,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 45,
"SkinId": 300005,
"Level": 5,
"UpItem": {
"310005": 13
},
"SkinSkillId": 30005,
"SkinSkillLevel": 5,
"SkinSkillValue": 5,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 46,
"SkinId": 300005,
"Level": 6,
"UpItem": {
"310005": 21
},
"SkinSkillId": 30005,
"SkinSkillLevel": 6,
"SkinSkillValue": 6,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 47,
"SkinId": 300005,
"Level": 7,
"UpItem": {
"310005": 34
},
"SkinSkillId": 30005,
"SkinSkillLevel": 7,
"SkinSkillValue": 7,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 48,
"SkinId": 300005,
"Level": 8,
"UpItem": {
"310005": 55
},
"SkinSkillId": 30005,
"SkinSkillLevel": 8,
"SkinSkillValue": 8,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 49,
"SkinId": 300005,
"Level": 9,
"UpItem": {
"310005": 89
},
"SkinSkillId": 30005,
"SkinSkillLevel": 9,
"SkinSkillValue": 9,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 50,
"SkinId": 300005,
"Level": 10,
"UpItem": {
"310005": 144
},
"SkinSkillId": 30005,
"SkinSkillLevel": 10,
"SkinSkillValue": 10,
"SkinSkillDes": "每日任务金币奖励提升{0}%"
},
{
"Id": 51,
"SkinId": 300006,
"Level": 1,
"SkinSkillDes": "0"
},
{
"Id": 52,
"SkinId": 300006,
"Level": 2,
"UpItem": {
"310006": 3
},
"SkinSkillDes": "0"
},
{
"Id": 53,
"SkinId": 300006,
"Level": 3,
"UpItem": {
"310006": 5
},
"SkinSkillDes": "0"
},
{
"Id": 54,
"SkinId": 300006,
"Level": 4,
"UpItem": {
"310006": 8
},
"SkinSkillDes": "0"
},
{
"Id": 55,
"SkinId": 300006,
"Level": 5,
"UpItem": {
"310006": 13
},
"SkinSkillDes": "0"
},
{
"Id": 56,
"SkinId": 300006,
"Level": 6,
"UpItem": {
"310006": 21
},
"SkinSkillDes": "0"
},
{
"Id": 57,
"SkinId": 300006,
"Level": 7,
"UpItem": {
"310006": 34
},
"SkinSkillDes": "0"
},
{
"Id": 58,
"SkinId": 300006,
"Level": 8,
"UpItem": {
"310006": 55
},
"SkinSkillDes": "0"
},
{
"Id": 59,
"SkinId": 300006,
"Level": 9,
"UpItem": {
"310006": 89
},
"SkinSkillDes": "0"
},
{
"Id": 60,
"SkinId": 300006,
"Level": 10,
"UpItem": {
"310006": 144
},
"SkinSkillDes": "0"
},
{
"Id": 61,
"SkinId": 300007,
"Level": 1,
"SkinSkillId": 30007,
"SkinSkillLevel": 1,
"SkinSkillValue": 1,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 62,
"SkinId": 300007,
"Level": 2,
"UpItem": {
"310007": 3
},
"SkinSkillId": 30007,
"SkinSkillLevel": 2,
"SkinSkillValue": 2,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 63,
"SkinId": 300007,
"Level": 3,
"UpItem": {
"310007": 5
},
"SkinSkillId": 30007,
"SkinSkillLevel": 3,
"SkinSkillValue": 3,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 64,
"SkinId": 300007,
"Level": 4,
"UpItem": {
"310007": 8
},
"SkinSkillId": 30007,
"SkinSkillLevel": 4,
"SkinSkillValue": 4,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 65,
"SkinId": 300007,
"Level": 5,
"UpItem": {
"310007": 13
},
"SkinSkillId": 30007,
"SkinSkillLevel": 5,
"SkinSkillValue": 5,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 66,
"SkinId": 300007,
"Level": 6,
"UpItem": {
"310007": 21
},
"SkinSkillId": 30007,
"SkinSkillLevel": 6,
"SkinSkillValue": 6,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 67,
"SkinId": 300007,
"Level": 7,
"UpItem": {
"310007": 34
},
"SkinSkillId": 30007,
"SkinSkillLevel": 7,
"SkinSkillValue": 7,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 68,
"SkinId": 300007,
"Level": 8,
"UpItem": {
"310007": 55
},
"SkinSkillId": 30007,
"SkinSkillLevel": 8,
"SkinSkillValue": 8,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 69,
"SkinId": 300007,
"Level": 9,
"UpItem": {
"310007": 89
},
"SkinSkillId": 30007,
"SkinSkillLevel": 9,
"SkinSkillValue": 9,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
},
{
"Id": 70,
"SkinId": 300007,
"Level": 10,
"UpItem": {
"310007": 144
},
"SkinSkillId": 30007,
"SkinSkillLevel": 10,
"SkinSkillValue": 10,
"SkinSkillDes": "每次钻石抽奖幸运值提升{0}%"
}
]
}

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -3,8 +3,8 @@
{
"Name": "不是VIP",
"Privilege1": [
100000,
2
0,
0
],
"Privilege2": [
0,
@ -28,7 +28,11 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"Privilege9": [
0
],
"PrivilegeShow": 100
},
{
"Id": 1,
@ -36,8 +40,8 @@
"Count": 1000,
"VipExp": 1000,
"Privilege1": [
100000,
100
0,
0
],
"Privilege2": [
0,
@ -62,7 +66,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 1,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 2000
},
{
"Id": 2,
@ -70,8 +81,8 @@
"Count": 2000,
"VipExp": 2000,
"Privilege1": [
150000,
150
0,
0
],
"Privilege2": [
0,
@ -96,7 +107,15 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 2,
"Privilege9": [
0,
0,
0,
0
],
"PrivilegeShow": 3000
},
{
"Id": 3,
@ -104,8 +123,8 @@
"Count": 5000,
"VipExp": 5000,
"Privilege1": [
200000,
200
0,
0
],
"Privilege2": [
0,
@ -130,7 +149,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 3,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 4000
},
{
"Id": 4,
@ -138,8 +164,8 @@
"Count": 10000,
"VipExp": 10000,
"Privilege1": [
300000,
250
0,
0
],
"Privilege2": [
0,
@ -164,7 +190,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 4,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 5000
},
{
"Id": 5,
@ -172,8 +205,8 @@
"Count": 20000,
"VipExp": 20000,
"Privilege1": [
400000,
300
0,
0
],
"Privilege2": [
0,
@ -198,7 +231,15 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 5,
"Privilege9": [
0,
0,
0,
0
],
"PrivilegeShow": 6000
},
{
"Id": 6,
@ -206,8 +247,8 @@
"Count": 50000,
"VipExp": 50000,
"Privilege1": [
500000,
350
0,
0
],
"Privilege2": [
0,
@ -232,7 +273,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 6,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 7000
},
{
"Id": 7,
@ -240,8 +288,8 @@
"Count": 100000,
"VipExp": 100000,
"Privilege1": [
600000,
400
0,
0
],
"Privilege2": [
0,
@ -266,7 +314,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 7,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 8000
},
{
"Id": 8,
@ -274,8 +329,8 @@
"Count": 200000,
"VipExp": 200000,
"Privilege1": [
700000,
450
0,
0
],
"Privilege2": [
0,
@ -300,7 +355,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 8,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 9000
},
{
"Id": 9,
@ -308,8 +370,8 @@
"Count": 500000,
"VipExp": 500000,
"Privilege1": [
800000,
500
0,
0
],
"Privilege2": [
0,
@ -334,7 +396,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 9,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 10000
},
{
"Id": 10,
@ -342,8 +411,8 @@
"Count": 1000000,
"VipExp": 1000000,
"Privilege1": [
900000,
550
0,
0
],
"Privilege2": [
0,
@ -368,7 +437,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 10,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 11000
},
{
"Id": 11,
@ -376,8 +452,8 @@
"Count": 2000000,
"VipExp": 2000000,
"Privilege1": [
1000000,
600
0,
0
],
"Privilege2": [
0,
@ -402,7 +478,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 11,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 12000
},
{
"Id": 12,
@ -410,8 +493,8 @@
"Count": 5000000,
"VipExp": 5000000,
"Privilege1": [
2000000,
650
0,
0
],
"Privilege2": [
0,
@ -436,7 +519,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 12,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 13000
},
{
"Id": 13,
@ -444,8 +534,8 @@
"Count": 10000000,
"VipExp": 10000000,
"Privilege1": [
3000000,
700
0,
0
],
"Privilege2": [
0,
@ -470,7 +560,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 13,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 14000
},
{
"Id": 14,
@ -478,8 +575,8 @@
"Count": 20000000,
"VipExp": 20000000,
"Privilege1": [
4000000,
750
0,
0
],
"Privilege2": [
0,
@ -504,7 +601,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 14,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 15000
},
{
"Id": 15,
@ -512,8 +616,8 @@
"Count": 50000000,
"VipExp": 50000000,
"Privilege1": [
5000000,
800
0,
0
],
"Privilege2": [
0,
@ -538,7 +642,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
],
"MatchFreeTimes": 15,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 16000
},
{
"Id": 16,
@ -546,8 +657,8 @@
"Count": 100000000,
"VipExp": 100000000,
"Privilege1": [
6000000,
850
0,
0
],
"Privilege2": [
0,
@ -572,8 +683,14 @@
"获得专属头像框",
"获得专属炮台",
"更多VIP功能正待开发"
]
},
{}
],
"MatchFreeTimes": 16,
"Privilege9": [
0,
0,
0
],
"PrivilegeShow": 17000
}
]
}

Some files were not shown because too many files have changed in this diff Show More