puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xy_tu 2023-08-11 15:44:39 +08:00
commit 22baebeab0
25 changed files with 353 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/arts/textures/background/shop/shop_gift_banner_5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 129 KiB

16
Assets/arts/textures/background/shop/shop_gift_banner_5.png.meta
View File

@ -50,7 +50,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0 textureType: 0
textureShape: 1 textureShape: 1
@ -99,18 +99,6 @@ TextureImporter:
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
@ -128,5 +116,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: arts/textures/background/shop/shop_gift_banner_5.png.ab assetBundleName:
assetBundleVariant: assetBundleVariant:

BIN
Assets/arts/textures/background/shop/shop_gift_banner_5_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 158 KiB

16
Assets/arts/textures/background/shop/shop_gift_banner_5_1.png.meta
View File

@ -50,7 +50,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0 textureType: 0
textureShape: 1 textureShape: 1
@ -99,18 +99,6 @@ TextureImporter:
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
@ -128,5 +116,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: arts/textures/background/shop/shop_gift_banner_5_1.png.ab assetBundleName:
assetBundleVariant: assetBundleVariant:

BIN
Assets/lua/app/common/data_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/chapter.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/chapter_board_daily_challenge.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/fx.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/grid_edge_type.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/monster_chapter.lua.bytes
View File

Binary file not shown.

829
Assets/lua/app/config/skill.lua.bytes
View File

File diff suppressed because one or more lines are too long

BIN
Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/activity/activity_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/skill/battle_grid_effect_handle.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/shop/shop_manager.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes Normal file
View File

Binary file not shown.

7
Assets/lua/app/ui/activity/activity_gift_hero_ui.lua.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a0851134ba4f98243aa36b5f1671d8df
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes Normal file
View File

Binary file not shown.

7
Assets/lua/app/ui/activity/activity_gift_skin_ui.lua.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fbf9eda4aa7b6eb4685ddff5e75bc078
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/lua/app/ui/activity/activity_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/main_city/cell/side_bar_activity_cell.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/activity/activity_data.lua.bytes
View File

Binary file not shown.