Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
gaoxin 2021-03-07 20:48:17 +08:00
commit 96086a40a4
9 changed files with 259 additions and 26 deletions

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 500, y: 0, z: 500, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 500, y: 0, z: 500, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 500, y: 0, z: 500, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 500, y: 0, z: 500, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -129148,7 +129148,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.8, y: 0.4}
m_SizeDelta: {x: 1079, y: 64}
m_SizeDelta: {x: 1200, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7387890176811832327
CanvasRenderer:
@ -129179,7 +129179,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8a742ea63bf298b46a5bb1df9bd60da4, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4

View File

@ -772,7 +772,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: cc769968502bdcc4abbc1a7f789bfb2e, type: 3}
m_Type: 1
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -2666,6 +2666,101 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2487444294694433412
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7000921484804782991}
- component: {fileID: 8202734755982141984}
- component: {fileID: 6213920480909963914}
- component: {fileID: 8186500911572451021}
m_Layer: 5
m_Name: infoText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7000921484804782991
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2487444294694433412}
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: 4511580642298369132}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 11.699997, y: -0.00004196167}
m_SizeDelta: {x: 196.51, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8202734755982141984
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2487444294694433412}
m_CullTransparentMesh: 0
--- !u!114 &6213920480909963914
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2487444294694433412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &8186500911572451021
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2487444294694433412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.98039216, g: 0.8745098, b: 0.6039216, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.08
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
LanguageIndex: 10911
--- !u!1 &2490445876764297659
GameObject:
m_ObjectHideFlags: 0
@ -2920,6 +3015,7 @@ RectTransform:
m_Children:
- {fileID: 2634665790303701291}
- {fileID: 1077569730892415883}
- {fileID: 4511580642298369132}
m_Father: {fileID: 4467816246437038445}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4137,7 +4233,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8661499499538550451
RectTransform:
m_ObjectHideFlags: 0
@ -5399,6 +5495,97 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4984126358847073665
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4511580642298369132}
- component: {fileID: 5470269441545085002}
- component: {fileID: 6119743453592606394}
- component: {fileID: 5977270668792698981}
m_Layer: 5
m_Name: infoTextbg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4511580642298369132
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4984126358847073665}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.85067, y: 0.85067, z: 1}
m_Children:
- {fileID: 7000921484804782991}
m_Father: {fileID: 4278237480177238713}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 366.5, y: -4.5}
m_SizeDelta: {x: 203.4, y: 82.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5470269441545085002
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4984126358847073665}
m_CullTransparentMesh: 0
--- !u!114 &6119743453592606394
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4984126358847073665}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 7000921484804782991}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 4511580642298369132}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_HorizontalScrollbarSpacing: 0
m_VerticalScrollbarSpacing: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &5977270668792698981
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4984126358847073665}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4992258504120317414
GameObject:
m_ObjectHideFlags: 0
@ -6382,9 +6569,9 @@ RectTransform:
m_Father: {fileID: 8305649059906842239}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 92, y: -90.95}
m_SizeDelta: {x: 184, y: 188}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3042156634390851169
@ -7771,7 +7958,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 184, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &8720036019275723153
MonoBehaviour:
@ -9310,7 +9497,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8858661580248806551
RectTransform:
m_ObjectHideFlags: 0
@ -9325,10 +9512,10 @@ RectTransform:
m_Father: {fileID: 1077569730892415883}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 110, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110, y: -162.01001}
m_SizeDelta: {x: 200, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5533042100985267421
CanvasRenderer:
@ -9490,6 +9677,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9092643564979373074}
m_Modifications:
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_Name
value: Effect_UI_changjing_qiankuanbaoguo
objectReference: {fileID: 0}
- target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_LocalPosition.x
@ -9545,11 +9737,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_Name
value: Effect_UI_changjing_qiankuanbaoguo
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3}
--- !u!4 &582742966390753427 stripped

View File

@ -204,7 +204,8 @@ function this.SetPlayerInfo(ranks,myRankInfo)
this.monsterWave.text = Language[11685]..Language[10036]
elseif myRank > 0 then
this.monsterRank.text = Language[10103]..tostring(myRank)
this.monsterWave.text = GetLanguageStrById(Language[12182])..Language[10262] .. myWave .. Language[10266]
-- this.monsterWave.text = GetLanguageStrById(Language[12182])..Language[10262] .. myWave .. Language[10266]
this.monsterWave.text = GetLanguageStrById(Language[12182])..string.format(Language[11218],myWave)
end
end
-- 其他玩家的排行

View File

@ -55,7 +55,7 @@ function QianKunBox:InitComponent(gameObject)
self.btnTime = Util.GetGameObject(self.bottom,"countDown/di1/time"):GetComponent("Text")
self.btnTen1 = Util.GetGameObject(self.bottom,"btnTen1")
self.btnTen2 = Util.GetGameObject(self.bottom,"btnTen2")
self.btnTimes= Util.GetGameObject(self.bottom,"countDown/di2/time"):GetComponent("Text")
self.btnTimes= Util.GetGameObject(self.bottom,"countDown/infoTextbg/infoText"):GetComponent("Text")
ForceRebuildLayout(self.btnTimes.gameObject.transform.parent)
--limit
self.limit = Util.GetGameObject(gameObject,"limitdi/limit"):GetComponent("Text")
@ -278,7 +278,8 @@ function QianKunBox:refreshMagicNum()
local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool)
-- self.leftUptips1.text = d[1].Count-math.floor(actData.value/1000)
local t = d[1].Count-math.floor(actData.value/1000)
self.btnTimes.text = tostring(d[2].Count-actData.value%1000)..Language[12185]
-- self.btnTimes.text = tostring(d[2].Count-actData.value%1000)..Language[12185]
self.btnTimes.text = string.format(GetLanguageStrById("%d次内必得金色及以上魂印"),d[2].Count-actData.value%1000)
self.midDowntips1.text = Language[10495]..t..Language[10496]
end

View File

@ -467,7 +467,7 @@ function this:ShopItemAdapter(shopItem, itemData)
-- -- 限购
limitBg:SetActive(maxLimitCount ~= -1)
limitTip.text =Language[12037].." "..maxLimitCount.." "..Language[10048]
limitTip.text =Language[12037].." "..maxLimitCount
SetTextVerTial(limitTip,Vector3.New(12.65,-4.2,0),"MiddleLeft")
-- 售空 限购次数为-1 表示不限购
local isEmpty = maxLimitCount ~= -1 and curBuyCount >= maxLimitCount