Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
83f48bbe24
|
@ -39272,7 +39272,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -46.7, y: 46.3}
|
||||
m_SizeDelta: {x: 74, y: 74}
|
||||
m_SizeDelta: {x: 35, y: 35}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7916119699031341114
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -648,9 +648,9 @@ RectTransform:
|
|||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 428.9, y: -539.69995}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 857.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &8121673493361692538
|
||||
|
@ -1005,9 +1005,9 @@ RectTransform:
|
|||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 428.9, y: -963.8999}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 857.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &3649937338384214621
|
||||
|
@ -1919,7 +1919,7 @@ MonoBehaviour:
|
|||
m_HandleRect: {fileID: 5662496400508578312}
|
||||
m_Direction: 2
|
||||
m_Value: 1
|
||||
m_Size: 0.98050505
|
||||
m_Size: 0.9590895
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -2366,6 +2366,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2856166134434741194
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3591791343968598137}
|
||||
- component: {fileID: 4796351776928188148}
|
||||
- component: {fileID: 2047521541680722938}
|
||||
m_Layer: 5
|
||||
m_Name: Text (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3591791343968598137
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2856166134434741194}
|
||||
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: 761062889225148252}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1074.9, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4796351776928188148
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2856166134434741194}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2047521541680722938
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2856166134434741194}
|
||||
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.990566, g: 0.9672036, b: 0.9672036, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 71
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!1 &2914980468282115045
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3295,9 +3374,9 @@ RectTransform:
|
|||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 428.9, y: -751.7999}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 857.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &3520215882717175998
|
||||
|
@ -3366,7 +3445,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8519602078899774996}
|
||||
- {fileID: 3591791343968598137}
|
||||
- {fileID: 7759797600969431214}
|
||||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 2
|
||||
|
@ -3399,85 +3478,6 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!1 &4224541773598177384
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8519602078899774996}
|
||||
- component: {fileID: 769082743509934315}
|
||||
- component: {fileID: 1908776433853424592}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8519602078899774996
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4224541773598177384}
|
||||
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: 761062889225148252}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &769082743509934315
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4224541773598177384}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1908776433853424592
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4224541773598177384}
|
||||
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: 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: New Text
|
||||
--- !u!1 &4293146313775758667
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6057,9 +6057,9 @@ RectTransform:
|
|||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 428.9, y: -327.59998}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 857.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &335545221599443231
|
||||
|
@ -7098,9 +7098,9 @@ RectTransform:
|
|||
m_Father: {fileID: 133927059845299505}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 428.9, y: -141.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 857.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &4838038619090972626
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -121,19 +121,19 @@ function HeroPreviewNewPanel:OnOpen(...)
|
|||
if(v.Pool==11) then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.waterGrid.transform)
|
||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
||||
view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
|
||||
elseif(v.Pool==12) then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.fireGrid.transform)
|
||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
||||
view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
|
||||
elseif(v.Pool==13) then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.windyGrid.transform)
|
||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
||||
view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
|
||||
elseif(v.Pool==14) then
|
||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.groundGrid.transform)
|
||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
||||
view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
|
||||
end
|
||||
end
|
||||
this.elementScroll:SetActive(true)
|
||||
|
@ -228,7 +228,7 @@ function this.SwitchView(index)
|
|||
this.List1[i] = SubUIManager.Open(SubUIConfig.ItemView,this.oneGrid.transform)
|
||||
end
|
||||
this.List1[i]:OnOpen(false, {oneData[i].Reward[1], oneData[i].Reward[2]}, 1.1, true)
|
||||
this.List1[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (oneData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List1[i].name:GetComponent("Text").text=""..string.format("%.2f", (oneData[i].WeightShow/100000)*100) .."%"
|
||||
this.List1[i].gameObject:SetActive(true)
|
||||
|
||||
end
|
||||
|
@ -246,7 +246,7 @@ function this.SwitchView(index)
|
|||
this.List2[i] = SubUIManager.Open(SubUIConfig.ItemView,this.twoGrid.transform)
|
||||
end
|
||||
this.List2[i]:OnOpen(false, {twoData[i].Reward[1], twoData[i].Reward[2]}, 1.1, true)
|
||||
this.List2[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (twoData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List2[i].name:GetComponent("Text").text=""..string.format("%.2f", (twoData[i].WeightShow/100000)*100) .."%"
|
||||
this.List2[i].gameObject:SetActive(true)
|
||||
|
||||
end
|
||||
|
@ -270,7 +270,7 @@ function this.SwitchView(index)
|
|||
this.List3[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.List3[i]:OnOpen(false, {threeData[i].Reward[1], threeData[i].Reward[2]}, 1.1, true)
|
||||
this.List3[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (threeData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List3[i].name:GetComponent("Text").text=""..string.format("%.2f", (threeData[i].WeightShow/100000)*100) .."%"
|
||||
this.List3[i].gameObject:SetActive(true)
|
||||
|
||||
end
|
||||
|
@ -293,7 +293,7 @@ function this.SwitchView(index)
|
|||
this.List4[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.List4[i]:OnOpen(false, {fourData[i].Reward[1], fourData[i].Reward[2]}, 1.1, true)
|
||||
this.List4[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (fourData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List4[i].name:GetComponent("Text").text=""..string.format("%.2f", (fourData[i].WeightShow/100000)*100) .."%"
|
||||
this.List4[i].gameObject:SetActive(true)
|
||||
|
||||
end
|
||||
|
@ -316,7 +316,7 @@ function this.SwitchView(index)
|
|||
this.List5[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.List5[i]:OnOpen(false, {fiveData[i].Reward[1], fiveData[i].Reward[2]}, 1.1, true)
|
||||
this.List5[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (fiveData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List5[i].name:GetComponent("Text").text=""..string.format("%.2f", (fiveData[i].WeightShow/100000)*100) .."%"
|
||||
this.List5[i].gameObject:SetActive(true)
|
||||
this.List5[i].gameObject.transform.parent.gameObject:SetActive(true)
|
||||
end
|
||||
|
@ -339,7 +339,7 @@ function this.SwitchView(index)
|
|||
this.List6[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.List6[i]:OnOpen(false, {sixData[i].Reward[1], sixData[i].Reward[2]}, 1.1, true)
|
||||
this.List6[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List6[i].name:GetComponent("Text").text=""..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%"
|
||||
this.List6[i].gameObject:SetActive(true)
|
||||
this.List6[i].gameObject.transform.parent.gameObject:SetActive(true)
|
||||
end
|
||||
|
@ -356,7 +356,7 @@ function this.SwitchView(index)
|
|||
-- this.List6[i].gameObject:SetActive(true)
|
||||
-- end
|
||||
-- this.List6[i]:OnOpen(false, {sixData[i].Reward[1], sixData[i].Reward[2]}, 1.1, true)
|
||||
-- this.List6[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%</color>"
|
||||
-- this.List6[i].name:GetComponent("Text").text=""..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%"
|
||||
-- this.List6[i].gameObject:SetActive(true)
|
||||
-- end
|
||||
for i = 1, #this.List7 do
|
||||
|
@ -370,7 +370,7 @@ function this.SwitchView(index)
|
|||
this.List7[i].gameObject:SetActive(true)
|
||||
end
|
||||
this.List7[i]:OnOpen(false, {sevenData[i].Reward[1], sevenData[i].Reward[2]}, 1.1, true)
|
||||
this.List7[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (sevenData[i].WeightShow/100000)*100) .."%</color>"
|
||||
this.List7[i].name:GetComponent("Text").text=""..string.format("%.2f", (sevenData[i].WeightShow/100000)*100) .."%"
|
||||
this.List7[i].gameObject:SetActive(true)
|
||||
end
|
||||
if #sevenData==0 then
|
||||
|
|
|
@ -284,7 +284,7 @@ function RecruitEquipPanelNew:UpdataWishPanel()
|
|||
-- if RecruitManager.isTenRecruit == 0 then
|
||||
-- self.tenTipText.text = "<color=#FFB83B><size=30>每次十连</size><color=#FEDA90><size=30>必得</size></color></color><color=#FFB83B><size=30>五星</size></color><color=#FEDA90><size=30>神将法宝</size></color>"
|
||||
-- else
|
||||
self.tenTipText.text = string.format("剩余<color=#31ff00>%s次</color>必得五星英雄生命卡",RecruitManager.GetRecruit2MustCount())
|
||||
self.tenTipText.text = string.format("剩余<color=#22A70C>%s次</color>必得五星生命卡",RecruitManager.GetRecruit2MustCount())
|
||||
--end
|
||||
end
|
||||
|
||||
|
@ -316,7 +316,7 @@ function RecruitEquipPanelNew:UpdataBoxReward()
|
|||
|
||||
else
|
||||
self.slider.fillAmount = 1
|
||||
self.sliderText.text ="宝箱已达最大等级"
|
||||
self.sliderText.text ="<color=#E15362>宝箱已达最大等级</color>"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue