Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
cd220c0f35
|
@ -3977,6 +3977,86 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_textSpacing: -30.48
|
_textSpacing: -30.48
|
||||||
|
--- !u!1 &6758105366629589145
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6014977842114892231}
|
||||||
|
- component: {fileID: 1921361452000967979}
|
||||||
|
- component: {fileID: 1672885002045253507}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6014977842114892231
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6758105366629589145}
|
||||||
|
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: 7472074626082027443}
|
||||||
|
m_RootOrder: 0
|
||||||
|
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: -1.44, y: 0.39999998}
|
||||||
|
m_SizeDelta: {x: 157.13, y: 65.07}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1921361452000967979
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6758105366629589145}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1672885002045253507
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6758105366629589145}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 38
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 50
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u524D\u5F80\u5F3A\u5316"
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &6777628736698248947
|
--- !u!1 &6777628736698248947
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -4148,6 +4228,7 @@ RectTransform:
|
||||||
- {fileID: 3198923251045082768}
|
- {fileID: 3198923251045082768}
|
||||||
- {fileID: 5360054861317454577}
|
- {fileID: 5360054861317454577}
|
||||||
- {fileID: 2538206906522360066}
|
- {fileID: 2538206906522360066}
|
||||||
|
- {fileID: 7472074626082027443}
|
||||||
m_Father: {fileID: 2948461849611934824}
|
m_Father: {fileID: 2948461849611934824}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -5316,6 +5397,166 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5957\u88C5\u5C5E\u6027\uFF1A"
|
m_Text: "\u5957\u88C5\u5C5E\u6027\uFF1A"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &8963690017352342295
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7472074626082027443}
|
||||||
|
- component: {fileID: 5261023711562685413}
|
||||||
|
- component: {fileID: 9006969022006818585}
|
||||||
|
- component: {fileID: 2142804385707484061}
|
||||||
|
- component: {fileID: 6678871090203015278}
|
||||||
|
- component: {fileID: 3153525182435110428}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: btnJump
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7472074626082027443
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 6014977842114892231}
|
||||||
|
m_Father: {fileID: 2111386558047614758}
|
||||||
|
m_RootOrder: 3
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 287, y: -60}
|
||||||
|
m_SizeDelta: {x: 200, y: 74}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5261023711562685413
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &9006969022006818585
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
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: ce3b37dbbab2b134d9b53e7d7fd99ceb, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 1
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &2142804385707484061
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
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: 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}
|
||||||
|
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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91,
|
||||||
|
type: 3}
|
||||||
|
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: 9006969022006818585}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &6678871090203015278
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
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!114 &3153525182435110428
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8963690017352342295}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_IgnoreLayout: 1
|
||||||
|
m_MinWidth: -1
|
||||||
|
m_MinHeight: -1
|
||||||
|
m_PreferredWidth: -1
|
||||||
|
m_PreferredHeight: -1
|
||||||
|
m_FlexibleWidth: -1
|
||||||
|
m_FlexibleHeight: -1
|
||||||
|
m_LayoutPriority: 1
|
||||||
--- !u!1001 &7193187890722799838
|
--- !u!1001 &7193187890722799838
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -8220,8 +8220,15 @@ local passivityList = {
|
||||||
local onTurnEnd=function(role)
|
local onTurnEnd=function(role)
|
||||||
role.Event:RemoveEvent(BattleEventName.RoleKill,onRoleKill,nil,nil,role)
|
role.Event:RemoveEvent(BattleEventName.RoleKill,onRoleKill,nil,nil,role)
|
||||||
if isNoDie then
|
if isNoDie then
|
||||||
local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1))
|
if role.curMainTarget then
|
||||||
BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage)
|
local isBoss=BattleUtil.CheckIsBoss(role.curMainTarget)
|
||||||
|
if isBoss then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1))
|
||||||
|
BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
isNoDie=true
|
isNoDie=true
|
||||||
end
|
end
|
||||||
|
|
|
@ -422,14 +422,19 @@ function this.SetHeadShow()
|
||||||
local enemy = MonsterManager.GetMonster(1, 100) -- 敌方主角
|
local enemy = MonsterManager.GetMonster(1, 100) -- 敌方主角
|
||||||
if enemy then
|
if enemy then
|
||||||
this.enemy:SetActive(true)
|
this.enemy:SetActive(true)
|
||||||
this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex])
|
if enemy.sex then
|
||||||
|
this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex])
|
||||||
|
end
|
||||||
else
|
else
|
||||||
this.enemy:SetActive(false)
|
this.enemy:SetActive(false)
|
||||||
end
|
end
|
||||||
local player = MonsterManager.GetMonster(0, 100) -- 我方主角
|
local player = MonsterManager.GetMonster(0, 100) -- 我方主角
|
||||||
if player then
|
if player then
|
||||||
this.player:SetActive(true)
|
this.player:SetActive(true)
|
||||||
this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex])
|
if player.sex then
|
||||||
|
this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex])
|
||||||
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
this.player:SetActive(false)
|
this.player:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
|
@ -48,6 +48,7 @@ function RewardEquipSingleShowPopup2:InitComponent()
|
||||||
self.homeProGrid = Util.GetGameObject(self.homePro, "grid")
|
self.homeProGrid = Util.GetGameObject(self.homePro, "grid")
|
||||||
self.homeProPre = Util.GetGameObject(self.homePro, "grid/curProName")
|
self.homeProPre = Util.GetGameObject(self.homePro, "grid/curProName")
|
||||||
self.homeProPre:SetActive(false)
|
self.homeProPre:SetActive(false)
|
||||||
|
self.btnJumpHome = Util.GetGameObject(self.homePro, "btnJump")
|
||||||
--suitPro
|
--suitPro
|
||||||
self.suitPro = Util.GetGameObject(self.midBar, "suitPro")
|
self.suitPro = Util.GetGameObject(self.midBar, "suitPro")
|
||||||
self.suitProName = Util.GetGameObject(self.suitPro, "PropertyName"):GetComponent("Text")
|
self.suitProName = Util.GetGameObject(self.suitPro, "PropertyName"):GetComponent("Text")
|
||||||
|
@ -151,6 +152,16 @@ function RewardEquipSingleShowPopup2:BindEvent()
|
||||||
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.nextEquip,self.position)
|
self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.nextEquip,self.position)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--跳转摘星阁
|
||||||
|
Util.AddClick(self.btnJumpHome, function()
|
||||||
|
HomeLandManager.curEquip = self.equipData.position
|
||||||
|
JumpManager.GoJump(40059,function ()
|
||||||
|
Timer.New(function ()
|
||||||
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HomeLandEquip)
|
||||||
|
end,0.5):Start()
|
||||||
|
end)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
--道具 和 装备分解 发送请求后 回调
|
--道具 和 装备分解 发送请求后 回调
|
||||||
|
|
Loading…
Reference in New Issue