root/iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

七控修改

Browse Source
This commit is contained in:
Long-PC\Long
2019-04-16 01:32:56 +08:00
parent 164af95bd0
commit 5f619f30f8
944 changed files with 22021 additions and 404379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+1 -1
View File
@@ -1 +1 @@
#Tue Apr 09 15:40:11 CST 2019
#Tue Apr 16 01:31:55 CST 2019
p2PCore/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="C:\Users\Long\.android\build-cache\5c7be4c5b06a82b628e0a9547e258e721490b847\output\res"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\ifish\p2PCore\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\ifish\p2PCore\src\androidTest\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\androidTest\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="C:\Users\Long\.android\build-cache\5c7be4c5b06a82b628e0a9547e258e721490b847\output\res"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="D:\ifish\p2PCore\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\ifish\p2PCore\src\androidTest\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\androidTest\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="C:\Users\Administrator\.android\build-cache\7f60ceede3a1b85b8bcc39101a275f97d5327a9b\output\res"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\androidTest\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\androidTest\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="C:\Users\Administrator\.android\build-cache\7f60ceede3a1b85b8bcc39101a275f97d5327a9b\output\res"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\androidTest\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\androidTest\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
p2PCore/build/intermediates/incremental/mergeDebugAssets/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\ifish\p2PCore\src\main\assets"/><source path="D:\ifish\p2PCore\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="D:\ifish\p2PCore\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\assets"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\assets"/></dataSet></merger>
p2PCore/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+1 -1
View File
@@ -1 +1 @@
#Tue Apr 09 15:40:11 CST 2019
#Tue Apr 16 01:31:55 CST 2019
p2PCore/build/intermediates/incremental/mergeDebugResources/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="C:\Users\Long\.android\build-cache\5c7be4c5b06a82b628e0a9547e258e721490b847\output\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\ifish\p2PCore\src\debug\res"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="C:\Users\Long\.android\build-cache\5c7be4c5b06a82b628e0a9547e258e721490b847\output\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\ifish\p2PCore\src\debug\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="output$Generated" generated="true"><source path="C:\Users\Administrator\.android\build-cache\7f60ceede3a1b85b8bcc39101a275f97d5327a9b\output\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\res"/></dataSet><dataSet config="output" from-dependency="true" generated-set="output$Generated"><source path="C:\Users\Administrator\.android\build-cache\7f60ceede3a1b85b8bcc39101a275f97d5327a9b\output\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\res"/></dataSet><mergedItems/></merger>
p2PCore/build/intermediates/incremental/mergeDebugShaders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\ifish\p2PCore\src\main\shaders"/></dataSet><dataSet config="debug"><source path="D:\ifish\p2PCore\src\debug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\shaders"/></dataSet></merger>
p2PCore/build/intermediates/incremental/mergeReleaseAssets/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\ifish\p2PCore\src\main\assets"/><source path="D:\ifish\p2PCore\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="D:\ifish\p2PCore\src\release\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\assets"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\p2PCore\src\release\assets"/></dataSet></merger>
p2PCore/build/intermediates/incremental/mergeReleaseShaders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="D:\ifish\p2PCore\src\main\shaders"/></dataSet><dataSet config="release"><source path="D:\ifish\p2PCore\src\release\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\p2PCore\src\release\shaders"/></dataSet></merger>
p2PCore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+1 -1
View File
@@ -1 +1 @@
#Tue Apr 09 15:40:11 CST 2019
#Tue Apr 16 01:31:55 CST 2019
p2PCore/build/intermediates/incremental/packageDebugResources/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\ifish\p2PCore\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\debug"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\ifish\p2PCore\src\debug\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\debug\res"/></dataSet><mergedItems/></merger>
p2PCore/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+1 -1
View File
@@ -1 +1 @@
#Tue Apr 09 15:39:41 CST 2019
#Tue Apr 16 01:31:49 CST 2019
p2PCore/build/intermediates/incremental/packageReleaseResources/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\release"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="D:\ifish\p2PCore\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\ifish\p2PCore\src\main\res"/><source path="D:\ifish\p2PCore\build\generated\res\rs\release"/><source path="D:\ifish\p2PCore\build\generated\res\resValues\release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="D:\ifish\p2PCore\src\release\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\release"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="C:\beifen\ifish\ifish\p2PCore\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\main\res"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\rs\release"/><source path="C:\beifen\ifish\ifish\p2PCore\build\generated\res\resValues\release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="C:\beifen\ifish\ifish\p2PCore\src\release\res"/></dataSet><mergedItems/></merger>