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

dev_chengFeng
jiaoyangna 2021-06-02 15:45:06 +08:00
commit 43941d2c7b
20 changed files with 296 additions and 128 deletions

View File

@ -1 +1 @@
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}}}
{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}}}

View File

@ -26,4 +26,4 @@ Material:
m_Floats:
- _InvFade: 1
m_Colors:
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _TintColor: {r: 0.6226415, g: 0.5012328, b: 0.23202206, a: 0.5019608}

View File

@ -148,6 +148,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1399205022525211762
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8018801407814597797}
- component: {fileID: 6436426854285322771}
- component: {fileID: 8871751318743663811}
m_Layer: 5
m_Name: Image (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8018801407814597797
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1399205022525211762}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children: []
m_Father: {fileID: 6361193509961736898}
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}
m_AnchoredPosition: {x: 0, y: 57}
m_SizeDelta: {x: 512, y: 512}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6436426854285322771
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1399205022525211762}
m_CullTransparentMesh: 0
--- !u!114 &8871751318743663811
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1399205022525211762}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: e58858f1b1ab3a7458d9d47baf18a9fa, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
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: db22a7aa0cabda647bc0284b80246bb8, 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 &1606432551381439893
GameObject:
m_ObjectHideFlags: 0
@ -478,6 +552,7 @@ RectTransform:
- {fileID: 5367728379246610282}
- {fileID: 5894301615642667041}
- {fileID: 7610283183577423566}
- {fileID: 8018801407814597797}
- {fileID: 5531222548493163716}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -1061,7 +1136,7 @@ PrefabInstance:
- target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1502086535292549112, guid: 754a6e330204e9f4c9d6563fc7f21d5e,
type: 3}

View File

@ -4652,7 +4652,7 @@ ParticleSystem:
--- !u!199 &1502086534190128304
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9417,7 +9417,7 @@ ParticleSystem:
--- !u!199 &1502086534398472809
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14183,7 +14183,7 @@ ParticleSystem:
--- !u!199 &1502086534435668158
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -18948,7 +18948,7 @@ ParticleSystem:
--- !u!199 &1502086534450209971
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23713,7 +23713,7 @@ ParticleSystem:
--- !u!199 &1502086534619458174
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28478,7 +28478,7 @@ ParticleSystem:
--- !u!199 &1502086534741814842
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33244,7 +33244,7 @@ ParticleSystem:
--- !u!199 &1502086534848615861
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -38010,7 +38010,7 @@ ParticleSystem:
--- !u!199 &1502086534911569893
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42775,7 +42775,7 @@ ParticleSystem:
--- !u!199 &1502086535142922346
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47473,7 +47473,7 @@ ParticleSystem:
--- !u!199 &1502086535199694531
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -52171,7 +52171,7 @@ ParticleSystem:
--- !u!199 &1502086535281454448
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56870,7 +56870,7 @@ ParticleSystem:
--- !u!199 &1502086535292549113
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61626,7 +61626,7 @@ ParticleSystem:
--- !u!199 &1502086535324031562
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -66382,7 +66382,7 @@ ParticleSystem:
--- !u!199 &1502086535355478197
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -71147,7 +71147,7 @@ ParticleSystem:
--- !u!199 &1502086535674928818
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -75913,7 +75913,7 @@ ParticleSystem:
--- !u!199 &1502086535719110089
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -80611,7 +80611,7 @@ ParticleSystem:
--- !u!199 &1502086535748455003
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -85377,7 +85377,7 @@ ParticleSystem:
--- !u!199 &1502086535782171297
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -90143,7 +90143,7 @@ ParticleSystem:
--- !u!199 &1502086535919702147
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -94899,7 +94899,7 @@ ParticleSystem:
--- !u!199 &1502086535990888684
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -94975,7 +94975,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6941918884040322754
Transform:
m_ObjectHideFlags: 0
@ -95073,7 +95073,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.99
minScalar: 1.5
maxCurve:
serializedVersion: 2
@ -96311,7 +96311,7 @@ ParticleSystem:
m_RotationOrder: 4
separateAxes: 0
ColorModule:
enabled: 1
enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@ -99655,7 +99655,7 @@ ParticleSystem:
--- !u!199 &1088076127499487974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -34,8 +34,8 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
@ -51,7 +51,7 @@ TextureImporter:
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@ -91,6 +91,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -60,7 +60,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953}
m_Children: []
m_Children:
- {fileID: 7868520532870301331}
m_Father: {fileID: 7615970307446995481}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -143,7 +144,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7586917845628614106
RectTransform:
m_ObjectHideFlags: 0
@ -151,16 +152,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3621620809879865289}
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_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762}
m_Children: []
m_Father: {fileID: 7615970307446995481}
m_RootOrder: 2
m_Father: {fileID: 5993955088853526996}
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: 5, y: -32.5}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -55, y: 0}
m_SizeDelta: {x: 59, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9115302304514649136
@ -332,7 +333,6 @@ RectTransform:
m_Children:
- {fileID: 8542266226903761540}
- {fileID: 5993955088853526996}
- {fileID: 7586917845628614106}
m_Father: {fileID: 6947002124225122056}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -452,6 +452,101 @@ RectTransform:
m_AnchoredPosition: {x: 283, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8136241361327276901
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7868520532870301331}
- component: {fileID: 8659842356983684918}
- component: {fileID: 1432783152129603294}
- component: {fileID: 1289954329682749125}
m_Layer: 0
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7868520532870301331
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8136241361327276901}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762}
m_Children: []
m_Father: {fileID: 8542266226903761540}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -55, y: 0}
m_SizeDelta: {x: 59, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8659842356983684918
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8136241361327276901}
m_CullTransparentMesh: 0
--- !u!114 &1432783152129603294
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8136241361327276901}
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: b47ba13ec7c5df340aa580bb5505abac, 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!114 &1289954329682749125
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8136241361327276901}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &9071092462066928365
GameObject:
m_ObjectHideFlags: 0
@ -470,7 +565,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5993955088853526996
RectTransform:
m_ObjectHideFlags: 0
@ -481,14 +576,15 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953}
m_Children: []
m_Children:
- {fileID: 7586917845628614106}
m_Father: {fileID: 7615970307446995481}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 630, y: -35}
m_SizeDelta: {x: 420, y: 66}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 630, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3764668692912066610
CanvasRenderer:

View File

@ -6152,7 +6152,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 393, y: -33}
m_AnchoredPosition: {x: 440, y: -33}
m_SizeDelta: {x: 137.2, y: 52.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8833716866223761799

View File

@ -13,6 +13,7 @@ ServerConfigManager.SettingConfig = {
NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号
PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号
SPRITE_LOADER = "SPRITE_LOADER", -- 资源加载器是否可以使用
IS_TITLE_EFFECT_SCALE = "IS_TITLE_EFFECT_SCALE", -- 判断
}

View File

@ -167,6 +167,7 @@ BattleEventName = {
RoleBeExile = indexAdd(),--角色被放逐
RoleExileEnd = indexAdd(),--角色放逐结束
RoleAddBuffFail = indexAdd(),--角色添加buff失败
RecordRageChange = indexAdd(), -- 怒气改变时
}
BattleMaxFrame = 1000000

View File

@ -16,6 +16,8 @@ local _TabData = {
}
-- 当前所在的聊天通道
this._CurChannel = 1
-- 称号
local titleList={}
--初始化组件(用于子类重写)
function ChatPanel:InitComponent()
@ -91,6 +93,14 @@ end
function ChatPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Chat.OnChatDataChanged, this.OnChatDataChanged)
end
function ChatPanel:OnSortingOrderChange()
if titleList then
for node, playerTitle in pairs(titleList) do
playerTitle:SetLayer(this.sortingOrder)
end
end
end
--界面打开时调用(用于子类重写)
function ChatPanel:OnOpen(...)
-- 参数保存
@ -142,6 +152,14 @@ function ChatPanel:OnDestroy()
ClearRedPointObject(v.rpType)
end
end
if titleList then
for node, playerTitle in pairs(titleList) do
SubUIManager.Close(playerTitle)
end
end
titleList = {}
end
-- tab节点自定义设置
@ -312,8 +330,6 @@ function this.GetScrollView(index)
end
end
local titleList={}
local titleStrList={}
-- 好友节点数据匹配
function this.FriendItemAdapter(node, data)
-- 获取节点
@ -333,30 +349,14 @@ function this.FriendItemAdapter(node, data)
head.sprite = GetPlayerHeadSprite(this.spLoader, fdata.head)
frame.sprite = GetPlayerHeadFrameSprite(this.spLoader, fdata.frame)
redpot:SetActive(FriendChatManager.IsFriendNewChat(data.friendId))
if titleList[node] then
poolManager:UnLoadAsset(titleStrList[node],titleList[node], PoolManager.AssetType.GameObject)
titleStrList[node] = nil
titleList[node] = nil
end
local title=fdata.userTitle
if title and title>0 then
local title = fdata.userTitle
if title and title > 0 then
titlePar:SetActive(true)
local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title)
local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName)
local titleLiveStr = curArtResourcesConfig.Name
local titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject)
titleLive.transform:SetParent(titlePar.transform)
titleLive.transform.localPosition = Vector3.New(0,0,0)
titleLive.transform.localScale = Vector3.New(0.4,0.4,0.4)
local sortingorder=0
if this.sortingOrder then
Util.SetParticleSortLayer(titleLive,this.sortingOrder)
-- sortingorder = this.sortingOrder
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
end
titleStrList[node]=titleLiveStr
titleList[node]=titleLive
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else
titlePar:SetActive(false)
end
@ -442,13 +442,6 @@ function this.ChatItemAdapter(node, data, isShowTime)
timeLab.text = TimeStampToDateStr(tonumber(data.times)/1000)
end
if titleList[node] then
poolManager:UnLoadAsset(titleStrList[node],titleList[node], PoolManager.AssetType.GameObject)
titleStrList[node] = nil
titleList[node] = nil
end
local contentStr = ""
if this._CurChannel == CHAT_CHANNEL.GLOBAL then
local chat = ChatManager.AnalysisGlobalChat(data.msg)
@ -531,20 +524,10 @@ function this.ChatItemAdapter(node, data, isShowTime)
end
if title and title>0 then
titlePar:SetActive(true)
local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,title)
local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName)
local titleLiveStr = curArtResourcesConfig.Name
local titleLive = poolManager:LoadAsset(titleLiveStr, PoolManager.AssetType.GameObject)
titleLive.transform:SetParent(titlePar.transform)
titleLive.transform.localPosition = Vector3.New(0,0,0)
titleLive.transform.localScale = Vector3.New(0.4,0.4,0.4)
local sortingorder=0
if this.sortingOrder then
Util.SetParticleSortLayer(titleLive,this.sortingOrder)
-- sortingorder = this.sortingOrder
if not titleList[node] then
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
end
titleStrList[node]=titleLiveStr
titleList[node]=titleLive
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
else
titlePar:SetActive(false)
end

View File

@ -177,7 +177,19 @@ function TimeLimitUpHero:RefreshHeroData()
end
lastLiveName=GetResourcePath(curConfig.Live)
heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar)
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
local totalTimes = 0
for i = 1, #wishConfig.UpList do
if wishConfig.UpList[i][1]==curHeroId then
totalTimes=wishConfig.UpList[i][4]
end
end
reMaintimes = totalTimes - reMaintimes
if reMaintimes <= 0 then
reMaintimes = 1
end
self.callTimeTxt.text=reMaintimes
end
local freeTime = 0
@ -252,19 +264,6 @@ function TimeLimitUpHero:RefreshGetHeroTimes()
end
Util.AddOnceClick(m.btn,sureFunc)
end
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
local totalTimes = 0
for i = 1, #wishConfig.UpList do
if wishConfig.UpList[i][1]==curHeroId then
totalTimes=wishConfig.UpList[i][4]
end
end
reMaintimes = totalTimes - reMaintimes
if reMaintimes == 0 then
reMaintimes = totalTimes
end
self.callTimeTxt.text=reMaintimes
end
function TimeLimitUpHero:Recruit(actId,type,itemId)

View File

@ -123,7 +123,7 @@ function this:ShowUpItem(config,actId)
end
end
hero:OnOpen(false,{config.Id,1},1.1,true)
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (num/100000)*100) .."%</color>"
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", 5 ).."%</color>"
hero.gameObject:SetActive(true)
for k,v in ipairs(this.ratePreList) do
@ -134,11 +134,11 @@ function this:ShowUpItem(config,actId)
-- return a.GetRate>b.GetRate
-- end)
local rateList={}
local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1}
local hero={tag="5星神将UP",name=config.ReadingName,value=0.05,Color=1}
for key, value in ConfigPairs(pool) do
local id=value.ItemId[1]
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0,sort=value.Sort}
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.FakeRate,Color=0,sort=value.Sort}
table.insert(rateList,data)
end
table.sort(rateList,function(a,b)
@ -165,7 +165,7 @@ function this:ShowUpItem(config,actId)
this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1)
end
this.ratePreList[n].name.text=m.name
this.ratePreList[n].rate.text=string.format((m.value/100000)*100).."%"
this.ratePreList[n].rate.text=(m.value*100).."%"
end
end

View File

@ -100,7 +100,7 @@ function HongMengEnvoyPanel:BindEvent()
self.UnShowText:SetActive(true)
self.UpBtnRedPoint:SetActive(false)
end
self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
self.GradeText.text = "鸿蒙碑等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
for i = 1, #self.EnvoyItemList do
self.EnvoyItemList[i]:UpdateFun()
end
@ -256,7 +256,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
local sum = HarmonyManager:HongMengTowerUpLimit()
self.GradeText.text = Language[12202]..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
self.GradeText.text = "鸿蒙碑等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
self:IsUpBtnGray()
self:InitTextMum()
self:CheckEvoyEquip()

View File

@ -334,8 +334,8 @@ function this:BindEvent()
-- LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel))
local _lv = NPCList[i].lv or NPCList[i].level or NPCList[i].userLevel
if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then
view.ImprintImg:SetActive(true)
PracticeManager.SetPracticeIcon(view.ImprintImg,NPCList[i].practiceLevel)
view.ImprintImg2:SetActive(true)
PracticeManager.SetPracticeIcon(view.ImprintImg2,NPCList[i].practiceLevel)
end
view:SetAutoMove()
view.leader.transform.name = "MainPlayerView"..i
@ -691,7 +691,7 @@ function this:OnSortingOrderChange()
Util.GetGameObject(self.sceneTran.gameObject, "layer7"):GetComponent("Canvas").sortingOrder = self.sortingOrder - 3
this.npcRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 2
this.decorateRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder - 1
Util.AddParticleSortLayer(this.btnClickMove, self.sortingOrder - orginLayer)
-- Util.AddParticleSortLayer(this.btnClickMove, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.sceneTran.gameObject, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(this.mountainTran.gameObject, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(Util.GetGameObject(this.decorateRoot, "effect"), self.sortingOrder - orginLayer)
@ -728,7 +728,7 @@ end
function this.CheckSixStarGoShow()
local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0)
if time and time~=0 and time~=666 and GetTimeStamp()-time< 259200 then
this.btnSixStarGo:SetActive(true)
this.btnSixStarGo:SetActive(true)
else
this.btnSixStarGo:SetActive(false)
end

View File

@ -17,8 +17,11 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
instance.leader.transform:SetParent(root.transform)
instance.leader.transform.localPosition = Vector3.zero
instance.leader.transform.localScale = Vector3.one
instance.ImprintImg = Util.GetGameObject(instance.leader, "name/Icon")--:GetComponent("Image")--修行标识
instance.ImprintImg:SetActive(false)
instance.ImprintImg1 = Util.GetGameObject(instance.leader, "name/text/Icon")--修行标识
instance.ImprintImg2 = Util.GetGameObject(instance.leader, "name/text2/Icon")--修行标识
instance.ImprintImg1:SetActive(false)
instance.ImprintImg2:SetActive(false)
local _sex, npc, scale
if isSelf then
@ -35,19 +38,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
end
--如果修行开启设置修行标识
if ActTimeCtrlManager.SingleFuncState(108) then
instance.ImprintImg:SetActive(true)
PracticeManager.SetPracticeIcon(instance.ImprintImg,PracticeManager.PracticeLevel)
instance.ImprintImg1:SetActive(true)
PracticeManager.SetPracticeIcon(instance.ImprintImg1,PracticeManager.PracticeLevel)
end
else
instance.NameText = Util.GetGameObject(instance.leader, "name/text2"):GetComponent("Text")
Util.GetGameObject(instance.leader, "name/text"):SetActive(false)
Util.GetGameObject(instance.leader, "name/text2"):SetActive(true)
_sex = _NpvData.sex
-- --如果修行开启设置修行标识
-- if _NpvData.lv and _NpvData.lv >= GlobalSysConfig[108].OpenRules[2] then
-- instance.ImprintImg:SetActive(true)
-- PracticeManager.SetPracticeIcon(instance.ImprintImg,_NpvData.practiceLevel)
-- end
if _sex == 0 then zuoqi = 80008 end
local PlayerLiveViewData = {
skin = _NpvData.userSkin,
@ -63,7 +61,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder)
end
-- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil)
instance.NpcGO:SetNameHeight(1.5)
instance.NpcGO:SetNameHeight(3)
instance.NpcGO:OnOpen()
instance.NameText.text = PlayerManager.nickName
instance.rect = rect

View File

@ -397,6 +397,7 @@ end
function this.ShowTipsOnUpgrade()
local prosData = XiuXianConfig[this.PracticeLevel].TotalPros
if prosData then
PopupTipPanel.ShowTip("突破成功!")
AttriTips.ShowAttriTip(prosData)
end
end

View File

@ -132,7 +132,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId)
self.parent:RefreshData(nil,false,false)
CheckRedPointStatus(RedPointType.DailyGift)
CheckRedPointStatus(RedPointType.GrowthPackage)
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1112 )then
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1108 )then
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
end
end)

View File

@ -222,7 +222,7 @@ function this.SingleRideClickShowInfo(data,go)
PopupTipPanel.ShowTip(Language[12317])
end)
elseif isGet and isUser then
NetManager.RequestChangeModifyDecoration(2,curPlayerHeadIconConfig.Id,function()
NetManager.RequestChangeModifyDecoration(2,0,function()
PlayerManager.SetPlayerDesignation(0)
this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true)

View File

@ -159,7 +159,7 @@ function PlayerLiveView:OnShowLive()
local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,self.PlayerLiveViewData.designation)
local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName)
local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale)
local y=curArtResourcesConfig.Position[2]+self.nameHeight
local y=curArtResourcesConfig.Position[2]+curPlayerRole.Height
if isRide then
y=y+3
end

View File

@ -1,6 +1,7 @@
PlayerTitle = {}
local this=PlayerTitle
local mapNpcOp = "PlayerTitle"
local isScaleActive = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_TITLE_EFFECT_SCALE)
function PlayerTitle:New(gameObject)
local b = {}
@ -74,8 +75,10 @@ function PlayerTitle:SetScale(scale)
end
function PlayerTitle:SetEffectScale(effectScale)
if self.titleLive then
Util.SetParticleScale(self.titleLive, effectScale)
if isScaleActive then
if self.titleLive then
Util.SetParticleScale(self.titleLive, effectScale)
end
end
end