【修行】主界面 修行提交 1

dev_chengFeng
ZhangBiao 2021-05-25 10:16:07 +08:00
parent b728d3a396
commit cecea9b415
7 changed files with 274 additions and 29 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -0,0 +1,121 @@
fileFormatVersion: 2
guid: 7f8196f2128a4e6489a78791b3146f78
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: 65, z: 0, w: 58}
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8c7ed254380fac34b881b94369ba4887
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -7174,7 +7174,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -7491,7 +7491,7 @@ RectTransform:
- {fileID: 1174661642300151069}
- {fileID: 165462485454605335}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -7972,7 +7972,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 986452627335843391}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -14291,7 +14291,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20067,7 +20067,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21137,6 +21137,120 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2415491614551069973
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7660667769146384125}
- component: {fileID: 4838229921349092622}
- component: {fileID: 4128701516009104150}
- component: {fileID: 1645486651630728352}
- component: {fileID: 5173274903696953053}
m_Layer: 5
m_Name: RightUp2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7660667769146384125
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415491614551069973}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 986452627335843391}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100, y: -50}
m_SizeDelta: {x: 160, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &4838229921349092622
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415491614551069973}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 7f8196f2128a4e6489a78791b3146f78, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!222 &4128701516009104150
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415491614551069973}
m_CullTransparentMesh: 0
--- !u!114 &1645486651630728352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415491614551069973}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &5173274903696953053
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415491614551069973}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 50
m_Bottom: 150
m_ChildAlignment: 1
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 148, y: 126}
m_Spacing: {x: 0, y: 0}
m_Constraint: 1
m_ConstraintCount: 1
--- !u!1 &2427972345482950957
GameObject:
m_ObjectHideFlags: 0
@ -22013,7 +22127,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -80.00004, y: -126}
m_AnchoredPosition: {x: -80.00004, y: -120}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3137880424192743195
@ -22679,7 +22793,7 @@ RectTransform:
m_GameObject: {fileID: 3139533495069807838}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_Children: []
m_Father: {fileID: 5034612710644007650}
m_RootOrder: 0
@ -27845,7 +27959,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32643,7 +32757,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38392,7 +38506,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43539,7 +43653,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -48816,7 +48930,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -53997,7 +54111,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60282,7 +60396,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60951,7 +61065,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -42, y: -136}
m_AnchoredPosition: {x: -42, y: -150}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8266236825769241062
@ -60968,14 +61082,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 15
m_Top: 0
m_Right: 170
m_Top: 15
m_Bottom: 0
m_ChildAlignment: 2
m_StartCorner: 1
m_StartAxis: 0
m_CellSize: {x: 148, y: 126}
m_Spacing: {x: 0, y: 20}
m_Spacing: {x: -25, y: 0}
m_Constraint: 1
m_ConstraintCount: 5
--- !u!1 &5243932003980679696
@ -63350,7 +63464,7 @@ RectTransform:
- {fileID: 5352445832565045888}
- {fileID: 7754725958776047094}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -67213,6 +67327,7 @@ RectTransform:
- {fileID: 1508767087665272957}
- {fileID: 1470640894515440942}
- {fileID: 1612271237950830011}
- {fileID: 7660667769146384125}
- {fileID: 8831099743542526053}
- {fileID: 7019400324678272696}
- {fileID: 19914098443950123}
@ -72030,7 +72145,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77189,7 +77304,7 @@ ParticleSystem:
--- !u!199 &2319946449668926234
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -83578,7 +83693,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88644,7 +88759,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -1398,6 +1398,7 @@ FUNCTION_OPEN_TYPE = {
MeiRiLiBao = 90,
guajigongneng = 89,--挂机多人
FIGHTLEVEL = 107,--山河社稷图
PRACTICE = 108,--修行
}
TaskGetBtnIconDef = {

View File

@ -27,7 +27,8 @@ local isFirstOpen = 0
--local isCanDragMsg = true
local supremHadSet = false
local isUpperMonthCardTimeShow = true
local activitys = {}
local activitys = {}--中部页签
local activitysRight = {}--右侧页签
local activityTabs = {}
local moveSceneList = {
@ -240,6 +241,7 @@ function this:InitComponent()
this.activityTabPrefab = Util.GetGameObject(self.gameObject, "RightUp/activityTabPrefab")
this.RightUp = Util.GetGameObject(self.gameObject, "RightUp")
this.RightUp.transform.localScale = Vector3.one * UIManager.adapterScale
this.RightUp2 = Util.GetGameObject(self.gameObject, "RightUp2")
this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj")
end
@ -701,7 +703,11 @@ function this.CreatActivity()
for k,v in ipairs(activitys) do
if not activityTabs[k] then
activityTabs[k] = {}
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
local root = this.RightUp
if v.ListType == 1 then
root = this.RightUp2
end
activityTabs[k].go = newObjToParent(this.activityTabPrefab,root)
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1")
activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text")

View File

@ -523,8 +523,8 @@ function this.RegisterRedCheckFunc()
--化虚坛英雄合成
RPData:AddCheckFunc(RedPointType.Huaxutan_CompoundHero,HeroManager.GetAllHeroCompoundRedPoint)
--主角修行
RPData:AddCheckFunc(RedPointType.Practice_upgrade,PracticeManager.PracticeCheckUpgrade)
RPData:AddCheckFunc(RedPointType.Practice_imprint,PracticeManager.PracticeCheckImprint)
RPData:AddCheckFunc(RedPointType.Practice_upgrade,PracticeManager.PracticeCheckUpgrade,FUNCTION_OPEN_TYPE.PRACTICE)
RPData:AddCheckFunc(RedPointType.Practice_imprint,PracticeManager.PracticeCheckImprint,FUNCTION_OPEN_TYPE.PRACTICE)
end

View File

@ -142,8 +142,10 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId)
name.text = configData.Name
Util.AddOnceClick(maskBtn,function ()
PlayerPrefs.SetInt(PlayerManager.uid.."Imprint"..configData.Id,1)
redPoint:SetActive(false)
if serverData then--如果没有解锁 点击查看不能影响后面红点
PlayerPrefs.SetInt(PlayerManager.uid.."Imprint"..configData.Id,1)
redPoint:SetActive(false)
end
local ScrollTrans = self.Scrollgrid:GetComponent("RectTransform")
curNum = configData.UnlockId - 1
local num = 100 + (curNum-2)*468 > 0 and 100 + (curNum-2)*468 or 0