每日豪礼 修改提交

dev_chengFeng
jiaoyangna 2021-06-02 20:20:39 +08:00
parent 2f2436697c
commit 06cac292f2
4 changed files with 133 additions and 22 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -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:

View File

@ -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)

View File

@ -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假战斗