zg 1 week ago
parent
commit
ccc4060750

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

@@ -241,9 +241,9 @@
       "isUseGpu": false,
       "heroType": 4,
       "attack": 50,
-      "hp": 200,
+      "hp": 150,
       "def": 50,
-      "shield": 200,
+      "shield": 0,
       "speed_atk": 4.0,
       "Linggen": [
         100,

+ 12 - 12
Assets/Res/Config/SkillConfig.json

@@ -7360,8 +7360,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        10.0,
-        60.0
+        30.0,
+        100.0
       ],
       "intensifierIndex": [
         1
@@ -7384,8 +7384,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        11.0,
-        55.0
+        33.0,
+        110.0
       ],
       "intensifierIndex": [
         1
@@ -7408,8 +7408,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        12.0,
-        50.0
+        36.0,
+        120.0
       ],
       "intensifierIndex": [
         1
@@ -7432,8 +7432,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        13.0,
-        45.0
+        39.0,
+        130.0
       ],
       "intensifierIndex": [
         1
@@ -7456,8 +7456,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        14.0,
-        40.0
+        42.0,
+        140.0
       ],
       "intensifierIndex": [
         1
@@ -7480,8 +7480,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        15.0,
-        35.0
+        45.0,
+        150.0
       ],
       "intensifierIndex": [
         1

BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/skill.xlsx


+ 54 - 54
UserSettings/Layouts/default-2022.dwlt

@@ -15,8 +15,8 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 151
-    y: 53
-    width: 1053
+    y: 51
+    width: 1698
     height: 1333
   m_ShowMode: 4
   m_Title: Game
@@ -41,7 +41,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 278
-    width: 478
+    width: 773
     height: 1005
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
@@ -52,7 +52,7 @@ MonoBehaviour:
   - {fileID: 11}
   - {fileID: 10}
   m_Selected: 3
-  m_LastSelected: 1
+  m_LastSelected: 2
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -70,14 +70,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 575
+    x: 925
     y: 0
-    width: 478
+    width: 773
     height: 1283
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 79
+  controlID: 82
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -99,7 +99,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1053
+    width: 1698
     height: 1333
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -124,7 +124,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1053
+    width: 1698
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -148,12 +148,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1053
+    width: 1698
     height: 1283
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 78
+  controlID: 81
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -172,7 +172,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 1313
-    width: 1053
+    width: 1698
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -186,23 +186,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ProjectSettingsWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 478
+    width: 773
     height: 278
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_MinSize: {x: 311, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 15}
   - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -220,7 +220,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 575
+    width: 925
     height: 1283
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -249,9 +249,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 726
-    y: 361
-    width: 477
+    x: 1076
+    y: 359
+    width: 772
     height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -284,9 +284,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 726
-    y: 361
-    width: 477
+    x: 1076
+    y: 359
+    width: 772
     height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -331,9 +331,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 726
-    y: 361
-    width: 477
+    x: 1076
+    y: 359
+    width: 772
     height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -365,10 +365,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 99
-    width: 684
-    height: 217
+    x: 1076
+    y: 81
+    width: 772
+    height: 257
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -385,7 +385,7 @@ MonoBehaviour:
   m_SplitterFlex: 0.2857143
   m_SearchText: 
   m_TreeViewState:
-    scrollPos: {x: 0, y: 399}
+    scrollPos: {x: 0, y: 359}
     m_SelectedIDs: 23e57dba
     m_LastClickedID: -1166154461
     m_ExpandedIDs: a01a5fa653336be20000000007f2324dc53aba5a
@@ -426,9 +426,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 726
-    y: 361
-    width: 477
+    x: 1076
+    y: 359
+    width: 772
     height: 984
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -445,7 +445,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 3867ffffd870ffffb8f9ffff
+      m_ExpandedIDs: 6cfaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -489,9 +489,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 726
-    y: 83
-    width: 477
+    x: 1076
+    y: 81
+    width: 772
     height: 257
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -529,9 +529,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 371}
-    m_SelectedIDs: 8ae40000
-    m_LastClickedID: 58506
-    m_ExpandedIDs: 00000000a6dd000036e000008ce4000000ca9a3bffffff7f
+    m_SelectedIDs: e6e00000
+    m_LastClickedID: 57574
+    m_ExpandedIDs: 00000000d8dd000068e00000e8e0000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -559,7 +559,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a6dd0000
+    m_ExpandedIDs: 00000000d8dd0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -586,7 +586,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -636,8 +636,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 151
-    y: 83
-    width: 574
+    y: 81
+    width: 924
     height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -682,7 +682,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -691,23 +691,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 574
+      width: 924
       height: 1241
     m_Scale: {x: 0.76416254, y: 0.76416254}
-    m_Translation: {x: 287, y: 620.5}
+    m_Translation: {x: 462, y: 620.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -375.57455
+      x: -604.58344
       y: -812
-      width: 751.1491
+      width: 1209.1669
       height: 1624
     m_MinimalGUI: 1
   m_defaultScale: 0.76416254
-  m_LastWindowPixelSize: {x: 574, y: 1262}
+  m_LastWindowPixelSize: {x: 924, y: 1262}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000