Browse Source

修改bug

lzx 1 week ago
parent
commit
8754b52e28

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: 0.29740077
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5
     - _MaskSpeedU: 0.5

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.9497664
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.9028065
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _ColorMask: 0
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.20827067
+    - _Alpha: 0.2050029
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20219481
+    - _MainTexOffsetU: 0.20611608
     - _MainTexOffsetV: 0
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingU: 0.8
     - _MainTilingV: 1
     - _MainTilingV: 1

+ 2 - 2
Assets/Res/UI/HeroInformainPanel/DaoYouInvitePanel.prefab

@@ -319,7 +319,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.56999, y: -237.22296}
   m_AnchoredPosition: {x: -0.56999, y: -237.22296}
-  m_SizeDelta: {x: 664.15, y: 71.9107}
+  m_SizeDelta: {x: 664.15, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1362513949651933117
 --- !u!222 &1362513949651933117
 CanvasRenderer:
 CanvasRenderer:
@@ -372,7 +372,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 961340744379981622}
   m_Content: {fileID: 961340744379981622}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_Vertical: 1
   m_MovementType: 1
   m_MovementType: 1
   m_Elasticity: 0.1
   m_Elasticity: 0.1

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

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

+ 1 - 1
Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -121,7 +121,7 @@ namespace GameLogic.Hero
                     if (daolvSkill.type == 1)
                     if (daolvSkill.type == 1)
                     {
                     {
                         daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
                         daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
-                        if (daoLvBiData != null)
+                        if (daoLvBiData == null)
                         {
                         {
                             daoLvBiData = new DaoLVBiData();
                             daoLvBiData = new DaoLVBiData();
                             daoLvBiData.id = i1;
                             daoLvBiData.id = i1;

+ 1 - 1
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -66,7 +66,7 @@ namespace Fort23.Mono
                 {
                 {
                     DaoyouModelConfig daoyouModelConfig =
                     DaoyouModelConfig daoyouModelConfig =
                         ConfigComponent.Instance.Get<DaoyouModelConfig>(playerDataDaoYouData.id);
                         ConfigComponent.Instance.Get<DaoyouModelConfig>(playerDataDaoYouData.id);
-                    if (playerDataDaoYouData.favorabilityLv == -1 || playerDataDaoYouData.favorabilityLv < daoyouModelConfig.EmotionLvforQuest || !EventSystemManager.Instance.IsEventCompleted(daoyouModelConfig.EventCompleteforQuest))
+                    if (playerDataDaoYouData.favorabilityLv == -1 || playerDataDaoYouData.favorabilityLv < daoyouModelConfig.EmotionLvforQuest || !EventSystemManager.Instance.IsEventCompleted(daoyouModelConfig.QuestID))
                     {
                     {
                         continue;
                         continue;
                     }
                     }

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -87,6 +87,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATrailRenderer_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe4_003F6073d988_003FTrailRenderer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATrailRenderer_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe4_003F6073d988_003FTrailRenderer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F66_003F966ef437_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F66_003F966ef437_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe5_003Fc58fb33c_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe5_003Fc58fb33c_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AType_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fbe_003F26f5d741_003FType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUIVertex_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F99827ca3f9704445bee7a19d83c9a5a27c00_003F7d_003F478e3a8a_003FUIVertex_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUIVertex_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F99827ca3f9704445bee7a19d83c9a5a27c00_003F7d_003F478e3a8a_003FUIVertex_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUndo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fff_003Fe1991d08_003FUndo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUndo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fff_003Fe1991d08_003FUndo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUnityEvent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F71_003F77df5b6d_003FUnityEvent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUnityEvent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F71_003F77df5b6d_003FUnityEvent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>