核心标记

onepiece_demo_arena
xiejun 2024-01-05 18:14:42 +08:00
parent 027eb9d1c5
commit 9f8a65e453
7 changed files with 236 additions and 46 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 31967916d1d7c6f47b79baaabd654e04
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a5a91b610e6ef644782dd634a93232bd
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -30,7 +30,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 17
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -95,7 +95,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1298132580563460616
RectTransform:
m_ObjectHideFlags: 0
@ -110,7 +110,7 @@ RectTransform:
- {fileID: 326373475629622326}
- {fileID: 4014327040002272395}
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -141,6 +141,80 @@ MonoBehaviour:
m_Spacing: {x: -12.04, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &2623199879758124776
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8422961301032672449}
- component: {fileID: 3405272048609084468}
- component: {fileID: 3651996204105101746}
m_Layer: 5
m_Name: core
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8422961301032672449
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623199879758124776}
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: 3396417040355110936}
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}
m_AnchoredPosition: {x: 74.8, y: 196.2}
m_SizeDelta: {x: 30, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3405272048609084468
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623199879758124776}
m_CullTransparentMesh: 0
--- !u!114 &3651996204105101746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2623199879758124776}
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: 31967916d1d7c6f47b79baaabd654e04, 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 &2787689028138261110
GameObject:
m_ObjectHideFlags: 0
@ -469,6 +543,7 @@ RectTransform:
m_Children:
- {fileID: 3461655562413708068}
- {fileID: 3395912715129006028}
- {fileID: 8422961301032672449}
- {fileID: 3461041183831773760}
- {fileID: 3461416457997464738}
- {fileID: 3880253530736025899}
@ -602,7 +677,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -675,7 +750,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -723,7 +798,7 @@ RectTransform:
m_Children:
- {fileID: 3395823834833100134}
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 2
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}
@ -927,7 +1002,7 @@ RectTransform:
m_Children:
- {fileID: 3395968103936434378}
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 3
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}
@ -1001,7 +1076,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.51}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1150,7 +1225,7 @@ RectTransform:
m_Children:
- {fileID: 3461094561493497734}
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1224,7 +1299,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1393,7 +1468,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1503,7 +1578,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1618,7 +1693,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 4
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}
@ -1766,7 +1841,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3396417040355110936}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1865,7 +1940,7 @@ PrefabInstance:
- target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
propertyPath: m_RootOrder
value: 16
value: 17
objectReference: {fileID: 0}
- target: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
@ -2114,9 +2189,9 @@ PrefabInstance:
objectReference: {fileID: 1271572592464149432}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3}
--- !u!4 &1271572592464149428 stripped
--- !u!4 &1271572592464149430 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218,
m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
@ -2126,6 +2201,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1271572592464149424 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1271572592464149422 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218,
@ -2204,15 +2285,15 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1165092670169827409 stripped
--- !u!4 &1271572592464149428 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218,
m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1271572592464149424 stripped
--- !u!4 &1165092670169827407 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218,
m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
@ -2228,12 +2309,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1165092670169827401 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1165092670169827399 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218,
@ -2264,6 +2339,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1165092670169827401 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!224 &7128533549541609610 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7128533550213603187, guid: 4c8639a41d5af934d933d50f22d40218,
@ -2276,15 +2357,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1271572592464149430 stripped
--- !u!4 &1165092670169827409 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1271572593135907919, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1165092670169827407 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218,
m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218,
type: 3}
m_PrefabInstance: {fileID: 1745768441}
m_PrefabAsset: {fileID: 0}
@ -2343,7 +2418,7 @@ PrefabInstance:
- target: {fileID: 623698330797109407, guid: 712846a3c1022a748be7ddd8db4690fc,
type: 3}
propertyPath: m_RootOrder
value: 15
value: 16
objectReference: {fileID: 0}
- target: {fileID: 623698330797109407, guid: 712846a3c1022a748be7ddd8db4690fc,
type: 3}
@ -2423,7 +2498,7 @@ PrefabInstance:
- target: {fileID: 7306042643356303935, guid: 49af885bbd9477844bc856422752773b,
type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7306042643356303935, guid: 49af885bbd9477844bc856422752773b,
type: 3}

View File

@ -722,6 +722,7 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
--SetHEeroLiveToward(Util.GetGameObject(_go.transform, "card/icon"),heroData.Toward)
Util.GetGameObject(_go.transform, "card/pro/Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
Util.GetGameObject(_go.transform, "card/heroStage"):SetActive(false)
Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.Main==1)
local starGrid = Util.GetGameObject(_go.transform, "star")
local aaa=star
if aaa==11 then
@ -736,10 +737,13 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...)
if PlayerManager.GetHeroDataByStar(0,heroData.Id) then
Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), false)
Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), false)
Util.SetGray(Util.GetGameObject(_go.transform, "card/core"), false)
Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = nil
else
Util.SetGray(Util.GetGameObject(_go.transform, "card/icon"), true)
Util.SetGray(Util.GetGameObject(_go.transform, "card/pro/Image"), true)
Util.SetGray(Util.GetGameObject(_go.transform, "card/core"), true)
-- Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.heroConfig.Main==1)
Util.GetGameObject(_go.transform, "card"):GetComponent("Image").material = Util.GetGameObject(_go.transform, "card/icon"):GetComponent("Image").material
end
end

View File

@ -13,13 +13,13 @@ ANIMATION = {
MapFloatingConfig = {
[0] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, -10, 0)},
position = Vector3.New(0, -40, 0)},
[1] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, -10, 0)},
position = Vector3.New(0, -40, 0)},
[2] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, 40, 0)},
position = Vector3.New(0, -40, 0)},
[3] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, 32, 0)},
@ -28,10 +28,10 @@ MapFloatingConfig = {
position = Vector3.New(-130, -5,0)},
[5] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, -10, 0)},
position = Vector3.New(0,-40, 0)},
[6] = {name = "live2d_npc_mao_difang",
scale = Vector3.New(0.2, 0.2, 0.2),
position = Vector3.zero},
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, -40, 0)},
[7] = {name = "live2d_npc_mao_difang",--福星高照NPC
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, -40, 0)},
@ -65,7 +65,7 @@ MapFloatingConfig = {
position = Vector3.New(0, 48, 0)},
[17] = {name = "live2d_npc_mao_difang",--数独NPC
scale = Vector3.New(0.23, 0.23, 0.23),
position = Vector3.New(0, 40, 0)},
position = Vector3.New(0, -40, 0)},
[18] = {name = "live2d_tiangongboss",--转盘NPC
scale = Vector3.New(0.1, 0.1, 0.1),
position = Vector3.New(0, 40, 0)},

View File

@ -304,6 +304,7 @@ function this.SingleHeroDataShow(_go,_heroData)
Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage])
local redPoint = Util.GetGameObject(_go.transform, "card/redAndLock/redPoint")
Util.GetGameObject(_go.transform, "card/redAndLock/lockImage"):SetActive(heroData.lockState == 1)
Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.heroConfig.Main == 1)
Util.GetGameObject(_go.transform, "card/starnum"):GetComponent("Text").text=_heroData.star.."/".._heroData.maxStar
_go.transform.localScale = Vector3.one * 0.95
local starGrid = Util.GetGameObject(_go.transform, "star")

View File

@ -523,9 +523,9 @@ function SingleFightPlayerView:SetRoleDirAction(u, v, isBack)
local dV = isBack and self.roleCurPos.v - v or v - self.roleCurPos.v
if dU > 0 then
self:SetWalkDir(WALK_DIR.RUN_RIGHT)
elseif dU < 0 then
self:SetWalkDir(WALK_DIR.RUN_LEFT)
elseif dU < 0 then
self:SetWalkDir(WALK_DIR.RUN_RIGHT)
elseif dV < 0 then
self:SetWalkDir(WALK_DIR.RUN_UP)
elseif dV > 0 then