From 377166293175b737d03e744e7d13500580ea78ea Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 29 Dec 2020 09:50:05 +0800
Subject: [PATCH] 12.28封包,提供公司内测

---
 USDKTest/.idea/workspace.xml |   26 +++++++-------------------
 1 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/USDKTest/.idea/workspace.xml b/USDKTest/.idea/workspace.xml
index 8fc7f06..f1f55bc 100644
--- a/USDKTest/.idea/workspace.xml
+++ b/USDKTest/.idea/workspace.xml
@@ -11,28 +11,18 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1d82a004-ec8b-4ee8-923f-fc9fa475ba66" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../Assets/Materials/UI/tileGold.mat" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Assets/Materials/UI/tileGold.mat.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Assets/Resources/Prefabs/BuyMesh.prefab" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Assets/Resources/Prefabs/BuyMesh.prefab.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Prefabs/Towers/Fire/TowerLevel.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Prefabs/Towers/Fire/TowerLevel.prefab" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Prefabs/Towers/Water/TowerLevel.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Prefabs/Towers/Water/TowerLevel.prefab" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Prefabs/Towers/WoodTower/TowerLevel.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Prefabs/Towers/WoodTower/TowerLevel.prefab" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Prefabs/UI/EndlessTileGridBuyBtn.prefab" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/Json/JsonDataCenter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/Json/JsonDataCenter.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Towers/TowerLevel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Towers/TowerLevel.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../Assets/Scripts/Common/SDKConfig.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../Assets/Scripts/Common/SDKConfig.cs.meta" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Assets/Materials/Guide/RectGuidance.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Materials/Guide/RectGuidance.mat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/Manager/ManagerRoot.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/Manager/ManagerRoot.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Assets/Scripts/UI/FinalPanel/FinalHttp.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/Scripts/UI/FinalPanel/FinalHttp.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/elf_info.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/elf_info.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/elf_upgrade.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/elf_upgrade.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_buff.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_buff.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_enemy.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_enemy.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_port.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/endless_port.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/gemcost.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/gemcost.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/skilllevelinfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/StreamingAssets/Table/skilllevelinfo.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Assets/UI/TowerLevel/星星4.png" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/UI/TowerLevel/星星4.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Assets/UI/icon_512.png" beforeDir="false" afterPath="$PROJECT_DIR$/../Assets/UI/icon_512.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/../ProjectSettings/ProjectSettings.asset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" afterDir="false" />
@@ -46,10 +36,8 @@
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/elf_info.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/elf_info.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/elf_upgrade.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/elf_upgrade.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_buff.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_buff.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_enemy.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_enemy.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_port.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/endless_port.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/gemcost.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/gemcost.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/skilllevelinfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/Table/skilllevelinfo.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Demos.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Demos.dll" afterDir="false" />

--
Gitblit v1.9.1