征服四海

onepiece_demo_arena
xiejun 2024-01-20 17:50:49 +08:00
parent 1e023b5e87
commit ad36ce6d66
7 changed files with 340578 additions and 75 deletions

View File

@ -9623,16 +9623,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 482285303}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 1647788101}
m_RootOrder: 4
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: 45.2, y: -7.300003}
m_AnchoredPosition: {x: 45.2, y: -7.3000183}
m_SizeDelta: {x: 160, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &482285306
@ -10043,16 +10043,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 864779401}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 1647788101}
m_RootOrder: 2
m_RootOrder: 4
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: 43.1, y: 43.6}
m_AnchoredPosition: {x: 92, y: 23}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &864779404
@ -19716,7 +19716,7 @@ RectTransform:
m_Children:
- {fileID: 2338537895707280654}
m_Father: {fileID: 1647788101}
m_RootOrder: 3
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}
@ -33942,9 +33942,9 @@ RectTransform:
m_Children:
- {fileID: 136393758}
- {fileID: 1629592543}
- {fileID: 864779402}
- {fileID: 1077141993}
- {fileID: 482285304}
- {fileID: 864779402}
m_Father: {fileID: 2461825146493731649}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -44426,6 +44426,101 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3660250487700725623
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4610569526662550707}
- component: {fileID: 7800989314590942507}
- component: {fileID: 2245165103585030494}
- component: {fileID: 6053387321768338148}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4610569526662550707
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3660250487700725623}
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: 5508371999346995973}
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: 0, y: -62}
m_SizeDelta: {x: 160, y: 86.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7800989314590942507
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3660250487700725623}
m_CullTransparentMesh: 0
--- !u!114 &2245165103585030494
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3660250487700725623}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 32
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6392\u884C\u699C"
--- !u!114 &6053387321768338148
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3660250487700725623}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &3705977572061868196
GameObject:
m_ObjectHideFlags: 0
@ -44952,7 +45047,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99978596, y: 0.99978596, z: 0.99978596}
m_Children: []
m_Children:
- {fileID: 4610569526662550707}
m_Father: {fileID: 2461825146493731649}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -45128,7 +45224,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: 164.4, y: -5.7}
m_AnchoredPosition: {x: 164.4, y: 0}
m_SizeDelta: {x: 149.7, y: 81.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5508371999712772546
@ -45320,7 +45416,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: 199.49, y: -380}
m_AnchoredPosition: {x: 199.49, y: -373}
m_SizeDelta: {x: 181.97, y: 92.22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5508372000111432841
@ -45363,7 +45459,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 0.9
m_LineSpacing: 0
m_Text: "\u4E09\u9014\u6D25"
--- !u!114 &6400551993738257452
MonoBehaviour:
@ -45504,7 +45600,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: -138, y: -11}
m_AnchoredPosition: {x: -138, y: 0}
m_SizeDelta: {x: 72.53, y: 70.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5508372000338963096
@ -45937,8 +46033,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: -27.2}
m_SizeDelta: {x: 1080, y: 1865.8}
m_AnchoredPosition: {x: 0, y: -52.94999}
m_SizeDelta: {x: 1080, y: 1814.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5508372001009023518
GameObject:

View File

@ -63284,7 +63284,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: 0, y: -156.1}
m_AnchoredPosition: {x: 0, y: -66}
m_SizeDelta: {x: 1078, y: 75.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6765032113628322309
@ -73411,16 +73411,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -131.5
objectReference: {fileID: 0}
- target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 162.252
objectReference: {fileID: 0}
- target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
@ -73431,32 +73421,17 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 217.458
value: 162.252
objectReference: {fileID: 0}
- target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 40.563
objectReference: {fileID: 0}
- target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 81.126
objectReference: {fileID: 0}
- target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
@ -73471,7 +73446,32 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 81.126
objectReference: {fileID: 0}
- target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 40.563
objectReference: {fileID: 0}
- target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
objectReference: {fileID: 0}
- target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 217.458
objectReference: {fileID: 0}
- target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -28.5385
@ -73836,14 +73836,14 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74211,14 +74211,14 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74586,14 +74586,14 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -74961,14 +74961,14 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -75336,14 +75336,14 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]

View File

@ -8449,7 +8449,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7230583955602208292
RectTransform:
m_ObjectHideFlags: 0

View File

@ -23,7 +23,7 @@ function FightLevelChapterPanel:InitComponent()
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
this.prb = Util.GetGameObject(self.gameObject, "middle/prb")
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "middle/rect").transform,
this.prb, nil, Vector2.New(1080, 1865.8), 1, 1, Vector2.New(0,0))
this.prb, nil, Vector2.New(1080, 1814.8), 1, 1, Vector2.New(0,0))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1

View File

@ -99,7 +99,7 @@ end
function this.showActivityBtn()
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ShanHeShiLian) then
this.activityEnterBtn.gameObject:SetActive(true)
this.activityEnterBtn.gameObject:SetActive(false)
else
this.activityEnterBtn.gameObject:SetActive(false)
end
@ -345,7 +345,7 @@ function this.SetlevelBox(_rewardBoxDatas)
for i, v in pairs(_rewardBoxDatas) do
boxList[i]:SetActive(true)
local missionConfigData = _rewardBoxDatas[i].config
boxList[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(missionConfigData.RewardIcon))
-- boxList[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(missionConfigData.RewardIcon))
Util.GetGameObject(boxList[i], "num"):GetComponent("Text").text = missionConfigData.Star
Util.GetGameObject(boxList[i], "redPoint"):SetActive( _rewardBoxDatas[i].state == 0 and chapterData.stars > _rewardBoxDatas[i].config.Star)
-- Util.GetGameObject(boxList[i], "UI_Effect_BaoXiang_KaiQi"):SetActive(v.state==SingleDailyMissionState.GetFinish)

View File

@ -143,6 +143,10 @@ function this:FormationAdapter()
-- LogYellow("MonsterGroup.Contents[1][i] "..MonsterGroup.Contents[1][i])
this.SetCardSingleData(heroListGo[pos],MonsterGroup.Contents[1][i],pos)
heroListGo[pos]:SetActive(true)
else
local pos = i
heroListGo[pos]:SetActive(true)
Util.GetGameObject( heroListGo[pos],"lv/Text"):GetComponent("Text").text=""
end
end
end
@ -179,7 +183,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
live.transform.rotation=Vector3.New(0,0,0)
local liveName = GetResourcePath(heroConfig.Live)
local liveName = GetResourcePath(heroConfig.Painting)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
local scale = roleConfig.play_liveScale
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)