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

Assets/Art/Environment/Sky/Clouds/tiankong02.mat

@@ -54,11 +54,11 @@ Material:
     - _Main_Tex:
         m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
         m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: -0.06}
+        m_Offset: {x: 0, y: 0.09}
     - _Mask:
         m_Texture: {fileID: 2800000, guid: fc22f6ee15890544eb128ed36ae8e9a6, type: 3}
         m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: 0.13}
+        m_Offset: {x: 0, y: -0.01}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Assets/Art/Environment/cj01.prefab

@@ -237,7 +237,7 @@ Transform:
   m_GameObject: {fileID: 879977783264322425}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -57.3, z: 0}
+  m_LocalPosition: {x: 0, y: -23, z: 0}
   m_LocalScale: {x: 500, y: 96.43, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Art/Environment/cj02.prefab

@@ -115,7 +115,7 @@ Transform:
   m_GameObject: {fileID: 1471893119496921437}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -21, z: 0}
+  m_LocalPosition: {x: 0, y: -13, z: 0}
   m_LocalScale: {x: 500, y: 96.43, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -608,7 +608,7 @@ MonoBehaviour:
   sortingLayer: Default
   sortingOrder: 0
   renderingLayerMask: 4294967295
-  fogColor: {r: 0.14215802, g: 0.6463502, b: 0.817, a: 0.7921569}
+  fogColor: {r: 0.14215802, g: 0.6463502, b: 0.817, a: 0.6509804}
   blendType: 0
   fogMeshType: 0
   customMesh: {fileID: 0}

Assets/Art/cs fukongdao.scene.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Di9N4X6oWy5Wx14ZjRcwY77HauBeTf3IXOZSiIokDWp4dkRTfpKazC1bh4/X
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/cs yaodu.scene.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DykYsCikAS0A7DjX1luvAwEyowbhw0JY+dK0SuelnDXA7Su/Mc2Vefs4OHCO
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/DropConfig.json

@@ -1457,6 +1457,36 @@
       "showItemId": [
         1001
       ]
+    },
+    {
+      "ID": 999005,
+      "dropType": 0
+    },
+    {
+      "ID": 999006,
+      "dropType": 0
+    },
+    {
+      "ID": 999007,
+      "dropGroupID": [
+        8,
+        9,
+        10,
+        11,
+        12
+      ],
+      "dropType": 1,
+      "showItemId": [
+        1001
+      ]
+    },
+    {
+      "ID": 999008,
+      "dropType": 0
+    },
+    {
+      "ID": 999009,
+      "dropType": 0
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -150,6 +150,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 1007,
+      "itemName": -1,
+      "itemDesc": -1,
+      "icon": "icon_GradeBadge_Challenger",
+      "itemTag": 1,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 0,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 1201,
       "itemName": 250,

Assets/Res/Config/SkillConfig.json

@@ -7956,7 +7956,7 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        100.0,
+        210.0,
         9.0
       ],
       "intensifierIndex": [
@@ -7980,7 +7980,7 @@
       "SkillType": 3,
       "level": 2,
       "effectValue": [
-        120.0,
+        280.0,
         9.0
       ],
       "intensifierIndex": [
@@ -8013,7 +8013,7 @@
       "SkillType": 3,
       "level": 3,
       "effectValue": [
-        140.0,
+        350.0,
         9.0
       ],
       "intensifierIndex": [
@@ -8048,7 +8048,7 @@
       "SkillType": 3,
       "level": 4,
       "effectValue": [
-        160.0,
+        420.0,
         9.0
       ],
       "intensifierIndex": [
@@ -8083,7 +8083,7 @@
       "SkillType": 3,
       "level": 5,
       "effectValue": [
-        180.0,
+        490.0,
         9.0
       ],
       "intensifierIndex": [
@@ -8118,7 +8118,7 @@
       "SkillType": 3,
       "level": 6,
       "effectValue": [
-        200.0,
+        560.0,
         9.0,
         15.0
       ],
@@ -8151,7 +8151,7 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        200.0
+        150.0
       ],
       "intensifierIndex": [
         1
@@ -8174,7 +8174,7 @@
       "SkillType": 3,
       "level": 2,
       "effectValue": [
-        220.0
+        200.0
       ],
       "intensifierIndex": [
         1
@@ -8197,7 +8197,7 @@
       "SkillType": 3,
       "level": 3,
       "effectValue": [
-        240.0
+        250.0
       ],
       "intensifierIndex": [
         1
@@ -8220,7 +8220,7 @@
       "SkillType": 3,
       "level": 4,
       "effectValue": [
-        260.0
+        300.0
       ],
       "intensifierIndex": [
         1
@@ -8243,7 +8243,7 @@
       "SkillType": 3,
       "level": 5,
       "effectValue": [
-        280.0
+        350.0
       ],
       "intensifierIndex": [
         1
@@ -8266,7 +8266,7 @@
       "SkillType": 3,
       "level": 6,
       "effectValue": [
-        300.0
+        400.0
       ],
       "intensifierIndex": [
         1

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;

UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 0654575100065d5f5e0f0f2113200a444f161e737f7e25667d2c4563bab8306c
+      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 0101040051055e02550d5c2148220844454f1e2e74707e622f2b1f37e7b06560
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
+      value: 5b5351570100080a095d5f7a40700a44424f1a2b782a7f327b7a4432e6e5606b
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 0101040051055e02550d5c2148220844454f1e2e74707e622f2b1f37e7b06560
+      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5b5351570100080a095d5f7a40700a44424f1a2b782a7f327b7a4432e6e5606b
+      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-6:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615