Merge branch 'master' of http://10.2.1.230/jl/JL_HotFix

Root/you_gu/Android/_log/dev_bt_and_41de4a357915cb1bb2ab79b605e5c746089280f0_2023_04_23_16_18_44.log

@@ -0,0 +1,13 @@
+热更文件版本：dev_bt_and_41de4a357915cb1bb2ab79b605e5c746089280f0_2023_04_23_16_18_44
+热更文件的工程对应的提交信息：
+commit 41de4a357915cb1bb2ab79b605e5c746089280f0
+Merge: 17821f9d1d 35ee3bdf48
+Author: zhangshanxue <zhangshanxue911@gmail.com>
+Date:   Sun Apr 23 15:31:16 2023 +0800
+
+    Merge branch 'china/dev_bt' into dev_bt_and
+热更大小：10.4508571624755859375
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_21_17_38_27.log

@@ -0,0 +1,7 @@
+files.unity3d
+lz4/prefabs/ui/compoundhero.unity3d
+lz4/prefabs/ui/generalpanel.unity3d
+lz4/prefabs/ui/rewardbox.unity3d
+lz4/prefabs/ui/tianshumijuan.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_21_17_38_27_Unity.log

@@ -0,0 +1,15 @@
+热更文件版本：you_gu_cdn_xiao7_and_2023_04_21_17_38_27
+热更版本号：1.1.60
+热更大小：11.31428623199462890625
+热更文件：
+files.unity3d
+lz4/prefabs/ui/compoundhero.unity3d
+lz4/prefabs/ui/generalpanel.unity3d
+lz4/prefabs/ui/rewardbox.unity3d
+lz4/prefabs/ui/tianshumijuan.unity3d
+lzma/luabytes.unity3d
+files.unity3d
+CDN TYPE: cos_yougu
+TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_yougu
+UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_xiao7_and you_gu_cdn_xiao7_and_2023_04_21_17_38_27 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_04_21_17_38_27_UpLoad.log
+Flush COMMAND: python Flush.py http://c-tcx.648sy.com/xiao7/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_04_21_17_38_27_UpLoad.log

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_21_17_38_27_UpLoad.log

@@ -0,0 +1,38 @@
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
+xiao7/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
+"87a86bd43317dec5a0de6ce82f7dbb03"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lz4/prefabs/ui/compoundhero.unity3d
+xiao7/Android/lz4/prefabs/ui/compoundhero.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lz4/prefabs/ui/compoundhero.unity3d ,headers=:{}
+"8a8c26e80c99f6218bd5f743976b4edf"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lz4/prefabs/ui/generalpanel.unity3d
+xiao7/Android/lz4/prefabs/ui/generalpanel.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lz4/prefabs/ui/generalpanel.unity3d ,headers=:{}
+"b4fa2aeee35f02e6d92ac95e3cca883d"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lz4/prefabs/ui/rewardbox.unity3d
+xiao7/Android/lz4/prefabs/ui/rewardbox.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lz4/prefabs/ui/rewardbox.unity3d ,headers=:{}
+"83b7f1c0dedb24af6a94474703fd26e5"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lz4/prefabs/ui/tianshumijuan.unity3d
+xiao7/Android/lz4/prefabs/ui/tianshumijuan.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lz4/prefabs/ui/tianshumijuan.unity3d ,headers=:{}
+"7acec2d2e1f7f29fa3a30830260e2439"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lzma/luabytes.unity3d
+xiao7/Android/lzma/luabytes.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lzma/luabytes.unity3d ,headers=:{}
+"d1d46648c67484d9186de2f231dedcf0"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
+xiao7/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
+"87a86bd43317dec5a0de6ce82f7dbb03"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/config.txt
+xiao7/Android/config.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/config.txt ,headers=:{}
+"223477d893dc0b3de5edc60fbb61b9ec"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/version.txt
+xiao7/Android/version.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/version.txt ,headers=:{}
+"0157d0934326fd9d36e4bbcae58ba39a"
+http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/xiao7/
+200

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_23_16_24_55.log

@@ -0,0 +1,3 @@
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_23_16_24_55_Unity.log

@@ -0,0 +1,11 @@
+热更文件版本：you_gu_cdn_xiao7_and_2023_04_23_16_24_55
+热更版本号：1.1.61
+热更大小：10.4508571624755859375
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d
+CDN TYPE: cos_yougu
+TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_yougu
+UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_xiao7_and you_gu_cdn_xiao7_and_2023_04_23_16_24_55 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_04_23_16_24_55_UpLoad.log
+Flush COMMAND: python Flush.py http://c-tcx.648sy.com/xiao7/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and//__HotFixLog/you_gu_cdn_xiao7_and_2023_04_23_16_24_55_UpLoad.log

Root/you_gu/cdn_xiao7_and/__HotFixLog/you_gu_cdn_xiao7_and_2023_04_23_16_24_55_UpLoad.log

@@ -0,0 +1,22 @@
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
+xiao7/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/lzma/luabytes.unity3d
+xiao7/Android/lzma/luabytes.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/lzma/luabytes.unity3d ,headers=:{}
+"926e39876f5b6bcb5d53aa7b0f9032fc"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/Android/files.unity3d
+xiao7/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/config.txt
+xiao7/Android/config.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/config.txt ,headers=:{}
+"223477d893dc0b3de5edc60fbb61b9ec"
+E:/JL/JL_HotFix/Root/you_gu/cdn_xiao7_and/version.txt
+xiao7/Android/version.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/xiao7/Android/version.txt ,headers=:{}
+"9eff740c2624dcea46c59fb6f358fb63"
+http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/xiao7/
+200

Root/you_gu/cdn_xiao7_and/version.txt

@@ -1 +1 @@
-{"subChannel":"2000","buglyId":"261348dcd3","channel":"YGXQ","resUrl":"http://c-tcx.648sy.com/xiao7/","packageVersion":"0.1","version":"1.1.59","serverUrl":"http://43.140.222.153:8080/"}
+{"subChannel":"2000","buglyId":"261348dcd3","channel":"YGXQ","resUrl":"http://c-tcx.648sy.com/xiao7/","packageVersion":"0.1","version":"1.1.61","serverUrl":"http://43.140.222.153:8080/"}

Root/you_gu/cdn_yougu_and/__HotFixLog/you_gu_cdn_yougu_and_2023_04_23_16_24_24.log

@@ -0,0 +1,3 @@
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/you_gu/cdn_yougu_and/__HotFixLog/you_gu_cdn_yougu_and_2023_04_23_16_24_24_Unity.log

@@ -0,0 +1,11 @@
+热更文件版本：you_gu_cdn_yougu_and_2023_04_23_16_24_24
+热更版本号：1.1.63
+热更大小：10.4508571624755859375
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d
+CDN TYPE: cos_yougu
+TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_yougu
+UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_yougu_and you_gu_cdn_yougu_and_2023_04_23_16_24_24 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and//__HotFixLog/you_gu_cdn_yougu_and_2023_04_23_16_24_24_UpLoad.log
+Flush COMMAND: python Flush.py http://c-tcx.648sy.com/yougu/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and//__HotFixLog/you_gu_cdn_yougu_and_2023_04_23_16_24_24_UpLoad.log

Root/you_gu/cdn_yougu_and/__HotFixLog/you_gu_cdn_yougu_and_2023_04_23_16_24_24_UpLoad.log

@@ -0,0 +1,22 @@
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/files.unity3d
+yougu/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/lzma/luabytes.unity3d
+yougu/Android/lzma/luabytes.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/lzma/luabytes.unity3d ,headers=:{}
+"926e39876f5b6bcb5d53aa7b0f9032fc"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/Android/files.unity3d
+yougu/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/config.txt
+yougu/Android/config.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/config.txt ,headers=:{}
+"223477d893dc0b3de5edc60fbb61b9ec"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_and/version.txt
+yougu/Android/version.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/yougu/Android/version.txt ,headers=:{}
+"a1e5842ffa49f895a38c82fd5f580450"
+http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/yougu/
+200

Root/you_gu/cdn_yougu_and/version.txt

@@ -1 +1 @@
-{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/yougu/","packageVersion":"0.1","version":"1.1.62","serverUrl":"http://43.140.213.135:8080/"}
+{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/yougu/","packageVersion":"0.1","version":"1.1.63","serverUrl":"http://43.140.213.135:8080/"}

Root/you_gu/cdn_yougu_andTest/__HotFixLog/you_gu_cdn_yougu_andTest_2023_04_23_16_19_12.log

@@ -0,0 +1,3 @@
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d

Root/you_gu/cdn_yougu_andTest/__HotFixLog/you_gu_cdn_yougu_andTest_2023_04_23_16_19_12_Unity.log

@@ -0,0 +1,11 @@
+热更文件版本：you_gu_cdn_yougu_andTest_2023_04_23_16_19_12
+热更版本号：1.1.64
+热更大小：10.4508571624755859375
+热更文件：
+files.unity3d
+lzma/luabytes.unity3d
+files.unity3d
+CDN TYPE: cos_haofan_ios
+TOOLS DIR: E:/JL/JL_HotFix/Tools/cos_haofan_ios
+UPLOAD COMMAND: python UpLoad.py E:/JL/JL_HotFix/Root/you_gu cdn_yougu_andTest you_gu_cdn_yougu_andTest_2023_04_23_16_19_12 0 >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_04_23_16_19_12_UpLoad.log
+Flush COMMAND: python Flush.py http://c-tcx.648sy.com/youguTest/ >>E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest//__HotFixLog/you_gu_cdn_yougu_andTest_2023_04_23_16_19_12_UpLoad.log

Root/you_gu/cdn_yougu_andTest/__HotFixLog/you_gu_cdn_yougu_andTest_2023_04_23_16_19_12_UpLoad.log

@@ -0,0 +1,22 @@
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/files.unity3d
+youguTest/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/lzma/luabytes.unity3d
+youguTest/Android/lzma/luabytes.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/lzma/luabytes.unity3d ,headers=:{}
+"926e39876f5b6bcb5d53aa7b0f9032fc"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/Android/files.unity3d
+youguTest/Android/files.unity3d
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/files.unity3d ,headers=:{}
+"e3c74d6fe380b6825d407335d4b29d85"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/config.txt
+youguTest/Android/config.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/config.txt ,headers=:{}
+"223477d893dc0b3de5edc60fbb61b9ec"
+E:/JL/JL_HotFix/Root/you_gu/cdn_yougu_andTest/version.txt
+youguTest/Android/version.txt
+INFO:qcloud_cos.cos_client:put object, url=:https://648sy-tcx-1251752472.cos.ap-beijing.myqcloud.com/youguTest/Android/version.txt ,headers=:{}
+"6934fee1de40faabd63cca781c2c7a47"
+http://smi.51sfsy.com/mrj/cdnrefresh?nonce=1532319693&token=881d1b9844fb78c165dad28752d67eb8&dirs=http://c-tcx.648sy.com/youguTest/
+200

Root/you_gu/cdn_yougu_andTest/version.txt

@@ -1 +1 @@
-{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/youguTest/","packageVersion":"0.1","version":"1.1.63","serverUrl":"http://82.157.34.193:8080/"}
+{"subChannel":"2000","buglyId":"261348dcd3","channel":"YOUGU","resUrl":"http://c-tcx.648sy.com/youguTest/","packageVersion":"0.1","version":"1.1.64","serverUrl":"http://82.157.34.193:8080/"}