Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-25 11:06:29 +08:00
commit e3a45d34b5
6 changed files with 29 additions and 40 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2aab1f1ddf871d041ba512322f022c72 guid: 09a450be982595f409c7128c923b6efc
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50 compressionQuality: 50
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 0 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
@ -58,28 +58,6 @@ TextureImporter:
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
platformSettings: 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: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2 - serializedVersion: 2
buildTarget: Android buildTarget: Android
maxTextureSize: 2048 maxTextureSize: 2048
@ -102,13 +80,24 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 88e2e4fb0350fa44b996aba0fcdeb158 spriteID: 1a89c4918d3730f4eb6bc0e7705619d5
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
@ -117,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: lz4/bg/r_fxgz_bg assetBundleName:
assetBundleVariant: unity3d assetBundleVariant:

View File

@ -6028,7 +6028,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -509.9, y: 316.8} m_AnchoredPosition: {x: -509.9, y: 359}
m_SizeDelta: {x: 977.6, y: 100} m_SizeDelta: {x: 977.6, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1596169475 --- !u!1 &1596169475
@ -52490,9 +52490,9 @@ RectTransform:
m_Father: {fileID: 6976277603980592380} m_Father: {fileID: 6976277603980592380}
m_RootOrder: 9 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -7, y: -563} m_AnchoredPosition: {x: 424, y: 363}
m_SizeDelta: {x: 68, y: 16} m_SizeDelta: {x: 68, y: 16}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8353568290887318895 --- !u!222 &8353568290887318895
@ -70821,7 +70821,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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: -29.59, y: -80.3} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 106.99, y: 93.6} m_SizeDelta: {x: 106.99, y: 93.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2371187725804371199 --- !u!222 &2371187725804371199
@ -129685,7 +129685,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
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.090013504, y: -8.409996} m_AnchoredPosition: {x: 0.09001541, y: -8.409996}
m_SizeDelta: {x: 68, y: 68} m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3714496386058682428 --- !u!222 &3714496386058682428
@ -130246,11 +130246,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 5391497229806396012} m_TransformParent: {fileID: 5391497229806396012}
m_Modifications: m_Modifications:
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -130356,6 +130351,11 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive

View File

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

View File

@ -46,7 +46,7 @@ function this:OnShow(_parent,...)
parent=_parent parent=_parent
sortingOrder =_parent.sortingOrder sortingOrder =_parent.sortingOrder
local args = {...} local args = {...}
_CostItem=lotterySetting[RecruitType.RecruitBox]._CostItem[1][2] _CostItem=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
local con = string.split(specialConfig[49].Value, "#") local con = string.split(specialConfig[49].Value, "#")
_Con_Recharge = tonumber(con[1]) _Con_Recharge = tonumber(con[1])