diff --git a/AssetBundles/version.txt b/AssetBundles/version.txt index 910deeb2e1..aa5c220c10 100644 --- a/AssetBundles/version.txt +++ b/AssetBundles/version.txt @@ -1 +1 @@ -{"channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.4", "subChannel":"200417", "version":"0.16.14", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file +{"subChannel":"1", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/Assets/CRC/game.asset b/Assets/CRC/game.asset index 1fd83b78b7..c53bbd70a9 100644 --- a/Assets/CRC/game.asset +++ b/Assets/CRC/game.asset @@ -15,8 +15,8 @@ MonoBehaviour: files: - id: 1 fileName: lz4/icons.unity3d - crc: 3154985965 - size: 7942755 + crc: 1921015954 + size: 7949084 - id: 2 fileName: lz4/splashpanel.unity3d crc: 1084456864 @@ -5127,12 +5127,12 @@ MonoBehaviour: size: 167711 - id: 1279 fileName: lz4/prefabs/effect/casting/tongyong_casting_shang.unity3d - crc: 3435099013 + crc: 2264735733 size: 243101 - id: 1280 fileName: lz4/prefabs/effect/casting/tongyong_casting_xia.unity3d - crc: 3047187504 - size: 245827 + crc: 1972874597 + size: 244358 - id: 1281 fileName: lz4/prefabs/effect/floating/c_jz_0002_skeff_slidesk_buff.unity3d crc: 3768720044 @@ -5699,8 +5699,8 @@ MonoBehaviour: size: 69895 - id: 1422 fileName: lz4/prefabs/ui/battle.unity3d - crc: 1814411735 - size: 1558509 + crc: 3855273658 + size: 1556857 - id: 1423 fileName: lz4/prefabs/ui/bindphonenumber.unity3d crc: 669053643 @@ -5835,8 +5835,8 @@ MonoBehaviour: size: 121570 - id: 1456 fileName: lz4/prefabs/ui/popup.unity3d - crc: 4081431032 - size: 2149698 + crc: 1758917122 + size: 2150622 - id: 1457 fileName: lz4/prefabs/ui/power.unity3d crc: 3263385330 @@ -5863,16 +5863,16 @@ MonoBehaviour: size: 1337358 - id: 1463 fileName: lz4/prefabs/ui/resolve.unity3d - crc: 1316875972 - size: 60852 + crc: 1835327053 + size: 88426 - id: 1464 fileName: lz4/prefabs/ui/rewardbox.unity3d crc: 1007678143 size: 14728 - id: 1465 fileName: lz4/prefabs/ui/roleinfo.unity3d - crc: 2322751377 - size: 1029252 + crc: 2590291549 + size: 1029262 - id: 1466 fileName: lz4/prefabs/ui/secretbox.unity3d crc: 2157366829 @@ -5891,8 +5891,8 @@ MonoBehaviour: size: 30521 - id: 1470 fileName: lz4/prefabs/ui/soulprint.unity3d - crc: 2324365426 - size: 102300 + crc: 1287548514 + size: 103475 - id: 1471 fileName: lz4/prefabs/ui/soulprintastrology.unity3d crc: 500780580 @@ -6835,10 +6835,10 @@ MonoBehaviour: size: 1116 - id: 1706 fileName: lzma/luabytes.unity3d - crc: 215211601 - size: 2114118 + crc: 2967188058 + size: 2116827 - id: 1707 fileName: lzma/resconfigs.unity3d - crc: 3870530001 - size: 67593 + crc: 3397494052 + size: 67478 version: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 4643eb8b79..29f1deed7c 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -24961,6 +24961,10 @@ MonoBehaviour: extension: .png resPathIndex: 139 resAbNameIndex: 1216 + - resName: r_hy_0025 + extension: .png + resPathIndex: 140 + resAbNameIndex: 1216 - resName: r_hy_bxsh_0009 extension: .png resPathIndex: 140 @@ -42065,7 +42069,6 @@ MonoBehaviour: - lz4/atlas/battleatlas.unity3d - lz4/publicartres/materials.unity3d - lz4/publicartres/models.unity3d - - lz4/spine/c_fx_00028.unity3d - assetBundleName: lz4/prefabs/effect/floating/c_jz_0002_skeff_slidesk_buff.unity3d dependences: - lz4/publicartres/materials.unity3d @@ -42957,7 +42960,6 @@ MonoBehaviour: - lz4/publicartres/models.unity3d - lz4/publicartres/textures.unity3d - lz4/rtexture/cardtexture1.unity3d - - lz4/spine/c_fx_00028.unity3d - assetBundleName: lz4/prefabs/ui/bindphonenumber.unity3d dependences: - lz4/atlas/chatatlas.unity3d @@ -43855,6 +43857,7 @@ MonoBehaviour: - lz4/fonts/kaiu.unity3d - lz4/icons.unity3d - lz4/publicartres/animations.unity3d + - lz4/publicartres/materials.unity3d - assetBundleName: lz4/prefabs/ui/rewardbox.unity3d dependences: - lz4/atlas/activityaltas.unity3d diff --git a/Assets/Resources/version.txt b/Assets/Resources/version.txt index f10a20f4c9..aa5c220c10 100644 --- a/Assets/Resources/version.txt +++ b/Assets/Resources/version.txt @@ -1 +1 @@ -{"buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "subChannel":"1", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file +{"subChannel":"1", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/BuildABs/Android/files.unity3d b/BuildABs/Android/files.unity3d index 29a824048f..1b0d4dea8b 100644 Binary files a/BuildABs/Android/files.unity3d and b/BuildABs/Android/files.unity3d differ diff --git a/BuildABs/Android/lz4/icons.unity3d b/BuildABs/Android/lz4/icons.unity3d index e204a3d3fc..36ed12211e 100644 Binary files a/BuildABs/Android/lz4/icons.unity3d and b/BuildABs/Android/lz4/icons.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_shang.unity3d b/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_shang.unity3d index fc6c5eee44..62112c1a88 100644 Binary files a/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_shang.unity3d and b/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_shang.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_xia.unity3d b/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_xia.unity3d index 5fdb104d3b..f413bf68d5 100644 Binary files a/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_xia.unity3d and b/BuildABs/Android/lz4/prefabs/effect/casting/tongyong_casting_xia.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/battle.unity3d b/BuildABs/Android/lz4/prefabs/ui/battle.unity3d index 1fc5be6670..8ad70a1206 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/battle.unity3d and b/BuildABs/Android/lz4/prefabs/ui/battle.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/popup.unity3d b/BuildABs/Android/lz4/prefabs/ui/popup.unity3d index 39c08fa969..e7597845d4 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/popup.unity3d and b/BuildABs/Android/lz4/prefabs/ui/popup.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/resolve.unity3d b/BuildABs/Android/lz4/prefabs/ui/resolve.unity3d index 5be5ba5af7..4b904cc2d9 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/resolve.unity3d and b/BuildABs/Android/lz4/prefabs/ui/resolve.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d b/BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d index 384d94f3e4..e24f8369aa 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d and b/BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d b/BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d index d4def08029..351011f28d 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d and b/BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d differ diff --git a/BuildABs/Android/lzma/luabytes.unity3d b/BuildABs/Android/lzma/luabytes.unity3d index 5c55e1f54f..9a9ebae652 100644 Binary files a/BuildABs/Android/lzma/luabytes.unity3d and b/BuildABs/Android/lzma/luabytes.unity3d differ diff --git a/BuildABs/Android/lzma/resconfigs.unity3d b/BuildABs/Android/lzma/resconfigs.unity3d index 16c59bc126..eac6bfd974 100644 Binary files a/BuildABs/Android/lzma/resconfigs.unity3d and b/BuildABs/Android/lzma/resconfigs.unity3d differ diff --git a/data_execl/excelTool/ExportConfig.xlsx b/data_execl/excelTool/ExportConfig.xlsx index 1613f3f049..0694fbbe54 100644 Binary files a/data_execl/excelTool/ExportConfig.xlsx and b/data_execl/excelTool/ExportConfig.xlsx differ