From 34cb342fd287b318047e92073eef2af5c134eeb5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-DDTRVOR\\asus" <1162187704@qq.com> Date: Sun, 22 Dec 2024 20:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Blacksmith/Assets/Pack/spine/player.meta | 8 + .../Pack/spine/player/tj_hero_1.atlas.txt | 62 +++++++ .../spine/player/tj_hero_1.atlas.txt.meta | 7 + .../Assets/Pack/spine/player/tj_hero_1.png | Bin 0 -> 13557 bytes .../Pack/spine/player/tj_hero_1.png.meta | 153 ++++++++++++++++++ .../Pack/spine/player/tj_hero_1.skel.bytes | Bin 0 -> 23116 bytes .../spine/player/tj_hero_1.skel.bytes.meta | 7 + .../Pack/spine/player/tj_hero_1_Atlas.asset | 19 +++ .../spine/player/tj_hero_1_Atlas.asset.meta | 8 + .../Pack/spine/player/tj_hero_1_Material.mat | 47 ++++++ .../spine/player/tj_hero_1_Material.mat.meta | 8 + .../spine/player/tj_hero_1_SkeletonData.asset | 31 ++++ .../player/tj_hero_1_SkeletonData.asset.meta | 8 + .../Resources/Prefab/player/player.prefab | 135 +++++++++++++++- .../Assets/Script/Battle/BattleManager.cs | 13 +- .../Assets/Script/Battle/BattleManager.cs.rej | 24 +++ .../Script/Battle/BattleManager.cs.rej.meta | 7 + .../Assets/Script/Battle/Player/PlayerItem.cs | 51 ++++++ Blacksmith/Assets/Script/PrefabPool.cs | 19 +++ Blacksmith/Assets/Script/PrefabPool.cs.rej | 28 ++++ .../Assets/Script/PrefabPool.cs.rej.meta | 7 + 21 files changed, 633 insertions(+), 9 deletions(-) create mode 100644 Blacksmith/Assets/Pack/spine/player.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.png create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.png.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.skel.bytes create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1.skel.bytes.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_Atlas.asset create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_Atlas.asset.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_Material.mat create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_Material.mat.meta create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_SkeletonData.asset create mode 100644 Blacksmith/Assets/Pack/spine/player/tj_hero_1_SkeletonData.asset.meta create mode 100644 Blacksmith/Assets/Script/Battle/BattleManager.cs.rej create mode 100644 Blacksmith/Assets/Script/Battle/BattleManager.cs.rej.meta create mode 100644 Blacksmith/Assets/Script/PrefabPool.cs.rej create mode 100644 Blacksmith/Assets/Script/PrefabPool.cs.rej.meta diff --git a/Blacksmith/Assets/Pack/spine/player.meta b/Blacksmith/Assets/Pack/spine/player.meta new file mode 100644 index 00000000..275f04c6 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82f3ff56d3a3784478958bb0d726e26c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt new file mode 100644 index 00000000..33f42c81 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt @@ -0,0 +1,62 @@ +tj_hero_1.png + size: 256, 256 + filter: Linear, Linear + pma: true +mod_1/Down_syndrome_a_01 + bounds: 96, 232, 24, 22 + offsets: 0, 1, 24, 23 +mod_1/Down_syndrome_a_02 + bounds: 96, 122, 22, 21 + offsets: 1, 0, 30, 21 +mod_1/Down_syndrome_a_04 + bounds: 188, 162, 66, 83 + offsets: 1, 0, 68, 83 + rotate: 180 +mod_1/Down_syndrome_a_05 + bounds: 2, 121, 57, 32 + rotate: 90 +mod_1/Down_syndrome_a_06 + bounds: 181, 222, 25, 32 +mod_1/Down_syndrome_a_07 + bounds: 73, 112, 24, 31 + offsets: 0, 1, 24, 32 +mod_2/Down_syndrome_b_01 + bounds: 2, 199, 17, 24 + offsets: 0, 1, 17, 25 +mod_2/Down_syndrome_b_02 + bounds: 234, 228, 18, 26 + offsets: 0, 0, 22, 26 +mod_2/Down_syndrome_b_03 + bounds: 107, 179, 92, 75 + offsets: 0, 0, 96, 75 +mod_2/Down_syndrome_b_04 + bounds: 44, 144, 77, 57 + offsets: 1, 0, 86, 61 + rotate: 180 +mod_2/Down_syndrome_b_05 + bounds: 2, 184, 19, 13 + offsets: 1, 3, 21, 17 +mod_2/Down_syndrome_b_06 + bounds: 202, 148, 18, 13 + offsets: 1, 1, 20, 15 +mod_2/Down_syndrome_b_07 + bounds: 183, 121, 31, 14 +mod_2/Down_syndrome_b_08 + bounds: 118, 122, 31, 14 +mod_3/Down_syndrome_c_01 + bounds: 2, 177, 105, 77 +mod_3/Down_syndrome_c_02 + bounds: 214, 108, 55, 40 + offsets: 0, 0, 55, 41 + rotate: 270 +mod_3/Down_syndrome_c_03 + bounds: 130, 135, 79, 50 + offsets: 0, 0, 80, 50 + rotate: 180 +mod_3/Down_syndrome_c_04 + bounds: 36, 109, 36, 34 + offsets: 0, 7, 36, 41 +mod_3/Down_syndrome_c_05 + bounds: 109, 148, 38, 38 + offsets: 0, 8, 41, 46 + rotate: 90 diff --git a/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt.meta b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt.meta new file mode 100644 index 00000000..0c7e35ce --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a0b745f2cddc2c468a7d0d72a68bc24 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/player/tj_hero_1.png b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8256cc6f59dac7b3aee9bbf5e8ff0b6aff41badf GIT binary patch literal 13557 zcma)C5vjh>F%zj8<9q&q(eedYL_liq$DI&N=jOCB~(NZ9zeR3E(vMa zef<;O`(^IjPjhGH{_dPJC&|cAi3T_L271*fPU1FJBvwBtQ3 z6%CVD;_8v2O0Htc{>-v*nuZTK#jNFJq;`A!Jx%nL4N^T!6_O*}#U-Tnv(y$-R1WH6 zCOgU{5fowjQv&Fyk%_XEgH7Nq5jGtYC$S;Upnf9SJX;K z+RoIY)7sgeTdzRtzMXvRnWIJB zzAnyvatlD0e3}kPDKPixQ#Z^I)u}LWdCKNCWfw7hTdzvUu)flgJNKo;dw=uv8q6KT zLK(}C$#0uu^4{~Ql+;zET8I3&C6UGJ^0lOPuE||o~85?QH&j^=S*6;kJ-Wh8bswd$bnJ>mE zNN+R7@$FCJkBy6on0H0-J0(wM3hYB)*3jQ?rjSVb<}1cv)$4_7%6T_7fmX^?VQR|? zU%x6%syn~MA2R&Y$UA%0+9S(Qh>tqwlde^)jB;C5lvjW_BirsdS4hhAy2sang3Swb zRi(u6*0q1yz~x}sRd=TA)(Km50l8h|&9HZP$?m}u>fe8F^546)_4*@To)uo*{6z&z z|EmG#0AoWFK!l}MW#W;zkG;YAVq@&zKfGSR4qeXYcw*0Xo?x?YE>EsLVsCPvEk|8< zN3=IwbzfvJW6#e^u-NSDi?gxoF)a3Gf4=^DXS}Hzi#^|6`@JyRdwo3d^#k@h_HuH3 zY!*B0;Ag1|fT*&Lx{7JY?CwODZl4i|U&&bKV4}Xx&7_J$syyUdhxS)8$(_fjw&FAT z<9RO-y-VX9_iK=*@YV0oY1dA$)h0NL=4Q}%cuOSijBWh3>LU3Q_`fv%FIz_4j_3X6 zoNVxD>0Ga8Rfl|FU8Hs~%lIs)GC%0DWty76r;@1epjW_ed}wMQ@aBirsp(5eTj!gt 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 S(-H*!nU02`dabH`^#1@~0{E-| literal 0 HcmV?d00001 diff --git a/Blacksmith/Assets/Pack/spine/player/tj_hero_1.png.meta b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.png.meta new file mode 100644 index 00000000..1876d9b6 --- /dev/null +++ b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: e0ca814bbf042854e96e49b63e1ccf14 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Pack/spine/player/tj_hero_1.skel.bytes b/Blacksmith/Assets/Pack/spine/player/tj_hero_1.skel.bytes new file mode 100644 index 0000000000000000000000000000000000000000..e5b6187c06805623e2eb6bb7398e316d34e27f60 GIT binary patch literal 23116 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 qci;Y=Xm+;nN1`jH4 + PrefabPool.ins.LoadObj("Prefab/player/player",index, (GameObject obj,int idex) => { - obj.transform.parent = playerParent[index]; + obj.transform.parent = playerParent[idex]; obj.transform.localPosition=Vector3.zero; - playerItems[index] = new PlayerRunState(); - playerItems[index].player = obj.GetComponent(); - playerItems[index].equipent = BattleEquipments[index]; - playerItems[index].RestState(); + playerItems[idex] = new PlayerRunState(); + playerItems[idex].player = obj.GetComponent(); + playerItems[idex].equipent = BattleEquipments[idex]; + playerItems[idex].RestState(); + playerItems[idex].player.SetModel(idex+1); }); } diff --git a/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej b/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej new file mode 100644 index 00000000..c3901b81 --- /dev/null +++ b/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej @@ -0,0 +1,24 @@ +diff a/Blacksmith/Assets/Script/Battle/BattleManager.cs b/Blacksmith/Assets/Script/Battle/BattleManager.cs (rejected hunks) +@@ -295,15 +295,15 @@ + var index = i; + if (BattleEquipments[i].EquipmentLock) + { +- PrefabPool.ins.LoadObj("Prefab/player/player", (GameObject obj) => ++ PrefabPool.ins.LoadObj("Prefab/player/player",index, (GameObject obj,int idex) => + { +- obj.transform.parent = playerParent[index]; ++ obj.transform.parent = playerParent[idex]; + obj.transform.localPosition=Vector3.zero; +- playerItems[index] = new PlayerRunState(); +- playerItems[index].player = obj.GetComponent(); +- playerItems[index].equipent = BattleEquipments[index]; +- playerItems[index].RestState(); +- ++ playerItems[idex] = new PlayerRunState(); ++ playerItems[idex].player = obj.GetComponent(); ++ playerItems[idex].equipent = BattleEquipments[idex]; ++ playerItems[idex].RestState(); ++ playerItems[idex].player.SetModel(idex+1); + }); + } + } diff --git a/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej.meta b/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej.meta new file mode 100644 index 00000000..63041640 --- /dev/null +++ b/Blacksmith/Assets/Script/Battle/BattleManager.cs.rej.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97b74a549b99c204480a3dffcd22dc98 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs b/Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs index 86410f61..a7682f26 100644 --- a/Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs +++ b/Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using cfg.BlacksmithData; +using Spine.Unity; using UnityEngine; using Random = UnityEngine.Random; using Vector3 = System.Numerics.Vector3; @@ -11,12 +12,56 @@ using Vector3 = System.Numerics.Vector3; /// public class PlayerItem : MonoBehaviour { + [SerializeField] private SkeletonAnimation spine; private BattleEquipment _battleEquipment; [SerializeField] private List _gameObjects = new List(); + + public playerAniType Type + { + get + { + return _type; + } + set + { + if (_type!=value) + { + _type = value; + switch (_type) + { + case playerAniType.play: + spine.state.SetAnimation(0, "attack_3", true); + break; + case playerAniType.wait: + spine.state.SetAnimation(0, "idle_3", true); + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + } + } + private playerAniType _type = playerAniType.wait; + public void SetModel(int i) + { + spine.Skeleton.SetSkin("mod_"+i); + spine.Skeleton.SetSlotsToSetupPose(); + } public void SetData(BattleEquipment battleData) { + switch (_type) + { + case playerAniType.play: + spine.state.SetAnimation(0, "attack_3", true); + break; + case playerAniType.wait: + spine.state.SetAnimation(0, "idle_3", true); + break; + default: + throw new ArgumentOutOfRangeException(); + } _battleEquipment = battleData; if (_battleEquipment.Weapon!=null) { @@ -61,3 +106,9 @@ public class PlayerItem : MonoBehaviour } } + +public enum playerAniType +{ + play, + wait +} \ No newline at end of file diff --git a/Blacksmith/Assets/Script/PrefabPool.cs b/Blacksmith/Assets/Script/PrefabPool.cs index c4b19482..45b18df8 100644 --- a/Blacksmith/Assets/Script/PrefabPool.cs +++ b/Blacksmith/Assets/Script/PrefabPool.cs @@ -49,7 +49,26 @@ public class PrefabPool : MonoBehaviour } }); } + public void LoadObj(string key,int i,Action action) + { + //如果池中没有该游戏物体或者游戏物体的队列中已经没有剩余的游戏对象时。 + //在这种情况下需要实例化一个新的物体，然后在判断是否需要在池中新加一个健值对还是直接放入队列中去 + //然后把新生成的放入池中。 + + if (!objDic.ContainsKey(key)||objDic[key].Count==0) { + AssetBundleManager.ins.LoadAsset(key, (GameObject obj) => + { + obj.name = key; + obj.SetActive(true); + action.Invoke(obj,i); + }); + return; + } + var obj = objDic[key].Dequeue(); + obj.SetActive(true); + action.Invoke(obj,i); + } public void RecycleObj(GameObject obj) { //由于生成的预制体的name后面都会加上（Clone），所以我们需要将其去除 diff --git a/Blacksmith/Assets/Script/PrefabPool.cs.rej b/Blacksmith/Assets/Script/PrefabPool.cs.rej new file mode 100644 index 00000000..c49779a7 --- /dev/null +++ b/Blacksmith/Assets/Script/PrefabPool.cs.rej @@ -0,0 +1,28 @@ +diff a/Blacksmith/Assets/Script/PrefabPool.cs b/Blacksmith/Assets/Script/PrefabPool.cs (rejected hunks) +@@ -34,6 +34,26 @@ + obj.SetActive(true); + action.Invoke(obj); + } ++ public void LoadObj(string key,int i,Action action) ++ { ++ //如果池中没有该游戏物体或者游戏物体的队列中已经没有剩余的游戏对象时。 ++ //在这种情况下需要实例化一个新的物体，然后在判断是否需要在池中新加一个健值对还是直接放入队列中去 ++ //然后把新生成的放入池中。 ++ ++ if (!objDic.ContainsKey(key)||objDic[key].Count==0) { ++ AssetBundleManager.ins.LoadAsset(key, (GameObject obj) => ++ { ++ obj.name = key; ++ obj.SetActive(true); ++ action.Invoke(obj,i); ++ }); ++ return; ++ } ++ ++ var obj = objDic[key].Dequeue(); ++ obj.SetActive(true); ++ action.Invoke(obj,i); ++ } + + public void AddPond(string key,int num) + { diff --git a/Blacksmith/Assets/Script/PrefabPool.cs.rej.meta b/Blacksmith/Assets/Script/PrefabPool.cs.rej.meta new file mode 100644 index 00000000..669178af --- /dev/null +++ b/Blacksmith/Assets/Script/PrefabPool.cs.rej.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f167b224892e7e34aad7ca52a0bcc83e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: