Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

wangzhenxing 2023-11-11 16:55:20 +08:00
commit cec18f4890
3 changed files with 190 additions and 16 deletions

View File

@ -233,6 +233,80 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6311\u6218"
--- !u!1 &1143143374
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1143143375}
- component: {fileID: 1143143377}
- component: {fileID: 1143143376}
m_Layer: 0
m_Name: select
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1143143375
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143143374}
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: 5295209651415148374}
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 &1143143377
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143143374}
m_CullTransparentMesh: 0
--- !u!114 &1143143376
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143143374}
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 &1398421205
GameObject:
m_ObjectHideFlags: 0
@ -307,6 +381,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1565031751
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1565031752}
- component: {fileID: 1565031755}
- component: {fileID: 1565031754}
- component: {fileID: 1565031753}
m_Layer: 5
m_Name: TilteTxt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1565031752
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565031751}
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: 6616730211952462317}
m_RootOrder: 3
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: -187, y: 24}
m_SizeDelta: {x: 331.9, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1565031755
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565031751}
m_CullTransparentMesh: 0
--- !u!114 &1565031754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565031751}
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: 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_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 80
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 8
m_MaxSize: 80
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9632\u5FA1\u526F\u672C"
--- !u!114 &1565031753
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565031751}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.6698113, g: 0.16113384, b: 0.16113384, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &39637761430653143
GameObject:
m_ObjectHideFlags: 0
@ -765,7 +934,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2809572546770804754
RectTransform:
m_ObjectHideFlags: 0
@ -1221,8 +1390,8 @@ 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: 0, y: 0}
m_SizeDelta: {x: 184, y: 175}
m_AnchoredPosition: {x: 1, y: 0}
m_SizeDelta: {x: 179, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3834411461835380838
CanvasRenderer:
@ -1252,7 +1421,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: f2393ce2d23f490409ca62cfa0b8f917, type: 3}
m_Sprite: {fileID: 21300000, guid: a6e5c1ff36c0f484bac142a8a5122395, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2290,7 +2459,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5295209651415148374
RectTransform:
m_ObjectHideFlags: 0
@ -2307,6 +2476,7 @@ RectTransform:
- {fileID: 4370945160089384286}
- {fileID: 7150058526118945938}
- {fileID: 5572587234424195031}
- {fileID: 1143143375}
m_Father: {fileID: 426311262980600154}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2400,7 +2570,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2, y: 0}
m_SizeDelta: {x: 92, y: 52}
m_SizeDelta: {x: 44, y: 61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &344200390624727114
CanvasRenderer:
@ -2430,7 +2600,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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3}
m_Sprite: {fileID: 21300000, guid: f7519fdfca8b19b44b3252088d658dc1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2745,6 +2915,7 @@ RectTransform:
- {fileID: 2809572546770804754}
- {fileID: 1202519692196597791}
- {fileID: 1365847374173356250}
- {fileID: 1565031752}
m_Father: {fileID: 3233073780574710381}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -11,13 +11,13 @@ local orginLayer=0
local carbonIndex=0-- 1 无尽副本 2 金币副本 副本索引id
local fightIndex=1 --关卡索引
local maxForce = 0
local maxForce = 0
--顶部背景图
local titleBg={
--回合
[1]={bg="UI_hz_yt_03", titleImg = "chall_title_fangyu", 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", 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={
@ -40,8 +40,8 @@ local freeTime=0--剩余免费次数
--Tab
local TabBox = require("Modules/Common/TabBox")
local _TabData={ [1] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32",lock = "r_richang_anniu_huihe_zh", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN },
[2] = { default = "UI_hz_gonghui_31", select = "UI_hz_gonghui_32",lock = "r_richang_anniu_shanghai_zh", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
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_32", select = "UI_hz_gonghui_32",lock = "UI_hz_gonghui_32", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP },
}
function ChallengeCopyPanel:InitComponent()
@ -50,6 +50,7 @@ function ChallengeCopyPanel:InitComponent()
this.titleBg=Util.GetGameObject(this.panel,"TitleBg"):GetComponent("Image")
this.titleImg=Util.GetGameObject(this.panel,"TitleBg/Image"):GetComponent("Image")
this.titleTip=Util.GetGameObject(this.panel,"TitleBg/Text"):GetComponent("Text")
this.TilteTxt=Util.GetGameObject(this.panel,"TitleBg/TilteTxt"):GetComponent("Text")
this.timeTip=Util.GetGameObject(this.panel,"TimeTip"):GetComponent("Text")
this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
this.helpBtn= Util.GetGameObject(this.panel, "HelpBtn")
@ -156,6 +157,7 @@ function this.RefreshShow(i)
this.titleBg.sprite=this.spLoader:LoadSprite(titleBg[i].bg)
this.titleImg.sprite=this.spLoader:LoadSprite(titleBg[i].titleImg)
this.titleTip.text=titleBg[i].titleTip
this.TilteTxt.text=titleBg[i].name
this.SetTimeTip()
this.SetScroll(fightIndex)
ChallengeCopyPanel:RefreshRedPotShow()
@ -342,10 +344,11 @@ end
function this.TabAdapter(tab, index, status)
local lock = Util.GetGameObject(tab, "LockImage")
local islock = status == "lock"
Util.SetGray( Util.GetGameObject(tab,"Image").gameObject, islock)
--Util.SetGray( Util.GetGameObject(tab,"Image").gameObject, islock)
lock:SetActive(islock)
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status])
Util.GetGameObject(tab,"Text"):GetComponent("Text").text = _TabData[index][status].name
Util.GetGameObject(tab,"Text"):GetComponent("Text").text = _TabData[index].name
Util.GetGameObject(tab,"select"):SetActive(status=="select")
end
---检测tab是否锁定
function this.TabIsLockCheck(index)

View File

@ -20,11 +20,11 @@ local _ShopPage = {
},
[SHOP_PAGE.COIN] ={ -- 代币
default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33",
rpType = RedPointType.Shop_Page_Coin,name="公会商店"
rpType = RedPointType.Shop_Page_Coin,name="灵兽商店"
},
[SHOP_PAGE.PLAY] = { -- 玩法
default = "UI_hz_gonghui_34", lock = "UI_hz_gonghui_34", select = "UI_hz_gonghui_34",
rpType = RedPointType.Shop_Page_Play,name="玩法商店"
rpType = RedPointType.Shop_Page_Play,name="逐胜商店"
},
[SHOP_PAGE.EXCHANGE] = { -- 兑换
default = "UI_hz_gonghui_31", lock = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",name="兑换商店"