Ver Fonte

战斗日志

chenwb10023 há 3 dias atrás
pai
commit
183e84c93e
77 ficheiros alterados com 1404 adições e 1246 exclusões
  1. 12 8
      assets/json/itemInfo.json
  2. 13 13
      assets/script/common/xlsConfig.ts
  3. 17 3
      assets/script/data/model/Battle/BattleModel.ts
  4. 14 0
      assets/script/data/model/Battle/BattleModelData.ts
  5. 1 1
      assets/script/data/model/Battle/BattleModelData.ts.meta
  6. 1 1
      assets/script/logic/battle/UEBattleRole.ts
  7. 930 926
      assets/script/logic/battle/UEBattleView.ts
  8. 1 1
      assets/script/shared/admin.meta
  9. 1 1
      assets/script/shared/admin/PtlDeleteSetting.ts.meta
  10. 1 1
      assets/script/shared/admin/PtlGetSetting.ts.meta
  11. 1 1
      assets/script/shared/admin/PtlGetVer.ts.meta
  12. 1 1
      assets/script/shared/admin/PtlHuodongFind.ts.meta
  13. 1 1
      assets/script/shared/admin/PtlUpdateSetting.ts.meta
  14. 1 1
      assets/script/shared/admin/PtladdBuMa.ts.meta
  15. 1 1
      assets/script/shared/admin/PtladdCode.ts.meta
  16. 1 1
      assets/script/shared/admin/PtladdMail.ts.meta
  17. 1 1
      assets/script/shared/admin/PtlcacheVer.ts.meta
  18. 1 1
      assets/script/shared/admin/PtldeleteCode.ts.meta
  19. 1 1
      assets/script/shared/admin/PtldeleteMail.ts.meta
  20. 1 1
      assets/script/shared/admin/PtldeleteQuFu.ts.meta
  21. 1 1
      assets/script/shared/admin/PtlgetCode.ts.meta
  22. 1 1
      assets/script/shared/admin/PtlgetCodeMa.ts.meta
  23. 1 1
      assets/script/shared/admin/PtlgetMail.ts.meta
  24. 1 1
      assets/script/shared/admin/PtlgetNeed.ts.meta
  25. 1 1
      assets/script/shared/admin/PtlgetQuFu.ts.meta
  26. 1 1
      assets/script/shared/admin/PtlhuodongAdd.ts.meta
  27. 1 1
      assets/script/shared/admin/PtlhuodongDelete.ts.meta
  28. 1 1
      assets/script/shared/admin/PtlhuodongEdit.ts.meta
  29. 1 1
      assets/script/shared/admin/PtlupdateMail.ts.meta
  30. 1 1
      assets/script/shared/admin/PtlupdateQuFu.ts.meta
  31. 1 1
      assets/script/shared/admin/Ptlxiazai.ts.meta
  32. 1 1
      assets/script/shared/base.ts.meta
  33. 1 1
      assets/script/shared/common.meta
  34. 1 1
      assets/script/shared/common/MsgItems.ts.meta
  35. 1 1
      assets/script/shared/common/MsgMessage.ts.meta
  36. 1 1
      assets/script/shared/eps.meta
  37. 1 1
      assets/script/shared/eps/PtlEpsInfo.ts.meta
  38. 1 1
      assets/script/shared/eps/server.meta
  39. 1 1
      assets/script/shared/eps/server/MsgEpsChange_s.ts.meta
  40. 13 0
      assets/script/shared/fight.meta
  41. 8 6
      assets/script/shared/fight/PtlFightTest.ts
  42. 10 0
      assets/script/shared/fight/PtlFightTest.ts.meta
  43. 1 1
      assets/script/shared/hc.meta
  44. 22 0
      assets/script/shared/hc/PtlHcEmit.ts
  45. 10 0
      assets/script/shared/hc/PtlHcEmit.ts.meta
  46. 1 1
      assets/script/shared/hc/PtlHcInfo.ts.meta
  47. 1 1
      assets/script/shared/hc/PtlHcMerge.ts.meta
  48. 1 1
      assets/script/shared/item.meta
  49. 1 1
      assets/script/shared/item/PtlItemInfo.ts.meta
  50. 1 1
      assets/script/shared/item/server.meta
  51. 1 1
      assets/script/shared/item/server/MsgItemChange_s.ts.meta
  52. 1 1
      assets/script/shared/mail.meta
  53. 1 1
      assets/script/shared/mail/PtlMailDelAll.ts.meta
  54. 1 1
      assets/script/shared/mail/PtlMailDelOne.ts.meta
  55. 1 1
      assets/script/shared/mail/PtlMailInfo.ts.meta
  56. 1 1
      assets/script/shared/mail/PtlMailRwdAll.ts.meta
  57. 1 1
      assets/script/shared/mail/PtlMailRwdOne.ts.meta
  58. 1 1
      assets/script/shared/mail/server.meta
  59. 1 1
      assets/script/shared/mail/server/MsgMailNew_s.ts.meta
  60. 1 1
      assets/script/shared/plat.meta
  61. 1 1
      assets/script/shared/plat/PtlPlatLogin.ts.meta
  62. 1 1
      assets/script/shared/player.meta
  63. 1 1
      assets/script/shared/player/PtlPlayerLogin.ts.meta
  64. 289 224
      assets/script/shared/serviceProto.ts
  65. 1 1
      assets/script/shared/serviceProto.ts.meta
  66. 1 1
      assets/script/shared/task.meta
  67. 1 1
      assets/script/shared/task/PtlTaskInfo.ts.meta
  68. 1 1
      assets/script/shared/task/PtlTaskRwd.ts.meta
  69. 1 1
      assets/script/shared/task/server.meta
  70. 1 1
      assets/script/shared/task/server/MsgTaskCons_s.ts.meta
  71. 1 1
      assets/script/shared/user.meta
  72. 1 1
      assets/script/shared/user/PtlUserLogin.ts.meta
  73. 1 1
      assets/script/shared/user/PtlUserNotices.ts.meta
  74. 1 1
      assets/script/shared/user/PtlUserSetName.ts.meta
  75. 1 1
      assets/script/shared/user/PtlUserUseCode.ts.meta
  76. 1 1
      assets/script/shared/user/server.meta
  77. 1 1
      assets/script/shared/user/server/MsgUserUplevel_s.ts.meta

+ 12 - 8
assets/json/itemInfo.json

@@ -1,16 +1,20 @@
 [
   {"id":"101","name":"金币","icon":"item_101","desc":"可以用来升级翅膀","pinzhi":1,"type":"1","detailType":"","param":0,"from":null,"produce":""},
   {"id":"102","name":"钻石","icon":"item_102","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"103","name":"宠物币","icon":"item_103","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"200","name":"体力","icon":"item_200","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"201","name":"宠物饼干","icon":"item_201","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"202","name":"羽毛","icon":"item_202","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"203","name":"神羽","icon":"item_203","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"204","name":"天赋书","icon":"item_204","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"205","name":"鱼币","icon":"item_205","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"206","name":"珍珠","icon":"item_206","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"103","name":"角色经验","icon":"item_103","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"104","name":"公会贡献","icon":"item_104","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"105","name":"公会经验","icon":"item_105","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"201","name":"体力","icon":"item_201","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"211","name":"羽毛","icon":"item_211","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"212","name":"神羽","icon":"item_212","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"221","name":"宠物币","icon":"item_221","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"222","name":"宠物饼干","icon":"item_222","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"231","name":"天赋书","icon":"item_231","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"241","name":"鱼币","icon":"item_241","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"242","name":"珍珠","icon":"item_242","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
   {"id":"1001","name":"竞技场门票","icon":"item_1001","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
   {"id":"1002","name":"加速卡","icon":"item_1002","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"1003","name":"后悔药","icon":"item_1003","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
   {"id":"1101","name":"面团","icon":"item_1101","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
   {"id":"1102","name":"臭臭饵","icon":"item_1102","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
   {"id":"1103","name":"果子饵","icon":"item_1103","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},

+ 13 - 13
assets/script/common/xlsConfig.ts

@@ -50,28 +50,28 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 // type for wing.excel
 
 export class XlsConfig {
-    xlsItemKind: xlsItemKind[]
-    xlsItemInfo: xlsItemInfo[]
-    xlsKaiqiInfo: xlsKaiqiInfo[]
-    xlsEquipInfo: xlsEquipInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsAudioInfo: xlsAudioInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
     xlsEmitterInfo: xlsEmitterInfo[]
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsLanguageClientText: xlsLanguageClientText[]
-    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsEquipInfo: xlsEquipInfo[]
     xlsGuideInfo: xlsGuideInfo[]
-    xlsAudioInfo: xlsAudioInfo[]
-    xlsNameName: xlsNameName[]
+    xlsItemKind: xlsItemKind[]
+    xlsItemInfo: xlsItemInfo[]
     xlsLevelLevel: xlsLevelLevel[]
-    xlsPackageInfo: xlsPackageInfo[]
-    xlsMergeInfo: xlsMergeInfo[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
-    xlsMathInfo: xlsMathInfo[]
     xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsLanguageClientText: xlsLanguageClientText[]
+    xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsMergePropInfo: xlsMergePropInfo[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
     xlsLanguageLang: xlsLanguageLang[]
+    xlsPackageInfo: xlsPackageInfo[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsNameName: xlsNameName[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {
         cc.assetManager.loadBundle(bundleName, (err, bundle) => {

+ 17 - 3
assets/script/data/model/Battle/BattleModel.ts

@@ -1,10 +1,12 @@
-
-import IDataModel from "../../../frameWork/model/IDataModel";
 import UEBattleRole from "../../../logic/battle/UEBattleRole";
+import { ResFightTest } from "../../../shared/fight/PtlFightTest";
+import GameDataCenter from "../../GameDataCenter";
+import { BattleModelData } from "./BattleModelData";
 
-export default class BattleModel extends IDataModel {
+export default class BattleModel extends BattleModelData {
     battleRoleList: { [id: string]: UEBattleRole } = {}
     realBattleSpeed: number;
+	fightInfo: ResFightTest;
 
 	constructor() {
 		super("battle");
@@ -15,4 +17,16 @@ export default class BattleModel extends IDataModel {
     addRole(id: string, role: UEBattleRole) {
 		this.battleRoleList[id] = role
     }
+
+	setFightInfo(res: ResFightTest) {
+		this.fightInfo = res;
+	}
+
+	async SendTestFight(cb:	Function) {
+		let ret = await GameDataCenter.gameServer.ReqApi("fight/FightTest", {});
+        if (ret?.res) {
+            this.setFightInfo(ret.res);
+            cb();
+        }
+	}
 }

+ 14 - 0
assets/script/data/model/Battle/BattleModelData.ts

@@ -0,0 +1,14 @@
+
+import IDataModel from "../../../frameWork/model/IDataModel";
+import { fightLogOne, fightLogOneData, FightStart, FightTeam, ResFightTest } from "../../../shared/fight/PtlFightTest";
+
+/**
+ * 定义 Model 的数据
+ */
+export class BattleModelData extends IDataModel {
+    fightTest : ResFightTest;
+    fightStart : FightStart;
+    fightTeam : FightTeam;
+    fightLogOne: fightLogOne;
+    fightLogOneData: fightLogOneData;
+}

+ 1 - 1
assets/script/shared/user/PtlUserFight.ts.meta → assets/script/data/model/Battle/BattleModelData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "5fd090e0-8ced-4744-bae7-8ca52502071f",
+  "uuid": "a6e41bd3-2f82-4baf-833d-2aae4626497d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/logic/battle/UEBattleRole.ts

@@ -1,7 +1,7 @@
-import { FightTeam } from "../../common/Xys";
 import { FightType } from "../../data/const/TypeConst";
 import ResSpine from "../../frameWork/compment/ResSpine";
 import { eg } from "../../frameWork/eg";
+import { FightTeam } from "../../shared/fight/PtlFightTest";
 import AssetMgr from "../../utils/AssetMgr";
 import { uiCommon } from "../../utils/UICommon";
 import UERole from "../ui/UERole";

Diff do ficheiro suprimidas por serem muito extensas
+ 930 - 926
assets/script/logic/battle/UEBattleView.ts


+ 1 - 1
assets/script/shared/admin.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "4679aee3-2d82-4089-8b12-3719d8cbfdc2",
+  "uuid": "82c6baba-4402-4387-9443-bb78bcfc71bb",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/admin/PtlDeleteSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f576a3f6-edad-4bc9-84b1-56c3e2d645a2",
+  "uuid": "0fefe9c4-336c-4e13-b978-8d983a5c7911",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlGetSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "9c027fb1-d9e1-461b-90aa-d04ad97365a9",
+  "uuid": "e3cfe35b-9f0f-403e-a349-70041f07d039",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlGetVer.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e990b979-b4c0-4361-bfa8-006058420bd5",
+  "uuid": "27266220-8b3a-4555-a852-d098deb51b7d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlHuodongFind.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "82562e6a-2aff-4f1c-83ec-52e34e00d55f",
+  "uuid": "bd93040e-0b65-4ef7-bf46-26e640cfd622",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlUpdateSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "366e2260-a077-4894-9b67-ce22b8b96a4e",
+  "uuid": "e2871d7d-5a81-45bb-ae71-d2561976ba01",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtladdBuMa.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "cd28ba5e-52a1-4624-8159-48df9c95bbe0",
+  "uuid": "5fba6b05-5372-46d7-a778-e2f65e00bb6c",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtladdCode.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "8f282ae9-d2ef-45f2-8a01-0afcee6299fc",
+  "uuid": "2bd3bfab-102f-4754-82a6-216a05ddbff6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtladdMail.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "c5523b3d-49a3-436d-a6a9-a3d30d60c8eb",
+  "uuid": "797f99df-0393-45fa-8bef-1bad5d750303",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlcacheVer.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "98f1c22b-e01c-4919-9626-df23110d26d1",
+  "uuid": "d5460362-1f3e-4908-8cfa-6a9f6dd75ead",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtldeleteCode.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "b2c4b2a3-b23f-4027-aeaf-4113091ee46c",
+  "uuid": "fe9a10ce-4329-4789-b65b-8a161dceba41",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtldeleteMail.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "60c2bc31-89d5-4700-af38-d231289b436f",
+  "uuid": "7332cf92-ca83-43b8-8d67-1d4f02b04471",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtldeleteQuFu.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "acb12106-3115-4c33-aa6f-6ad9d1cba921",
+  "uuid": "6b7cfcf0-e3f3-4869-a356-a213e9d94cf7",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlgetCode.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "4def5180-53d6-409a-b8e5-bf00d0d31d37",
+  "uuid": "29daee5e-96c3-497a-bb9d-32a92a0e1db4",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlgetCodeMa.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "5cab3650-a98b-4158-9601-af54dc5279ec",
+  "uuid": "7e968009-2cf8-4add-8622-a9b6128aba1c",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlgetMail.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f030bb83-3fd6-4711-b568-1eabc12e3dad",
+  "uuid": "baad521f-5184-43cf-8ebc-b4cd04e5f20a",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlgetNeed.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "63e03343-019a-402a-97bd-38d6cb27ac3a",
+  "uuid": "92d5a95d-1196-4688-be62-c62ad865de11",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlgetQuFu.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "5715f61c-c53f-4d2b-9c93-34e37efa1fc9",
+  "uuid": "b61edc5f-bd0f-422a-9358-495218150d62",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlhuodongAdd.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "b53b8097-7dcf-4dd1-80dc-ddd3b3911d63",
+  "uuid": "a6213e39-e814-4ae2-b618-8af98f7d0971",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlhuodongDelete.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "742daf9e-d481-46e5-92b4-014226f4c24f",
+  "uuid": "c07c4b7c-e22b-4ceb-b8b5-bb737f1478a9",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlhuodongEdit.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "7ee553de-47cb-42fa-92d7-fe36d083b486",
+  "uuid": "9646a8ea-5e27-455f-b8dd-fc7688e50f22",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlupdateMail.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "bd6a5e46-95e2-4c79-978e-2dfc5cc137c2",
+  "uuid": "cbc97720-308a-4459-9c26-2a050891d442",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/PtlupdateQuFu.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "567c437d-1bdb-48c9-91dc-bc0b7da9ce60",
+  "uuid": "4b597b89-8c23-46c5-bf92-222b0be784b6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/admin/Ptlxiazai.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "70f34664-823b-4833-8511-15ae09452300",
+  "uuid": "97e77896-b3cc-469f-8989-19a969d47636",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/base.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "47667a71-328c-491e-980a-2074c3369652",
+  "uuid": "cdf49ad5-0723-4cb9-94a3-6b0db50d1448",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/common.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "c3da660f-4488-4518-94a7-e72769ca8f05",
+  "uuid": "2778731d-fcc3-47fe-98f3-959befdcf863",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/common/MsgItems.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "9afd4ec7-2113-4a4a-bd62-5b9178cd926f",
+  "uuid": "020422a4-93ab-4e07-b4d9-2a7ccf849e6d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/common/MsgMessage.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "c8f2fc78-7ab0-46d0-857e-eed88ca24716",
+  "uuid": "bfbefd2a-a642-438c-bb95-1a6c09d120be",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/eps.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "4edcbb38-383b-47c3-bea7-7eb9075c46b3",
+  "uuid": "7d2a2d4e-f224-49fa-9c9e-03c33c36b72c",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/eps/PtlEpsInfo.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "aec47d22-a594-482f-863e-704710a5b160",
+  "uuid": "f77dd060-bc84-4932-a790-da6bf2469dcd",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/eps/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "1191cd9a-3edf-4aa4-86a6-26c84a32969f",
+  "uuid": "a7d0f1c5-2654-4a8e-a98c-08e0861fa5ed",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/eps/server/MsgEpsChange_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "8a0c6e7a-94f9-470b-93f8-8cf7cf0f5cbd",
+  "uuid": "56b1d4e1-c819-4633-aa86-22b89e8b5935",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 13 - 0
assets/script/shared/fight.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "467e40c7-1b31-486e-b92c-a8945909f6e0",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 8 - 6
assets/script/shared/user/PtlUserFight.ts → assets/script/shared/fight/PtlFightTest.ts

@@ -1,16 +1,16 @@
 
 
 /**
- * 战斗测试
- */
-export interface ReqUserFight {
+* 请求接口
+*/
+export interface ReqFightTest {
 
 }
 
 /**
- * 返回战斗信息
- */
-export interface ResUserFight {
+* 返回信息
+*/
+export interface ResFightTest {
     fightStart:FightStart; //战斗阵容
     win: number; //0失败 1胜利
     log: {
@@ -34,12 +34,14 @@ export interface FightStart {
  */
 export interface FightTeam {
     fid: string; //业务中身份
+    seat: number //位置
     eps: {[id:string]:number}; //属性
 }
 
 //单回合内战斗日志
 export interface fightLogOne {
     aType: ActionType; //战斗动作类型
+    seat:number, //位置
     atker: fightLogOneData; //出手方
     target: fightLogOneData[]; //目标
 }

+ 10 - 0
assets/script/shared/fight/PtlFightTest.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "498da727-c127-4a2a-b72c-27dc5af3d0cf",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 1 - 1
assets/script/shared/hc.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "5259afdd-18e4-40bb-aa0b-f94d224b0a08",
+  "uuid": "91be8ad6-719a-40c3-bd8a-e50086d9212d",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 22 - 0
assets/script/shared/hc/PtlHcEmit.ts

@@ -0,0 +1,22 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqHcEmit {
+
+}
+
+/**
+* 返回信息
+*/
+export interface ResHcEmit {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

+ 10 - 0
assets/script/shared/hc/PtlHcEmit.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "17ef889d-7045-4377-b6cb-c956b5d39b7f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 1 - 1
assets/script/shared/hc/PtlHcInfo.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f1d8b45f-d609-4bf1-ac26-2ed5a325b783",
+  "uuid": "3c809b13-383c-4888-8c4f-30b961b26bef",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/hc/PtlHcMerge.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "498842b2-7fbe-46c1-92fe-4894f9e408e6",
+  "uuid": "b8192f5b-77e1-499b-9c68-45816f422a92",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/item.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "8e5ec12d-d149-4584-afa7-6b9134d97c98",
+  "uuid": "a4fba072-7c34-4389-bef4-0b0d47ed4895",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/item/PtlItemInfo.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "5ded5afa-6d0d-4d74-a268-24d7c7908640",
+  "uuid": "86d3148c-a183-4a18-881e-dbf3cd2c1852",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/item/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "31886e46-6a06-47ff-8e71-e44de4f234bc",
+  "uuid": "4cfae027-1f95-4a19-b35f-a01d7844c5d2",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/item/server/MsgItemChange_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "90450d98-a800-45c8-be47-6984f5f6e491",
+  "uuid": "a9cdfb56-6e17-4565-bf44-02af539ffe2b",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "96f1a6aa-17e2-4805-b85c-cfdc2c3d55ad",
+  "uuid": "1da84a84-705b-4a6c-89b3-a5f04266f534",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/mail/PtlMailDelAll.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "c6328de8-4e6d-4c45-ba93-5c50c5b3cb54",
+  "uuid": "fc5dd013-bd5c-4e15-8a90-6f65ce742ac6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail/PtlMailDelOne.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f3eddf46-4e0f-4865-8881-a1c698f2f9da",
+  "uuid": "46869731-9858-4dd0-b0a2-ef1c0441bbe1",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail/PtlMailInfo.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "ae39e1bb-00e4-4401-9a7d-e46d9b4cca2b",
+  "uuid": "4bc4694a-30d7-42ad-a6ca-aa6d778f0d53",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail/PtlMailRwdAll.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "a4c2f959-f1a5-4556-ae97-b749b3beadac",
+  "uuid": "e26346f8-f894-4e5f-adef-41f6db515506",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail/PtlMailRwdOne.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "5f21f2fb-8391-45e1-a7a5-60f74bb8768a",
+  "uuid": "6bf25822-4667-415f-a26e-0f7e8612309d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/mail/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "030ce394-d1c8-4480-b30c-055a0e4e557a",
+  "uuid": "c287abda-e635-4d23-bd85-be3897cdd40e",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/mail/server/MsgMailNew_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "309ee77d-a96b-48e2-be0a-b3f9f6204386",
+  "uuid": "20c4b9d5-449e-4d49-830e-9988bef60b36",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/plat.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "686a25df-2e74-41f3-8fbd-3f294fe0e3d7",
+  "uuid": "5dcbb7da-6f88-404a-90c1-cb1f0f98a3b1",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/plat/PtlPlatLogin.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e757690e-f4ac-49ce-9fa2-294d12aaf82f",
+  "uuid": "60e9479a-9e9f-47b7-b996-ce293a8518a6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/player.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "40b71e12-3195-4ab9-99c8-5521c7c396e4",
+  "uuid": "70748076-6064-4661-b490-4c316be4c1ce",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/player/PtlPlayerLogin.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e98a9c52-cd80-4b32-8f38-9355a01b0888",
+  "uuid": "5f997de3-ba4a-4d3a-97cb-76c30d0042b1",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 289 - 224
assets/script/shared/serviceProto.ts

@@ -26,6 +26,8 @@ import { MsgItems } from './common/MsgItems';
 import { MsgMessage } from './common/MsgMessage';
 import { ReqEpsInfo, ResEpsInfo } from './eps/PtlEpsInfo';
 import { MsgEpsChange_s } from './eps/server/MsgEpsChange_s';
+import { ReqFightTest, ResFightTest } from './fight/PtlFightTest';
+import { ReqHcEmit, ResHcEmit } from './hc/PtlHcEmit';
 import { ReqHcInfo, ResHcInfo } from './hc/PtlHcInfo';
 import { ReqHcMerge, ResHcMerge } from './hc/PtlHcMerge';
 import { ReqItemInfo, ResItemInfo } from './item/PtlItemInfo';
@@ -41,8 +43,8 @@ import { ReqPlayerLogin, ResPlayerLogin } from './player/PtlPlayerLogin';
 import { ReqTaskInfo, ResTaskInfo } from './task/PtlTaskInfo';
 import { ReqTaskRwd, ResTaskRwd } from './task/PtlTaskRwd';
 import { MsgTaskCons_s } from './task/server/MsgTaskCons_s';
-import { ReqUserFight, ResUserFight } from './user/PtlUserFight';
 import { ReqUserLogin, ResUserLogin } from './user/PtlUserLogin';
+import { ReqUserNotices, ResUserNotices } from './user/PtlUserNotices';
 import { ReqUserSetName, ResUserSetName } from './user/PtlUserSetName';
 import { ReqUserUseCode, ResUserUseCode } from './user/PtlUserUseCode';
 import { MsgUserUplevel_s } from './user/server/MsgUserUplevel_s';
@@ -145,6 +147,14 @@ export interface ServiceType {
             req: ReqEpsInfo,
             res: ResEpsInfo
         },
+        "fight/FightTest": {
+            req: ReqFightTest,
+            res: ResFightTest
+        },
+        "hc/HcEmit": {
+            req: ReqHcEmit,
+            res: ResHcEmit
+        },
         "hc/HcInfo": {
             req: ReqHcInfo,
             res: ResHcInfo
@@ -193,14 +203,14 @@ export interface ServiceType {
             req: ReqTaskRwd,
             res: ResTaskRwd
         },
-        "user/UserFight": {
-            req: ReqUserFight,
-            res: ResUserFight
-        },
         "user/UserLogin": {
             req: ReqUserLogin,
             res: ResUserLogin
         },
+        "user/UserNotices": {
+            req: ReqUserNotices,
+            res: ResUserNotices
+        },
         "user/UserSetName": {
             req: ReqUserSetName,
             res: ResUserSetName
@@ -222,7 +232,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 53,
+    "version": 56,
     "services": [
         {
             "id": 39,
@@ -432,6 +442,22 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "type": "msg"
         },
         {
+            "id": 86,
+            "name": "fight/FightTest",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 87,
+            "name": "hc/HcEmit",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 66,
             "name": "hc/HcInfo",
             "type": "api",
@@ -543,16 +569,16 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "type": "msg"
         },
         {
-            "id": 68,
-            "name": "user/UserFight",
+            "id": 61,
+            "name": "user/UserLogin",
             "type": "api",
             "conf": {
                 "connet": "ws"
             }
         },
         {
-            "id": 61,
-            "name": "user/UserLogin",
+            "id": 85,
+            "name": "user/UserNotices",
             "type": "api",
             "conf": {
                 "connet": "ws"
@@ -1184,6 +1210,240 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
+        "fight/PtlFightTest/ReqFightTest": {
+            "type": "Interface"
+        },
+        "fight/PtlFightTest/ResFightTest": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "fightStart",
+                    "type": {
+                        "type": "Reference",
+                        "target": "fight/PtlFightTest/FightStart"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "win",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "log",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Array",
+                                "elementType": {
+                                    "type": "Reference",
+                                    "target": "fight/PtlFightTest/fightLogOne"
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "fight/PtlFightTest/FightStart": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "from",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "seed",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "teams",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Reference",
+                                "target": "fight/PtlFightTest/FightTeam"
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "fight/PtlFightTest/FightTeam": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "fid",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "seat",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "eps",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Number"
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "fight/PtlFightTest/fightLogOne": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "aType",
+                    "type": {
+                        "type": "Reference",
+                        "target": "fight/PtlFightTest/ActionType"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "seat",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "atker",
+                    "type": {
+                        "type": "Reference",
+                        "target": "fight/PtlFightTest/fightLogOneData"
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "target",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Reference",
+                            "target": "fight/PtlFightTest/fightLogOneData"
+                        }
+                    }
+                }
+            ]
+        },
+        "fight/PtlFightTest/ActionType": {
+            "type": "Enum",
+            "members": [
+                {
+                    "id": 0,
+                    "value": "wu"
+                },
+                {
+                    "id": 1,
+                    "value": "0"
+                },
+                {
+                    "id": 2,
+                    "value": "1"
+                },
+                {
+                    "id": 3,
+                    "value": "2"
+                },
+                {
+                    "id": 4,
+                    "value": "3"
+                },
+                {
+                    "id": 5,
+                    "value": "999"
+                }
+            ]
+        },
+        "fight/PtlFightTest/fightLogOneData": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "iid",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "hp",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "buff",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Tuple",
+                            "elementTypes": [
+                                {
+                                    "type": "String"
+                                },
+                                {
+                                    "type": "Number"
+                                }
+                            ]
+                        }
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "effect",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Tuple",
+                            "elementTypes": [
+                                {
+                                    "type": "String"
+                                },
+                                {
+                                    "type": "Number"
+                                }
+                            ]
+                        }
+                    }
+                }
+            ]
+        },
+        "hc/PtlHcEmit/ReqHcEmit": {
+            "type": "Interface"
+        },
+        "hc/PtlHcEmit/ResHcEmit": {
+            "type": "Interface"
+        },
         "hc/PtlHcInfo/ReqHcInfo": {
             "type": "Interface"
         },
@@ -1945,220 +2205,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "user/PtlUserFight/ReqUserFight": {
-            "type": "Interface"
-        },
-        "user/PtlUserFight/ResUserFight": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "fightStart",
-                    "type": {
-                        "type": "Reference",
-                        "target": "user/PtlUserFight/FightStart"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "win",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 2,
-                    "name": "log",
-                    "type": {
-                        "type": "Interface",
-                        "indexSignature": {
-                            "keyType": "String",
-                            "type": {
-                                "type": "Array",
-                                "elementType": {
-                                    "type": "Reference",
-                                    "target": "user/PtlUserFight/fightLogOne"
-                                }
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "user/PtlUserFight/FightStart": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "from",
-                    "type": {
-                        "type": "String"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "seed",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 2,
-                    "name": "teams",
-                    "type": {
-                        "type": "Interface",
-                        "indexSignature": {
-                            "keyType": "String",
-                            "type": {
-                                "type": "Reference",
-                                "target": "user/PtlUserFight/FightTeam"
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "user/PtlUserFight/FightTeam": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "fid",
-                    "type": {
-                        "type": "String"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "eps",
-                    "type": {
-                        "type": "Interface",
-                        "indexSignature": {
-                            "keyType": "String",
-                            "type": {
-                                "type": "Number"
-                            }
-                        }
-                    }
-                }
-            ]
-        },
-        "user/PtlUserFight/fightLogOne": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "aType",
-                    "type": {
-                        "type": "Reference",
-                        "target": "user/PtlUserFight/ActionType"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "atker",
-                    "type": {
-                        "type": "Reference",
-                        "target": "user/PtlUserFight/fightLogOneData"
-                    }
-                },
-                {
-                    "id": 2,
-                    "name": "target",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "Reference",
-                            "target": "user/PtlUserFight/fightLogOneData"
-                        }
-                    }
-                }
-            ]
-        },
-        "user/PtlUserFight/ActionType": {
-            "type": "Enum",
-            "members": [
-                {
-                    "id": 0,
-                    "value": "wu"
-                },
-                {
-                    "id": 1,
-                    "value": "0"
-                },
-                {
-                    "id": 2,
-                    "value": "1"
-                },
-                {
-                    "id": 3,
-                    "value": "2"
-                },
-                {
-                    "id": 4,
-                    "value": "3"
-                },
-                {
-                    "id": 5,
-                    "value": "999"
-                }
-            ]
-        },
-        "user/PtlUserFight/fightLogOneData": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "iid",
-                    "type": {
-                        "type": "String"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "hp",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 2,
-                    "name": "buff",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "Tuple",
-                            "elementTypes": [
-                                {
-                                    "type": "String"
-                                },
-                                {
-                                    "type": "Number"
-                                }
-                            ]
-                        }
-                    }
-                },
-                {
-                    "id": 3,
-                    "name": "effect",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "Tuple",
-                            "elementTypes": [
-                                {
-                                    "type": "String"
-                                },
-                                {
-                                    "type": "Number"
-                                }
-                            ]
-                        }
-                    }
-                }
-            ]
-        },
         "user/PtlUserLogin/ReqUserLogin": {
             "type": "Interface",
             "properties": [
@@ -2295,6 +2341,25 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "user/PtlUserNotices/ReqUserNotices": {
+            "type": "Interface"
+        },
+        "user/PtlUserNotices/ResUserNotices": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "notices",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Reference",
+                            "target": "plat/PtlPlatLogin/Notices"
+                        }
+                    }
+                }
+            ]
+        },
         "user/PtlUserSetName/ReqUserSetName": {
             "type": "Interface",
             "properties": [

+ 1 - 1
assets/script/shared/serviceProto.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "87d991ff-9f71-40c6-a441-5cb08c1bf52c",
+  "uuid": "80a98f2d-db1a-4de8-824c-9b2174c75b21",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/task.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "f61bc54b-8d33-4f0b-a27e-485188df7fa9",
+  "uuid": "b477d50a-64a2-4472-a425-6aa853cff328",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/task/PtlTaskInfo.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f0822423-2cde-4935-a6a8-f6ed5a078841",
+  "uuid": "f36af21e-8f2d-4433-b6ac-d2ce43a6ca5a",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/task/PtlTaskRwd.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "1bc38199-920d-4665-9cd9-7f5acd853a09",
+  "uuid": "3fc56521-0f63-4e23-8a59-4575f5acc3d8",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/task/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "f476512e-5c18-4961-8058-650de24016f6",
+  "uuid": "9f3df479-e756-4e05-97a8-ed87b2e99e32",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/task/server/MsgTaskCons_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "2585da10-1594-4096-8f3f-011b3434dab2",
+  "uuid": "4bca0a73-c2e2-4e95-b908-7194261086a0",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/user.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "8812af4e-de7e-45a6-a2e2-0527ac17847e",
+  "uuid": "9029b1a2-cc6d-4b94-bd30-d792a4acbe68",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/user/PtlUserLogin.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "bfc9bb2b-cc40-4810-8574-f48cc0ee0039",
+  "uuid": "d71dd040-d6cb-4c64-9cec-6a248fde1988",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/user/PtlUserNotices.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "481454ba-cec3-4fde-b2a9-e69ca55479d2",
+  "uuid": "783f531a-5ee3-4f82-aa0b-5bb92fb6abe7",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/user/PtlUserSetName.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "ff4d0b17-669c-4ace-a6c1-6e35219e6c0c",
+  "uuid": "1c3075c4-ef6b-4015-bb71-c33c7ff55bc2",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/user/PtlUserUseCode.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "10e0bdab-5878-44a4-b26c-19a25481b4da",
+  "uuid": "02bbe6f6-3dd6-48fc-afb1-be6d318ea12a",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

+ 1 - 1
assets/script/shared/user/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "6bbd5ec9-962b-4bfb-a5cf-ae5731b7e3f9",
+  "uuid": "9710a4c8-4176-4a7f-a981-abe6ee61c6eb",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

+ 1 - 1
assets/script/shared/user/server/MsgUserUplevel_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "81a21251-2bb4-4da1-ae3e-a3bb4ffb3936",
+  "uuid": "9776a939-d2ec-405a-92b3-447ef910ca09",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff