DESKTOP-FB72PO8\Administrator пре 15 часа
родитељ
комит
291bbaf59f

+ 63 - 63
Assets/Res/Config/HeroModelConfig.json

@@ -66,10 +66,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 220,
-      "hp": 183,
+      "attack": 198,
+      "hp": 165,
       "def": 100,
-      "shield": 183,
+      "shield": 165,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 224,
+      "attack": 162,
+      "hp": 201,
       "def": 100,
-      "shield": 224,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -182,10 +182,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 200,
-      "hp": 201,
+      "attack": 180,
+      "hp": 181,
       "def": 100,
-      "shield": 201,
+      "shield": 181,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -240,10 +240,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 240,
-      "hp": 168,
+      "attack": 216,
+      "hp": 151,
       "def": 100,
-      "shield": 168,
+      "shield": 151,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -298,10 +298,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 160,
-      "hp": 251,
+      "attack": 144,
+      "hp": 226,
       "def": 100,
-      "shield": 251,
+      "shield": 226,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -356,10 +356,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 230,
-      "hp": 175,
+      "attack": 207,
+      "hp": 157,
       "def": 100,
-      "shield": 175,
+      "shield": 157,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -414,10 +414,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 250,
-      "hp": 161,
+      "attack": 225,
+      "hp": 145,
       "def": 100,
-      "shield": 161,
+      "shield": 145,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -472,10 +472,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 210,
-      "hp": 192,
+      "attack": 189,
+      "hp": 172,
       "def": 100,
-      "shield": 192,
+      "shield": 172,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -530,10 +530,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 264,
+      "hp": 219,
       "def": 100,
-      "shield": 262,
+      "shield": 219,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -588,10 +588,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 216,
+      "hp": 268,
       "def": 100,
-      "shield": 262,
+      "shield": 268,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -646,10 +646,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 240,
+      "hp": 241,
       "def": 100,
-      "shield": 262,
+      "shield": 241,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -704,10 +704,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 288,
+      "hp": 201,
       "def": 100,
-      "shield": 262,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -762,10 +762,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 192,
+      "hp": 302,
       "def": 100,
-      "shield": 262,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -820,10 +820,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 276,
+      "hp": 210,
       "def": 100,
-      "shield": 262,
+      "shield": 210,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -878,10 +878,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 300,
+      "hp": 193,
       "def": 100,
-      "shield": 262,
+      "shield": 193,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -936,10 +936,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -994,10 +994,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1052,10 +1052,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1110,10 +1110,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1168,10 +1168,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1226,10 +1226,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 210,
-      "hp": 431,
+      "attack": 300,
+      "hp": 302,
       "def": 100,
-      "shield": 431,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Разлика између датотеке није приказан због своје велике величине
+ 112 - 112
Assets/Res/Config/HeroPowerUpConfig.json


Разлика између датотеке није приказан због своје велике величине
+ 112 - 112
Assets/Res/Config/MonsterPowerUpConfig.json


+ 41 - 5
Assets/Scenes/testCombat.scene

@@ -2203,6 +2203,10 @@ PrefabInstance:
       propertyPath: zhanZhuangTime
       value: 200
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.size
       value: 1
@@ -2245,15 +2249,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 150
+      value: 125
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].level
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].heroID
+      value: 101
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 150
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2265,7 +2277,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 1001
+      value: 5003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2277,11 +2289,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 1
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 1
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].skillLevel
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].skillStart
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skillLevel
@@ -2327,6 +2347,10 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.size
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
       value: 0
@@ -2347,6 +2371,18 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[3]
       value: 10004
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[0]
+      value: 10001
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[1]
+      value: 10002
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[2]
+      value: 10003
+      objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_Name
       value: TestCombat

+ 1 - 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;

+ 1 - 1
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;

+ 1 - 1
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;

BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


BIN
Excel2Json/Excel/数据验_2.xlam


BIN
Excel2Json/Excel/数据验证.xlsx


Неке датотеке нису приказане због велике количине промена