GemBattle.git - Gitblit

parent: 9a884eb3 | patch | commit | ignore whitespace

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

wangguan

2020-10-29 9154c42f5dece22c0391203c2a2ea4127d3a5793

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

24 files modified

	Assets/Materials/Guide/RectGuidance.mat	6 ●●●●● 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/level0	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/sharedassets0.assets	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
	ProjectSettings/ProjectSettings.asset	4 ●●●●● patch \| view \| raw \| blame \| history

 Assets/Materials/Guide/RectGuidance.mat

@@ -69,8 +69,8 @@
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _Slider: 81.39478
    - _SliderX: 79
    - _SliderY: 265
    - _SliderX: 189
    - _SliderY: 73.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -83,7 +83,7 @@
    - _UseUIAlphaClip: 0
    - _ZWrite: 1
    m_Colors:
    - _Center: {r: -145, g: 155, b: 0, a: 0}
    - _Center: {r: -3, g: -862, b: 0, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []

 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/level0

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/sharedassets0.assets

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

 ProjectSettings/ProjectSettings.asset

@@ -663,7 +663,7 @@
  webGLThreadsSupport: 0
  webGLDecompressionFallback: 0
  scriptingDefineSymbols:
    1: MOREMOUNTAINS_NICEVIBRATIONS;TDGA_CUSTOM
    1: MOREMOUNTAINS_NICEVIBRATIONS;TDAA_CUSTOM
    7: MOREMOUNTAINS_NICEVIBRATIONS;TDAA_CUSTOM
  platformArchitecture: {}
  scriptingBackend: {}
@@ -671,7 +671,7 @@
  managedStrippingLevel: {}
  incrementalIl2cppBuild: {}
  allowUnsafeCode: 0
  useDeterministicCompilation: 1
  useDeterministicCompilation: 0
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
  gcIncremental: 0

			@@ -69,8 +69,8 @@
			- _OcclusionStrength: 1
			- _Parallax: 0.02
			- _Slider: 81.39478
			- _SliderX: 79
			- _SliderY: 265
			- _SliderX: 189
			- _SliderY: 73.5
			- _SmoothnessTextureChannel: 0
			- _SpecularHighlights: 1
			- _SrcBlend: 1
			@@ -83,7 +83,7 @@
			- _UseUIAlphaClip: 0
			- _ZWrite: 1
			m_Colors:
			- _Center: {r: -145, g: 155, b: 0, a: 0}
			- _Center: {r: -3, g: -862, b: 0, a: 0}
			- _Color: {r: 1, g: 1, b: 1, a: 1}
			- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
			m_BuildTextureStacks: []

			@@ -663,7 +663,7 @@
			webGLThreadsSupport: 0
			webGLDecompressionFallback: 0
			scriptingDefineSymbols:
			1: MOREMOUNTAINS_NICEVIBRATIONS;TDGA_CUSTOM
			1: MOREMOUNTAINS_NICEVIBRATIONS;TDAA_CUSTOM
			7: MOREMOUNTAINS_NICEVIBRATIONS;TDAA_CUSTOM
			platformArchitecture: {}
			scriptingBackend: {}
			@@ -671,7 +671,7 @@
			managedStrippingLevel: {}
			incrementalIl2cppBuild: {}
			allowUnsafeCode: 0
			useDeterministicCompilation: 1
			useDeterministicCompilation: 0
			additionalIl2CppArgs:
			scriptingRuntimeVersion: 1
			gcIncremental: 0