补充提交

dev_chengFeng
JieLing 2020-06-12 18:04:22 +08:00
parent 90e12f1a4a
commit 2db43096de
24 changed files with 229 additions and 274 deletions

View File

@ -111623,7 +111623,7 @@ RectTransform:
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: -34.3, y: -35.8}
m_AnchoredPosition: {x: -12, y: -35.8}
m_SizeDelta: {x: 160, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3138096716679861701

View File

@ -7379,7 +7379,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -10681,7 +10681,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -11519,7 +11519,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -13674,7 +13674,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -14649,7 +14649,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -21933,7 +21933,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -22470,7 +22470,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -27984,7 +27984,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -37135,7 +37135,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -38199,7 +38199,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -39336,7 +39336,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -49181,124 +49181,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &623436378493166653
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 572652005106018274}
- component: {fileID: 5727368933151306669}
- component: {fileID: 3661142128631800210}
- component: {fileID: 4838033820164009970}
m_Layer: 5
m_Name: SaveBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &572652005106018274
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 623436378493166653}
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: 3436116032096366443}
m_Father: {fileID: 3299316360080635000}
m_RootOrder: 2
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: -421, y: 546}
m_SizeDelta: {x: 228.5, y: 67.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5727368933151306669
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 623436378493166653}
m_CullTransparentMesh: 0
--- !u!114 &3661142128631800210
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 623436378493166653}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &4838033820164009970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 623436378493166653}
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: 3661142128631800210}
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 &654867619932682541
GameObject:
m_ObjectHideFlags: 0
@ -50511,85 +50393,6 @@ RectTransform:
m_AnchoredPosition: {x: 146.54, y: 0}
m_SizeDelta: {x: 393.07, y: 66.14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2004820258952098814
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3436116032096366443}
- component: {fileID: 7176185005978773234}
- component: {fileID: 4102655889006093322}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3436116032096366443
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2004820258952098814}
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: 572652005106018274}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7176185005978773234
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2004820258952098814}
m_CullTransparentMesh: 0
--- !u!114 &4102655889006093322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2004820258952098814}
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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4FDD\u5B58\u7F16\u961F"
--- !u!1 &2017573758791092712
GameObject:
m_ObjectHideFlags: 0
@ -70684,7 +70487,6 @@ RectTransform:
m_Children:
- {fileID: 6959223419321465460}
- {fileID: 5970967723695097414}
- {fileID: 572652005106018274}
m_Father: {fileID: 116484329638739653}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 7030412799340013248}
- component: {fileID: 3529937809466818830}
- component: {fileID: 6151016813355172414}
- component: {fileID: 4207082639280969269}
m_Layer: 5
m_Name: GoBtn
m_TagString: Untagged
@ -94,7 +95,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 3
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}
@ -118,6 +119,25 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &4207082639280969269
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873150957316726126}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1031748898737920370
GameObject:
m_ObjectHideFlags: 0

View File

@ -59,7 +59,7 @@ __refPoss = {
nil,
{7,1.5,6},
nil,
{5,1,6,5,1,3,2,1},
{5,1,6,4,1,4,2,1},
nil,
nil
},

View File

@ -82,6 +82,8 @@ TOWERCOPYINFO_HIGHESTTOWER_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_ESSENCEVALUE_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_MAPINTORESET_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TOWERUSETIME_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
TOWERCOPYINFO_KILLCOUNT_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor();
@ -904,11 +906,31 @@ TOWERCOPYINFO_TOWERUSETIME_FIELD.default_value = 0
TOWERCOPYINFO_TOWERUSETIME_FIELD.type = 5
TOWERCOPYINFO_TOWERUSETIME_FIELD.cpp_type = 1
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.name = "trialRewardInfo"
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.trialRewardInfo"
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.number = 7
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.index = 6
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.label = 3
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.has_default_value = false
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.default_value = {}
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.type = 5
TOWERCOPYINFO_TRIALREWARDINFO_FIELD.cpp_type = 1
TOWERCOPYINFO_KILLCOUNT_FIELD.name = "killCount"
TOWERCOPYINFO_KILLCOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.killCount"
TOWERCOPYINFO_KILLCOUNT_FIELD.number = 8
TOWERCOPYINFO_KILLCOUNT_FIELD.index = 7
TOWERCOPYINFO_KILLCOUNT_FIELD.label = 1
TOWERCOPYINFO_KILLCOUNT_FIELD.has_default_value = false
TOWERCOPYINFO_KILLCOUNT_FIELD.default_value = 0
TOWERCOPYINFO_KILLCOUNT_FIELD.type = 5
TOWERCOPYINFO_KILLCOUNT_FIELD.cpp_type = 1
TOWERCOPYINFO.name = "TowerCopyInfo"
TOWERCOPYINFO.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo"
TOWERCOPYINFO.nested_types = {}
TOWERCOPYINFO.enum_types = {}
TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD}
TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD}
TOWERCOPYINFO.is_extendable = false
TOWERCOPYINFO.extensions = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.name = "levelDifficultyInfos"

View File

@ -48,6 +48,8 @@ function this.PrintBattleTable(tb)
local v = tb[k]
if type(v) == "table" then
indent_str = indent_str .. this.PrintBattleTable(v)
elseif type(v) == "string" then
indent_str = indent_str .. "\""..tostring(v) .. "\""
else
indent_str = indent_str .. tostring(v)
end
@ -62,6 +64,8 @@ function this.PrintBattleTable(tb)
if type(k) ~= "number" then
if type(v) == "table" then
indent_str = string.format("%s%s=%s", indent_str, tostring(k), this.PrintBattleTable(v))
elseif type(v) == "string" then
indent_str = string.format("%s%s=\"%s\"", indent_str, tostring(k), tostring(v))
else
indent_str = string.format("%s%s=%s", indent_str, tostring(k), tostring(v))
end

View File

@ -185,11 +185,11 @@ function FindTreasureDispatchPanel:ShowNeedConditionData(type)
Util.SetGray(conditionGrid[i], needState[i] < 1)
local tipsStr = ""
if conFigData.Condition[i][1] >= FindTreasureNeedType.Star then
tipsStr = "需要"..conFigData.Condition[i][2].."猎妖师"
tipsStr = "需要"..conFigData.Condition[i][2].."神将"
Util.GetGameObject(conditionGrid[i], "starIcon/numImage"):GetComponent("Image").sprite = Util.LoadSprite(starNumIamage[self:GetHeroStarImage(conFigData.Condition[i][2],1)])
Util.GetGameObject(conditionGrid[i], "starIcon/starImage"):GetComponent("Image").sprite = Util.LoadSprite(self:GetHeroStarImage(conFigData.Condition[i][2],2))
elseif conFigData.Condition[i][1] == FindTreasureNeedType.Pro then
tipsStr = "需要"..HeroElementDef[conFigData.Condition[i][2]].."属性猎妖师"
tipsStr = "需要"..HeroElementDef[conFigData.Condition[i][2]].."属性神将"
proIcon:GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(conFigData.Condition[i][2]))
end
Util.AddOnceClick(conditionGrid[i], function()

View File

@ -34,7 +34,13 @@ function this:OnShow()
this.ShowPanelData()
end
function this.ShowPanelData()
this.titleText.text = "援助次数("..MyGuildManager.MyFeteInfo.guildHelpTime.."/"..(guildHelpConfig[1].HelpTime[1] + guildHelpConfig[1].HelpTime[2])..")"
if MyGuildManager.MyFeteInfo.guildHelpTime < guildHelpConfig[1].HelpTime[1] then
this.titleText.text = "免费援助次数("..MyGuildManager.MyFeteInfo.guildHelpTime.."/"..guildHelpConfig[1].HelpTime[1]..")"
else
local curNum = MyGuildManager.MyFeteInfo.guildHelpTime - guildHelpConfig[1].HelpTime[1]
local item = ConfigManager.GetConfigData(ConfigName.GuildHelpConfig,1).Expend[1]
this.titleText.text = ConfigManager.GetConfigData(ConfigName.ItemConfig,item).Name.."援助次数("..curNum.."/".. guildHelpConfig[1].HelpTime[2]..")"
end
local allMyAidData = MyGuildManager.GetAllGuildHelpInfo()
if #allMyAidData <= 0 then
NetManager.GuildHelpGetAllRequest(function (msg)
@ -69,10 +75,7 @@ function this.SingleHelpAidDataShow(go,data)
Util.GetGameObject(getRewardBtn, "Text"):GetComponent("Text").text = "免费援助"
Util.AddOnceClick(getRewardBtn, function()
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
MyGuildManager.SetSingleGuildHelpguildHelpTimeData()
this.ShowPanelData()
end)
this.ShowRewardAndRefreshPanel(msg)
end)
end)
elseif MyGuildManager.MyFeteInfo.guildHelpTime >= guildHelpConfig[1].HelpTime[1] and MyGuildManager.MyFeteInfo.guildHelpTime < zongNum then
@ -86,10 +89,7 @@ function this.SingleHelpAidDataShow(go,data)
return
end
NetManager.GuildHelpHelpOtherRequest(data.uid,data.type,function (msg)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
MyGuildManager.SetSingleGuildHelpguildHelpTimeData()
this.ShowPanelData()
end)
this.ShowRewardAndRefreshPanel(msg)
end)
end)
else
@ -106,5 +106,21 @@ end
--界面销毁时调用(用于子类重写)
function this:OnDestroy()
end
function this.ShowRewardAndRefreshPanel(msg)
local content = {}
if msg.drop.itemlist ~= nil and #msg.drop.itemlist > 0 then
for i = 1, #msg.drop.itemlist do
local itemdata = {}
itemdata.configData = itemConfig[msg.drop.itemlist[i].itemId]
itemdata.name = itemdata.configData.Name
itemdata.icon = Util.LoadSprite(GetResourcePath(itemdata.configData.ResourceID))
itemdata.num = msg.drop.itemlist[i].itemNum
table.insert(content, itemdata)
end
end
PopupText(content, 0.5, 2)
--UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
MyGuildManager.SetSingleGuildHelpguildHelpTimeData()
this.ShowPanelData()
end
return this

View File

@ -110,10 +110,12 @@ function this.ShowPanelData()
local curguildHelpInfo = MyGuildManager.MyFeteInfo.guildHelpInfo[i]
--LogError("MyGuildManager.MyFeteInfo.guildHelpInfo "..i.." "..curguildHelpInfo.type.." "..curguildHelpInfo.num)
if allMyAidData[i] then
curAidNum = curAidNum + 1
allMyAidData[i].type = curguildHelpInfo.type
allMyAidData[i].num = curguildHelpInfo.num
allMyAidData[i].hadtakenum = curguildHelpInfo.hadtakenum
if allMyAidData[i].num == allMyAidData[i].hadtakenum == guildHelpConfig[1].RecourseTime[2] then
curAidNum = curAidNum + 1
end
end
end
end

View File

@ -188,13 +188,21 @@ function this.ShowTitleAllData()
this.timeNumText.text = ""
this.timeText.text = ""
this.timeText2.text = ""
if curProgress == -1 then
if GuildCarDelayManager.battleStartTime < Today_N_OClockTimeStamp(5) + 86400 then
LogGreen("curProgress "..curProgress)
if curProgress == -5 then
--LogGreen("GuildCarDelayManager.battleStartTime "..GuildCarDelayManager.battleStartTime)
--if GuildCarDelayManager.battleStartTime < Today_N_OClockTimeStamp(5) + 86400 then
if this.timer then
this.timer:Stop()
this.timer = nil
end
this.timeTextGo:SetActive(true)
this.timeText2.text = "车迟斗法将于次日5:00重置。"
else
--else
elseif curProgress == -1 then
timeText = "挑战开始时间:"
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.battleStartTime - GetTimeStamp(),timeText)
end
--end
elseif curProgress == 1 then
timeText = "挑战剩余时间:"
this.RemainTimeDown(this.timeTextGo,this.timeText,this.timeNumText,GuildCarDelayManager.endTime - GetTimeStamp(),timeText)
@ -210,7 +218,7 @@ function this.ShowTitleAllData()
end
testLiveGO = poolManager:LoadLive(GetResourcePath(heroConfig[curMonsterIdConFig.Boss].Live), this.live2dRoot.transform, Vector3.one*heroConfig[curMonsterIdConFig.Boss].Scale, Vector3.zero)
this.RefrePanelRedPoint()
end
end
-- tab节点显示自定义
function this.TabAdapter(tab, index, status)
local tabLab = Util.GetGameObject(tab, "Text")
@ -405,6 +413,8 @@ end
function this.RefrePanelRedPoint()
Util.GetGameObject(this.challengeBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge))
Util.GetGameObject(this.lootBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot))
Util.SetGray(Util.GetGameObject(this.challengeBtn,"redPoint"),false)
Util.SetGray(Util.GetGameObject(this.lootBtn,"redPoint"),false)
end
--界面销毁时调用(用于子类重写)
function GuildCarDelayMainPanel:OnDestroy()

View File

@ -12,7 +12,7 @@ function this.SetProgressData(msg)
this.bossIndexId = msg.bossIndexId--boss索引id
this.battleStartTime = msg.battleStartTime--挑战boss开启时间
this.grabStartTime = msg.grabStartTime--抢夺开启时间
--LogError("progress "..this.progress.." endTime "..this.endTime.." bossIndexId "..this.bossIndexId)
--LogError("progress "..this.progress.." endTime "..this.endTime.." bossIndexId "..this.bossIndexId.." this.battleStartTime "..this.battleStartTime)
if this.timer2 then
this.timer2:Stop()
this.timer2 = nil

View File

@ -3,6 +3,7 @@ local this = MapTrialManager
local trailSetting = ConfigManager.GetConfig(ConfigName.TrialSetting)
local trailConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
local trialwelfareConfig=ConfigManager.GetConfig(ConfigName.TrialwelfareConfig)
local trialKillConfig=ConfigManager.GetConfig(ConfigName.TrialKillConfig)
function this.Initialize()
this.resetLevel = 0 -- 重置到的层数
this.resetCount = 0 -- 已经重置的次数
@ -23,11 +24,13 @@ function this.Initialize()
this.rolePos = Vector2.zero
this.canMove = true -- 服务器返回精气值100时不可寻路
this.isChangeLevel = false -- 换层时不可寻路
this.gotRewardLevel = {} -- 已经领取奖励的层数
-- this.gotRewardLevel = {} -- 已经领取奖励的层数
this.firstEnter = false -- 试炼副本重置后进图
this.selectHeroDid="" --已选择英雄的动态id
this.cell=nil --传送门位置
-- this.isFirstIn=false --是否第一次进入副本 退出副本时置为false
this.trialRewardInfo={} --试炼领奖信息
this.killCount=0 --已击杀小怪数量
end
function this.RefreshTrialInfo(towerCopyInfo)
@ -39,6 +42,9 @@ function this.RefreshTrialInfo(towerCopyInfo)
this.powerValue = towerCopyInfo.essenceValue
this.isCanReset=towerCopyInfo.mapIntoReset
this.doneTime = towerCopyInfo.towerUseTime
-- this.trialRewardInfo=towerCopyInfo.trialRewardInfo
this.InitTrialRewardData(towerCopyInfo.trialRewardInfo)
this.killCount=towerCopyInfo.killCount
-- 最后一层需要赋值
this.bossDeadTime = towerCopyInfo.towerUseTime
@ -163,27 +169,49 @@ end
-- 登录时试炼副本的层级数据
function this.InitTrialRewardData(gotLevelData)
this.gotRewardLevel = {}
this.trialRewardInfo = {}
if gotLevelData and #gotLevelData > 0 then
for i = 1, #gotLevelData do
Log("已经领取的奖励层数" .. gotLevelData[i])
this.gotRewardLevel[gotLevelData[i]] = gotLevelData[i]
LogPink("已经领取的奖励层数" .. gotLevelData[i])
this.trialRewardInfo[gotLevelData[i]] = gotLevelData[i]
end
end
end
-- 某一层的奖励领取状态
-- 击杀怪物数量的奖励领取状态
-- 0 已经领取1 可领取2不能领取
function this.GetRewardState(levelNum)
if this.gotRewardLevel[levelNum] and this.gotRewardLevel[levelNum] > 0 then
return 0
elseif not this.gotRewardLevel[levelNum] then
if levelNum > this.highestLevel then
function this.GetRewardState(id)
if #this.trialRewardInfo<=0 then
if this.killCount<trialKillConfig[id].Count then
return 2
elseif levelNum <= this.highestLevel then
elseif this.killCount>=trialKillConfig[id].Count then
return 1
end
else
if #this.trialRewardInfo>0 then
for i, v in ipairs(this.trialRewardInfo) do
if v==id then
return 0
else
if this.killCount<trialKillConfig[id].Count then
return 2
elseif this.killCount>=trialKillConfig[id].Count then
return 1
end
end
end
end
end
-- if this.trialRewardInfo[levelNum] and this.trialRewardInfo[levelNum] > 0 then
-- return 0
-- elseif not this.trialRewardInfo[levelNum] then
-- if levelNum > this.highestLevel then
-- return 2
-- elseif levelNum <= this.highestLevel then
-- return 1
-- end
-- end
end
-- 获得试炼副本的层数奖励数据
@ -239,4 +267,25 @@ function this.SetHeroHp(data,did,func)
if func then func() end
end
--试练奖励信息
function this.SetTrialRewardInfo(v)
for i, value in ipairs(this.trialRewardInfo) do
if value~=v then
table.insert(this.trialRewardInfo,v)
break
end
end
end
function this.GetTrialRewardInfo()
return this.trialRewardInfo
end
--试练已杀小怪数量
function this.SetKillCount(v)
this.killCount=v
end
function this.GetKilCount()
return this.killCount
end
return this

View File

@ -96,6 +96,10 @@ function TrialMapPanel:BindEvent()
--请求战斗数据
NetManager.QuickFightRequest(function(msg)
--战斗赢了 击杀小怪数量+1包括BOSS吗
if msg.result==1 then
MapTrialManager.SetKillCount(MapTrialManager.GetKilCount()+1)
end
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
local fightData = BattleManager.GetBattleServerData(msg)
UIManager.OpenPanel(UIName.BattlePanel,fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()

View File

@ -155,7 +155,7 @@ function this.PlayerInfoRequest(func)
EliteMonsterManager.SetEliteData(suddBossId, endTime, findMapId)
-- 试炼副本层级奖励
MapTrialManager.InitTrialRewardData(msg.towerReceivedReward)
-- MapTrialManager.InitTrialRewardData(msg.towerReceivedReward)
TreasureOfSomebodyManagerV2.SetCurrentLevel(msg.treasureLevel)
TreasureOfSomebodyManagerV2.SetTreasureBuyStatus(msg.hadBuyTreasure)
@ -4137,7 +4137,7 @@ function NetManager.TreasureOfHeavenScoreRequest(func)
local data = buffer:DataByte()
local msg = Expedition_pb.ExpeditionTreasureInfoResponse()
msg:ParseFromString(data)
LogGreen("msg.treasureRewardState "..#msg.treasureRewardState)
-- LogGreen("msg.treasureRewardState "..#msg.treasureRewardState)
-- TreasureOfHeavenManger.GetTreasureState()
TreasureOfHeavenManger.SetScore(msg.score)
TreasureOfHeavenManger.SetState(msg.treasureRewardState)

View File

@ -57,11 +57,17 @@ end
--刷新
function this.RefreshPanel()
local d={{id=1},{id=2},{id=3}}--临时数据
local d={}--临时数据
for _, configInfo in ConfigPairs(trialKillConfig) do
table.insert(d, configInfo)
end
this.scrollView:SetData(d,function(index,root)
this.SetScrollPre(root,d[index])
end)
this.scrollView:SetIndex(1)
for key, value in pairs(MapTrialManager.GetTrialRewardInfo()) do
LogPink("value "..value)
end
end
--设置每条数据
@ -69,12 +75,35 @@ function this.SetScrollPre(root,data)
local info=Util.GetGameObject(root,"Title/Info"):GetComponent("Text")
local grid=Util.GetGameObject(root,"Grid")
local goBtn=Util.GetGameObject(root,"GoBtn")
local goText=Util.GetGameObject(goBtn,"Text"):GetComponent("Text")
info.text=string.format( "击败%s名敌人%s/%s",trialKillConfig[data.id].Count,1,trialKillConfig[data.id].Count)
ResetItemView(root,grid.transform,itemList,#trialKillConfig[data.id].BoxReward,0.8,sortingOrder,false,trialKillConfig[data.id].BoxReward)
info.text=string.format( "击败%s名敌人%s/%s",data.Count,MapTrialManager.GetKilCount(),data.Count)
ResetItemView(root,grid.transform,itemList,#data.BoxReward,0.8,sortingOrder,false,data.BoxReward)
--按钮状态
local s=MapTrialManager.GetRewardState(data.Id)
LogPink(s)
goBtn:GetComponent("Button").interactable=s~=0
if s==0 then
goText.text="已领取"
elseif s==1 then
goText.text="领取"
elseif s==2 then
goText.text="前往"
end
Util.AddOnceClick(goBtn,function()
LogPink("点击领取奖励!")
if s==1 then
NetManager.RequestLevelReward(data.Id, function(msg)
MapTrialManager.SetTrialRewardInfo(data.Id)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
this.RefreshPanel()
end)
end)
elseif s==2 then
this:ClosePanel()
end
end)
end

View File

@ -284,7 +284,7 @@ function RoleInfoPanel:BindEvent()
else
-- local equipSignSetting = ConfigManager.GetConfig(ConfigName.EquipSignSetting)
local EquipSignUnlock = ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipSignUnlock
PopupTipPanel.ShowTip("猎妖师"..NumToSimplenessFont[EquipSignUnlock[2][2]] .. "星解锁魂印!")
PopupTipPanel.ShowTip("神将"..NumToSimplenessFont[EquipSignUnlock[2][2]] .. "星解锁魂印!")
end
end)
--显示所有属性
@ -561,7 +561,7 @@ function this:UpdateHeroUpLvAndBreakData()
-- 升级获取突破 和 升星相应heroRankUpConfig静态数据
-- LogError("curHeroData "..curHeroData.breakId)
if isHeroUpTuPo and upTuPoRankUpConfig and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
this.tipUpLv:GetComponent("Text").text="提升猎妖师等级上限"
this.tipUpLv:GetComponent("Text").text="提升神将等级上限"
this.tipUpLv:SetActive(true)
this.upLvBtnText.text="突 破"
this.upLvBtnImage.sprite = Util.LoadSprite("r_hero_button_001")--r_chouka_button_004
@ -581,11 +581,11 @@ function this:UpdateHeroUpLvAndBreakData()
if isHeroUpStar and upStarRankUpConfig and curTuPoRankUpConfig and curTuPoRankUpConfig.JudgeClass==1 and curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then--当前突破全部完成
if curStarRankUpConfig then--进阶过处理
if curHeroData.lv == curStarRankUpConfig.OpenLevel then
this.tipUpLv:GetComponent("Text").text="提升猎妖师等级上限"
this.tipUpLv:GetComponent("Text").text="提升神将等级上限"
this.tipUpLv:SetActive(true)
end
else--从未进阶过处理
this.tipUpLv:GetComponent("Text").text="提升猎妖师等级上限"
this.tipUpLv:GetComponent("Text").text="提升神将等级上限"
this.tipUpLv:SetActive(true)
end
end
@ -1068,7 +1068,7 @@ end
--进阶按钮点击
function RoleInfoPanel:OnClickBtnUpStar()
if curHeroData.heroConfig.GrowthSwitch then
PopupTipPanel.ShowTip("猎妖师不可进阶")
PopupTipPanel.ShowTip("神将不可进阶")
return
end
RoleInfoPanel.HideAllLayout()
@ -1160,31 +1160,32 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
_isReqLvUp = false
return
end
LogPink("curStarRankUpConfig "..tostring(curStarRankUpConfig))
if curTuPoRankUpConfig then
LogPink("curTuPoRankUpConfig "..curTuPoRankUpConfig.Id)
end
if upStarRankUpConfig then
LogPink("upStarRankUpConfig "..upStarRankUpConfig.Id)
end
--如果此时需要进阶 每次都要跳转
if isHeroUpStar and upStarRankUpConfig and curTuPoRankUpConfig and curTuPoRankUpConfig.JudgeClass==1 and curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then--当前突破全部完成
if curStarRankUpConfig then--进阶过处理
if curHeroData.lv == curStarRankUpConfig.OpenLevel then
_isClicked = false
_isReqLvUp = false
LogPink("111")
MsgPanel.ShowTwo("进阶后可以提升等级上限。是否立即前往进阶界面?", nil, function()
RoleInfoPanel:OnClickBtnUpStar()
end,"取消","前往进阶")
else
if isUpLvMaterials then
if isSingleLvUp then--是否是单次升级
LogPink("222")
NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv + 1,curHeroData.lv,function (msg)
self:DeleteLvUpMaterials(isSingleLvUp,msg)
end)
else
LogPink("333")
isTriggerLongClick = true
self:DeleteLvUpMaterials(isSingleLvUp)
end
else
LogPink("444")
_isClicked = false
_isReqLvUp = false
if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
@ -1195,7 +1196,6 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
end
end
else--从未进阶过处理
LogPink("555")
_isClicked = false
_isReqLvUp = false
MsgPanel.ShowTwo("进阶后可以提升等级上限。是否立即前往进阶界面?", nil, function()
@ -1205,7 +1205,6 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
else
if isUpLvMaterials then
if isSingleLvUp then--是否是单次升级
LogPink("666")
local curUpLv = curHeroData.lv
if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
curUpLv = curHeroData.lv
@ -1216,12 +1215,10 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
self:DeleteLvUpMaterials(isSingleLvUp,msg)
end)
else
LogPink("777")
isTriggerLongClick = true
self:DeleteLvUpMaterials(isSingleLvUp)
end
else
LogPink("888")
_isClicked = false
_isReqLvUp = false
if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
@ -1245,7 +1242,7 @@ function RoleInfoPanel:StarUpClick()
return
end
if curHeroData.lv<upStarRankUpConfig.LimitLevel then
PopupTipPanel.ShowTip("需要猎妖师等级达到"..upStarRankUpConfig.LimitLevel)
PopupTipPanel.ShowTip("需要神将等级达到"..upStarRankUpConfig.LimitLevel)
return
end
local isUpStarMaterialsHero=true
@ -1506,9 +1503,9 @@ function RoleInfoPanel:HeroLockEvent()
end
NetManager.HeroLockEvent(curHeroData.dynamicId,curHeroData.lockState,function ()
if curHeroData.lockState == 1 then
PopupTipPanel.ShowTip("猎妖师锁定成功")
PopupTipPanel.ShowTip("神将锁定成功")
elseif curHeroData.lockState == 0 then
PopupTipPanel.ShowTip("猎妖师解锁成功")
PopupTipPanel.ShowTip("神将解锁成功")
end
HeroManager.UpdateSingleHeroLockState(curHeroData.dynamicId,curHeroData.lockState)
this.unlockImage:SetActive(curHeroData.lockState == 0)
@ -1522,11 +1519,11 @@ function RoleInfoPanel:HeroLockEvent()
end
function RoleInfoPanel:HeroReturnEvent()
if isUpZhen then
PopupTipPanel.ShowTip("猎妖师已上阵")
PopupTipPanel.ShowTip("神将已上阵")
return
end
if curHeroData.lockState == 1 then
PopupTipPanel.ShowTip("猎妖师已锁定")
PopupTipPanel.ShowTip("神将已锁定")
return
end
UIManager.OpenPanel(UIName.RoleReturnPanel,curHeroData,isUpZhen)

View File

@ -76,7 +76,7 @@ function this.RedPoint()
if rewardStateData[i].state==0 and curtreasrueState==1 or
rewardStateData[i].state==1 and curtreasrueState==1 or
rewardStateData[i].state==0 and curtreasrueState==0 then
LogBlue("掉了么?")
-- LogBlue("掉了么?")
return true
end
end

Binary file not shown.

Binary file not shown.