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

Assets/Art/Environment/fukong dao2.prefab

@@ -36,8 +36,8 @@ Transform:
 --- !u!1 &3515542236926725537
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
-  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
@@ -55,13 +55,13 @@ GameObject:
 --- !u!4 &2635808446306131277
 Transform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
-  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3515542236926725537}
   serializedVersion: 2
   m_LocalRotation: {x: -0.2571829, y: 0.65867823, z: 0.65867823, w: 0.2571829}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: -3.37, z: 0}
   m_LocalScale: {x: 3.2728, y: 3.2728, z: 3.2728}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -70,16 +70,16 @@ Transform:
 --- !u!33 &7422373066537718526
 MeshFilter:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1091396269776134280, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
-  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3515542236926725537}
   m_Mesh: {fileID: 3223647848749318582, guid: ebe13b67332437f478e3ba635a061233, type: 3}
 --- !u!23 &275904094642747149
 MeshRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 2936800325524362306, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
-  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3515542236926725537}
   m_Enabled: 1
@@ -120,72 +120,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1001 &1922033871240831382
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 6531860447979389797}
-    m_Modifications:
-    - target: {fileID: 0}
-      propertyPath: m_Name
-      value: fukong dao2 (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.x
-      value: 3.2728
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.y
-      value: 3.2728
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.z
-      value: 3.2728
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.w
-      value: 0.2571829
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.x
-      value: -0.2571829
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.y
-      value: 0.65867823
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.z
-      value: 0.65867823
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 137.343
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 0}

Assets/Art/Environment/fukong dao3.prefab

@@ -3,8 +3,8 @@
 --- !u!1 &765340368279689263
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3905164629616407330, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
-  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
@@ -22,13 +22,13 @@ GameObject:
 --- !u!4 &4947522758557136696
 Transform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4429921519942298008, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
-  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 765340368279689263}
   serializedVersion: 2
   m_LocalRotation: {x: -0.24617667, y: -0.66287035, z: -0.66287035, w: 0.24617667}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: -2.67, z: 0}
   m_LocalScale: {x: 4, y: 4, z: 4}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -37,16 +37,16 @@ Transform:
 --- !u!33 &3445450105515365864
 MeshFilter:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 780782669881140797, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
-  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 765340368279689263}
   m_Mesh: {fileID: -6909115843317292050, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
 --- !u!23 &3727334830803835583
 MeshRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3256404872649183991, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
-  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 765340368279689263}
   m_Enabled: 1
@@ -120,60 +120,3 @@ Transform:
   - {fileID: 4947522758557136696}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &8029598009332787400
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 4160862028817849242}
-    m_Modifications:
-    - target: {fileID: 0}
-      propertyPath: m_Name
-      value: fukong dao3
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.w
-      value: 0.24617667
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.x
-      value: -0.24617667
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.y
-      value: -0.66287035
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.z
-      value: -0.66287035
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: -139.252
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 0}

Assets/Art/Environment/fukong dao4.prefab

@@ -3,8 +3,8 @@
 --- !u!1 &1224579573862923457
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 3703108956536512397, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
@@ -22,13 +22,13 @@ GameObject:
 --- !u!4 &6140134704763648785
 Transform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 4048671560039220535, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1224579573862923457}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 4.2, z: 0}
+  m_LocalPosition: {x: 0, y: 2.66, z: 0}
   m_LocalScale: {x: 6.3410997, y: 6.3410997, z: 6.3410997}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -37,16 +37,16 @@ Transform:
 --- !u!33 &739692015363110405
 MeshFilter:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 1116926517609384594, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1224579573862923457}
   m_Mesh: {fileID: 6153351672944578211, guid: 63677335207fa85458d422635ffac560, type: 3}
 --- !u!23 &7936720611081973566
 MeshRenderer:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 2910708037704662616, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1224579573862923457}
   m_Enabled: 1
@@ -120,72 +120,3 @@ Transform:
   - {fileID: 6140134704763648785}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &8365091946876407639
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 411656382419835695}
-    m_Modifications:
-    - target: {fileID: 0}
-      propertyPath: m_Name
-      value: fukong dao4
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.x
-      value: 6.3410997
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.y
-      value: 6.3410997
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalScale.z
-      value: 6.3410997
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.y
-      value: 4.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 0}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 0}

Assets/Res/Config/SkillConfig.json

@@ -4366,7 +4366,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -4393,7 +4393,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -4429,7 +4429,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -4465,7 +4465,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -4501,7 +4501,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -4537,7 +4537,7 @@
         3.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -4567,10 +4567,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        50.0
+        20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -4594,10 +4594,10 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        50.0
+        25.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -4630,10 +4630,10 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        50.0
+        30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -4666,10 +4666,10 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        50.0
+        35.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -4702,10 +4702,10 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        50.0
+        40.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -4738,10 +4738,10 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        100.0
+        45.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -4771,10 +4771,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        30.0
+        10.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -4798,10 +4798,10 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        30.0
+        15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -4834,10 +4834,10 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        30.0
+        20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -4870,10 +4870,10 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        30.0
+        25.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -4909,7 +4909,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -4942,12 +4942,12 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        30.0,
+        35.0,
         15.0,
         10.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -4981,7 +4981,7 @@
         4.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1
     },
@@ -5005,7 +5005,7 @@
         4.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -5038,7 +5038,7 @@
         4.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -5071,7 +5071,7 @@
         4.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -5104,7 +5104,7 @@
         4.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -5138,7 +5138,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -5168,7 +5168,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -5196,7 +5196,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -5233,7 +5233,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -5270,7 +5270,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -5307,7 +5307,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -5345,7 +5345,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -5379,7 +5379,7 @@
         9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -5407,7 +5407,7 @@
         9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -5444,7 +5444,7 @@
         9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -5481,7 +5481,7 @@
         9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -5518,7 +5518,7 @@
         9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -5556,7 +5556,7 @@
         15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -5590,7 +5590,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -5618,7 +5618,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -5655,7 +5655,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -5692,7 +5692,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -5729,7 +5729,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -5767,7 +5767,7 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -5799,10 +5799,10 @@
       "effectValue": [
         5.0,
         30.0,
-        50.0
+        20.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -5827,10 +5827,10 @@
       "effectValue": [
         5.0,
         40.0,
-        60.0
+        30.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "addPropertyType": [
         102
@@ -5864,10 +5864,10 @@
       "effectValue": [
         5.0,
         50.0,
-        70.0
+        40.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "addPropertyType": [
         102
@@ -5901,10 +5901,10 @@
       "effectValue": [
         5.0,
         60.0,
-        80.0
+        50.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "addPropertyType": [
         102
@@ -5938,10 +5938,10 @@
       "effectValue": [
         5.0,
         70.0,
-        90.0
+        60.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "addPropertyType": [
         102
@@ -5975,10 +5975,10 @@
       "effectValue": [
         5.0,
         100.0,
-        100.0
+        70.0
       ],
       "intensifierIndex": [
-        0
+        3
       ],
       "addPropertyType": [
         102
@@ -6008,11 +6008,11 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        90.0,
+        50.0,
         0.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1
     },
@@ -6032,12 +6032,12 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        110.0,
+        60.0,
         20.0,
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -6066,12 +6066,12 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        130.0,
+        70.0,
         20.0,
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -6100,12 +6100,12 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        150.0,
+        80.0,
         30.0,
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -6134,12 +6134,12 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        170.0,
+        90.0,
         30.0,
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -6168,12 +6168,12 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        190.0,
+        100.0,
         30.0,
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -6202,7 +6202,7 @@
         550.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1
     },
@@ -6225,7 +6225,7 @@
         650.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -6257,7 +6257,7 @@
         750.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -6289,7 +6289,7 @@
         850.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -6321,7 +6321,7 @@
         950.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -6353,7 +6353,7 @@
         1050.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -6744,7 +6744,7 @@
         10.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -6773,7 +6773,7 @@
         15.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         101
@@ -6811,7 +6811,7 @@
         15.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         101
@@ -6849,7 +6849,7 @@
         20.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         101
@@ -6887,7 +6887,7 @@
         25.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         101
@@ -6925,7 +6925,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         101
@@ -6960,7 +6960,7 @@
         10.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -6989,7 +6989,7 @@
         15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -7027,7 +7027,7 @@
         15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -7065,7 +7065,7 @@
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -7103,7 +7103,7 @@
         25.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -7141,7 +7141,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         102
@@ -7385,7 +7385,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -7411,7 +7411,7 @@
         40.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -7446,7 +7446,7 @@
         50.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -7481,7 +7481,7 @@
         60.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -7516,7 +7516,7 @@
         70.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -7551,7 +7551,7 @@
         80.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         101
@@ -7586,7 +7586,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "PromoteLan": -1
     },
@@ -7612,7 +7612,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -7647,7 +7647,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -7682,7 +7682,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -7717,7 +7717,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -7752,7 +7752,7 @@
         5.0
       ],
       "intensifierIndex": [
-        0
+        2
       ],
       "addPropertyType": [
         102
@@ -7781,7 +7781,7 @@
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": -1,
       "PromoteLanPara_1": [
@@ -7807,7 +7807,7 @@
         30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -7842,7 +7842,7 @@
         40.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -7877,7 +7877,7 @@
         50.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -7912,7 +7912,7 @@
         60.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103
@@ -7947,7 +7947,7 @@
         70.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "addPropertyType": [
         103

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;

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -123,11 +123,11 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             GameObjectPool gameObjectPool = GetObejct(odds);
             if (gameObjectPool != null)
             {
-                float y = Random.Range(-10.0f, 1.0f);
+                float y = Random.Range(-10.0f, -1f);
                 int d = Mathf.Abs(Mathf.Abs(xintdex) - 1);
                 if (d <= 1)
                 {
-                    y = Random.Range(-10.0f - d * 10, -5.0f - d * 10);
+                    y = Random.Range(-10.0f - d * 10, -6.0f - d * 10);
                 }
 
                 float x = Random.Range(-3.0f, 3.0f);