Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-31 5b08cbf22299ff750452eb24ce9398c5dd950953

Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

 Assets/Animations/Endless/Boss_Standing.anim

@@ -20,13 +20,13 @@
  m_PPtrCurves:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, type: 3}
      value: {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
    - time: 0.1
      value: {fileID: 21300000, guid: 8db35398193affa479065700b24b95c9, type: 3}
      value: {fileID: 21300000, guid: ab749929ad1ce294da69693e42f80590, type: 3}
    - time: 0.2
      value: {fileID: 21300000, guid: bfa3f1d04db2a7849b85c1b9ed44da4b, type: 3}
      value: {fileID: 21300000, guid: 4fd8f1f8d7ea9c148bb11e7edd19fda9, type: 3}
    - time: 0.3
      value: {fileID: 21300000, guid: b20fb97cac43bce438f3e3be77634794, type: 3}
      value: {fileID: 21300000, guid: b4196b5ed6f8fbb40af4edbfa9db2dbf, type: 3}
    attribute: m_Sprite
    path: 
    classID: 114
@@ -46,10 +46,10 @@
      customType: 0
      isPPtrCurve: 1
    pptrCurveMapping:
    - {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, type: 3}
    - {fileID: 21300000, guid: 8db35398193affa479065700b24b95c9, type: 3}
    - {fileID: 21300000, guid: bfa3f1d04db2a7849b85c1b9ed44da4b, type: 3}
    - {fileID: 21300000, guid: b20fb97cac43bce438f3e3be77634794, type: 3}
    - {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
    - {fileID: 21300000, guid: ab749929ad1ce294da69693e42f80590, type: 3}
    - {fileID: 21300000, guid: 4fd8f1f8d7ea9c148bb11e7edd19fda9, type: 3}
    - {fileID: 21300000, guid: b4196b5ed6f8fbb40af4edbfa9db2dbf, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}

 Assets/Animations/Endless/Boss_Summon.anim

@@ -20,21 +20,21 @@
  m_PPtrCurves:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
      value: {fileID: 21300000, guid: 88730395492cc214390dc404395da017, type: 3}
    - time: 0.1
      value: {fileID: 21300000, guid: b1c1221f9e98d114796186481b0150c2, type: 3}
      value: {fileID: 21300000, guid: 39d0b8564b89cc847b8ffecb2a09f30a, type: 3}
    - time: 0.2
      value: {fileID: 21300000, guid: ad5b59c89f1bc3b41b9705f02b67eefa, type: 3}
      value: {fileID: 21300000, guid: 9a1d9d86b179e6b4491fea327d66993e, type: 3}
    - time: 0.3
      value: {fileID: 21300000, guid: b86aa0b361ce58e42bc3fc746dad7750, type: 3}
      value: {fileID: 21300000, guid: 7fdf1c0e3aee99e4585f75a83085ef61, type: 3}
    - time: 0.4
      value: {fileID: 21300000, guid: d8b657dbab4a60c4e98c4cae98030e4b, type: 3}
      value: {fileID: 21300000, guid: 4675764e80046444b9d3d0ad9275c7f4, type: 3}
    - time: 0.5
      value: {fileID: 21300000, guid: 97cf279232a99f24cb0b930520af87af, type: 3}
      value: {fileID: 21300000, guid: 674fffb864188e942883b33c7109e8d8, type: 3}
    - time: 0.6
      value: {fileID: 21300000, guid: 6b250b585c8e8294a8b65786e817b97d, type: 3}
      value: {fileID: 21300000, guid: 8ce8b4310f886e644b58afcc0ad29785, type: 3}
    - time: 0.7
      value: {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
      value: {fileID: 21300000, guid: 5d0f96e085a6b7d4ba41b57ca482917a, type: 3}
    attribute: m_Sprite
    path: 
    classID: 114
@@ -54,14 +54,14 @@
      customType: 0
      isPPtrCurve: 1
    pptrCurveMapping:
    - {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
    - {fileID: 21300000, guid: b1c1221f9e98d114796186481b0150c2, type: 3}
    - {fileID: 21300000, guid: ad5b59c89f1bc3b41b9705f02b67eefa, type: 3}
    - {fileID: 21300000, guid: b86aa0b361ce58e42bc3fc746dad7750, type: 3}
    - {fileID: 21300000, guid: d8b657dbab4a60c4e98c4cae98030e4b, type: 3}
    - {fileID: 21300000, guid: 97cf279232a99f24cb0b930520af87af, type: 3}
    - {fileID: 21300000, guid: 6b250b585c8e8294a8b65786e817b97d, type: 3}
    - {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
    - {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}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}

 Assets/Scenes/Levels/Battle/Endless.unity

@@ -972,7 +972,7 @@
  m_GameObject: {fileID: 114868870}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1.8, y: 1.8, z: 1.8}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 561495239}
  m_RootOrder: 7
@@ -1021,7 +1021,7 @@
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_Sprite: {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, type: 3}
  m_Sprite: {fileID: 21300000, guid: 0e39ed812eb123145b3d988dcf2d81d1, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1

 Assets/UI/Endless/boss/a_1.meta

File was renamed from Assets/UI/Endless/boss/s_4.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e6be7bc8c9d62634689be5b72d76872f
guid: 7b5cc35ba2af37f4e87ad8d5ed96fdd4
folderAsset: yes
DefaultImporter:
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0000.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 88730395492cc214390dc404395da017
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0001.png.meta

File was renamed from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 39d0b8564b89cc847b8ffecb2a09f30a
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0002.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 9a1d9d86b179e6b4491fea327d66993e
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0003.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 7fdf1c0e3aee99e4585f75a83085ef61
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0004.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 4675764e80046444b9d3d0ad9275c7f4
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0005.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 674fffb864188e942883b33c7109e8d8
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0006.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 8ce8b4310f886e644b58afcc0ad29785
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png

 Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png.meta

copy from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
copy to Assets/UI/Endless/boss/a_1/a_10000_0000_0007.png.meta
File was copied from Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d8b657dbab4a60c4e98c4cae98030e4b
guid: 5d0f96e085a6b7d4ba41b57ca482917a
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/a_4.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0000.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0001.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0002.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0003.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0004.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0005.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0006.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta

File was deleted

 Assets/UI/Endless/boss/a_4/a_40000_0007.png

Binary files differ

 Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta

File was deleted

 Assets/UI/Endless/boss/s_1.meta

copy from Assets/UI/Endless/boss/s_4.meta
copy to Assets/UI/Endless/boss/s_1.meta
File was copied from Assets/UI/Endless/boss/s_4.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e6be7bc8c9d62634689be5b72d76872f
guid: f5e6b6570628ae14197563a146f65d9c
folderAsset: yes
DefaultImporter:
  externalObjects: {}

 Assets/UI/Endless/boss/s_1/s_10000_0008.png

 Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta

copy from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
copy to Assets/UI/Endless/boss/s_1/s_10000_0008.png.meta
File was copied from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8db35398193affa479065700b24b95c9
guid: 0e39ed812eb123145b3d988dcf2d81d1
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/s_1/s_10000_0009.png

 Assets/UI/Endless/boss/s_1/s_10000_0009.png.meta

copy from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
copy to Assets/UI/Endless/boss/s_1/s_10000_0009.png.meta
File was copied from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8db35398193affa479065700b24b95c9
guid: ab749929ad1ce294da69693e42f80590
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/s_1/s_10000_0010.png

 Assets/UI/Endless/boss/s_1/s_10000_0010.png.meta

File was renamed from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8db35398193affa479065700b24b95c9
guid: 4fd8f1f8d7ea9c148bb11e7edd19fda9
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/s_1/s_10000_0011.png

 Assets/UI/Endless/boss/s_1/s_10000_0011.png.meta

copy from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
copy to Assets/UI/Endless/boss/s_1/s_10000_0011.png.meta
File was copied from Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8db35398193affa479065700b24b95c9
guid: b4196b5ed6f8fbb40af4edbfa9db2dbf
TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

 Assets/UI/Endless/boss/s_4/s_40000_0008.png

Binary files differ

 Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta

File was deleted

 Assets/UI/Endless/boss/s_4/s_40000_0009.png

Binary files differ

 Assets/UI/Endless/boss/s_4/s_40000_0010.png

Binary files differ

 Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta

File was deleted

 Assets/UI/Endless/boss/s_4/s_40000_0011.png

Binary files differ

 Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta

File was deleted