diff --git a/assets/resources/config/TS.meta b/assets/resources/config/TS.meta new file mode 100644 index 00000000..c7de6310 --- /dev/null +++ b/assets/resources/config/TS.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "30cab6da-ae9a-4c2f-b0b8-cb3aea9173b5", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/hero/arc1.prefab b/assets/resources/game/hero/arc1.prefab index 42568280..96874eaa 100644 --- a/assets/resources/game/hero/arc1.prefab +++ b/assets/resources/game/hero/arc1.prefab @@ -1485,7 +1485,7 @@ "__id__": 64 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 70 @@ -1789,7 +1789,7 @@ "__id__": 78 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 84 diff --git a/assets/resources/game/hero/k3.prefab b/assets/resources/game/hero/k3.prefab index 1a754012..2dccb8b9 100644 --- a/assets/resources/game/hero/k3.prefab +++ b/assets/resources/game/hero/k3.prefab @@ -1576,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1696,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39V/39ruhFN6dbuqa2bsMj" + "fileId": "baE6tADE1GP5/5aZOBsFIC" }, { "__type__": "cc.Sprite", @@ -1741,7 +1741,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1bZFC2Mf1HtK/19iW6BKTO" + "fileId": "71ZlFlc+1GrLK7yJ2kRW+i" }, { "__type__": "cc.PrefabInfo", @@ -1751,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "dbR+GorDhPhY0hp2lpkACn", + "fileId": "a4kW4I+ZNFQI0E8U/MzAiA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1782,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7CLvIIohKT67Ckhk6DsAk" + "fileId": "6fMMc3kK9GSo7HBZiqY7G5" }, { "__type__": "cc.Sprite", @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bMlr68YRGupW2yyTJMYks" + "fileId": "95RjVxCQhNxbOD6tNoDsq7" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3evAFumlCwbWxYCq0rZ8X" + "fileId": "33rplHGrpACaV9btvUIlUT" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "8bLzvMgr5NF5OTqT9M5FTe", + "fileId": "c3T1r4FpdAerxNchip0uny", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "676/Zm1FxMD5T9UxbO6Go/" + "fileId": "b7ifouTSNEl7UA6DIghQrK" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36Rvu+qMFIPpnsjL/dD2m3" + "fileId": "66/fabMf1P9LtZR65SkELG" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "85uSuvRFpC45yi7EVvW4ss", + "fileId": "39TqLJfVFHJaBbdly2yodb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4agjCwcmlNHaVyCorcK1le" + "fileId": "1fsW1IlTdEdK3k6dG7B8We" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bjwvLjelIBoRZq0Tj857k" + "fileId": "feswErt0RI0L1e4EqXVcDc" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dcmCV3vUVImbwnQ+VNufiN" + "fileId": "95l0ffweFHIaOp1pyaIcDr" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "49AyEzLzpJFIqs5vJPcL1I", + "fileId": "77IwuAIzlFtYL8oesc7y6E", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "57fuNT0ihNo6jVbEgGA34i" + "fileId": "3ddvlfWsNFfp1d1EsKQBAO" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8cFUpfG8FOJYEpgibM9+zo" + "fileId": "ca/JwjRa9H16zgQcvaHG6V" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "edsZrlChdNmJ1a2/SNSWfL", + "fileId": "caZ1TxwgFNF47S2Xyi0E9h", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7R26VGlBJwrQcbeuYkzjS" + "fileId": "aeA12f3slIh7uYNXVdS22Q" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80lTIHj4BBrIyzbIpH8A5T" + "fileId": "c29mdGSU5EF75Sx+Mu2RTA" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "26hoorWSBOUaG/L0M4cHQs" + "fileId": "97NEejU51I5aV/n4PhJl1e" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "68VY72kmpJkpjmO2KUbjKg", + "fileId": "fd8A2rHuRKy4rPR8FfPbhE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "79ONaScHhJWYfYYXxZx2No" + "fileId": "1dtOulQIxL4ptQOP/0uk7R" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "f8jj4cUR5KqJSBNGxCVszf", + "fileId": "5d9FvPzupFfLwDjNB7cdaw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6DV1s9D1Di6LQ3KNx/54q" + "fileId": "13psfzfqtIj75UOsomAVj5" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "ccYE7UlsBDlJZb84HDqVjh", + "fileId": "42bsJcBQVMco9ZbPeTjn3q", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/game/hero/m1.prefab b/assets/resources/game/hero/m1.prefab index 4cfcd5fa..bc49e196 100644 --- a/assets/resources/game/hero/m1.prefab +++ b/assets/resources/game/hero/m1.prefab @@ -1576,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1696,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "efm8KrE+9JjYHoVLo7F2Iv" + "fileId": "8btMCLZaRKh6F2GBKyvYzl" }, { "__type__": "cc.Sprite", @@ -1741,7 +1741,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b429CueqVH05UxPr1Ywk1D" + "fileId": "ce1sKwBsVEoa3CX/NivMHp" }, { "__type__": "cc.PrefabInfo", @@ -1751,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "92t68hLplJK5oyB40DRQ7e", + "fileId": "c59jZRW6JCP5Qbt/jPIMN0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1782,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4dcWExG01BmZ9vepOQatBG" + "fileId": "c5Sf3jmVBOC53hy7WrVSAW" }, { "__type__": "cc.Sprite", @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "67hawemFpPNYKWoYa40u4J" + "fileId": "b4VEoH2HBP4YwQ0btjAD2P" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aeKG8qHlZK5JVaAisnBA+9" + "fileId": "f7j9M+oLlJM6NLPDoblmFy" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "9e2aN6qzJKjIfSTxPxbVCj", + "fileId": "e2/PbSqQdHQLjGjDzyhQq3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "eabp73n2RBkZXFo11m69z4" + "fileId": "b8qr8QyeFF3rB6VkwlqPIg" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "61m0dmAyVInaoiqftjXv5c" + "fileId": "3du8RJB5dPWq9XkpUYPrg5" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "fe9T2LyKBF+LIYeoBgpz84", + "fileId": "04ZcmX9jdDfanCfdCvmw8a", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c4Wr/8JTBK/KABKDJGo1cg" + "fileId": "d6le7ZNrhKxJB+Th9b02gZ" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03Y2XymL9Dq4mDnqufgeBj" + "fileId": "27eVFmYTZAL63eCjyvVCDi" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fcC3cFvGFMEYU9FustgEGO" + "fileId": "6bcWjJV1NJs6LT+mBwG8Tx" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "35sx+5QphJA4iGju+IWS8H", + "fileId": "16xd79ApNFhYCYafUoeWJ8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "50OeopMyJJ9YUuGMf0ZzvA" + "fileId": "18dSYfq/FHdrAZlAsm6G7b" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "82qVbtxM5HIp0qa+bA7jD5" + "fileId": "5bUrr+/F5NeZoeiueu5LWC" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "9eKFVv1L1NrI/O+E6CxYtM", + "fileId": "d7YbeLSHpEwY4+Xw/+ShYH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "932xF6noNEApDPH69c+dNE" + "fileId": "e98gKszu9DFbJkrBXT3cEn" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "12LO2hhN9LFKjbSPWE2oKO" + "fileId": "19GnL/+ORI3ac+mAz8mJr4" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a2c4BSC99HAZPHXZb0bZv6" + "fileId": "64oFzbaqlGnpBPZSwaCIi8" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "64cK83wo9DFYUsHyNFusaq", + "fileId": "4a8CDHiotJaLql8oRMSvZD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "24zDkPz09KtLBlESnYp3t+" + "fileId": "98HdLJrvVH8b3M8cVN2jK1" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "41XB+GhDBO4aJvOsSYVsO4", + "fileId": "44nz89c7ZPqqjCSBF/XBVg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "78v+BH2UJMvZN4I2/tsZrU" + "fileId": "18nbXc72BHja4iIEeBPQBa" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "67dchA8YpKIonZafVcV4ep", + "fileId": "03dp38WMJAzazuDDCL92We", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/game/hero/m2.prefab b/assets/resources/game/hero/m2.prefab index 1a17f77f..d8f4365e 100644 --- a/assets/resources/game/hero/m2.prefab +++ b/assets/resources/game/hero/m2.prefab @@ -1576,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1696,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9691IyzG1CDZ5/QzFmuVRs" + "fileId": "bfu++WJc1IUYBoNcCQrrm+" }, { "__type__": "cc.Sprite", @@ -1741,7 +1741,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3cFVyENCdIG4KgEZmxvphx" + "fileId": "f8QMJPHuZHg4gmIwAYFAAv" }, { "__type__": "cc.PrefabInfo", @@ -1751,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "a0hRE2sTNISobxwwVGm58Z", + "fileId": "e8nGeu2iVBV4pYnBsKrKUC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1782,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "864MLpd+FIy7Z6D5obkHIc" + "fileId": "d85ploz1JK46Wf8KzlMPoZ" }, { "__type__": "cc.Sprite", @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "452vkeQ8xE4pTqQYKhEd3r" + "fileId": "32O0kacpVFlI3WgJGYYAxu" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fdaskkAYtOBrsrqW7l152H" + "fileId": "04wviHqbdAkLiN+yl3v30V" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "a51VHEEAlEdqbreKzhs3Y3", + "fileId": "b7tHA5/pNM87P8i8QUwB/m", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8aoJ3qAmtNEr2PQf9y5i4o" + "fileId": "e1Wl7kZ9FJBqc1Ijx2PtDl" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6DeSSALJCy7Dy+3/sZrJl" + "fileId": "bahoVurQJGRYOjxZsw2RTO" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "6aDd3Q/VVKiK/EfsYgHJys", + "fileId": "52vKKvb4pOB5EbJRHUi8bR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c4Jq8lxqVBp6PCcDU5G85o" + "fileId": "66hGyUwF5A34SmVu7gKbxv" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "34SWoep41GOb87KZkozICO" + "fileId": "1ey2awjoRIrbgAn5/keq2x" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3c3SwXlFpMDKdhKndU/9cQ" + "fileId": "5fH/2atQdHQJUBfshiwl+b" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "5frmt7ZkJIKqzkz0zWni7t", + "fileId": "62aKkQGN5JtIUpjrU95wwj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "41ssRjqd5FAJjleHDdj/KI" + "fileId": "cfmLuyT9dHCIZoS+/JIHFT" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64/M6/QgxKHJHqWZSCRYzP" + "fileId": "dcGh/oKSdDvLq7d6rvcRv2" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "e8rn+e1xZF7Yd8dbhqlAoY", + "fileId": "d63AG+4ZJIJK8YAYBcHco+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "74kdGcpXFG8LLGW+Vno/XJ" + "fileId": "ffHRSb58xILozt093jiRUe" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7cacKX0x9M1Ku7Fm5EjmIb" + "fileId": "90vKoCht9NXozmn3wBJZwt" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "98V+P2/0pIfa5NEXFqvhy5" + "fileId": "d2pO2hXHVNDaKEtnABorKM" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "017UHRNY9O3Jb+rDJIh623", + "fileId": "75hrLljq1CrpvdWGuZAWjZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5drTK9qVJECZtD+m01YVm9" + "fileId": "11yWY0JQZDko8E4lYooqn3" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "b4/NL+W9JJT7QalwMsxc4B", + "fileId": "59tWWc/EdGJZrhu4Y5NzKl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6dJ/pCGMhKBaMu2aqogz+5" + "fileId": "f1mJd/nsZEZLHjZ77fVkeB" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "2crxR8TQFKjYpI1LfWoK3C", + "fileId": "368FKBFKFElKjXrYwrsvD/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/game/hero/m3.prefab b/assets/resources/game/hero/m3.prefab index c82f07a9..9478b64b 100644 --- a/assets/resources/game/hero/m3.prefab +++ b/assets/resources/game/hero/m3.prefab @@ -1576,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1696,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9fuFx1rutDPJpmXHZQV06i" + "fileId": "6ezZaV/xNEUpvFYPCXYzLM" }, { "__type__": "cc.Sprite", @@ -1741,7 +1741,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8cxftn7idH8p9nTs3KLJqw" + "fileId": "42Yq5h0PhL75cSKErZ2t9P" }, { "__type__": "cc.PrefabInfo", @@ -1751,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "204BmQWu5HYochWmJmvZ2Q", + "fileId": "59DL6AV7RHOqb94sGCuQme", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1782,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0MNh3HJtExrXzturk+LDA" + "fileId": "aaE+o5d3RLOIF+fAtRjIX3" }, { "__type__": "cc.Sprite", @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "17uBPzOWxEdYRicfS9GNaC" + "fileId": "bb2kMW5SpKJ5oujveLSCNf" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6aUK+YxzlHP5C3LtZAP+L4" + "fileId": "c6mjSXMp1CvZCVB+gxCc3e" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "e2ldeUSfZL94JfH8J9EZK7", + "fileId": "f7WcH3PTxHx4KdQQHq2Mpn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6agjeYoTVC9J7pLYKMXcgb" + "fileId": "df6QBOnlRKHZQ6Tkqn1xMG" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "11iaFYUqxJVZtpQS3I9Qiw" + "fileId": "a4kpdi/9JM1YcPaQh+t6Kv" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "d1wJpgApJOFqu9Q4bxGsCV", + "fileId": "9e23dVAr9ATpJZHkUfAinV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c44dwGmgpBeoY3E01BxSdn" + "fileId": "17DnvBFcZAdpJBkRPl2x0r" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dZ40kKvZAYJMytVyEGGmt" + "fileId": "62Mx7xBixB+4QDOH39JfCz" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d1Ig8UK8tJTbBvHVOjWhDq" + "fileId": "e7RDXbLL5N3ptACgIyYSF5" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "daMDNLuHtGUIBGeMJq44tf", + "fileId": "5esawiJW5AUaplg+8pKs2Y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0bGnx2aQ1BcrJ+utxRHJqq" + "fileId": "28SstTS5VASKlbgS+8+49u" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f7MSTldNJMP4Eom3mxrqRT" + "fileId": "618vU9KtZBPJ+uG5kGtmig" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "92KIAm1kpDO7Ob25o5FbkM", + "fileId": "09VTynW+9FyZ6u1/YC7Xb8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ffCqCF1GZGdrOnQrsqLJRF" + "fileId": "5106iOfWFBe62nU7QWf9Bd" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06Mu/XoUtCV5Lwum/lLMP9" + "fileId": "14DIbyhT9F26aZ/hn/Lkdw" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2a6RvTaVlFsa4lMo5kh2Od" + "fileId": "0aXTpjNf5EFLScrIWvSF9O" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "62EwRu3JROdrEJqlrR6Fx6", + "fileId": "6eyRXDAKJINI9qFIk7hp4W", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7fw3bXhYBN5JsadKD5UtRw" + "fileId": "680qIOlX9PhIEcRe0Mh23P" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "d4kFvxz9hAv7H00tHWM+Ty", + "fileId": "8cDeLO2A9IOY/Sbb8ofqBR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "88OJeajfJBCqSUVGHsgfEZ" + "fileId": "4bQRw4PO5NX5jFC1oEY5ep" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "fahZdcWFhMaIILFQYTX7LM", + "fileId": "772PD4P6FJwYMGFr11idlT", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/game/heros/role.prefab b/assets/resources/game/heros/role.prefab index 86f69779..f9f0421e 100644 --- a/assets/resources/game/heros/role.prefab +++ b/assets/resources/game/heros/role.prefab @@ -88,8 +88,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -277,8 +277,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -605,7 +605,7 @@ "enabledContactListener": true, "bullet": true, "awakeOnLoad": true, - "_group": 2, + "_group": 4, "_type": 1, "_allowSleep": false, "_gravityScale": 0, @@ -637,7 +637,7 @@ "__id__": 26 }, "tag": 4, - "_group": 2, + "_group": 4, "_density": 0, "_sensor": false, "_friction": 0.2, @@ -650,7 +650,7 @@ "_size": { "__type__": "cc.Size", "width": 800, - "height": 500 + "height": 400 }, "_id": "" }, @@ -780,7 +780,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -45.415, - "y": 105.673, + "y": 65.192, "z": 0 }, "_lrot": { @@ -1084,7 +1084,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -45.595, - "y": 111.661, + "y": 71.18, "z": 0 }, "_lrot": { @@ -1385,7 +1385,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -45.269, - "y": 109.116, + "y": 68.635, "z": 0 }, "_lrot": { @@ -1679,7 +1679,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -22.293000000000006, + "y": 77.385, "z": 0 }, "_lrot": { @@ -1783,8 +1783,6 @@ "__id__": 0 }, "fileId": "dan9CUjmhFipAW7pXgUTOt", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -3388,7 +3386,7 @@ "enabledContactListener": true, "bullet": true, "awakeOnLoad": true, - "_group": 2, + "_group": 4, "_type": 1, "_allowSleep": false, "_gravityScale": 1, @@ -3420,20 +3418,20 @@ "__id__": 151 }, "tag": 0, - "_group": 2, + "_group": 4, "_density": 1, "_sensor": false, "_friction": 0, "_restitution": 1, "_offset": { "__type__": "cc.Vec2", - "x": -2.4, - "y": 64.3 + "x": -3.5, + "y": 34.4 }, "_size": { "__type__": "cc.Size", - "width": 82.2, - "height": 111.8 + "width": 79.9, + "height": 85.1 }, "_id": "" }, @@ -3514,7 +3512,6 @@ "__id__": 0 }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", - "instance": null, - "targetOverrides": null + "instance": null } ] \ No newline at end of file diff --git a/assets/resources/game/monster/du1.prefab b/assets/resources/game/monster/du1.prefab index 8c24b6b2..3d36af3d 100644 --- a/assets/resources/game/monster/du1.prefab +++ b/assets/resources/game/monster/du1.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 4.409, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2.035, - "y": 57.467, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "2fcb2Dx/FBK4UzDVCN08aZ" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "6ef1/penVPLb8TxlKA4EN3" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "04XARqm7NN4aT7uqr3GXLY", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "c0O9nqgXlLb599JMUww3xE" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "c16ycAzE5JGKQWUJLfzI2+" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "82gkIatnZD76U7b9cQVEay" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "88ryM8OPhGOpAytY4TVIe3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "b8oDdUVX9Kj46IbiOebhDM" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "b2mCYYZeNPp4CcJYLHGXRR" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "f7rYa3FnxH9q7qADiyo0h5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "48HXxNRWdPsZ5if4n1yN+C" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "3aElc4kCFF5KMr/q1uYZ/Y" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "750LYpZ4xLLIhd2ilV6xLS" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "8fXE4pn35Luoy58ZgKX6PW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "5fc+QLSiVI7Z/jveUudvA+" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "b7grf9wxdG1ZUsRw0uu/I6" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "52wg3fj5JOR54h+LPnWpG1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "adU79qQRVEDpUzw9429rpl" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "119vquzAZC661lTOVW0im+" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "ccaaexw0NPnIOTZjnnDzd4" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "e411e8wg9L9JgwvezPzqFM", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "2fxSPvo1NGjI72MvquoBtE" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "26IzqGvsZM86UptlFesV4M", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "afV+bjifFLb649xZekjbJ6" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "36x3dprHBAcbW5JvptCPsZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/du2.prefab b/assets/resources/game/monster/du2.prefab index 3ce4f036..2679f520 100644 --- a/assets/resources/game/monster/du2.prefab +++ b/assets/resources/game/monster/du2.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 4.409, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2.035, - "y": 57.467, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "57MhxVdD1Fxpj1GWJHmhbu" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "20bjTJYZNFVa520UqB5Eb7" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "93k/0a2BtMPLZ0OKlJAL5P", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "2futWM4oxCa62g69maA5aq" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "e8YSosLsxKdrhc6sA4KPie" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "36wMf8ivhD6p+OeB64G2pc" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "5eVqjyGmRCI79yzYEvj0cJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "8dva0ZLytPkIuv3FubNtA/" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "81xdjbpIdIcqCOKKOKBN4i" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "2bU9sfjqJE06ox+KNCUsVv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "50tiia9IlFcpjtvsPqBRte" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "b23PyKynhHOIYCMFI0qSG2" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "d2VWDlwj1B85e+Bue16Vo6" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "24fOz2oA1CsqHEKWUWdULW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "95MCKuwbxDLISEQCu/E+1D" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "2c+n3Z5+NKxJHK8OmhmR2o" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "10ophaPPdO5JmStkpqSUJG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "47rBtXI4lHB7EURo4iZEU+" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "f71YUgikFI1YVhfydiSQ23" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "afMIOgvuVAnpWfMlq1NA7t" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "4bLinpjxFCCbcmbyKpEvMG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "e0qWuxdZVOC74mNrTU3zVN" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "4fW9c+0wZKea1EhQMJHMIv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "a3qDSxWclFNYo+NuCsblgH" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "b0loz13epAvI4jURV9rGk8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/du3.prefab b/assets/resources/game/monster/du3.prefab index 956a723e..18929677 100644 --- a/assets/resources/game/monster/du3.prefab +++ b/assets/resources/game/monster/du3.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 4.409, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2.035, - "y": 57.467, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "9fJMF34LZAAL73Z+IleD4i" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "759fgRS7RKrqUHB8OOnmy0" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "98a9siB3VNo4A3R3FseO6R", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "22k+t8i2hKNJ2PzvS/vwcP" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "50EUAEdHFMa71TqVZikhap" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "9caPfYKO9BJqDdclbT7MpZ" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "19Wt5qEPJPlJ6hpDRt+oKs", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "b93BonyAhJcYPilXYbuntc" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "93hPSEpc1FdZTnaUvXB1VH" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "adbw0uQyxFzJinwP8Kn8bj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "5b20trQ+9AeY08UQQv5IyN" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "d4RZQ6zz9B8bGBEYNuA+Si" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "2fbhwhsVlIsawB2ZXwZyxS" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "b851FiAvRG7aGu00mAGGoS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "7c2TGtYj9LXbgeJKwsd23j" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "0aVy2P/gBCK7nBrTjxvYoG" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "be6CS7NypD9qY+DouJfL5q", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "c5y0HwYlRPd5AFmUO7xBob" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "a2AjPujW5J7oltdn4F7wHq" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "8fXbFseXNLP6ouAGvA+GmI" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "73ET+fhIBFuagjQ/TJ1Apk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "a8m5O/h/lP8oRSwwSY4UxQ" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "43kONZ6atKb4NNZ6UKOm4j", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "92FHDZtVlKHb+G/++ertlU" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "f6r8XYup9EqYQrGGw3pApq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ge1.prefab b/assets/resources/game/monster/ge1.prefab index 5a2e3e5d..0627f05b 100644 --- a/assets/resources/game/monster/ge1.prefab +++ b/assets/resources/game/monster/ge1.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 15, - "y": 52.719, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1646,8 +1643,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "9aZrimT4dB2o2YkIsxMReg" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "ccEpY2e6lP/5q0H9cQTNzm" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "27hVBMq9dL3pZPfm6dt1TJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "e6O7K5MWFKLItxJa8bPSKZ" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "5cTkt7DU5LwJ4JWyKnXUGG" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "5fQ8UGNBJLtYLECjdSWiK5" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "20nWY++vtNn7q0VWxSg2Qx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1947,8 +1947,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "7aVK0QxVxCibvOAwOgecA3" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "ceLvH6Sj1IxorEt6phQCk+" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "c23fImubZA0Id7wsypY6Nf", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "fbVNy5O3dKdYnJybGFDoLY" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "1fipiy9d9LP4Tr7qDnGTjw" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "f9S6VfRE9JbZBfFkuJk6kn" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "03EO+EotVM8ohUqyswMePP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2251,8 +2251,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "3fWO9lb29Om6kUcuaXgqa7" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "6c0hcXtRpK75ff5bE5qSnu" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "f5ucrSJLBPUrrP6ReolojC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "4cJgNFepVO9IBmfzi24Iq0" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "938g9dvvZEGJ9CcG+R9py9" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "8bRH70Eg9FzIUbsq4qv5XJ" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "bcHyod28JAkpr9uBKsZ2Uw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "6dz6ImXURBK65xGoQDSSVX" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "583S6ihwdPFL9+FUb9OS/I", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "b1KA7KHalA+ICxdh94lS9o" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "0b6crlCEdL15eHQAPoysig", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ge2.prefab b/assets/resources/game/monster/ge2.prefab index 8c913193..b2880483 100644 --- a/assets/resources/game/monster/ge2.prefab +++ b/assets/resources/game/monster/ge2.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 15, - "y": 52.719, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1646,8 +1643,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "485srI91xKcqUZWa/1wkOF" + "fileId": "f3GNC1QyVHKIQASOHM34+L" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "77Djf53B9FB7ZkLpaYcCY/" + "fileId": "5bgPSVfEVKLI2sqsCN5plw" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "38ExCsQ+dO2JsZ+MYU0/ub", + "fileId": "46ie1BliZNy6dqUnIjjS8Y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6645U7jE1ILaG/eyYwchfX" + "fileId": "6fpx18EclDirP0pYNM2Zt5" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "61v4DIhitLkIW7HbAvZTXh" + "fileId": "3cCrE3IU9PGZ6BgMFJdSrc" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06sVrwFVlG75+oC8hh2mzF" + "fileId": "16fSeZpCxNQq5hsOvKDNOJ" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "9bzq1ouixCoY25oliEW5/c", + "fileId": "5e+4GSKNxLdZnxZm+wJwBm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1947,8 +1947,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "43j8ghxfVCH6vgaV/lK6hI" + "fileId": "25KasXPihLhr60GbTAW2Al" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f4nOVcCrlIl76TqKuDue8Q" + "fileId": "1fu7GdfZBCeqjMDq8eO8k4" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5MKr+QopOLpaoY38NQ5Fj", + "fileId": "91wb801+hHArSBQuRHFH29", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "22aCjEvWRFV43QO4bS0GnM" + "fileId": "10c9lGglpH6o0xtEDx74N0" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dch43YCORDw74XGdfAcA5e" + "fileId": "dbWUDRhLZLwrB1N7/yeqL4" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "361nIpfhRFarHg7Nhwa+rG" + "fileId": "beaka4dbZGxIllSUkLf+Gb" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "2f90NNpEZGP6oFBlabY7Np", + "fileId": "eeX5gObTZE74MsvrxerHvQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2251,8 +2251,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "faAq6YXZJIYaBYJYD2nhhp" + "fileId": "fft26AaW5MII9YdfHv5bI+" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "59pWxkjVBDu67Wzki7tud1" + "fileId": "caZLUcc6hDnpdf5cf46NkA" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "ebxWmQOFVHG7UfWL2bzmdl", + "fileId": "e6/VwpOjVMiYjet0T+jRA0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7bgyztzHBJXZXJEqnYwIIf" + "fileId": "5a0xjaj6FM4aBmwpoSQKmc" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b0jEbowDRPq4vi5AD2c87G" + "fileId": "1f7r6RepZE4rDsCBOwxRo5" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25DQfL7KRBjIBQ5rnBtovs" + "fileId": "44d/gYzG9Lp4ErY4EA/er1" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "8fXEU0/gVM2JiejTsRp/vS", + "fileId": "a0IpT/dm1Og4zK/R7iTFp6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "07+OVW+O5MrYS+MC9/L5Tu" + "fileId": "73nHSNN4NA/IJI0r2bFG5B" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "afLoFP+AZEfpBaP/NkgY+E", + "fileId": "f01xBtuU5DfLxsf2WUwcnd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2ewDLvcvdAOZe7z6zq2cco" + "fileId": "69gmWaB1dJhY6/HSNuz7xq" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "c6LHNn875DSp8ETDhPGUBi", + "fileId": "97c9ck9M1FYpkR327IX2KQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ge3.prefab b/assets/resources/game/monster/ge3.prefab index 958e8d7b..71bee17e 100644 --- a/assets/resources/game/monster/ge3.prefab +++ b/assets/resources/game/monster/ge3.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1539,8 +1536,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 15, - "y": 52.719, + "x": 0, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1646,8 +1643,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d2j+nl465FI47cDNFebRd3" + "fileId": "98eFZiTuxP0aLeoOTsoJiC" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "98+YyJCmdDqI8iZ6OqtvuV" + "fileId": "013etbGd9EorAbXGa6BkhU" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "45jHfJStZD8KZeMM3jjfQz", + "fileId": "fausXBI3hKv5NSpA43HzWT", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9euFhOM1xAjZljDRyuJfde" + "fileId": "e1IkiCoP5Do5WoT4g7y7K7" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03+Mh0e8hEF6uHF9XxGamw" + "fileId": "91vcXL/CRPYr0XKGzhkYSC" }, { "__type__": "cc.ProgressBar", @@ -1852,7 +1852,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "90IXa9LE9N6oZtCwb3bN9V" + "fileId": "ebpi+GqtlP7JYhxH3UGuhE" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "9aTUG1NxROCIIrRHIuTLyR", + "fileId": "b5a5ZzPlNFlL/l8kgiOiGU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1947,8 +1947,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -2, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d82AhpEdJOj7yPACLv0kBX" + "fileId": "e7bhNqKhNER5AhWVmdGZFf" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "922aKGI45D5ZtPdZ8YCBwf" + "fileId": "4dC2yw3yVNQoTr9Gfzprg5" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "10+PuJakpETa+dd9XSr0tw", + "fileId": "17L9IO5BFG96m3EGBCg/vc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b3b2am4t5IH4+Z0H8q5M6Q" + "fileId": "4dMV2t1tFCMZM1uNJ6PWnK" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "84DuZ3rjdAZYw6dmHM0XCl" + "fileId": "c2kuw5JmhNTKrIK2JK2EZM" }, { "__type__": "cc.ProgressBar", @@ -2156,7 +2156,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "51sAtj5A9Aw6Qyi+oSPclX" + "fileId": "267erjN/BG6YCpyUqQbSGN" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "05myEnyXdBo6CAL7H8u6mh", + "fileId": "12CcRxueRMKr/6OKwkdFD8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2251,8 +2251,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -22, - "y": 5.028, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2297,14 +2297,14 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, + "x": 0.5, "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9BGsCpVhEG4SPmokcbeAk" + "fileId": "35MvmroqRBXpGBxR5ZFCui" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93SWO6dC1G6rbzhuVyKGNb" + "fileId": "eah0tj/EJG5J1Bo052Np8M" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "57iKqORu9J+qJVEdtLZ0tZ", + "fileId": "c7gAIpDKpKfp8dUBbjNnUa", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09g5Tbq39Nm7wiqKmGqHDS" + "fileId": "3e94Zr1uZGS6q4dmGttJvj" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b78BDJTZhJY5+4GDh2O8Ca" + "fileId": "d2AL43srVDv78R+5929Ch1" }, { "__type__": "cc.ProgressBar", @@ -2460,7 +2460,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c2ck2ewLtP5bEOyEG5qbIn" + "fileId": "32gZoG/9FL47X81M1y9iyk" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "7eJgj6kRhEXYDC/Aqn5V47", + "fileId": "03NIxY7m9EA5eQcpGtC8q+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6e4JvylzNFGLUaN+Ua1as0" + "fileId": "40wsW6EK1MEoGdWFInb+n2" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "62SscusW5FN6D1q4Qe9U7y", + "fileId": "f1XloUoexOjofEM/4u+z9n", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cciKJjK6VA0bQEub9eAlrA" + "fileId": "d6AIHDqAlEx5kWjy5lDNOb" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "f9YUvAs2RFOYdkKOUKIwoN", + "fileId": "10aXOf/qNEELrWdZDqE+4L", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/gou1.prefab b/assets/resources/game/monster/gou1.prefab index cf6e3e2b..27a606fe 100644 --- a/assets/resources/game/monster/gou1.prefab +++ b/assets/resources/game/monster/gou1.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 6.214, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 56.969, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "d9+eoSO9lIkbu7QJtLrGQp" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "b1u5VVnF1PbqIgxv7VD8wZ" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "d6L7DXXQBID6hQd+KcIPym", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "60Az0ifnVG1omk6busvVp8" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "80yX7Ea0pECJbgrkvDiETE" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "92heoplglEZaCEaHAWg9ET" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "04Kp6Hg4NL5baZHqrUsg6x", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "84rIAxOKRBvZ19AoCdSNXe" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "7dS93ubplFJ4iC2CeUaVzk" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "0dZfEW91JDTLGtWsvxOcpr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "73/OoyF8xJ2I6E8iplN8JK" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "5a7Adl8hdPQLAlPQOSMC8J" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "b2WwBOiGJOL69xcxGYd5AK" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "ec0ToVD/lBIaEWU/yAq1ra", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "38SH1vRLJKsrKpHILPRvg4" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "26RV0uJFpIe6AoP1lYyUtZ" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "33fzzV3wpPJ5HajdF5zCqh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "411PnesRBKNr7DVxkm3ic+" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "bf3Q0yDDJITJPm5MEVvTbv" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "5fsBadX1lAlKVzHGEsbEJD" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "b4ErK5P9NAHLxz2jxLTg7i", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "ccy1NpaDNHBbtT8PUX0MmC" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "52HvxlvnFCN7CX7bT3Kkg5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "7fklpefn5OwLuBTRcDHy3r" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "eeH07hLehN6K0cN8t8ituI", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/gou2.prefab b/assets/resources/game/monster/gou2.prefab index 7433e9b2..980a34b3 100644 --- a/assets/resources/game/monster/gou2.prefab +++ b/assets/resources/game/monster/gou2.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 6.214, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 56.969, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "94pSe8dA5BsrXz9jHI6Rrq" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "7atc9TB55FdboclCdrZKWM" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "7cAYNSRFJN1a2YBTFrmdz7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "b6FJdo6rpAbZhmoTba/NRz" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "54Nj9msO9JX6jhsydNJTuS" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "64KvdH6A9KxZWLg75wAtKF" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "39muWYJpdLIrudWq+6tquu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "fcAnTc9yFMiawPA8dCjEaZ" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "170L+0b6ZGmYBsWBolLsk/" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "9aXb64Q3lHAJ0DYtwbXUKe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "98GFytf99A7oznuTD2/c9v" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "fe4YRiqflA1oqcJqhvB1NX" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "30ZcpWNFZHHZEvqDLbdgvV" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "eb+6kLo1ZOdpFAgvy6RA64", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "3fz8bo4StDs6awjuMHdPh7" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "f6yzuPrctFCZGO+s8mp92e" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "f2/rrWCbtPwYzv29rqgOEv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "2dcNh99I1PZa0MD1FgYwIn" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "b8Gwx8mslHMYb6jAgB4e4Z" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "baNw8zWtVC85AnAqHIpWNE" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "e0++Xr1KlA55Yabgv7phi4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "59Vw9L/7pPWKUpRPrgbuAZ" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "bd0HwBA51GZru00q/cHgqA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "f3wX0hcd1MS7ZehMAbV3i+" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "45HVK+MOlL/qVeDes0pXX7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/gou3.prefab b/assets/resources/game/monster/gou3.prefab index f21a26db..4248806d 100644 --- a/assets/resources/game/monster/gou3.prefab +++ b/assets/resources/game/monster/gou3.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 6.214, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 56.969, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "1574aeddhNPqdJTz89AIQg" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "fd3PzTMppFk7NruquHeT+s" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "74hVEL/OhOmp3ZxRAm9U4V", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "eenRpZCoVIYZ1ZsFuPeLCa" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "a3PLWLPi1AjbBRSvWdYllW" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "bcrICx7s5EnYaKdr925IyO" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "dd+pvi4OhAeLgYlM4PgouM", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "2291kOuBZCHLLI40GmVVUr" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "84ryYXMDpKCJCcfsltSyQg" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "3dSK69pDRLJqW1hbXDxzXV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "50I307HRVIh4HWxRBSsgg6" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "5bWhw0FCtEJ6qAswGbs6UH" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "68RrENbXdOBYV7WejyxWcZ" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "f6wK+Mdu5OQrFpR2PuojfV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "4ddRiWnLBArqLst3Mwy9XS" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "fetpKwIfhDPa5GGU9Nvprj" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "42akKOMNlCMacOBMzOXKsm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "7cAPIviHJKqJIqAhxc8sYK" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "159KlFIVlGBK2nCie63k45" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "bdHPWJaoRLn52GssWfxHwt" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "157nfeNWdHFa0UsNeSPuPv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "daAJ4ULSZP7Y+pPo9IBUg+" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "f7zXVig+FPJryOMxJh37PC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "9cL+9Ee6lCMJ1c8lCLl6de" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "7ai0vKc8FFUax9hB3vZs88", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/mon.prefab b/assets/resources/game/monster/mon.prefab index c37a8441..f5ea69e2 100644 --- a/assets/resources/game/monster/mon.prefab +++ b/assets/resources/game/monster/mon.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1534,7 +1531,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1546,7 +1543,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1573,7 +1570,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1590,7 +1587,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1681,8 +1678,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1693,7 +1690,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "32jVlKM5RO3YWYD2gFu2XF" }, { "__type__": "cc.Sprite", @@ -1718,7 +1715,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1732,13 +1729,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "7b1Vbpx+RBhYGN911Q5FMS" }, { "__type__": "cc.PrefabInfo", @@ -1748,7 +1745,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "9bANSZ4W5IvKcLyhuq+uYr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1767,8 +1764,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1779,7 +1776,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "75iGCrLjpCKIOHxIr6ZPkS" }, { "__type__": "cc.Sprite", @@ -1803,7 +1800,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1821,7 +1821,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "25aE4WjH9Nf7gofRGe4pZF" }, { "__type__": "cc.ProgressBar", @@ -1839,14 +1839,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "cdoB/wzLdHB7Mtez/HNwFk" }, { "__type__": "cc.PrefabInfo", @@ -1856,7 +1856,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "a0ClAYITlLIaTLT0vaCcAi", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1874,7 +1874,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1891,7 +1891,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1982,8 +1982,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1994,7 +1994,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "3f3wZIz1ZOLrrFRMCFAhfO" }, { "__type__": "cc.Sprite", @@ -2039,7 +2039,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "e4pXGaOhlEsJVrKdIUWNln" }, { "__type__": "cc.PrefabInfo", @@ -2049,7 +2049,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "d7uf5OvGpCLploESIVN5CC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2068,7 +2068,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2080,7 +2080,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "86PgreLc1PU5cgPcf8VMPi" }, { "__type__": "cc.Sprite", @@ -2125,7 +2125,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "3aISeNdWlC6KsbI74MQu7m" }, { "__type__": "cc.ProgressBar", @@ -2143,14 +2143,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "811T7GbZpFYY3u0YBTBsgh" }, { "__type__": "cc.PrefabInfo", @@ -2160,7 +2160,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "3143eYad1EybBoK/xKnMfH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2195,7 +2195,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2286,8 +2286,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2298,7 +2298,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "cdZ8PyzipKyLb1NYtXN71o" }, { "__type__": "cc.Sprite", @@ -2343,7 +2343,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "24Jzj5XjtMhLV+8ogNEwky" }, { "__type__": "cc.PrefabInfo", @@ -2353,7 +2353,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "e62i8PL6xJeaMqL2fd7z8g", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2372,8 +2372,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2384,7 +2384,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "ed6ewMjfdIgam9hTm2qaEI" }, { "__type__": "cc.Sprite", @@ -2429,7 +2429,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "75o3fGf4FAJoMQTooU3UGZ" }, { "__type__": "cc.ProgressBar", @@ -2447,14 +2447,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "209k4nZyNCQ7/tBxNk9oop" }, { "__type__": "cc.PrefabInfo", @@ -2464,7 +2464,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "50ydYlJsdAhYJtTxDwMQgv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2542,7 +2542,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "a2Nkb1G/BGC7/ycWxpvunO" }, { "__type__": "cc.PrefabInfo", @@ -2552,7 +2552,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "efvTfp9KRIwr1eFruIwCvy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2583,7 +2583,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "db7ZE6QVhOJaR2MJhYEt1g" }, { "__type__": "cc.PrefabInfo", @@ -2593,7 +2593,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "42i3R4KDxIObOI+RoC/XSD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2740,24 +2740,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/orc1.prefab b/assets/resources/game/monster/orc1.prefab index f5d37319..3e94dced 100644 --- a/assets/resources/game/monster/orc1.prefab +++ b/assets/resources/game/monster/orc1.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 60.211, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "f3qHFWEJhIi6gWQWr3AZrz" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "08yTt8hRpA1Y4s39KKEHw5" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "dauak2vZ1BD4K86DTKLhAR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "74fu5RArdHILmhbz8Kjjgk" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "8awil0sfZFkIO+8vKcJgCv" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "dbso97ryxC4oGeBxmeNNPc" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "3bGv4Bc0xH8qIqcANcqFMx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "367X1LDVZJeKWuGhN/nwRs" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "a0Xa0LKeRLf6L+/MDXpbzn" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "00ypoFMnRGC4SbAJYEpXJB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "6cRqG5k79Mj7E6QqYga1xd" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "0b32S4F+1PTJ/3mBZfWD+i" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "06ylZAfE1Ad6FL8OgpV8nI" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "c69ZvSnBRAp6AapJAR8b6w", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "97oxUzdwVLlpZLn+9BZpKZ" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "0929Ebe6hKd4ov/fDT08fh" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "0702NK56JEvb6xoBfgyZTv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "36YPX+5ptK9IWoMOywab/Q" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "74wgaWUiVPNpIvN1RqC29i" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "5fs/nlWdNKp6VU0VsWRRdQ" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "dfECI6D5BEFLuWtYKlsVvk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "35pC4VNf5OopjkSfq5tRhl" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "e9Qsm/kOBJVbZ/QB1+PL8l", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "b5DwinoxJDzKEe5Mg/fLzk" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "44oy740m9H96iw+U/R3BYJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/orc2.prefab b/assets/resources/game/monster/orc2.prefab index 9ce416ab..f6d52d06 100644 --- a/assets/resources/game/monster/orc2.prefab +++ b/assets/resources/game/monster/orc2.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 66.455, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "967o97C0pMP42oBOeZo73+" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "28xEIPIq5JD6wjaFIh2aTe" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "e0n+MHpHpIh6uqY26/eo8+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "1fK00A2dJNqY2iJEjOcvTw" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "d1/NoPOAZJKY4uJqDhuA40" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "f2lGBDz/FMyrbNYmrMfbgN" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "dbeO5f4oFNe54nXeInDXeS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "94LhAdFZpMzoixWGvkBHX7" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "38yxTQWZ5FAbXxKMfBsVFY" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "6em7cS6kpMJaoMOr1hMEpd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "d7gpr+fx5GsrFUdSHad0eg" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "1cuaT2oLJMqqYS+d7I0TMD" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "60lmVxGupIJ4PtK2no1WAP" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "09r/a29YpJY6Wdnp9Ofk8v", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "4dgkcPTnNObbsZVYBmabdm" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "c9H96yYVZDrqnoilOi1X5F" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "cfr5dzfK9E/oUQaPtfzBS1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "48GI71FoxHa5JDHyG+tyoq" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "4eunP+k+9D2YjkFbdx56kX" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "98Ty2ucIlEdZ2gXJv84gdt" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "876j470o9A+IQvJMmf0LEC", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "28epIP6AtLRqK73evFN3Aa" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "89a6hHWCFMA7muJ57CitJV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "298W9s/4ZC67ncVvMdpf+1" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "03VIxO5t9OC4G5WOBZZCpE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/orc3.prefab b/assets/resources/game/monster/orc3.prefab index 675efbcb..5aa874b8 100644 --- a/assets/resources/game/monster/orc3.prefab +++ b/assets/resources/game/monster/orc3.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -385,7 +382,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5.725, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 68.953, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "29lkYHk3pD0aAZ10f0SVfY" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "58YPGrcD9GCbH/qHu0sNUz" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "3c8XbxcR9Dlq+82D7WJ/nE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "13fMV9ni5Ai5i8y9rXIuk4" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "78FNG7A69AJ54LSsmPW1nW" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "14KNRRZqBNJ7PM+1zLNT8I" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "4euSzUdaZC6q0MfSegP5mn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "19K6IZ9pdOZbiFKDfWnhU6" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "12E/OxzcxMAYUs65v9xT24" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "fe+2WjHgRHFJARg8tVOxql", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "3c7waFVXJIU5b4jeiI5BO2" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "79zjFMYGpAy7wIUMOqxwFN" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "389HhHcp5L0Y3Ugv1gI4hn" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "a2nlsQUuRNZ7IeuBozSsEs", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "70rrontuVFH6LS4V84ceES" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "49a9048WtINr7jxXFU6Ctu" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "032o+UZhxLu7yrwdhANUEG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "79KIA8CohATKXiRf0j9eNV" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "5645S0CRpEwYkeXOqbkyJU" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "93qcousyZDJY9kYYOwoXKt" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "36bWVXHP5MmZCFKgwkcpxG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "dfgZzlYi9OYKvj2jHl5TvZ" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "43NXpz8yhLqa2o5IYU0Cgr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "5e+16eB11MTJ3+s1g6CeEY" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "68rE/HdCtNL41ofvDwJFV9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ys1.prefab b/assets/resources/game/monster/ys1.prefab index 86ce5db0..2beb19e4 100644 --- a/assets/resources/game/monster/ys1.prefab +++ b/assets/resources/game/monster/ys1.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 11, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "6dO8rvCM5MF77/YxizmDL7" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "10u7MHMetHd68+k02OKYYM" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "c4L37FMx1HxoVUGbXCFNUb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "72cjyh8vNJ+IRhwnASWC1h" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "94PpK4UTtKsJxQKqZxG1yN" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "bdjSxi8FJNhIrvd+UZ5lPM" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "1cPRtJg9pJspgKIS7OC/OS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "5fbQw9dcZBzJZ9UGjsVSpl" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "ffAkBWDFJNPqkmx7jGqtJk" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "ecUX+MWt9GpLC63UJdZB93", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "d9PlTjDy9OB6ixu4/DwEGF" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "1d2Vt37YlJdJsj9px8f2Oz" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "ccShkUV8hJooPxRU0heTsE" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "4e8lwMleJNrIs/QK2cUzs9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "03gfvv3vdH6rAn431F4Nr6" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "2fzyg2aWhE2If4BXG/5aMV" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "0bTJS/fONF6L/t6HKVGPh0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "eeacZOLCVCUaDGgWJEHCBR" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "a0GyXL3sZJW6ZHi+tkS7w/" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "70HlwV6RxMo6U6Ws+kwtC1" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "d0OrayJuFCDJ7FPQRDeuU+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "eeBP/SnXJGep9V+mtBePmb" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "955PVYltdBrJvx9AZX7XTh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "b7G+7EnUpE1oSA9sTFfs3p" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "9deMA3JG9G6Kvo4YiYthX1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ys2.prefab b/assets/resources/game/monster/ys2.prefab index b5c90fd1..d5458fd7 100644 --- a/assets/resources/game/monster/ys2.prefab +++ b/assets/resources/game/monster/ys2.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 11, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "13HO/cEHxLvL5fcNvaGU2+" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "9fwfDMGq5LzarDNZF4SCHf" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "5fwd3dUaFAnqKpualGcHrJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "9eJOwMU41DUYkeCq7Sih60" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "337uEUO3tMoqxyiyfzv7BZ" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "dc9J7ye95Jd7tepJMLsmck" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "f4r+MoYohGap7OK1rfAE4b", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "a3NaoR9HRNDar/cGHq+hya" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "55tdr3OulMDatDbN9gR6a0" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "08slOawh9PDa5boEJctXvO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "e888q3UmZJJq+tt6oi0Hkw" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "7dPJLIB6lFXYTDoNl1+1sa" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "1dmNyBS5tI2oM4xDABNjP2" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "b9/s3yitJCKaGajjI7K5uQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "05xJNpaa1LUqm9p9u+2Hhb" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "d70szLeVZFH5wg799W4g7W" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "a6WxUESTBHQ7OEomlxs2eO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "2cQj2YF6RKZoLwq/4EhGpj" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "7bZ1Nn/+dEQKr45PVL7UPp" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "11O3nNJ0FPTLbbhJItiRES" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "38ZY1BsghE9oGFKCHFN0e/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "46gbCAU3ZJE6bBTI1HGqx/" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "b9OefCMFlMNoszej9UlQvU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "4ee5KCszxJNqIZ8iX8+Rtg" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "4f7cbRFmFHa7e0uTPuPp8n", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/monster/ys3.prefab b/assets/resources/game/monster/ys3.prefab index fd03f73d..0ec98b5f 100644 --- a/assets/resources/game/monster/ys3.prefab +++ b/assets/resources/game/monster/ys3.prefab @@ -50,13 +50,10 @@ }, { "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -384,8 +381,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 11, - "y": 5.725, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1540,7 +1537,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 66.342, "z": 0 }, "_lrot": { @@ -1552,7 +1549,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -1579,7 +1576,7 @@ "__id__": 68 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 74 @@ -1596,7 +1593,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 11.501, "z": 0 }, @@ -1687,8 +1684,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1699,7 +1696,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fd3dH6jldPsa66Ci7KUVI3" + "fileId": "c0veG4oq1O55uI571hDHlO" }, { "__type__": "cc.Sprite", @@ -1724,7 +1721,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -1738,13 +1735,13 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": true, + "_useGrayscale": false, "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42nR/FpVZByb+otJaujBAU" + "fileId": "e8ZLEaQwRNOIXc1y2SRnrW" }, { "__type__": "cc.PrefabInfo", @@ -1754,7 +1751,7 @@ "asset": { "__id__": 0 }, - "fileId": "82t+mKrT1NDK/FLaizJqmu", + "fileId": "67yG9gq+hCJrQHXggfW5L3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1773,8 +1770,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1785,7 +1782,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0Vsb23mxLQp4brp5KrYoI" + "fileId": "6dVQ8zZS9KkaIYCopdQFzK" }, { "__type__": "cc.Sprite", @@ -1809,7 +1806,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91cea", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -1827,7 +1827,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "817EmqwtZOoo1jCiT331/h" + "fileId": "dfXV6eeNFP9YTguro487Ht" }, { "__type__": "cc.ProgressBar", @@ -1845,14 +1845,14 @@ "__id__": 71 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03p2B8lt5IL6sqNzysZUD4" + "fileId": "50IHYcoUxI4KJbhXiDYUut" }, { "__type__": "cc.PrefabInfo", @@ -1862,7 +1862,7 @@ "asset": { "__id__": 0 }, - "fileId": "f5X0rdMcFOMZ0GRx4uHEc0", + "fileId": "bf8vLtp2dCr5HHQNVRdr/P", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1880,7 +1880,7 @@ "__id__": 82 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 88 @@ -1897,7 +1897,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 4.35, "z": 0 }, @@ -1988,8 +1988,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2000,7 +2000,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "813TIYW4hFE51fj5XnIM7U" + "fileId": "2bSUiLoyJLfbZ6GVjh9l2Y" }, { "__type__": "cc.Sprite", @@ -2045,7 +2045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6uKKYR+hOwqOSPSq7AlvQ" + "fileId": "11M2nxenNENpFb1emq5t40" }, { "__type__": "cc.PrefabInfo", @@ -2055,7 +2055,7 @@ "asset": { "__id__": 0 }, - "fileId": "b3LJ0VG0VFrYRVjfPY427V", + "fileId": "16P/CbNMZJjrA+HCYQZl+k", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2074,7 +2074,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, + "width": 40, "height": 8 }, "_anchorPoint": { @@ -2086,7 +2086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09RqqG2gdIyLDPmkOnUl7P" + "fileId": "f6vXjOTOpN+6qzFGNjZsHm" }, { "__type__": "cc.Sprite", @@ -2131,7 +2131,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "36zTet8jxGlIf/W9fQOS9R" + "fileId": "44xyiTs/FIu51yOlaSqXbh" }, { "__type__": "cc.ProgressBar", @@ -2149,14 +2149,14 @@ "__id__": 85 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9C5D8jvtF/JEjVlHBhBdr" + "fileId": "79/8JtHNlD4YQgLOaUdiZO" }, { "__type__": "cc.PrefabInfo", @@ -2166,7 +2166,7 @@ "asset": { "__id__": 0 }, - "fileId": "b5rEuqD9FEYYP4Im0qXER9", + "fileId": "2diKIyBwBGp5o0G8PWSSOo", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2201,7 +2201,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -9.161, + "x": 0, "y": 8.374, "z": 0 }, @@ -2292,8 +2292,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2304,7 +2304,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64oRBs3hJO3LA5VFslDpOO" + "fileId": "f6D9MsUR1Kma5UDmF/EF8i" }, { "__type__": "cc.Sprite", @@ -2349,7 +2349,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1b7JSpvcxOhplKvSN0EmRv" + "fileId": "32EfB/+iVIEpoDg2DCZUn+" }, { "__type__": "cc.PrefabInfo", @@ -2359,7 +2359,7 @@ "asset": { "__id__": 0 }, - "fileId": "1eXXKteoBAvo0Hvio77rEU", + "fileId": "36T0I/eLhGkJTlW7CMP7kO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2378,8 +2378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 30, - "height": 5 + "width": 40, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2390,7 +2390,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml" + "fileId": "0aBaTR4ZxKZ4b47VnRP4JQ" }, { "__type__": "cc.Sprite", @@ -2435,7 +2435,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "81qai2QVVH/ZHainysEVfg" + "fileId": "51KDhYMfZJZaV1AsAU7IFe" }, { "__type__": "cc.ProgressBar", @@ -2453,14 +2453,14 @@ "__id__": 99 }, "_mode": 0, - "_totalLength": 30, + "_totalLength": 40, "_progress": 1, "_reverse": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "679kvexftOP5THClBTLwgV" + "fileId": "6dPJvcbYJG5rZAoIMf+ayS" }, { "__type__": "cc.PrefabInfo", @@ -2470,7 +2470,7 @@ "asset": { "__id__": 0 }, - "fileId": "e0uLHlpWdNPYyGkO1b43Fw", + "fileId": "2e71cvhm9O7oQnO5TxdIq5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2548,7 +2548,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5ee77+ulxDVLmOpnqyiJiI" + "fileId": "88k95xdVFEJqsmTvpNAORj" }, { "__type__": "cc.PrefabInfo", @@ -2558,7 +2558,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "fileId": "a7MnK4uLlMjrpWyCr0G1Rp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2589,7 +2589,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87TOHvukJEtaMdt++5klVw" + "fileId": "fb6VQlyYVBWLY8yrkVSGQQ" }, { "__type__": "cc.PrefabInfo", @@ -2599,7 +2599,7 @@ "asset": { "__id__": 0 }, - "fileId": "dan9CUjmhFipAW7pXgUTOt", + "fileId": "07JtjJnbpDJ5AiRaWMrsIV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2746,24 +2746,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "91VJfYuZRBl76Iu3sucOsm" }, - { - "__type__": "dc9c4wHvjRNHIFBjsP5/4J1", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 127 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ce3Im9ZWZEpIwFBFpRTmyf" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/base3.prefab b/assets/resources/game/skills/arrow.prefab similarity index 98% rename from assets/resources/game/skills/base3.prefab rename to assets/resources/game/skills/arrow.prefab index a1d55d1a..2d2fde13 100644 --- a/assets/resources/game/skills/base3.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "base3", + "_name": "arrow", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "base3", + "_name": "arrow", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.3, - "y": 0.3, + "x": -1, + "y": 0.1, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skills/base3.prefab.meta b/assets/resources/game/skills/arrow.prefab.meta similarity index 86% rename from assets/resources/game/skills/base3.prefab.meta rename to assets/resources/game/skills/arrow.prefab.meta index 72cf978b..96b32f9d 100644 --- a/assets/resources/game/skills/base3.prefab.meta +++ b/assets/resources/game/skills/arrow.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "base3" + "syncNodeName": "arrow" } } diff --git a/assets/resources/game/skills/base2.prefab b/assets/resources/game/skills/mball.prefab similarity index 99% rename from assets/resources/game/skills/base2.prefab rename to assets/resources/game/skills/mball.prefab index e08718ef..e5203aed 100644 --- a/assets/resources/game/skills/base2.prefab +++ b/assets/resources/game/skills/mball.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "base2", + "_name": "mball", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "base2", + "_name": "mball", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/resources/game/skills/base2.prefab.meta b/assets/resources/game/skills/mball.prefab.meta similarity index 86% rename from assets/resources/game/skills/base2.prefab.meta rename to assets/resources/game/skills/mball.prefab.meta index 082e3b41..57181d59 100644 --- a/assets/resources/game/skills/base2.prefab.meta +++ b/assets/resources/game/skills/mball.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "base2" + "syncNodeName": "mball" } } diff --git a/assets/resources/game/skills/base.prefab b/assets/resources/game/skills/patk.prefab similarity index 99% rename from assets/resources/game/skills/base.prefab rename to assets/resources/game/skills/patk.prefab index 2c13c23d..0927f6f8 100644 --- a/assets/resources/game/skills/base.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "base", + "_name": "patk", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "base", + "_name": "patk", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -78,7 +78,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 3 diff --git a/assets/resources/game/skills/base.prefab.meta b/assets/resources/game/skills/patk.prefab.meta similarity index 87% rename from assets/resources/game/skills/base.prefab.meta rename to assets/resources/game/skills/patk.prefab.meta index 751f9b48..06dfc04f 100644 --- a/assets/resources/game/skills/base.prefab.meta +++ b/assets/resources/game/skills/patk.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "base" + "syncNodeName": "patk" } } diff --git a/assets/resources/game/skills/tooltip.prefab b/assets/resources/game/skills/tooltip.prefab index e8ccbd9a..1627601a 100644 --- a/assets/resources/game/skills/tooltip.prefab +++ b/assets/resources/game/skills/tooltip.prefab @@ -1050,9 +1050,9 @@ "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 15, - "_fontSize": 20, + "_fontSize": 16, "_fontFamily": "Arial", - "_lineHeight": 20, + "_lineHeight": 16, "_overflow": 0, "_enableWrapText": true, "_font": null, diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts index 98056e02..19531558 100644 --- a/assets/script/game/Role/RoleViewComp.ts +++ b/assets/script/game/Role/RoleViewComp.ts @@ -59,8 +59,8 @@ export class RoleViewComp extends CCComp { skill_name: string = "base"; //技能名称 max_skill_name: string = "base"; //大技能名称 - skill_uuid:number = 9001; - max_skill_uuid:number = 1001; + skill_uuid:number = 9002; + max_skill_uuid:number = 9002; atk: number = 10; /**攻击力 */ // atk_speed: number = 1; atk_cd: number = 1.3; /**攻击速度 攻击间隔 */ diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 364f75a2..12eb064f 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -24,6 +24,11 @@ export class SingletonModuleComp extends ecs.Comp { cards: any = [ {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1} ]; + items: any = [ + {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2}, + + {uuid:6210,type:3},{uuid:6211,type:3},{uuid:6005,type:3},{uuid:6006,type:3},{uuid:6101,type:3},{uuid:6102,type:3}, + ]; player_skills: any = [ ]; player_buffs: any = [ diff --git a/assets/script/game/common/config/MonSet.ts b/assets/script/game/common/config/MonSet.ts deleted file mode 100644 index 751b08c7..00000000 --- a/assets/script/game/common/config/MonSet.ts +++ /dev/null @@ -1,33 +0,0 @@ - -export const MonSet={ - 1001:{uuid: 1001,path: "ge1",type: 1,level: 1,name: "战斗哥",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1002:{uuid: 1002,path: "ge2",type: 1,level: 1,name: "墨西哥",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1003:{uuid: 1003,path: "ge3",type: 1,level: 1,name: "铁头哥",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1011:{uuid: 1011,path: "orc1",type: 1,level: 1,name: "森林兽人",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1012:{uuid: 1012,path: "orc2",type: 1,level: 1,name: "荒野兽人",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1013:{uuid: 1013,path: "orc3",type: 1,level: 1,name: "兽人战士",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1021:{uuid: 1021,path: "gou1",type: 1,level: 1,name: "黄皮豺狼",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1022:{uuid: 1022,path: "gou2",type: 1,level: 1,name: "白皮豺狼",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1023:{uuid: 1023,path: "gou3",type: 1,level: 1,name: "灰皮豺狼",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1031:{uuid: 1031,path: "gou1",type: 1,level: 1,name: "独眼巨人",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1032:{uuid: 1032,path: "gou2",type: 1,level: 1,name: "狂暴独眼",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1033:{uuid: 1033,path: "gou3",type: 1,level: 1,name: "独眼首领",atk: 4,hp: 30,atk_dis:40,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1041:{uuid: 1041,path: "ys1",type: 1,level: 1,name: "火元素",atk: 4,hp: 30,atk_dis:400,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, - 1042:{uuid: 1042,path: "ys2",type: 1,level: 1,name: "冰元素",atk: 4,hp: 30,atk_dis:400,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "ys"}, - 1043:{uuid: 1043,path: "ys3",type: 1,level: 1,name: "气元素",atk: 4,hp: 30,atk_dis:400,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "ys"}, -} \ No newline at end of file diff --git a/assets/script/game/common/config/MonSet.ts.meta b/assets/script/game/common/config/MonSet.ts.meta deleted file mode 100644 index a2a7d83d..00000000 --- a/assets/script/game/common/config/MonSet.ts.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "42f65183-72b1-4150-a850-00ff62389bbd", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index f42e7f70..9e9c99a7 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -24,47 +24,41 @@ path: 图片地址 export const SkillSet={ 1001:{uuid: 1001,path: "1001",type: 1,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人", - dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, + dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 1002:{uuid: 1002,path: "1002",type: 1,level: 1,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人", - dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, + dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 4011:{uuid: 4011,path: "1011",type: 1,level: 3,name: "火焰风暴",sp_name:"fire",info:"释放多个个火球术攻击敌人", - dis:720,count:5,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, + dis:720,count:5,atk:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 4012:{uuid: 4012,path: "1012",type: 1,level: 3,name: "冰晶风暴",sp_name:"ice",info:"释放多个个寒冰箭攻击敌人", - dis:720,count:5,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - 9001:{uuid: 9001,path: "1001",type: 1,level: 1,name: "魔法波动",sp_name:"base",info:"释放一个魔法球攻击敌人", - dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,}, - 9002:{uuid: 9002,path: "1001",type: 1,level: 1,name: "魔法波动",sp_name:"base2",info:"释放一个魔法球攻击敌人", - dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,}, - 9003:{uuid: 9003,path: "1001",type: 2,level: 1,name: "魔法波动",sp_name:"base3",info:"释放一个魔法球攻击敌人", - dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,}, + dis:720,count:5,atk:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, + 9001:{uuid: 9001,path: "1001",type: 1,level: 1,name: "精准打击",sp_name:"patk",info:"释放一个魔法球攻击敌人", + dis:720,count:1,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450,}, + 9002:{uuid: 9002,path: "1001",type: 1,level: 1,name: "魔法球",sp_name:"mball",info:"释放一个魔法球攻击敌人", + dis:720,count:1,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450,}, + 9003:{uuid: 9003,path: "1001",type: 1,level: 1,name: "精准射击",sp_name:"arrow",info:"释放一个魔法球攻击敌人", + dis:720,count:1,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450,}, - 6001:{uuid: 6001,path: "6001",type: 92,level: 1,name: "普通单手剑",sp_name:"",info:"", + 6210:{uuid: 6210,path: "6210",type: 92,level: 1,name: "普通攻击石",sp_name:"",info:"", dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - 6002:{uuid: 6002,path: "6002",type: 93,level: 3,name: "精致单手剑",sp_name:"",info:"", + 6211:{uuid: 6211,path: "6211",type: 93,level: 3,name: "精炼攻击石",sp_name:"",info:"", dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - 6003:{uuid: 6003,path: "6003",type: 94,level: 3,name: "魔法单手剑",sp_name:"",info:"", - dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - - 6004:{uuid: 6004,path: "6004",type: 92,level: 1,name: "普通木盾",sp_name:"",info:"", - dis:720,count:1,atk:0,hp:0,shield:30,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - - 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "精致钢盾",sp_name:"",info:"", + 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "钢盾",sp_name:"",info:"", dis:720,count:1,atk:0,hp:0,shield:30,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, 6006:{uuid: 6006,path: "6006",type: 94,level: 3,name: "魔法盾",sp_name:"",info:"", dis:720,count:1,atk:0,hp:0,shield:30,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, 6101:{uuid: 6101,path: "6101",type: 91,level: 1,name: "初级药水",sp_name:"",info:"", - dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, + dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, 6102:{uuid: 6102,path: "6102",type: 93,level: 3,name: "高级药水",sp_name:"",info:"", - dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, + dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - 6103:{uuid: 6103,path: "6103",type: 94,level: 3,name: "活力药水",sp_name:"",info:"", - dis:720,count:1,atk:0,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, +} +export const AllItems={ 6210:{uuid: 6210,path: "6210",type: 92,level: 3,name: "普通攻击石",sp_name:"",info:"", dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, @@ -91,10 +85,5 @@ export const SkillSet={ 6218:{uuid: 6218,path: "6218",type: 94,level: 4,name: "精炼全能石",sp_name:"",info:"", dis:720,count:1,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350, }, - -} - -export const AllItems={ - } diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 3282edd7..ffd7abc0 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -1,20 +1,52 @@ export const HeroSet={ - 9001:{uuid: 9001,path: "k3",type: 1,level: 1,name: "战士",atk: 4,hp: 350,atk_dis:40,atk_cd: 2,power:0,power_max: 10,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: 1,}, - - - 9011:{uuid: 9004,path: "m1",type: 1,level: 1,name: "冰法",atk: 4,hp: 15,atk_dis:400,atk_cd: 2,power:0,power_max: 10,speed: 30, - skill: "base2",max_skill: "ice",skill_uuid: 9001,max_skill_uuid: 1002, atktype: 1,}, - 9021:{uuid: 9005,path: "m2",type: 3,level: 1,name: "火法",atk: 6,hp: 15,atk_dis:400,atk_cd: 2,power:0,power_max: 10,speed: 30, - skill: "base2",max_skill: "fire",skill_uuid: 9001,max_skill_uuid: 1001, atktype: 2}, - - 9031:{uuid: 9006,path: "m3",type: 3,level: 1,name: "牧师",atk: 3,hp: 20,atk_dis:400,atk_cd: 2,power:0,power_max: 10,speed: 30, - skill: "base2",max_skill: "base2",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: 2}, - - - 9041:{uuid: 9009,path: "arc1",type: 3,level: 1,name: "弓箭手",atk: 3,hp: 15,atk_dis:400,atk_cd: 1,power:0,power_max: 10,speed: 30, - skill: "base3",max_skill: "base3",skill_uuid: 9001,max_skill_uuid: 1001,word: "狂暴",info: "全体攻击", atktype: 2}, + 9001:{uuid:9001,path:"k3",type:1,level:1,name:"战士",atk:4,hp: 350,atk_dis:40,atk_cd:2,power:0,power_max: 10,speed: 30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1,}, + + + 9011:{uuid:9004,path:"m1",type:1,level:1,name:"冰法",atk:4,hp: 15,atk_dis:200,atk_cd:2,power:0,power_max: 10,speed: 30, + max_skill: "寒冰箭",skill_uuid:9002,max_skill_uuid:1002,word: "守护",info: "自身护盾",atktype:1,}, + 9021:{uuid:9006,path:"m3",type:3,level:1,name:"火法",atk:6,hp: 15,atk_dis:200,atk_cd:2,power:0,power_max: 10,speed: 30, + max_skill: "火球术",skill_uuid:9002,max_skill_uuid:1001,word: "守护",info: "自身护盾", atktype:2}, + + 9031:{uuid:9005,path:"m2",type:3,level:1,name:"牧师",atk:3,hp: 20,atk_dis:200,atk_cd:2,power:0,power_max: 10,speed: 30, + max_skill: "治愈术",skill_uuid:9002,max_skill_uuid:9002,word: "守护",info: "自身护盾", atktype:2}, + + + 9041:{uuid:9009,path:"arc1",type:3,level:1,name:"弓箭手",atk:3,hp: 15,atk_dis:300,atk_cd:1,power:0,power_max: 10,speed: 30, + max_skill: "精准射击",skill_uuid:9003,max_skill_uuid:9003,word: "狂暴",info: "全体攻击", atktype:2}, +} +export const MonSet={ + 1001:{uuid:1001,path:"ge1",type:1,level:1,name:"战斗哥",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1002:{uuid:1002,path:"ge2",type:1,level:1,name:"墨西哥",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1003:{uuid:1003,path:"ge3",type:1,level:1,name:"铁头哥",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1011:{uuid:1011,path:"orc1",type:1,level:1,name:"森林兽人",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1012:{uuid:1012,path:"orc2",type:1,level:1,name:"荒野兽人",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1013:{uuid:1013,path:"orc3",type:1,level:1,name:"兽人战士",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1021:{uuid:1021,path:"gou1",type:1,level:1,name:"黄皮豺狼",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1022:{uuid:1022,path:"gou2",type:1,level:1,name:"白皮豺狼",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1023:{uuid:1023,path:"gou3",type:1,level:1,name:"灰皮豺狼",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1031:{uuid:1031,path:"gou1",type:1,level:1,name:"独眼巨人",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1032:{uuid:1032,path:"gou2",type:1,level:1,name:"狂暴独眼",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1033:{uuid:1033,path:"gou3",type:1,level:1,name:"独眼首领",atk:4,hp: 30,atk_dis:40,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "精准打击",skill_uuid:9001,max_skill_uuid:9001,word: "守护",info: "自身护盾", atktype:1}, + 1041:{uuid:1041,path:"ys1",type:1,level:1,name:"火元素",atk:4,hp: 30,atk_dis:200,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "火球术",skill_uuid:9002,max_skill_uuid:1001,word: "守护",info: "自身护盾", atktype:2}, + 1042:{uuid:1042,path:"ys2",type:1,level:1,name:"冰元素",atk:4,hp: 30,atk_dis:200,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "寒冰箭",skill_uuid:9002,max_skill_uuid:1002,word: "守护",info: "自身护盾", atktype:2}, + 1043:{uuid:1043,path:"ys3",type:1,level:1,name:"气元素",atk:4,hp: 30,atk_dis:200,atk_cd:2,power:0,power_max:10,speed:30, + max_skill: "魔法球",skill_uuid:9002,max_skill_uuid:9002,word: "守护",info: "自身护盾", atktype:2}, } \ No newline at end of file diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index da836c94..1687fe36 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -16,8 +16,7 @@ import { HeroSpine } from "./HeroSpine"; import { HeroViewComp } from "./HeroViewComp"; import { BoxSet } from "../common/config/BoxSet"; import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; -import { HeroSet } from "../common/config/heroSet"; -import { MonSet } from "../common/config/MonSet"; +import { HeroSet,MonSet } from "../common/config/heroSet"; /** 角色实体 */ @ecs.register(`Hero`) export class Hero extends ecs.Entity { @@ -83,7 +82,7 @@ export class Hero extends ecs.Entity { mv.power = smc.heros[uuid].power; mv.power_max= smc.heros[uuid].power_max; mv.type = smc.heros[uuid].type; - mv.skill_uuid = 9001; + mv.skill_uuid = smc.heros[uuid].skill_uuid; mv.max_skill_uuid = smc.heros[uuid].max_skill_uuid; mv.scale = 1; mv.Tpos = v3(0,0,0); diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 61f28830..ff5f940e 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -85,6 +85,7 @@ export class HeroViewComp extends CCComp { buff_shields:any=[]; buff_atks:any = []; + dir_y:number = 0; onLoad() { this.as = this.getComponent(HeroSpine); @@ -94,7 +95,7 @@ export class HeroViewComp extends CCComp { start () { this.as.move() this.sprite = this.node.getChildByName("anm").getComponent(Sprite); - this.node.getChildByName("top").getChildByName("shield").active = false; + // this.node.getChildByName("top").getChildByName("shield").active = false; // this.node.getChildByName("top").setScale(this.scale,1); // this.node.getChildByName("atk").setScale(this.scale,1); // this.node.getChildByName("atk").getComponent(Label).string = this.atk.toString(); @@ -173,7 +174,11 @@ export class HeroViewComp extends CCComp { if(this.enemy){ return } - this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y, this.node.position.z); + this.set_diry() + this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z); + } + set_diry(){ + this.dir_y=-(this.node.position.y-BoxSet.GAME_LINE)/60 } move_to(){ var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); @@ -221,10 +226,10 @@ export class HeroViewComp extends CCComp { },0.5) this.power = 0 } - let power_progress= this.power/this.power_max; - this.node.getChildByName("top").getChildByName("power").getComponent(ProgressBar)!.progress = power_progress; + // let power_progress= this.power/this.power_max; + // this.node.getChildByName("top").getChildByName("power").getComponent(ProgressBar)!.progress = power_progress; } - shoot(skill_uuid:number){ + shoot(skill_uuid:number,y:number=0){ // console.log("mon shoot"); let skill = ecs.getEntity(Skill); let scale = this.scale @@ -232,11 +237,19 @@ export class HeroViewComp extends CCComp { let dis = smc.skills[skill_uuid].dis; let atk = smc.skills[skill_uuid].atk+this.atk; let {pos,angle,t_pos}=this.get_enemy_pos() + pos.y=pos.y + y skill.load(pos,speed,dis,scale,this.node,skill_uuid,atk,angle,t_pos); // this.tooltip(3,smc.skills[skill_uuid].name,this.skill_uuid); } //使用max_skill do_max_skill(){ + if(this.max_skill_uuid==this.skill_uuid){ + this.shoot(this.max_skill_uuid,10) + this.shoot(this.max_skill_uuid,0) + this.shoot(this.max_skill_uuid,-10) + return + } + let skill = ecs.getEntity(Skill); let scale = this.scale let speed =smc.skills[this.max_skill_uuid].speed; @@ -255,7 +268,7 @@ export class HeroViewComp extends CCComp { console.log("move_to",this.enemy.isValid); return } - t_pos = v3(this.enemy.position.x-(this.node.position.x+pos.x),this.enemy.position.y-(this.node.position.y+pos.y)+BoxSet.ATK_Y) + t_pos = v3(this.enemy.position.x-(this.node.position.x),this.enemy.position.y-(this.node.position.y+pos.y)+BoxSet.ATK_Y) angle = Math.atan2(t_pos.y,t_pos.x) * 180 / Math.PI; if(this.scale == -1){ angle = angle +180 @@ -373,16 +386,16 @@ export class HeroViewComp extends CCComp { if(this.shield_time <= 0){ this.shield_time = 0; this.shield = this.shield_max=0; - this.node.getChildByName("top").getChildByName("shield").active=false + // this.node.getChildByName("top").getChildByName("shield").active=false } - let shield_progress= this.shield/this.shield_max; - this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress; + // let shield_progress= this.shield/this.shield_max; + // this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress; } if(this.shield <= 0){ this.shield_time=0 - this.node.getChildByName("top").getChildByName("shield").active=false + // this.node.getChildByName("top").getChildByName("shield").active=false }else{ - this.node.getChildByName("top").getChildByName("shield").active=true + // this.node.getChildByName("top").getChildByName("shield").active=true } } tooltip(type:number=1,value:string="",s_uuid:number=1001,y:number=60){ @@ -405,36 +418,21 @@ export class HeroViewComp extends CCComp { } } in_destroy(){ - // switch (this.scale) { - // case -1: - // if(this.node.position.x < BoxSet.LETF_END){ - // this.toDestroy(); - // } - // break; - // case 1: - // if(this.node.position.x > BoxSet.RIGHT_END){ - // this.toDestroy(); - // } - // break; - // } + } in_atked() { - if(this.is_role){ - var path = "game/skills/atked"; - var prefab: Prefab = oops.res.get(path, Prefab)!; - var node = instantiate(prefab); - let pos = v3(0,60) - node.setPosition(pos) - node.parent = this.node; + // var path = "game/skills/atked"; + // var prefab: Prefab = oops.res.get(path, Prefab)!; + // var node = instantiate(prefab); + // let pos = v3(0,60) + // node.setPosition(pos) + // node.parent = this.node; + this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); + this.scheduleOnce(() => { + this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); + }, 0.1); - }else{ - this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); - this.scheduleOnce(() => { - this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); - }, 0.1); - } - } dead(){ diff --git a/assets/script/game/initialize/Initialize.ts b/assets/script/game/initialize/Initialize.ts index 7cc51958..36a24046 100644 --- a/assets/script/game/initialize/Initialize.ts +++ b/assets/script/game/initialize/Initialize.ts @@ -12,9 +12,8 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { UIID } from "../common/config/GameUIConfig"; import { LoadingViewComp } from "./view/LoadingViewComp"; import { smc } from "../common/SingletonModuleComp"; -import { HeroSet } from "../common/config/heroSet"; +import { MonSet, HeroSet } from "../common/config/heroSet"; import { SkillSet } from "../common/config/SkillSet"; -import { MonSet } from "../common/config/MonSet"; // import {data} from "../data/data"; /** diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 1e07ee53..b875985a 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -4,7 +4,6 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { smc } from "../common/SingletonModuleComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; -import { CardList } from "../common/config/CardSet"; import { SkillSet } from "../common/config/SkillSet"; import { HeroModelComp } from "../hero/HeroModelComp"; const { ccclass, property } = _decorator; @@ -229,10 +228,7 @@ export class CardControllerComp extends CCComp { } } - get_card_list(li:number){ - let list = RandomManager.instance.getRandomByObjectList(CardList[li], 1); - return list - } + load_cards() { this.in_load = true let card:any=null @@ -261,7 +257,7 @@ export class CardControllerComp extends CCComp { this.cards[index].alive=true } for (let index = 5; index <= 6; index++) { - card=RandomManager.instance.getRandomByObjectList(CardList[index], 1); + card=RandomManager.instance.getRandomByObjectList(smc.items, 1); this.cards[index].uuid=card[0].uuid this.cards[index].type=card[0].type let url: string = ""; diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index dd35092a..3e590b92 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -149,9 +149,9 @@ export class MapMonsterComp extends CCComp { let m2:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1) // console.log("刷怪",m) var scene = smc.map.MapView.scene; - let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE) - let pos1:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+60) - let pos2:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE-60) + let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(-40,40, 1)) + let pos1:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(40,130, 1)) + let pos2:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE-RandomManager.instance.getRandomInt(40,130, 1)) let monster_layer = scene.entityLayer!.node! let monster_layer1 = scene.entityLayer1!.node!; @@ -168,17 +168,17 @@ export class MapMonsterComp extends CCComp { } set_layer(start:number=0){ var scene = smc.map.MapView.scene; - let pos:Vec3 = v3(start,BoxSet.GAME_LINE) + let pos:Vec3 = v3(start,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(-40,40, 1)); let x = RandomManager.instance.getRandomInt(0,2, 2); let monster_layer = scene.entityLayer!.node! switch (x) { case 1: monster_layer = scene.entityLayer1!.node!; - pos.y=pos.y+80; + pos.y=pos.y+RandomManager.instance.getRandomInt(40,130, 1); break; case 2: monster_layer= scene.entityLayer2!.node!; - pos.y=pos.y-80; + pos.y=pos.y-RandomManager.instance.getRandomInt(40,130, 1); break; } diff --git a/assets/script/game/map/RefController.ts b/assets/script/game/map/RefController.ts deleted file mode 100644 index b86fe982..00000000 --- a/assets/script/game/map/RefController.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { _decorator,v3 ,NodeEventType} 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 { smc } from "../common/SingletonModuleComp"; -import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; -import { HeroCard } from "../monster/HeroCard"; -import { HeroCardViewComp } from "../monster/HeroCardViewComp"; -import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; -import { CardList } from "../common/config/CardSet"; -const { ccclass, property } = _decorator; - -/** 视图层对象 */ -@ccclass('RefControllerComp') -@ecs.register('RefController', false) -export class RefControllerComp extends CCComp { - card_level = 1; - - protected onLoad(): void { - - } - - start() { - - } - - protected update(dt: number): void { - - } - - reset() { - this.node.destroy(); - } - - onTouch(){ - - - } - - - -} \ No newline at end of file diff --git a/assets/script/game/map/RefController.ts.meta b/assets/script/game/map/RefController.ts.meta deleted file mode 100644 index 1a264c14..00000000 --- a/assets/script/game/map/RefController.ts.meta +++ /dev/null @@ -1 +0,0 @@ -{"ver":"4.0.23","importer":"typescript","imported":true,"uuid":"6527b285-9d12-416e-8963-5e39820b7d4e","files":[],"subMetas":{},"userData":{}} diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts index d12475ec..4d869836 100644 --- a/assets/script/game/map/view/MapViewComp.ts +++ b/assets/script/game/map/view/MapViewComp.ts @@ -3,8 +3,6 @@ import { ecs } from "../../../../../extensions/oops-plugin-framework/assets/libs import { CCComp } from "../../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { smc } from "../../common/SingletonModuleComp"; import { BoxSet } from "../../common/config/BoxSet"; -import { Hero } from "../../monster/Hero"; -import { Monster } from "../../monster/Monster"; import { MapViewScene } from "./MapViewScene"; import { Timer } from "../../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; import { oops } from "../../../../../extensions/oops-plugin-framework/assets/core/Oops"; @@ -51,13 +49,6 @@ export class MapViewComp extends CCComp { gold_add(dt: number) { smc.vm_data.gold.time += dt; if (smc.vm_data.gold.time >= smc.vm_data.gold.cd) { - // if (smc.vm_data.gold.max < smc.vm_data.gold.max_limit) { - // smc.vm_data.gold.max += 1; - // } - // smc.vm_data.gold.min = smc.vm_data.gold.max; - // if(smc.vm_data.gold.min < smc.vm_data.gold.max){ - // smc.vm_data.gold.min += 1; - // } smc.vm_data.gold.min += 1; smc.vm_data.gold.time = 0; } diff --git a/assets/script/game/mon/Mon.ts b/assets/script/game/mon/Mon.ts index c5716e08..94bb0f0d 100644 --- a/assets/script/game/mon/Mon.ts +++ b/assets/script/game/mon/Mon.ts @@ -16,9 +16,7 @@ import { MonSpine } from "./MonSpine"; import { MonViewComp } from "./MonViewComp"; import { BoxSet } from "../common/config/BoxSet"; import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; -import { MonBuffComp } from "./MonBuffComp"; -import { HeroSet } from "../common/config/heroSet"; -import { MonSet } from "../common/config/MonSet"; +import { HeroSet,MonSet } from "../common/config/heroSet"; /** 角色实体 */ @ecs.register(`Mon`) export class Mon extends ecs.Entity { @@ -26,7 +24,6 @@ export class Mon extends ecs.Entity { MonModel!: MonModelComp; // 视图层 MonView!: MonViewComp; - MonBuff!: MonBuffComp; // 移动 protected init() { this.addComponents( MonModelComp); @@ -35,7 +32,6 @@ export class Mon extends ecs.Entity { destroy(): void { this.remove(MonViewComp); - this.remove(MonBuffComp); super.destroy(); } @@ -74,23 +70,22 @@ export class Mon extends ecs.Entity { } hero_init(uuid:number=1001,node:Node,pos:Vec3=v3(0,0,0)){ var mv = node.getComponent(MonViewComp)!; - var buff =node.getComponent(MonBuffComp)!; // console.log("hero_init",buff) mv.speed =mv.ospeed = smc.monsters[uuid].speed; mv.hero_name= smc.monsters[uuid].name; - buff.group=mv.box_group= BoxSet.MONSTER; mv.hp= mv.hp_max = smc.monsters[uuid].hp; mv.level = smc.monsters[uuid].level; mv.atk = smc.monsters[uuid].atk; mv.atk_cd = smc.monsters[uuid].atk_cd; mv.atk_dis = smc.monsters[uuid].atk_dis; mv.power = smc.monsters[uuid].power; + mv.power_max = smc.monsters[uuid].power_max; + mv.type = smc.monsters[uuid].type; - mv.skill_uuid = 9001; + mv.skill_uuid = smc.monsters[uuid].skill_uuid; mv.max_skill_uuid = smc.monsters[uuid].max_skill_uuid; mv.scale = -1; mv.Tpos = v3(0,0,0); this.add(mv); - this.add(buff); } } \ No newline at end of file diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts index d66d0b92..f14fb1aa 100644 --- a/assets/script/game/mon/MonViewComp.ts +++ b/assets/script/game/mon/MonViewComp.ts @@ -19,7 +19,6 @@ import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/ import { SkillCom } from "../skills/SkillCom"; import { SkillSet } from "../common/config/SkillSet"; import { Tooltip } from "../skills/Tooltip"; -import { MonBuffComp } from "./MonBuffComp"; import { MoveToComp } from "../common/ecs/position/MoveTo"; import { BoxRangComp } from "./BoxRangComp"; const { ccclass, property } = _decorator; @@ -36,7 +35,6 @@ export class MonViewComp extends CCComp { @property(Node) BoxRang:Node =null! - buff:MonBuffComp =null! is_role:boolean = false; enemy_pos:Vec3=null!; enemy:any=null!; @@ -83,10 +81,11 @@ export class MonViewComp extends CCComp { is_dead:boolean = false; //是否摧毁 is_stop:boolean = false; is_atking:boolean = false; - + buff_shields:any=[]; + buff_atks:any = []; + dir_y:number = 0; onLoad() { this.as = this.getComponent(MonSpine); - this.buff=this.node.getComponent(MonBuffComp); // this.BoxRang = this.node.getChildByName("range_box"); // this.BoxRang = this.node.getChildByName("range_box"); } /** 视图层逻辑代码分离演示 */ @@ -108,7 +107,6 @@ export class MonViewComp extends CCComp { // this.enemy=smc.Role.RoleView.node // // console.log("mon enemy ",this.enemy); // } - this.buff.group=this.box_group // 注册单个碰撞体的回调函数 let collider = this.getComponent(Collider2D); collider.group = this.box_group; @@ -170,7 +168,7 @@ export class MonViewComp extends CCComp { this.power_change(this.power_speed) } this.in_destroy(); - this.in_shield(); + this.in_shield(dt); this.in_stop(dt); this.in_atk(dt); this.move(dt); @@ -193,9 +191,12 @@ export class MonViewComp extends CCComp { // if(this.enemy){ // return // } - this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y, this.node.position.z); + this.set_diry() + this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z); } - move_to(){ + set_diry(){ + this.dir_y=-(this.node.position.y-BoxSet.GAME_LINE)/60 + } move_to(){ var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); move.target = v3(smc.Role.RoleView.node.position.x+10,smc.Role.RoleView.node.position.y); move.node = this.node; @@ -241,8 +242,8 @@ export class MonViewComp extends CCComp { },0.5) this.power = 0 } - let power_progress= this.power/this.power_max; - this.node.getChildByName("top").getChildByName("power").getComponent(ProgressBar)!.progress = power_progress; + // let power_progress= this.power/this.power_max; + // this.node.getChildByName("top").getChildByName("power").getComponent(ProgressBar)!.progress = power_progress; } shoot(skill_uuid:number){ // console.log("mon shoot"); @@ -309,16 +310,7 @@ export class MonViewComp extends CCComp { this.atk_time += dt; } } - in_shield(){ - let shield_progress= this.shield/this.shield_max; - this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress; - // if(this.shield <= 0){ - // this.node.getChildByName("shield").active=false - // }else{ - // this.node.getChildByName("shield").active=true - - // } - } + hp_change(hp: number){ if(this.is_dead){ return; @@ -353,10 +345,36 @@ export class MonViewComp extends CCComp { } add_hp(hp: number=0){ console.log("hero 加血动画"); + this.hp+=hp; + if(this.hp > this.hp_max){ + this.hp = this.hp_max; + } this.tooltip(2,hp.toString()); let hp_progress= this.hp/this.hp_max; this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; } + add_atk(atk: number,time:number=0){ + if(time > 0){ + let buff={atk:atk,time:time} + this.buff_atks.push(buff); + }else{ + this.atk += atk; + } + } + check_buff_atks(dt: number){ + for(let i=0;i 0)this.atk -= buff.atk; + this.buff_atks.splice(i,1); + } + } + } + add_shield(shield: number,time:number=0){ + this.shield =this.shield_max=shield + this.shield_time = time; + } shield_change(hp: number){ let ls=this.shield - hp; if(ls <= 0){ @@ -367,6 +385,27 @@ export class MonViewComp extends CCComp { return 0; } } + in_shield(dt){ + if(this.shield_time <= 0){ + return + } + if(this.shield_time > 0){ + this.shield_time -= dt; + if(this.shield_time <= 0){ + this.shield_time = 0; + this.shield = this.shield_max=0; + // this.node.getChildByName("top").getChildByName("shield").active=false + } + // let shield_progress= this.shield/this.shield_max; + // this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress; + } + if(this.shield <= 0){ + this.shield_time=0 + // this.node.getChildByName("top").getChildByName("shield").active=false + }else{ + // this.node.getChildByName("top").getChildByName("shield").active=true + } + } tooltip(type:number=1,value:string="",s_uuid:number=1001){ // console.log("tooltip",type); let tip =ecs.getEntity(Tooltip); @@ -401,23 +440,12 @@ export class MonViewComp extends CCComp { // } } - in_atked() { - if(this.is_role){ - var path = "game/skills/atked"; - var prefab: Prefab = oops.res.get(path, Prefab)!; - var node = instantiate(prefab); - let pos = v3(0,60) - node.setPosition(pos) - node.parent = this.node; + in_atked() { + this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); + this.scheduleOnce(() => { + this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); + }, 0.1); - }else{ - this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); - this.scheduleOnce(() => { - this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); - }, 0.1); - } - - } dead(){ var path = "game/skills/dead"; diff --git a/assets/script/game/skills/TooltipCom.ts b/assets/script/game/skills/TooltipCom.ts index 721775e3..cc95156d 100644 --- a/assets/script/game/skills/TooltipCom.ts +++ b/assets/script/game/skills/TooltipCom.ts @@ -21,7 +21,7 @@ export class TooltipCom extends CCComp { value:string = ""; s_uuid:number = 1001; alive_time:number = 1; - skill_name_time=1; + skill_name_time=0.5; start() { this.node.getChildByName("loss_life").active=false; this.node.getChildByName("add_life").active=false @@ -56,6 +56,7 @@ export class TooltipCom extends CCComp { this.node.getChildByName("skill").getChildByName("name").getComponent(Label).string = smc.skills[this.s_uuid].name; this.node.getChildByName("skill").active=true; + this.node.setPosition(v3(this.node.position.x,this.node.position.y+60)) // this.alive_time = 2 tween(this.node).to( this.alive_time,