Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
879687f705
|
@ -862,6 +862,80 @@ MonoBehaviour:
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: New Text
|
m_Text: New Text
|
||||||
|
--- !u!1 &1540944412
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1540944413}
|
||||||
|
- component: {fileID: 1540944415}
|
||||||
|
- component: {fileID: 1540944414}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: select
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1540944413
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1540944412}
|
||||||
|
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: 8250364618381481986}
|
||||||
|
m_RootOrder: 5
|
||||||
|
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: 0}
|
||||||
|
m_SizeDelta: {x: 185, y: 170}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1540944415
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1540944412}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1540944414
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1540944412}
|
||||||
|
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: 70880bb948d704640910d7f25d8c5294, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1665404872
|
--- !u!1 &1665404872
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -3116,7 +3190,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 2, y: 0}
|
m_AnchoredPosition: {x: 2, y: 0}
|
||||||
m_SizeDelta: {x: 92, y: 52}
|
m_SizeDelta: {x: 40, y: 54}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8199897445868407895
|
--- !u!222 &8199897445868407895
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -3146,7 +3220,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -3753,7 +3827,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &8250364618381481986
|
--- !u!224 &8250364618381481986
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -3770,6 +3844,7 @@ RectTransform:
|
||||||
- {fileID: 6222697736908523205}
|
- {fileID: 6222697736908523205}
|
||||||
- {fileID: 3743936422720510939}
|
- {fileID: 3743936422720510939}
|
||||||
- {fileID: 6003663800827907004}
|
- {fileID: 6003663800827907004}
|
||||||
|
- {fileID: 1540944413}
|
||||||
m_Father: {fileID: 426311262980600154}
|
m_Father: {fileID: 426311262980600154}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -3863,7 +3938,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 184, y: 175}
|
m_SizeDelta: {x: 179, y: 164}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6678710353538224651
|
--- !u!222 &6678710353538224651
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -3893,7 +3968,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: f2393ce2d23f490409ca62cfa0b8f917, type: 3}
|
m_Sprite: {fileID: 21300000, guid: a6e5c1ff36c0f484bac142a8a5122395, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
@ -15,9 +15,9 @@ local maxForce = 0
|
||||||
--顶部背景图
|
--顶部背景图
|
||||||
local titleBg={
|
local titleBg={
|
||||||
--回合
|
--回合
|
||||||
[1]={bg="UI_hz_yt_03", titleImg = "chall_title_fangyu",name="金币副本", titleTip = GetLanguageStrById(specialConfig[150].Value),pos = Vector3.New(257.08,658.37,0)},
|
[1]={bg="UI_hz_yt_03", titleImg = "chall_title_fangyu",name="防御副本", titleTip = GetLanguageStrById(specialConfig[150].Value),pos = Vector3.New(257.08,658.37,0)},
|
||||||
--伤害
|
--伤害
|
||||||
[2]={bg="UI_hz_yt_04", titleImg = "chall_title_shanghai",name="经验副本", titleTip = GetLanguageStrById(specialConfig[151].Value),pos = Vector3.New(257.08,651.24,0)},
|
[2]={bg="UI_hz_yt_04", titleImg = "chall_title_shanghai",name="伤害副本", titleTip = GetLanguageStrById(specialConfig[151].Value),pos = Vector3.New(257.08,651.24,0)},
|
||||||
}
|
}
|
||||||
--难度图片
|
--难度图片
|
||||||
local qualityBg={
|
local qualityBg={
|
||||||
|
@ -40,8 +40,8 @@ local freeTime=0--剩余免费次数
|
||||||
|
|
||||||
--Tab
|
--Tab
|
||||||
local TabBox = require("Modules/Common/TabBox")
|
local TabBox = require("Modules/Common/TabBox")
|
||||||
local _TabData={ [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",lock = "UI_hz_gonghui_31", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
|
local _TabData={ [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",lock = "UI_hz_gonghui_31", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
|
||||||
[2] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",lock = "UI_hz_gonghui_32", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
|
[2] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",lock = "UI_hz_gonghui_32", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
|
||||||
}
|
}
|
||||||
|
|
||||||
function ChallengeCopyPanel:InitComponent()
|
function ChallengeCopyPanel:InitComponent()
|
||||||
|
|
|
@ -15,15 +15,15 @@ local maxForce = 0
|
||||||
--顶部背景图
|
--顶部背景图
|
||||||
local titleBg={
|
local titleBg={
|
||||||
--金币
|
--金币
|
||||||
[1]={bg="UI_hz_yt_01", titleImg = "r_richang_banner_5_zi_zh", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)},
|
[1]={bg="UI_hz_yt_01", titleImg = "r_richang_banner_5_zi_zh",name="金币副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)},
|
||||||
--经验
|
--经验
|
||||||
[2]={bg="UI_hz_yt_02", titleImg = "r_richang_banner_4_zi_zh", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)},
|
[2]={bg="UI_hz_yt_02", titleImg = "r_richang_banner_4_zi_zh",name="经验副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)},
|
||||||
--神将
|
--神将
|
||||||
[3]={bg="r_richang_banner_3_zh", titleImg = "r_richang_banner_3_zi_zh", titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)},
|
[3]={bg="r_richang_banner_3_zh", titleImg = "r_richang_banner_3_zi_zh", name="神将副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)},
|
||||||
--法宝
|
--法宝
|
||||||
[4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)},
|
[4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh",name="法宝副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)},
|
||||||
--魂印
|
--魂印
|
||||||
[5]={bg="r_richang_banner_1_zh", titleImg = "r_richang_banner_1_zi_zh", titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)},
|
[5]={bg="r_richang_banner_1_zh", titleImg = "r_richang_banner_1_zi_zh", name="魂印副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)},
|
||||||
}
|
}
|
||||||
--难度图片
|
--难度图片
|
||||||
local qualityBg={
|
local qualityBg={
|
||||||
|
@ -56,8 +56,8 @@ local maxFreeTime=0
|
||||||
--Tab
|
--Tab
|
||||||
local TabBox = require("Modules/Common/TabBox")
|
local TabBox = require("Modules/Common/TabBox")
|
||||||
|
|
||||||
local _TabData={ [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32",lock = "r_richang_anniu_jinbi_zh", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
|
local _TabData={ [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",lock = "UI_hz_gonghui_31", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
|
||||||
[2] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32",lock = "r_richang_anniu_jingyan_zh", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
|
[2] = { default = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",lock = "UI_hz_gonghui_32", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
|
||||||
|
|
||||||
--[3] = { default = "r_richang_anniu_lieyaoshi_01_zh", select = "r_richang_anniu_lieyaoshi_zh",lock = "r_richang_anniu_lieyaoshi_zh", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS },
|
--[3] = { default = "r_richang_anniu_lieyaoshi_01_zh", select = "r_richang_anniu_lieyaoshi_zh",lock = "r_richang_anniu_lieyaoshi_zh", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS },
|
||||||
--[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN },
|
--[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN },
|
||||||
|
@ -73,6 +73,7 @@ function DailyCarbonPanel:InitComponent()
|
||||||
this.titleBg=Util.GetGameObject(this.panel,"TitleBg"):GetComponent("Image")
|
this.titleBg=Util.GetGameObject(this.panel,"TitleBg"):GetComponent("Image")
|
||||||
this.titleImg=Util.GetGameObject(this.panel,"TitleBg/Image"):GetComponent("Image")
|
this.titleImg=Util.GetGameObject(this.panel,"TitleBg/Image"):GetComponent("Image")
|
||||||
this.titleTip=Util.GetGameObject(this.panel,"TitleBg/Text"):GetComponent("Text")
|
this.titleTip=Util.GetGameObject(this.panel,"TitleBg/Text"):GetComponent("Text")
|
||||||
|
this.titleName=Util.GetGameObject(this.panel,"TitleBg/titleName"):GetComponent("Text")
|
||||||
this.timeTip=Util.GetGameObject(this.panel,"TimeTip"):GetComponent("Text")
|
this.timeTip=Util.GetGameObject(this.panel,"TimeTip"):GetComponent("Text")
|
||||||
this.titleName=Util.GetGameObject(this.panel,"titleName"):GetComponent("Text")
|
this.titleName=Util.GetGameObject(this.panel,"titleName"):GetComponent("Text")
|
||||||
this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
|
this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
|
||||||
|
@ -180,6 +181,7 @@ function this.RefreshShow(i,isTop,isAni)
|
||||||
this.titleBg.sprite=this.spLoader:LoadSprite(titleBg[i].bg)
|
this.titleBg.sprite=this.spLoader:LoadSprite(titleBg[i].bg)
|
||||||
this.titleImg.sprite=this.spLoader:LoadSprite(titleBg[i].titleImg)
|
this.titleImg.sprite=this.spLoader:LoadSprite(titleBg[i].titleImg)
|
||||||
this.titleTip.text=titleBg[i].titleTip
|
this.titleTip.text=titleBg[i].titleTip
|
||||||
|
this.titleName.text=titleBg[i].name
|
||||||
-- this.titleTip.gameObject:GetComponent("RectTransform").localPosition = titleBg[i].pos
|
-- this.titleTip.gameObject:GetComponent("RectTransform").localPosition = titleBg[i].pos
|
||||||
this.SetTimeTip()
|
this.SetTimeTip()
|
||||||
this.SetScroll(i,isTop,isAni)
|
this.SetScroll(i,isTop,isAni)
|
||||||
|
@ -204,7 +206,7 @@ function this.SetScroll(i,isTop,isAni)
|
||||||
curMaxOpenId = #curData
|
curMaxOpenId = #curData
|
||||||
end
|
end
|
||||||
curName=qualityBg[curMaxOpenId].name
|
curName=qualityBg[curMaxOpenId].name
|
||||||
this.titleName.text=_TabData[curMaxOpenId].name
|
--this.titleName.text=_TabData[curMaxOpenId].name
|
||||||
this.timeTip.text="<color=#FEF693>当前难度:</color>"..string.format(txtColor[curMaxOpenId],curName)
|
this.timeTip.text="<color=#FEF693>当前难度:</color>"..string.format(txtColor[curMaxOpenId],curName)
|
||||||
--state 1:挑战 2:未开启 3.扫荡
|
--state 1:挑战 2:未开启 3.扫荡
|
||||||
for k,v in ipairs(curData) do
|
for k,v in ipairs(curData) do
|
||||||
|
@ -476,6 +478,7 @@ function this.TabAdapter(tab, index, status)
|
||||||
lock:SetActive(islock)
|
lock:SetActive(islock)
|
||||||
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status])
|
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status])
|
||||||
Util.GetGameObject(tab,"Text"):GetComponent("Text").text = _TabData[index].name
|
Util.GetGameObject(tab,"Text"):GetComponent("Text").text = _TabData[index].name
|
||||||
|
Util.GetGameObject(tab,"select"):SetActive(status=="select")
|
||||||
-- tabLab:GetComponent("Text").text = _TabData[index].name
|
-- tabLab:GetComponent("Text").text = _TabData[index].name
|
||||||
-- tabLab:GetComponent("Text").color = _TabFontColor[status]
|
-- tabLab:GetComponent("Text").color = _TabFontColor[status]
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue