Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng
jiaoyangna 2020-10-12 16:56:10 +08:00
commit 13b9886ddb
27 changed files with 849 additions and 356 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: eee2f69f547bbfb4cac413e68ddcad46
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: 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: cb0bc4bc5db4101418d29db68b247796
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 4f18f84a083f78044919425e7ef0964c
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: 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: 44b2733deaec54c4c8581689a7a55a0d
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 736 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: c0fe7e9ed1555b747954fbefc24f2511
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: 58
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: 9c2eb689ef523c04fa00ed7995869456
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -206562,6 +206562,7 @@ RectTransform:
- {fileID: 1134866492387166048}
- {fileID: 1198390692838390176}
- {fileID: 6844250112748375290}
- {fileID: 779923156369837899}
m_Father: {fileID: 4634750098772353997}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -209008,6 +209009,124 @@ MonoBehaviour:
isPlayAudio: 0
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &5049176152727700534
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 779923156369837899}
- component: {fileID: 3132055218821676556}
- component: {fileID: 1348622659457416419}
- component: {fileID: 5204760565233383293}
m_Layer: 5
m_Name: Btn (27)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &779923156369837899
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5049176152727700534}
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:
- {fileID: 1523129274906622535}
m_Father: {fileID: 4634750099138607162}
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 184, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3132055218821676556
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5049176152727700534}
m_CullTransparentMesh: 0
--- !u!114 &1348622659457416419
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5049176152727700534}
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: 7179dcbc48186824784df3ace7ccd9fa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5204760565233383293
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5049176152727700534}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1348622659457416419}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5049976560999039660
GameObject:
m_ObjectHideFlags: 0
@ -254617,6 +254736,80 @@ MonoBehaviour:
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &6846855373085303496
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1523129274906622535}
- component: {fileID: 713670196808022933}
- component: {fileID: 5465564905207828972}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1523129274906622535
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6846855373085303496}
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: 779923156369837899}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 157.3, y: -37.2}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &713670196808022933
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6846855373085303496}
m_CullTransparentMesh: 0
--- !u!114 &5465564905207828972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6846855373085303496}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6847909152768819446
GameObject:
m_ObjectHideFlags: 0

View File

@ -754,6 +754,7 @@ RedPointType = {
Expert_UpLv= 3123,--充值限量礼包
--Expert_LuckyTurn= 1118,--秘宝达人
Expert_Expedition= 3126,--天宫达人
Expert_Slhj= 3127,--森罗幻境达人
Expert_WeekCard= 3150,--周卡
--战力排行 达标战力
WarPowerSort_Sort = 3151,--达标战力
@ -1016,6 +1017,7 @@ ActivityTypeDef = {
FightExper = 21,--副本达人
EnergyExper = 22,--体力达人
ExpeditionExper = 26,--天宫达人
slhjExper = 70,--森罗幻境达人
AccumulativeRechargeExper = 24,--限时累计充值
DemonSlayer = 25,--三界除魔
PatFace = 29,--神兵天降
@ -1586,6 +1588,7 @@ ExperType = {
ContinueRecharge=24,--积天豪礼
GiftBuy=25,--限时抢购
Expedtion=26,--天宫达人
Slhj=27,--森罗幻境达人
}
-- 枚举
@ -1619,6 +1622,7 @@ numExChange = {
[21]=ActivityTypeDef.RecruitExper,
[22]=ActivityTypeDef.SecretBoxExper,
[26]=ActivityTypeDef.ExpeditionExper,
[27]=ActivityTypeDef.slhjExper,
}
-- 关卡中地图章节
@ -2070,6 +2074,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
[9] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12386] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FindTreasureExper,isRankingMainPanelShow = false},
[10] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12386] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.ExpeditionExper,isRankingMainPanelShow = false},
[11] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.DemonSlayer,isRankingMainPanelShow = false},
[12] = { bgImage = "r_zjm_paihangbang_banner01", name = "森罗幻境" ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.slhjExper,isRankingMainPanelShow = false},
}
SoulPrintSpriteByQuantity={

View File

@ -549,6 +549,7 @@ function this.RefreshActivityRedPoint()
CheckRedPointStatus(RedPointType.Expert_Recruit)
CheckRedPointStatus(RedPointType.Expert_SecretBox)
CheckRedPointStatus(RedPointType.Expert_Expedition)
CheckRedPointStatus(RedPointType.Expert_Slhj)
--战力排行
CheckRedPointStatus(RedPointType.WarPowerSort_Sort)
--东海寻仙

View File

@ -147,6 +147,7 @@ function this.RefreshActivityRedPoint()
CheckRedPointStatus(RedPointType.Expert_Recruit)
CheckRedPointStatus(RedPointType.Expert_SecretBox)
CheckRedPointStatus(RedPointType.Expert_Expedition)
CheckRedPointStatus(RedPointType.Expert_Slhj)
--战力排行
CheckRedPointStatus(RedPointType.WarPowerSort_Sort)
--东海寻仙

View File

@ -29,6 +29,11 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
--Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
local _itemCfgData = itemConfig[_itemData.itemId]
if _itemCfgData ~= nil then
-- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据,
if _itemCfgData.ItemType == ItemType.EquipTreasure then
return
end
--
itemdata.itembackData = _itemData
itemdata.itemConfig = _itemCfgData
itemdata.id = _itemCfgData.Id

View File

@ -6,7 +6,7 @@ local expertRewardTabs = {}
local activeIndext = 0
local titleImageSprites = {[10]="x_xianshihuodong_jishudarenbanner",[11]="r_daren_jingji",[9]="r_daren_banner_01",[12]="r_daren_zhuangbei",[13]="x_xianshihuodong_dianjindarenbanner",--"r_daren_dianjing",
[14]="r_daren_fuben",[15]="r_daren_fuben",[16]="r_daren_fabao_01",[17]="r_daren_hunyin_01",[7]="r_huodong_leiji",
[19]="r_daren_xubao3",[20]="r_daren_tanbao",[21]="r_daren_zhengmu",[22]="r_daren_mibao",[26]="g_gonghui_banner"}
[19]="r_daren_xubao3",[20]="r_daren_tanbao",[21]="r_daren_zhengmu",[22]="r_daren_mibao",[26]="g_gonghui_banner",[27]="s_senluohuanjing_banner"}
function Expert:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
@ -99,6 +99,8 @@ function Expert:OnShowData(index)
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[9])
elseif index == 26 then
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[10])
elseif index == 27 then
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[12])
end
end)

View File

@ -29,6 +29,7 @@ local imageSprite = {
[24] = {"r_jitianhaoli_anniu_01", "r_jitianhaoli_anniu"},
[25] = {"l_lbqg_icon2", "l_lbqg_icon1"},
[26] = {"g_gonghui_anniu_02", "g_gonghui_anniu_01"},
[27] = {"s_senluohuanjing_icon2", "s_senluohuanjing_icon1"},
}
local allActivityNum = #imageSprite
@ -141,6 +142,7 @@ function ExpertPanel:BindEvent()
BindRedPointObject(RedPointType.Expert_UpLv, expertRedPointGrid[23])
BindRedPointObject(RedPointType.ContinuityRecharge, expertRedPointGrid[24])
BindRedPointObject(RedPointType.Expert_Expedition, expertRedPointGrid[26])
BindRedPointObject(RedPointType.Expert_Slhj, expertRedPointGrid[27])
end
@ -401,6 +403,8 @@ function ExpertPanel:RefreshActivityBtn(context)
tabBtns[24]:SetActive(context.status == 1)
elseif context.type == ActivityTypeDef.ExpeditionExper then
tabBtns[26]:SetActive(context.status == 1)
elseif context.type == ActivityTypeDef.slhjExper then
tabBtns[27]:SetActive(context.status == 1)
end
tabBtns[6]:SetActive(false)--探宝长久关闭
tabBtns[1]:SetActive(false)--七日登录奖励
@ -437,6 +441,7 @@ function ExpertPanel:RefreshActivityShow()
tabBtns[24]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ContinuityRecharge))
tabBtns[25]:SetActive(OperatingManager.IsGiftBuyActive())
tabBtns[26]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ExpeditionExper))
tabBtns[27]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.slhjExper))
end
--事件刷新活动进度
function ExpertPanel:RefreshActivityProgress()
@ -451,6 +456,7 @@ function ExpertPanel:OnClose()
--this.luckyTurn.OnClose()
this.exChange.OnClose()
-- this.heroStarGift:OnClose()
this.giftBuy.OnClose()
this.upLvRewardGrid:OnClose()
defaultIndex = activeIndext
this.isPlayingLackCatAni = false
@ -480,6 +486,7 @@ function ExpertPanel:OnDestroy()
ClearRedPointObject(RedPointType.HERO_STAR_GIFT)
ClearRedPointObject(RedPointType.ContinuityRecharge)
ClearRedPointObject(RedPointType.Expert_Expedition)
ClearRedPointObject(RedPointType.Expert_Slhj)
if LiveName then
poolManager:UnLoadLive(LiveName, LiveGO)
LiveName = nil
@ -489,6 +496,7 @@ function ExpertPanel:OnDestroy()
-- this.heroStarGift:OnDestroy()
this.upLvRewardGrid:OnDestroy()
this.exChange.OnDestroy()
this.giftBuy.OnDestroy()
SubUIManager.Close(this.UpView)
end
--获取开启的活动 和 隐藏显示按钮

View File

@ -168,6 +168,14 @@ function ExpertRewardSortPanel:ActivitySortRewardShow()
RankingManager.InitData(rankKingList[7].rankType, function()
this.SetGoldExperSortInfo()
end,ActivityGiftManager.GetActivityIdByType(rankKingList[7].activiteId))
elseif activeIndext == 19 then
RankingManager.InitData(rankKingList[9].rankType, function()
this.SetGoldExperSortInfo()
end,ActivityGiftManager.GetActivityIdByType(rankKingList[9].activiteId))
elseif activeIndext == 27 then
RankingManager.InitData(rankKingList[12].rankType, function()
this.SetGoldExperSortInfo()
end,ActivityGiftManager.GetActivityIdByType(rankKingList[12].activiteId))
end
end
function this.SetGoldExperSortInfo()

View File

@ -59,7 +59,11 @@ function Expert_UpLv:OnSortingOrderChange(cursortingOrder)
end
function Expert_UpLv:OnShowData()
local globalActive = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActivityGiftManager.GetOpenExpertIdByActivityType(ActivityTypeDef.UpLvAct))
local activityId = ActivityGiftManager.GetOpenExpertIdByActivityType(ActivityTypeDef.UpLvAct)
if activityId <= 0 then
return
end
local globalActive = ConfigManager.GetConfigData(ConfigName.GlobalActivity,activityId)
activeData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpLvAct)
PatFaceManager.RemainTimeDown(this.timeTextExpertgo,this.timeTextExpert,activeData.endTime - GetTimeStamp())
table.sort(activeData.mission, function(a,b)

View File

@ -210,6 +210,7 @@ end
function GiftBuy:OnDestroy()
sortingOrder = 0
itemsGrid = {}
end
return GiftBuy

View File

@ -1686,7 +1686,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--end
-- Vip加成 暂时注释
-- local vipAddPro = VipManager.GetAddPro()
local vipAddPro = VipManager.GetAddPro()
--if vipAddPro and LengthOfTable(vipAddPro) > 0 then
-- for i, v in pairs(vipAddPro) do
-- if v > 0 then
@ -1703,7 +1703,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allAddProVal, playerDcorateAdd)
this.DoubleTableCompound(allAddProVal, heroSkillSingleHeroProVal)
this.DoubleTableCompound(allAddProVal, equipTreasureAddPro)
-- this.DoubleTableCompound(allAddProVal, vipAddPro)
this.DoubleTableCompound(allAddProVal, vipAddPro)
--100等级所有属性合并
this.DoubleTableCompound(lvProVal, falismanLvProVal)
this.DoubleTableCompound(lvProVal,lvSoulPrintProVal)

View File

@ -296,7 +296,6 @@ function this.SetHeroHp(data,did,func)
v.heroHp=data[1]
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,true)--第二个false 已经进入副本了 不需要设置选择第一个Hero
if func then func() end
end

View File

@ -99,7 +99,6 @@ function this:BindEvent()
--更新精气值
LogGreen(Language[12222]..msg.essenceValue)
MapTrialManager.powerValue = msg.essenceValue
--召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
@ -109,6 +108,7 @@ function this:BindEvent()
Timer.New(function()
-- 刷新数据
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)--打完刷新血量
end, 0.2):Start()
end)
self:ClosePanel()
@ -201,45 +201,6 @@ function this.SetSelectHero()
Util.SetGray(item,value.heroHp<=0)--死啦
end
--刷新英雄选择面板时 检测血量 若有低于40%血量的英雄 给选择Hero加血
--再遍历一次防止下面的return 打断上面for循环表现的正常赋值
--这里只关于自动嗑药逻辑
-- for k, v in ipairs(d) do
-- --若存在该设置参数并为已勾选状态 =1 否则=0
-- local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)
-- and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..2)==1) and 1 or 0
-- if t==0 then return end
-- if MapTrialManager.selectHeroDid== v.heroId then
-- if v.heroHp<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11262],itemConfig[itemId].Name))
-- return
-- end
-- end
-- --若血量小于自动回复百分比 并且 有血量
-- if v.heroHp/10000<trialSetting[1].HealingPercent/10000 and v.heroHp>0 then
-- if (itemNum-MapManager.addHpCount)<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11263],itemConfig[itemId].Name))
-- return
-- end
-- if BagManager.GetItemCountById(itemId)<=0 then
-- PopupTipPanel.ShowTip(string.format(Language[11264],itemConfig[itemId].Name,itemConfig[itemId].Name))
-- return
-- end
-- NetManager.UseAddHpItemRequest(MapTrialManager.selectHeroDid,function()
-- local curHeroHp=0
-- if v.heroId==MapTrialManager.selectHeroDid then
-- curHeroHp=v.heroHp
-- end
-- curHeroHp=curHeroHp+5000 --5000增加的血量也是要配表的
-- if curHeroHp>=10000 then
-- curHeroHp=10000
-- end
-- MapTrialManager.SetHeroHp({curHeroHp},MapTrialManager.selectHeroDid,function()
-- PopupTipPanel.ShowTip(string.format(Language[11265],itemConfig[itemId].Name))
-- end)
-- end)
-- end
-- end
end

View File

@ -596,7 +596,10 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
curHeroHp=10000
end
MapTrialManager.SetHeroHp({curHeroHp},MapTrialManager.selectHeroDid,function()
MapManager.addHpCount=MapManager.addHpCount+1
PopupTipPanel.ShowTip(string.format(Language[11265],itemConfig[itemId].Name))
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)--打完刷新血量
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
end)
end)
end

View File

@ -343,6 +343,7 @@ local directFight = function(showType, eventId, showValues, options)
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
--更新精气值
MapTrialManager.powerValue = msg.essenceValue
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)--打完刷新血量
-- --召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
@ -352,7 +353,6 @@ local directFight = function(showType, eventId, showValues, options)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
end
-- 起名字界面
@ -451,6 +451,7 @@ local funcList = {
--事件点触发
function this.EventPointTrigger(eventId)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
MyPCall(function ()
--Log("EventPointTrigger中得到的事件ID " .. eventId)
if eventId == 0 or eventId < 0 then

View File

@ -224,6 +224,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Expert_UpLv, RedPointType.Expert)
RPData:SetParent(RedPointType.ContinuityRecharge, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_Expedition, RedPointType.Expert)
RPData:SetParent(RedPointType.Expert_Slhj, RedPointType.Expert)
--战力排行
RPData:SetParent(RedPointType.WarPowerSort_Sort, RedPointType.WarPowerSort)
--背包
@ -359,6 +360,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.LuckyTurn, LuckyTurnTableManager.ReturnRedPointState)
RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.ExpterActivityIsShowRedPoint)
RPData:AddCheckFunc(RedPointType.Expert_Slhj, ActivityGiftManager.ExpterActivityIsShowRedPoint)
-- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive)
--战力排行
RPData:AddCheckFunc(RedPointType.WarPowerSort_Sort, ActivityGiftManager.WarPowerSortActivityIsShowRedPoint)

View File

@ -79,6 +79,7 @@ function GeneralPopup:BindEvent()
end
--返回按钮
Util.AddClick(this.backBtn,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
self:ClosePanel()
end)
end

View File

@ -38,6 +38,7 @@ end
function this:BindEvent()
--取消按钮
Util.AddClick(this.cancelBtn,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
parent:ClosePanel()
end)
--使用按钮
@ -73,6 +74,7 @@ function this:BindEvent()
curHeroHp=10000
end
MapTrialManager.SetHeroHp({curHeroHp},selectHeroDid)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
end)
end)

View File

@ -371,6 +371,8 @@ function this.SetInfoShow(go,data,rankType,Value0)
goldExper:GetComponent("Text").text = "积分:"
elseif sData.activiteId == ActivityTypeDef.DemonSlayer then
goldExper:GetComponent("Text").text = "试炼层数"
elseif sData.activiteId == ActivityTypeDef.slhjExper then
goldExper:GetComponent("Text").text = "幻境层数"
end
elseif rankType == RANK_TYPE.ARENA_RANK then
arenaScore:SetActive(true)

View File

@ -631,13 +631,17 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
end
end
--加自身分解消耗的东西
local rewardShowStr1 = {}
local resolveRewardStr = curEquipTreasureData.itemConfig.ResolveReward
if resolveRewardStr and rewardGroup[tonumber(resolveRewardStr)] then
local curRewardGroupData = rewardGroup[tonumber(resolveRewardStr)]
for key, curRewardGroupDatavalue in ipairs(curRewardGroupData.ShowItem) do
this.GetEquipTreasureResolveItems2(curRewardGroupDatavalue[1], curRewardGroupDatavalue[2])
-- local rewardShowStr1 = {}
if curEquipTreasureData.refineLv <= 0 and curEquipTreasureData.lv <= 0 then
local resolveRewardStr = curEquipTreasureData.itemConfig.ResolveReward
if resolveRewardStr and rewardGroup[tonumber(resolveRewardStr)] then
local curRewardGroupData = rewardGroup[tonumber(resolveRewardStr)]
for key, curRewardGroupDatavalue in ipairs(curRewardGroupData.ShowItem) do
this.GetEquipTreasureResolveItems2(curRewardGroupDatavalue[1], curRewardGroupDatavalue[2])
end
end
else
this.GetEquipTreasureResolveItems2(curEquipTreasureData.id, 1)
end
end
local dropList = {}

View File

@ -13,362 +13,366 @@ MonoBehaviour:
m_Name: DataConfigMD5Record
m_EditorClassIdentifier:
_keys:
- F:\jl_data_execl\master_develop/base_data\ActivityDropReward.xlsx
- F:\jl_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GameSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildRedPackConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaReward.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaRobotSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ActivityRankingReward.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildBossConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExchangeRate.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaBattleReward.xlsx
- F:\jl_data_execl\master_develop/base_data\AdventureReward.xlsx
- F:\jl_data_execl\master_develop/base_data\FakeBattle.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AreaConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\FoodsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\BlessingRewardPool.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleReward.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleTask.xlsx
- F:\jl_data_execl\master_develop/base_data\ActivityDropReward.xlsx
- F:\jl_data_execl\master_develop/base_data\BlessingConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyRankConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GlobalActivity.xlsx
- F:\jl_data_execl\master_develop/base_data\GuideConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DailyChallengeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AdventureConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AreaConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BeStronger.xlsx
- F:\jl_data_execl\master_develop/base_data\AchievementConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DailyTasksConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleTask.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ActivityRankingReward.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyRankConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeStarBox.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChampionshipReward.xlsx
- F:\jl_data_execl\master_develop/base_data\BuffEffectConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BeginnerTask.xlsx
- F:\jl_data_execl\master_develop/base_data\MazeTreasure.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSignSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildScoreConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EndlessDifficulty.xlsx
- F:\jl_data_execl\master_develop/base_data\EndlessMapConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx
- F:\jl_data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroRankupConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroRankupGroup.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroSacrifice.xlsx
- F:\jl_data_execl\master_develop/base_data\CombatControl.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSign.xlsx
- F:\jl_data_execl\master_develop/base_data\DialRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipStarsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LuxuryFund.xlsx
- F:\jl_data_execl\master_develop/base_data\LuckyCatConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LotterySetting.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MissionEventsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MainMapIconConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\FloodConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JumpConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleReward.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaRobotSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArenaBattleReward.xlsx
- F:\jl_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ChampionshipSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\DialogueViewConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AdventureReward.xlsx
- F:\jl_data_execl\master_develop/base_data\ChampionshipReward.xlsx
- F:\jl_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AdventureConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\CustomEventConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DailyTasksConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BlessingRewardPool.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSignSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\BuffEffectConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DialRewardSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildHelpConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DailyChallengeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx
- F:\jl_data_execl\master_develop/base_data\DialRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EndlessDifficulty.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx
- F:\jl_data_execl\master_develop/base_data\EndlessMapConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipStarsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipSign.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AudioConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\BeginnerTask.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipPropertyPool.xlsx
- F:\jl_data_execl\master_develop/base_data\LevelSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ErrorCodeHint.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildRedPackConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildScoreConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildWarConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\CustomEventConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildHelpConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExchangeRate.xlsx
- F:\jl_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\CombatControl.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GodSacrificeSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LoginPosterConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ItemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\AudioConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LevelSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx
- F:\jl_data_execl\master_develop/base_data\DialRewardSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\ErrorCodeHint.xlsx
- F:\jl_data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipPropertyPool.xlsx
- F:\jl_data_execl\master_develop/base_data\MonthcardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MonsterViewConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroReturn.xlsx
- F:\jl_data_execl\master_develop/base_data\GodSacrificeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialGameConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\QAConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SeverConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TestWelfare.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RunesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx
- F:\jl_data_execl\master_develop/base_data\StoreTypeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SevenDaysActivity.xlsx
- F:\jl_data_execl\master_develop/base_data\OptionAddCondition.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SignInConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerAppearance.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx
- F:\jl_data_execl\master_develop/base_data\SpecialConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\VipLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelRankupConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialKillConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\UIConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerRole.xlsx
- F:\jl_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PropertyConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SystemMessageConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\RewardItemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MapPointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RaceTowerConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SevenDaysScore.xlsx
- F:\jl_data_execl\master_develop/base_data\LotterySetting.xlsx
- F:\jl_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\LoginPosterConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildBossConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx
- F:\jl_data_execl\master_develop/base_data\GlobalActivity.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerRole.xlsx
- F:\jl_data_execl\master_develop/base_data\GameSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\DialogueViewConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JumpConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LuckyCatConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuideConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroRankupConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PlayerAppearance.xlsx
- F:\jl_data_execl\master_develop/base_data\RecommendTeam.xlsx
- F:\jl_data_execl\master_develop/base_data\RunesPoolConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LuxuryFund.xlsx
- F:\jl_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SevenDaysActivity.xlsx
- F:\jl_data_execl\master_develop/base_data\StoreTypeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RandomName.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildTechnology.xlsx
- F:\jl_data_execl\master_develop/base_data\SystemMessageConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MonthcardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RewardItemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroRankupGroup.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MonsterViewConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MazeTreasure.xlsx
- F:\jl_data_execl\master_develop/base_data\OptionAddCondition.xlsx
- F:\jl_data_execl\master_develop/base_data\RaceTowerConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SeverConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SignInConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MissionEventsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SevenDaysScore.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelRankupConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\FoodsConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TestWelfare.xlsx
- F:\jl_data_execl\master_develop/base_data\ItemConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroReturn.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\JewelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MainMapIconConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\SpecialConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RunesPoolConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\VipLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialSetting.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RoleConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroSacrifice.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RunesConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\GuildTechnology.xlsx
- F:\jl_data_execl\master_develop/base_data\FakeBattle.xlsx
- F:\jl_data_execl\master_develop/base_data\UIConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\HeroLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialKillConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialGameConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TaskConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\FloodConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\TrialConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MapPointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SkillConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PassiveSkillConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\SkillLogicConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\StoreConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopTechnology.xlsx
- F:\jl_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EventPointConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\EquipTalismana.xlsx
- F:\jl_data_execl\master_develop/base_data\WorkShopTechnology.xlsx
- F:\jl_data_execl\master_develop/base_data\StoreConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RewardGroup.xlsx
- F:\jl_data_execl\master_develop/base_data\OptionConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\RewardGroup.xlsx
- F:\jl_data_execl\master_develop/base_data\MonsterGroup.xlsx
- F:\jl_data_execl\master_develop/base_data\MainLevelConfig.xlsx
- F:\jl_data_execl\master_develop/base_data\MonsterConfig.xlsx
_values:
- 3591751192
- 3229246241
- 1120913959
- 1382260277
- 421974146
- 475620184
- 3153364400
- 2296996310
- 1289424307
- 1656119918
- 986789930
- 3233002609
- 1442255327
- 173728414
- 1645456228
- 702480255
- 3252026258
- 613479935
- 1195934816
- 3943131728
- 3591751192
- 996682802
- 1786243540
- 413963702
- 1924824445
- 2204989227
- 2050621784
- 939963957
- 230994945
- 2137927414
- 3062382507
- 2131302457
- 2830891614
- 4055477448
- 514933169
- 1586346478
- 1924824445
- 3507522218
- 3548626589
- 2618565706
- 2014039849
- 3749192783
- 1774803500
- 1848421159
- 2587490859
- 3062382507
- 220677422
- 1565259591
- 1023901955
- 2943614740
- 3389195548
- 1996735664
- 427098595
- 755222564
- 866186388
- 4138292608
- 3228740331
- 1572157444
- 2014737423
- 3517900411
- 3079207713
- 1241055907
- 3356066097
- 727009153
- 249002466
- 903221398
- 3846713010
- 3597116301
- 583891024
- 3773792064
- 1493914227
- 306567717
- 3022619009
- 1790592577
- 3566908170
- 494399256
- 2903827109
- 2479323017
- 3787793196
- 2568046174
- 4124958540
- 472584542
- 4088438912
- 3625815197
- 260126611
- 3766499137
- 929354238
- 3746847302
- 1705732776
- 1393544882
- 230994945
- 1289424307
- 1656119918
- 3252026258
- 2050621784
- 3338153430
- 2809447110
- 613479935
- 2943614740
- 427098595
- 1848421159
- 2944506204
- 614500767
- 939963957
- 1705732776
- 3517900411
- 3389195548
- 583891024
- 4198004043
- 903221398
- 3930424554
- 3894020600
- 4124958540
- 1774803500
- 2568046174
- 3566908170
- 1241055907
- 2759035733
- 2294226303
- 249002466
- 3356066097
- 2618565706
- 494399256
- 1572157444
- 1402356663
- 932779961
- 1790592577
- 3943131728
- 986789930
- 2684915448
- 755222564
- 3153107712
- 3705022903
- 894523047
- 460607005
- 1382260277
- 1448464981
- 475620184
- 3153364400
- 3079207713
- 1468913191
- 3472737567
- 3585263874
- 932779961
- 2944506204
- 2759035733
- 3894020600
- 702480255
- 1678524219
- 1996735664
- 2014737423
- 3022619009
- 1645456228
- 56159406
- 2445182985
- 2403795715
- 1757541933
- 460607005
- 680191298
- 2664024792
- 329162371
- 2684915448
- 3705022903
- 2294226303
- 4198004043
- 1448464981
- 894523047
- 3153107712
- 2181074157
- 515856748
- 1402356663
- 242814620
- 322704922
- 700606590
- 1442255327
- 1023901955
- 1120913959
- 648629407
- 568553271
- 1452490095
- 1982645928
- 678093140
- 2748321716
- 1321320575
- 4291486445
- 2854113790
- 1155516420
- 319164499
- 269889771
- 160427834
- 683415129
- 2930068975
- 29725303
- 80325891
- 2534897219
- 141295447
- 1173373930
- 3048495520
- 3314623045
- 148429609
- 2405621183
- 241982493
- 980629513
- 1891222748
- 3255901169
- 595190689
- 739739032
- 98336120
- 3431809730
- 3873092379
- 295715991
- 3641128642
- 1611065383
- 3739218118
- 329162371
- 3228740331
- 3597116301
- 838751704
- 110435588
- 297530923
- 2777840995
- 967064327
- 811712663
- 2121869243
- 3489124197
- 4114437015
- 1952787401
- 3510105300
- 3746847302
- 1757541933
- 173728414
- 319164499
- 3558190872
- 3641128642
- 421974146
- 1173373930
- 2809447110
- 2562740755
- 2479323017
- 1794129640
- 3194116722
- 1452490095
- 3216252194
- 595190689
- 3773792064
- 2534897219
- 371577342
- 804383039
- 3663717884
- 4065623856
- 2433642113
- 3127079988
- 1393544882
- 2903827109
- 2096178423
- 160427834
- 269889771
- 38983593
- 312894044
- 1823741956
- 297530923
- 2181074157
- 778521455
- 1493914227
- 280567271
- 515856748
- 866186388
- 683415129
- 4114437015
- 2748321716
- 29725303
- 295715991
- 3625815197
- 2997270240
- 1952787401
- 2930068975
- 980629513
- 2204989227
- 4291486445
- 3618491883
- 2854113790
- 322704922
- 3663717884
- 727009153
- 2405621183
- 110435588
- 260126611
- 3730808838
- 3314623045
- 804383039
- 3048495520
- 967064327
- 2869536578
- 241982493
- 141295447
- 98336120
- 4285496955
- 1658599847
- 306567717
- 2777840995
- 3894361750
- 1155516420
- 80325891
- 312894044
- 1195934816
- 2851471920
- 3255901169
- 739739032
- 1982645928
- 1321320575
- 148429609
- 3127079988
- 3766499137
- 266440734
- 728643604
- 3489124197
- 2669121422
- 2037042661
- 2149795273
- 594844862
- 2385666962
- 2453679101
- 2149795273
- 567764364
- 4033164304
- 2453679101
- 1713944378
- 1143673964
- 2563511001
- 2534570125
- 249999430
- 1568647799
- 2849905846
- 3060981699