GemBattle.git - Gitblit

parent: c5679cb5 | patch | commit | ignore whitespace

wangguan

2020-12-24 4943b4638e01a7d63dda9056a28f0e639b3cf894

12.24版本

5 files deleted

29 files modified

	USDKTest/.gradle/6.1.1/executionHistory/executionHistory.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/executionHistory/executionHistory.lock	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/fileHashes/fileHashes.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/fileHashes/fileHashes.lock	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/fileHashes/resourceHashesCache.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/javaCompile/classAnalysis.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/javaCompile/jarAnalysis.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/javaCompile/javaCompile.lock	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/6.1.1/javaCompile/taskHistory.bin	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/buildOutputCleanup/buildOutputCleanup.lock	patch \| view \| raw \| blame \| history
	USDKTest/.gradle/buildOutputCleanup/outputFiles.bin	patch \| view \| raw \| blame \| history
	USDKTest/.idea/caches/build_file_checksums.ser	patch \| view \| raw \| blame \| history
	USDKTest/.idea/libraries/Gradle__org_apache_http_legacy.xml	1 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/.idea/workspace.xml	71 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/launcher/release/launcher-release.apk	patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/AndroidManifest.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/drawable-xhdpi/app_icon.png	patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon.xml	5 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon_round.xml	5 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/mipmap-mdpi/app_icon.png	patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_background.png	patch \| view \| raw \| blame \| history
	USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/Table/endless_buff.json	2 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Demos.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Haptics.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.Timeline.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll	patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/boot.config	2 ●●●●● patch \| view \| raw \| blame \| history
	USDKTest/unityLibrary/src/main/assets/bin/Data/data.unity3d	patch \| view \| raw \| blame \| history

 USDKTest/.gradle/6.1.1/executionHistory/executionHistory.bin

Binary files differ

 USDKTest/.gradle/6.1.1/executionHistory/executionHistory.lock

Binary files differ

 USDKTest/.gradle/6.1.1/fileHashes/fileHashes.bin

Binary files differ

 USDKTest/.gradle/6.1.1/fileHashes/fileHashes.lock

Binary files differ

 USDKTest/.gradle/6.1.1/fileHashes/resourceHashesCache.bin

Binary files differ

 USDKTest/.gradle/6.1.1/javaCompile/classAnalysis.bin

Binary files differ

 USDKTest/.gradle/6.1.1/javaCompile/jarAnalysis.bin

Binary files differ

 USDKTest/.gradle/6.1.1/javaCompile/javaCompile.lock

Binary files differ

 USDKTest/.gradle/6.1.1/javaCompile/taskHistory.bin

Binary files differ

 USDKTest/.gradle/buildOutputCleanup/buildOutputCleanup.lock

Binary files differ

 USDKTest/.gradle/buildOutputCleanup/outputFiles.bin

Binary files differ

 USDKTest/.idea/caches/build_file_checksums.ser

Binary files differ

 USDKTest/.idea/libraries/Gradle__org_apache_http_legacy.xml

@@ -2,6 +2,7 @@
  <library name="Gradle: org.apache.http.legacy">
    <CLASSES>
      <root url="jar://$PROJECT_DIR$/../AndroidSDK/platforms/android-27/optional/org.apache.http.legacy.jar!/" />
      <root url="jar://$PROJECT_DIR$/../../AndroidSDK/platforms/android-27/optional/org.apache.http.legacy.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />

 USDKTest/.idea/workspace.xml

@@ -10,7 +10,45 @@
    <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 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/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.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/6.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" 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$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy.xml" 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" />
      <change beforePath="$PROJECT_DIR$/launcher/release/output.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/launcher/src/main/AndroidManifest.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/drawable-xhdpi/app_icon.png" beforeDir="false" afterPath="$PROJECT_DIR$/launcher/src/main/res/drawable-xhdpi/app_icon.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-anydpi-v26/app_icon.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-anydpi-v26/app_icon_round.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/app_icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/ic_launcher_background.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png" beforeDir="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/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" />
      <change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/platform_native_link.xml" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/platform_native_link.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -19,7 +57,7 @@
  <component name="DefaultGradleProjectSettings">
    <option name="isMigrated" value="true" />
  </component>
  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[]" />
  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[96e5ca27]" />
  <component name="ExternalProjectsData">
    <projectState path="$PROJECT_DIR$">
      <ProjectState />
@@ -74,10 +112,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 +127,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 +338,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" />

 USDKTest/launcher/release/launcher-release.apk

Binary files differ

 USDKTest/launcher/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
    <uses-permission android:name="com.asus.msa.SupplementaryDID.ACCESS" />
    <uses-permission android:name="android.permission.VIBRATE"/>

  <application android:extractNativeLibs="true" android:label="@string/app_name" android:icon="@mipmap/app_icon"
  <application android:extractNativeLibs="true" android:label="@string/app_name" android:icon="@drawable/app_icon"
      android:name="com.unity3d.player.UnityApplication">
    <meta-data android:name="unity.builder" android:value="\12369527122641" />


 USDKTest/launcher/src/main/res/drawable-xhdpi/app_icon.png



 USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon.xml

File was deleted

 USDKTest/launcher/src/main/res/mipmap-anydpi-v26/app_icon_round.xml

File was deleted

 USDKTest/launcher/src/main/res/mipmap-mdpi/app_icon.png

Binary files differ

 USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_background.png

Binary files differ

 USDKTest/launcher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

Binary files differ

 USDKTest/unityLibrary/src/main/assets/Table/endless_buff.json

@@ -1 +1 @@
[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加愤怒小鸡10%攻击力","6","9","10024","2","99"],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加雪糕投手12%攻击力",6,"9","10020","2","99"],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加玉米枪手15%攻击力",6,"9","10025","2","99"],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99"],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99"],["6","精灵魔盒",[0],[3,3,200],0,"随机获得一个3级精灵","2","4",10006,"1","10"],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3"],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2"],["9","火灵之力",[3,101],[1,20,0],-1,"增加愤怒小鸡20%攻击力",9,"15","10024","3","99"],["10","水灵之力",[3,201],[1,24,0],-1,"增加雪糕投手24%攻击力",9,"15","10020","3","99"],["11","木灵之力",[3,301],[1,30,0],-1,"增加玉米枪手30%攻击力",9,"15","10025","3","99"],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99"],["14","超级精灵魔盒",[0],[3,4,400],0,"随机获得一个4级精灵","5","8",10006,"2","10"],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","9","10021","2","3"],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","9","10022","2","2"],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1"],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米枪手高能子弹+1",6,99,"10016","2","1"],["19","爆裂狂怒",[3,101],[9,7,0],-1,"愤怒小鸡充能后攻速+30%",6,99,"10026","2","1"],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加愤怒小鸡30%攻击力","12","99","10024","4","99"],["21","高级水灵之力",[3,201],[1,36,0],-1,"增加雪糕投手36%攻击力","12","99","10020","4","99"],["22","高级木灵之力",[3,301],[1,45,0],-1,"增加玉米枪手45%攻击力","12","99","10025","4","99"],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加愤怒小鸡40%攻击力","99","99","10024","4","0"],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加雪糕投手50%攻击力","99","99","10020","4","0"],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加玉米枪手60%攻击力","99","99","10025","4","0"],["26","攻速增加_水",[3,201],[4,0.25,0.5],-1,"雪糕投手攻速+25%","6",99,"10019",3,"2"],["27","攻速增加_火",[3,101],[4,0.3,0.5],-1,"愤怒小鸡攻速+30%","99",99,"10013",3,"1"],["28","攻速增加_木",[3,301],[4,0.2,0.5],-1,"玉米枪手攻速+20%",6,99,"10017",3,"2"],["29","暴击_木",[3,301],[5,300,0],-1,"玉米枪手暴击率+30%",6,99,"10015",3,"2"],["30","暴怒_木",[3,301],[6,350,0],-1,"玉米枪手暴击伤害+35%",6,99,"10014",3,"2"],["31","暴击_火",[3,101],[5,250,0],-1,"愤怒小鸡暴击率+25%",6,99,"10012",3,"2"],["32","暴怒_火",[3,101],[6,300,0],-1,"愤怒小鸡暴击伤害+30%",6,99,"10011",3,"2"],["33","暴击_水",[3,201],[5,300,0],-1,"雪糕投手暴击率+30%",6,99,"10027",3,"2"],["34","暴怒_水",[3,201],[6,350,0],-1,"雪糕投手暴击伤害+35%",6,99,"10028",3,"2"],["35","超级弹夹",[3,301],[7,3,0],-1,"玉米枪手高能子弹+2","9",99,"10016","4","1"],["36","超级爆裂狂怒",[3,101],[9,8,0],-1,"愤怒小鸡充能后攻速+60%","9",99,"10026","4","1"],["37","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4"],["38","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米枪手蓄力时间-30%","7",99,"10018","4","3"],["39","中大奖",[0],[2,800,0],"0","增加800金币","9",99,"10010","3","99"],["40","一夜暴富",[0],[2,1500,0],"0","增加1500金币","11","99","10010","4","99"],["41","特级精灵魔盒",[0],[3,5,800],"-1","随机获得一个5级精灵","11","99","10006","4","2"],["42","寒气_水",[3,201],[12,80,0],"-1","雪糕投手攻击冰冻概率+8%","4","99","10029",3,"3"],["43","冻伤_水",[3,201],[13,300,0],"-1","雪糕投手对冰冻的敌人伤害+30%","6","99","10028",3,4],["44","冰冻延时",[3,201],[14,1,0],"-1","冰冻时间+1秒","6","99","10030",3,3]]
[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加愤怒小鸡10%攻击力","6","9","10024","2","99",2],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加雪糕投手12%攻击力",6,"9","10020","2","99",3],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加玉米枪手15%攻击力",6,"9","10025","2","99",4],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99",1],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99",0],["6","精灵魔盒",[0],[3,3,200],0,"随机获得一个3级精灵","2","4",10006,"1","10",0],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3",1],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2",1],["9","火灵之力",[3,101],[1,20,0],-1,"增加愤怒小鸡20%攻击力",9,"15","10024","3","99",2],["10","水灵之力",[3,201],[1,24,0],-1,"增加雪糕投手24%攻击力",9,"15","10020","3","99",3],["11","木灵之力",[3,301],[1,30,0],-1,"增加玉米枪手30%攻击力",9,"15","10025","3","99",4],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99",0],["14","超级精灵魔盒",[0],[3,4,400],0,"随机获得一个4级精灵","5","8",10006,"2","10",0],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","9","10021","2","3",1],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","9","10022","2","2",1],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1",1],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米枪手高能子弹+1",6,99,"10016","2","1",4],["19","爆裂狂怒",[3,101],[9,7,0],-1,"愤怒小鸡充能后攻速+30%",6,99,"10026","2","1",2],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加愤怒小鸡30%攻击力","12","99","10024","4","99",2],["21","高级水灵之力",[3,201],[1,36,0],-1,"增加雪糕投手36%攻击力","12","99","10020","4","99",3],["22","高级木灵之力",[3,301],[1,45,0],-1,"增加玉米枪手45%攻击力","12","99","10025","4","99",4],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加愤怒小鸡40%攻击力","99","99","10024","4","0",2],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加雪糕投手50%攻击力","99","99","10020","4","0",3],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加玉米枪手60%攻击力","99","99","10025","4","0",4],["26","攻速增加_水",[3,201],[4,0.25,0.5],-1,"雪糕投手攻速+25%","6",99,"10019",3,"2",3],["27","攻速增加_火",[3,101],[4,0.3,0.5],-1,"愤怒小鸡攻速+30%","99",99,"10013",3,"1",2],["28","攻速增加_木",[3,301],[4,0.2,0.5],-1,"玉米枪手攻速+20%",6,99,"10017",3,"2",4],["29","暴击_木",[3,301],[5,300,0],-1,"玉米枪手暴击率+30%",6,99,"10015",3,"2",4],["30","暴怒_木",[3,301],[6,350,0],-1,"玉米枪手暴击伤害+35%",6,99,"10014",3,"2",4],["31","暴击_火",[3,101],[5,250,0],-1,"愤怒小鸡暴击率+25%",6,99,"10012",3,"2",2],["32","暴怒_火",[3,101],[6,300,0],-1,"愤怒小鸡暴击伤害+30%",6,99,"10011",3,"2",2],["33","暴击_水",[3,201],[5,300,0],-1,"雪糕投手暴击率+30%",6,99,"10027",3,"2",3],["34","暴怒_水",[3,201],[6,350,0],-1,"雪糕投手暴击伤害+35%",6,99,"10028",3,"2",3],["35","超级弹夹",[3,301],[7,3,0],-1,"玉米枪手高能子弹+2","9",99,"10016","4","1",4],["36","超级爆裂狂怒",[3,101],[9,8,0],-1,"愤怒小鸡充能后攻速+60%","9",99,"10026","4","1",2],["37","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4",0],["38","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米枪手蓄力时间-30%","7",99,"10018","4","3",4],["39","中大奖",[0],[2,800,0],"0","增加800金币","9",99,"10010","3","99",0],["40","一夜暴富",[0],[2,1500,0],"0","增加1500金币","11","99","10010","4","99",0],["41","特级精灵魔盒",[0],[3,5,800],"-1","随机获得一个5级精灵","11","99","10006","4","2",0],["42","寒气_水",[3,201],[12,80,0],"-1","雪糕投手攻击冰冻概率+8%","4","99","10029",3,"3",3],["43","冻伤_水",[3,201],[13,300,0],"-1","雪糕投手对冰冻的敌人伤害+30%","6","99","10028",3,4,3],["44","冰冻延时",[3,201],[14,1,0],"-1","冰冻时间+1秒","6","99","10030",3,3,3]]

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp-firstpass.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Demos.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.Haptics.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/MoreMountains.NiceVibrations.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Sirenix.OdinInspector.CompatibilityLayer.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/Unity.Timeline.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/Managed/UnityEngine.UI.dll

Binary files differ

 USDKTest/unityLibrary/src/main/assets/bin/Data/boot.config

@@ -3,4 +3,4 @@
hdr-display-enabled=0
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637437080752351052
buildDate=637444025111555285

 USDKTest/unityLibrary/src/main/assets/bin/Data/data.unity3d

Binary files differ

			@@ -2,6 +2,7 @@
			<library name="Gradle: org.apache.http.legacy">
			<CLASSES>
			<root url="jar://$PROJECT_DIR$/../AndroidSDK/platforms/android-27/optional/org.apache.http.legacy.jar!/" />
			<root url="jar://$PROJECT_DIR$/../../AndroidSDK/platforms/android-27/optional/org.apache.http.legacy.jar!/" />
			</CLASSES>
			<JAVADOC />
			<SOURCES />

			@@ -10,7 +10,45 @@
			<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 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/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/jarAnalysis.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/6.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/taskHistory.bin" 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$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy.xml" 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" />
			<change beforePath="$PROJECT_DIR$/launcher/release/output.json" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/launcher/src/main/AndroidManifest.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/drawable-xhdpi/app_icon.png" beforeDir="false" afterPath="$PROJECT_DIR$/launcher/src/main/res/drawable-xhdpi/app_icon.png" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-anydpi-v26/app_icon.xml" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-anydpi-v26/app_icon_round.xml" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/app_icon.png" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/ic_launcher_background.png" beforeDir="false" />
			<change beforePath="$PROJECT_DIR$/launcher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png" beforeDir="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/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" />
			<change beforePath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/platform_native_link.xml" beforeDir="false" afterPath="$PROJECT_DIR$/unityLibrary/src/main/assets/bin/Data/platform_native_link.xml" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
			@@ -19,7 +57,7 @@
			<component name="DefaultGradleProjectSettings">
			<option name="isMigrated" value="true" />
			</component>
			<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[]" />
			<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[96e5ca27]" />
			<component name="ExternalProjectsData">
			<projectState path="$PROJECT_DIR$">
			<ProjectState />
			@@ -74,10 +112,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 +127,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 +338,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" />

			@@ -23,7 +23,7 @@
			<uses-permission android:name="com.asus.msa.SupplementaryDID.ACCESS" />
			<uses-permission android:name="android.permission.VIBRATE"/>

			<application android:extractNativeLibs="true" android:label="@string/app_name" android:icon="@mipmap/app_icon"
			<application android:extractNativeLibs="true" android:label="@string/app_name" android:icon="@drawable/app_icon"
			android:name="com.unity3d.player.UnityApplication">
			<meta-data android:name="unity.builder" android:value="\12369527122641" />

			@@ -1 +1 @@
			[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加愤怒小鸡10%攻击力","6","9","10024","2","99"],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加雪糕投手12%攻击力",6,"9","10020","2","99"],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加玉米枪手15%攻击力",6,"9","10025","2","99"],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99"],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99"],["6","精灵魔盒",[0],[3,3,200],0,"随机获得一个3级精灵","2","4",10006,"1","10"],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3"],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2"],["9","火灵之力",[3,101],[1,20,0],-1,"增加愤怒小鸡20%攻击力",9,"15","10024","3","99"],["10","水灵之力",[3,201],[1,24,0],-1,"增加雪糕投手24%攻击力",9,"15","10020","3","99"],["11","木灵之力",[3,301],[1,30,0],-1,"增加玉米枪手30%攻击力",9,"15","10025","3","99"],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99"],["14","超级精灵魔盒",[0],[3,4,400],0,"随机获得一个4级精灵","5","8",10006,"2","10"],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","9","10021","2","3"],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","9","10022","2","2"],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1"],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米枪手高能子弹+1",6,99,"10016","2","1"],["19","爆裂狂怒",[3,101],[9,7,0],-1,"愤怒小鸡充能后攻速+30%",6,99,"10026","2","1"],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加愤怒小鸡30%攻击力","12","99","10024","4","99"],["21","高级水灵之力",[3,201],[1,36,0],-1,"增加雪糕投手36%攻击力","12","99","10020","4","99"],["22","高级木灵之力",[3,301],[1,45,0],-1,"增加玉米枪手45%攻击力","12","99","10025","4","99"],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加愤怒小鸡40%攻击力","99","99","10024","4","0"],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加雪糕投手50%攻击力","99","99","10020","4","0"],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加玉米枪手60%攻击力","99","99","10025","4","0"],["26","攻速增加_水",[3,201],[4,0.25,0.5],-1,"雪糕投手攻速+25%","6",99,"10019",3,"2"],["27","攻速增加_火",[3,101],[4,0.3,0.5],-1,"愤怒小鸡攻速+30%","99",99,"10013",3,"1"],["28","攻速增加_木",[3,301],[4,0.2,0.5],-1,"玉米枪手攻速+20%",6,99,"10017",3,"2"],["29","暴击_木",[3,301],[5,300,0],-1,"玉米枪手暴击率+30%",6,99,"10015",3,"2"],["30","暴怒_木",[3,301],[6,350,0],-1,"玉米枪手暴击伤害+35%",6,99,"10014",3,"2"],["31","暴击_火",[3,101],[5,250,0],-1,"愤怒小鸡暴击率+25%",6,99,"10012",3,"2"],["32","暴怒_火",[3,101],[6,300,0],-1,"愤怒小鸡暴击伤害+30%",6,99,"10011",3,"2"],["33","暴击_水",[3,201],[5,300,0],-1,"雪糕投手暴击率+30%",6,99,"10027",3,"2"],["34","暴怒_水",[3,201],[6,350,0],-1,"雪糕投手暴击伤害+35%",6,99,"10028",3,"2"],["35","超级弹夹",[3,301],[7,3,0],-1,"玉米枪手高能子弹+2","9",99,"10016","4","1"],["36","超级爆裂狂怒",[3,101],[9,8,0],-1,"愤怒小鸡充能后攻速+60%","9",99,"10026","4","1"],["37","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4"],["38","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米枪手蓄力时间-30%","7",99,"10018","4","3"],["39","中大奖",[0],[2,800,0],"0","增加800金币","9",99,"10010","3","99"],["40","一夜暴富",[0],[2,1500,0],"0","增加1500金币","11","99","10010","4","99"],["41","特级精灵魔盒",[0],[3,5,800],"-1","随机获得一个5级精灵","11","99","10006","4","2"],["42","寒气_水",[3,201],[12,80,0],"-1","雪糕投手攻击冰冻概率+8%","4","99","10029",3,"3"],["43","冻伤_水",[3,201],[13,300,0],"-1","雪糕投手对冰冻的敌人伤害+30%","6","99","10028",3,4],["44","冰冻延时",[3,201],[14,1,0],"-1","冰冻时间+1秒","6","99","10030",3,3]]
			[["1","低级火灵之力",[3,101],[1,10,0],"-1","增加愤怒小鸡10%攻击力","6","9","10024","2","99",2],["2","低级水灵之力",[3,201],[1,12,0],-1,"增加雪糕投手12%攻击力",6,"9","10020","2","99",3],["3","低级木灵之力",[3,301],[1,15,0],-1,"增加玉米枪手15%攻击力",6,"9","10025","2","99",4],["4","攻击力增加",[1,0],[1,8,0],"-1","增加全体8%攻击力","0",5,"10005","1","99",1],["5","意外收获",[0],[2,200,0],0,"增加200金币","0","5","10007","1","99",0],["6","精灵魔盒",[0],[3,3,200],0,"随机获得一个3级精灵","2","4",10006,"1","10",0],["7","暴击增加",[1,0],[5,50,0],-1,"全体暴击率+5%","0","3","10021","1","3",1],["8","爆伤增加",[1,0],[6,80,0],-1,"全体暴击伤害+8%","0","3","10022","1","2",1],["9","火灵之力",[3,101],[1,20,0],-1,"增加愤怒小鸡20%攻击力",9,"15","10024","3","99",2],["10","水灵之力",[3,201],[1,24,0],-1,"增加雪糕投手24%攻击力",9,"15","10020","3","99",3],["11","木灵之力",[3,301],[1,30,0],-1,"增加玉米枪手30%攻击力",9,"15","10025","3","99",4],["12","精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力","99",99,"10005",2,1,1],["13","飞来横财",[0],[2,400,0],0,"增加400金币","6","8","10008","2","99",0],["14","超级精灵魔盒",[0],[3,4,400],0,"随机获得一个4级精灵","5","8",10006,"2","10",0],["15","暴击增加",[1,0],[5,100,0],-1,"全体暴击率+10%","4","9","10021","2","3",1],["16","爆伤增加",[1,0],[6,150,0],-1,"全体暴击伤害+15%","4","9","10022","2","2",1],["17","攻速增加",[1,0],[4,0.1,0.5],"-1","全体攻速+10%","0","5","10023","2","1",1],["18","弹夹扩容",[3,301],[7,2,0],-1,"玉米枪手高能子弹+1",6,99,"10016","2","1",4],["19","爆裂狂怒",[3,101],[9,7,0],-1,"愤怒小鸡充能后攻速+30%",6,99,"10026","2","1",2],["20","高级火灵之力",[3,101],[1,30,0],-1,"增加愤怒小鸡30%攻击力","12","99","10024","4","99",2],["21","高级水灵之力",[3,201],[1,36,0],-1,"增加雪糕投手36%攻击力","12","99","10020","4","99",3],["22","高级木灵之力",[3,301],[1,45,0],-1,"增加玉米枪手45%攻击力","12","99","10025","4","99",4],["23","特级火灵之力",[3,101],[1,40,0],-1,"增加愤怒小鸡40%攻击力","99","99","10024","4","0",2],["24","特级水灵之力",[3,201],[1,50,0],-1,"增加雪糕投手50%攻击力","99","99","10020","4","0",3],["25","特级木灵之力",[3,301],[1,60,0],-1,"增加玉米枪手60%攻击力","99","99","10025","4","0",4],["26","攻速增加_水",[3,201],[4,0.25,0.5],-1,"雪糕投手攻速+25%","6",99,"10019",3,"2",3],["27","攻速增加_火",[3,101],[4,0.3,0.5],-1,"愤怒小鸡攻速+30%","99",99,"10013",3,"1",2],["28","攻速增加_木",[3,301],[4,0.2,0.5],-1,"玉米枪手攻速+20%",6,99,"10017",3,"2",4],["29","暴击_木",[3,301],[5,300,0],-1,"玉米枪手暴击率+30%",6,99,"10015",3,"2",4],["30","暴怒_木",[3,301],[6,350,0],-1,"玉米枪手暴击伤害+35%",6,99,"10014",3,"2",4],["31","暴击_火",[3,101],[5,250,0],-1,"愤怒小鸡暴击率+25%",6,99,"10012",3,"2",2],["32","暴怒_火",[3,101],[6,300,0],-1,"愤怒小鸡暴击伤害+30%",6,99,"10011",3,"2",2],["33","暴击_水",[3,201],[5,300,0],-1,"雪糕投手暴击率+30%",6,99,"10027",3,"2",3],["34","暴怒_水",[3,201],[6,350,0],-1,"雪糕投手暴击伤害+35%",6,99,"10028",3,"2",3],["35","超级弹夹",[3,301],[7,3,0],-1,"玉米枪手高能子弹+2","9",99,"10016","4","1",4],["36","超级爆裂狂怒",[3,101],[9,8,0],-1,"愤怒小鸡充能后攻速+60%","9",99,"10026","4","1",2],["37","技能提升",[4,0],[10,1,0],-1,"全体技能等级+1",6,99,"10005",3,"4",0],["38","快速蓄能",[3,301],[11,0.3,0.8],-1,"玉米枪手蓄力时间-30%","7",99,"10018","4","3",4],["39","中大奖",[0],[2,800,0],"0","增加800金币","9",99,"10010","3","99",0],["40","一夜暴富",[0],[2,1500,0],"0","增加1500金币","11","99","10010","4","99",0],["41","特级精灵魔盒",[0],[3,5,800],"-1","随机获得一个5级精灵","11","99","10006","4","2",0],["42","寒气_水",[3,201],[12,80,0],"-1","雪糕投手攻击冰冻概率+8%","4","99","10029",3,"3",3],["43","冻伤_水",[3,201],[13,300,0],"-1","雪糕投手对冰冻的敌人伤害+30%","6","99","10028",3,4,3],["44","冰冻延时",[3,201],[14,1,0],"-1","冰冻时间+1秒","6","99","10030",3,3,3]]

			@@ -3,4 +3,4 @@
			hdr-display-enabled=0
			androidStartInFullscreen=1
			androidRenderOutsideSafeArea=1
			buildDate=637437080752351052
			buildDate=637444025111555285