更新

2026-04-01 12:23:27 -04:00
parent aff7ac0e03
commit c3b1561375
933 changed files with 114333 additions and 119360 deletions
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@@ -268,6 +268,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -404,6 +405,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -644,6 +646,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -780,6 +783,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -916,6 +920,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -1203,6 +1208,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -1353,6 +1359,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -1489,6 +1496,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -2106,14 +2114,14 @@ Light:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 410087039}
  m_Enabled: 1
-  serializedVersion: 11
+  serializedVersion: 12
  m_Type: 1
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_Intensity: 2
  m_Range: 10
  m_SpotAngle: 30
  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
+  m_CookieSize2D: {x: 10, y: 10}
  m_Shadows:
    m_Type: 2
    m_Resolution: -1
@@ -2653,6 +2661,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -2896,6 +2905,7 @@ GameObject:
  m_IsActive: 1
 --- !u!212 &663400105
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -2941,6 +2951,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_Sprite: {fileID: 21300000, guid: 94afd1f82c3501d41ae8eaa18c7f0f05, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -2950,7 +2961,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!4 &663400106
 Transform:
@@ -2979,6 +2989,7 @@ SortingGroup:
  m_SortingLayer: 0
  m_SortingOrder: -1000
  m_SortAtRoot: 0
+  m_Sort3DAs2D: 0
 --- !u!1 &682317575
 GameObject:
  m_ObjectHideFlags: 0
@@ -3208,6 +3219,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -3476,6 +3488,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -3612,6 +3625,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -3748,6 +3762,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -4162,6 +4177,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -4213,6 +4229,7 @@ GameObject:
  m_Component:
  - component: {fileID: 903411924}
  - component: {fileID: 903411925}
+  - component: {fileID: 903411926}
  m_Layer: 0
  m_Name: CombatManager
  m_TagString: Untagged
@@ -4252,6 +4269,19 @@ MonoBehaviour:
    combatCharacterViews: []
  currentRound: 0
  currentActionIndex: 0
+  combatState: 0
+--- !u!114 &903411926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 903411923}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d12e840753630dc4d9a3e4b8f4365b37, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: GameAPI::Continentis.MainGame.Combat.CombatLogs
 --- !u!1 &922348734
 GameObject:
  m_ObjectHideFlags: 0
@@ -4603,6 +4633,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -4801,6 +4832,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: -6
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -5454,6 +5486,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -5590,6 +5623,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -6110,6 +6144,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -6246,6 +6281,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -6382,6 +6418,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -6621,6 +6658,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -7106,6 +7144,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -7499,6 +7538,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -8101,6 +8141,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -8514,6 +8555,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: -6
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -8686,6 +8728,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -8967,6 +9010,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -9103,6 +9147,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0
@@ -9701,6 +9746,7 @@ MonoBehaviour:
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
  m_wordSpacing: 0
  m_lineSpacing: 0
  m_lineSpacingMax: 0