diff --git a/assets/resources/gui/top_inf.prefab b/assets/resources/gui/top_inf.prefab index c9c03c3a..cfd824cc 100644 --- a/assets/resources/gui/top_inf.prefab +++ b/assets/resources/gui/top_inf.prefab @@ -71,7 +71,7 @@ }, { "__type__": "cc.Node", - "_name": "energy", + "_name": "gold", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -105,8 +105,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 21.414, - "y": 68.09, + "x": 30, + "y": 70, "z": 0 }, "_lrot": { @@ -209,7 +209,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -30, + "x": -42.656, "y": -13.059, "z": 0 }, @@ -250,8 +250,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 57, - "height": 79 + "width": 67, + "height": 75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -262,7 +262,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29Ypf1dolA5KzIyEyz3CYY" + "fileId": "16wWAPPFBNuJBwIh/5Li0i" }, { "__type__": "cc.Sprite", @@ -287,7 +287,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fd68b", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0fc77", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -307,7 +307,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6851M9M6NPkY44fm15bOX/" + "fileId": "5eaF60AbZHQaDwaBufMyX0" }, { "__type__": "cc.PrefabInfo", @@ -317,7 +317,7 @@ "asset": { "__id__": 0 }, - "fileId": "5bFuA6p7dCE6QmMpl9MK+1", + "fileId": "84UrVFklpNXKYAmCgu+A1V", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -336,7 +336,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, + "width": 220, "height": 50 }, "_anchorPoint": { @@ -348,7 +348,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80aLL9CPtF960DIeh+7LbH" + "fileId": "c1Qk3IOJ9J1JJMTfNu1rOb" }, { "__type__": "cc.Sprite", @@ -393,7 +393,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9bccvHuiJJprtn1teoaDoO" + "fileId": "8e/fy7IrlClZzoDMdGcOu/" }, { "__type__": "cc.PrefabInfo", @@ -403,7 +403,7 @@ "asset": { "__id__": 0 }, - "fileId": "01b3XpYMlOp42c3g6sJ361", + "fileId": "5cPK1/vrlMELQuci8vnQX1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -437,7 +437,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 70, + "x": 110.74, "y": 25, "z": 0 }, @@ -478,7 +478,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52.0537109375, + "width": 170, "height": 39.8 }, "_anchorPoint": { @@ -490,7 +490,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bf9xptkzZGgKf2xS5ExdwW" + "fileId": "f1bk/V2oVL44qmv9GHsNpd" }, { "__type__": "cc.Label", @@ -515,13 +515,13 @@ "a": 255 }, "_string": "100", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 30, - "_overflow": 0, + "_overflow": 1, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -558,7 +558,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8dFPpQJDdAl6jy4GW2Z0Lv" + "fileId": "d1eODb2tNIH61Yvy5byRU4" }, { "__type__": "cc.LabelOutline", @@ -576,7 +576,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03X5b2xg5LcYYwtH071c/2" + "fileId": "b7O5YNDNVCAI2kJHe9mzC7" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -591,7 +591,7 @@ "__id__": 23 }, "templateMode": false, - "watchPath": "data.role.energy", + "watchPath": "data.role.gold", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" @@ -600,7 +600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "86cQ7zeLdMSJEn1QH53aS6" + "fileId": "5dc5gwIlBNx73wBdsHguRY" }, { "__type__": "cc.PrefabInfo", @@ -610,7 +610,7 @@ "asset": { "__id__": 0 }, - "fileId": "dcdJesIKBInb5flvQBeY7v", + "fileId": "a5QH/oxwVP1pCqq0SSMkct", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -697,7 +697,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ch3ZBAnpPEKLSX2iX25ey" + "fileId": "90YIklwEdC6bDWJ9jHFVf/" }, { "__type__": "cc.Label", @@ -765,7 +765,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "83LtawJwtDtKNf1meFTTWO" + "fileId": "04F0d7wFNI35rIMZ8fwHhQ" }, { "__type__": "cc.LabelOutline", @@ -783,7 +783,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36Ida9XVhEJIKIB1c2ZifS" + "fileId": "84UBa44pNPzo+uXoW2PbJ5" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -807,7 +807,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27TUu2erpBzoSYWa+YSRh7" + "fileId": "96A/Kl6sJKS6HwpSkt5BAk" }, { "__type__": "cc.PrefabInfo", @@ -817,7 +817,7 @@ "asset": { "__id__": 0 }, - "fileId": "4bf6Vf1UhEiJzIe4BwCwdD", + "fileId": "77F32FkqpAkouuUQvs6pJg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -849,8 +849,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 170, - "y": 25.662, + "x": 225.086, + "y": 25.663, "z": 0 }, "_lrot": { @@ -952,7 +952,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aXDof3xdEv5mZbUzuR95Z" + "fileId": "e2x3V/T1NLcpa/ZbMiLfsj" }, { "__type__": "cc.Sprite", @@ -997,7 +997,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13DEvey/hGuqU3clrsr0HU" + "fileId": "8bqfmfMSRG6akxlVE/XtmG" }, { "__type__": "cc.PrefabInfo", @@ -1007,7 +1007,7 @@ "asset": { "__id__": 0 }, - "fileId": "d5YyEp1TVNSYpVgmUtQXtF", + "fileId": "2d5CMn171MApA5hYTKQiqD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1038,7 +1038,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d7QJVVbIJC0oVMk+Mc4yWS" + "fileId": "353UHCWopPHrcckp5z98wY" }, { "__type__": "cc.Sprite", @@ -1083,7 +1083,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f5F5/d0nVHtYFUNjBn2PB2" + "fileId": "60E4NzXslOFaIMONn9Ctov" }, { "__type__": "cc.PrefabInfo", @@ -1093,7 +1093,7 @@ "asset": { "__id__": 0 }, - "fileId": "24+mH0A6tLV4DcK/w/R0I8", + "fileId": "cd4fk03p5Pu6Inp8NwegPN", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1124,7 +1124,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c2vT2yrsZCkYL/OQWuFpwZ" + "fileId": "b7sDE8ZapE16/LPQwFBL4i" }, { "__type__": "cc.Widget", @@ -1140,10 +1140,10 @@ }, "_alignFlags": 12, "_target": null, - "_left": 21.414, + "_left": 30, "_right": 68.59100000000001, "_top": 0, - "_bottom": 68.09, + "_bottom": 70, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1160,7 +1160,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0k4DWbhlIG5DFEbbtLjKN" + "fileId": "f4ybrY9chFPolclqtdMgQP" }, { "__type__": "cc.PrefabInfo", @@ -1170,14 +1170,14 @@ "asset": { "__id__": 0 }, - "fileId": "41Nf8vf6VO0J/jwRE9p/na", + "fileId": "49PrV3VBdKEp8Oq8oZ1hdu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "gems", + "_name": "energy", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1211,8 +1211,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 267.437, - "y": 72.205, + "x": 260, + "y": 70, "z": 0 }, "_lrot": { @@ -1294,7 +1294,7 @@ }, { "__type__": "cc.Node", - "_name": "91", + "_name": "ItemIcon_Meat", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1315,8 +1315,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -45.546, - "y": -13.059, + "x": 5.815, + "y": 24.641, "z": 0 }, "_lrot": { @@ -1328,8 +1328,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.6, + "y": 0.6, "z": 1 }, "_mobility": 0, @@ -1356,19 +1356,19 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 77, - "height": 69 + "width": 122, + "height": 118 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 0.5, + "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87BUfccA9AhpkHiq/MGcaR" + "fileId": "7cZ3IafehE/6OcbyoSZ24F" }, { "__type__": "cc.Sprite", @@ -1393,7 +1393,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3fef2", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@79b39", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1413,7 +1413,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "49+w1kwNNPe4QA1KHYOEMu" + "fileId": "74NmWYkd5ASYFO8T01gF8J" }, { "__type__": "cc.PrefabInfo", @@ -1423,7 +1423,7 @@ "asset": { "__id__": 0 }, - "fileId": "edr0i7GANNP7Iea1nRC1A0", + "fileId": "7bqMbnWLZF/5A/TOpP4WNy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1442,7 +1442,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, + "width": 220, "height": 50 }, "_anchorPoint": { @@ -1454,7 +1454,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0eN0bEYX5EYZctMDif3AkS" + "fileId": "80aLL9CPtF960DIeh+7LbH" }, { "__type__": "cc.Sprite", @@ -1499,7 +1499,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a05qwvbW9FwIH2NOaWhHZA" + "fileId": "9bccvHuiJJprtn1teoaDoO" }, { "__type__": "cc.PrefabInfo", @@ -1509,7 +1509,7 @@ "asset": { "__id__": 0 }, - "fileId": "d8Vv21RFpD4ao5fXqTdVha", + "fileId": "01b3XpYMlOp42c3g6sJ361", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1543,7 +1543,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 70, + "x": 123.051, "y": 25, "z": 0 }, @@ -1584,7 +1584,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52.0537109375, + "width": 170, "height": 39.8 }, "_anchorPoint": { @@ -1596,7 +1596,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d2P2bmMpVHLa0sx8RX4ZzI" + "fileId": "bf9xptkzZGgKf2xS5ExdwW" }, { "__type__": "cc.Label", @@ -1621,13 +1621,13 @@ "a": 255 }, "_string": "100", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 30, - "_overflow": 0, + "_overflow": 1, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -1664,7 +1664,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "10/sjz2EJHP6bnUwhUulzQ" + "fileId": "8dFPpQJDdAl6jy4GW2Z0Lv" }, { "__type__": "cc.LabelOutline", @@ -1682,7 +1682,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fbCPQJKsFL1KpWMXxouyHw" + "fileId": "03X5b2xg5LcYYwtH071c/2" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -1697,7 +1697,7 @@ "__id__": 73 }, "templateMode": false, - "watchPath": "data.role.gems", + "watchPath": "data.role.energy", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" @@ -1706,7 +1706,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9e4WPVzKhBkq/hOOZ/ieWk" + "fileId": "86cQ7zeLdMSJEn1QH53aS6" }, { "__type__": "cc.PrefabInfo", @@ -1716,7 +1716,7 @@ "asset": { "__id__": 0 }, - "fileId": "5aigdxn5tG0ZJBNYzJaZMs", + "fileId": "dcdJesIKBInb5flvQBeY7v", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1803,7 +1803,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1eQ5guWVpJ/rPkhuSUsozP" + "fileId": "5ch3ZBAnpPEKLSX2iX25ey" }, { "__type__": "cc.Label", @@ -1871,7 +1871,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "49+eKpB25CZqNTJABxY5lH" + "fileId": "83LtawJwtDtKNf1meFTTWO" }, { "__type__": "cc.LabelOutline", @@ -1889,7 +1889,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "32jm7PdDhKr6MyHO929/Qi" + "fileId": "36Ida9XVhEJIKIB1c2ZifS" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -1913,7 +1913,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7cD/Q989FJOYYp4UGKCL0s" + "fileId": "27TUu2erpBzoSYWa+YSRh7" }, { "__type__": "cc.PrefabInfo", @@ -1923,7 +1923,7 @@ "asset": { "__id__": 0 }, - "fileId": "39CXDIwf5F7ZT3cXJNuRbu", + "fileId": "4bf6Vf1UhEiJzIe4BwCwdD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1955,8 +1955,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 170, - "y": 25.662, + "x": 231.668, + "y": 25.663, "z": 0 }, "_lrot": { @@ -2058,7 +2058,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "67DCzm/aVJvrAXo2BkhWmu" + "fileId": "2aXDof3xdEv5mZbUzuR95Z" }, { "__type__": "cc.Sprite", @@ -2103,7 +2103,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b4R3Qi1LxJxYJ06uJfVQkz" + "fileId": "13DEvey/hGuqU3clrsr0HU" }, { "__type__": "cc.PrefabInfo", @@ -2113,7 +2113,7 @@ "asset": { "__id__": 0 }, - "fileId": "6bZ96yQZVMKLPstcVmQsZx", + "fileId": "d5YyEp1TVNSYpVgmUtQXtF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2144,7 +2144,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25DLjauthBRY1w8CFGFXqm" + "fileId": "d7QJVVbIJC0oVMk+Mc4yWS" }, { "__type__": "cc.Sprite", @@ -2189,7 +2189,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4dMPOlAZBDEbTEtX5VL3Zr" + "fileId": "f5F5/d0nVHtYFUNjBn2PB2" }, { "__type__": "cc.PrefabInfo", @@ -2199,7 +2199,7 @@ "asset": { "__id__": 0 }, - "fileId": "8fxi7/dxpPTYkE0qQpybVZ", + "fileId": "24+mH0A6tLV4DcK/w/R0I8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2230,7 +2230,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8dH53978tNr7UXDuhIDRxk" + "fileId": "c2vT2yrsZCkYL/OQWuFpwZ" }, { "__type__": "cc.Widget", @@ -2246,10 +2246,10 @@ }, "_alignFlags": 12, "_target": null, - "_left": 267.437, + "_left": 260, "_right": 68.59100000000001, "_top": 0, - "_bottom": 72.205, + "_bottom": 70, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2266,7 +2266,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8cUsTqlyFOJo829PpbCGe4" + "fileId": "f0k4DWbhlIG5DFEbbtLjKN" }, { "__type__": "cc.PrefabInfo", @@ -2276,14 +2276,14 @@ "asset": { "__id__": 0 }, - "fileId": "4a+Ff4qMZBpYQB/mq2qttc", + "fileId": "41Nf8vf6VO0J/jwRE9p/na", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "gold", + "_name": "gems", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2317,8 +2317,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 510.381, - "y": 72.205, + "x": 510, + "y": 70, "z": 0 }, "_lrot": { @@ -2421,7 +2421,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -42.656, + "x": -45.546, "y": -13.059, "z": 0 }, @@ -2462,8 +2462,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 67, - "height": 75 + "width": 77, + "height": 69 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2474,7 +2474,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "16wWAPPFBNuJBwIh/5Li0i" + "fileId": "87BUfccA9AhpkHiq/MGcaR" }, { "__type__": "cc.Sprite", @@ -2499,7 +2499,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0fc77", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3fef2", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2519,7 +2519,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5eaF60AbZHQaDwaBufMyX0" + "fileId": "49+w1kwNNPe4QA1KHYOEMu" }, { "__type__": "cc.PrefabInfo", @@ -2529,7 +2529,7 @@ "asset": { "__id__": 0 }, - "fileId": "84UrVFklpNXKYAmCgu+A1V", + "fileId": "edr0i7GANNP7Iea1nRC1A0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 170, + "width": 220, "height": 50 }, "_anchorPoint": { @@ -2560,7 +2560,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c1Qk3IOJ9J1JJMTfNu1rOb" + "fileId": "0eN0bEYX5EYZctMDif3AkS" }, { "__type__": "cc.Sprite", @@ -2605,7 +2605,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8e/fy7IrlClZzoDMdGcOu/" + "fileId": "a05qwvbW9FwIH2NOaWhHZA" }, { "__type__": "cc.PrefabInfo", @@ -2615,7 +2615,7 @@ "asset": { "__id__": 0 }, - "fileId": "5cPK1/vrlMELQuci8vnQX1", + "fileId": "d8Vv21RFpD4ao5fXqTdVha", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2649,7 +2649,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 70, + "x": 112.685, "y": 25, "z": 0 }, @@ -2690,7 +2690,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52.0537109375, + "width": 170, "height": 39.8 }, "_anchorPoint": { @@ -2702,7 +2702,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f1bk/V2oVL44qmv9GHsNpd" + "fileId": "d2P2bmMpVHLa0sx8RX4ZzI" }, { "__type__": "cc.Label", @@ -2727,13 +2727,13 @@ "a": 255 }, "_string": "100", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 30, - "_overflow": 0, + "_overflow": 1, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -2770,7 +2770,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d1eODb2tNIH61Yvy5byRU4" + "fileId": "10/sjz2EJHP6bnUwhUulzQ" }, { "__type__": "cc.LabelOutline", @@ -2788,7 +2788,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7O5YNDNVCAI2kJHe9mzC7" + "fileId": "fbCPQJKsFL1KpWMXxouyHw" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -2803,7 +2803,7 @@ "__id__": 123 }, "templateMode": false, - "watchPath": "data.role.gold", + "watchPath": "data.role.gems", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" @@ -2812,7 +2812,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5dc5gwIlBNx73wBdsHguRY" + "fileId": "9e4WPVzKhBkq/hOOZ/ieWk" }, { "__type__": "cc.PrefabInfo", @@ -2822,7 +2822,7 @@ "asset": { "__id__": 0 }, - "fileId": "a5QH/oxwVP1pCqq0SSMkct", + "fileId": "5aigdxn5tG0ZJBNYzJaZMs", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2909,7 +2909,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "90YIklwEdC6bDWJ9jHFVf/" + "fileId": "1eQ5guWVpJ/rPkhuSUsozP" }, { "__type__": "cc.Label", @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "04F0d7wFNI35rIMZ8fwHhQ" + "fileId": "49+eKpB25CZqNTJABxY5lH" }, { "__type__": "cc.LabelOutline", @@ -2995,7 +2995,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "84UBa44pNPzo+uXoW2PbJ5" + "fileId": "32jm7PdDhKr6MyHO929/Qi" }, { "__type__": "545c05XsG9GDJispEGWKvYv", @@ -3019,7 +3019,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "96A/Kl6sJKS6HwpSkt5BAk" + "fileId": "7cD/Q989FJOYYp4UGKCL0s" }, { "__type__": "cc.PrefabInfo", @@ -3029,7 +3029,7 @@ "asset": { "__id__": 0 }, - "fileId": "77F32FkqpAkouuUQvs6pJg", + "fileId": "39CXDIwf5F7ZT3cXJNuRbu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3061,8 +3061,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 170, - "y": 25.662, + "x": 218.044, + "y": 25.663, "z": 0 }, "_lrot": { @@ -3164,7 +3164,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2x3V/T1NLcpa/ZbMiLfsj" + "fileId": "67DCzm/aVJvrAXo2BkhWmu" }, { "__type__": "cc.Sprite", @@ -3209,7 +3209,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bqfmfMSRG6akxlVE/XtmG" + "fileId": "b4R3Qi1LxJxYJ06uJfVQkz" }, { "__type__": "cc.PrefabInfo", @@ -3219,7 +3219,7 @@ "asset": { "__id__": 0 }, - "fileId": "2d5CMn171MApA5hYTKQiqD", + "fileId": "6bZ96yQZVMKLPstcVmQsZx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3250,7 +3250,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "353UHCWopPHrcckp5z98wY" + "fileId": "25DLjauthBRY1w8CFGFXqm" }, { "__type__": "cc.Sprite", @@ -3295,7 +3295,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "60E4NzXslOFaIMONn9Ctov" + "fileId": "4dMPOlAZBDEbTEtX5VL3Zr" }, { "__type__": "cc.PrefabInfo", @@ -3305,7 +3305,7 @@ "asset": { "__id__": 0 }, - "fileId": "cd4fk03p5Pu6Inp8NwegPN", + "fileId": "8fxi7/dxpPTYkE0qQpybVZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3336,7 +3336,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7sDE8ZapE16/LPQwFBL4i" + "fileId": "8dH53978tNr7UXDuhIDRxk" }, { "__type__": "cc.Widget", @@ -3352,10 +3352,10 @@ }, "_alignFlags": 12, "_target": null, - "_left": 510.381, + "_left": 510, "_right": 68.59100000000001, "_top": 0, - "_bottom": 72.205, + "_bottom": 70, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3372,7 +3372,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f4ybrY9chFPolclqtdMgQP" + "fileId": "8cUsTqlyFOJo829PpbCGe4" }, { "__type__": "cc.PrefabInfo", @@ -3382,7 +3382,7 @@ "asset": { "__id__": 0 }, - "fileId": "49PrV3VBdKEp8Oq8oZ1hdu", + "fileId": "4a+Ff4qMZBpYQB/mq2qttc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/gui/victory.prefab b/assets/resources/gui/victory.prefab index f791f829..7d138147 100644 --- a/assets/resources/gui/victory.prefab +++ b/assets/resources/gui/victory.prefab @@ -2753,7 +2753,7 @@ }, { "__type__": "cc.Node", - "_name": "5012", + "_name": "icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 1133d6ad..bb10dd43 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -31,6 +31,7 @@ export class SingletonModuleComp extends ecs.Comp { // {uuid:6216,type:2},{uuid:6217,type:2},{uuid:6218,type:2} ]; items: any = [] + sitems:any = [] player_skills: any = [ ]; player_buffs: any = [ @@ -149,6 +150,18 @@ export class SingletonModuleComp extends ecs.Comp { skill3:{uuid:1001,cd:3,cd_max:3,alive:false}, skill4:{uuid:1001,cd:3,cd_max:3,alive:false}, skill5:{uuid:1001,cd:3,cd_max:3,alive:false}, + items:{ + 1001:{uuid: 1001,num:0}, + 1002:{uuid: 1002,num:0}, + 1003:{uuid: 1003,num:0}, + 1004:{uuid: 1004,num:0}, + 1005:{uuid: 1005,num:0}, + 1006:{uuid: 1006,num:0}, + 1007:{uuid: 1007,num:0}, + 1008:{uuid: 1008,num:0}, + 1009:{uuid: 1009,num:0}, + 1010:{uuid: 1010,num:0}, + } }, talent:{ 1001:{uuid:1001,lv:0,}, diff --git a/assets/script/game/common/config/ItemSet.ts b/assets/script/game/common/config/ItemSet.ts index 3863a472..e7d10996 100644 --- a/assets/script/game/common/config/ItemSet.ts +++ b/assets/script/game/common/config/ItemSet.ts @@ -25,8 +25,7 @@ path: 图片地址 */ -export const Items={ - +export const Sitems={ 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "钢盾",sp_name:"",info:"", dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:100,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, }, @@ -64,7 +63,6 @@ export const Items={ dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, }, 6218:{uuid: 6218,path: "6218",type: 94,level: 4,name: "精炼技能石",sp_name:"",info:"", - dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, }, - + dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, }, } diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts new file mode 100644 index 00000000..5c4c850d --- /dev/null +++ b/assets/script/game/common/config/Items.ts @@ -0,0 +1,15 @@ +/* +type: + 1 普通消耗品,武器升级或技能升级原材料 + 2 可双击打开,如宝箱, + +*/ + +export const Items={ + 1001:{uuid: 1001,path: "1001",type: 1,lv: 1,name: "经验卷轴",info:"提升英雄等级", }, + 1002:{uuid: 1002,path: "1002",type: 1,lv: 1,name: "技能卷轴",info:"提升英雄技能等级", }, + 1003:{uuid: 1003,path: "1003",type: 1,lv: 1,name: "治疗药水",info:"战斗中回复英雄血量", }, + 1004:{uuid: 1004,path: "1004",type: 1,lv: 1,name: "攻击药水",info:"战斗中增加英雄攻击", }, + 1005:{uuid: 1005,path: "1005",type: 1,lv: 1,name: "迅捷药水",info:"战斗中增加英雄速度", }, +} + diff --git a/assets/script/game/common/config/Items.ts.meta b/assets/script/game/common/config/Items.ts.meta new file mode 100644 index 00000000..f5411d07 --- /dev/null +++ b/assets/script/game/common/config/Items.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "49217bd4-ee11-49f7-b404-e8d40478fa2d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts index 2567fb10..faedee68 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/MissionSet.ts @@ -11,6 +11,7 @@ export const BossList = { } } + export const MissionSet = { 1:{ lv1_num:10, @@ -48,5 +49,11 @@ export const MissionSet = { lv4_skill_num:10, lv5_skill_num:10, } + +} + +export const MissionReward = { + 1:[1001,1002,1003,1004,1005], + 2:[1001], + 3:[1001], } -export const MissionReward = [] \ No newline at end of file diff --git a/assets/script/game/initialize/Initialize.ts b/assets/script/game/initialize/Initialize.ts index 36b946ca..7ecc3845 100644 --- a/assets/script/game/initialize/Initialize.ts +++ b/assets/script/game/initialize/Initialize.ts @@ -14,7 +14,7 @@ import { LoadingViewComp } from "./view/LoadingViewComp"; import { smc } from "../common/SingletonModuleComp"; import { MonSet, HeroSet } from "../common/config/heroSet"; import { SkillSet } from "../common/config/SkillSet"; -import { Items } from "../common/config/ItemSet"; +import { Sitems } from "../common/config/ItemSet"; // import {data} from "../data/data"; /** @@ -90,7 +90,7 @@ export class Initialize extends ecs.Entity { smc.monsters=MonSet; // console.log("加载完成!",smc.heros); smc.skills=SkillSet; - smc.items=Items; + smc.sitems=Sitems; var uic: UICallbacks = { onAdded: (node: Node, params: any) => { var comp = node.getComponent(LoadingViewComp) as ecs.Comp; diff --git a/assets/script/game/map/CardController.ots b/assets/script/game/map/CardController.ots index d2fcfc1f..dfeaee8c 100644 --- a/assets/script/game/map/CardController.ots +++ b/assets/script/game/map/CardController.ots @@ -157,18 +157,18 @@ export class CardControllerComp extends CCComp { // console.log("show_info",uuid) let node =this.node.getChildByName("item_box") if(type == 2){ - smc.vm_data.item_box.info = smc.items[uuid].info - smc.vm_data.item_box.name = smc.items[uuid].name - smc.vm_data.item_box.skillcd = smc.items[uuid].cd - smc.vm_data.item_box.skillsd = smc.items[uuid].sd - smc.vm_data.item_box.atk = smc.items[uuid].atk - smc.vm_data.item_box.hp = smc.items[uuid].hp - smc.vm_data.item_box.shield = smc.items[uuid].shield + smc.vm_data.item_box.info = smc.sitems[uuid].info + smc.vm_data.item_box.name = smc.sitems[uuid].name + smc.vm_data.item_box.skillcd = smc.sitems[uuid].cd + smc.vm_data.item_box.skillsd = smc.sitems[uuid].sd + smc.vm_data.item_box.atk = smc.sitems[uuid].atk + smc.vm_data.item_box.hp = smc.sitems[uuid].hp + smc.vm_data.item_box.shield = smc.sitems[uuid].shield node.active=true - if(smc.items[uuid].shield > 0){ + if(smc.sitems[uuid].shield > 0){ node.getChildByName("data").getChildByName("shield").active=true } - if(smc.items[uuid].hp > 0){ + if(smc.sitems[uuid].hp > 0){ node.getChildByName("data").getChildByName("hp").active=true } } @@ -272,7 +272,7 @@ export class CardControllerComp extends CCComp { // let level: number = 0; // let { uuid, type } = card[0]; // url = "game/heros/skill"; - // ({ path: pathName, name, level } = smc.items[uuid]); + // ({ path: pathName, name, level } = smc.sitems[uuid]); // this.cards[index].lv=level // let node=this.node.getChildByName('cards').getChildByName('card'+index) // node.getChildByName('cost').getComponent(Label).string=level.toString() diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index f84af4d4..1e4e9ea2 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -55,18 +55,18 @@ export class CardControllerComp extends CCComp { // console.log("show_info",uuid) let node =this.node.getChildByName("item_box") if(type == 2){ - smc.vm_data.item_box.info = smc.items[uuid].info - smc.vm_data.item_box.name = smc.items[uuid].name - smc.vm_data.item_box.skillcd = smc.items[uuid].cd - smc.vm_data.item_box.skillsd = smc.items[uuid].sd - smc.vm_data.item_box.atk = smc.items[uuid].atk - smc.vm_data.item_box.hp = smc.items[uuid].hp - smc.vm_data.item_box.shield = smc.items[uuid].shield + smc.vm_data.item_box.info = smc.sitems[uuid].info + smc.vm_data.item_box.name = smc.sitems[uuid].name + smc.vm_data.item_box.skillcd = smc.sitems[uuid].cd + smc.vm_data.item_box.skillsd = smc.sitems[uuid].sd + smc.vm_data.item_box.atk = smc.sitems[uuid].atk + smc.vm_data.item_box.hp = smc.sitems[uuid].hp + smc.vm_data.item_box.shield = smc.sitems[uuid].shield node.active=true - if(smc.items[uuid].shield > 0){ + if(smc.sitems[uuid].shield > 0){ node.getChildByName("data").getChildByName("shield").active=true } - if(smc.items[uuid].hp > 0){ + if(smc.sitems[uuid].hp > 0){ node.getChildByName("data").getChildByName("hp").active=true } } diff --git a/assets/script/game/map/MapSkillComp.ts b/assets/script/game/map/MapSkillComp.ts index 42a5ca28..d2c9dbd0 100644 --- a/assets/script/game/map/MapSkillComp.ts +++ b/assets/script/game/map/MapSkillComp.ts @@ -41,14 +41,14 @@ export class MapSkillComp extends CCComp { } useItem(event: string, args: any){ console.log("useItem"); - if(smc.items[args.uuid].hp > 0){ //buff加血 - smc.Role.RoleView.add_hp(smc.items[args.uuid].hp) + if(smc.sitems[args.uuid].hp > 0){ //buff加血 + smc.Role.RoleView.add_hp(smc.sitems[args.uuid].hp) } - if(smc.items[args.uuid].atk > 0){ //buff加攻击 - smc.Role.RoleView.add_atk(smc.items[args.uuid].atk,smc.items[args.uuid].sd) + if(smc.sitems[args.uuid].atk > 0){ //buff加攻击 + smc.Role.RoleView.add_atk(smc.sitems[args.uuid].atk,smc.sitems[args.uuid].sd) } - if(smc.items[args.uuid].shield > 0){ //buff护盾 - smc.Role.RoleView.add_shield(smc.items[args.uuid].shield,smc.items[args.uuid].sd) + if(smc.sitems[args.uuid].shield > 0){ //buff护盾 + smc.Role.RoleView.add_shield(smc.sitems[args.uuid].shield,smc.sitems[args.uuid].sd) } } /** 视图层逻辑代码分离演示 */ diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index 0ea58418..b2b1f2cb 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -1,4 +1,4 @@ -import { _decorator } from "cc"; +import { _decorator, Label } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; @@ -7,6 +7,9 @@ import { MonViewComp } from "../mon/MonViewComp"; import { HeroViewComp } from "../hero/HeroViewComp"; import { RoleViewComp } from "../Role/RoleViewComp"; import { BossViewComp } from "../Boss/BossViewComp"; +import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; +import { MissionReward } from "../common/config/MissionSet"; +import { Items } from "../common/config/Items"; const { ccclass, property } = _decorator; @@ -14,6 +17,9 @@ const { ccclass, property } = _decorator; @ccclass('VictoryComp') @ecs.register('Victory', false) export class VictoryComp extends CCComp { + reward_lv:number=1 + reward_num:number=2 + rerawd_item:any={} /** 视图层逻辑代码分离演示 */ start() { // console.log("VictoryComp start") @@ -28,24 +34,34 @@ export class VictoryComp extends CCComp { smc.vm_data.role.mission += 1 } this.node.getChildByName("Node").active = true; + this.getReward() this.node.getChildByName("Node").getChildByName("defeat").active = false this.node.getChildByName("Node").getChildByName("victory").active = true; } private do_defeat() { smc.vm_data.mission.play=false this.node.getChildByName("Node").active = true; + this.getReward() this.node.getChildByName("Node").getChildByName("victory").active = false; this.node.getChildByName("Node").getChildByName("defeat").active = true } + getReward(){ + let reward:any = RandomManager.instance.getRandomByObjectList(MissionReward[this.reward_lv], 1); + this.rerawd_item =Items[reward[0]] + // console.log("getReward:",this.rerawd_item) + this.node.getChildByName("Node").getChildByName("item3").getChildByName("num").getComponent(Label).string=this.reward_num.toString() + } end_mission(){ this.node.getChildByName("Node").active=false smc.vm_data.role.gold += smc.vm_data.mission.reward_gold smc.vm_data.role.exp += smc.vm_data.mission.reward_exp + smc.vm_data.role.items[this.rerawd_item.uuid].num += this.reward_num + smc.vm_data.mission.reward_gold=0 smc.vm_data.mission.reward_exp=0 this.empty_mission() oops.message.dispatchEvent("to_mission") - console.log("end_mission") + console.log("end_mission",smc.vm_data.role.items) } empty_mission(){ let monsters:any= ecs.query(ecs.allOf(MonViewComp));