GemBattle.git - Gitblit

parent: fdfb88a9 | patch | commit | ignore whitespace

chenxin

2020-11-19 1213446becf0fd501829ed8e6532b64cf904b2f6

打包

5 files added

24 files modified

	And/GemBattle.apk	patch \| view \| raw \| blame \| history
	Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta	2 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta	5 ●●●●● patch \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs	4 ●●●●● 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/Sirenix.OdinInspector.Attributes.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Sirenix.Serialization.Config.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Sirenix.Serialization.dll	patch \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/Managed/Sirenix.Utilities.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/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/sharedassets1.assets.resS	patch \| view \| raw \| blame \| history

 And/GemBattle.apk

Binary files differ

 Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta

@@ -95,7 +95,7 @@
  - first:
      Standalone: Win64
    second:
      enabled: 1
      enabled: 0
      settings:
        CPU: 
  - first:

 Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta

@@ -95,7 +95,7 @@
  - first:
      Standalone: Win64
    second:
      enabled: 1
      enabled: 0
      settings:
        CPU: 
  - first:

 Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta

@@ -85,6 +85,11 @@
      enabled: 1
      settings: {}
  - first:
      Standalone: Win64
    second:
      enabled: 1
      settings: {}
  - first:
      WebGL: WebGL
    second:
      enabled: 1

 Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta

@@ -85,6 +85,11 @@
      enabled: 1
      settings: {}
  - first:
      Standalone: Win64
    second:
      enabled: 1
      settings: {}
  - first:
      WebGL: WebGL
    second:
      enabled: 1

 Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs

@@ -191,9 +191,7 @@
            Image obj = Instantiate(OneTimeKillObj);
            obj.transform.SetParent(GameObject.Find("Panel").transform, false);
            obj.sprite = Resources.Load<Sprite>($"UI/DoubleHit/hit_{count}");
            Animator animator = obj.GetComponent<Animator>();
            AnimatorClipInfo[] animatorClipInfos = animator.GetCurrentAnimatorClipInfo(0);
            Destroy(obj.gameObject, animatorClipInfos[0].clip.length);
            Destroy(obj.gameObject, 0.59f);
        }

        private void OnShowOneTimeKillComplete()

 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/Sirenix.OdinInspector.Attributes.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Sirenix.Serialization.Config.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Sirenix.Serialization.dll

Binary files differ

 GemBattle/宝石塔防_Data/Managed/Sirenix.Utilities.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/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/sharedassets1.assets.resS

Binary files differ

			@@ -95,7 +95,7 @@
			- first:
			Standalone: Win64
			second:
			enabled: 1
			enabled: 0
			settings:
			CPU:
			- first:

			@@ -85,6 +85,11 @@
			enabled: 1
			settings: {}
			- first:
			Standalone: Win64
			second:
			enabled: 1
			settings: {}
			- first:
			WebGL: WebGL
			second:
			enabled: 1

			@@ -191,9 +191,7 @@
			Image obj = Instantiate(OneTimeKillObj);
			obj.transform.SetParent(GameObject.Find("Panel").transform, false);
			obj.sprite = Resources.Load<Sprite>($"UI/DoubleHit/hit_{count}");
			Animator animator = obj.GetComponent<Animator>();
			AnimatorClipInfo[] animatorClipInfos = animator.GetCurrentAnimatorClipInfo(0);
			Destroy(obj.gameObject, animatorClipInfos[0].clip.length);
			Destroy(obj.gameObject, 0.59f);
			}

			private void OnShowOneTimeKillComplete()