Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/Character/Guaiwu/BeiHaiGui/Boss_BeiHaiGui.playable

@@ -119,6 +119,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -254,6 +255,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: 881613419088213694}
   - {fileID: 1228133446815200320}
   m_Clips: []
   m_Markers:
@@ -555,6 +557,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -807,6 +810,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -948,6 +952,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1181,6 +1186,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1268,13 +1274,14 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: -1
-    y: 1
+    x: -2
+    y: 2
   yoff:
-    x: 0
-    y: 1
+    x: -2
+    y: 2
   zoff:
     x: 0
     y: 1
@@ -1511,7 +1518,7 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 7377960909120119226}
+  m_Parent: {fileID: -6200623485216483768}
   m_Children: []
   m_Clips:
   - m_Version: 1
@@ -1757,16 +1764,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 1
-    y: -1
+    x: -2
+    y: 2
   yoff:
-    x: 1
-    y: 0
+    x: -2
+    y: 2
   zoff:
-    x: 0.5
-    y: 0
+    x: 0
+    y: 1
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2070,7 +2078,6 @@ MonoBehaviour:
   m_Children:
   - {fileID: -1457073455624008756}
   - {fileID: -8675259125427027619}
-  - {fileID: 881613419088213694}
   m_Clips: []
   m_Markers:
     m_Objects: []

Assets/Art/Character/Guaiwu/TreeBoss/Boss_Tree.playable

@@ -733,13 +733,13 @@ MonoBehaviour:
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 2
-    y: -2
+    x: 1
+    y: -1
   yoff:
-    x: 2
-    y: 0
+    x: 1
+    y: -1
   zoff:
-    x: 2
+    x: 1
     y: 0
   hitPointGroupName: 
   isGround: 0
@@ -776,7 +776,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.4
+    m_Start: 1.5
     m_ClipIn: 0
     m_Asset: {fileID: -3916580764650170293}
     m_Duration: 1
@@ -1173,7 +1173,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -1873,7 +1873,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}

Assets/Art/Character/Guaiwu/TreeBoss/smalltree/Boss_Tree_xiao.playable

@@ -376,7 +376,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -523,6 +523,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -810,16 +811,17 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 1
-    y: -1
+    x: 0.2
+    y: -0.2
   yoff:
-    x: 1
-    y: -1
+    x: 0.2
+    y: -0.2
   zoff:
     x: 1
-    y: -1
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0

Assets/Art/VFX/FXPrefabs/fx boss 9063 zd.prefab

@@ -14745,10 +14745,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.7
-  multipleTargetDelayTime: 0.2
+  delayTime: 0
+  multipleTargetDelayTime: 0.1
   hitFxName: fx boss 9063 hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0

Assets/Art/VFX/FXPrefabs/fx_boss 9023_zd.prefab

@@ -101,6 +101,7 @@ GameObject:
   - component: {fileID: 7631705833251191900}
   - component: {fileID: 8457976793867317183}
   - component: {fileID: 1124730764268920782}
+  - component: {fileID: 3913249063617437967}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_boss 9023_zd
@@ -5021,6 +5022,7 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.1
   hitFxName: fx_boss 9021_hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -5067,6 +5069,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!114 &3913249063617437967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2066468629973911024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfa417b106904e3fa8b8fdd30dfb0e38, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  delayTime: 0.5
 --- !u!1 &2838780130075249857
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_muci.prefab

@@ -19646,10 +19646,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.5
-  multipleTargetDelayTime: 0.2
+  delayTime: 0
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_muci_hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -19657,7 +19658,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 15
+  speed: 13
   roatRoot: {fileID: 0}
   raotIndex: 0
   parabolaCurveType: 2

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -651,7 +651,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 5355338081498464365}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -2.643743, g: -5.5874977, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scenes/testCombat.scene

@@ -2265,7 +2265,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 5001
+      value: 9004
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID

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>

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -170,9 +170,19 @@ namespace Fort23.Mono
             }
 
 
-            // energyWidget =
-            //     await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            // energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
+            return await base.AsyncInit(uiData);
+        }
+
+        public async override CTask Show()
+        {
+            await base.Show();
+            foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(sentimentEffectWidget);
+            }
+
+            sentimentEffectWidgets.Clear();
+
 
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
@@ -198,12 +208,6 @@ namespace Fort23.Mono
             }
 
 
-            return await base.AsyncInit(uiData);
-        }
-
-        public async override CTask Show()
-        {
-            await base.Show();
             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
             {
                 int level = sentimentEffectWidget.sentimentProperty.level <= 0 ? 1 : sentimentEffectWidget.sentimentProperty.level;

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

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>