抽取命石添加次数限制
parent
9c1823a57b
commit
44f6ea0e86
|
|
@ -273,6 +273,85 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_HorizontalFit: 0
|
m_HorizontalFit: 0
|
||||||
m_VerticalFit: 2
|
m_VerticalFit: 2
|
||||||
|
--- !u!1 &669145491
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 669145492}
|
||||||
|
- component: {fileID: 669145494}
|
||||||
|
- component: {fileID: 669145493}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: lotteryInfo
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &669145492
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 669145491}
|
||||||
|
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: 4110496243653304681}
|
||||||
|
m_RootOrder: 11
|
||||||
|
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, y: -676}
|
||||||
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &669145494
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 669145491}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &669145493
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 669145491}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 0.82745105, b: 0.56078434, 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_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||||
|
m_FontSize: 34
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: New Text
|
||||||
--- !u!1 &1135636950
|
--- !u!1 &1135636950
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -19988,6 +20067,7 @@ RectTransform:
|
||||||
- {fileID: 3606503841884422814}
|
- {fileID: 3606503841884422814}
|
||||||
- {fileID: 1576026675}
|
- {fileID: 1576026675}
|
||||||
- {fileID: 260925511}
|
- {fileID: 260925511}
|
||||||
|
- {fileID: 669145492}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -80,6 +80,7 @@ GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD = protobuf.FieldDescriptor();
|
||||||
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD = protobuf.FieldDescriptor();
|
GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD = protobuf.FieldDescriptor();
|
||||||
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD = protobuf.FieldDescriptor();
|
GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD = protobuf.FieldDescriptor();
|
||||||
GETPLAYERINFORESPONSE_GIFTIDS_FIELD = protobuf.FieldDescriptor();
|
GETPLAYERINFORESPONSE_GIFTIDS_FIELD = protobuf.FieldDescriptor();
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD = protobuf.FieldDescriptor();
|
||||||
GETITEMINFOREQUEST = protobuf.Descriptor();
|
GETITEMINFOREQUEST = protobuf.Descriptor();
|
||||||
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
||||||
GETITEMINFORESPONSE = protobuf.Descriptor();
|
GETITEMINFORESPONSE = protobuf.Descriptor();
|
||||||
|
|
@ -1572,11 +1573,21 @@ GETPLAYERINFORESPONSE_GIFTIDS_FIELD.default_value = {}
|
||||||
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.type = 5
|
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.type = 5
|
||||||
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.cpp_type = 1
|
GETPLAYERINFORESPONSE_GIFTIDS_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.name = "gemLotteryCountByDay"
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.gemLotteryCountByDay"
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.number = 53
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.index = 51
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.label = 3
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.has_default_value = false
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.default_value = {}
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.type = 5
|
||||||
|
GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD.cpp_type = 1
|
||||||
|
|
||||||
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
||||||
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
||||||
GETPLAYERINFORESPONSE.nested_types = {}
|
GETPLAYERINFORESPONSE.nested_types = {}
|
||||||
GETPLAYERINFORESPONSE.enum_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_XIUWEILEVEL_FIELD, GETPLAYERINFORESPONSE_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD, GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD, GETPLAYERINFORESPONSE_GIFTIDS_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_PRACTICESKILLINFOS_FIELD, GETPLAYERINFORESPONSE_FABAOSOULINFOS_FIELD, GETPLAYERINFORESPONSE_LIFEGRIDINFOS_FIELD, GETPLAYERINFORESPONSE_GIFTIDS_FIELD, GETPLAYERINFORESPONSE_GEMLOTTERYCOUNTBYDAY_FIELD}
|
||||||
GETPLAYERINFORESPONSE.is_extendable = false
|
GETPLAYERINFORESPONSE.is_extendable = false
|
||||||
GETPLAYERINFORESPONSE.extensions = {}
|
GETPLAYERINFORESPONSE.extensions = {}
|
||||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,15 @@ local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
this.myGemList = {}--我穿戴命石的id
|
this.myGemList = {}--我穿戴命石的id
|
||||||
this.typeGemList = {}
|
this.typeGemList = {}
|
||||||
|
this.gemLottery = {} --抽卡次数记录
|
||||||
|
local value=ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value
|
||||||
|
this.drawLimit = string.split(value,"#")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function this.GetLimitNumByType(_type)
|
||||||
|
return tonumber(this.drawLimit[_type])
|
||||||
|
end
|
||||||
--获取服务器发来的背包中的命石数据信息
|
--获取服务器发来的背包中的命石数据信息
|
||||||
function this.GetGemsFromBagByType(_type)
|
function this.GetGemsFromBagByType(_type)
|
||||||
local data = {}
|
local data = {}
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,14 @@ function this.Initialize()
|
||||||
this.typeGemList = {}
|
this.typeGemList = {}
|
||||||
this.timer=nil
|
this.timer=nil
|
||||||
this.oldPower=0
|
this.oldPower=0
|
||||||
|
local value=ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value
|
||||||
|
this.drawLimit = string.split(value,"#")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function this.GetLimitNumByType(_type)
|
||||||
|
return tonumber(this.drawLimit[_type])
|
||||||
|
end
|
||||||
--初始化命石
|
--初始化命石
|
||||||
function this.InitGemsInfo(msg)
|
function this.InitGemsInfo(msg)
|
||||||
if msg==nil then
|
if msg==nil then
|
||||||
|
|
@ -23,7 +29,7 @@ function this.InitGemsInfo(msg)
|
||||||
end
|
end
|
||||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local isChange=false
|
local isChange=false
|
||||||
LogError("gemsData len==========="..#gemsData)
|
--LogError("gemsData len==========="..#gemsData)
|
||||||
this.myGemList={}
|
this.myGemList={}
|
||||||
this.sperGemList={}
|
this.sperGemList={}
|
||||||
for i=1,#gemsData do
|
for i=1,#gemsData do
|
||||||
|
|
@ -43,7 +49,7 @@ function this.InitGemsInfo(msg)
|
||||||
data.frame = GetHeroQuantityImageByquality(config.Quality)
|
data.frame = GetHeroQuantityImageByquality(config.Quality)
|
||||||
data.icon = GetResourcePath(config.Image)
|
data.icon = GetResourcePath(config.Image)
|
||||||
data.num = 1
|
data.num = 1
|
||||||
LogError("gemsData[i].isReplace================"..gemsData[i].isReplace)
|
--LogError("gemsData[i].isReplace================"..gemsData[i].isReplace)
|
||||||
if gemsData[i].isReplace==1 then
|
if gemsData[i].isReplace==1 then
|
||||||
isChange=true
|
isChange=true
|
||||||
data.isReplace=true
|
data.isReplace=true
|
||||||
|
|
@ -89,7 +95,6 @@ function this.CheckGemRed()
|
||||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12301)
|
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12301)
|
||||||
local isOpen=CheckFunctionOpen(144)
|
local isOpen=CheckFunctionOpen(144)
|
||||||
if isOpen==false then
|
if isOpen==false then
|
||||||
LogError("144==========================")
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local progresss=0
|
local progresss=0
|
||||||
|
|
@ -98,7 +103,6 @@ function this.CheckGemRed()
|
||||||
progresss=actconfigs.mission[i].progress
|
progresss=actconfigs.mission[i].progress
|
||||||
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
||||||
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
||||||
LogError("144 red==========================")
|
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -109,7 +113,6 @@ end
|
||||||
function this.CheckSuperGemRed()
|
function this.CheckSuperGemRed()
|
||||||
local isOpen=CheckFunctionOpen(145)
|
local isOpen=CheckFunctionOpen(145)
|
||||||
if isOpen==false then
|
if isOpen==false then
|
||||||
LogError("145==========================")
|
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12401)
|
local actconfigs=ActivityGiftManager.GetActivityInfoByType(12401)
|
||||||
|
|
@ -119,7 +122,6 @@ function this.CheckSuperGemRed()
|
||||||
progresss=actconfigs.mission[i].progress
|
progresss=actconfigs.mission[i].progress
|
||||||
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
local config=ConfigManager.GetConfigData(ConfigName.GemLotteryConfig,actconfigs.mission[i].missionId) --ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.GemLotteryConfig,"Library",curType,"Level",actconfigs.mission[i].missionId)
|
||||||
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
if actconfigs.mission[i].state==0 and progresss>=config.LibraryNumber then
|
||||||
LogError("145 red==========================")
|
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -221,7 +223,7 @@ function this.GetProListByType(type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
for k, v in pairs(proList) do
|
for k, v in pairs(proList) do
|
||||||
LogError("k=========="..k.." v======="..v)
|
--LogError("k=========="..k.." v======="..v)
|
||||||
end
|
end
|
||||||
return proList
|
return proList
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ local progresss=0
|
||||||
local wishLv=0
|
local wishLv=0
|
||||||
local oldWarPower=0
|
local oldWarPower=0
|
||||||
local redList={}
|
local redList={}
|
||||||
|
local drawLimit=nil
|
||||||
function Gem:InitComponent()
|
function Gem:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
if not self.playerInfoView then
|
if not self.playerInfoView then
|
||||||
|
|
@ -69,7 +70,9 @@ function Gem:InitComponent()
|
||||||
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
||||||
self.additionBtn = Util.GetGameObject(self.gameObject, "additionBtn")
|
self.additionBtn = Util.GetGameObject(self.gameObject, "additionBtn")
|
||||||
self.curType = 1
|
self.curType = 1
|
||||||
|
local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,169).Value
|
||||||
|
LogError("value=================================="..specialConfig)
|
||||||
|
drawLimit = string.split(specialConfig,"#")
|
||||||
--页签
|
--页签
|
||||||
self.tab = Util.GetGameObject(self.gameObject, "TabBox")
|
self.tab = Util.GetGameObject(self.gameObject, "TabBox")
|
||||||
|
|
||||||
|
|
@ -129,6 +132,7 @@ function Gem:InitComponent()
|
||||||
self.propertyList[i]=Util.GetGameObject(self.gameObject, "pro/name ("..i..")"):GetComponent("Text")
|
self.propertyList[i]=Util.GetGameObject(self.gameObject, "pro/name ("..i..")"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
self.infoTxt=Util.GetGameObject(self.gameObject,"lotteryInfo"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
function Gem:BindEvent()
|
function Gem:BindEvent()
|
||||||
|
|
@ -217,7 +221,7 @@ function Gem:UpdatePanelData(_type)
|
||||||
else
|
else
|
||||||
self.boxLv.text="高级命格等级:"..wishLv
|
self.boxLv.text="高级命格等级:"..wishLv
|
||||||
end
|
end
|
||||||
|
self.infoTxt.text="今日抽取上限:"..GemNewManager.gemLottery[_type].."/"..drawLimit[_type]
|
||||||
LogError("nextnum==="..nextNum.." progersss=="..progresss)
|
LogError("nextnum==="..nextNum.." progersss=="..progresss)
|
||||||
if nextNum==0 and progresss~=0 then
|
if nextNum==0 and progresss~=0 then
|
||||||
self.boxProgress.text="宝箱已达最大等级"
|
self.boxProgress.text="宝箱已达最大等级"
|
||||||
|
|
@ -350,6 +354,8 @@ function Gem:Recruit(recrutType,num,costId)
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.WishGemBuyTenPanel,msg.drop,recrutType,costId,activityId)
|
UIManager.OpenPanel(UIName.WishGemBuyTenPanel,msg.drop,recrutType,costId,activityId)
|
||||||
end
|
end
|
||||||
|
--GemManager.gemLottery[recrutType]=GemManager.gemLottery[recrutType]+num
|
||||||
|
--LogError("recrutType===="..recrutType.." num==="..num)
|
||||||
--CheckRedPointStatus(self.config.RpType)
|
--CheckRedPointStatus(self.config.RpType)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
@ -359,6 +365,7 @@ function Gem:OnOpen()
|
||||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Gem })
|
self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Gem })
|
||||||
self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice })
|
self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice })
|
||||||
self.TabCtrl:Init(self.tab, _TabData,2)
|
self.TabCtrl:Init(self.tab, _TabData,2)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function Gem:OnSortingOrderChange()
|
function Gem:OnSortingOrderChange()
|
||||||
|
|
@ -372,6 +379,7 @@ function Gem:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
|
|
||||||
function Gem:OnShow()
|
function Gem:OnShow()
|
||||||
|
|
||||||
oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
GemNewManager.oldPower=oldWarPower
|
GemNewManager.oldPower=oldWarPower
|
||||||
LogError("oldWarPower====================="..oldWarPower)
|
LogError("oldWarPower====================="..oldWarPower)
|
||||||
|
|
@ -380,6 +388,7 @@ function Gem:OnShow()
|
||||||
--self:Refresh()
|
--self:Refresh()
|
||||||
self:UpdatePanelData(curType)
|
self:UpdatePanelData(curType)
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
function Gem:Refresh()
|
function Gem:Refresh()
|
||||||
CheckRedPointStatus(RedPointType.Gem)
|
CheckRedPointStatus(RedPointType.Gem)
|
||||||
|
|
|
||||||
|
|
@ -241,6 +241,7 @@ function this.PlayerInfoRequest(func)
|
||||||
-- 服务器开启时间
|
-- 服务器开启时间
|
||||||
PlayerManager.SetServerOpenTime(msg.serverOpenTime)
|
PlayerManager.SetServerOpenTime(msg.serverOpenTime)
|
||||||
TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos)
|
TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos)
|
||||||
|
GemNewManager.gemLottery=msg.gemLotteryCountByDay
|
||||||
--GemManager.GetWearedGem(msg.lifeGridInfos)
|
--GemManager.GetWearedGem(msg.lifeGridInfos)
|
||||||
--数字游戏初始化
|
--数字游戏初始化
|
||||||
RatioNumberLevelManager.ChapterHandle()
|
RatioNumberLevelManager.ChapterHandle()
|
||||||
|
|
@ -7295,6 +7296,12 @@ end
|
||||||
|
|
||||||
--命格抽卡
|
--命格抽卡
|
||||||
function NetManager.GemNewDrawRequest(_type,_num,func)
|
function NetManager.GemNewDrawRequest(_type,_num,func)
|
||||||
|
local maxNum=GemNewManager.GetLimitNumByType(_type)
|
||||||
|
--LogError("maxNum========================"..maxNum.." GemManager.gemLottery[_type]=="..GemManager.gemLottery[_type].." _num==".._num)
|
||||||
|
if GemNewManager.gemLottery[_type]+_num > maxNum then
|
||||||
|
PopupTipPanel.ShowTip("超过每日抽取上限")
|
||||||
|
return
|
||||||
|
end
|
||||||
local data = PlayerInfoProto_pb.GemNewDrawRequest()
|
local data = PlayerInfoProto_pb.GemNewDrawRequest()
|
||||||
data.libraryId = _type
|
data.libraryId = _type
|
||||||
data.drawNum = _num
|
data.drawNum = _num
|
||||||
|
|
@ -7303,6 +7310,7 @@ function NetManager.GemNewDrawRequest(_type,_num,func)
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GemNewDrawRequest,MessageTypeProto_pb.GemNewDrawResponse,msg,function(buffer)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.GemNewDrawRequest,MessageTypeProto_pb.GemNewDrawResponse,msg,function(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = PlayerInfoProto_pb.GemNewDrawResponse()
|
local msg = PlayerInfoProto_pb.GemNewDrawResponse()
|
||||||
|
GemNewManager.gemLottery[_type]=GemNewManager.gemLottery[_type]+_num
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,7 @@ function WishGemBuyOnePanel:BindEvent()
|
||||||
|
|
||||||
NetManager.GemNewDrawRequest(this.recruitType,1,function(msg)
|
NetManager.GemNewDrawRequest(this.recruitType,1,function(msg)
|
||||||
UIManager.OpenPanel(UIName.WishGemBuyOnePanel,msg.drop,this.recruitType,costId,activityId)
|
UIManager.OpenPanel(UIName.WishGemBuyOnePanel,msg.drop,this.recruitType,costId,activityId)
|
||||||
|
|
||||||
--CheckRedPointStatus(self.config.RpType)
|
--CheckRedPointStatus(self.config.RpType)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
@ -73,9 +74,9 @@ function WishGemBuyOnePanel:OnSortingOrderChange()
|
||||||
Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
|
Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
|
||||||
orginLayer = self.sortingOrder
|
orginLayer = self.sortingOrder
|
||||||
|
|
||||||
if this.view then
|
-- if this.view then
|
||||||
this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder)
|
-- this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder)
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -151,8 +152,9 @@ end
|
||||||
function WishGemBuyOnePanel:OnDestroy()
|
function WishGemBuyOnePanel:OnDestroy()
|
||||||
this.spLoader:Destroy()
|
this.spLoader:Destroy()
|
||||||
SubUIManager.Close(this.UpView)
|
SubUIManager.Close(this.UpView)
|
||||||
|
if this.view then
|
||||||
this.view = nil
|
this.view = nil
|
||||||
|
end
|
||||||
if this.timer then
|
if this.timer then
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer = nil
|
this.timer = nil
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ function WishGemBuyTenPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip(GetLanguageStrById(ItemConfig[itemId].Name)..Language[10486])
|
PopupTipPanel.ShowTip(GetLanguageStrById(ItemConfig[itemId].Name)..Language[10486])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
NetManager.GemNewDrawRequest(this.recruitType,costId,function(msg)
|
NetManager.GemNewDrawRequest(this.recruitType,10,function(msg)
|
||||||
UIManager.OpenPanel(UIName.WishGemBuyTenPanel,msg.drop,this.recruitType,costId,activityId)
|
UIManager.OpenPanel(UIName.WishGemBuyTenPanel,msg.drop,this.recruitType,costId,activityId)
|
||||||
--CheckRedPointStatus(self.config.RpType)
|
--CheckRedPointStatus(self.config.RpType)
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@ function ItemView:InitComponent()
|
||||||
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
|
Util.GetGameObject(self.gameObject, "item/heroShow/posIcon"):SetActive(false)
|
||||||
self.name = Util.GetGameObject(self.gameObject, "name")
|
self.name = Util.GetGameObject(self.gameObject, "name")
|
||||||
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
|
self.resetLv = Util.GetGameObject(self.gameObject, "item/resetLv")
|
||||||
-- self.upImg = Util.GetGameObject(self.gameObject, "item/upImg")
|
self.upImg = Util.GetGameObject(self.gameObject, "item/upImg")
|
||||||
-- self.upImg:SetActive(false)
|
self.upImg:SetActive(false)
|
||||||
self.resetLvText = self.resetLv:GetComponent("Text")
|
self.resetLvText = self.resetLv:GetComponent("Text")
|
||||||
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
|
self.rightUplv = Util.GetGameObject(self.gameObject, "item/rightUplv"):GetComponent("Text")
|
||||||
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
|
self.middleDownLv = Util.GetGameObject(self.gameObject, "item/middleDownLv")
|
||||||
|
|
@ -305,10 +305,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
end)
|
end)
|
||||||
elseif _itemData.configData.ItemType == ItemType.Gem then
|
elseif _itemData.configData.ItemType == ItemType.Gem then
|
||||||
if _itemData.isReplace then
|
if _itemData.isReplace then
|
||||||
-- self.upImg:SetActive(true)
|
self.upImg:SetActive(true)
|
||||||
end
|
end
|
||||||
if _itemData.backData.isReplace then
|
if _itemData.backData.isReplace then
|
||||||
-- self.upImg:SetActive(true)
|
self.upImg:SetActive(true)
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue