xiaoyang0346 1 week ago
parent
commit
f6fff752dd

+ 6 - 0
s_to_proto/shared/eps/client/MsgEpsInfo_c.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo_c {
+
+}

+ 7 - 0
s_to_proto/shared/eps/server/MsgEpsChange_s.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsChange_s {
+    [id: string]: number; //属性信息
+}
+

+ 7 - 0
s_to_proto/shared/eps/server/MsgEpsInfo_s.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo_s {
+    [id: string]: number; //属性信息
+}
+

+ 6 - 0
s_to_proto/shared/hc/client/MsgHcInfo_c.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgHcInfo_c {
+
+}

+ 32 - 0
s_to_proto/shared/hc/server/MsgHcInfo_s.ts

@@ -0,0 +1,32 @@
+
+
+// 定义返回字段
+export interface MsgHcInfo_s {
+    chapterId:number  //章节ID
+    tili:number  //体力
+    lastTime:number //最后一次结算体力时间
+    list:List //格子列表
+}
+
+
+interface List {
+    [gzid: string]: GeziInfo;
+}
+
+interface GeziInfo {
+    type:Type   //具体物品类型
+    unlock:Unlock  //解锁状态
+    correlationId:number  //物品ID
+}
+//具体物品类型
+export enum Type {
+    wu = "0", //无物品
+    emitter = "1", //发射器
+    monster = "2", //怪物
+    equip = "3", //装备
+}
+//解锁状态
+export enum Unlock {
+    on = "on", //开
+    off = "off", //关
+}

+ 8 - 0
s_to_proto/shared/item/client/MsgItemInfo_c.ts

@@ -0,0 +1,8 @@
+
+
+// 请求道具列表
+export interface MsgItemInfo_c {
+
+}
+
+

+ 7 - 0
s_to_proto/shared/item/server/MsgItemChange_s.ts

@@ -0,0 +1,7 @@
+
+
+// 道具数量发生改变下发
+export interface MsgItemChange_s {
+    [itemid:string]:number
+}
+

+ 7 - 0
s_to_proto/shared/item/server/MsgItemInfo_s.ts

@@ -0,0 +1,7 @@
+
+
+// 道具列表
+export interface MsgItemInfo_s {
+    [itemid:string]:number
+}
+

+ 20 - 0
s_to_proto/shared/plat/PtlPlatLogin.ts

@@ -0,0 +1,20 @@
+
+
+// 定义请求参数
+export interface ReqPlatLogin {
+    pid:string; //包ID
+    param:string[]; //参数
+}
+
+// 定义返回字段
+export interface ResPlatLogin {
+    openId:string
+    token:string
+}
+
+export const conf = {
+    connet: "http"
+}
+
+
+

+ 49 - 0
s_to_proto/shared/player/PtlPlayerLogin.ts

@@ -0,0 +1,49 @@
+
+// 定义请求参数
+export interface ReqPlayerLogin {
+    pid:string //分包ID
+	openId:string //登陆唯一标识
+	lang:string //语言
+	plat:string //登陆平台
+	device:string //登陆设备
+	parms:string[] //其他参数
+}
+
+// 定义返回字段
+export interface ResPlayerLogin {
+	uid: string; //uid
+	sid: string; //最后一次登陆区服
+	list: { [sid: string]: ResLoginList}; //每个区最多一个角色
+	token: string; //账号登陆验证码
+	//区服列表
+	qufuList:{
+		[sid:string]:qufuInfo
+	}
+	wsUrl:string //ws地址
+}
+
+export interface ResLoginList {
+	uuid: string; //角色ID
+	name: string;
+	level: number; //等级
+	lastlogin: number; //最后一次登录时间
+}
+
+//区服信息
+export interface qufuInfo {
+    sid: string; //区服ID
+    name: string; //名字
+    sName: string; //所属区服大区
+    openAt: number; //开服时间
+    status: string; //状态 1新服 2拥挤 3爆满 4维护
+    heid: string; //合服ID
+    suofu: string; //锁服
+    skin: string; //皮肤
+}
+
+export const conf = {
+    connet: "http"
+}
+
+
+

+ 230 - 107
s_to_proto/shared/serviceProto.ts

@@ -21,19 +21,21 @@ import { RequpdateSetting, ResupdateSetting } from './admin/PtlupdateSetting';
 import { Reqxaizai, Resxaizai } from './admin/Ptlxaizai';
 import { MsgItems } from './common/MsgItems';
 import { MsgMessage } from './common/MsgMessage';
-import { MsgEpsInfo } from './eps/client/MsgEpsInfo';
-import { MsgEpsChange } from './eps/server/MsgEpsChange';
-import { MsgEpsInfo as MsgEpsInfo_1 } from './eps/server/MsgEpsInfo';
-import { MsgItemInfo } from './item/client/MsgItemInfo';
-import { MsgItemChange } from './item/server/MsgItemChange';
-import { MsgItemInfo as MsgItemInfo_1 } from './item/server/MsgItemInfo';
-import { ReqLogin, ResLogin } from './plat/PtlLogin';
-import { ReqLogin as ReqLogin_1, ResLogin as ResLogin_1 } from './player/PtlLogin';
-import { MsgSetName } from './user/client/MsgSetName';
-import { MsgUserFight } from './user/client/MsgUserFight';
-import { ReqLogin as ReqLogin_2, ResLogin as ResLogin_2 } from './user/PtlLogin';
-import { MsgSetName as MsgSetName_1 } from './user/server/MsgSetName';
-import { MsgUserFight as MsgUserFight_1 } from './user/server/MsgUserFight';
+import { MsgEpsInfo_c } from './eps/client/MsgEpsInfo_c';
+import { MsgEpsChange_s } from './eps/server/MsgEpsChange_s';
+import { MsgEpsInfo_s } from './eps/server/MsgEpsInfo_s';
+import { MsgHcInfo_c } from './hc/client/MsgHcInfo_c';
+import { MsgHcInfo_s } from './hc/server/MsgHcInfo_s';
+import { MsgItemInfo_c } from './item/client/MsgItemInfo_c';
+import { MsgItemChange_s } from './item/server/MsgItemChange_s';
+import { MsgItemInfo_s } from './item/server/MsgItemInfo_s';
+import { ReqPlatLogin, ResPlatLogin } from './plat/PtlPlatLogin';
+import { ReqPlayerLogin, ResPlayerLogin } from './player/PtlPlayerLogin';
+import { MsgSetName_c } from './user/client/MsgSetName_c';
+import { MsgUserFight_c } from './user/client/MsgUserFight_c';
+import { ReqUserLogin, ResUserLogin } from './user/PtlUserLogin';
+import { MsgSetName_s } from './user/server/MsgSetName_s';
+import { MsgUserFight_s } from './user/server/MsgUserFight_s';
 
 export interface ServiceType {
     api: {
@@ -117,37 +119,39 @@ export interface ServiceType {
             req: Reqxaizai,
             res: Resxaizai
         },
-        "plat/Login": {
-            req: ReqLogin,
-            res: ResLogin
+        "plat/PlatLogin": {
+            req: ReqPlatLogin,
+            res: ResPlatLogin
         },
-        "player/Login": {
-            req: ReqLogin_1,
-            res: ResLogin_1
+        "player/PlayerLogin": {
+            req: ReqPlayerLogin,
+            res: ResPlayerLogin
         },
-        "user/Login": {
-            req: ReqLogin_2,
-            res: ResLogin_2
+        "user/UserLogin": {
+            req: ReqUserLogin,
+            res: ResUserLogin
         }
     },
     msg: {
         "common/Items": MsgItems,
         "common/Message": MsgMessage,
-        "eps/client/EpsInfo": MsgEpsInfo,
-        "eps/server/EpsChange": MsgEpsChange,
-        "eps/server/EpsInfo": MsgEpsInfo_1,
-        "item/client/ItemInfo": MsgItemInfo,
-        "item/server/ItemChange": MsgItemChange,
-        "item/server/ItemInfo": MsgItemInfo_1,
-        "user/client/SetName": MsgSetName,
-        "user/client/UserFight": MsgUserFight,
-        "user/server/SetName": MsgSetName_1,
-        "user/server/UserFight": MsgUserFight_1
+        "eps/client/EpsInfo_c": MsgEpsInfo_c,
+        "eps/server/EpsChange_s": MsgEpsChange_s,
+        "eps/server/EpsInfo_s": MsgEpsInfo_s,
+        "hc/client/HcInfo_c": MsgHcInfo_c,
+        "hc/server/HcInfo_s": MsgHcInfo_s,
+        "item/client/ItemInfo_c": MsgItemInfo_c,
+        "item/server/ItemChange_s": MsgItemChange_s,
+        "item/server/ItemInfo_s": MsgItemInfo_s,
+        "user/client/SetName_c": MsgSetName_c,
+        "user/client/UserFight_c": MsgUserFight_c,
+        "user/server/SetName_s": MsgSetName_s,
+        "user/server/UserFight_s": MsgUserFight_s
     }
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 35,
+    "version": 37,
     "services": [
         {
             "id": 39,
@@ -320,77 +324,87 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "type": "msg"
         },
         {
-            "id": 20,
-            "name": "eps/client/EpsInfo",
+            "id": 49,
+            "name": "eps/client/EpsInfo_c",
             "type": "msg"
         },
         {
-            "id": 21,
-            "name": "eps/server/EpsChange",
+            "id": 50,
+            "name": "eps/server/EpsChange_s",
             "type": "msg"
         },
         {
-            "id": 22,
-            "name": "eps/server/EpsInfo",
+            "id": 51,
+            "name": "eps/server/EpsInfo_s",
             "type": "msg"
         },
         {
-            "id": 13,
-            "name": "item/client/ItemInfo",
+            "id": 52,
+            "name": "hc/client/HcInfo_c",
             "type": "msg"
         },
         {
-            "id": 14,
-            "name": "item/server/ItemChange",
+            "id": 53,
+            "name": "hc/server/HcInfo_s",
             "type": "msg"
         },
         {
-            "id": 15,
-            "name": "item/server/ItemInfo",
+            "id": 54,
+            "name": "item/client/ItemInfo_c",
             "type": "msg"
         },
         {
-            "id": 32,
-            "name": "plat/Login",
+            "id": 55,
+            "name": "item/server/ItemChange_s",
+            "type": "msg"
+        },
+        {
+            "id": 56,
+            "name": "item/server/ItemInfo_s",
+            "type": "msg"
+        },
+        {
+            "id": 57,
+            "name": "plat/PlatLogin",
             "type": "api",
             "conf": {
                 "connet": "http"
             }
         },
         {
-            "id": 3,
-            "name": "player/Login",
+            "id": 58,
+            "name": "player/PlayerLogin",
             "type": "api",
             "conf": {
                 "connet": "http"
             }
         },
         {
-            "id": 11,
-            "name": "user/client/SetName",
+            "id": 59,
+            "name": "user/client/SetName_c",
             "type": "msg"
         },
         {
-            "id": 33,
-            "name": "user/client/UserFight",
+            "id": 60,
+            "name": "user/client/UserFight_c",
             "type": "msg"
         },
         {
-            "id": 4,
-            "name": "user/Login",
+            "id": 61,
+            "name": "user/UserLogin",
             "type": "api",
             "conf": {
                 "connet": "ws"
             }
         },
         {
-            "id": 12,
-            "name": "user/server/SetName",
+            "id": 62,
+            "name": "user/server/SetName_s",
             "type": "msg"
         },
         {
-            "id": 34,
-            "name": "user/server/UserFight",
+            "id": 63,
+            "name": "user/server/UserFight_s",
             "type": "msg"
         }
     ],
@@ -896,10 +910,10 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "eps/client/MsgEpsInfo/MsgEpsInfo": {
+        "eps/client/MsgEpsInfo_c/MsgEpsInfo_c": {
             "type": "Interface"
         },
-        "eps/server/MsgEpsChange/MsgEpsChange": {
+        "eps/server/MsgEpsChange_s/MsgEpsChange_s": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -908,7 +922,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
-        "eps/server/MsgEpsInfo/MsgEpsInfo": {
+        "eps/server/MsgEpsInfo_s/MsgEpsInfo_s": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -917,10 +931,119 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
-        "item/client/MsgItemInfo/MsgItemInfo": {
+        "hc/client/MsgHcInfo_c/MsgHcInfo_c": {
+            "type": "Interface"
+        },
+        "hc/server/MsgHcInfo_s/MsgHcInfo_s": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "chapterId",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "tili",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "lastTime",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "list",
+                    "type": {
+                        "type": "Reference",
+                        "target": "hc/server/MsgHcInfo_s/List"
+                    }
+                }
+            ]
+        },
+        "hc/server/MsgHcInfo_s/List": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Reference",
+                    "target": "hc/server/MsgHcInfo_s/GeziInfo"
+                }
+            }
+        },
+        "hc/server/MsgHcInfo_s/GeziInfo": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "type",
+                    "type": {
+                        "type": "Reference",
+                        "target": "hc/server/MsgHcInfo_s/Type"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "unlock",
+                    "type": {
+                        "type": "Reference",
+                        "target": "hc/server/MsgHcInfo_s/Unlock"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "correlationId",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
+        "hc/server/MsgHcInfo_s/Type": {
+            "type": "Enum",
+            "members": [
+                {
+                    "id": 0,
+                    "value": "0"
+                },
+                {
+                    "id": 1,
+                    "value": "1"
+                },
+                {
+                    "id": 2,
+                    "value": "2"
+                },
+                {
+                    "id": 3,
+                    "value": "3"
+                }
+            ]
+        },
+        "hc/server/MsgHcInfo_s/Unlock": {
+            "type": "Enum",
+            "members": [
+                {
+                    "id": 0,
+                    "value": "on"
+                },
+                {
+                    "id": 1,
+                    "value": "off"
+                }
+            ]
+        },
+        "item/client/MsgItemInfo_c/MsgItemInfo_c": {
             "type": "Interface"
         },
-        "item/server/MsgItemChange/MsgItemChange": {
+        "item/server/MsgItemChange_s/MsgItemChange_s": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -929,7 +1052,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
-        "item/server/MsgItemInfo/MsgItemInfo": {
+        "item/server/MsgItemInfo_s/MsgItemInfo_s": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -938,7 +1061,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
-        "plat/PtlLogin/ReqLogin": {
+        "plat/PtlPlatLogin/ReqPlatLogin": {
             "type": "Interface",
             "properties": [
                 {
@@ -960,7 +1083,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "plat/PtlLogin/ResLogin": {
+        "plat/PtlPlatLogin/ResPlatLogin": {
             "type": "Interface",
             "properties": [
                 {
@@ -979,7 +1102,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "player/PtlLogin/ReqLogin": {
+        "player/PtlPlayerLogin/ReqPlayerLogin": {
             "type": "Interface",
             "properties": [
                 {
@@ -1029,7 +1152,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "player/PtlLogin/ResLogin": {
+        "player/PtlPlayerLogin/ResPlayerLogin": {
             "type": "Interface",
             "properties": [
                 {
@@ -1055,7 +1178,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             "keyType": "String",
                             "type": {
                                 "type": "Reference",
-                                "target": "player/PtlLogin/ResLoginList"
+                                "target": "player/PtlPlayerLogin/ResLoginList"
                             }
                         }
                     }
@@ -1076,7 +1199,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             "keyType": "String",
                             "type": {
                                 "type": "Reference",
-                                "target": "player/PtlLogin/qufuInfo"
+                                "target": "player/PtlPlayerLogin/qufuInfo"
                             }
                         }
                     }
@@ -1090,7 +1213,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "player/PtlLogin/ResLoginList": {
+        "player/PtlPlayerLogin/ResLoginList": {
             "type": "Interface",
             "properties": [
                 {
@@ -1123,7 +1246,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "player/PtlLogin/qufuInfo": {
+        "player/PtlPlayerLogin/qufuInfo": {
             "type": "Interface",
             "properties": [
                 {
@@ -1184,7 +1307,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/client/MsgSetName/MsgSetName": {
+        "user/client/MsgSetName_c/MsgSetName_c": {
             "type": "Interface",
             "properties": [
                 {
@@ -1196,10 +1319,10 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/client/MsgUserFight/MsgUserFight": {
+        "user/client/MsgUserFight_c/MsgUserFight_c": {
             "type": "Interface"
         },
-        "user/PtlLogin/ReqLogin": {
+        "user/PtlUserLogin/ReqUserLogin": {
             "type": "Interface",
             "properties": [
                 {
@@ -1225,102 +1348,102 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/PtlLogin/ResLogin": {
+        "user/PtlUserLogin/ResUserLogin": {
             "type": "Interface",
             "properties": [
                 {
-                    "id": 13,
+                    "id": 0,
                     "name": "uuid",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 0,
+                    "id": 1,
                     "name": "sid",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 1,
+                    "id": 2,
                     "name": "name",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 2,
+                    "id": 3,
                     "name": "head",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 3,
+                    "id": 4,
                     "name": "wxhead",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 4,
+                    "id": 5,
                     "name": "sex",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 5,
+                    "id": 6,
                     "name": "level",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 6,
+                    "id": 7,
                     "name": "regtime",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 7,
+                    "id": 8,
                     "name": "loginTime",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 8,
+                    "id": 9,
                     "name": "lastlogin",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 9,
+                    "id": 10,
                     "name": "lang",
                     "type": {
                         "type": "String"
                     }
                 },
                 {
-                    "id": 10,
+                    "id": 11,
                     "name": "iscz",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 11,
+                    "id": 12,
                     "name": "rmbcz",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 12,
+                    "id": 13,
                     "name": "power",
                     "type": {
                         "type": "Number"
@@ -1328,7 +1451,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/server/MsgSetName/MsgSetName": {
+        "user/server/MsgSetName_s/MsgSetName_s": {
             "type": "Interface",
             "properties": [
                 {
@@ -1340,26 +1463,26 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/server/MsgUserFight/MsgUserFight": {
+        "user/server/MsgUserFight_s/MsgUserFight_s": {
             "type": "Interface",
             "properties": [
                 {
-                    "id": 2,
+                    "id": 0,
                     "name": "fightStart",
                     "type": {
                         "type": "Reference",
-                        "target": "user/server/MsgUserFight/FightStart"
+                        "target": "user/server/MsgUserFight_s/FightStart"
                     }
                 },
                 {
-                    "id": 0,
+                    "id": 1,
                     "name": "win",
                     "type": {
                         "type": "Number"
                     }
                 },
                 {
-                    "id": 1,
+                    "id": 2,
                     "name": "log",
                     "type": {
                         "type": "Interface",
@@ -1369,7 +1492,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                                 "type": "Array",
                                 "elementType": {
                                     "type": "Reference",
-                                    "target": "user/server/MsgUserFight/fightLogOne"
+                                    "target": "user/server/MsgUserFight_s/fightLogOne"
                                 }
                             }
                         }
@@ -1377,7 +1500,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/server/MsgUserFight/FightStart": {
+        "user/server/MsgUserFight_s/FightStart": {
             "type": "Interface",
             "properties": [
                 {
@@ -1403,14 +1526,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             "keyType": "String",
                             "type": {
                                 "type": "Reference",
-                                "target": "user/server/MsgUserFight/FightTeam"
+                                "target": "user/server/MsgUserFight_s/FightTeam"
                             }
                         }
                     }
                 }
             ]
         },
-        "user/server/MsgUserFight/FightTeam": {
+        "user/server/MsgUserFight_s/FightTeam": {
             "type": "Interface",
             "properties": [
                 {
@@ -1435,7 +1558,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/server/MsgUserFight/fightLogOne": {
+        "user/server/MsgUserFight_s/fightLogOne": {
             "type": "Interface",
             "properties": [
                 {
@@ -1443,7 +1566,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "name": "aType",
                     "type": {
                         "type": "Reference",
-                        "target": "user/server/MsgUserFight/ActionType"
+                        "target": "user/server/MsgUserFight_s/ActionType"
                     }
                 },
                 {
@@ -1451,7 +1574,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "name": "atker",
                     "type": {
                         "type": "Reference",
-                        "target": "user/server/MsgUserFight/fightLogOneData"
+                        "target": "user/server/MsgUserFight_s/fightLogOneData"
                     }
                 },
                 {
@@ -1461,13 +1584,13 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "type": "Array",
                         "elementType": {
                             "type": "Reference",
-                            "target": "user/server/MsgUserFight/fightLogOneData"
+                            "target": "user/server/MsgUserFight_s/fightLogOneData"
                         }
                     }
                 }
             ]
         },
-        "user/server/MsgUserFight/ActionType": {
+        "user/server/MsgUserFight_s/ActionType": {
             "type": "Enum",
             "members": [
                 {
@@ -1496,7 +1619,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/server/MsgUserFight/fightLogOneData": {
+        "user/server/MsgUserFight_s/fightLogOneData": {
             "type": "Interface",
             "properties": [
                 {

+ 30 - 0
s_to_proto/shared/user/PtlUserLogin.ts

@@ -0,0 +1,30 @@
+// 角色登录
+export interface ReqUserLogin {
+    sid:string;//区服ID
+    uid:string;//账号ID
+    token:string;//账号登录下发的token
+}
+
+// 角色信息返回
+export interface ResUserLogin {
+    uuid:string; //角色ID
+    sid: string; //所属分区
+    name: string; //名字
+    head: string; //头像
+    wxhead: string; //微信头像
+    sex: number; //0女1男
+    level: number; //等级
+    regtime: number; //注册时间
+    loginTime: number; //登录时间
+    lastlogin: number; //最后一次操作时间
+    lang: string; //语言
+    iscz: number; //现金点消耗  +  RMB购买其他礼包(购买现金点除外)
+    rmbcz: number;//RMB购买
+    power: number; //战力
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+

+ 4 - 0
s_to_proto/shared/user/client/MsgSetName_c.ts

@@ -0,0 +1,4 @@
+// 修改名字
+export interface MsgSetName_c {
+    name:string;
+}

+ 6 - 0
s_to_proto/shared/user/client/MsgUserFight_c.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgUserFight_c {
+
+}

+ 7 - 0
s_to_proto/shared/user/server/MsgSetName_s.ts

@@ -0,0 +1,7 @@
+
+
+// 返回修改后名字
+export interface MsgSetName_s {
+    name:string
+}
+

+ 53 - 0
s_to_proto/shared/user/server/MsgUserFight_s.ts

@@ -0,0 +1,53 @@
+
+
+// 定义返回字段
+export interface MsgUserFight_s {
+    fightStart:FightStart; //战斗阵容
+    win: number; //0失败 1胜利
+    log: {
+        //战斗日志列表
+        //回合ID:单回合内战斗日志
+        [huihe: string]: fightLogOne[];
+    };
+}
+/**
+ * 战斗初始阵容
+ */
+export interface FightStart {
+    from: string; //战斗类型
+    seed: number; //随机种子
+    teams: {
+        [iid: string]: FightTeam;
+    };
+}
+/**
+ * 单个阵容信息
+ */
+export interface FightTeam {
+    fid: string; //业务中身份
+    eps: {[id:string]:number}; //属性
+}
+
+//单回合内战斗日志
+export interface fightLogOne {
+    aType: ActionType; //战斗动作类型
+    atker: fightLogOneData; //出手方
+    target: fightLogOneData[]; //目标
+}
+/**
+ * 战斗动作类型
+ */
+export enum ActionType {
+    wu = "wu", //默认没有 不处理
+    round = "0", //回合开始 玩家出手前
+    buff = "1", //buff
+    atk = "2", //普通攻击
+    wxsk = "3", //技能
+    over = "999", //回合结束
+}
+export interface fightLogOneData {
+    iid: string; //阵容下标
+    hp: number; //剩余血量
+    buff: [string, number][]; //上BUFF [ [BuffID,回合数]]
+    effect: [string, number][]; //触发效果 [ [属性key,数值]]
+}