Browse Source

修改怪物模型

DESKTOP-FB72PO8\Administrator 8 hours ago
parent
commit
5511589f74

+ 8 - 8
Assets/Res/Config/HeroModelConfig.json

@@ -63,7 +63,7 @@
       "nickName": -1,
       "name": 2,
       "headicon": "icon_tx1001",
-      "model": "Gw_Man",
+      "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 220,
@@ -179,7 +179,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1003",
-      "model": "Gw_Man",
+      "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 200,
@@ -237,7 +237,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1004",
-      "model": "Gw_Woman",
+      "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 240,
@@ -527,7 +527,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5001",
-      "model": "Gw_Man",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 286,
@@ -585,7 +585,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5002",
-      "model": "Gw_Man",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 234,
@@ -643,7 +643,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5003",
-      "model": "Gw_Woman",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 260,
@@ -701,7 +701,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5004",
-      "model": "Gw_Man",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 312,
@@ -759,7 +759,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5005",
-      "model": "Gw_Woman",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 208,

+ 19 - 16
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogicGroupBasic.cs

@@ -7,7 +7,8 @@ using UnityEngine;
 using Utility;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
-using Random = System.Random;
+using Random = UnityEngine.Random;
+
 
 namespace CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic
 {
@@ -76,20 +77,21 @@ namespace CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic
 
         public float SkillPreparationTime;
 
-        public Random Random
-        {
-            get
-            {
-                if (_random == null)
-                {
-                    _random = new Random((int)Time.time);
-                }
-
-                return _random;
-            }
-        }
-
-        private Random _random;
+        // public Random Random
+        // {
+        //     get
+        //     {
+        //         if (_random == null)
+        //         {
+        //            
+        //             _random = new Random((int)Time.time);
+        //         }
+        //
+        //         return _random;
+        //     }
+        // }
+        //
+        // private Random _random;
 
         private Map<int, Vector3> randomPos = new Map<int, Vector3>();
         // public void AddAssociationGroupBasics(TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic)
@@ -213,7 +215,8 @@ namespace CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic
                 (min, max) = (max, min);
             }
 
-            return Random.Next((int)(min * 100), (int)(max * 100)) / 100f;
+            
+            return Random.Range((int)(min * 100), (int)(max * 100)) / 100f;
         }
 
         /// <summary>

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -48,6 +48,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AQuaternion_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2008d2d6093f4149aaeafd5f414aa7a517c400_003Fe8_003F196a10dc_003FQuaternion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AQueue_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fb6_003F5769248b_003FQueue_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fe1_003Fdd575341_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F5e_003F47954b4f_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F9f_003F293a2b71_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARandom_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F4c_003Fb5eddf34_003FRandom_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AS2002_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa01b6d4ffd8a40da9aa90b33ff5055f23dc00_003Fce_003Fab212403_003FS2002_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>