root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

xiyou_sanguo
zhangjiannan 2025-12-24 12:20:49 +08:00
parent 52c099c53d
commit d7d530f954
6 changed files with 7077 additions and 6489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat
View File

@ -68,7 +68,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _R: 0.201898
- _R: 0.100000024
- _ScaleX: 0.46126762
- _ScaleY: 1
- _SmoothnessTextureChannel: 0
@ -77,7 +77,7 @@ Material:
- _Trans: 10
- _UVSec: 0
- _X: 0.5
- _Y: 0.51081365
- _Y: 0.5
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}

486
Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab
View File

@ -1603,6 +1603,204 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3191556078033662117
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7718973845283805319}
- component: {fileID: 5144562210799030787}
- component: {fileID: 5364831059085489285}
m_Layer: 5
m_Name: ImgBg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7718973845283805319
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3191556078033662117}
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: 8873750586204373146}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 653, y: 458}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5144562210799030787
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3191556078033662117}
m_CullTransparentMesh: 0
--- !u!114 &5364831059085489285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3191556078033662117}
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: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9a5e8ff192a2c6142aa5690faae7cdb9, 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 &3370277777510456077
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8873750586204373146}
- component: {fileID: 2263192090409662180}
- component: {fileID: 5408749415763870084}
- component: {fileID: 668920627164142687}
- component: {fileID: 2004935081022877194}
m_Layer: 5
m_Name: other_3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8873750586204373146
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3370277777510456077}
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:
- {fileID: 7718973845283805319}
- {fileID: 7980791336877672430}
m_Father: {fileID: 2111641511848696073}
m_RootOrder: 15
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: 296, y: 773}
m_SizeDelta: {x: 653, y: 458}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2263192090409662180
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3370277777510456077}
m_CullTransparentMesh: 0
--- !u!114 &5408749415763870084
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3370277777510456077}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2004935081022877194}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!95 &668920627164142687
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3370277777510456077}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &2004935081022877194
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3370277777510456077}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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: []
--- !u!1 &3405237349591711058
GameObject:
m_ObjectHideFlags: 0
@ -1648,6 +1846,7 @@ RectTransform:
- {fileID: 758519615073335968}
- {fileID: 6724564084982409929}
- {fileID: 7865517985651843510}
- {fileID: 8873750586204373146}
m_Father: {fileID: 6278899851612589502}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5236,6 +5435,43 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8831131948346666479
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7980791336877672430}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7980791336877672430
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8831131948346666479}
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:
- {fileID: 8960664656381190691}
- {fileID: 4049969491646417488}
m_Father: {fileID: 8873750586204373146}
m_RootOrder: 1
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: -57.000004, y: 52}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8896427205265497543
GameObject:
m_ObjectHideFlags: 0
@ -7471,6 +7707,131 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 4926306831710627081}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5445206335046473874
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7980791336877672430}
m_Modifications:
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8333105736802882243, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
propertyPath: m_Name
value: Fx_XuanYuanBaoJing_S
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1fca89f74bcb1b149af3dd6ba980ba97, type: 3}
--- !u!224 &4049969491646417488 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8333105736802882242, guid: 1fca89f74bcb1b149af3dd6ba980ba97,
type: 3}
m_PrefabInstance: {fileID: 5445206335046473874}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6644914602569324996
PrefabInstance:
m_ObjectHideFlags: 0
@ -8221,6 +8582,131 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 8550799179779472925}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8656190619233581380
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7980791336877672430}
m_Modifications:
- target: {fileID: 322669859001588576, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_Name
value: Fx_XuanYuanBaoJing
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cf6543005c821df4ea3cecfe7c2aacf3, type: 3}
--- !u!224 &8960664656381190691 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 322669859001588583, guid: cf6543005c821df4ea3cecfe7c2aacf3,
type: 3}
m_PrefabInstance: {fileID: 8656190619233581380}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8744449918922119930
PrefabInstance:
m_ObjectHideFlags: 0

13045
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

File diff suppressed because it is too large Load Diff

10
Assets/ManagedResources/~Lua/Modules/BecomeAGod/BecomeAGodManager.lua
View File

@ -213,14 +213,13 @@ end
--计算 属性加成
function this.CalculateBecomAGodProAddVal()
local addAllProVal = {}
local level = 1
for _type = 1, 6 do
local becomAGodSettingData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.BecomeAGodSetting, "Type",
_type)
for k = 1, #becomAGodSettingData.PropertyGit do
local configData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.BecomeAGodPropertyGit, "Type",
becomAGodSettingData.PropertyGit[k], "Level",
level)
this.playerMeridiansLevel[_type])
for i = 1, #configData.Property do
local propArr = configData.Property[i]
if addAllProVal[propArr[1]] then
@ -235,7 +234,6 @@ function this.CalculateBecomAGodProAddVal()
end
function this.GetBecomeAGodProAddRate(_type)
local level = 1
local addRate = 0
for _type = 1, 6 do
local becomAGodSettingData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.BecomeAGodSetting, "Type",
@ -243,7 +241,7 @@ function this.GetBecomeAGodProAddRate(_type)
for k = 1, #becomAGodSettingData.PropertyGit do
local configData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.BecomeAGodPropertyGit, "Type",
becomAGodSettingData.PropertyGit[k], "Level",
level)
this.playerMeridiansLevel[_type])
for i = 1, #configData.SystemProperty do
if configData.SystemProperty[1] == _type then
addRate = addRate + configData.SystemProperty[2]
@ -251,6 +249,10 @@ function this.GetBecomeAGodProAddRate(_type)
end
end
end
if this.playerGodLevel > 0 then
local jinjieData = ConfigManager.TryGetConfigData(ConfigName.BecomeAGodLevel, this.playerGodLevel)
addRate = addRate + jinjieData.Property[2]
end
return addRate
end

19
Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
View File

@ -86,7 +86,7 @@ local carbonData = {
-- effect2 = "Fx_SenLuoHuanJjing_S",
-- },
[FUNCTION_OPEN_TYPE.LINGMAIMIJING] = {
id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境
id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境
objName = "lingmai",
nameImg = "f_fuben_fubenming_09",
btnPos = Vector2(-17, 28),
@ -103,6 +103,15 @@ local carbonData = {
effect1 = "Fx_XuanYuanBaoJing",
effect2 = "Fx_XuanYuanBaoJing_S",
},
[FUNCTION_OPEN_TYPE.GodsWayTower_3] = {
id = FUNCTION_OPEN_TYPE.GodsWayTower_3, --多队塔
objName = "other_3",
nameImg = "f_fuben_fubenming_08",
btnPos = Vector2(8, 0),
redPointType = RedPointType.godsWayTower,
effect1 = "Fx_XuanYuanBaoJing",
effect2 = "Fx_XuanYuanBaoJing_S",
},
[FUNCTION_OPEN_TYPE.Number_Game] = {
id = FUNCTION_OPEN_TYPE.Number_Game, --数字游戏
objName = "trial",
@ -462,6 +471,14 @@ function CarbonsPanel:BtnClick(id)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
end
elseif id == FUNCTION_OPEN_TYPE.GodsWayTower_3 then
if CheckFunctionOpen(FUNCTION_OPEN_TYPE.GodsWayTower_3) then
NetManager.RequestDuoduiInfoRequest(function()
UIManager.OpenPanel(UIName.GodsWayTowerPanel, 2)
end)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id))
end
elseif id == FUNCTION_OPEN_TYPE.QIJIESHILIAN then --七界试炼
if ActTimeCtrlManager.SingleFuncState(id) then
local tipStr = ""

2
Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua
View File

@ -8,6 +8,7 @@ end
function this.Init(msg)
local infos = msg.info
LogError("================多队塔试炼："..#infos)
for i = 1, #infos do
local config = ConfigManager.GetConfigData(ConfigName.DuoDuiTowerConfig, infos[i].type)
local needFloor
@ -166,6 +167,7 @@ function this.GetTimeTip(_type)
--local config=ConfigManager.GetConfigData(ConfigName.DuoDuiTowerConfig,type)
local buyTime = 0
local freeTime = 0
LogError("bbbbbbbbbbbbbbb".._type)
if towerInfos[_type] then
buyTime = PrivilegeManager.GetPrivilegeRemainValue(towerInfos[_type].buyId)
freeTime = PrivilegeManager.GetPrivilegeRemainValue(towerInfos[_type].freeId)