~wxd/GemBattle.git

完善PVE界面逻辑，使用正式的界面资源解决bug：1.打掉小怪没有获得金币 2.摧毁塔位塔没有消失

chenxin

2020-10-20 23ef235a263191230031dfaa02c054197fdddd91

refs
author	chenxin <chenxin6991@163.com>
	Tuesday, October 20, 2020 14:08 +0800
committer	chenxin <chenxin6991@163.com>
	Tuesday, October 20, 2020 14:08 +0800
commit	23ef235a263191230031dfaa02c054197fdddd91
tree	66e86191eee1a9d0362e9e255b09211692a8ef79 tree \| zip \| gz
parent	4a637848b7f2bc133e05f6d37b49cf4a37a04a00 view \| diff

完善PVE界面逻辑，使用正式的界面资源
解决bug：1.打掉小怪没有获得金币 2.摧毁塔位 塔没有消失

5 files renamed

5 files copied

1 files deleted

19 files added

66 files modified

	And/GemBattle.apk	diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/01效果图-PVE战斗.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/03效果图-选择完成.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/04效果图-结算.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/05标注.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/06标注.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/07标注.jpg.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/PVEBg.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/PVEBg.png.meta	8 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/RewardInfo.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/RewardInfo.png.meta	42 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/buffMask.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/check.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/diamond.png	diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/diamond.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/drop.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/line.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/propDi_0.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/propDi_1.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/propDi_2.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/propDi_3.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/speed_1.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/speed_2.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/treasure_0.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/treasure_1.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/treasure_2.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Materials/PVE/victoryTitle.png.meta	40 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/BuffIcon.prefab	500 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/BuffIcon.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/PropIcon.prefab	189 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/PropIcon.prefab.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/Endless.unity	4196 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scenes/Levels/Battle/GemBattle.unity	20 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Data/EndlessBuffData.cs	23 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Data/EndlessPortData.cs	20 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Enum/EndlessBuffSelectState.cs	19 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Enum/EndlessBuffSelectState.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Json/JsonDataCenter.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/Common.cs	2068 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/Game.cs	4156 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/NetMapping.cs	56 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/Opcode.cs	48 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Net/NetExtends/Table.cs	181 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Economy/LootDrop.cs	165 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs	46 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessWave.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/EndlessViewObtainedProps.cs	51 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/EndlessViewObtainedProps.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs	101 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSwitchSpeed.cs	42 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSwitchSpeed.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs	33 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs	31 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs	37 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs	96 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs.meta	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/donateshop.json	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/donateshop.json.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_buff.json	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_enemy.json	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_port.json	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/notice.json	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/notice.json.meta	7 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/scoreshop.json	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/scoreshop.json.meta	7 ●●●●● 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/StreamingAssets/Table/donateshop.json	1 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_buff.json	2 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_enemy.json	2 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json	2 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/notice.json	1 ●●●●● diff \| view \| raw \| blame \| history
	GemBattle/宝石塔防_Data/StreamingAssets/Table/scoreshop.json	1 ●●●●● 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
	GemBattle/宝石塔防_Data/sharedassets3.assets.resS	diff \| view \| raw \| blame \| history