Skip to content

Commit d5ee31e

Browse files
committed
update 2.8X
1 parent 6e9eb50 commit d5ee31e

File tree

13,304 files changed

+2888
-4404763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,304 files changed

+2888
-4404763
lines changed

.idea/.gitignore

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/LollipopGo2.8x.iml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/src/Proto/Protoxy/Proto_Proxy.go renamed to LollipopGo/Proxy_Server/Proto/Proto_Proxy.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,18 @@ type C2Proxy_SendData struct {
6666
Protocol int
6767
Protocol2 int
6868
ServerID string
69-
Data interface{}
69+
Data interface{} //
7070
}
7171

72+
//type Proxy2GS_InitHall struct {
73+
// Protocol int
74+
// Protocol2 int
75+
// Token string
76+
// OpenID string
77+
// LoginType string
78+
// //IMEI string
79+
//}
80+
7281
// Proxy2C_SendDataProto
7382
type Proxy2C_SendData struct {
7483
Protocol int
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package Proto_Proxy
2+
3+
// 为proto中定义的错误实现Error接口
4+
func (e *ErrorST) Error() string {
5+
return e.Msg
6+
}

LollipopGo/Proxy_Server/Proto/msg.pb.go

Lines changed: 260 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//公用的proto文件,业务无关的一些通用消息
2+
3+
syntax = "proto3";
4+
package proto;
5+
6+
//错误码
7+
enum STATUS {
8+
//0~99, 通用错误码
9+
OK = 0;
10+
UNKNOWN_ERROR = 1; // 未知错误
11+
NOT_AUTH = 2; // 需要重新认证
12+
TOKEN_INVALID = 3; // token错误
13+
INSUFFICIENT = 4; // 余额不足
14+
REDIRECT = 5; // 需要用户重连到另外的服务器
15+
IDLE_TIMEOUT = 6; //闲置时间过长
16+
DUP_LOGIN = 7; //重复登录
17+
PARAM_ERROR = 8; //参数错误
18+
SERVER_CLOSED = 9; //服务器已经关闭
19+
20+
//200-299 cube错误码
21+
CUBE_BANKER_INSUFFICIENT = 200; //上庄金额不足
22+
CUBE_BANKER_FULL = 201; //上庄队列已满
23+
CUBE_CHIP_ERROR = 202; //筹码错误
24+
CUBE_BET_OVER_LIMIT = 203; //单个区域下注金额超出限制
25+
CUBE_OFF_BANKER_FOR_CREDIT = 204; //金额不足下庄
26+
CUBE_OFF_BANKER_FOR_COUNT = 205; //连庄达到上限下庄
27+
CUBE_BET_OVER_CREDIT = 206; //本局下注金额已达上限
28+
}
29+
30+
// 对时,服务端存活探测探测, id=0
31+
message Ping {
32+
int64 Timestamp = 1;
33+
}
34+
35+
//对时,服务端返回当前时间,id=99
36+
message Pong {
37+
int64 Timestamp = 1;
38+
}
39+
40+
//错误信息,id: 100
41+
message ErrorST {
42+
int64 Timestamp = 1; //毫秒级时间戳,下同
43+
STATUS Status = 2;
44+
string Msg = 3;
45+
}

LollipopGo/UTF-8/utf-8.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package utf8
2+

0 commit comments

Comments
 (0)