Merge branch 'master_develop' into xuanyuanbaojing

# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx
dev_chengFeng
jiaoyangna 2020-07-20 20:00:31 +08:00
commit 9b7e47aaef
49 changed files with 16180 additions and 16897 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: ab2c5183d1b674c48adc1edb96bde6ba
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: 65
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a89cfe9d0e63df442b92bbbfe9d72270
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c3a6856840ebd9642ad750223fed0c08
guid: 12e56bc5a2215d544abd425232c4bf72
AudioImporter:
externalObjects: {}
serializedVersion: 6

File diff suppressed because it is too large Load Diff

View File

@ -1677,6 +1677,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 672}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1902493317592025725
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5102867911860676314}
- component: {fileID: 4929236181800039330}
- component: {fileID: 2347750445167593321}
m_Layer: 5
m_Name: arenaScore
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5102867911860676314
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902493317592025725}
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: 3128544740893925850}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000006914139, y: 0.0000021457672}
m_SizeDelta: {x: 300.59998, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4929236181800039330
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902493317592025725}
m_CullTransparentMesh: 0
--- !u!114 &2347750445167593321
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902493317592025725}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u70BC\u72F15-5"
LanguageIndex: 11440
--- !u!1 &2038844224890316750
GameObject:
m_ObjectHideFlags: 0
@ -1783,6 +1863,7 @@ RectTransform:
- {fileID: 3574257153817449386}
- {fileID: 2636399030825652164}
- {fileID: 6343858779078722984}
- {fileID: 7874033753268375199}
m_Father: {fileID: 6913215175904765234}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2988,6 +3069,7 @@ RectTransform:
- {fileID: 1323843675036142031}
- {fileID: 8982232778493311718}
- {fileID: 6619555056324006340}
- {fileID: 2886390000781381518}
m_Father: {fileID: 3542290585148391186}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3375,6 +3457,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4487017081131425909
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7874033753268375199}
- component: {fileID: 8799657971638144051}
- component: {fileID: 2632570842379578499}
m_Layer: 5
m_Name: arenaScore
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7874033753268375199
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4487017081131425909}
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: 8790539866172688193}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.000010967255, y: 0.0000021457672}
m_SizeDelta: {x: 300.59998, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8799657971638144051
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4487017081131425909}
m_CullTransparentMesh: 0
--- !u!114 &2632570842379578499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4487017081131425909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u70BC\u72F15-5"
LanguageIndex: 11440
--- !u!1 &4529726933452628595
GameObject:
m_ObjectHideFlags: 0
@ -4169,6 +4331,86 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Delegates: []
delegates: []
--- !u!1 &5496183595523988309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2886390000781381518}
- component: {fileID: 5261976870595917203}
- component: {fileID: 8088748264479296521}
m_Layer: 5
m_Name: arenaScore
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2886390000781381518
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496183595523988309}
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: 1661457884122057613}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.00000047683716, y: 0.000012040138}
m_SizeDelta: {x: 300.59998, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5261976870595917203
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496183595523988309}
m_CullTransparentMesh: 0
--- !u!114 &8088748264479296521
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5496183595523988309}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u70BC\u72F15-5"
LanguageIndex: 11440
--- !u!1 &5506042280547655900
GameObject:
m_ObjectHideFlags: 0
@ -6606,6 +6848,7 @@ RectTransform:
- {fileID: 4440706391705485068}
- {fileID: 4935494681454572907}
- {fileID: 3939068427722580484}
- {fileID: 5102867911860676314}
m_Father: {fileID: 8830212790296371356}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -12928,6 +12928,14 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 84
resAbNameIndex: 130
- resName: Audioc_swk_00015_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 130
- resName: Audio_common_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 130
- resName: Audio_c_ab_00014_attack_01
extension: .mp3
resPathIndex: 85
@ -13100,6 +13108,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 172
- resName: Audio_c_jbj_0007_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 172
- resName: Audio_c_jcdp_00027_attack_01
extension: .mp3
resPathIndex: 85
@ -13252,6 +13264,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 210
- resName: Audio_c_mrzq_0010_skeff_slidesk_attacked
extension: .mp3
resPathIndex: 85
resAbNameIndex: 210
- resName: Audio_c_mz_00038_attack_01
extension: .mp3
resPathIndex: 85
@ -13352,6 +13368,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 233
- resName: Audio_c_ts_00017_attack_01_1
extension: .mp3
resPathIndex: 85
resAbNameIndex: 233
- resName: Audio_c_ttjz_00048_attack_01
extension: .mp3
resPathIndex: 85
@ -13600,6 +13620,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_FX_c_yxz_0057_skill01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_fx_Effect_CST_skill01
extension: .mp3
resPathIndex: 85
@ -13708,6 +13732,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 300
- resName: Audio_m_mh_0046__attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 300
- resName: Audio_m_mmls_0045_attack_01
extension: .mp3
resPathIndex: 85

View File

@ -1677,6 +1677,7 @@ RANK_TYPE = {
GUILD_FORCE_RANK=20,-- 公会
GOLD_EXPER=21,-- 点金
FORCE_CURR_RANK=22,-- 实时战力排行
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
}
--东海寻仙弹窗类型
@ -1904,7 +1905,8 @@ DeathPosStatus={
Death=-1,
Close=0,
Fight=1,
Reward=2
Reward=2,
Belated=0,--十绝阵开启才加入工会
}
--公会车迟 阶段类型 1挑战 2间歇 3抢夺
GuildCarDelayProType={
@ -1937,11 +1939,12 @@ BATTLE_TYPE = {
Senro = 12, --森罗幻境
}
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0},
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,Id = 55,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0},
[3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,Id = 4,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0},
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0},
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper},
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
[2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,Id = 55,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
[3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,Id = 4,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = true},
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,Id = 8,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
}
SoulPrintSpriteByQuantity={

View File

@ -2238,4 +2238,7 @@
[12237] = "1星",
[12238] = "没有得到equipData",
[12239] = "召唤 次必得红色魂印",
[12240] = "竞技排名",
[12241] = "积分:",
[12242] = "",
}

View File

@ -262,6 +262,7 @@ DEATHPATHINFO_GUILDNAME_FIELD = protobuf.FieldDescriptor();
DEATHPATHINFO_GID_FIELD = protobuf.FieldDescriptor();
GETDEATHPATHSTATUSRESPONSE = protobuf.Descriptor();
GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD = protobuf.FieldDescriptor();
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD = protobuf.FieldDescriptor();
GETDEATHPATHINFORESPONSE = protobuf.Descriptor();
GETDEATHPATHINFORESPONSE_OVERTIME_FIELD = protobuf.FieldDescriptor();
GETDEATHPATHINFORESPONSE_CHALLENGECOUNT_FIELD = protobuf.FieldDescriptor();
@ -2713,11 +2714,21 @@ GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.default_value = 0
GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.type = 5
GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.cpp_type = 1
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.name = "allowChallange"
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.full_name = ".com.ljsd.jieling.protocols.GetDeathPathStatusResponse.allowChallange"
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.number = 2
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.index = 1
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.label = 1
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.has_default_value = false
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.default_value = 0
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.type = 5
GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.cpp_type = 1
GETDEATHPATHSTATUSRESPONSE.name = "GetDeathPathStatusResponse"
GETDEATHPATHSTATUSRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetDeathPathStatusResponse"
GETDEATHPATHSTATUSRESPONSE.nested_types = {}
GETDEATHPATHSTATUSRESPONSE.enum_types = {}
GETDEATHPATHSTATUSRESPONSE.fields = {GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD}
GETDEATHPATHSTATUSRESPONSE.fields = {GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD, GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD}
GETDEATHPATHSTATUSRESPONSE.is_extendable = false
GETDEATHPATHSTATUSRESPONSE.extensions = {}
GETDEATHPATHINFORESPONSE_OVERTIME_FIELD.name = "overTime"

View File

@ -9,15 +9,15 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
local _TabData = {
[1]= {txt = Language[10079]},
[2]= {txt = Language[10030]},
[3]= {txt = Language[10080]},
[4]= {txt = Language[10081]},
-- [2]= {txt = Language[10030]},
[2]= {txt = Language[10080]},
[3]= {txt = Language[10081]},
}
-- 内容数据
local _ViewData = {
[1] = {script = "Modules/Arena/View/ArenaView"},
[2] = {script = "Modules/Arena/View/RankView"},
[3] = {script = "Modules/Arena/View/RewardView"},
-- [2] = {script = "Modules/Arena/View/RankView"},
[2] = {script = "Modules/Arena/View/RewardView"},
}
@ -29,8 +29,8 @@ function ArenaMainPanel:InitComponent()
this.ViewList = {}
this.ViewList[1] = Util.GetGameObject(self.gameObject, "content/ArenaView")
this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RankView")
this.ViewList[3] = Util.GetGameObject(self.gameObject, "content/RewardView")
-- this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RankView")
this.ViewList[2] = Util.GetGameObject(self.gameObject, "content/RewardView")
this.ViewLogicList = {}
@ -123,7 +123,7 @@ function this.TabAdapter(tab, index, status)
-- 判断是否需要检测红点
local redpot = Util.GetGameObject(tab, "redpot")
if index == 4 then
if index == 3 then
BindRedPointObject(RedPointType.Arena_Shop, redpot)
end
end
@ -141,7 +141,7 @@ function this.OpenView(index)
this._CurLogicIndex = index
this._CurTabIndex = index
-- 商店界面特殊处理
if index == 4 then
if index == 3 then
if not this.shopView then
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
end
@ -183,7 +183,7 @@ function this.CloseView(index)
if this._CurLogicIndex ~= index then return end
-- 商店界面特殊处理
if index == 4 then
if index == 3 then
if this.shopView then
this.shopView.gameObject:SetActive(false)
end

View File

@ -1,7 +1,7 @@
local ArenaView = {}
local this = ArenaView
local rewardBoxBtn = {}
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)
--初始化组件(用于子类重写)
function ArenaView:InitComponent()
this.ArenaName = Util.GetGameObject(self.gameObject, "name")
@ -13,7 +13,7 @@ function ArenaView:InitComponent()
this.AllNums = Util.GetGameObject(self.gameObject, "allNum")
-- this.HelpBtn=Util.GetGameObject(self.gameObject,"btn")
this.FormationBtn = Util.GetGameObject(self.gameObject, "defendbox/orggroup")
this.FormationBtn = Util.GetGameObject(self.gameObject, "formationBtn")
--this.DiffDemons = {}
--for i = 1, 3 do
-- table.insert(this.DiffDemons, Util.GetGameObject(self.gameObject, "diffdemons/icon_"..i))
@ -24,13 +24,14 @@ function ArenaView:InitComponent()
end
this.Enemys = {}
for i = 1, 4 do
for i = 1, 5 do
table.insert(this.Enemys, Util.GetGameObject(self.gameObject, "challengebox/enemy_"..i))
end
this.RecordBtn = Util.GetGameObject(self.gameObject, "record")
this.RefreshBtn = Util.GetGameObject(self.gameObject, "refresh")
this.sortBtn = Util.GetGameObject(self.gameObject, "sortBtn")
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
@ -42,11 +43,11 @@ function ArenaView:InitComponent()
this.effect = Util.GetGameObject(self.gameObject, "bg/UI_effect_ArenaMainPanel_particle")
--宝箱部分
this.progressImage = Util.GetGameObject(self.gameObject, "finalTarget/progressbar/progress"):GetComponent("Image")
this.progressText = Util.GetGameObject(self.gameObject, "finalTarget/curProgress/Text"):GetComponent("Text")
this.progressTipText = Util.GetGameObject(self.gameObject, "finalTarget/curProgress/Text (1)"):GetComponent("Text")
this.progressTipText = Util.GetGameObject(self.gameObject, "finalTarget/Text (1)"):GetComponent("Text")
rewardBoxBtn = {}
for i = 1, 7 do
rewardBoxBtn[i] = Util.GetGameObject(self.gameObject, "finalTarget/rewardProgress/rewardBoxBtn (" .. i .. ")")
rewardBoxBtn[i].transform.localPosition = Vector3.New(arenaBattleReward[i].Position[1], arenaBattleReward[i].Position[2] ,0)
end
end
@ -96,7 +97,10 @@ function ArenaView:BindEvent()
end
end)
end
--排行
Util.AddClick(this.sortBtn, function()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[6])
end)
-- 刷新按钮
Util.AddClick(this.RefreshBtn, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
@ -320,7 +324,6 @@ function this.ShowRewardBoxProgressData()
maxNum = configInfo.BattleTimes
end
end
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)
for i = 1, #rewardBoxBtn do
if arenaBattleReward[i] then
local state = 1--1 未完成 2 未领取 3 已完成allNums >= arenaBattleReward[i].BattleTimes and false
@ -332,7 +335,7 @@ function this.ShowRewardBoxProgressData()
state = 3
end
Util.GetGameObject(rewardBoxBtn[i], "redPoint"):SetActive(state == 2)
Util.GetGameObject(rewardBoxBtn[i], "Text"):GetComponent("Text").text = arenaBattleReward[i].BattleTimes
Util.GetGameObject(rewardBoxBtn[i], "Text"):GetComponent("Text").text = arenaBattleReward[i].BattleTimes..Language[12242]
Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3)
Util.AddOnceClick(rewardBoxBtn[i], function()
if state == 1 then
@ -352,7 +355,6 @@ function this.ShowRewardBoxProgressData()
end
end
this.progressImage.fillAmount = allNums/maxNum
this.progressText.text = allNums
this.progressTipText.text = Language[12204]
end
-- 层级改变回调

View File

@ -33,7 +33,6 @@ function this:InitComponent()
this.BtnTimeScale = Util.GetGameObject(this.DownRoot, "option/BtnTimeScale")
this.BtnExit = Util.GetGameObject(this.DownRoot, "option/BtnExit")
this.Button = Util.GetGameObject(this.DownRoot, "option/Button")
this.ButtonLock = Util.GetGameObject(this.DownRoot, "option/Button/lock")
this.BtnGM = Util.GetGameObject(this.DownRoot, "option/Button")
@ -201,7 +200,7 @@ function this:OnOpen(_fightData, _fightType, _endFunc)
-- LogPink(fightType)
this.BG:GetComponent("Image").sprite = Util.LoadSprite(BattleManager.GetBattleBg(fightType))
this.BtnGM:SetActive(AppConst.isOpenGM)
-- this.BtnGM:SetActive(AppConst.isOpenGM)
this.BtnExit:SetActive(false)--FightPointPassManager.GetStopBtnState())
@ -279,10 +278,16 @@ function this.InitOption()
this.Option:SetActive(true)
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed())
local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() or AppConst.isOpenGM
local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() --or AppConst.isOpenGM
Util.GetGameObject(this.BtnExit, "lock"):SetActive(not IsUnLockBattlePass)
Util.GetGameObject(this.BtnGM, "lock"):SetActive(not IsUnLockBattlePass)
this.BtnGM:GetComponent("Button").interactable = IsUnLockBattlePass
if AppConst.isOpenGM then
Util.GetGameObject(this.BtnGM, "lock"):SetActive(false)
else
Util.GetGameObject(this.BtnGM, "lock"):SetActive(not IsUnLockBattlePass)
this.BtnGM:GetComponent("Button").interactable = IsUnLockBattlePass
end
-- 初始化战斗时间,刷新前端显示
BattleManager.InitTimeScale()

View File

@ -87,6 +87,10 @@ function DeathPosInfoPanel:BindEvent()
PopupTipPanel.ShowTip(Language[11047])
return
end
if DeathPosManager.allowchallange==DeathPosStatus.Belated then
PopupTipPanel.ShowTip("<color=red>挑战阶段加入公会,不允许参与本轮十绝阵!</color>")
return
end
if DeathPosManager.battleTime<=0 then
PopupTipPanel.ShowTip(Language[11048])
return

View File

@ -2,6 +2,7 @@
local this = DeathPosManager
local guildSetting=ConfigManager.GetConfig(ConfigName.GuildSetting)
this.status=0 --十绝阵阶段状态 0未开启 1挑战阶段 2领奖阶段
this.allowchallange = 0--是否中途加入公会
local rewardData={} --全部宝箱奖励数据(未翻牌)
local myRewardData={} --全部宝箱奖励数据(已翻牌)
local doRewardData={} --其他玩家点击领取奖励推送数据(单组数据)
@ -26,6 +27,7 @@ function this.InitData(func)
return
end
NetManager.GetDeathPathStatusResponse(function(msg)
this.allowchallange=msg.allowchallange
this.status=msg.status
if this.status==DeathPosStatus.Fight then --请求剩余挑战次数
NetManager.GetDeathPathInfoResponse(function(msg1)

View File

@ -683,8 +683,10 @@ function this:BindEvent()
local types = {}
local activiteIds = {}
for i = 1, #rankKingList do
table.insert(types,rankKingList[i].rankType)
table.insert(activiteIds,rankKingList[i].activiteId)
if rankKingList[i].isRankingMainPanelShow then
table.insert(types,rankKingList[i].rankType)
table.insert(activiteIds,rankKingList[i].activiteId)
end
end
NetManager.RankFirstRequest(types,activiteIds,function (msg)
UIManager.OpenPanel(UIName.RankingListMainPanel,msg)

View File

@ -182,6 +182,7 @@ function TrialMapPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.RefreshBombNum)
Game.GlobalEvent:AddEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
Game.GlobalEvent:AddEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.InitShopInfo)
end
--移除事件监听(用于子类重写)
@ -192,6 +193,7 @@ function TrialMapPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.RefreshBombNum)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.InitShopInfo)
end
--界面打开时调用(用于子类重写)

View File

@ -24,7 +24,7 @@ end
--绑定事件(用于子类重写)
function BuffChoosePanel:BindEvent()
Util.AddClick(this.btnBack, function()
this:ClosePanel()
-- this:ClosePanel()
end)
end

View File

@ -105,6 +105,7 @@ function QianKunBox:refreshBtnShow()
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
local freeTime= 0
self.limit.text = Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]
self.di1:SetActive(true)
if freeTimesId>0 then
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
@ -123,7 +124,10 @@ function QianKunBox:refreshBtnShow()
redPot.gameObject:SetActive(isFree)
icon.gameObject:SetActive(not isFree)
num.gameObject:SetActive(not isFree)
self.di1:SetActive(not isFree)
if n==bType.Btn1 and isFree then
self.di1:SetActive(false)
end
local itemId=0
local itemNum=0
@ -215,7 +219,6 @@ end
function QianKunBox:refreshMagicNum()
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)
-- LogYellow("ID:"..actData.activityId.." value"..actData.value)
self.leftUptips1.text = lotterySpecialConfig[20].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(lotterySpecialConfig[21].Count-actData.value%1000).."次内必得金色魂印"
self.midDowntips1.text = Language[12239]

View File

@ -235,6 +235,7 @@ function TimeLimitedCall:RefreshGetHeroTimes()
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
self.curtext.text=curTimes
self.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
self.timeupdate.gameObject:SetActive(true)
local freeTime= 0
if freeTimesId>0 then
freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
@ -253,7 +254,9 @@ function TimeLimitedCall:RefreshGetHeroTimes()
redPot.gameObject:SetActive(isFree)
icon.gameObject:SetActive(not isFree)
num.gameObject:SetActive(not isFree)
self.timeupdate.gameObject:SetActive(not isFree)
if n==bType.Btn1 and isFree then
self.timeupdate.gameObject:SetActive(false)
end
local itemId=0
local itemNum=0

View File

@ -82,10 +82,10 @@ function this.RefreshPanel(type)
local express1 = val >= 0 and "+" or ""
local express2 = ""
if propertyConfig[v.id].Style == 2 then
val = val / 10000
val = val / 100
express2 = "%"
end
tip.text=string.format(Language[11648],propertyConfig[v.id].Info,(express1..val..express2))
tip.text=string.format("%s%s",propertyConfig[v.id].Info,(express1..val..express2))
if propertyConfig[v.id].BuffShow then
local lastStr = ""

View File

@ -71,7 +71,7 @@ function this.SwitchView(index)
proud = RankingManager.GetRankProud()
--先执行上一面板关闭逻辑
for i = 1, math.max(#rankKingListGo, #rankKingList) do
if rankKingList[i].rankType ~= RANK_TYPE.GOLD_EXPER then
if rankKingList[i].isRankingMainPanelShow then
local go = rankKingListGo[i]
if not go then
go=newObject(this.ItemPre)
@ -85,7 +85,7 @@ function this.SwitchView(index)
end
for i = 1, #rankKingList do
if rankKingList[i].rankType ~= RANK_TYPE.GOLD_EXPER then
if rankKingList[i].isRankingMainPanelShow then
rankKingListGo[i]:SetActive(true)
this.SingleRankKingListShow(i)
end

View File

@ -187,7 +187,7 @@ function this.SetArenaInfo()
this.SetNotRollingInfo(Language[11713],Language[11717],Language[10104],Language[11718],myRankData.myRank,Language[10041],"",myRankData.myRank,myRankData.myScore)
local dData = {
rankInfo = {param1 = myRankData.myScore},
force = myRankData.myScore
score = myRankData.myScore
}
this.SetInfoShow(this.infoGo,dData,sData.rankType)
--数据拆分
@ -660,10 +660,12 @@ function this.SetInfoShow(go,data,rankType,Value0)
local warPower = Util.GetGameObject(go,"warPower")
local trial = Util.GetGameObject(go,"trial")
local goldExper = Util.GetGameObject(go,"goldExper")
local arenaScore = Util.GetGameObject(go,"arenaScore")
fight:SetActive(false)
warPower:SetActive(false)
trial:SetActive(false)
goldExper:SetActive(false)
arenaScore:SetActive(false)
if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
fight:SetActive(true)
@ -705,6 +707,16 @@ function this.SetInfoShow(go,data,rankType,Value0)
end
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
end
elseif rankType == RANK_TYPE.ARENA_RANK then
-- if data.personInfo.score and data.personInfo.score > 0 then
arenaScore:SetActive(true)
if Value0 then
Value0:GetComponent("Text").text = "<size=40%>"..data.personInfo.name .."</size>"
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.personInfo.score
else
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = Language[12241] .. data.score
end
-- end
end
end
return RankingSingleListPanel

View File

@ -189,6 +189,7 @@ function this.RequestBuyShopItem(shopType, shopItemId, num, func)
end
-- 检测商店红点
this.CheckShopRedpot(shopType)
this.SortItemList(shopType)
-- 更新事件
Game.GlobalEvent:DispatchEvent(GameEvent.Shop.OnShopInfoChange)
@ -363,7 +364,7 @@ end
-- 刷新商店物品列表排序
function this.SortItemList(shopType)
-- 试炼副本商店不按sort字段排序
if shopType == SHOP_TYPE.TRIAL_SHOP then return end
-- if shopType == SHOP_TYPE.TRIAL_SHOP then return end--森罗商店上来就被🈲了,但是现在对森罗商店有了处理
-- 排序
local shopData = nil
for _, v in ipairs(this.allShopData) do
@ -393,6 +394,20 @@ function this.SortItemList(shopType)
-- 按sort排序
return aInfo.Sort < bInfo.Sort
end)
else--是试炼商店
table.sort(v.storeItem, function(a, b)
local aId = a.id % _StoreItemIdFilter
local bId = b.id % _StoreItemIdFilter
local aInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, aId)
local bInfo = ConfigManager.GetConfigData(ConfigName.StoreConfig, bId)
if a.buyNum == 0 and b.buyNum > 0 then
return true
end
if a.buyNum > 0 and b.buyNum == 0 then
return false
end
return aInfo.Sort < bInfo.Sort
end)
end
end
end

View File

@ -138,7 +138,7 @@ function this:Refresh(index)
this.arrowsRight:SetActive(not not curGiftList[curIndex+1])
curGiftId = curGiftList[curIndex].goodsId
curEndTime = curGiftList[curIndex].endTime
this.endTime.text = Language[10028]..TimeToHMS(curEndTime-GetTimeStamp())
this.endTime.text = Language[11496]..TimeToHMS(curEndTime-GetTimeStamp())
this:SetGfitShow()
this:SetTime()
end
@ -187,7 +187,7 @@ function this:SetTime()
end
end
end
this.endTime.text = Language[10028]..TimeToHMS(curEndTime-GetTimeStamp())
this.endTime.text = Language[11496]..TimeToHMS(curEndTime-GetTimeStamp())
end,1,-1,true)
self.localTimer:Start()
end

View File

@ -2237,3 +2237,6 @@
12237,1星
12238,没有得到equipData
12239,召唤 次必得红色魂印
12240,竞技排名
12241,积分:
12242,次

1 10001 没有ActivityTypeDef为%s任务Id为%s的数据
2237 12237 1星
2238 12238 没有得到equipData
2239 12239 召唤 次必得红色魂印
2240 12240 竞技排名
2241 12241 积分:
2242 12242

Binary file not shown.

Binary file not shown.