Merge remote-tracking branch 'origin/master'

Assets/Editor/GameRuntimeConfigInspector.cs

@@ -25,6 +25,11 @@ namespace Fort23.Editor
                 // LogTool.Log("清理本地储存成功.");
                 AccountFileInfo.Instance.DeleteFile(AccountFileInfo.Instance.persistentDataPath);
             }
+            
+            if (GUILayout.Button("打开数据文件夹"))
+            {
+                Application.OpenURL(Application.persistentDataPath);
+            }
 
             // EditorUtility.SetDirty(runtimeConfig);
         }

Assets/Res/Config/EventConfig.json

@@ -23,9 +23,9 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -56,9 +56,9 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -89,9 +89,9 @@
       "PrizeNums": [
         -6000,
         -5000,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -122,9 +122,9 @@
       "PrizeNums": [
         -6000,
         -3000,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -155,9 +155,9 @@
       "PrizeNums": [
         -6000,
         -3000,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -188,7 +188,7 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -221,9 +221,9 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -254,7 +254,7 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -287,7 +287,7 @@
       "PrizeNums": [
         -6000,
         1,
-        -3000
+        -2000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -320,9 +320,9 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -353,9 +353,9 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -386,9 +386,9 @@
       "PrizeNums": [
         -9000,
         -7500,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -419,9 +419,9 @@
       "PrizeNums": [
         -9000,
         -4000,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -452,9 +452,9 @@
       "PrizeNums": [
         -9000,
         -4000,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -485,7 +485,7 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -518,9 +518,9 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -551,7 +551,7 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -584,7 +584,7 @@
       "PrizeNums": [
         -9000,
         1,
-        -4000
+        -3000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -617,9 +617,9 @@
       "PrizeNums": [
         -12000,
         1,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -650,9 +650,9 @@
       "PrizeNums": [
         -12000,
         1,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -683,9 +683,9 @@
       "PrizeNums": [
         -12000,
         -10000,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -716,9 +716,9 @@
       "PrizeNums": [
         -12000,
         -5000,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -749,9 +749,9 @@
       "PrizeNums": [
         -12000,
         -5000,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -782,7 +782,7 @@
       "PrizeNums": [
         -12000,
         1,
-        -5000
+        -4000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -815,9 +815,9 @@
       "PrizeNums": [
         -12000,
         1,
-        -5000
+        -4000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -848,7 +848,7 @@
       "PrizeNums": [
         -12000,
         2,
-        -5000
+        -4000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -881,7 +881,7 @@
       "PrizeNums": [
         -12000,
         2,
-        -5000
+        -4000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -914,9 +914,9 @@
       "PrizeNums": [
         -20000,
         1,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -947,9 +947,9 @@
       "PrizeNums": [
         -20000,
         1,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -980,9 +980,9 @@
       "PrizeNums": [
         -20000,
         -15000,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1013,9 +1013,9 @@
       "PrizeNums": [
         -20000,
         -6000,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1046,9 +1046,9 @@
       "PrizeNums": [
         -20000,
         -6000,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1079,7 +1079,7 @@
       "PrizeNums": [
         -20000,
         1,
-        -6000
+        -5000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1112,9 +1112,9 @@
       "PrizeNums": [
         -20000,
         1,
-        -6000
+        -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1145,7 +1145,7 @@
       "PrizeNums": [
         -20000,
         2,
-        -6000
+        -5000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1178,7 +1178,7 @@
       "PrizeNums": [
         -20000,
         2,
-        -6000
+        -5000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1211,9 +1211,9 @@
       "PrizeNums": [
         -30000,
         1,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1244,9 +1244,9 @@
       "PrizeNums": [
         -30000,
         1,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 50,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1277,9 +1277,9 @@
       "PrizeNums": [
         -30000,
         -20000,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 200,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1310,9 +1310,9 @@
       "PrizeNums": [
         -30000,
         -7500,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1343,9 +1343,9 @@
       "PrizeNums": [
         -30000,
         -7500,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 300,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1376,7 +1376,7 @@
       "PrizeNums": [
         -30000,
         1,
-        -8000
+        -6000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1409,9 +1409,9 @@
       "PrizeNums": [
         -30000,
         1,
-        -8000
+        -6000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 150,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1442,7 +1442,7 @@
       "PrizeNums": [
         -30000,
         3,
-        -8000
+        -6000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1475,7 +1475,7 @@
       "PrizeNums": [
         -30000,
         3,
-        -8000
+        -6000
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -6711,7 +6711,7 @@
       ],
       "PrizeNums": [
         1,
-        -3000,
+        -2000,
         -6000
       ],
       "RefreshProbability": 100,
@@ -6933,7 +6933,7 @@
       ],
       "PrizeNums": [
         1,
-        -4000,
+        -3000,
         -9000
       ],
       "RefreshProbability": 100,
@@ -6975,7 +6975,7 @@
       ],
       "PrizeNums": [
         1,
-        -5000,
+        -4000,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7008,7 +7008,7 @@
       ],
       "PrizeNums": [
         1,
-        -6000,
+        -5000,
         -20000
       ],
       "RefreshProbability": 100,
@@ -7041,7 +7041,7 @@
       ],
       "PrizeNums": [
         1,
-        -3000,
+        -2000,
         -6000
       ],
       "RefreshProbability": 100,
@@ -7074,7 +7074,7 @@
       ],
       "PrizeNums": [
         1,
-        -4000,
+        -3000,
         -9000
       ],
       "RefreshProbability": 100,
@@ -7108,7 +7108,7 @@
       ],
       "PrizeNums": [
         1,
-        -5000,
+        -4000,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7142,7 +7142,7 @@
       ],
       "PrizeNums": [
         1,
-        -6000,
+        -5000,
         -20000
       ],
       "RefreshProbability": 100,
@@ -7176,7 +7176,7 @@
       ],
       "PrizeNums": [
         1,
-        -4000,
+        -3000,
         -9000
       ],
       "RefreshProbability": 100,

Assets/Res/Config/EventLinkConfig.json

@@ -23175,7 +23175,7 @@
         1001
       ],
       "PrizeNums": [
-        999999
+        666666
       ],
       "ResultType": 1,
       "ResultOptions": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "上天入地之瑰宝"
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "上天入地之瑰宝"
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "上天入地之瑰宝"
     },
     {
       "ID": 4101,
@@ -38366,11 +38366,11 @@
     },
     {
       "ID": 10332,
-      "txt": "({0}后，恢复1点神识)"
+      "txt": "每{0}恢复1点神识"
     },
     {
       "ID": 10333,
-      "txt": "({0}后，恢复全部神识)"
+      "txt": "{0}后恢复全部神识"
     },
     {
       "ID": 10334,

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -7813,8 +7813,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 282.51, y: -22.7}
-  m_SizeDelta: {x: 110.66, y: 36.4585}
+  m_AnchoredPosition: {x: 273.6597, y: -24.673}
+  m_SizeDelta: {x: 128.3606, y: 32.512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &686079759204038695
 CanvasRenderer:
@@ -7846,7 +7846,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
+    m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

Assets/Res/UI/DaoYouPanel/DaoYouaaFfixWidget.prefab

@@ -271,6 +271,7 @@ GameObject:
   - component: {fileID: 7869838569737806745}
   - component: {fileID: 7982240772326421710}
   - component: {fileID: 6374737024246323474}
+  - component: {fileID: 41904762996154385}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: DaoYouaaFfixWidget
@@ -377,7 +378,56 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_DaoYouaaFfixWidget
+    gameObject: {fileID: 41904762996154385}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &41904762996154385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3054950519963356202}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7982240772326421710}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4690716534689735017
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -30,7 +30,6 @@ namespace GameLogic.Hero
 
         // public List<int> ImmortalBond = new List<int>();
 
-      
 
         public HeroInfo()
         {
@@ -131,10 +130,19 @@ namespace GameLogic.Hero
                     }
                     else
                     {
-                        daoLvBiData = new DaoLVBiData();
-                        daoLvBiData.id = i1;
-                        daoLvBiData.value = daolvSkill.para[0];
-                        daolvBl.Add(daoLvBiData);
+                        daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
+                        if (daoLvBiData == null)
+                        {
+                            daoLvBiData = new DaoLVBiData();
+                            daoLvBiData.id = i1;
+                            daoLvBiData.value = daolvSkill.para[0];
+                            daolvBl.Add(daoLvBiData);
+                        }
+                        else
+                        {
+                            daoLvBiData.value += daolvSkill.para[0];
+                        }
+
                         if (!daolvBlMap.ContainsKey(i1))
                         {
                             daolvBlMap.Add(i1, daolvSkill.para[0]);
@@ -314,8 +322,5 @@ namespace GameLogic.Hero
                     break;
             }
         }
-
-       
-
     }
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidget.cs

@@ -5,39 +5,46 @@ using GameLogic.Hero;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "DaoYouaaFfixWidget"  )]
-	public partial class DaoYouaaFfixWidget : UIComponent
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "DaoYouaaFfixWidget")]
+    public partial class DaoYouaaFfixWidget : UIComponent
+    {
+        private daolvSkill daolvSkill;
+        private float value;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void DelEvent()
+        {
+        }
 
-		}
+        public override void AddButtonEvent()
+        {
+            Btn_DaoYouaaFfixWidget.onClick.AddListener(() =>
+            {
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(daolvSkill.des, value));
+            });
+        }
 
-		public void CustomInit(int configId)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
-		
-		public void CustomInit(DaoLVBiData daoLVBiData)
-		{
-			daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
-			Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
-			Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
-		}
+        public void CustomInit(int configId)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(configId);
+            value = daolvSkill.para[0];
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
 
-	}
-}
+        public void CustomInit(DaoLVBiData daoLVBiData)
+        {
+            daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(daoLVBiData.id);
+            value = daoLVBiData.value;
+            Text_Name.text = LanguageManager.Instance.Text(daolvSkill.name);
+            Icon_Weiyi.gameObject.SetActive(daolvSkill.type == 1);
+        }
+    }
+}

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouaaFfixWidgetData.cs

@@ -30,6 +30,17 @@ namespace Fort23.Mono
 	      return _Icon_Weiyi;
 	     }
 	   }
+	  private Button _Btn_DaoYouaaFfixWidget;
+	  public Button Btn_DaoYouaaFfixWidget
+	   {
+	   get{
+	      if (_Btn_DaoYouaaFfixWidget == null)
+	       {
+	         _Btn_DaoYouaaFfixWidget  = GetUIUnit<Button>("Btn_DaoYouaaFfixWidget"); 
+	       }
+	      return _Btn_DaoYouaaFfixWidget;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{