parent: 63133c | patch | commitdiff
chenxin
2020-10-22 85f0d13945f3aef5aef1b3c1b47c77cea0514c17
refs
author chenxin <chenxin6991@163.com>
Thursday, October 22, 2020 16:06 +0800
committer chenxin <chenxin6991@163.com>
Thursday, October 22, 2020 16:06 +0800
commit85f0d13945f3aef5aef1b3c1b47c77cea0514c17
tree 232b1360c90d10e942899aa5efbd9a2133cbccdd tree | zip | gz
parent 63133cf5403a9d7fbe3811d20c3d24f26a752449 view | diff
45aacf1c3f93a53c3c885b0034b05c50a28ae2d4 view | diff 
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
71 files added
72 files modified
152185 ■■■■■ changed files
Assets/00000/package/Materials/Glow_001.mat 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua.prefab 4818 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua.prefab.meta 2 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua_00.prefab 24460 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua_00.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua_02.prefab 110 ●●●●● diff | view | raw | blame | history
Assets/00000/package/Prefab/Effect_baomihua_03.prefab 24 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_BubbleBlue_Mobile.prefab 8 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/Mobile/vfx_Muzzle_Fire_Mobile.prefab 8 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/vfx_Muzzle_ArrowGreen.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Muzzle/vfx_Muzzle_LaserBlue.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/AndroidManifest.xml 35 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/Android/AndroidManifest.xml.meta 7 ●●●●● 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/Android/SaaS_GameAnalytics_Android_SDK_V4.0.58.jar.meta 32 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS.meta 8 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.h 221 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.h.meta 27 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.mm 148 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/TalkingDataGA.mm.meta 37 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/libTalkingDataGA.a diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/Plugins/iOS/libTalkingDataGA.a.meta 27 ●●●●● diff | view | raw | blame | history
Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts.meta 8 ●●●●● 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/TDGADemoScript.cs.meta 11 ●●●●● 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/TDGAMission.cs.meta 11 ●●●●● 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/Materials/PVPTD/Materials/SheetAnim.mat 100 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/SheetAnim.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat 81 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat 81 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat 81 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat 81 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/Anim.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/Anim.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/fireMonMat_animOppo.mat 78 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/fireMonMat_animOppo.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/fireMonMat_animSelf.mat 81 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/fireMonMat_animSelf.mat.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/fire_oppo.png.meta 6 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/self_fire_attack.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/self_fire_attack.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/self_fire_wait.png diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/self_fire_wait.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/bgGrass.png diff | view | raw | blame | history
Assets/Materials/Shader.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Materials/Shader/TexAnimation.shader 82 ●●●●● diff | view | raw | blame | history
Assets/Materials/Shader/TexAnimation.shader.meta 9 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/BossAgent.prefab 256 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/fire.prefab 261 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/water.prefab 256 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Enemies/wood.prefab 256 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/FireProjectile_0.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/FireProjectile_1.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/FireProjectile_2.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/FireProjectile_3.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab 12 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower.prefab 23 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_0.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_1.prefab 4 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_3.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Fire/GrowUpTower_4.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_0.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_1.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_2.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_3.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/Water/WaterProjectile_4.prefab 6 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab 28 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab 2 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab 5 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_0.prefab 19777 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_0.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_1.prefab 19777 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_1.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_2.prefab 19777 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_2.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_3.prefab 19777 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_3.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_4.prefab 19777 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/Projectile_4.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WoodHit.prefab 19421 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/Towers/WoodTower/WoodHit.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Prefabs/UI/BulletUI.prefab 1 ●●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/GemBattle.unity 26 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Damager.cs 17 ●●●●● diff | view | raw | blame | history
Assets/Scripts/ActionGameFramework/Health/Targetable.cs 23 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/GameAnalytics_SDK_Main.cs 20 ●●●●● diff | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/GameAnalytics_SDK_Main.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/Affector.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 46 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Agents/Agent.cs 12 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 72 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLaunchers/BallisticLauncher.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs 5 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs 22 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/BulletUICtl.cs 34 ●●●●● diff | view | raw | blame | history
GemBattle.zip diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers diff | view | raw | blame | history
GemBattle/宝石塔防_Data/globalgamemanagers.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level0 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level1 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level2 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/level3 diff | view | raw | blame | history
GemBattle/宝石塔防_Data/resources.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets0.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets1.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets2.assets.resS diff | view | raw | blame | history
GemBattle/宝石塔防_Data/sharedassets3.assets diff | view | raw | blame | history
ProjectSettings/TagManager.asset 3 ●●●●● diff | view | raw | blame | history