GemBattle.git - Gitblit

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

liuzhiwei

2020-10-29 22d482183aa44aa2ffd837d8939a7b0bd15d28b9

refs
author	liuzhiwei <liuzhiwei@qq.com>
	Thursday, October 29, 2020 10:45 +0800
committer	liuzhiwei <liuzhiwei@qq.com>
	Thursday, October 29, 2020 10:45 +0800
commit	22d482183aa44aa2ffd837d8939a7b0bd15d28b9
tree	721594e9c9a372f371a0063eb629b1d9be351469 tree \| zip \| gz
parent	4ac78b7903b7395c229d168b4f51556f7666fbbf view \| diff 177de218b09057a908b8756f1d7af64a5bdcb798 view \| diff

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

# Conflicts:
#	Assets/00000/package/Materials/Sequence_034_4X3.mat

3 files renamed

3 files copied

12 files deleted

20 files added

24 files modified

	Assets/00000/package/Materials/Glow_029.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_029.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_029_b.mat	30 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Materials/Glow_029_b.mat.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/1028Effect_tishikuang_01.prefab	4912 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/1028Effect_tishikuang_01.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/1028Effect_tishikuang_02.prefab	9792 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/1028Effect_tishikuang_02.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_029.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_029.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_029_b.png	diff \| view \| raw \| blame \| history
	Assets/00000/package/Texture/Glow_029_b.png.meta	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Demigiant/DOTween/DOTween.dll.meta	12 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/Android.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/AndroidManifest.xml.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/SaaS_AppAnalytics_Android_SDK_V4.0.58.jar	diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/SaaS_AppAnalytics_Android_SDK_V4.0.58.jar.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/SaaS_GameAnalytics_Android_SDK_V4.0.58.jar	diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs	196 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAAccount.cs	192 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAAccount.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs	194 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAItem.cs	55 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAItem.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAMission.cs	75 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs	75 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataGA.cs	300 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataGA.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataOrder.cs	71 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataOrder.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataPlugin.cs	549 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataPlugin.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataShoppingCart.cs	63 ●●●●● diff \| view \| raw \| blame \| history
	Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TalkingDataShoppingCart.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/Guide/RectGuidance.mat	6 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Guide/GuidePanel.prefab	14746 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/GemBattle.unity	205190 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/LoadingScene.unity	230 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/TestGuide.unity	295 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Data/EndlessPortData.cs	9 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/GameAnalytics_SDK/GA_SDK_Manager.cs	15 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs	358 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs	25 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/CharForeach.cs	78 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/GuideConfig.cs	47 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/GuideCtrl.cs	87 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/GuidePanel.cs	102 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/ImageFire1.cs	21 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/ImageFire2.cs	14 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/ImageSkill.cs	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/ImageWater.cs	10 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/Mask/RectGuidance.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Manager/ManagerRoot.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessWave.cs	54 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/UI/GuideUser/拖动指针.png	diff \| view \| raw \| blame \| history
	Assets/UI/GuideUser/拖动指针.png.meta	118 ●●●●● diff \| view \| raw \| blame \| history
	ProjectSettings/ProjectSettings.asset	2 ●●●●● diff \| view \| raw \| blame \| history