Merge branch 'master' of http://fort23.cn:3000/fort23/XY001

Assets/Res/HeroAnimtion/Hero01_library.asset

@@ -168,6 +168,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 0791e523b7f1b2740a3b1cde42b6aeac, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-1984665127228597385
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01_Stay_SwordAndShield
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714755
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714755
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 0e112f1584fcccd4face09e3b7156832, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-1093939256595028265
 MonoBehaviour:
   m_ObjectHideFlags: 17
@@ -205,6 +233,9 @@ MonoBehaviour:
     - {fileID: -3110653298159896961}
     - {fileID: -7492277400977875935}
     - {fileID: -6088646584569579690}
+    - {fileID: 723220657297123379}
+    - {fileID: -1984665127228597385}
+    - {fileID: 8824324649147237955}
     _Modifiers:
     - _From: 0
       _To: 5
@@ -232,6 +263,34 @@ MonoBehaviour:
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
+--- !u!114 &723220657297123379
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01_SwordAndShield
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714754
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714754
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 5940bb0b55717a746bbbe4d3e47e7e39, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &4132149882535381313
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -316,3 +375,31 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 8283fadf2c89507469495f30db8680db, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &8824324649147237955
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: GetUp_SwordAndShield
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714756
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714756
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 4e1dc6b0156559b4ca64937d40514fb5, type: 3}
+        _NormalizedStartTime: NaN

Assets/Res/HeroAnimtion/Hero02_library.asset

@@ -154,6 +154,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 972a8dea6ffa7e3439eceb5bbb8091df, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-65799685497046678
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01Stay_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714758
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714758
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 58ce6fdbcc0a91b45826d8f7eb9a919d, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -174,6 +202,9 @@ MonoBehaviour:
     - {fileID: -2105887236420780568}
     - {fileID: -3877112560210374695}
     - {fileID: 3578840217490985036}
+    - {fileID: 2327916512474532429}
+    - {fileID: -65799685497046678}
+    - {fileID: 1802178590809212851}
     _Modifiers:
     - _From: 0
       _To: 2
@@ -195,6 +226,62 @@ MonoBehaviour:
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
+--- !u!114 &1802178590809212851
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: GetUp_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714759
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714759
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: c641f834dc6bd23488955fa9957071a3, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &2327916512474532429
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714757
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714757
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: e472c5e119271b44da44eab352a52e92, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &3578840217490985036
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/HeroAnimtion/Hero03_library.asset

@@ -28,6 +28,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: f8e3ccf20d4f8ab4fba19fa0469d4b4d, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-9056275484312783452
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: GetUp_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714762
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714762
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: c641f834dc6bd23488955fa9957071a3, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-8693759471711124066
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -56,6 +84,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 61b882f7d27344948b5ebcaa1c47a47c, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-5896870218776002402
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714760
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714760
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: e472c5e119271b44da44eab352a52e92, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-5827242348574449950
 MonoBehaviour:
   m_ObjectHideFlags: 17
@@ -118,6 +174,9 @@ MonoBehaviour:
     - {fileID: -5627690267219994143}
     - {fileID: -9192171538510261934}
     - {fileID: -8693759471711124066}
+    - {fileID: -5896870218776002402}
+    - {fileID: 3124886926350408519}
+    - {fileID: -9056275484312783452}
     _Modifiers:
     - _From: 0
       _To: 2
@@ -161,6 +220,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 6047a8bb25a95e74d8d687f84c41ede9, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &3124886926350408519
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01Stay_MagicWand
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714761
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714761
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 58ce6fdbcc0a91b45826d8f7eb9a919d, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &6688080069938604809
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/HeroAnimtion/Hero04_library.asset

@@ -1,5 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8049724655490830066
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01Stay_BowAndArrow
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714764
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714764
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 5a773821ca91c4f4b9c5de9cfc2d2d84, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-7675625571975765643
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -56,6 +84,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 7458aa17b3618764297dcd29b84d8cfb, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-5923635983850828682
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: GetUp_BowAndArrow
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714765
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714765
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: bd21b8e8272da5846ad0dfb71d2c8a97, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-5542219812724629070
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -84,6 +140,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: b9e421ece8412464dbc04308e708e50e, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-81037519900947732
+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: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: Die01_BowAndArrow
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 6156714879328714763
+  references:
+    version: 2
+    RefIds:
+    - rid: 6156714879328714763
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: f4bb47b742910624aa1db3ecdf7a1181, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -104,6 +188,9 @@ MonoBehaviour:
     - {fileID: 3263211012213732882}
     - {fileID: 6845602817871315611}
     - {fileID: 4211541484706168499}
+    - {fileID: -81037519900947732}
+    - {fileID: -8049724655490830066}
+    - {fileID: -5923635983850828682}
     _Modifiers:
     - _From: 0
       _To: 2

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -137,10 +137,10 @@ namespace GameLogic.Combat.CombatType
 
 
             List<string> allEquip = new List<string>();
-            for (int i = 0; i < 1; i++)
+            for (int i = 0; i < 10; i++)
             {
                 int odds = CombatCalculateTool.Instance.GetOdd();
-                if (odds < 10)
+                if (odds < 30)
                 {
                     allEquip.Add(equipName[CombatCalculateTool.Instance.GetOdd(0, equipName.Count)]);
                 }