GemBattle.git - Gitblit

parent: ddd1064c | patch | commit | ignore whitespace

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-26 18ce923e39033c39c4cab84581d03a492cb730f4

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

6 files modified

	Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab	6 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab	6 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab	6 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab	15 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab	6 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Endless/BottomCanvas.prefab	6 ●●●●● patch \| view \| raw \| blame \| history

 Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab

@@ -43961,17 +43961,17 @@
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}

 Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab

@@ -86976,17 +86976,17 @@
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}

 Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab

@@ -129991,17 +129991,17 @@
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}

 Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab

@@ -130194,6 +130194,21 @@
      propertyPath: m_LocalScale.z
      value: 0.5
      objectReference: {fileID: 0}
    - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_Name

 Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab

@@ -130167,17 +130167,17 @@
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 0.5
      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
        type: 3}

 Assets/Prefabs/UI/Endless/BottomCanvas.prefab

@@ -6221,12 +6221,12 @@
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 144
      value: 992
      objectReference: {fileID: 0}
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 553
      value: 502
      objectReference: {fileID: 0}
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
@@ -7243,7 +7243,7 @@
    - target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 436
      value: 502
      objectReference: {fileID: 0}
    - target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
        type: 3}

			@@ -43961,17 +43961,17 @@
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.x
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.y
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.z
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}

			@@ -86976,17 +86976,17 @@
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.x
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.y
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.z
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}

			@@ -129991,17 +129991,17 @@
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.x
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.y
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.z
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}

			@@ -130194,6 +130194,21 @@
			propertyPath: m_LocalScale.z
			value: 0.5
			objectReference: {fileID: 0}
			- target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.x
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.y
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.z
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_Name

			@@ -130167,17 +130167,17 @@
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.x
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.y
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}
			propertyPath: m_LocalScale.z
			value: 0.5
			value: 0.3
			objectReference: {fileID: 0}
			- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
			type: 3}

			@@ -6221,12 +6221,12 @@
			- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
			type: 3}
			propertyPath: m_AnchoredPosition.x
			value: 144
			value: 992
			objectReference: {fileID: 0}
			- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
			type: 3}
			propertyPath: m_AnchoredPosition.y
			value: 553
			value: 502
			objectReference: {fileID: 0}
			- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
			type: 3}
			@@ -7243,7 +7243,7 @@
			- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
			type: 3}
			propertyPath: m_AnchoredPosition.y
			value: 436
			value: 502
			objectReference: {fileID: 0}
			- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
			type: 3}