协议修改

assets/Scripts/Sub/UI/PreloadUI.ts

@@ -27,6 +27,7 @@ import { promptItem } from "../Item/promptItem";
 import LanguageUtils, { LanguageType } from "../../Main/Common/LanguageUtils";
 import { DataManager, DataId } from "../../chat18x/data/DataManager";
 import { LoginData } from "../../chat18x/data/LoginData";
+import { PlayerData } from "../../chat18x/data/PlayerData";
 import { AccountData } from "../../chat18x/data/AccountData";
 import { MetaData } from "../../chat18x/data/MetaData";
 import { NetTimeData } from "../../chat18x/data/NetTimeData";
@@ -273,13 +274,13 @@ export class PreloadUI extends Component {
       const resData = res.data;
       // 保存数据
       const loginData = DataManager.I.getDataById<LoginData>(DataId.Login);
-      // loginData.operateType = resData.OperateType;
       loginData.token = resData.token;
-      // loginData.refreshToken = resData.refreshToken;
+      loginData.refreshToken = resData.refreshToken;
-      // loginData.ip = resData.Ip;
+      loginData.expire = resData.expire;
-      // loginData.machineIdentifier = resData.MachineIdentifier;
+      const playerData = DataManager.I.getDataById<PlayerData>(DataId.Player);
-      // loginData.sdkUid = resData.SdkUid;
+      playerData.name = resData.name;
-      // loginData.lastLoginTime = resData.LastLoginTime;
+
+
       // const accountData = DataManager.I.getDataById<AccountData>(DataId.Account);
       // accountData.identifier = resData.Identifier;
       // accountData.identityType = resData.IdentityType;
@@ -294,21 +295,19 @@ export class PreloadUI extends Component {
 
       this.loginFinish = true;
 
-      // this.reqPlayerData();
+      // this.reqMyInfo();
     };
   }
 
-  // 请求玩家数据
+  // 请求个人信息
-  private async reqPlayerData() {
+  private async reqMyInfo() {
     const reqData = {
-      GameName: ConfigManager.tables.TbGlobalConfig.GameName,
+
-      IsAll: true,
-      DataFlagList: [],
     };
     console.log("玩家数据请求数据：", reqData);
-    let res = await PlayerDataService.I.reqQueryPlayerData(reqData);
+    let res = await PlayerDataService.I.reqMyInfo(reqData);
     console.log("玩家数据响应数据：", res);
-    if (res && res.code === ApiCode.OK) {
+    if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
 
     }
   }

assets/Scripts/chat18x/data/AccountData.ts

@@ -13,7 +13,32 @@ export class AccountData extends BaseData {
     // 是否新手
     private _isNewGuide = true;    
     // 是否刚注册
-    private _isNewRegist = true;         
+    private _isNewRegist = true;   
+    
+    public reset(): void {
+        this._identifier = "";
+        this._identityType = 1;
+        this._uid = "";
+        this._isNewGuide = true; 
+        this._isNewRegist = true; 
+    }
+
+    public clear(): void {
+        this._identifier = "";
+        this._identityType = 1;
+        this._uid = "";
+        this._isNewGuide = true; 
+        this._isNewRegist = true;         
+    }
+
+    public destroy(): void {
+        super.destroy();
+        this._identifier = null;
+        this._identityType = null; 
+        this._uid = null; 
+        this._isNewGuide = null; 
+        this._isNewRegist = null;               
+    }    
 
     /** 设置身份识别码 */
     public set identifier(value: string) {
@@ -64,29 +89,4 @@ export class AccountData extends BaseData {
     public get isNewRegist(): boolean {
         return this._isNewRegist;
     }      
-
-    public reset(): void {
-        this._identifier = "";
-        this._identityType = 1;
-        this._uid = "";
-        this._isNewGuide = true; 
-        this._isNewRegist = true; 
-    }
-
-    public clear(): void {
-        this._identifier = "";
-        this._identityType = 1;
-        this._uid = "";
-        this._isNewGuide = true; 
-        this._isNewRegist = true;         
-    }
-
-    public destroy(): void {
-        super.destroy();
-        this._identifier = null;
-        this._identityType = null; 
-        this._uid = null; 
-        this._isNewGuide = null; 
-        this._isNewRegist = null;               
-    }
 }

assets/Scripts/chat18x/data/LoginData.ts

@@ -10,6 +10,8 @@ export class LoginData extends BaseData {
     private _token = "";
     // refresh token
     private _refreshToken = "";  
+    // token 过期时间戳 
+    private _expire = 0;
     // 操作类型，1：登录界面；2：断线重连；3：其他
     private _operateType = 1;
     // 公网IP
@@ -19,7 +21,44 @@ export class LoginData extends BaseData {
     // sdk体系的UID
     private _sdkUid = "";   
     // 上次登陆时间
-    private _lastLoginTime = "";        
+    private _lastLoginTime = "";    
+    
+    public reset(): void {
+        this._loginState = 0;
+        this._token = "";
+        this._refreshToken = "";
+        this._expire = 0;
+        this._operateType = 1;
+        this._ip = "";
+        this._machineIdentifier = "";
+        this._sdkUid = "";
+        this._lastLoginTime = "";
+    }
+
+    public clear(): void {
+        this._loginState = 0;
+        this._token = "";
+        this._refreshToken = "";
+        this._expire = 0;
+        this._operateType = 1;
+        this._ip = "";
+        this._machineIdentifier = "";
+        this._sdkUid = "";
+        this._lastLoginTime = "";
+    }
+
+    public destroy(): void {
+        super.destroy();
+        this._loginState = null;
+        this._token = null;
+        this._refreshToken = null;
+        this._expire = null;
+        this._operateType = null;
+        this._ip = null;
+        this._machineIdentifier = null;
+        this._sdkUid = null;
+        this._lastLoginTime = null;
+    }    
 
     /**是否已登录成功 */
     public isLogin(): boolean {
@@ -55,8 +94,18 @@ export class LoginData extends BaseData {
     /** 获取登录refresh token */
     public get refreshToken(): string {
         return this._refreshToken;
-    }       
+    } 
     
+    /** 设置token 过期时间戳  */
+    public set expire(value: number) {
+        this._expire = value;
+    }
+
+    /** 获取token 过期时间戳  */
+    public get expire(): number {
+        return this._expire;
+    }    
+
     /** 设置操作类型 */
     public set operateType(value: number) {
         this._operateType = value;
@@ -106,35 +155,4 @@ export class LoginData extends BaseData {
     public get lastLoginTime(): string {
         return this._lastLoginTime;
     }       
-
-    public reset(): void {
-        this._loginState = 0;
-        this._token = "";
-        this._operateType = 1;
-        this._ip = "";
-        this._machineIdentifier = "";
-        this._sdkUid = "";
-        this._lastLoginTime = "";
-    }
-
-    public clear(): void {
-        this._loginState = 0;
-        this._token = "";
-        this._operateType = 1;
-        this._ip = "";
-        this._machineIdentifier = "";
-        this._sdkUid = "";
-        this._lastLoginTime = "";
-    }
-
-    public destroy(): void {
-        super.destroy();
-        this._loginState = null;
-        this._token = null;
-        this._operateType = null;
-        this._ip = null;
-        this._machineIdentifier = null;
-        this._sdkUid = null;
-        this._lastLoginTime = null;
-    }
 }

assets/Scripts/chat18x/data/PlayerData.ts

@@ -4,29 +4,59 @@
 import { BaseData } from "./BaseData";
 
 export class PlayerData extends BaseData {
+    // 用户名
     private _name: string = '';
-    private _score: number = 0;
+    // 钻石数
+    private _diamond: number = 0;
+    // vip失效时间戳
+    private _vipExpire: number = 0;
 
     public reset(): void {
         this._name = '';
-        this._score = 0;
+        this._diamond = 0;
+        this._vipExpire = 0;
     }
 
     public clear(): void {
         this._name = '';
-        this._score = 0;
+        this._diamond = 0;
+        this._vipExpire = 0;
     }
 
     public destroy(): void {
         super.destroy();
-        // 这里可以做额外释放资源的操作
+        this._name = null;
+        this._diamond = null;   
+        this._vipExpire = null;
     }
 
-    public setName(name: string): void {
+    /** 设置用户名 */
-        this._name = name;
+    public set name(value: string) {
+        this._name = value;
     }
 
-    public getName(): string {
+    /** 获取用户名 */
+    public get name(): string {
         return this._name;
     }
+
+    /** 设置钻石数 */
+    public set diamond(value: number) {
+        this._diamond = value;
+    }
+
+    /** 获取钻石数 */
+    public get diamond(): number {
+        return this._diamond;
+    }    
+
+    /** 设置vip失效时间戳 */
+    public set vipExpire(value: number) {
+        this._vipExpire = value;
+    }
+
+    /** 获取vip失效时间戳 */
+    public get vipExpire(): number {
+        return this._vipExpire;
+    }      
 }

assets/Scripts/chat18x/network/services/PlayerDataService.ts

@@ -11,25 +11,14 @@ export class PlayerDataService {
   }
   private constructor(private api = ApiClient.I) {}
 
-  // 拉取玩家数据
+  // 获取个人信息
-  public async reqQueryPlayerData(req: proto.ProtoMsg.IQueryPlayerDataReq): Promise<ApiResponse<proto.ProtoMsg.IQueryPlayerDataRsp>> {
+  public async reqMyInfo(req: proto.cs.ICSMyInfoReq): Promise<ApiResponse<proto.cs.ICSMyInfoRes>> {
-    let epData: Endpoint<proto.ProtoMsg.IQueryPlayerDataReq, proto.ProtoMsg.IQueryPlayerDataRsp> = {
+    let epData: Endpoint<proto.cs.ICSMyInfoReq, proto.cs.ICSMyInfoRes> = {
-        path: "playerdata/query_player_data",
+        path: "api/acc/info",
         method: "POST",
         codec: "json",
         needsAuth: true
     };
     return this.api.call(epData, req);
   }
-
-  // 保存玩家数据
-  public async reqSavePlayerData(req: proto.ProtoMsg.ISavePlayerDataReq): Promise<ApiResponse<proto.ProtoMsg.ISavePlayerDataRsp>> {
-    let epData: Endpoint<proto.ProtoMsg.ISavePlayerDataReq, proto.ProtoMsg.ISavePlayerDataRsp> = {
-        path: "playerdata/save_player_data",
-        method: "POST",
-        codec: "json",
-        needsAuth: true
-    };
-    return this.api.call(epData, req);
-  }  
 }

assets/Scripts/proto/proto.pb.d.ts

@@ -145,6 +145,115 @@ toJSON(): { [k: string]: any };
 static getTypeUrl(typeUrlPrefix?: string): string;
     }
 
+    /** Properties of a GirlPhoto. */
+    interface IGirlPhoto {
+
+        /** GirlPhoto pic */
+        pic?: (string|null);
+
+        /** GirlPhoto isRelease */
+        isRelease?: (boolean|null);
+
+        /** GirlPhoto price */
+        price?: (number|null);
+    }
+
+    /** Represents a GirlPhoto. */
+    class GirlPhoto implements IGirlPhoto {
+
+        /**
+         * Constructs a new GirlPhoto.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: cs.IGirlPhoto);
+
+        /** GirlPhoto pic. */
+pic: string;
+
+        /** GirlPhoto isRelease. */
+isRelease: boolean;
+
+        /** GirlPhoto price. */
+price: number;
+
+        /**
+         * Creates a new GirlPhoto instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns GirlPhoto instance
+         */
+static create(properties?: cs.IGirlPhoto): cs.GirlPhoto;
+
+        /**
+         * Encodes the specified GirlPhoto message. Does not implicitly {@link cs.GirlPhoto.verify|verify} messages.
+         * @param message GirlPhoto message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encode(message: cs.IGirlPhoto, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified GirlPhoto message, length delimited. Does not implicitly {@link cs.GirlPhoto.verify|verify} messages.
+         * @param message GirlPhoto message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encodeDelimited(message: cs.IGirlPhoto, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a GirlPhoto message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns GirlPhoto
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.GirlPhoto;
+
+        /**
+         * Decodes a GirlPhoto message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns GirlPhoto
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.GirlPhoto;
+
+        /**
+         * Verifies a GirlPhoto message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a GirlPhoto message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns GirlPhoto
+         */
+static fromObject(object: { [k: string]: any }): cs.GirlPhoto;
+
+        /**
+         * Creates a plain object from a GirlPhoto message. Also converts values to other types if specified.
+         * @param message GirlPhoto
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+static toObject(message: cs.GirlPhoto, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this GirlPhoto to JSON.
+         * @returns JSON object
+         */
+toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for GirlPhoto
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
     /** Properties of a GirlDetail. */
     interface IGirlDetail {
 
@@ -154,8 +263,14 @@ static getTypeUrl(typeUrlPrefix?: string): string;
         /** GirlDetail desc */
         desc?: (string|null);
 
-        /** GirlDetail pics */
+        /** GirlDetail photos */
-        pics?: (string[]|null);
+        photos?: (cs.IGirlPhoto[]|null);
+
+        /** GirlDetail isRelease */
+        isRelease?: (boolean|null);
+
+        /** GirlDetail chatCount */
+        chatCount?: (number|null);
     }
 
     /** Represents a GirlDetail. */
@@ -173,8 +288,14 @@ brief?: (cs.IGirlBrief|null);
         /** GirlDetail desc. */
 desc: string;
 
-        /** GirlDetail pics. */
+        /** GirlDetail photos. */
-pics: string[];
+photos: cs.IGirlPhoto[];
+
+        /** GirlDetail isRelease. */
+isRelease: boolean;
+
+        /** GirlDetail chatCount. */
+chatCount: number;
 
         /**
          * Creates a new GirlDetail instance using the specified properties.
@@ -548,8 +669,8 @@ static getTypeUrl(typeUrlPrefix?: string): string;
         /** HallTheme category */
         category?: (number|null);
 
-        /** HallTheme isLock */
+        /** HallTheme isRelease */
-        isLock?: (boolean|null);
+        isRelease?: (boolean|null);
 
         /** HallTheme path */
         path?: (string|null);
@@ -576,8 +697,8 @@ name: string;
         /** HallTheme category. */
 category: number;
 
-        /** HallTheme isLock. */
+        /** HallTheme isRelease. */
-isLock: boolean;
+isRelease: boolean;
 
         /** HallTheme path. */
 path: string;
@@ -761,7 +882,7 @@ static getTypeUrl(typeUrlPrefix?: string): string;
     interface ICSGetGirlListReq {
 
         /** CSGetGirlListReq category */
-        category?: (string|null);
+        category?: (number|null);
 
         /** CSGetGirlListReq page */
         page?: (number|null);
@@ -780,7 +901,7 @@ static getTypeUrl(typeUrlPrefix?: string): string;
         constructor(properties?: cs.ICSGetGirlListReq);
 
         /** CSGetGirlListReq category. */
-category: string;
+category: number;
 
         /** CSGetGirlListReq page. */
 page: number;
@@ -1157,230 +1278,121 @@ toJSON(): { [k: string]: any };
 static getTypeUrl(typeUrlPrefix?: string): string;
     }
 
-    /** Properties of a Diamond. */
+    /** Properties of a Good. */
-    interface IDiamond {
+    interface IGood {
 
-        /** Diamond id */
+        /** Good id */
         id?: (number|null);
 
-        /** Diamond name */
+        /** Good name */
         name?: (string|null);
 
-        /** Diamond price */
+        /** Good desc */
-        price?: (string|null);
-
-        /** Diamond diamonCount */
-        diamonCount?: (number|null);
-    }
-
-    /** Represents a Diamond. */
-    class Diamond implements IDiamond {
-
-        /**
-         * Constructs a new Diamond.
-         * @param [properties] Properties to set
-         */
-        constructor(properties?: cs.IDiamond);
-
-        /** Diamond id. */
-id: number;
-
-        /** Diamond name. */
-name: string;
-
-        /** Diamond price. */
-price: string;
-
-        /** Diamond diamonCount. */
-diamonCount: number;
-
-        /**
-         * Creates a new Diamond instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns Diamond instance
-         */
-static create(properties?: cs.IDiamond): cs.Diamond;
-
-        /**
-         * Encodes the specified Diamond message. Does not implicitly {@link cs.Diamond.verify|verify} messages.
-         * @param message Diamond message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-static encode(message: cs.IDiamond, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified Diamond message, length delimited. Does not implicitly {@link cs.Diamond.verify|verify} messages.
-         * @param message Diamond message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-static encodeDelimited(message: cs.IDiamond, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Decodes a Diamond message from the specified reader or buffer.
-         * @param reader Reader or buffer to decode from
-         * @param [length] Message length if known beforehand
-         * @returns Diamond
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
-static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.Diamond;
-
-        /**
-         * Decodes a Diamond message from the specified reader or buffer, length delimited.
-         * @param reader Reader or buffer to decode from
-         * @returns Diamond
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
-static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.Diamond;
-
-        /**
-         * Verifies a Diamond message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a Diamond message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns Diamond
-         */
-static fromObject(object: { [k: string]: any }): cs.Diamond;
-
-        /**
-         * Creates a plain object from a Diamond message. Also converts values to other types if specified.
-         * @param message Diamond
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-static toObject(message: cs.Diamond, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this Diamond to JSON.
-         * @returns JSON object
-         */
-toJSON(): { [k: string]: any };
-
-        /**
-         * Gets the default type url for Diamond
-         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
-         * @returns The default type url
-         */
-static getTypeUrl(typeUrlPrefix?: string): string;
-    }
-
-    /** Properties of a Vip. */
-    interface IVip {
-
-        /** Vip id */
-        id?: (number|null);
-
-        /** Vip name */
-        name?: (string|null);
-
-        /** Vip desc */
         desc?: (string|null);
 
-        /** Vip price */
+        /** Good price */
         price?: (string|null);
+
+        /** Good count */
+        count?: (number|null);
     }
 
-    /** Represents a Vip. */
+    /** Represents a Good. */
-    class Vip implements IVip {
+    class Good implements IGood {
 
         /**
-         * Constructs a new Vip.
+         * Constructs a new Good.
          * @param [properties] Properties to set
          */
-        constructor(properties?: cs.IVip);
+        constructor(properties?: cs.IGood);
 
-        /** Vip id. */
+        /** Good id. */
 id: number;
 
-        /** Vip name. */
+        /** Good name. */
 name: string;
 
-        /** Vip desc. */
+        /** Good desc. */
 desc: string;
 
-        /** Vip price. */
+        /** Good price. */
 price: string;
 
+        /** Good count. */
+count: number;
+
         /**
-         * Creates a new Vip instance using the specified properties.
+         * Creates a new Good instance using the specified properties.
          * @param [properties] Properties to set
-         * @returns Vip instance
+         * @returns Good instance
          */
-static create(properties?: cs.IVip): cs.Vip;
+static create(properties?: cs.IGood): cs.Good;
 
         /**
-         * Encodes the specified Vip message. Does not implicitly {@link cs.Vip.verify|verify} messages.
+         * Encodes the specified Good message. Does not implicitly {@link cs.Good.verify|verify} messages.
-         * @param message Vip message or plain object to encode
+         * @param message Good message or plain object to encode
          * @param [writer] Writer to encode to
          * @returns Writer
          */
-static encode(message: cs.IVip, writer?: $protobuf.Writer): $protobuf.Writer;
+static encode(message: cs.IGood, writer?: $protobuf.Writer): $protobuf.Writer;
 
         /**
-         * Encodes the specified Vip message, length delimited. Does not implicitly {@link cs.Vip.verify|verify} messages.
+         * Encodes the specified Good message, length delimited. Does not implicitly {@link cs.Good.verify|verify} messages.
-         * @param message Vip message or plain object to encode
+         * @param message Good message or plain object to encode
          * @param [writer] Writer to encode to
          * @returns Writer
          */
-static encodeDelimited(message: cs.IVip, writer?: $protobuf.Writer): $protobuf.Writer;
+static encodeDelimited(message: cs.IGood, writer?: $protobuf.Writer): $protobuf.Writer;
 
         /**
-         * Decodes a Vip message from the specified reader or buffer.
+         * Decodes a Good message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
          * @param [length] Message length if known beforehand
-         * @returns Vip
+         * @returns Good
          * @throws {Error} If the payload is not a reader or valid buffer
          * @throws {$protobuf.util.ProtocolError} If required fields are missing
          */
-static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.Vip;
+static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.Good;
 
         /**
-         * Decodes a Vip message from the specified reader or buffer, length delimited.
+         * Decodes a Good message from the specified reader or buffer, length delimited.
          * @param reader Reader or buffer to decode from
-         * @returns Vip
+         * @returns Good
          * @throws {Error} If the payload is not a reader or valid buffer
          * @throws {$protobuf.util.ProtocolError} If required fields are missing
          */
-static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.Vip;
+static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.Good;
 
         /**
-         * Verifies a Vip message.
+         * Verifies a Good message.
          * @param message Plain object to verify
          * @returns `null` if valid, otherwise the reason why it is not
          */
 static verify(message: { [k: string]: any }): (string|null);
 
         /**
-         * Creates a Vip message from a plain object. Also converts values to their respective internal types.
+         * Creates a Good message from a plain object. Also converts values to their respective internal types.
          * @param object Plain object
-         * @returns Vip
+         * @returns Good
          */
-static fromObject(object: { [k: string]: any }): cs.Vip;
+static fromObject(object: { [k: string]: any }): cs.Good;
 
         /**
-         * Creates a plain object from a Vip message. Also converts values to other types if specified.
+         * Creates a plain object from a Good message. Also converts values to other types if specified.
-         * @param message Vip
+         * @param message Good
          * @param [options] Conversion options
          * @returns Plain object
          */
-static toObject(message: cs.Vip, options?: $protobuf.IConversionOptions): { [k: string]: any };
+static toObject(message: cs.Good, options?: $protobuf.IConversionOptions): { [k: string]: any };
 
         /**
-         * Converts this Vip to JSON.
+         * Converts this Good to JSON.
          * @returns JSON object
          */
 toJSON(): { [k: string]: any };
 
         /**
-         * Gets the default type url for Vip
+         * Gets the default type url for Good
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
          * @returns The default type url
          */
@@ -1481,11 +1493,8 @@ static getTypeUrl(typeUrlPrefix?: string): string;
     /** Properties of a CSGetShopRes. */
     interface ICSGetShopRes {
 
-        /** CSGetShopRes diamonds */
+        /** CSGetShopRes Goods */
-        diamonds?: (cs.IDiamond[]|null);
+        Goods?: (cs.IGood[]|null);
-
-        /** CSGetShopRes vips */
-        vips?: (cs.IVip[]|null);
     }
 
     /** Represents a CSGetShopRes. */
@@ -1497,11 +1506,8 @@ static getTypeUrl(typeUrlPrefix?: string): string;
          */
         constructor(properties?: cs.ICSGetShopRes);
 
-        /** CSGetShopRes diamonds. */
+        /** CSGetShopRes Goods. */
-diamonds: cs.IDiamond[];
+Goods: cs.IGood[];
-
-        /** CSGetShopRes vips. */
-vips: cs.IVip[];
 
         /**
          * Creates a new CSGetShopRes instance using the specified properties.
@@ -1877,6 +1883,9 @@ static getTypeUrl(typeUrlPrefix?: string): string;
 
         /** CSCreateOrderRes payUrl */
         payUrl?: (string|null);
+
+        /** CSCreateOrderRes orderId */
+        orderId?: (string|null);
     }
 
     /** Represents a CSCreateOrderRes. */
@@ -1891,6 +1900,9 @@ static getTypeUrl(typeUrlPrefix?: string): string;
         /** CSCreateOrderRes payUrl. */
 payUrl: string;
 
+        /** CSCreateOrderRes orderId. */
+orderId: string;
+
         /**
          * Creates a new CSCreateOrderRes instance using the specified properties.
          * @param [properties] Properties to set
@@ -1969,6 +1981,218 @@ toJSON(): { [k: string]: any };
 static getTypeUrl(typeUrlPrefix?: string): string;
     }
 
+    /** Properties of a CSQueryOrderReq. */
+    interface ICSQueryOrderReq {
+
+        /** CSQueryOrderReq orderId */
+        orderId?: (string|null);
+    }
+
+    /** Represents a CSQueryOrderReq. */
+    class CSQueryOrderReq implements ICSQueryOrderReq {
+
+        /**
+         * Constructs a new CSQueryOrderReq.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: cs.ICSQueryOrderReq);
+
+        /** CSQueryOrderReq orderId. */
+orderId: string;
+
+        /**
+         * Creates a new CSQueryOrderReq instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns CSQueryOrderReq instance
+         */
+static create(properties?: cs.ICSQueryOrderReq): cs.CSQueryOrderReq;
+
+        /**
+         * Encodes the specified CSQueryOrderReq message. Does not implicitly {@link cs.CSQueryOrderReq.verify|verify} messages.
+         * @param message CSQueryOrderReq message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encode(message: cs.ICSQueryOrderReq, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified CSQueryOrderReq message, length delimited. Does not implicitly {@link cs.CSQueryOrderReq.verify|verify} messages.
+         * @param message CSQueryOrderReq message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encodeDelimited(message: cs.ICSQueryOrderReq, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a CSQueryOrderReq message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns CSQueryOrderReq
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.CSQueryOrderReq;
+
+        /**
+         * Decodes a CSQueryOrderReq message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns CSQueryOrderReq
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.CSQueryOrderReq;
+
+        /**
+         * Verifies a CSQueryOrderReq message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a CSQueryOrderReq message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns CSQueryOrderReq
+         */
+static fromObject(object: { [k: string]: any }): cs.CSQueryOrderReq;
+
+        /**
+         * Creates a plain object from a CSQueryOrderReq message. Also converts values to other types if specified.
+         * @param message CSQueryOrderReq
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+static toObject(message: cs.CSQueryOrderReq, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this CSQueryOrderReq to JSON.
+         * @returns JSON object
+         */
+toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for CSQueryOrderReq
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a CSQueryOrderRes. */
+    interface ICSQueryOrderRes {
+
+        /** CSQueryOrderRes status */
+        status?: (number|null);
+
+        /** CSQueryOrderRes retCode */
+        retCode?: (number|null);
+
+        /** CSQueryOrderRes diamond */
+        diamond?: (number|Long|null);
+
+        /** CSQueryOrderRes vipExpire */
+        vipExpire?: (number|Long|null);
+    }
+
+    /** Represents a CSQueryOrderRes. */
+    class CSQueryOrderRes implements ICSQueryOrderRes {
+
+        /**
+         * Constructs a new CSQueryOrderRes.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: cs.ICSQueryOrderRes);
+
+        /** CSQueryOrderRes status. */
+status: number;
+
+        /** CSQueryOrderRes retCode. */
+retCode: number;
+
+        /** CSQueryOrderRes diamond. */
+diamond: (number|Long);
+
+        /** CSQueryOrderRes vipExpire. */
+vipExpire: (number|Long);
+
+        /**
+         * Creates a new CSQueryOrderRes instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns CSQueryOrderRes instance
+         */
+static create(properties?: cs.ICSQueryOrderRes): cs.CSQueryOrderRes;
+
+        /**
+         * Encodes the specified CSQueryOrderRes message. Does not implicitly {@link cs.CSQueryOrderRes.verify|verify} messages.
+         * @param message CSQueryOrderRes message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encode(message: cs.ICSQueryOrderRes, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified CSQueryOrderRes message, length delimited. Does not implicitly {@link cs.CSQueryOrderRes.verify|verify} messages.
+         * @param message CSQueryOrderRes message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+static encodeDelimited(message: cs.ICSQueryOrderRes, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a CSQueryOrderRes message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns CSQueryOrderRes
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): cs.CSQueryOrderRes;
+
+        /**
+         * Decodes a CSQueryOrderRes message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns CSQueryOrderRes
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): cs.CSQueryOrderRes;
+
+        /**
+         * Verifies a CSQueryOrderRes message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a CSQueryOrderRes message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns CSQueryOrderRes
+         */
+static fromObject(object: { [k: string]: any }): cs.CSQueryOrderRes;
+
+        /**
+         * Creates a plain object from a CSQueryOrderRes message. Also converts values to other types if specified.
+         * @param message CSQueryOrderRes
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+static toObject(message: cs.CSQueryOrderRes, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this CSQueryOrderRes to JSON.
+         * @returns JSON object
+         */
+toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for CSQueryOrderRes
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
     /** Properties of a CSLoginReq. */
     interface ICSLoginReq {