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

Assets/Res/Config/ShopItemConfig.json

@@ -441,7 +441,7 @@
       "ID": 20,
       "giftID": "",
       "itemId": [
-        21010
+        21006
       ],
       "itemCount": [
         99
@@ -464,7 +464,7 @@
       "ID": 21,
       "giftID": "",
       "itemId": [
-        21011
+        21007
       ],
       "itemCount": [
         99
@@ -487,7 +487,7 @@
       "ID": 22,
       "giftID": "",
       "itemId": [
-        21012
+        21008
       ],
       "itemCount": [
         99
@@ -509,6 +509,98 @@
     {
       "ID": 23,
       "giftID": "",
+      "itemId": [
+        21009
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 24,
+      "giftID": "",
+      "itemId": [
+        21010
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 25,
+      "giftID": "",
+      "itemId": [
+        21011
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 26,
+      "giftID": "",
+      "itemId": [
+        21012
+      ],
+      "itemCount": [
+        99
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 1,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Coin"
+      ]
+    },
+    {
+      "ID": 27,
+      "giftID": "",
       "itemId": [
         21013
       ],

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -168,9 +168,9 @@ namespace Excel2Json
 		///触发条件类型 只能配处于什么状态和数值，不能配变化的数值
 		/// </summary>
 #if !COMBAT_SERVER
-		public int EventConditionId;
+		public int[] EventConditionId;
 #else
-		public int EventConditionId{ set; get; }
+		public int[] EventConditionId{ set; get; }
 #endif
 		
 
@@ -188,9 +188,9 @@ namespace Excel2Json
 		///触发判定数量or次数
 		/// </summary>
 #if !COMBAT_SERVER
-		public int EventCount;
+		public int[] EventCount;
 #else
-		public int EventCount{ set; get; }
+		public int[] EventCount{ set; get; }
 #endif
 		
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -182,7 +182,7 @@ namespace Fort23.Mono
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
             Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
                 PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
-    
+
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -208,18 +208,16 @@ namespace Fort23.Mono
             {
                 Text_Speed.text = LanguageManager.Instance.Text(10230,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
-           
             }
             else
             {
-  
-                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
 
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.exp.Value}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{(int)PlayerManager.Instance.myHero.exp.Value}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
             {
@@ -241,7 +239,7 @@ namespace Fort23.Mono
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
 
             Text_exp.text =
-                $"{PlayerManager.Instance.myHero.heroData.exp + (int)allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
+                $"{(int)(PlayerManager.Instance.myHero.heroData.exp + allexp)}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
                               (PlayerManager.Instance.myHero.heroData.exp + allexp)) /
@@ -250,12 +248,10 @@ namespace Fort23.Mono
             {
                 Text_Speed.text = LanguageManager.Instance.Text(10230,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei, PlayerManager.TimeToHSM(miao));
-           
             }
             else
             {
-  
-                Text_Speed.text =              LanguageManager.Instance.Text(10266,
+                Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
         }