Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
7d1f1d7f01
Binary file not shown.
After Width: | Height: | Size: 24 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4a96c52048881a448a1baa0e9228026a
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5c5b9c611d4786a4ea24216e9462d68c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
@ -102,7 +102,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: FourElement
|
||||
spritePackingTag: TaiChuMiJuan
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
File diff suppressed because it is too large
Load Diff
|
@ -1155,8 +1155,8 @@ MonoBehaviour:
|
|||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 2/2
|
||||
LanguageIndex: 0
|
||||
|
|
|
@ -67,7 +67,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 124a5c62ef9a54645bc17e3550cb3862, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 4a96c52048881a448a1baa0e9228026a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -959,6 +959,8 @@ RedPointType = {
|
|||
FightLevel = 802,--山河社稷图入口
|
||||
JourneyWithWind = 804,--缥缈之旅
|
||||
FightLevelTrial = 8021,--山河试炼
|
||||
FightLevelBoxReward = 8022,--山河社稷图宝箱奖励
|
||||
FightLevelDailyReward = 8023,--山河试炼每日奖励
|
||||
--化虚坛
|
||||
Huaxutan = 803,--化虚坛主界面红点
|
||||
Huaxutan_CompoundHero = 8031,--化虚坛英雄合成红点
|
||||
|
|
|
@ -482,6 +482,7 @@ GameEvent = {
|
|||
--山河社稷图
|
||||
FightLevel={
|
||||
MainLevelInfoRefresh = "FightLevel.MainLevelInfoRefresh",--主关卡详情界面属性
|
||||
DailyRewardStateChange = "FightLevel.DailyRewardStateChange",--每日奖励状态变化
|
||||
},
|
||||
--心魔试炼
|
||||
MonsterCamp={
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -74,6 +74,7 @@ GETPLAYERINFORESPONSE_DRAWTIMES_FIELD = protobuf.FieldDescriptor();
|
|||
GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFOREQUEST = protobuf.Descriptor();
|
||||
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFORESPONSE = protobuf.Descriptor();
|
||||
|
@ -551,6 +552,7 @@ WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD = protobuf.FieldDescriptor();
|
|||
HARDSTAGEREQUEST = protobuf.Descriptor();
|
||||
HARDSTAGERESPONSE = protobuf.Descriptor();
|
||||
HARDSTAGERESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEFIGHTREQUEST = protobuf.Descriptor();
|
||||
HARDSTAGEFIGHTREQUEST_NODEID_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEFIGHTREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -568,6 +570,8 @@ HARDSTAGEREPORTREQUSET = protobuf.Descriptor();
|
|||
HARDSTAGEREPORTREQUSET_HARDSTAGEID_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEREPORTRESPONSE = protobuf.Descriptor();
|
||||
HARDSTAGEREPORTRESPONSE_PLAYER_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEDAILYREWARDRESPONSE = protobuf.Descriptor();
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
VIPLEVELSTATEREQUSET = protobuf.Descriptor();
|
||||
VIPLEVELSTATERESPONSE = protobuf.Descriptor();
|
||||
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -1317,11 +1321,21 @@ GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD.default_value = 0
|
|||
GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD.type = 5
|
||||
GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD.cpp_type = 1
|
||||
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.name = "xiuweiLevel"
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.xiuweiLevel"
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.number = 48
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.index = 46
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.label = 1
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.default_value = 0
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.type = 5
|
||||
GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD.cpp_type = 1
|
||||
|
||||
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.nested_types = {}
|
||||
GETPLAYERINFORESPONSE.enum_types = {}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD, GETPLAYERINFORESPONSE_HELPFIGHTLIST_FIELD, GETPLAYERINFORESPONSE_SIXIANGINFOS_FIELD, GETPLAYERINFORESPONSE_SERVEROPENTIME_FIELD, GETPLAYERINFORESPONSE_XIUWEILEVEL_FIELD}
|
||||
GETPLAYERINFORESPONSE.is_extendable = false
|
||||
GETPLAYERINFORESPONSE.extensions = {}
|
||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
|
@ -5650,11 +5664,21 @@ HARDSTAGERESPONSE_INFO_FIELD.message_type = CommonProto_pb.HARDSTAGEINFO
|
|||
HARDSTAGERESPONSE_INFO_FIELD.type = 11
|
||||
HARDSTAGERESPONSE_INFO_FIELD.cpp_type = 10
|
||||
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.name = "isTake"
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.full_name = ".rpc.protocols.HardStageResponse.isTake"
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.number = 2
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.index = 1
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.label = 1
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.has_default_value = false
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.default_value = false
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.type = 8
|
||||
HARDSTAGERESPONSE_ISTAKE_FIELD.cpp_type = 7
|
||||
|
||||
HARDSTAGERESPONSE.name = "HardStageResponse"
|
||||
HARDSTAGERESPONSE.full_name = ".rpc.protocols.HardStageResponse"
|
||||
HARDSTAGERESPONSE.nested_types = {}
|
||||
HARDSTAGERESPONSE.enum_types = {}
|
||||
HARDSTAGERESPONSE.fields = {HARDSTAGERESPONSE_INFO_FIELD}
|
||||
HARDSTAGERESPONSE.fields = {HARDSTAGERESPONSE_INFO_FIELD, HARDSTAGERESPONSE_ISTAKE_FIELD}
|
||||
HARDSTAGERESPONSE.is_extendable = false
|
||||
HARDSTAGERESPONSE.extensions = {}
|
||||
HARDSTAGEFIGHTREQUEST_NODEID_FIELD.name = "nodeId"
|
||||
|
@ -5813,6 +5837,24 @@ HARDSTAGEREPORTRESPONSE.enum_types = {}
|
|||
HARDSTAGEREPORTRESPONSE.fields = {HARDSTAGEREPORTRESPONSE_PLAYER_FIELD}
|
||||
HARDSTAGEREPORTRESPONSE.is_extendable = false
|
||||
HARDSTAGEREPORTRESPONSE.extensions = {}
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.name = "drop"
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.HardStageDailyRewardResponse.drop"
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.number = 1
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.index = 0
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.label = 1
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.has_default_value = false
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.default_value = nil
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.type = 11
|
||||
HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
HARDSTAGEDAILYREWARDRESPONSE.name = "HardStageDailyRewardResponse"
|
||||
HARDSTAGEDAILYREWARDRESPONSE.full_name = ".rpc.protocols.HardStageDailyRewardResponse"
|
||||
HARDSTAGEDAILYREWARDRESPONSE.nested_types = {}
|
||||
HARDSTAGEDAILYREWARDRESPONSE.enum_types = {}
|
||||
HARDSTAGEDAILYREWARDRESPONSE.fields = {HARDSTAGEDAILYREWARDRESPONSE_DROP_FIELD}
|
||||
HARDSTAGEDAILYREWARDRESPONSE.is_extendable = false
|
||||
HARDSTAGEDAILYREWARDRESPONSE.extensions = {}
|
||||
VIPLEVELSTATEREQUSET.name = "VipLevelStateRequset"
|
||||
VIPLEVELSTATEREQUSET.full_name = ".rpc.protocols.VipLevelStateRequset"
|
||||
VIPLEVELSTATEREQUSET.nested_types = {}
|
||||
|
@ -6347,6 +6389,7 @@ GetSomeActitityInfoRespone = protobuf.Message(GETSOMEACTITITYINFORESPONE)
|
|||
GetSomeActivityInfoRequest = protobuf.Message(GETSOMEACTIVITYINFOREQUEST)
|
||||
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
|
||||
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
|
||||
HardStageDailyRewardResponse = protobuf.Message(HARDSTAGEDAILYREWARDRESPONSE)
|
||||
HardStageFightRequest = protobuf.Message(HARDSTAGEFIGHTREQUEST)
|
||||
HardStageFightResponse = protobuf.Message(HARDSTAGEFIGHTRESPONSE)
|
||||
HardStageReportRequset = protobuf.Message(HARDSTAGEREPORTREQUSET)
|
||||
|
|
|
@ -176,6 +176,7 @@ local icon = {
|
|||
function DailyRechargePanel:SetSelectBtn()
|
||||
self.select.gameObject:SetActive(true)
|
||||
self.select.transform:SetParent(self.items[index].go.transform)
|
||||
self.select.transform:SetSiblingIndex(1)
|
||||
self.select.transform.localPosition = Vector3.zero
|
||||
if MoneyUtil.MT == MoneyType.RMB then
|
||||
self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[index].selectImaRMB)
|
||||
|
@ -265,8 +266,7 @@ function DailyRechargePanel:RefreshRedShow()
|
|||
for i = 1,#self.actInfo.mission do
|
||||
if self.items[i] and self.items[i].redpot then
|
||||
if self.actInfo.mission[i].state == 0
|
||||
and DailyRechargeManager.ReceivedEnabled(self.actInfo.mission[i].missionId)
|
||||
and index ~= i then
|
||||
and DailyRechargeManager.ReceivedEnabled(self.actInfo.mission[i].missionId) then
|
||||
self.items[i].redpot:SetActive(true)
|
||||
else
|
||||
self.items[i].redpot:SetActive(false)
|
||||
|
|
|
@ -19,6 +19,16 @@ function FightLevelChapterPanel:InitComponent()
|
|||
this.prb, nil, Vector2.New(1080, 1865.8), 1, 1, Vector2.New(0,0))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 1
|
||||
|
||||
-- 奖励按钮
|
||||
self.rewardBtn = Util.GetGameObject(self.gameObject, "rewardBtn")
|
||||
self.rewardRedPot = Util.GetGameObject(self.gameObject, "rewardBtn/red")
|
||||
self.rewardTai = Util.GetGameObject(self.gameObject, "rewardBtn/Tai"):GetComponent("Image")
|
||||
self.rewardTextBg = Util.GetGameObject(self.gameObject, "rewardBtn/TextBg"):GetComponent("Image")
|
||||
self.rewardTip = Util.GetGameObject(self.gameObject, "rewardBtn/Text"):GetComponent("Text")
|
||||
self.rewardKaiQi = Util.GetGameObject(self.gameObject, "rewardBtn/BoxBtn1/UI_Effect_BaoXiang_KaiQi")
|
||||
self.rewardKeKaiQi = Util.GetGameObject(self.gameObject, "rewardBtn/BoxBtn1/UI_Effect_BaoXiang_KeKaiQi")
|
||||
self.rewardOpen = Util.GetGameObject(self.gameObject, "rewardBtn/BoxBtn1/open")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -33,8 +43,38 @@ function FightLevelChapterPanel:BindEvent()
|
|||
Util.AddClick(self.sortBtn, function()
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[15],1)
|
||||
end)
|
||||
Util.AddClick(self.rewardBtn, function()
|
||||
local data = FightLevelManager.GetDailyRewardData()
|
||||
if not data.state or data.state ~= 0 then
|
||||
PopupTipPanel.ShowTip("今日已领取,请明日再来!")
|
||||
return
|
||||
end
|
||||
-- 请求领取奖励
|
||||
self.rewardKeKaiQi:SetActive(false)
|
||||
self.rewardOpen:SetActive(false)
|
||||
self.rewardKaiQi:SetActive(false)
|
||||
self.rewardKaiQi:SetActive(true)
|
||||
Timer.New(function()
|
||||
FightLevelManager.RequestGetDailyReward()
|
||||
end, 1):Start()
|
||||
end)
|
||||
end
|
||||
--添加事件监听(用于子类重写)
|
||||
function FightLevelChapterPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FightLevel.DailyRewardStateChange, self.SetDailyRewardShow, self)
|
||||
|
||||
BindRedPointObject(RedPointType.FightLevelDailyReward, self.rewardRedPot)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function FightLevelChapterPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FightLevel.DailyRewardStateChange, self.SetDailyRewardShow, self)
|
||||
|
||||
ClearRedPointObject(RedPointType.FightLevelDailyReward, self.rewardRedPot)
|
||||
end
|
||||
function FightLevelChapterPanel:OnSortingOrderChange()
|
||||
Util.SetParticleSortLayer(self.rewardKaiQi, self.sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(self.rewardKeKaiQi, self.sortingOrder + 1)
|
||||
orginLayer = self.sortingOrder
|
||||
end
|
||||
--界面打开时调用(用于子类重写)
|
||||
|
@ -62,6 +102,9 @@ function this.OnShowPanel()
|
|||
end,true,true)
|
||||
local curIndex = FightLevelManager.GetCurChapterId()
|
||||
this.ScrollView:SetShow(curIndex)
|
||||
|
||||
-- 设置每日奖励显示
|
||||
this:SetDailyRewardShow()
|
||||
end
|
||||
function this.SingleChapterDataShow(go, data)
|
||||
|
||||
|
@ -88,7 +131,13 @@ function this.SingleChapterDataShow(go, data)
|
|||
-- designation = PlayerManager.GetPlayerDesignation()
|
||||
}
|
||||
npc = PlayerLiveView:New(playerParent.transform,2, PlayerLiveViewData,this.sortingOrder)
|
||||
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,0,0),WALK_DIR.IDLE_LEFT)
|
||||
-- npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,0,0),WALK_DIR.IDLE_LEFT)
|
||||
if data.userMount and data.userMount > 0 and data.userMount ~= PlayerRide.YUJIAN then
|
||||
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,0,0),WALK_DIR.IDLE_LEFT)
|
||||
else
|
||||
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,0,0),WALK_DIR.IDLE_FRONT)
|
||||
end
|
||||
|
||||
end
|
||||
if curChapterId == data.chapterId then
|
||||
playerParent.gameObject:SetActive(true)
|
||||
|
@ -125,6 +174,27 @@ function this.SingleChapterDataShow(go, data)
|
|||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- 设置日常奖励显示
|
||||
function FightLevelChapterPanel:SetDailyRewardShow()
|
||||
local data = FightLevelManager.GetDailyRewardData()
|
||||
if data and data.state == 0 then
|
||||
self.rewardTip.text = string.format("<color=%s>%s</color>", UIColorStr.GREEN, "可领取")
|
||||
self.rewardKaiQi:SetActive(false)
|
||||
self.rewardKeKaiQi:SetActive(true)
|
||||
self.rewardOpen:SetActive(false)
|
||||
self.rewardTai.sprite = this.spLoader:LoadSprite("s_shanhe_xiaoditu_zhongbiao")
|
||||
self.rewardTextBg.sprite = this.spLoader:LoadSprite("s_shanhe_xiaoditu_biaoxiamingzidi")
|
||||
else
|
||||
self.rewardTip.text = string.format("<color=%s>%s</color>", UIColorStr.YELLOW, "明日刷新")
|
||||
self.rewardKaiQi:SetActive(false)
|
||||
self.rewardKeKaiQi:SetActive(false)
|
||||
self.rewardOpen:SetActive(true)
|
||||
self.rewardTai.sprite = this.spLoader:LoadSprite("s_shanhe_xiaoditu_zhongbiao_01")
|
||||
self.rewardTextBg.sprite = this.spLoader:LoadSprite("s_shanhe_xiaoditu_biaoxiamingzidi_01")
|
||||
end
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function FightLevelChapterPanel:OnClose()
|
||||
end
|
||||
|
|
|
@ -54,7 +54,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
|
|||
if msg then
|
||||
for i = 1, #msg.chapter do
|
||||
local singleHardStageChapter = allChapterData[msg.chapter[i].chapterId]
|
||||
-- Log("chapterId:"..msg.chapter[i].chapterId.." stars"..msg.chapter[i].stars.." node"..#msg.chapter[i].node.."reward:"..#msg.chapter[i].reward.." needStars:"..singleHardStageChapter.stars)
|
||||
Log("chapterId:"..msg.chapter[i].chapterId)--.." stars"..msg.chapter[i].stars.." node"..#msg.chapter[i].node.."reward:"..#msg.chapter[i].reward.." needStars:"..singleHardStageChapter.stars)
|
||||
singleHardStageChapter.chapterId = msg.chapter[i].chapterId
|
||||
if singleHardStageChapter.chapterId > oldChapterId and _isShowChapterOpenPopup then
|
||||
this.SetisShowChapterOpenPopup(true)
|
||||
|
@ -84,7 +84,7 @@ function this.UpdataChapterData(msg,_isShowChapterOpenPopup)
|
|||
table.sort(singleHardStageChapter.reward, function(a,b) return a.id < b.id end)
|
||||
allChapterData[msg.chapter[i].chapterId] = singleHardStageChapter
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.FightLevel)
|
||||
CheckRedPointStatus(RedPointType.FightLevelBoxReward)
|
||||
PracticeManager.StarNum = FightLevelManager.GetAllChapterStars()
|
||||
end
|
||||
end
|
||||
|
@ -349,4 +349,46 @@ function this.CheckTrialRedPoint()
|
|||
end
|
||||
--=====================================================================
|
||||
|
||||
-- 设置山河社稷图每日奖励数据
|
||||
local _DailyRewardData = {}
|
||||
function this.SetDailyRewardData(msg)
|
||||
|
||||
Log("山河每日奖励:"..tostring(msg.isTake))
|
||||
_DailyRewardData = {}
|
||||
_DailyRewardData.state = msg.isTake and 1 or 0 -- 0 未领取 1 已领取
|
||||
-- 刷新红点状态
|
||||
CheckRedPointStatus(RedPointType.FightLevelDailyReward)
|
||||
-- 触发状态改变
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.DailyRewardStateChange)
|
||||
end
|
||||
function this.GetDailyRewardData()
|
||||
return _DailyRewardData
|
||||
end
|
||||
-- 请求领取每日奖励
|
||||
function this.RequestGetDailyReward()
|
||||
--
|
||||
if not _DailyRewardData.state or _DailyRewardData.state ~= 0 then
|
||||
PopupTipPanel.ShowTip("今日已领取,请明日再来!")
|
||||
return
|
||||
end
|
||||
NetManager.GetHardStageDailyReward(function(msg)
|
||||
_DailyRewardData.state = 1
|
||||
-- 刷新红点状态
|
||||
CheckRedPointStatus(RedPointType.FightLevelDailyReward)
|
||||
-- 触发状态改变
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.FightLevel.DailyRewardStateChange)
|
||||
-- 显示掉落
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
-- 检测红点状态
|
||||
function this.CheckDailyRewardRed()
|
||||
if _DailyRewardData.state and _DailyRewardData.state == 0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -316,7 +316,7 @@ function this.SetlevelBox(_rewardBoxDatas)
|
|||
NetManager.GetHardStageChapterReward(chapterData.chapterId,missionConfigData.Id,function(msg)
|
||||
--自己刷新一下宝箱数据
|
||||
FightLevelManager.SetChapterBoxRewardData(chapterData.chapterId,missionConfigData.Id,1)
|
||||
CheckRedPointStatus(RedPointType.FightLevel)
|
||||
CheckRedPointStatus(RedPointType.FightLevelBoxReward)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop, 1,function()--isBackBattle true时 为回放不走回调
|
||||
if chapterData.reward and LengthOfTable(chapterData.reward) > 0 then
|
||||
this.SetlevelBox(chapterData.reward)
|
||||
|
|
|
@ -982,6 +982,7 @@ function this.HardStageResponse(buffer)
|
|||
local msg = PlayerInfoProto_pb.HardStageResponse()
|
||||
msg:ParseFromString(data)
|
||||
FightLevelManager.UpdataChapterData(msg.info,true)
|
||||
FightLevelManager.SetDailyRewardData(msg)
|
||||
end
|
||||
|
||||
--神印信息推送
|
||||
|
|
|
@ -5409,15 +5409,16 @@ end
|
|||
function NetManager.HardStageRequest(func)
|
||||
local data = PlayerInfoProto_pb.HardStageRequest()
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_INFO_REQUEST, MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, msg, function(buffer)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_INFO_REQUEST, MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.HardStageResponse()
|
||||
msg:ParseFromString(data)
|
||||
FightLevelManager.UpdataChapterData(msg.info)
|
||||
FightLevelManager.SetDailyRewardData(msg)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
--山河社稷图领取宝箱奖励
|
||||
function NetManager.GetHardStageChapterReward(_chapterId,_rewradId,func)
|
||||
|
@ -5434,6 +5435,17 @@ function NetManager.GetHardStageChapterReward(_chapterId,_rewradId,func)
|
|||
end
|
||||
end)
|
||||
end
|
||||
--山河社稷图领取每日奖励
|
||||
function NetManager.GetHardStageDailyReward(func)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_TAKE_DAILY_REWAR_REQUEST, MessageTypeProto_pb.HARD_STAGE_TAKE_DAILY_REWAR_RESPONSE, nil, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.HardStageDailyRewardResponse()
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
--vip特权奖励初始化
|
||||
function NetManager.VipLevelStateRequset(func)
|
||||
local data = PlayerInfoProto_pb.VipLevelStateRequset()
|
||||
|
|
|
@ -307,6 +307,11 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
|
||||
--玉虚论道
|
||||
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
|
||||
-- 山河社稷图
|
||||
RPData:SetParent(RedPointType.FightLevelBoxReward, RedPointType.FightLevel)
|
||||
RPData:SetParent(RedPointType.FightLevelDailyReward, RedPointType.FightLevel)
|
||||
|
||||
|
||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
|
||||
if v.RpType > 0 and v.RpTypeParent > 0 then
|
||||
RPData:SetParent(v.RpType,v.RpTypeParent)
|
||||
|
@ -498,7 +503,9 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.FightLevel, FightLevelManager.GetChapterRewardBoxRedPoint)
|
||||
-- 山河社稷图相关
|
||||
RPData:AddCheckFunc(RedPointType.FightLevelBoxReward, FightLevelManager.GetChapterRewardBoxRedPoint, FUNCTION_OPEN_TYPE.FIGHTLEVEL)
|
||||
RPData:AddCheckFunc(RedPointType.FightLevelDailyReward, FightLevelManager.CheckDailyRewardRed, FUNCTION_OPEN_TYPE.FIGHTLEVEL)
|
||||
RPData:AddCheckFunc(RedPointType.JourneyWithWind, ActivityGiftManager.JourneyWithWindAllRedPointState)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.WeekGiftPage,OperatingManager.CheckWeekGiftPageRedPoint)
|
||||
|
|
|
@ -251,6 +251,7 @@ function this.RefreshHeroGrowList()
|
|||
value = curScore/maxScore
|
||||
str = string.format("%d/%d", curScore, maxScore)
|
||||
end
|
||||
progress.gameObject:SetActive(data.Control == 1)
|
||||
progress.value = value
|
||||
progressText.text = str
|
||||
|
||||
|
|
|
@ -155,11 +155,11 @@ function this.RankNodeAdapter(node, data,index)
|
|||
local heroTeam={}
|
||||
heroTeam.team={}
|
||||
heroTeam.totalForce=msg.recordData.yxldMyForce[i]
|
||||
LogError("myforce=="..msg.recordData.yxldMyForce[i])
|
||||
--LogError("myforce=="..msg.recordData.yxldMyForce[i])
|
||||
local enTeam={}
|
||||
enTeam.team={}
|
||||
enTeam.totalForce=msg.recordData.yxldDefForce[i]
|
||||
LogError("en force=="..msg.recordData.yxldDefForce[i])
|
||||
--LogError("en force=="..msg.recordData.yxldDefForce[i])
|
||||
for i = 1, #fightData.heroFightInfos.fightUnitList do
|
||||
local hero=fightData.heroFightInfos.fightUnitList[i]
|
||||
local newHero={}
|
||||
|
@ -172,18 +172,21 @@ function this.RankNodeAdapter(node, data,index)
|
|||
newHero.skinId=hero.skinId
|
||||
table.insert(heroTeam.team,newHero)
|
||||
end
|
||||
for i = 1, #fightData.monsterList[1].fightUnitList do
|
||||
local hero=fightData.monsterList[1].fightUnitList[i]
|
||||
local newHero={}
|
||||
newHero.heroTid=tonumber(hero.unitId)
|
||||
local pro=string.split(hero.property,"#")
|
||||
newHero.level=pro[1]
|
||||
newHero.heroid=hero.realId
|
||||
newHero.star=hero.star
|
||||
newHero.position=hero.position
|
||||
newHero.skinId=hero.skinId
|
||||
table.insert(enTeam.team,newHero)
|
||||
end
|
||||
|
||||
if fightData.monsterList[1] then
|
||||
for i = 1, #fightData.monsterList[1].fightUnitList do
|
||||
local hero=fightData.monsterList[1].fightUnitList[i]
|
||||
local newHero={}
|
||||
newHero.heroTid=tonumber(hero.unitId)
|
||||
local pro=string.split(hero.property,"#")
|
||||
newHero.level=pro[1]
|
||||
newHero.heroid=hero.realId
|
||||
newHero.star=hero.star
|
||||
newHero.position=hero.position
|
||||
newHero.skinId=hero.skinId
|
||||
table.insert(enTeam.team,newHero)
|
||||
end
|
||||
end
|
||||
table.insert(allHeroTeam,heroTeam)
|
||||
table.insert(allEnTeam,enTeam)
|
||||
-- allHeroTeam[i]=heroTeam
|
||||
|
|
Loading…
Reference in New Issue