generated from root/miduo_client
mht_china/zf热更文件更新:china/zf_test_81582e01b2f86e0ebe544a9a586829c54580ad28_2021_07_19_19_42_40
parent
cbb8f72b42
commit
99821aba60
|
|
@ -0,0 +1,41 @@
|
|||
热更文件版本:china/zf_test_81582e01b2f86e0ebe544a9a586829c54580ad28_2021_07_19_19_42_40
|
||||
热更文件的工程对应的提交信息:
|
||||
commit 81582e01b2f86e0ebe544a9a586829c54580ad28
|
||||
Merge: 9ff9f2186c 06cf7f6cdd
|
||||
Author: JieLing <jieling@ljsd.com>
|
||||
Date: Mon Jul 19 18:31:25 2021 +0800
|
||||
|
||||
Merge remote-tracking branch 'origin/china/dev' into china/zf_test
|
||||
|
||||
# Conflicts:
|
||||
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
||||
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
||||
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua
|
||||
热更大小:23.41235446929931640625
|
||||
热更文件:
|
||||
lz4/atlas/activityaltas.unity3d
|
||||
lz4/atlas/dynamicactivityatlas.unity3d
|
||||
lz4/atlas/fightlevelatlas.unity3d
|
||||
lz4/atlas/journeywithwindatlas.unity3d
|
||||
lz4/atlas/linglongatlas.unity3d
|
||||
lz4/atlas/mainatlas.unity3d
|
||||
lz4/atlas/recruitatlas.unity3d
|
||||
lz4/atlas/timelimituphero.unity3d
|
||||
lz4/dynamicatlas/y_yjj_128kuang001.unity3d
|
||||
lz4/effectresui/linglongbaojing.unity3d
|
||||
lz4/icon/item.unity3d
|
||||
lz4/prefabs/ui/dynamicacticity.unity3d
|
||||
lz4/prefabs/ui/fightlevel.unity3d
|
||||
lz4/prefabs/ui/firstrecharge.unity3d
|
||||
lz4/prefabs/ui/generalpanel.unity3d
|
||||
lz4/prefabs/ui/linglong.unity3d
|
||||
lz4/prefabs/ui/main.unity3d
|
||||
lz4/prefabs/ui/operating.unity3d
|
||||
lz4/prefabs/ui/popup.unity3d
|
||||
lz4/prefabs/ui/recruit.unity3d
|
||||
lz4/prefabs/ui/upppermonthcardview.unity3d
|
||||
lz4/publicartres/materials.unity3d
|
||||
lz4/publicartres/shaders.unity3d
|
||||
lzma/luabytes.unity3d
|
||||
lzma/resconfigs.unity3d
|
||||
files.unity3d
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue