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

Assets/Res/Config/DivineSenseConfig.json

@@ -3,13 +3,12 @@
     {
       "ID": 1,
       "QualityBonusChance": [
-        645.0,
+        700.0,
         200.0,
         100.0,
-        50.0,
-        5.0,
         0.0,
-        1.0
+        0.0,
+        0.0
       ],
       "exp": 1000,
       "MaxNum": 2
@@ -17,13 +16,12 @@
     {
       "ID": 2,
       "QualityBonusChance": [
-        627.0,
+        685.0,
         210.0,
         105.0,
-        52.0,
-        6.0,
         0.0,
-        2.0
+        0.0,
+        0.0
       ],
       "exp": 3000,
       "MaxNum": 3
@@ -31,13 +29,12 @@
     {
       "ID": 3,
       "QualityBonusChance": [
-        609.0,
+        670.0,
         220.0,
         110.0,
-        54.0,
-        7.0,
         0.0,
-        3.0
+        0.0,
+        0.0
       ],
       "exp": 6000,
       "MaxNum": 4
@@ -45,13 +42,12 @@
     {
       "ID": 4,
       "QualityBonusChance": [
-        591.0,
+        655.0,
         230.0,
         115.0,
-        56.0,
-        8.0,
         0.0,
-        4.0
+        0.0,
+        0.0
       ],
       "exp": 10000,
       "MaxNum": 5
@@ -59,13 +55,12 @@
     {
       "ID": 5,
       "QualityBonusChance": [
-        573.0,
+        635.0,
         240.0,
         120.0,
-        58.0,
-        9.0,
+        5.0,
         0.0,
-        5.0
+        0.0
       ],
       "exp": 15000,
       "MaxNum": 6
@@ -73,13 +68,12 @@
     {
       "ID": 6,
       "QualityBonusChance": [
-        555.0,
+        615.0,
         250.0,
         125.0,
-        60.0,
         10.0,
         0.0,
-        6.0
+        0.0
       ],
       "exp": 21000,
       "MaxNum": 6
@@ -87,13 +81,12 @@
     {
       "ID": 7,
       "QualityBonusChance": [
-        537.0,
+        595.0,
         260.0,
         130.0,
-        62.0,
-        11.0,
+        15.0,
         0.0,
-        7.0
+        0.0
       ],
       "exp": 27000,
       "MaxNum": 6
@@ -101,13 +94,12 @@
     {
       "ID": 8,
       "QualityBonusChance": [
-        519.0,
+        575.0,
         270.0,
         135.0,
-        64.0,
-        12.0,
+        20.0,
         0.0,
-        8.0
+        0.0
       ],
       "exp": 33000,
       "MaxNum": 6
@@ -115,13 +107,12 @@
     {
       "ID": 9,
       "QualityBonusChance": [
-        501.0,
+        555.0,
         280.0,
         140.0,
-        66.0,
-        13.0,
+        25.0,
         0.0,
-        9.0
+        0.0
       ],
       "exp": 39000,
       "MaxNum": 6
@@ -129,11 +120,11 @@
     {
       "ID": 10,
       "QualityBonusChance": [
-        483.0,
+        531.0,
         290.0,
         145.0,
-        68.0,
-        14.0,
+        30.0,
+        4.0,
         0.0
       ],
       "exp": 45000,
@@ -142,11 +133,11 @@
     {
       "ID": 11,
       "QualityBonusChance": [
-        465.0,
+        507.0,
         300.0,
         150.0,
-        70.0,
-        15.0,
+        35.0,
+        8.0,
         0.0
       ],
       "exp": 51000,
@@ -155,11 +146,11 @@
     {
       "ID": 12,
       "QualityBonusChance": [
-        447.0,
+        483.0,
         310.0,
         155.0,
-        72.0,
-        16.0,
+        40.0,
+        12.0,
         0.0
       ],
       "exp": 57000,
@@ -168,11 +159,11 @@
     {
       "ID": 13,
       "QualityBonusChance": [
-        429.0,
+        459.0,
         320.0,
         160.0,
-        74.0,
-        17.0,
+        45.0,
+        16.0,
         0.0
       ],
       "exp": 63000,
@@ -181,11 +172,11 @@
     {
       "ID": 14,
       "QualityBonusChance": [
-        411.0,
+        435.0,
         330.0,
         165.0,
-        76.0,
-        18.0,
+        50.0,
+        20.0,
         0.0
       ],
       "exp": 69000,
@@ -194,11 +185,11 @@
     {
       "ID": 15,
       "QualityBonusChance": [
-        393.0,
+        411.0,
         340.0,
         170.0,
-        78.0,
-        19.0,
+        55.0,
+        24.0,
         0.0
       ],
       "exp": 75000,
@@ -207,11 +198,11 @@
     {
       "ID": 16,
       "QualityBonusChance": [
-        375.0,
+        387.0,
         350.0,
         175.0,
-        80.0,
-        20.0,
+        60.0,
+        28.0,
         0.0
       ],
       "exp": 81000,
@@ -220,11 +211,11 @@
     {
       "ID": 17,
       "QualityBonusChance": [
-        357.0,
+        363.0,
         360.0,
         180.0,
-        82.0,
-        21.0,
+        65.0,
+        32.0,
         0.0
       ],
       "exp": 87000,
@@ -236,8 +227,8 @@
         339.0,
         370.0,
         185.0,
-        84.0,
-        22.0,
+        70.0,
+        36.0,
         0.0
       ],
       "exp": 93000,
@@ -246,11 +237,11 @@
     {
       "ID": 19,
       "QualityBonusChance": [
-        321.0,
+        315.0,
         380.0,
         190.0,
-        86.0,
-        23.0,
+        75.0,
+        40.0,
         0.0
       ],
       "exp": 99000,
@@ -259,11 +250,11 @@
     {
       "ID": 20,
       "QualityBonusChance": [
-        303.0,
+        291.0,
         390.0,
         195.0,
-        88.0,
-        24.0,
+        80.0,
+        44.0,
         0.0
       ],
       "exp": 105000,

Assets/Res/Config/LanguageChineseConfig.json

@@ -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,

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;