Browse Source

双人初始出生点以及外貌

LAPTOP-OM1V99U2\永远de小亡灵 1 năm trước cách đây
mục cha
commit
6091626b53

+ 13 - 0
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -829,6 +829,12 @@ MonoBehaviour:
   minHurtKeepTime: 0.2
   hurtKeepTime: 0
   hurtChangeVelocity: 1
+  maxSpeed: 10
+  minSpeed: 2
+  height: 8
+  maxRotateSpeed: 10
+  minRotateSpeed: 4
+  floatTime: 5
   demonicPrefabs:
   - {fileID: 8639832132491289359, guid: 4c2987691cdb47040b3a55ff928803c3, type: 3}
   - {fileID: 5440846222648032759, guid: 05825e721b2832f478f66e78daed901f, type: 3}
@@ -881,6 +887,13 @@ MonoBehaviour:
   isClickBtnWest: 0
   isClickBtnNorth: 0
   isKeepBtnNorth: 0
+  leftDir: {x: 0, y: 0}
+  playerId: 0
+  skeletonMecanim: {fileID: 6843453365888964567}
+  playerSpine:
+  - {fileID: 11400000, guid: a1915b92abea4a049a4d50b2ebd53111, type: 2}
+  - {fileID: 11400000, guid: b8dcb564f1b91234588d66173ce4064e, type: 2}
+  LBisHold: 0
 --- !u!54 &3571941038519084339
 Rigidbody:
   m_ObjectHideFlags: 0

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/player2.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3ed5a2e13c1f244c9595512e559c2be
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 65 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.atlas.txt

@@ -0,0 +1,65 @@
+king_deil_player2.png
+size:1008,784
+filter:Linear,Linear
+pma:true
+scale:0.9
+X
+bounds:950,331,48,77
+arm1
+bounds:803,4,63,166
+offsets:0,1,63,167
+arm2
+bounds:803,172,86,182
+rotate:90
+blade_0004
+bounds:311,36,204,131
+offsets:20,11,230,230
+rotate:90
+body
+bounds:546,2,71,112
+offsets:0,0,72,113
+cloat
+bounds:2,242,445,540
+cloat2
+bounds:449,286,293,496
+eye1
+bounds:950,410,54,64
+offsets:3,4,60,72
+face
+bounds:744,476,254,306
+fire1
+bounds:744,270,103,194
+offsets:0,5,115,230
+rotate:90
+fire2
+bounds:444,36,100,204
+offsets:1,5,115,230
+fire3
+bounds:744,375,99,204
+offsets:2,5,115,230
+rotate:90
+fire4
+bounds:106,29,101,211
+offsets:3,6,115,230
+fire5
+bounds:2,29,102,211
+offsets:3,7,115,230
+fire6
+bounds:209,34,100,206
+offsets:2,6,115,230
+gun
+bounds:868,6,164,86
+offsets:15,14,188,107
+rotate:90
+hand
+bounds:940,260,69,66
+offsets:1,1,71,67
+rotate:90
+head1
+bounds:546,116,168,184
+offsets:1,2,170,187
+rotate:90
+leg1
+bounds:619,14,100,182
+offsets:0,0,100,183
+rotate:90

+ 7 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.atlas.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6149f9f0edc6d5641aa777d84ee17613
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.json


+ 7 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bdd8547839de70e44a83dc143b209306
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.png


+ 123 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 000e3223eb219d44f88236483c4df150
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 19 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_Atlas.asset

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: king_deil_player2_Atlas
+  m_EditorClassIdentifier: 
+  textureLoadingMode: 0
+  onDemandTextureLoader: {fileID: 0}
+  atlasFile: {fileID: 4900000, guid: 6149f9f0edc6d5641aa777d84ee17613, type: 3}
+  materials:
+  - {fileID: 2100000, guid: a99d08a53232874468b3b4b943cb5ff6, type: 2}

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_Atlas.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 738122754597fdc4bb54dc517a5a694d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 43 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_Material.mat

@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: king_deil_player2_Material
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 000e3223eb219d44f88236483c4df150, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_Material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a99d08a53232874468b3b4b943cb5ff6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 31 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_SkeletonData.asset

@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: king_deil_player2_SkeletonData
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 738122754597fdc4bb54dc517a5a694d, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: bdd8547839de70e44a83dc143b209306, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 1
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

+ 8 - 0
ActionTowerDefense/Assets/Resources/Spine/player2/king_deil_player2_SkeletonData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8dcb564f1b91234588d66173ce4064e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 18 - 10
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -170,9 +170,11 @@ public class PlayerController : MoveCharacter
     }
     [HideInInspector]
     public bool isKeepBtnNorth;
+    [HideInInspector]
     public Vector2 leftDir;
-
-
+    public int playerId;
+    public SkeletonMecanim skeletonMecanim;
+    public SkeletonDataAsset[] playerSpine;
     //public Vector2 leftDir
     //{
     //    get
@@ -208,7 +210,19 @@ public class PlayerController : MoveCharacter
 
     private void Awake()
     {
-        transform.position = new Vector3(144, 0, 0);
+        PlayerInput playerInput = transform.GetComponent<PlayerInput>();
+        playerId = playerInput.playerIndex;
+        if (playerId == 0)
+        {
+            transform.position = new Vector3(142, 0, 0);
+            skeletonMecanim.skeletonDataAsset = playerSpine[0];
+        }
+        else
+        {
+            transform.position = new Vector3(146, 0, 0);
+            skeletonMecanim.skeletonDataAsset = playerSpine[1];
+        }
+        
         if (!PlayersInput.instance[0])
         {
             PlayersInput.instance[0] = this;
@@ -258,11 +272,6 @@ public class PlayerController : MoveCharacter
         {
             isKeepBtnRush = true;
         }
-
-        if (foot.TrigGround)
-        {
-            isUp = 0;
-        }
     }
     
 
@@ -277,9 +286,9 @@ public class PlayerController : MoveCharacter
         LBisHold = false;
     }
     //ÊÖ±ú°´ÏÂLB
+    [HideInInspector]
     public bool LBisHold;
     //¶ÁÈ¡ÊÖ±ú²ÎÊý
-    public int isUp; 
     private void OnMove(InputValue value)
     {
         leftDir = value.Get<Vector2>();
@@ -308,7 +317,6 @@ public class PlayerController : MoveCharacter
 
     public void AirJump()
     {
-        print("airjump");
         SetUpSpeed(airJumpSpeed);
         ani.Play("jump", 0, 0);
     }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác