Go to file
DESKTOP-RH64908\Administrator 31b7a9a61a Merge branch 'master' of http://192.168.1.21:3000/root/miduo_HotFix
# Conflicts:
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and1/version.txt
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/Android/lz4/prefabs/ui/gmpanel.unity3d
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/Android/lz4/prefabs/ui/homeland.unity3d
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_16_16_05_08.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_16_16_05_08_Unity.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_16_16_05_08_UpLoad.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_19_19_04_18.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_19_19_04_18_Unity.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_19_19_04_18_UpLoad.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_20_16_25_29.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_20_16_25_29_Unity.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_20_16_25_29_UpLoad.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_21_14_54_49.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_21_14_54_49_Unity.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_and5/__HotFixLog/xiyouZeroOne_cdn_ziyouZeroOneTest_and_2024_08_21_14_54_49_UpLoad.log
#	Root/xiyouZeroOne/cdn_ziyouZeroOneTest_andbufen/version.txt
2024-08-28 17:22:01 +08:00
Root 幽谷西游0.1QD1Test_and更新:xiyouZeroOne_cdn_ziyouZeroOneTest_and1_2024_08_21_14_55_18 2024-08-21 14:55:28 +08:00
Tools 西游 bt 热更提交 2024-06-25 15:57:06 +08:00
.gitignore 【忽略临时文件】 2021-09-07 16:51:50 +08:00