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

TCX_LongZhu
DESKTOP-RH64908\Administrator 2024-12-24 18:50:25 +08:00
commit e54cb08cb0
7 changed files with 161 additions and 190 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ecbbf7b6e365f4a42a4d1daafb0bc020
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 KiB

View File

@ -1,121 +0,0 @@
fileFormatVersion: 2
guid: a5af14478e9a8244db616f021d4dad1e
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- 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: 8d1669d62cfcdb9428dcab06270cdfaf
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/artfont/s_shouchong_slogan_zh
assetBundleVariant: unity3d

View File

@ -1186257,7 +1186257,8 @@ GameObject:
m_Component:
- component: {fileID: 6878692377187784316}
- component: {fileID: 6878692377187784288}
- component: {fileID: 6878692377187784319}
- component: {fileID: 9015685326215912308}
- component: {fileID: 28735329939885739}
m_Layer: 5
m_Name: okButton
m_TagString: Untagged
@ -1186292,7 +1186293,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6878692377187784315}
m_CullTransparentMesh: 0
--- !u!114 &6878692377187784319
--- !u!114 &9015685326215912308
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1186301,26 +1186302,46 @@ MonoBehaviour:
m_GameObject: {fileID: 6878692377187784315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
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_Color: {r: 0.5070206, g: 1, b: 0.1745283, 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: 3a19d32f59f4c2647be996277c6a2703, 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
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u4EE5\u8FBE\u6210"
--- !u!114 &28735329939885739
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6878692377187784315}
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 &6878692377484353120
GameObject:
m_ObjectHideFlags: 0
@ -1186411,7 +1186432,8 @@ GameObject:
m_Component:
- component: {fileID: 6878692377529183652}
- component: {fileID: 6878692377529183656}
- component: {fileID: 6878692377529183655}
- component: {fileID: 5850252326680785559}
- component: {fileID: 8274844719813265609}
m_Layer: 5
m_Name: noButton
m_TagString: Untagged
@ -1186446,7 +1186468,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6878692377529183651}
m_CullTransparentMesh: 0
--- !u!114 &6878692377529183655
--- !u!114 &5850252326680785559
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1186455,26 +1186477,46 @@ MonoBehaviour:
m_GameObject: {fileID: 6878692377529183651}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
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_Color: {r: 1, g: 0.30980393, b: 0.30980393, 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: 3a19d32f59f4c2647be996277c6a2703, 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
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u672A\u8FBE\u6210"
--- !u!114 &8274844719813265609
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6878692377529183651}
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 &6911309247104639475
GameObject:
m_ObjectHideFlags: 0
@ -1656586,7 +1656628,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8411282984208600219
RectTransform:
m_ObjectHideFlags: 0
@ -2151027,22 +2151069,22 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
@ -2151182,22 +2151224,22 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
@ -2151337,22 +2151379,22 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3

View File

@ -269,7 +269,8 @@ GameObject:
m_Component:
- component: {fileID: 224585437670146656}
- component: {fileID: 222462214114844470}
- component: {fileID: 114055735655553014}
- component: {fileID: 2237230003692851733}
- component: {fileID: 7638671578155057408}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -304,7 +305,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248312265161770}
m_CullTransparentMesh: 0
--- !u!114 &114055735655553014
--- !u!114 &2237230003692851733
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -313,26 +314,46 @@ MonoBehaviour:
m_GameObject: {fileID: 1248312265161770}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.7169812, g: 0.42557186, b: 0.1792453, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &7638671578155057408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248312265161770}
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: 0
m_Color: {r: 1, g: 0.9594226, b: 0.759434, 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: 2afbd36bb3abea245896431bcb14b30c, 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
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 40
m_FontStyle: 0
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: "\u6218\u529B"
--- !u!1 &1381424163838158
GameObject:
m_ObjectHideFlags: 0

View File

@ -743,7 +743,8 @@ GameObject:
m_Component:
- component: {fileID: 4957940032035423568}
- component: {fileID: 1211845825792654022}
- component: {fileID: 1527676088696959292}
- component: {fileID: 4762273905387876240}
- component: {fileID: 5263761903225155111}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -778,7 +779,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8171599642999912432}
m_CullTransparentMesh: 0
--- !u!114 &1527676088696959292
--- !u!114 &4762273905387876240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -787,23 +788,43 @@ MonoBehaviour:
m_GameObject: {fileID: 8171599642999912432}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
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: 0
m_Color: {r: 1, g: 0.9607843, b: 0.7607843, 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: 2afbd36bb3abea245896431bcb14b30c, 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
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 70
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6218\u529B"
--- !u!114 &5263761903225155111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8171599642999912432}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.7176471, g: 0.42745098, b: 0.18039216, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1

View File

@ -78,8 +78,8 @@ function this.SingleDataShow(_go,_rewardData,_index)
end
Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text").text = index == 0 and "首通奖励" or des
Util.GetGameObject(_go, "titleImage/Text"):GetComponent("Text").text = index
Util.GetGameObject(_go, "okButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_yidacheng_zh")
Util.GetGameObject(_go, "noButton"):GetComponent("Image").sprite = this.spLoader:LoadSprite("g_ghhb_weidacheng_zh")
-- Util.GetGameObject(_go, "okButton"):GetComponent("Text").text = "以达成"
-- Util.GetGameObject(_go, "noButton"):GetComponent("Text").text = "未达成"
local noStarImage = Util.GetGameObject(_go, "noStarImage")
local getStarImage = Util.GetGameObject(_go, "getStarImage")
noStarImage:SetActive(not FightLevelManager.GetCurLevelStarState(fightLevelData.state,index) and index ~= 0)