chenxin
2020-11-10 953bd094847c309b46030593d120e56d30a4544e
Merge commit '820e4f5728b5ec6ec6d7d9395b86c54e210c116c' into master
2 files renamed
31 files copied
23 files deleted
31 files added
33 files modified
1668 ■■■■ changed files
And/GemBattle.apk patch | view | raw | blame | history
Assets/Animations/Endless/BossAniCtrl.controller 110 ●●●●● patch | view | raw | blame | history
Assets/Animations/Endless/Boss_Death.anim 76 ●●●●● patch | view | raw | blame | history
Assets/Animations/Endless/Boss_Standing.anim 38 ●●●●● patch | view | raw | blame | history
Assets/Animations/Endless/Boss_Summon.anim 50 ●●●● patch | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 7 ●●●●● patch | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 1 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs 10 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs 8 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0008.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0008.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0009.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0009.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0010.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0010.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0011.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0011.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0012.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0012.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0013.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0013.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0014.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0014.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0015.png patch | view | raw | blame | history
Assets/UI/Endless/boss/a_1/a_10000_0015.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0008.png patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0009.png patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0009.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0010.png patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0010.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0011.png patch | view | raw | blame | history
Assets/UI/Endless/boss/s_1/s_10000_0011.png.meta 118 ●●●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0016.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0016.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0017.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0017.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0018.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0018.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0019.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0019.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0020.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0020.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0021.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0021.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0022.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0022.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0023.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0023.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0024.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0024.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0025.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0025.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0026.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0026.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0027.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0027.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0028.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0028.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0029.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0029.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0030.png patch | view | raw | blame | history
Assets/UI/Endless/boss/sw_1/sw_10000_0030.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0000.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0000.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0001.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0001.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0002.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0002.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0003.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0003.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0004.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0004.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0005.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0005.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0006.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0006.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0007.png patch | view | raw | blame | history
Assets/UI/Endless/boss/z_1/z_10000_0007.png.meta 2 ●●● patch | view | raw | blame | history
Assets/UI/tileWaitBuy.png patch | view | raw | blame | history
Assets/UI/tileWaitBuy.png.meta 2 ●●● patch | view | raw | blame | history
GemBattle.zip patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll patch | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers patch | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 patch | view | raw | blame | history
GemBattle/宝石塔防_Data/level2 patch | view | raw | blame | history
GemBattle/宝石塔防_Data/level3 patch | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets.resS patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets.resS patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets patch | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets.resS patch | view | raw | blame | history
And/GemBattle.apk
Binary files differ
Assets/Animations/Endless/BossAniCtrl.controller
@@ -12,6 +12,7 @@
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3415644705494399158}
  - {fileID: 4147007038900216743}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -37,7 +38,9 @@
  m_Name: Boss_Death
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
  m_Transitions:
  - {fileID: 8495300801505481333}
  - {fileID: 3717016447630417514}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -106,6 +109,56 @@
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &3717016447630417514
AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name:
  m_Conditions:
  - m_ConditionMode: 6
    m_ConditionEvent: State
    m_EventTreshold: 1
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -5306412402751564557}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
  m_ExitTime: 0.8
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &4147007038900216743
AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name:
  m_Conditions:
  - m_ConditionMode: 6
    m_ConditionEvent: State
    m_EventTreshold: 2
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -5019473085201770094}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
  m_ExitTime: 0.625
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1107 &5494319997971291351
AnimatorStateMachine:
  serializedVersion: 5
@@ -123,13 +176,13 @@
    m_Position: {x: 10, y: 430, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -5019473085201770094}
    m_Position: {x: 390, y: 290, z: 0}
    m_Position: {x: 240, y: 340, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_AnyStatePosition: {x: 220, y: 30, z: 0}
  m_EntryPosition: {x: 20, y: 130, z: 0}
  m_ExitPosition: {x: 350, y: 100, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@@ -171,6 +224,7 @@
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 7445845012217583020}
  - {fileID: 8941273312195821849}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -186,3 +240,53 @@
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &8495300801505481333
AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name:
  m_Conditions:
  - m_ConditionMode: 6
    m_ConditionEvent: State
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 7540435519779049080}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
  m_ExitTime: 0.8
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &8941273312195821849
AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name:
  m_Conditions:
  - m_ConditionMode: 6
    m_ConditionEvent: State
    m_EventTreshold: 2
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -5019473085201770094}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
  m_ExitTime: 0.625
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
Assets/Animations/Endless/Boss_Death.anim
@@ -17,21 +17,78 @@
  m_PositionCurves: []
  m_ScaleCurves: []
  m_FloatCurves: []
  m_PPtrCurves: []
  m_SampleRate: 60
  m_PPtrCurves:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 4f69626a5f254004caa28a9f60918a6c, type: 3}
    - time: 0.125
      value: {fileID: 21300000, guid: 85521a969298c404da84eabc40941407, type: 3}
    - time: 0.25
      value: {fileID: 21300000, guid: 2f9d7ddceba87234086aa5476270bb47, type: 3}
    - time: 0.375
      value: {fileID: 21300000, guid: 2e78a56c4ad36e6418d4fd9f90155cd2, type: 3}
    - time: 0.5
      value: {fileID: 21300000, guid: 4b75ab8d9a0a93f458b187fa66544734, type: 3}
    - time: 0.625
      value: {fileID: 21300000, guid: f94ba20485789cd499ae02dede1566e8, type: 3}
    - time: 0.75
      value: {fileID: 21300000, guid: ef442bb3f19936443a275ccae8398fb5, type: 3}
    - time: 0.875
      value: {fileID: 21300000, guid: 287a532d3a2bacd46bb293a0bc776574, type: 3}
    - time: 1
      value: {fileID: 21300000, guid: d3a8fef36cb6ae64d9fe66393e953fe7, type: 3}
    - time: 1.125
      value: {fileID: 21300000, guid: 5afdb83e870b3ab4284927f67468a5cd, type: 3}
    - time: 1.25
      value: {fileID: 21300000, guid: 4c988feb059c5b041ba8d1f9d41d848b, type: 3}
    - time: 1.375
      value: {fileID: 21300000, guid: f00733c914808fa419d34c8f2fe67cf0, type: 3}
    - time: 1.5
      value: {fileID: 21300000, guid: 530b19737a31cc4429f0b5bca74b5277, type: 3}
    - time: 1.625
      value: {fileID: 21300000, guid: 0a839f97a8e524c4ab5990c65bb4a9ab, type: 3}
    - time: 1.75
      value: {fileID: 21300000, guid: 537669a98a163314d92c16bcdfac547b, type: 3}
    attribute: m_Sprite
    path:
    classID: 114
    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_SampleRate: 8
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
    genericBindings: []
    pptrCurveMapping: []
    genericBindings:
    - serializedVersion: 2
      path: 0
      attribute: 2015549526
      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
      typeID: 114
      customType: 0
      isPPtrCurve: 1
    pptrCurveMapping:
    - {fileID: 21300000, guid: 4f69626a5f254004caa28a9f60918a6c, type: 3}
    - {fileID: 21300000, guid: 85521a969298c404da84eabc40941407, type: 3}
    - {fileID: 21300000, guid: 2f9d7ddceba87234086aa5476270bb47, type: 3}
    - {fileID: 21300000, guid: 2e78a56c4ad36e6418d4fd9f90155cd2, type: 3}
    - {fileID: 21300000, guid: 4b75ab8d9a0a93f458b187fa66544734, type: 3}
    - {fileID: 21300000, guid: f94ba20485789cd499ae02dede1566e8, type: 3}
    - {fileID: 21300000, guid: ef442bb3f19936443a275ccae8398fb5, type: 3}
    - {fileID: 21300000, guid: 287a532d3a2bacd46bb293a0bc776574, type: 3}
    - {fileID: 21300000, guid: d3a8fef36cb6ae64d9fe66393e953fe7, type: 3}
    - {fileID: 21300000, guid: 5afdb83e870b3ab4284927f67468a5cd, type: 3}
    - {fileID: 21300000, guid: 4c988feb059c5b041ba8d1f9d41d848b, type: 3}
    - {fileID: 21300000, guid: f00733c914808fa419d34c8f2fe67cf0, type: 3}
    - {fileID: 21300000, guid: 530b19737a31cc4429f0b5bca74b5277, type: 3}
    - {fileID: 21300000, guid: 0a839f97a8e524c4ab5990c65bb4a9ab, type: 3}
    - {fileID: 21300000, guid: 537669a98a163314d92c16bcdfac547b, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
    m_StopTime: 1
    m_StopTime: 1.875
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -50,4 +107,11 @@
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
  m_Events: []
  m_Events:
  - time: 1.75
    functionName: FireAnimationEvent
    data: death
    objectReferenceParameter: {fileID: 0}
    floatParameter: 0
    intParameter: 0
    messageOptions: 0
Assets/Animations/Endless/Boss_Standing.anim
@@ -20,18 +20,26 @@
  m_PPtrCurves:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
    - time: 0.1
      value: {fileID: 21300000, guid: ab749929ad1ce294da69693e42f80590, type: 3}
    - time: 0.2
      value: {fileID: 21300000, guid: 4fd8f1f8d7ea9c148bb11e7edd19fda9, type: 3}
    - time: 0.3
      value: {fileID: 21300000, guid: b4196b5ed6f8fbb40af4edbfa9db2dbf, type: 3}
      value: {fileID: 21300000, guid: f1aa154024c451b449fa40b9c866b2c2, type: 3}
    - time: 0.125
      value: {fileID: 21300000, guid: 73c417781b843144a84f215f322c53ce, type: 3}
    - time: 0.25
      value: {fileID: 21300000, guid: 7c9b84f279b945a46b9fe60f61f3a959, type: 3}
    - time: 0.375
      value: {fileID: 21300000, guid: b10b56b9b56626c4990c519b70f8933d, type: 3}
    - time: 0.5
      value: {fileID: 21300000, guid: 9ac4e88ca573a1e41910141b0fb985a9, type: 3}
    - time: 0.625
      value: {fileID: 21300000, guid: ed10c3750661ddb47ab84fe244061426, type: 3}
    - time: 0.75
      value: {fileID: 21300000, guid: ee09881bf0880314a8935566dcb02aa6, type: 3}
    - time: 0.875
      value: {fileID: 21300000, guid: 04dacff6b85b5654a828ddee2d56ff48, type: 3}
    attribute: m_Sprite
    path: 
    classID: 114
    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_SampleRate: 10
  m_SampleRate: 8
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@@ -46,16 +54,20 @@
      customType: 0
      isPPtrCurve: 1
    pptrCurveMapping:
    - {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
    - {fileID: 21300000, guid: ab749929ad1ce294da69693e42f80590, type: 3}
    - {fileID: 21300000, guid: 4fd8f1f8d7ea9c148bb11e7edd19fda9, type: 3}
    - {fileID: 21300000, guid: b4196b5ed6f8fbb40af4edbfa9db2dbf, type: 3}
    - {fileID: 21300000, guid: f1aa154024c451b449fa40b9c866b2c2, type: 3}
    - {fileID: 21300000, guid: 73c417781b843144a84f215f322c53ce, type: 3}
    - {fileID: 21300000, guid: 7c9b84f279b945a46b9fe60f61f3a959, type: 3}
    - {fileID: 21300000, guid: b10b56b9b56626c4990c519b70f8933d, type: 3}
    - {fileID: 21300000, guid: 9ac4e88ca573a1e41910141b0fb985a9, type: 3}
    - {fileID: 21300000, guid: ed10c3750661ddb47ab84fe244061426, type: 3}
    - {fileID: 21300000, guid: ee09881bf0880314a8935566dcb02aa6, type: 3}
    - {fileID: 21300000, guid: 04dacff6b85b5654a828ddee2d56ff48, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
    m_StopTime: 0.4
    m_StopTime: 1
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
Assets/Animations/Endless/Boss_Summon.anim
@@ -20,26 +20,26 @@
  m_PPtrCurves:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 88730395492cc214390dc404395da017, type: 3}
    - time: 0.1
      value: {fileID: 21300000, guid: 39d0b8564b89cc847b8ffecb2a09f30a, type: 3}
    - time: 0.2
      value: {fileID: 21300000, guid: 9a1d9d86b179e6b4491fea327d66993e, type: 3}
    - time: 0.3
      value: {fileID: 21300000, guid: 7fdf1c0e3aee99e4585f75a83085ef61, type: 3}
    - time: 0.4
      value: {fileID: 21300000, guid: 4675764e80046444b9d3d0ad9275c7f4, type: 3}
      value: {fileID: 21300000, guid: efead474954cf2e439fc5a1d7546d1c9, type: 3}
    - time: 0.125
      value: {fileID: 21300000, guid: 1c03ed4789578534b92e54d59285bc96, type: 3}
    - time: 0.25
      value: {fileID: 21300000, guid: 5b09f9622e17d1c4f87882dcf8b7a355, type: 3}
    - time: 0.375
      value: {fileID: 21300000, guid: 536e940715110584db64c8fd8356323b, type: 3}
    - time: 0.5
      value: {fileID: 21300000, guid: 674fffb864188e942883b33c7109e8d8, type: 3}
    - time: 0.6
      value: {fileID: 21300000, guid: 8ce8b4310f886e644b58afcc0ad29785, type: 3}
    - time: 0.7
      value: {fileID: 21300000, guid: 5d0f96e085a6b7d4ba41b57ca482917a, type: 3}
      value: {fileID: 21300000, guid: e932ae2859f41424faa236780d7ce9dc, type: 3}
    - time: 0.625
      value: {fileID: 21300000, guid: 7823d67c5137e89479fdbfaa50cc92b5, type: 3}
    - time: 0.75
      value: {fileID: 21300000, guid: 2b047f293f907ff49bfa4f546dec8f5d, type: 3}
    - time: 0.875
      value: {fileID: 21300000, guid: 8af4a3ae89e9b4c45877a263ffe26ba8, type: 3}
    attribute: m_Sprite
    path: 
    classID: 114
    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_SampleRate: 10
  m_SampleRate: 8
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@@ -54,20 +54,20 @@
      customType: 0
      isPPtrCurve: 1
    pptrCurveMapping:
    - {fileID: 21300000, guid: 88730395492cc214390dc404395da017, type: 3}
    - {fileID: 21300000, guid: 39d0b8564b89cc847b8ffecb2a09f30a, type: 3}
    - {fileID: 21300000, guid: 9a1d9d86b179e6b4491fea327d66993e, type: 3}
    - {fileID: 21300000, guid: 7fdf1c0e3aee99e4585f75a83085ef61, type: 3}
    - {fileID: 21300000, guid: 4675764e80046444b9d3d0ad9275c7f4, type: 3}
    - {fileID: 21300000, guid: 674fffb864188e942883b33c7109e8d8, type: 3}
    - {fileID: 21300000, guid: 8ce8b4310f886e644b58afcc0ad29785, type: 3}
    - {fileID: 21300000, guid: 5d0f96e085a6b7d4ba41b57ca482917a, type: 3}
    - {fileID: 21300000, guid: efead474954cf2e439fc5a1d7546d1c9, type: 3}
    - {fileID: 21300000, guid: 1c03ed4789578534b92e54d59285bc96, type: 3}
    - {fileID: 21300000, guid: 5b09f9622e17d1c4f87882dcf8b7a355, type: 3}
    - {fileID: 21300000, guid: 536e940715110584db64c8fd8356323b, type: 3}
    - {fileID: 21300000, guid: e932ae2859f41424faa236780d7ce9dc, type: 3}
    - {fileID: 21300000, guid: 7823d67c5137e89479fdbfaa50cc92b5, type: 3}
    - {fileID: 21300000, guid: 2b047f293f907ff49bfa4f546dec8f5d, type: 3}
    - {fileID: 21300000, guid: 8af4a3ae89e9b4c45877a263ffe26ba8, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
    m_StopTime: 0.8
    m_StopTime: 1
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -87,7 +87,7 @@
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
  m_Events:
  - time: 0.7
  - time: 0.875
    functionName: FireAnimationEvent
    data: summonEnd
    objectReferenceParameter: {fileID: 0}
Assets/Scenes/Levels/Battle/Endless.unity
@@ -761,7 +761,7 @@
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 114868870}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalPosition: {x: 0, y: 0, z: -0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 561495239}
@@ -769,7 +769,7 @@
  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: 18, y: 584}
  m_AnchoredPosition: {x: 18, y: 590}
  m_SizeDelta: {x: 1080, y: 1080}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &114868872
@@ -811,7 +811,7 @@
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
  m_Sprite: {fileID: 21300000, guid: f1aa154024c451b449fa40b9c866b2c2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -8594,6 +8594,7 @@
  TowerAppearEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  MinLevel: 0
  temporaryMat: {fileID: 0}
--- !u!114 &1340671926
MonoBehaviour:
  m_ObjectHideFlags: 0
Assets/Scripts/Event/EventType.cs
@@ -49,6 +49,8 @@
        GuidePlayUpgradeEffect,
        // 无尽模式boss召唤结束
        EndlessBossSummonEnd,
        // 无尽模式boss死亡动作结束
        EndlessBossDeathActionEnd,
        // 无尽模式新的波次开始
        EndlessBeginWave,
        // 无尽模式boss技能泡泡炸弹受到一次攻击
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -421,6 +421,7 @@
        {
            IsAllWaveCompleted = true;
            EndlessBossSkillManager.instance.ClearSkillList();
            EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Death);
        }
        /// <summary>
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
@@ -84,6 +84,11 @@
                // 召唤动作结束后自动切换到站立状态
                ChangeState(EndlessBossActionState.Standing);
            }
            else if (frameName == "death")
            {
                BossAnimator.speed = 0;
                EventCenter.Ins.BroadCast((int)EventType.EndlessBossDeathActionEnd);
            }
        }
        /// <summary>
@@ -92,9 +97,10 @@
        /// <param name="newState"></param>
        public void ChangeState(EndlessBossActionState newState)
        {
            if (newState == ActionState) return;
            ActionState = newState;
            if (newState == EndlessBossActionState.Standing || newState == EndlessBossActionState.Summon)
                BossAnimator.speed = 1;
            BossAnimator.SetInteger("State", (int)newState);
        }
    }
Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs
@@ -1,4 +1,5 @@
using UnityEngine;
using TowerDefense.Level;
namespace TowerDefense.UI.HUD
{
@@ -82,8 +83,15 @@
                        tileRenderer.sharedMaterial = waitBuyMat;
                    break;
                case PlacementGridType.EGridOpen:
                    if (EndlessLevelManager.instanceExists)
                    {
                        tileRenderer.enabled = false;
                    }
                    else
                    {
                    if (tileRenderer != null && openMat != null)
                        tileRenderer.sharedMaterial = openMat;
                    }
                    break;
                case PlacementGridType.EGridDestroyed:
                    if (tileRenderer != null && destroyedMat != null)
Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png
Binary files differ
Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png.meta
File was deleted
Assets/UI/Endless/boss/a_1/a_10000_0008.png
Assets/UI/Endless/boss/a_1/a_10000_0008.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0008.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: efead474954cf2e439fc5a1d7546d1c9
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0009.png
Assets/UI/Endless/boss/a_1/a_10000_0009.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0009.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 1c03ed4789578534b92e54d59285bc96
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0010.png
Assets/UI/Endless/boss/a_1/a_10000_0010.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0010.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 5b09f9622e17d1c4f87882dcf8b7a355
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0011.png
Assets/UI/Endless/boss/a_1/a_10000_0011.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0011.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 536e940715110584db64c8fd8356323b
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0012.png
Assets/UI/Endless/boss/a_1/a_10000_0012.png.meta
File was renamed from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: e932ae2859f41424faa236780d7ce9dc
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0013.png
Assets/UI/Endless/boss/a_1/a_10000_0013.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0013.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 7823d67c5137e89479fdbfaa50cc92b5
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0014.png
Assets/UI/Endless/boss/a_1/a_10000_0014.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0014.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 2b047f293f907ff49bfa4f546dec8f5d
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/a_1/a_10000_0015.png
Assets/UI/Endless/boss/a_1/a_10000_0015.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/a_1/a_10000_0015.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 8af4a3ae89e9b4c45877a263ffe26ba8
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/s_1/s_10000_0008.png
Binary files differ
Assets/UI/Endless/boss/s_1/s_10000_0009.png
Binary files differ
Assets/UI/Endless/boss/s_1/s_10000_0009.png.meta
File was deleted
Assets/UI/Endless/boss/s_1/s_10000_0010.png
Binary files differ
Assets/UI/Endless/boss/s_1/s_10000_0010.png.meta
File was deleted
Assets/UI/Endless/boss/s_1/s_10000_0011.png
Binary files differ
Assets/UI/Endless/boss/s_1/s_10000_0011.png.meta
File was deleted
Assets/UI/Endless/boss/sw_1.meta
copy from Assets/UI/Endless/boss/s_1.meta copy to Assets/UI/Endless/boss/sw_1.meta
File was copied from Assets/UI/Endless/boss/s_1.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f5e6b6570628ae14197563a146f65d9c
guid: a647758c9c09cb24d8f9488de59ac9aa
folderAsset: yes
DefaultImporter:
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0016.png
Assets/UI/Endless/boss/sw_1/sw_10000_0016.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0016.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 4f69626a5f254004caa28a9f60918a6c
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0017.png
Assets/UI/Endless/boss/sw_1/sw_10000_0017.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0017.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 85521a969298c404da84eabc40941407
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0018.png
Assets/UI/Endless/boss/sw_1/sw_10000_0018.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0018.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 2f9d7ddceba87234086aa5476270bb47
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0019.png
Assets/UI/Endless/boss/sw_1/sw_10000_0019.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0019.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 2e78a56c4ad36e6418d4fd9f90155cd2
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0020.png
Assets/UI/Endless/boss/sw_1/sw_10000_0020.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0020.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 4b75ab8d9a0a93f458b187fa66544734
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0021.png
Assets/UI/Endless/boss/sw_1/sw_10000_0021.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0021.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: f94ba20485789cd499ae02dede1566e8
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0022.png
Assets/UI/Endless/boss/sw_1/sw_10000_0022.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0022.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: ef442bb3f19936443a275ccae8398fb5
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0023.png
Assets/UI/Endless/boss/sw_1/sw_10000_0023.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0023.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 287a532d3a2bacd46bb293a0bc776574
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0024.png
Assets/UI/Endless/boss/sw_1/sw_10000_0024.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0024.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: d3a8fef36cb6ae64d9fe66393e953fe7
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0025.png
Assets/UI/Endless/boss/sw_1/sw_10000_0025.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0025.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 5afdb83e870b3ab4284927f67468a5cd
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0026.png
Assets/UI/Endless/boss/sw_1/sw_10000_0026.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0026.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 4c988feb059c5b041ba8d1f9d41d848b
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0027.png
Assets/UI/Endless/boss/sw_1/sw_10000_0027.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0027.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: f00733c914808fa419d34c8f2fe67cf0
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0028.png
Assets/UI/Endless/boss/sw_1/sw_10000_0028.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0028.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 530b19737a31cc4429f0b5bca74b5277
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0029.png
Assets/UI/Endless/boss/sw_1/sw_10000_0029.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0029.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 0a839f97a8e524c4ab5990c65bb4a9ab
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/sw_1/sw_10000_0030.png
Assets/UI/Endless/boss/sw_1/sw_10000_0030.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/sw_1/sw_10000_0030.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 537669a98a163314d92c16bcdfac547b
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1.meta
File was renamed from Assets/UI/Endless/boss/s_1.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f5e6b6570628ae14197563a146f65d9c
guid: 00dcdb3bd3000cb4ca835096c5a789cc
folderAsset: yes
DefaultImporter:
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0000.png
Assets/UI/Endless/boss/z_1/z_10000_0000.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0000.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: f1aa154024c451b449fa40b9c866b2c2
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0001.png
Assets/UI/Endless/boss/z_1/z_10000_0001.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0001.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 73c417781b843144a84f215f322c53ce
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0002.png
Assets/UI/Endless/boss/z_1/z_10000_0002.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0002.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 7c9b84f279b945a46b9fe60f61f3a959
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0003.png
Assets/UI/Endless/boss/z_1/z_10000_0003.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0003.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: b10b56b9b56626c4990c519b70f8933d
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0004.png
Assets/UI/Endless/boss/z_1/z_10000_0004.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0004.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 9ac4e88ca573a1e41910141b0fb985a9
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0005.png
Assets/UI/Endless/boss/z_1/z_10000_0005.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0005.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: ed10c3750661ddb47ab84fe244061426
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0006.png
Assets/UI/Endless/boss/z_1/z_10000_0006.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0006.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: ee09881bf0880314a8935566dcb02aa6
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/Endless/boss/z_1/z_10000_0007.png
Assets/UI/Endless/boss/z_1/z_10000_0007.png.meta
copy from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta copy to Assets/UI/Endless/boss/z_1/z_10000_0007.png.meta
File was copied from Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0e39ed812eb123145b3d988dcf2d81d1
guid: 04dacff6b85b5654a828ddee2d56ff48
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
Assets/UI/tileWaitBuy.png

Assets/UI/tileWaitBuy.png.meta
@@ -6,7 +6,7 @@
  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
GemBattle.zip
Binary files differ
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll
Binary files differ
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll
Binary files differ
GemBattle/宝石塔防_Data/globalgamemanagers
Binary files differ
GemBattle/宝石塔防_Data/globalgamemanagers.assets
Binary files differ
GemBattle/宝石塔防_Data/level1
Binary files differ
GemBattle/宝石塔防_Data/level2
Binary files differ
GemBattle/宝石塔防_Data/level3
Binary files differ
GemBattle/宝石塔防_Data/resources.assets
Binary files differ
GemBattle/宝石塔防_Data/resources.assets.resS
Binary files differ
GemBattle/宝石塔防_Data/sharedassets1.assets
Binary files differ
GemBattle/宝石塔防_Data/sharedassets2.assets
Binary files differ
GemBattle/宝石塔防_Data/sharedassets2.assets.resS
Binary files differ
GemBattle/宝石塔防_Data/sharedassets3.assets
Binary files differ
GemBattle/宝石塔防_Data/sharedassets3.assets.resS
Binary files differ