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 | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/USDKTest/.idea/workspace.xml b/USDKTest/.idea/workspace.xml
index 735083e..f1f55bc 100644
--- a/USDKTest/.idea/workspace.xml
+++ b/USDKTest/.idea/workspace.xml
@@ -10,7 +10,46 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
- <list default="true" id="1d82a004-ec8b-4ee8-923f-fc9fa475ba66" name="Default Changelist" comment="" />
+ <list default="true" id="1d82a004-ec8b-4ee8-923f-fc9fa475ba66" name="Default Changelist" comment="">
+ <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_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/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" />
+ <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/launcher/release/launcher-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/launcher/release/launcher-release.apk" afterDir="false" />
+ <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_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/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" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Unity.Timeline.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/Unity.Timeline.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/boot.config" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/boot.config" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/data.unity3d" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/data.unity3d" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -74,10 +113,13 @@
</option>
</component>
<component name="GenerateSignedApkSettings">
- <option name="KEY_STORE_PATH" value="D:\USDKTest\kt_fx_hw.jks" />
+ <option name="KEY_STORE_PATH" value="D:\GemBattleGit\USDKTest\kt_fx_hw.jks" />
<option name="KEY_ALIAS" value="kt_fx_hw" />
<option name="REMEMBER_PASSWORDS" value="true" />
<option name="BUILD_TARGET_KEY" value="apk" />
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="ProjectId" id="1lPYggZKrupcIXUGzgTGPpUURZ2" />
<component name="ProjectViewState">
@@ -86,14 +128,14 @@
</component>
<component name="PropertiesComponent">
<property name="ApkExportedModule" value="USDKTest.launcher" />
- <property name="ExportApk.ApkPath" value="D:\USDKTest\launcher" />
+ <property name="ExportApk.ApkPath" value="D:\GemBattleGit\USDKTest\launcher" />
<property name="ExportApk.BuildVariants" value="release" />
<property name="ExportApk.SignV1" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
<property name="extract.method.default.visibility" value="private" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/unityLibrary/libs" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/launcher" />
<property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
@@ -297,36 +339,36 @@
<screen x="1920" y="0" width="1920" height="1040" />
</state>
<state width="479" height="582" key="DebuggerActiveHint/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1607522375697" />
- <state x="551" y="174" key="FileChooserDialogImpl" timestamp="1607946862213">
+ <state x="939" y="209" key="FileChooserDialogImpl" timestamp="1608790985209">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="551" y="174" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1607946862213" />
+ <state x="939" y="209" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1608790985209" />
<state x="689" y="220" key="FileChooserDialogImpl/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1607940773694" />
- <state width="1493" height="210" key="GridCell.Tab.0.bottom" timestamp="1608106695289">
+ <state width="1493" height="606" key="GridCell.Tab.0.bottom" timestamp="1608810117210">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1493" height="210" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608106695289" />
+ <state width="1493" height="606" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608810117210" />
<state width="1877" height="285" key="GridCell.Tab.0.bottom/0.0.1920.1050@0.0.1920.1050" timestamp="1607502133192" />
<state width="1864" height="176" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1607940508079" />
<state width="1846" height="176" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1607935741364" />
- <state width="1493" height="210" key="GridCell.Tab.0.center" timestamp="1608106695289">
+ <state width="1493" height="606" key="GridCell.Tab.0.center" timestamp="1608810117210">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1493" height="210" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608106695289" />
+ <state width="1493" height="606" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608810117210" />
<state width="1877" height="285" key="GridCell.Tab.0.center/0.0.1920.1050@0.0.1920.1050" timestamp="1607502133191" />
<state width="1864" height="176" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1607940508079" />
<state width="1846" height="176" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1607935741364" />
- <state width="1493" height="210" key="GridCell.Tab.0.left" timestamp="1608106695289">
+ <state width="1493" height="606" key="GridCell.Tab.0.left" timestamp="1608810117210">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1493" height="210" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608106695289" />
+ <state width="1493" height="606" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608810117210" />
<state width="1877" height="285" key="GridCell.Tab.0.left/0.0.1920.1050@0.0.1920.1050" timestamp="1607502133191" />
<state width="1864" height="176" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1607940508078" />
<state width="1846" height="176" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1607935741364" />
- <state width="1493" height="210" key="GridCell.Tab.0.right" timestamp="1608106695289">
+ <state width="1493" height="606" key="GridCell.Tab.0.right" timestamp="1608810117210">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1493" height="210" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608106695289" />
+ <state width="1493" height="606" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608810117210" />
<state width="1877" height="285" key="GridCell.Tab.0.right/0.0.1920.1050@0.0.1920.1050" timestamp="1607502133191" />
<state width="1864" height="176" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1607940508079" />
<state width="1846" height="176" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1607935741364" />
--
Gitblit v1.9.1