From 06cac292f270d3a90084bf539b14334c6ea2048d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Jun 2021 20:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/r_mrcz_zi_111_zh.png | Bin 0 -> 16887 bytes .../ArtFont/r_mrcz_zi_111_zh.png.meta | 99 ++++++++++++++++++ .../DailyRecharge/DailyRechargePanel.lua | 13 ++- .../~Lua/Modules/Story/StoryMapPanel.lua | 43 +++++--- 4 files changed, 133 insertions(+), 22 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png create mode 100644 Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..219e1436a4d27d412f06dbda209fcfd61c8553bd GIT binary patch literal 16887 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png.meta new file mode 100644 index 0000000000..01c6052a9a --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_zi_111_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: a5bc6f9d00ea5f04b99c0c1f0a4cacdc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 42e42e2589898a64ab3cd53c8ae79aa0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 7801c30e31..59ceea7382 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -160,7 +160,7 @@ function DailyRechargePanel:OnDestroy() end local icon = { - [0] = "r_mrcz_zi_11", + [0] = "r_mrcz_zi_111_zh", [1] = "r_mrcz_zi_33_zh", } @@ -191,15 +191,14 @@ function DailyRechargePanel:RefreshPanel() self.extraTip.text = missionIndex[index].tipText self.dealText.text = Language[10420] self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + self.moneyNum:SetNumShow(1,(actRewardConfig1.Values[1][1] - dailyActInfo.value)) end else - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[0]) - self.extraTip.gameObject:SetActive(true) - self.extraTip.text = missionIndex[index].tipText + self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1]) + self.extraTip.gameObject:SetActive(false) self.dealText.text = Language[10101] - self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) + self.moneyNum.gameObject:SetActive(false) end self.extraIcon:SetNativeSize() table.walk(self.rewardList, function(rewardPosItem) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index a23005e95b..c10b935b33 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -56,8 +56,10 @@ end function StoryMapPanel:BindEvent() Util.AddClick(this.btnSkip, function () --StoryMapManager.GetSingleStoryConfig() - isSkip = true - this:StackPop() + MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function() + isSkip = true + this:StackPop() + end,"取消","确认") end) Util.AddClick(this.btnGoOn, function () this:ShowDialog() @@ -155,6 +157,7 @@ function StoryMapPanel:OnShow() end table.insert(this.triggerEvent,event) end + isSkip = false this.callList:Clear() for i = #this.triggerEvent,1,-1 do this.callList:Push(function() @@ -185,22 +188,32 @@ local pos = { function this:CheckTrigger(data,go) if isSkip then - --LogGreen("data.eventType:"..tostring(data.eventType).." this.curEvent.eventType:"..tostring(this.curEvent.eventType)) - if (data.eventType == this.curEvent.eventType) then--(data.eventType ~= 3 and data.eventType ~= 1 and data.eventType ~= 2 and data.eventType ~= 10) or (data.eventType == this.curEvent.eventType) then - this:CloseDiaLog() + -- --LogGreen("data.eventType:"..tostring(data.eventType).." this.curEvent.eventType:"..tostring(this.curEvent.eventType)) + -- if (data.eventType == this.curEvent.eventType) then--(data.eventType ~= 3 and data.eventType ~= 1 and data.eventType ~= 2 and data.eventType ~= 10) or (data.eventType == this.curEvent.eventType) then + -- this:CloseDiaLog() + -- this:StackPop() + -- return + -- end + -- if this.curEvent.eventType == 2 then + -- for k,v in pairs(this.PlayerGrouops) do + -- v:StopAction() + -- end + -- end + if data.eventType ~= 3 then this:StackPop() - return end - if this.curEvent.eventType == 2 then - for k,v in pairs(this.PlayerGrouops) do - v:StopAction() - end - end - if this.curEvent.eventType == 1 then - this:CloseDiaLog() - end - isSkip = false + -- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function() + -- if this.callList:Count() > 0 then + -- this.callList:Clear() + -- end + -- StoryMapManager.GetSingleStoryConfig() + -- return + -- end,"取消","确认") + -- MsgPanel.ShowTwo("是否跳过整段剧情?",function() end,function() + -- this:ClosePanel() + -- end,"取消","确认") end + isSkip = false this.go = go this.curEvent = data if data.eventType == 1 then -- 1 对话 2跑图 3假战斗