diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg b/Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg new file mode 100644 index 0000000000..c39f065dca Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg differ diff --git a/Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg.meta similarity index 72% rename from Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png.meta rename to Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg.meta index 09845f9217..f4eb140429 100644 --- a/Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_Activity3/b_bowenduoshi_banner_zh.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 815baebf53313784abb525ea7f9ae9d4 +guid: 6203597b2a144cc408d394a81b123d1d TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -84,18 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 + textureFormat: 56 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -108,14 +86,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8bf6894028c84784cbdcfa0ad0b1255e + spriteID: 75bf3ef1a7534e740913f32086a6beeb vertices: [] indices: edges: [] weights: [] - spritePackingTag: + spritePackingTag: DyAct_Activity3 pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/b_bowenduoshi_banner_zh - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png b/Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png deleted file mode 100644 index ddb44f14de..0000000000 Binary files a/Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index b45fda9b31..cd41c1976e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -53,11 +53,6 @@ function QianKunBoxBuyTenPanel:InitComponent() this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent") this.contentListParent[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i) end - - -- 关于抽卡的LotterySetting数据 - local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) - drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id - drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id end --绑定事件(用于子类重写) @@ -132,6 +127,8 @@ function QianKunBoxBuyTenPanel:OnOpen(...) this.drop=args[1] this.recruitType = args[2] recType = args[3] + drawtType.FindFairySingle=recType[1] + drawtType.FindFairyTen=recType[2] if args[4] then this.tenFunc=args[4] end