lzx 1 giorno fa
parent
commit
2d8d911de3

+ 13 - 13
Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1817,7 +1817,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 40.885, y: -28.8}
-  m_SizeDelta: {x: 318.5276, y: 60.0177}
+  m_SizeDelta: {x: 0, y: 60.0177}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &864881423897064306
 CanvasRenderer:
@@ -2409,7 +2409,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -29.54004, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &3562994113173717176
 MonoBehaviour:
@@ -3239,7 +3239,7 @@ RectTransform:
   m_Father: {fileID: 6350789941309522625}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -5497,7 +5497,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5836252166898464303
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9799,7 +9799,7 @@ RectTransform:
   m_Father: {fileID: 1952845166686697092}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 25.2874, y: 5.2874}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -10775,7 +10775,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.x
@@ -10783,7 +10783,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.x
@@ -10823,11 +10823,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 239.2157
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -25.71575
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -10952,7 +10952,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.x
@@ -10960,7 +10960,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.x
@@ -11000,11 +11000,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 79.3119
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -25.71575
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 1 - 1
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -57,7 +57,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
     private CTask _cTask;
 
-    public long serverTime => TimeHelper.ServerNow();
+    public long serverTime => TimeHelper.ClientNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
 
     public AccountFileInfo.SmallPlacesData CurrentsmallPlaces

+ 2 - 2
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -54,8 +54,8 @@ namespace Fort23.Mono
                         return null;
                     }
 
-                    AccountFileInfo.Instance.playerData.todayTotalAds++;
-                    AccountFileInfo.Instance.SavePlayerData();
+                    // AccountFileInfo.Instance.playerData.todayTotalAds++;
+                    // AccountFileInfo.Instance.SavePlayerData();
                 }
 
                 if (!PlayerManager.Instance.BagController.IsEnough(23002, 1))

+ 5 - 3
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -368,7 +368,7 @@ namespace Fort23.Mono
                 }
 
                 taskAwaitBuffer.AddTask(cts2.WaitAll());
-                
+
                 Text_Desc3.gameObject.SetActive(true);
             }
             else
@@ -597,8 +597,10 @@ namespace Fort23.Mono
             if (widgetItem1 != null && daoyouGiftConfig.ID != 0)
             {
                 Text_GiveGiftDesc.text = LanguageManager.Instance.Text(10289, daoyouGiftConfig.emotionValue,
-                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] * 0.001,
-                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] * 0.001);
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] *
+                    PlayerManager.Instance.gameConstantConfig.daolvfavoratePara * 0.01f * 0.001,
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] *
+                    PlayerManager.Instance.gameConstantConfig.daolvfavoratePara * 0.01f * 0.001);
             }
             else if (widgetItem1 != null && daoyouGiftConfig.ID == 0)
             {

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -96,6 +96,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStyleSheet_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003Fcb_003Fe0e387fe_003FStyleSheet_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATaskStatus_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F39_003F7aac61ac_003FTaskStatus_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATextAsset_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F50_003F0344ee3c_003FTextAsset_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc97329dd3fa74b7aa23fdb625c1fe90446ac00_003F38_003Fcff38a89_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff0_003F199a436f_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc97329dd3fa74b7aa23fdb625c1fe90446ac00_003F52_003Ff694390e_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F3b_003F1a234af4_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>