Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815

2023-08-11 15:44:39 +08:00 · 2023-08-11 15:44:39 +08:00 · 22baebeab0
commit 22baebeab0
parent 44228b01fe 187eda1f35
25 changed files with 353 additions and 522 deletions
--- a/Assets/arts/textures/background/shop/shop_gift_banner_5.png
+++ b/Assets/arts/textures/background/shop/shop_gift_banner_5.png
--- a/Assets/arts/textures/background/shop/shop_gift_banner_5.png.meta
+++ b/Assets/arts/textures/background/shop/shop_gift_banner_5.png.meta
@ -50,7 +50,7 @@ TextureImporter:
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
@ -99,18 +99,6 @@ TextureImporter:
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -128,5 +116,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_5.png.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/textures/background/shop/shop_gift_banner_5_1.png
+++ b/Assets/arts/textures/background/shop/shop_gift_banner_5_1.png
--- a/Assets/arts/textures/background/shop/shop_gift_banner_5_1.png.meta
+++ b/Assets/arts/textures/background/shop/shop_gift_banner_5_1.png.meta
@ -50,7 +50,7 @@ TextureImporter:
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
  spriteTessellationDetail: -1
  textureType: 0
  textureShape: 1
@ -99,18 +99,6 @@ TextureImporter:
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -128,5 +116,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: arts/textures/background/shop/shop_gift_banner_5_1.png.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/lua/app/common/data_manager.lua.bytes
+++ b/Assets/lua/app/common/data_manager.lua.bytes
--- a/Assets/lua/app/config/chapter.lua.bytes
+++ b/Assets/lua/app/config/chapter.lua.bytes
--- a/Assets/lua/app/config/chapter_board_daily_challenge.lua.bytes
+++ b/Assets/lua/app/config/chapter_board_daily_challenge.lua.bytes
--- a/Assets/lua/app/config/fx.lua.bytes
+++ b/Assets/lua/app/config/fx.lua.bytes
--- a/Assets/lua/app/config/grid_edge_type.lua.bytes
+++ b/Assets/lua/app/config/grid_edge_type.lua.bytes
--- a/Assets/lua/app/config/monster_chapter.lua.bytes
+++ b/Assets/lua/app/config/monster_chapter.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
--- a/Assets/lua/app/module/activity/activity_manager.lua.bytes
+++ b/Assets/lua/app/module/activity/activity_manager.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes
--- a/Assets/lua/app/module/battle/skill/battle_grid_effect_handle.lua.bytes
+++ b/Assets/lua/app/module/battle/skill/battle_grid_effect_handle.lua.bytes
--- a/Assets/lua/app/module/shop/shop_manager.lua.bytes
+++ b/Assets/lua/app/module/shop/shop_manager.lua.bytes
--- a/Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes
+++ b/Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes
--- a/Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes.meta
+++ b/Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a0851134ba4f98243aa36b5f1671d8df
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes
+++ b/Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes
--- a/Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes.meta
+++ b/Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fbf9eda4aa7b6eb4685ddff5e75bc078
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/ui/activity/activity_ui.lua.bytes
+++ b/Assets/lua/app/ui/activity/activity_ui.lua.bytes
--- a/Assets/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.bytes
+++ b/Assets/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.bytes
--- a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
+++ b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
--- a/Assets/lua/app/userdata/activity/activity_data.lua.bytes
+++ b/Assets/lua/app/userdata/activity/activity_data.lua.bytes