Test_Project_Cocos/DataBoardDemo
1
0
Fork 0
mirror of https://github.com/szrpf/DataBoardDemo.git synced 2025-11-03 04:45:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
szrpf
2023-05-24 13:20:33 +08:00
parent 9775ded5f5
commit 4056e1a1f8
6 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/imports/92/9285e338-6210-4984-bf3e-0b9ebd5f6f78.js
View File

@@ -30,6 +30,21 @@ var Helloworld = /** @class */ (function (_super) {
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.hp = 100;
_this.mp = 60;
_this.equip = {
name: '装备',
sword: {
name: '小刀',
attack: 30
},
shoe: {
name: '草鞋',
attr: {
name: '属性',
speed: 5,
durable: 100
}
}
};
return _this;
}
Helloworld.prototype.update = function (dt) {

2
library/imports/92/9285e338-6210-4984-bf3e-0b9ebd5f6f78.js.map
View File

@@ -1 +1 @@
{"version":3,"sources":["assets\\Script\\Hero.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAM,IAAA,KAAsB,EAAE,CAAC,UAAU,EAAlC,OAAO,aAAA,EAAE,QAAQ,cAAiB,CAAC;AAG1C;IAAwC,8BAAY;IAApD;QAAA,qEA6BC;QA1BG,QAAE,GAAG,GAAG,CAAC;QACT,QAAE,GAAG,EAAE,CAAC;;IAyBZ,CAAC;IAJG,2BAAM,GAAN,UAAQ,EAAE;QACN,IAAI,CAAC,EAAE,IAAI,GAAG,GAAC,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE,IAAI,GAAG,GAAC,EAAE,CAAC;IACtB,CAAC;IA5BgB,UAAU;QAD9B,OAAO;OACa,UAAU,CA6B9B;IAAD,iBAAC;CA7BD,AA6BC,CA7BuC,EAAE,CAAC,SAAS,GA6BnD;kBA7BoB,UAAU","file":"","sourceRoot":"/","sourcesContent":["const {ccclass, property} = cc._decorator;\r\n\r\n@ccclass\r\nexport default class Helloworld extends cc.Component {\r\n<<<<<<< HEAD\r\n\r\n hp = 100;\r\n mp = 60;\r\n=======\r\n hp = 100;\r\n mp = 60;\r\n equip = {\r\n name:'装备',\r\n sword:{\r\n name:'小刀',\r\n attack:30\r\n },\r\n shoe:{\r\n name:'草鞋',\r\n attr:{\r\n name:'属性',\r\n speed:5,\r\n durable:100\r\n }\r\n }\r\n }\r\n>>>>>>> 144f8f4 (v2.0)\r\n\r\n update (dt) {\r\n this.hp += 1.0*dt;\r\n this.mp += 0.5*dt;\r\n }\r\n}"]}
{"version":3,"sources":["assets\\Script\\Hero.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAM,IAAA,KAAsB,EAAE,CAAC,UAAU,EAAlC,OAAO,aAAA,EAAE,QAAQ,cAAiB,CAAC;AAG1C;IAAwC,8BAAY;IAApD;QAAA,qEAuBC;QAtBG,QAAE,GAAG,GAAG,CAAC;QACT,QAAE,GAAG,EAAE,CAAC;QACR,WAAK,GAAG;YACJ,IAAI,EAAC,IAAI;YACT,KAAK,EAAC;gBACF,IAAI,EAAC,IAAI;gBACT,MAAM,EAAC,EAAE;aACZ;YACD,IAAI,EAAC;gBACD,IAAI,EAAC,IAAI;gBACT,IAAI,EAAC;oBACD,IAAI,EAAC,IAAI;oBACT,KAAK,EAAC,CAAC;oBACP,OAAO,EAAC,GAAG;iBACd;aACJ;SACJ,CAAA;;IAML,CAAC;IAJG,2BAAM,GAAN,UAAQ,EAAE;QACN,IAAI,CAAC,EAAE,IAAI,GAAG,GAAC,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE,IAAI,GAAG,GAAC,EAAE,CAAC;IACtB,CAAC;IAtBgB,UAAU;QAD9B,OAAO;OACa,UAAU,CAuB9B;IAAD,iBAAC;CAvBD,AAuBC,CAvBuC,EAAE,CAAC,SAAS,GAuBnD;kBAvBoB,UAAU","file":"","sourceRoot":"/","sourcesContent":["const {ccclass, property} = cc._decorator;\r\n\r\n@ccclass\r\nexport default class Helloworld extends cc.Component {\r\n hp = 100;\r\n mp = 60;\r\n equip = {\r\n name:'装备',\r\n sword:{\r\n name:'小刀',\r\n attack:30\r\n },\r\n shoe:{\r\n name:'草鞋',\r\n attr:{\r\n name:'属性',\r\n speed:5,\r\n durable:100\r\n }\r\n }\r\n }\r\n\r\n update (dt) {\r\n this.hp += 1.0*dt;\r\n this.mp += 0.5*dt;\r\n }\r\n}"]}

10
library/uuid-to-mtime.json
View File

@@ -534,14 +534,14 @@
"meta": 1684905427643,
"relativePath": "Script\\DataBoard.ts"
},
"9285e338-6210-4984-bf3e-0b9ebd5f6f78": {
"asset": 1684905223475,
"meta": 1684905427676,
"relativePath": "Script\\Hero.ts"
},
"2d2f792f-a40c-49bb-a189-ed176a246e49": {
"asset": 1684905403655,
"meta": 1684905427685,
"relativePath": "Scene\\helloworld.fire"
},
"9285e338-6210-4984-bf3e-0b9ebd5f6f78": {
"asset": 1684905450979,
"meta": 1684905579431,
"relativePath": "Script\\Hero.ts"
}
}