GemBattle.git - Gitblit

parent: 8d6c8425 | patch | commit | ignore whitespace

wangguan

2020-11-13 09b62e30dac412fa29b1e63a0f637dfd21cbfb7a

修改木，水子弹

10 files added

11 files modified

	Assets/00000/package/Model/Bullet.fbx.meta	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/CopyCatTower_0.prefab	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/CopyCatTower_1.prefab	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/CopyCatTower_2.prefab	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/CopyCatTower_3.prefab	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/CopyCatTower_4.prefab	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_0 1.prefab	34055 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_0 1.prefab.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_1 1.prefab	34055 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_1 1.prefab.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_2 1.prefab	34055 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_2 1.prefab.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_3 1.prefab	34055 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_3 1.prefab.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_4 1.prefab	34055 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/Water/WaterProjectile_4 1.prefab.meta	10 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab	14775 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_1.prefab	14775 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_2.prefab	15097 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_3.prefab	15043 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/WProjectile_4.prefab	14775 ●●●●● patch \| view \| raw \| blame \| history

 Assets/00000/package/Model/Bullet.fbx.meta

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bd35323e928fb5b43828f6605aee2b5c
guid: c61ea245a55db9d4ab9e8004335671c0
ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:

 Assets/Prefabs/Towers/Water/CopyCatTower_0.prefab

@@ -19164,8 +19164,6 @@
  m_EditorClassIdentifier: 
  towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
    type: 3}
  buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
    type: 3}
  levelDamager: {fileID: 114588164740221456, guid: 2911a186c1af1ac4994b2bb264db9822,
@@ -43401,7 +43399,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1830508508936448, guid: 5d777067c17b96c43a3bd547d25cb893, type: 3}
  projectile: {fileID: 1830508508936448, guid: ea6e7c64a17622d4c929f3dc46d96390, type: 3}
  woodProjectile_SP: {fileID: 0}
  projectilePoints:
  - {fileID: 4457715277627928}
  epicenter: {fileID: 4795219791600268}

 Assets/Prefabs/Towers/Water/CopyCatTower_1.prefab

@@ -14617,8 +14617,6 @@
  m_EditorClassIdentifier: 
  towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
    type: 3}
  buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
    type: 3}
  levelDamager: {fileID: 114588164740221456, guid: e37342e84f9efa043b67c6a65116d035,
@@ -29115,7 +29113,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1830508508936448, guid: d01ad8c50e2c3054c9360437a90d5a98, type: 3}
  projectile: {fileID: 1830508508936448, guid: 2fed87ef6aa9abe40b6f5a23314fd9aa, type: 3}
  woodProjectile_SP: {fileID: 0}
  projectilePoints:
  - {fileID: 4129159134802836}
  epicenter: {fileID: 4187985146200546}

 Assets/Prefabs/Towers/Water/CopyCatTower_2.prefab

@@ -51,8 +51,6 @@
  m_EditorClassIdentifier: 
  towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
    type: 3}
  buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
    type: 3}
  levelDamager: {fileID: 114588164740221456, guid: 9d6caa3c6a140e7478c20791ead1e48f,
@@ -28909,7 +28907,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1830508508936448, guid: 130c2fff924206841a6dde7234fc3269, type: 3}
  projectile: {fileID: 1830508508936448, guid: e74dae4425a0cf9458fe3b9f0b8f6108, type: 3}
  woodProjectile_SP: {fileID: 0}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}

 Assets/Prefabs/Towers/Water/CopyCatTower_3.prefab

@@ -51,8 +51,6 @@
  m_EditorClassIdentifier: 
  towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
    type: 3}
  buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
    type: 3}
  levelDamager: {fileID: 114588164740221456, guid: d01fc05182fea73448bbf912c0ae090b,
@@ -28909,7 +28907,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1830508508936448, guid: fb658e2444ef21943a8d4b6b3c1a4fbc, type: 3}
  projectile: {fileID: 1830508508936448, guid: 83ec876cd03880a40bccc33b4d08178f, type: 3}
  woodProjectile_SP: {fileID: 0}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}

 Assets/Prefabs/Towers/Water/CopyCatTower_4.prefab

@@ -51,8 +51,6 @@
  m_EditorClassIdentifier: 
  towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
    type: 3}
  buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
    type: 3}
  UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
    type: 3}
  levelDamager: {fileID: 114588164740221456, guid: 4f899e2e5c237424da44de31e72b0c5b,
@@ -28909,7 +28907,8 @@
  m_Name: 
  m_EditorClassIdentifier: 
  description: Offensive
  projectile: {fileID: 1830508508936448, guid: 688e38a12a3ea1142af63fef0dfac7ad, type: 3}
  projectile: {fileID: 1830508508936448, guid: 235a91af7dfc977419570e9a19441f8b, type: 3}
  woodProjectile_SP: {fileID: 0}
  projectilePoints:
  - {fileID: 4575828760328406}
  epicenter: {fileID: 4737672716932362}

 Assets/Prefabs/Towers/Water/WaterProjectile_0 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Water/WaterProjectile_0 1.prefab.meta

New file
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: ea6e7c64a17622d4c929f3dc46d96390
timeCreated: 1529401657
licenseType: Store
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Water/WaterProjectile_1 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Water/WaterProjectile_1 1.prefab.meta

New file
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2fed87ef6aa9abe40b6f5a23314fd9aa
timeCreated: 1529401657
licenseType: Store
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Water/WaterProjectile_2 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Water/WaterProjectile_2 1.prefab.meta

New file
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: e74dae4425a0cf9458fe3b9f0b8f6108
timeCreated: 1529401657
licenseType: Store
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Water/WaterProjectile_3 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Water/WaterProjectile_3 1.prefab.meta

New file
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 83ec876cd03880a40bccc33b4d08178f
timeCreated: 1529401657
licenseType: Store
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/Water/WaterProjectile_4 1.prefab

New file
Diff too large

 Assets/Prefabs/Towers/Water/WaterProjectile_4 1.prefab.meta

New file
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 235a91af7dfc977419570e9a19441f8b
timeCreated: 1529401657
licenseType: Store
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab

Diff too large

 Assets/Prefabs/Towers/WoodTower/WProjectile_1.prefab

Diff too large

 Assets/Prefabs/Towers/WoodTower/WProjectile_2.prefab

Diff too large

 Assets/Prefabs/Towers/WoodTower/WProjectile_3.prefab

Diff too large

 Assets/Prefabs/Towers/WoodTower/WProjectile_4.prefab

Diff too large

			@@ -1,5 +1,5 @@
			fileFormatVersion: 2
			guid: bd35323e928fb5b43828f6605aee2b5c
			guid: c61ea245a55db9d4ab9e8004335671c0
			ModelImporter:
			serializedVersion: 23
			fileIDToRecycleName:

			@@ -19164,8 +19164,6 @@
			m_EditorClassIdentifier:
			towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
			type: 3}
			buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
			type: 3}
			UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
			type: 3}
			levelDamager: {fileID: 114588164740221456, guid: 2911a186c1af1ac4994b2bb264db9822,
			@@ -43401,7 +43399,8 @@
			m_Name:
			m_EditorClassIdentifier:
			description: Offensive
			projectile: {fileID: 1830508508936448, guid: 5d777067c17b96c43a3bd547d25cb893, type: 3}
			projectile: {fileID: 1830508508936448, guid: ea6e7c64a17622d4c929f3dc46d96390, type: 3}
			woodProjectile_SP: {fileID: 0}
			projectilePoints:
			- {fileID: 4457715277627928}
			epicenter: {fileID: 4795219791600268}

			@@ -14617,8 +14617,6 @@
			m_EditorClassIdentifier:
			towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
			type: 3}
			buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
			type: 3}
			UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
			type: 3}
			levelDamager: {fileID: 114588164740221456, guid: e37342e84f9efa043b67c6a65116d035,
			@@ -29115,7 +29113,8 @@
			m_Name:
			m_EditorClassIdentifier:
			description: Offensive
			projectile: {fileID: 1830508508936448, guid: d01ad8c50e2c3054c9360437a90d5a98, type: 3}
			projectile: {fileID: 1830508508936448, guid: 2fed87ef6aa9abe40b6f5a23314fd9aa, type: 3}
			woodProjectile_SP: {fileID: 0}
			projectilePoints:
			- {fileID: 4129159134802836}
			epicenter: {fileID: 4187985146200546}

			@@ -51,8 +51,6 @@
			m_EditorClassIdentifier:
			towerGhostPrefab: {fileID: 114795132175009648, guid: 22686d2625244a842bf6f7690ffdb40f,
			type: 3}
			buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
			type: 3}
			UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
			type: 3}
			levelDamager: {fileID: 114588164740221456, guid: 9d6caa3c6a140e7478c20791ead1e48f,
			@@ -28909,7 +28907,8 @@
			m_Name:
			m_EditorClassIdentifier:
			description: Offensive
			projectile: {fileID: 1830508508936448, guid: 130c2fff924206841a6dde7234fc3269, type: 3}
			projectile: {fileID: 1830508508936448, guid: e74dae4425a0cf9458fe3b9f0b8f6108, type: 3}
			woodProjectile_SP: {fileID: 0}
			projectilePoints:
			- {fileID: 4575828760328406}
			epicenter: {fileID: 4737672716932362}

New file
			@@ -0,0 +1,10 @@
			fileFormatVersion: 2
			guid: ea6e7c64a17622d4c929f3dc46d96390
			timeCreated: 1529401657
			licenseType: Store
			NativeFormatImporter:
			externalObjects: {}
			mainObjectFileID: 100100000
			userData:
			assetBundleName:
			assetBundleVariant: