每日豪礼 修改提交
parent
2f2436697c
commit
06cac292f2
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
|
@ -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:
|
|
@ -160,7 +160,7 @@ function DailyRechargePanel:OnDestroy()
|
||||||
end
|
end
|
||||||
|
|
||||||
local icon = {
|
local icon = {
|
||||||
[0] = "r_mrcz_zi_11",
|
[0] = "r_mrcz_zi_111_zh",
|
||||||
[1] = "r_mrcz_zi_33_zh",
|
[1] = "r_mrcz_zi_33_zh",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,15 +191,14 @@ function DailyRechargePanel:RefreshPanel()
|
||||||
self.extraTip.text = missionIndex[index].tipText
|
self.extraTip.text = missionIndex[index].tipText
|
||||||
self.dealText.text = Language[10420]
|
self.dealText.text = Language[10420]
|
||||||
self.moneyNum.gameObject:SetActive(true)
|
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
|
end
|
||||||
else
|
else
|
||||||
self.extraIcon.sprite = self.spLoader:LoadSprite(icon[0])
|
self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1])
|
||||||
self.extraTip.gameObject:SetActive(true)
|
self.extraTip.gameObject:SetActive(false)
|
||||||
self.extraTip.text = missionIndex[index].tipText
|
|
||||||
self.dealText.text = Language[10101]
|
self.dealText.text = Language[10101]
|
||||||
self.moneyNum.gameObject:SetActive(true)
|
self.moneyNum.gameObject:SetActive(false)
|
||||||
self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1])
|
|
||||||
end
|
end
|
||||||
self.extraIcon:SetNativeSize()
|
self.extraIcon:SetNativeSize()
|
||||||
table.walk(self.rewardList, function(rewardPosItem)
|
table.walk(self.rewardList, function(rewardPosItem)
|
||||||
|
|
|
@ -56,8 +56,10 @@ end
|
||||||
function StoryMapPanel:BindEvent()
|
function StoryMapPanel:BindEvent()
|
||||||
Util.AddClick(this.btnSkip, function ()
|
Util.AddClick(this.btnSkip, function ()
|
||||||
--StoryMapManager.GetSingleStoryConfig()
|
--StoryMapManager.GetSingleStoryConfig()
|
||||||
isSkip = true
|
MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||||
this:StackPop()
|
isSkip = true
|
||||||
|
this:StackPop()
|
||||||
|
end,"取消","确认")
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnGoOn, function ()
|
Util.AddClick(this.btnGoOn, function ()
|
||||||
this:ShowDialog()
|
this:ShowDialog()
|
||||||
|
@ -155,6 +157,7 @@ function StoryMapPanel:OnShow()
|
||||||
end
|
end
|
||||||
table.insert(this.triggerEvent,event)
|
table.insert(this.triggerEvent,event)
|
||||||
end
|
end
|
||||||
|
isSkip = false
|
||||||
this.callList:Clear()
|
this.callList:Clear()
|
||||||
for i = #this.triggerEvent,1,-1 do
|
for i = #this.triggerEvent,1,-1 do
|
||||||
this.callList:Push(function()
|
this.callList:Push(function()
|
||||||
|
@ -185,22 +188,32 @@ local pos = {
|
||||||
|
|
||||||
function this:CheckTrigger(data,go)
|
function this:CheckTrigger(data,go)
|
||||||
if isSkip then
|
if isSkip then
|
||||||
--LogGreen("data.eventType:"..tostring(data.eventType).." this.curEvent.eventType:"..tostring(this.curEvent.eventType))
|
-- --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
|
-- 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: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()
|
this:StackPop()
|
||||||
return
|
|
||||||
end
|
end
|
||||||
if this.curEvent.eventType == 2 then
|
-- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||||
for k,v in pairs(this.PlayerGrouops) do
|
-- if this.callList:Count() > 0 then
|
||||||
v:StopAction()
|
-- this.callList:Clear()
|
||||||
end
|
-- end
|
||||||
end
|
-- StoryMapManager.GetSingleStoryConfig()
|
||||||
if this.curEvent.eventType == 1 then
|
-- return
|
||||||
this:CloseDiaLog()
|
-- end,"取消","确认")
|
||||||
end
|
-- MsgPanel.ShowTwo("是否跳过整段剧情?",function() end,function()
|
||||||
isSkip = false
|
-- this:ClosePanel()
|
||||||
|
-- end,"取消","确认")
|
||||||
end
|
end
|
||||||
|
isSkip = false
|
||||||
this.go = go
|
this.go = go
|
||||||
this.curEvent = data
|
this.curEvent = data
|
||||||
if data.eventType == 1 then -- 1 对话 2跑图 3假战斗
|
if data.eventType == 1 then -- 1 对话 2跑图 3假战斗
|
||||||
|
|
Loading…
Reference in New Issue