Browse Source

漏传了一些东西

HY-LSZNWIN10\Administrator 2 weeks ago
parent
commit
3d35dfcc29

+ 5 - 142
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -91,7 +91,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   attackerID: 0
   curX: 0
 --- !u!114 &7946576076600575026
@@ -1080,7 +1080,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -1161,7 +1161,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
 --- !u!1 &6911591061214860228
 GameObject:
   m_ObjectHideFlags: 0
@@ -1236,7 +1236,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492983f5b77df7e4b82cba32bc74fb94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   hitRate: 1
   isDemSummon: 0
 --- !u!1 &7414577738945366659
@@ -1443,7 +1443,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8639832132491289354}
-  - component: {fileID: 8639832132491289351}
   - component: {fileID: 6714591057465281647}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 6589564398742701796}
@@ -1474,142 +1473,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8639832132491289351
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rb: {fileID: 8639832132491289349}
-  bodyTrans: {fileID: 5769591908339262981}
-  beSearchTrigger: {fileID: 316813748882225178}
-  searchTrigger: {fileID: 3566347593191160092}
-  bodyCollider: {fileID: 2616922587087395095}
-  uiHp: {fileID: 3586716274361854270}
-  beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 6589564398742701796}
-  platform: {fileID: 0}
-  mecanim: {fileID: 3354085511906294621}
-  meshRenderer: {fileID: 0}
-  ani: {fileID: 5978259926173120695}
-  totalDieKeepTime: 1
-  showInjuryNum: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
-  injuryNumPos_summon: {x: 0, y: 1}
-  injuryNumRandom_summon: {x: 1, y: 1}
-  injuryNumPos_march: {x: 0, y: 1}
-  injuryNumRandom_march: {x: 2, y: 2}
-  dieKeepTime: 0
-  beHitDistance: 0.1
-  attackDis: 0
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 0
-  totalHp: 10
-  hp: 0
-  regenerationTime: 0
-  canFly: 1
-  canControlFly: 0
-  nowCanFly: 0
-  canNotShotDown: 1
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  isDie: 0
-  isRevive: 0
-  invincibleTime: 0
-  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  hitResistance: 0
-  bc: {fileID: 0}
-  foot: {fileID: 8639832132450015562}
-  attributeStatus: {fileID: 0}
-  hitFeedbackSystem: {fileID: 0}
-  spineEvent: {fileID: 0}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  extraGroundGravity: -28.8
-  velocityAddition: 0
-  platformPosY: 0
-  platformRotZ: 0
-  RotLerpSpeed: 0.6
-  RotLerpTime: 0
-  needToAdjustFlyHeight: 1
-  flyHeight: 0
-  maxFlyHeight: 9
-  minFlyHeight: 5
-  flyUpTime: 0.241
-  isAdjustHeight: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: b634d447d9a02a14abc964532eedfc35, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: 916bb121eaeae3b43914636f946abdcd, type: 2}
-  moveSpeed: 5
-  moveSpeedScale: 1
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 0}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  killer: {fileID: 0}
-  isFrozen: 0
-  isElectrify: 0
-  electrifyEffect: {fileID: 0}
-  isOnFire: 0
-  fireStacks: 0
-  searchState: 0
-  bigSoldier: {fileID: 8684670505913003432}
-  dragonTrigger: {fileID: 4619289108872985744}
-  myName: "\u98DE\u5251"
-  summonEndToDie: 0
-  canSizeChange: 0
-  ignoresOnState: 0
-  soldierType: 0
-  player: {fileID: 0}
-  playerID: 0
-  id: 0
-  costMp: 50
-  isBack: 0
-  baseSortingOrder: 8000
-  runSpeed: 0
-  demoicTags: 5
-  ownDamageScale: 0
-  isReturnSoulTower: 0
-  origSoulPos: {x: 0, y: 0, z: 0}
-  isRecorded: 0
-  adsorbSpeed: 0
-  adsorbTarget: {x: 0, y: 0, z: 0}
-  effectPrefab: {fileID: 0}
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 60
 --- !u!114 &6714591057465281647
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2382,7 +2245,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8562f76ec9f88004b9eade117489ef49, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  demonic: {fileID: 8639832132491289351}
+  demonic: {fileID: 6714591057465281647}
   stageSize:
   - 1.5
   - 2

+ 3 - 1
ActionTowerDefense/Assets/Scripts/Characters/DemonicArrow.cs

@@ -1,12 +1,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Sirenix.OdinInspector;
 
 public class DemonicArrow : Demonic
 {
+    [LabelText("ÉÁ±ÜתÉ˺¦±¶ÂÊ")] public float scale = 2;
     public override void AfterInit()
     {
         base.AfterInit();
-        ownDamageScale += attributeStatus.resistances.dodge * 2;
+        ownDamageScale += (int)(attributeStatus.resistances.dodge * scale);
     }
 }

+ 3 - 1
ActionTowerDefense/Assets/Scripts/Characters/DemonicGiant.cs

@@ -1,9 +1,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Sirenix.OdinInspector;
 
 public class DemonicGiant : Demonic
 {
+    [LabelText("ÉúÃüתÉ˺¦±¶ÂÊ")] public float scale = 0.2f; 
     //public BuffAura ba;
 
     //public override void Attack_summon()
@@ -20,7 +22,7 @@ public class DemonicGiant : Demonic
     public override void AfterInit()
     {
         base.AfterInit();
-        ownDamageScale += (int)(GameManager.instance.totalHp / 10f);
+        ownDamageScale += (int)(GameManager.instance.totalHp * scale);
         //if (GameManager.instance.demonicAttributes[id].trigger0)
         //{
         //    ownDamageScale += attributeStatus.resistances.armor * 5;

+ 4 - 2
ActionTowerDefense/Assets/Scripts/Characters/DemonicSword.cs

@@ -1,21 +1,23 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Sirenix.OdinInspector;
 
 public class DemonicSword : Demonic
 {
+    [LabelText("³õʼ±©»÷É˺¦")] public int scale = 50;
     public override void AfterInit()
     {
         base.AfterInit();
         for (int i = 0; i < attackController.attackMethod_summon.Length; i++)
         {
             AttackInfo attackInfo = attackController.attackMethod_summon[i].attackInfo;
-            attackInfo.criticalStrikeEffect += 50;
+            attackInfo.criticalStrikeEffect += scale;
         }
         for (int i = 0; i < attackController.attackMethod_march.Length; i++)
         {
             AttackInfo attackInfo = attackController.attackMethod_march[i].attackInfo;
-            attackInfo.criticalStrikeEffect += 50;
+            attackInfo.criticalStrikeEffect += scale;
         }
     }
 }

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

@@ -301,7 +301,7 @@ public class MoveCharacter : Character
             return;
         }
 
-        if (Random.Range(0, 100) < attributeStatus.resistances.dodge && attackFrom.CompareTag("Demonic") || attackFrom.CompareTag("Player"))
+        if (Random.Range(0, 100) < attributeStatus.resistances.dodge && CompareTag("Demonic"))
         {
             GameObject missTxt = PoolManager.Instantiate(injuryNumTextSummon);
             missTxt.transform.position = new Vector3(