Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

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

Assets/Res/Config/HeroPowerUpConfig.json

@@ -969,7 +969,8 @@
       ],
       "LeijieDamages": [
         3431,
-        5147
+        5147,
+        2
       ],
       "HPFactor": 15.0624866,
       "ATKFactor": 1.80870819,
@@ -1954,7 +1955,8 @@
       ],
       "LeijieDamages": [
         14300,
-        21450
+        21450,
+        3
       ],
       "HPFactor": 52.6819839,
       "ATKFactor": 4.907138,
@@ -2939,7 +2941,8 @@
       ],
       "LeijieDamages": [
         64589,
-        96883
+        96883,
+        4
       ],
       "HPFactor": 174.988464,
       "ATKFactor": 13.3133717,
@@ -3924,7 +3927,8 @@
       ],
       "LeijieDamages": [
         257663,
-        386494
+        386494,
+        5
       ],
       "HPFactor": 561.732544,
       "ATKFactor": 36.1200066,
@@ -4909,7 +4913,8 @@
       ],
       "LeijieDamages": [
         897059,
-        1345589
+        1345589,
+        6
       ],
       "HPFactor": 1759.992,
       "ATKFactor": 97.99583,
@@ -5894,7 +5899,8 @@
       ],
       "LeijieDamages": [
         3024062,
-        4536093
+        4536093,
+        7
       ],
       "HPFactor": 5415.187,
       "ATKFactor": 265.8688,
@@ -6879,7 +6885,8 @@
       ],
       "LeijieDamages": [
         10349560,
-        15524340
+        15524340,
+        8
       ],
       "HPFactor": 16428.6953,
       "ATKFactor": 721.3186,
@@ -7864,7 +7871,8 @@
       ],
       "LeijieDamages": [
         34630848,
-        51946272
+        51946272,
+        9
       ],
       "HPFactor": 49284.54,
       "ATKFactor": 1956.9823,
@@ -8849,7 +8857,8 @@
       ],
       "LeijieDamages": [
         105941258,
-        158911886
+        158911886,
+        10
       ],
       "HPFactor": 146497.234,
       "ATKFactor": 5309.415,
@@ -9831,7 +9840,8 @@
       ],
       "LeijieDamages": [
         327737400,
-        491606100
+        491606100,
+        11
       ],
       "HPFactor": 432143.219,
       "ATKFactor": 14404.7734,

Assets/Res/Config/ItemConfig.json

@@ -9,6 +9,9 @@
       "quality": 2,
       "stack": 0,
       "isSell": false,
+      "SkiptoID": [
+        5
+      ],
       "rewardsNum": 0,
       "isVisible": 1,
       "isUse": false,
@@ -34,6 +37,10 @@
       "quality": 4,
       "stack": 0,
       "isSell": false,
+      "SkiptoID": [
+        5,
+        4
+      ],
       "rewardsNum": 0,
       "isVisible": 1,
       "isUse": false,
@@ -198,7 +205,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         6
       ],
       "sort": 0,
@@ -227,7 +234,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         30
       ],
       "sort": 0,
@@ -256,7 +263,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         98
       ],
       "sort": 0,
@@ -285,7 +292,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         198
       ],
       "sort": 0,
@@ -314,7 +321,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         328
       ],
       "sort": 0,
@@ -343,7 +350,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         648
       ],
       "sort": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -646,15 +646,15 @@
     },
     {
       "ID": 162,
-      "txt": "金幣，可用於開寶箱"
+      "txt": "游历仙界最基础的货币。"
     },
     {
       "ID": 163,
-      "txt": "鑽石，後續開放（敬請期待）"
+      "txt": "妖物魂魄凝结而成的丹药，一般作为较为稀有的货币。"
     },
     {
       "ID": 164,
-      "txt": "經驗，用於英雄升級"
+      "txt": "英雄提升等级所必需的资源。"
     },
     {
       "ID": 165,
@@ -674,15 +674,15 @@
     },
     {
       "ID": 169,
-      "txt": "金幣"
+      "txt": "灵石"
     },
     {
       "ID": 170,
-      "txt": "鑽石"
+      "txt": "妖丹"
     },
     {
       "ID": 171,
-      "txt": "英雄經驗"
+      "txt": "修为"
     },
     {
       "ID": 172,
@@ -994,7 +994,7 @@
     },
     {
       "ID": 249,
-      "txt": "最稀有的货币"
+      "txt": "仙界最为珍贵的货币。"
     },
     {
       "ID": 250,
@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道 "
+      "txt": "玄黄道"
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）\n"
+      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）"
     },
     {
       "ID": 702,
@@ -2898,11 +2898,11 @@
     },
     {
       "ID": 725,
-      "txt": "功法灵气"
+      "txt": "灵气"
     },
     {
       "ID": 726,
-      "txt": "[临]灵气的描述"
+      "txt": "功法升级所必需的资源。"
     },
     {
       "ID": 727,
@@ -5598,11 +5598,11 @@
     },
     {
       "ID": 1400,
-      "txt": "法宝灵韵"
+      "txt": "玄晶"
     },
     {
       "ID": 1401,
-      "txt": "用于提升法宝的等级"
+      "txt": "法宝升级所必需的资源。"
     },
     {
       "ID": 1402,
@@ -13042,75 +13042,75 @@
     },
     {
       "ID": 4001,
-      "txt": "[资源1]法宝掉落×1"
+      "txt": "[资源]法宝掉落"
     },
     {
       "ID": 4002,
-      "txt": "[资源1]功法掉落×1"
+      "txt": "[资源]功法掉落"
     },
     {
       "ID": 4003,
-      "txt": "[资源1]灵石×-5000"
+      "txt": "[资源]灵石"
     },
     {
       "ID": 4004,
-      "txt": "[资源1]灵气×-5000"
+      "txt": "[资源]灵气"
     },
     {
       "ID": 4005,
-      "txt": "[资源1]玄晶×-5000"
+      "txt": "[资源]玄晶"
     },
     {
       "ID": 4006,
-      "txt": "[资源1]妖丹×100"
+      "txt": "[资源]妖丹"
     },
     {
       "ID": 4007,
-      "txt": "[资源1]仙缘宝券×10"
+      "txt": "[资源]仙缘宝券"
     },
     {
       "ID": 4008,
-      "txt": "[资源1]好感度礼物1×1"
+      "txt": "[资源]好感度礼物1"
     },
     {
       "ID": 4009,
-      "txt": "[资源1]心情礼物1×1"
+      "txt": "[资源]心情礼物1"
     },
     {
       "ID": 4010,
-      "txt": "[资源2]法宝掉落×1"
+      "txt": "[资源]法宝掉落"
     },
     {
       "ID": 4011,
-      "txt": "[资源2]功法掉落×1"
+      "txt": "[资源]功法掉落"
     },
     {
       "ID": 4012,
-      "txt": "[资源2]灵石×-5000"
+      "txt": "[资源]灵石"
     },
     {
       "ID": 4013,
-      "txt": "[资源2]灵气×-5000"
+      "txt": "[资源]灵气"
     },
     {
       "ID": 4014,
-      "txt": "[资源2]玄晶×-5000"
+      "txt": "[资源]玄晶"
     },
     {
       "ID": 4015,
-      "txt": "[资源2]妖丹×100"
+      "txt": "[资源]妖丹"
     },
     {
       "ID": 4016,
-      "txt": "[资源2]仙缘宝券×10"
+      "txt": "[资源]仙缘宝券"
     },
     {
       "ID": 4017,
-      "txt": "[资源2]好感度礼物1×1"
+      "txt": "[资源]好感度礼物1"
     },
     {
       "ID": 4018,
-      "txt": "[资源2]心情礼物1×1"
+      "txt": "[资源]心情礼物1"
     },
     {
       "ID": 4019,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,
@@ -14230,111 +14230,111 @@
     },
     {
       "ID": 4298,
-      "txt": "[资源3]法宝掉落×1"
+      "txt": "[资源]法宝掉落"
     },
     {
       "ID": 4299,
-      "txt": "[资源3]功法掉落×1"
+      "txt": "[资源]功法掉落"
     },
     {
       "ID": 4300,
-      "txt": "[资源3]灵石×-5000"
+      "txt": "[资源]灵石"
     },
     {
       "ID": 4301,
-      "txt": "[资源3]灵气×-5000"
+      "txt": "[资源]灵气"
     },
     {
       "ID": 4302,
-      "txt": "[资源3]玄晶×-5000"
+      "txt": "[资源]玄晶"
     },
     {
       "ID": 4303,
-      "txt": "[资源3]妖丹×100"
+      "txt": "[资源]妖丹"
     },
     {
       "ID": 4304,
-      "txt": "[资源3]仙缘宝券×10"
+      "txt": "[资源]仙缘宝券"
     },
     {
       "ID": 4305,
-      "txt": "[资源3]好感度礼物1×1"
+      "txt": "[资源]好感度礼物1"
     },
     {
       "ID": 4306,
-      "txt": "[资源3]心情礼物1×1"
+      "txt": "[资源]心情礼物1"
     },
     {
       "ID": 4307,
-      "txt": "[资源4]法宝掉落×1"
+      "txt": "[资源]法宝掉落"
     },
     {
       "ID": 4308,
-      "txt": "[资源4]功法掉落×1"
+      "txt": "[资源]功法掉落"
     },
     {
       "ID": 4309,
-      "txt": "[资源4]灵石×-5000"
+      "txt": "[资源]灵石"
     },
     {
       "ID": 4310,
-      "txt": "[资源4]灵气×-5000"
+      "txt": "[资源]灵气"
     },
     {
       "ID": 4311,
-      "txt": "[资源4]玄晶×-5000"
+      "txt": "[资源]玄晶"
     },
     {
       "ID": 4312,
-      "txt": "[资源4]妖丹×100"
+      "txt": "[资源]妖丹"
     },
     {
       "ID": 4313,
-      "txt": "[资源4]仙缘宝券×10"
+      "txt": "[资源]仙缘宝券"
     },
     {
       "ID": 4314,
-      "txt": "[资源4]好感度礼物1×1"
+      "txt": "[资源]好感度礼物1"
     },
     {
       "ID": 4315,
-      "txt": "[资源4]心情礼物1×1"
+      "txt": "[资源]心情礼物1"
     },
     {
       "ID": 4316,
-      "txt": "[资源5]法宝掉落×1"
+      "txt": "[资源]法宝掉落"
     },
     {
       "ID": 4317,
-      "txt": "[资源5]功法掉落×1"
+      "txt": "[资源]功法掉落"
     },
     {
       "ID": 4318,
-      "txt": "[资源5]灵石×-5000"
+      "txt": "[资源]灵石"
     },
     {
       "ID": 4319,
-      "txt": "[资源5]灵气×-5000"
+      "txt": "[资源]灵气"
     },
     {
       "ID": 4320,
-      "txt": "[资源5]玄晶×-5000"
+      "txt": "[资源]玄晶"
     },
     {
       "ID": 4321,
-      "txt": "[资源5]妖丹×100"
+      "txt": "[资源]妖丹"
     },
     {
       "ID": 4322,
-      "txt": "[资源5]仙缘宝券×10"
+      "txt": "[资源]仙缘宝券"
     },
     {
       "ID": 4323,
-      "txt": "[资源5]好感度礼物1×1"
+      "txt": "[资源]好感度礼物1"
     },
     {
       "ID": 4324,
-      "txt": "[资源5]心情礼物1×1"
+      "txt": "[资源]心情礼物1"
     },
     {
       "ID": 4325,
@@ -37602,7 +37602,7 @@
     },
     {
       "ID": 10141,
-      "txt": "完成这些神识事件，发现新的地点"
+      "txt": "每完成一个神识事件，都增加当前地点的探索度;再完成{0}个事件就可以把北海.海边探索完毕了;去看看。"
     },
     {
       "ID": 10142,
@@ -38198,7 +38198,7 @@
     },
     {
       "ID": 10290,
-      "txt": "心情+{0} "
+      "txt": "心情+{0}"
     },
     {
       "ID": 10291,

Assets/Res/Config/ShopItemConfig.json

@@ -1869,6 +1869,29 @@
       "itemId": [
         1002
       ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1004,
+      "price": 10,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 7,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 702,
+      "giftID": "",
+      "itemId": [
+        1002
+      ],
       "itemCount": [
         10
       ],

Assets/Res/Config/SkiptoConfig.json

@@ -5,7 +5,7 @@
       "SkipType": 1,
       "SkipID": 1,
       "SkipTxt": 10107,
-      "UnlockType": 1,
+      "UnlockType": 0,
       "UnlockPara2": 0
     },
     {
@@ -28,6 +28,9 @@
       "ID": 4,
       "SkipType": 4,
       "SkipID": 4,
+      "SkipArguments": [
+        7
+      ],
       "SkipTxt": 10110,
       "UnlockType": 0,
       "UnlockPara2": 0
@@ -39,6 +42,14 @@
       "SkipTxt": 10111,
       "UnlockType": 0,
       "UnlockPara2": 0
+    },
+    {
+      "ID": 6,
+      "SkipType": 6,
+      "SkipID": 4,
+      "SkipTxt": 0,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -145,7 +145,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///雷劫伤害 要填下限和上限
+		///雷劫伤害 要填下限、上限、表现上几根雷
 		/// </summary>
 #if !COMBAT_SERVER
 		public int[] LeijieDamages;