英雄解锁和强制上阵的判定

2023-04-19 22:20:44 +08:00 · 2023-04-19 22:20:44 +08:00 · ca8519d154
commit ca8519d154
parent b0a3b083c1
6 changed files with 252 additions and 29 deletions
--- a/Assets/arts/textures/background/battle_common/battle_dec_1.png.meta
+++ b/Assets/arts/textures/background/battle_common/battle_dec_1.png.meta
@ -35,9 +35,9 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
--- a/Assets/arts/textures/background/battle_common/battle_dec_2.png.meta
+++ b/Assets/arts/textures/background/battle_common/battle_dec_2.png.meta
@ -35,9 +35,9 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
--- a/Assets/arts/textures/background/battle_common/chessboard_1.png.meta
+++ b/Assets/arts/textures/background/battle_common/chessboard_1.png.meta
@ -35,9 +35,9 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
--- a/Assets/prefabs/ui/common/hero_cell.prefab
+++ b/Assets/prefabs/ui/common/hero_cell.prefab
@ -30,7 +30,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 3357254900952041124}
-  m_RootOrder: 6
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -159,16 +159,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 463051881752968921}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3357254900952041124}
-  m_RootOrder: 7
+  m_Father: {fileID: 1549891444253958721}
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -44, y: -71}
+  m_AnchoredPosition: {x: -44, y: 0}
  m_SizeDelta: {x: 32, y: 32}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2536024240531748565
@ -209,6 +209,81 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1169547910251918195
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6481811374413750581}
+  - component: {fileID: 1295362842029712067}
+  - component: {fileID: 4561833893916831764}
+  m_Layer: 5
+  m_Name: lock
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6481811374413750581
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1169547910251918195}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4836602531196866153}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -56, y: 150}
+  m_SizeDelta: {x: 44, y: 44}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1295362842029712067
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1169547910251918195}
+  m_CullTransparentMesh: 1
+--- !u!114 &4561833893916831764
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1169547910251918195}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3365775747780917783
 GameObject:
  m_ObjectHideFlags: 0
@ -313,12 +388,12 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3357254900952041124}
-  m_RootOrder: 5
+  m_Father: {fileID: 1549891444253958721}
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -71}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 89, y: 31}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1314085980636127276
@ -518,16 +593,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3980620953055471096}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3357254900952041124}
-  m_RootOrder: 4
+  m_Father: {fileID: 1549891444253958721}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -71}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 98, y: 24}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5973987437485769901
@ -562,6 +637,141 @@ MonoBehaviour:
  m_FillDirection: 0
  m_Value: 1
  m_FillCenter: 1
+--- !u!1 &5419043625903708716
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4836602531196866153}
+  - component: {fileID: 475194763958158683}
+  - component: {fileID: 8898428075711890928}
+  m_Layer: 5
+  m_Name: unlock_tx
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4836602531196866153
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5419043625903708716}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6481811374413750581}
+  m_Father: {fileID: 3357254900952041124}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -60}
+  m_SizeDelta: {x: 89, y: 31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &475194763958158683
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5419043625903708716}
+  m_CullTransparentMesh: 1
+--- !u!114 &8898428075711890928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5419043625903708716}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6679154729212616606
 GameObject:
  m_ObjectHideFlags: 0
@ -595,10 +805,8 @@ RectTransform:
  - {fileID: 3365151691530395721}
  - {fileID: 7485681934836625276}
  - {fileID: 1549891444253958721}
-  - {fileID: 5461218779571924405}
-  - {fileID: 6038587744778571334}
  - {fileID: 6555570717243424459}
-  - {fileID: 3377266600146884313}
+  - {fileID: 4836602531196866153}
  m_Father: {fileID: 2568998946116628564}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -748,6 +956,14 @@ MonoBehaviour:
    hashName: 2729627118
    objectType: 0
    gameObject: {fileID: 36593263334551080}
+  - name: hero_cell.hero_bg.unlock_tx
+    hashName: 3979319156
+    objectType: 0
+    gameObject: {fileID: 5419043625903708716}
+  - name: hero_cell.hero_bg.progress_bg
+    hashName: 3597872236
+    objectType: 0
+    gameObject: {fileID: 8748012947855194358}
 --- !u!225 &6876715644725703649
 CanvasGroup:
  m_ObjectHideFlags: 0
@ -972,7 +1188,10 @@ RectTransform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 5461218779571924405}
+  - {fileID: 3377266600146884313}
+  - {fileID: 6038587744778571334}
  m_Father: {fileID: 3357254900952041124}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/prefabs/ui/hero/hero_ui.prefab
+++ b/Assets/prefabs/ui/hero/hero_ui.prefab
@ -404,8 +404,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -1670.8}
-  m_SizeDelta: {x: 720, y: 2972}
+  m_AnchoredPosition: {x: 0, y: -741.9655}
+  m_SizeDelta: {x: 720, y: 649.9138}
  m_Pivot: {x: 0.5, y: 0.6}
 --- !u!114 &7141566688789457768
 MonoBehaviour:
@ -1378,6 +1378,10 @@ MonoBehaviour:
    hashName: 2601848281
    objectType: 0
    gameObject: {fileID: 7701579831426425270}
+  - name: hero_ui.scrollrect.viewport
+    hashName: 3086284622
+    objectType: 0
+    gameObject: {fileID: 8828537705071452128}
 --- !u!1 &6456592540508302520
 GameObject:
  m_ObjectHideFlags: 0
@ -1899,7 +1903,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 720, y: 1954}
+  m_SizeDelta: {x: 720, y: 649.9138}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &822048272817942488
 MonoBehaviour:
--- a/Assets/prefabs/ui/main_city/main_ui.prefab
+++ b/Assets/prefabs/ui/main_city/main_ui.prefab
@ -1880,7 +1880,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8461932745927490369, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
      propertyPath: m_Pivot.x