好感度等级修改提交

dev_chengFeng
jiaoyangna 2021-09-26 13:55:57 +08:00
parent 14b967185b
commit e59f160387
7 changed files with 496 additions and 168 deletions

View File

@ -5522,7 +5522,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000030517578, y: 15.2}
m_SizeDelta: {x: 508, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &5086809663402702269
MonoBehaviour:
@ -5546,7 +5546,7 @@ MonoBehaviour:
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildControlHeight: 1
--- !u!114 &5086809663402702270
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5559,7 +5559,7 @@ MonoBehaviour:
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &1689833139572698375
GameObject:
@ -6052,6 +6052,7 @@ GameObject:
- component: {fileID: 2717758793960761777}
- component: {fileID: 9008547840016297840}
- component: {fileID: 7221800882815018164}
- component: {fileID: 2233768062626440142}
m_Layer: 5
m_Name: title
m_TagString: Untagged
@ -6076,7 +6077,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &9008547840016297840
CanvasRenderer:
@ -6120,6 +6121,20 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!114 &2233768062626440142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2378711152285979126}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2385795265252942905
GameObject:
m_ObjectHideFlags: 0
@ -6470,10 +6485,10 @@ MonoBehaviour:
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 5
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildControlHeight: 1
--- !u!1 &3313502045985959149
GameObject:
m_ObjectHideFlags: 0
@ -12151,6 +12166,7 @@ GameObject:
- component: {fileID: 2682774768257850983}
- component: {fileID: 2578050656831745031}
- component: {fileID: 3541980483321316574}
- component: {fileID: 7995749470275272809}
m_Layer: 5
m_Name: content
m_TagString: Untagged
@ -12175,7 +12191,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -35}
m_SizeDelta: {x: 160, y: 30}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2578050656831745031
CanvasRenderer:
@ -12219,6 +12235,20 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!114 &7995749470275272809
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4161636770910114303}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &4206296634294409560
GameObject:
m_ObjectHideFlags: 0

View File

@ -298,7 +298,7 @@ GameObject:
- component: {fileID: 7575507291051525301}
- component: {fileID: 5009944731236835870}
m_Layer: 5
m_Name: proScroll
m_Name: proScrollgrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -313,14 +313,14 @@ RectTransform:
m_GameObject: {fileID: 2296337707904648307}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5601896589029272011}
m_RootOrder: 1
m_Father: {fileID: 7647837852959861211}
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: 371.31, y: -315.7}
m_AnchoredPosition: {x: 311.33502, y: -0.000053769796}
m_SizeDelta: {x: 622.67, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &7575507291051525301
@ -341,11 +341,11 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 99.2
m_Spacing: 30
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildControlHeight: 1
--- !u!114 &5009944731236835870
MonoBehaviour:
m_ObjectHideFlags: 0
@ -574,7 +574,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9090717114976058863}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -653,7 +653,7 @@ RectTransform:
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 2641095517172412257}
- {fileID: 3818108209810798678}
- {fileID: 7647837852959861211}
m_Father: {fileID: 7723528773779627565}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -699,6 +699,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6605211455925681041
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5321483325535019191}
- component: {fileID: 7559798355403744499}
- component: {fileID: 9157763978044180188}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5321483325535019191
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6605211455925681041}
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: 9090717114976058863}
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_SizeDelta: {x: 954, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7559798355403744499
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6605211455925681041}
m_CullTransparentMesh: 0
--- !u!114 &9157763978044180188
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6605211455925681041}
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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 21e18b4111348a64684763f0a33d142c, 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 &7507699185486137369
GameObject:
m_ObjectHideFlags: 0
@ -932,6 +1006,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5321483325535019191}
- {fileID: 3317469863392146604}
- {fileID: 8375993777823693432}
m_Father: {fileID: 7723528773779627565}
@ -1083,7 +1158,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9090717114976058863}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -1132,3 +1207,115 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5168\u4F53\u751F\u547D"
--- !u!1 &9165522331602773854
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7647837852959861211}
- component: {fileID: 3558985047716541038}
- component: {fileID: 1508179970963515718}
- component: {fileID: 8333602489280244247}
- component: {fileID: 5343499758257154985}
m_Layer: 5
m_Name: proScroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7647837852959861211
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165522331602773854}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025}
m_Children:
- {fileID: 3818108209810798678}
m_Father: {fileID: 5601896589029272011}
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: 371.31, y: -315.7}
m_SizeDelta: {x: 622.7, y: 616.5}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &3558985047716541038
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165522331602773854}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 3818108209810798678}
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: 0}
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!222 &1508179970963515718
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165522331602773854}
m_CullTransparentMesh: 0
--- !u!114 &8333602489280244247
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165522331602773854}
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: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!114 &5343499758257154985
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165522331602773854}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

@ -1,5 +1,117 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &659386614502861412
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2797617377609803997}
- component: {fileID: 331622415219582505}
- component: {fileID: 6721052908764124151}
- component: {fileID: 1329862907396897293}
- component: {fileID: 4736471306360373797}
m_Layer: 5
m_Name: proScroll
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2797617377609803997
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659386614502861412}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025}
m_Children:
- {fileID: 3818108209810798678}
m_Father: {fileID: 5601896589029272011}
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: 372.86, y: -315.7}
m_SizeDelta: {x: 677.13, y: 531.3}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &331622415219582505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659386614502861412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6721052908764124151
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659386614502861412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 3818108209810798678}
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: 0}
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!222 &1329862907396897293
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659386614502861412}
m_CullTransparentMesh: 0
--- !u!114 &4736471306360373797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659386614502861412}
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: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &1988342703692745041
GameObject:
m_ObjectHideFlags: 0
@ -161,7 +273,7 @@ GameObject:
- component: {fileID: 7575507291051525301}
- component: {fileID: 5009944731236835870}
m_Layer: 5
m_Name: proScroll
m_Name: proScrollGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -176,16 +288,16 @@ RectTransform:
m_GameObject: {fileID: 2296337707904648307}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99992025, y: 0.99992025, z: 0.99992025}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5601896589029272011}
m_RootOrder: 1
m_Father: {fileID: 2797617377609803997}
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: 371.31, y: -315.7}
m_SizeDelta: {x: 622.67, y: 0}
m_Pivot: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000012407653}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7575507291051525301
MonoBehaviour:
m_ObjectHideFlags: 0
@ -204,11 +316,11 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 99.2
m_Spacing: 30
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildControlHeight: 1
--- !u!114 &5009944731236835870
MonoBehaviour:
m_ObjectHideFlags: 0
@ -221,7 +333,7 @@ MonoBehaviour:
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2389109418045921723
GameObject:
@ -377,80 +489,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2732465857881465424
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5896084319477897067}
- component: {fileID: 2666304547052984499}
- component: {fileID: 8295637500545167300}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5896084319477897067
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2732465857881465424}
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: 7723528773779627565}
m_RootOrder: 3
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: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2666304547052984499
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2732465857881465424}
m_CullTransparentMesh: 0
--- !u!114 &8295637500545167300
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2732465857881465424}
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: 0.57254905}
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: c21907837dd98b546ae0921a8bf90e7d, 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 &4011359818800892791
GameObject:
m_ObjectHideFlags: 0
@ -483,7 +521,7 @@ RectTransform:
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: -246.01, y: 217.65}
m_AnchoredPosition: {x: -246.01, y: 248.33}
m_SizeDelta: {x: 156.78, y: 151.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4653971794010380136
@ -714,7 +752,7 @@ RectTransform:
m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
m_Children:
- {fileID: 4664733373664257448}
- {fileID: 3818108209810798678}
- {fileID: 2797617377609803997}
- {fileID: 3828915907801313799}
- {fileID: 4463471678228227236}
m_Father: {fileID: 7723528773779627565}
@ -890,7 +928,6 @@ RectTransform:
- {fileID: 7723611781473440887}
- {fileID: 9090717114976058863}
- {fileID: 5601896589029272011}
- {fileID: 5896084319477897067}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1098,7 +1135,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: -4706, y: -476}
m_AnchoredPosition: {x: -4138, y: -520}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7433707905162828150
@ -1302,6 +1339,7 @@ GameObject:
- component: {fileID: 8375993777823693432}
- component: {fileID: 5747301298875000768}
- component: {fileID: 2936331656785944192}
- component: {fileID: 8841633203694036813}
m_Layer: 5
m_Name: content
m_TagString: Untagged
@ -1326,7 +1364,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -48.35}
m_SizeDelta: {x: 160, y: 35}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5747301298875000768
CanvasRenderer:
@ -1370,3 +1408,17 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5168\u4F53\u751F\u547D"
--- !u!114 &8841633203694036813
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8883238478301340286}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2

View File

@ -20,7 +20,8 @@ function this.InitializeTableData()
data.Id = v.Id
data.Type = v.Type
data.lv = v.Level
data.value = v.FavorDegree
data.value = this.GetTotalValue(data.lv,v.Type)
LogGreen("data.value:"..data.value)
data.Property = v.Property
data.priPro = v.PrivilegeProperty
if v.Type == 1 then
@ -51,6 +52,20 @@ function this.InitializeTableData()
end
end
function this.GetTotalValue(lv,indexType)
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.LikeAbility,"Type",indexType)
local num = 0
if lv == 0 then
return num
end
for i = 1,lv do
if configs[i].FavorDegree and configs[i].FavorDegree > 0 then
num = num + configs[i].FavorDegree
end
end
return num
end
function this.CheckIsMaxLv(heroId)
local totalCurNum,totalLv,totalNum = this.GetTotalHeroLikeLv(heroId)
if totalLv >= this.HeroLvList[#this.HeroLvList].lv then
@ -143,8 +158,8 @@ function this.GetLv(indexType,value)
list = this.HeroLvList
end
for i = 1,#list do
if not list[i].value or list[i].value <= 0 or value < list[i].value then
return list[i].lv,list[i].value
if value < list[i].value then
return list[i].lv - 1,list[i].value
end
end
end
@ -163,11 +178,13 @@ function this.GetProData(indexType,index,lv)
if index >= 0 then
for _,n in ipairs(list) do
if indexType == n.Type and index == n.lv then
for i = 1,#n.Property do
if not allPro[n.Property[i][1]] then
allPro[n.Property[i][1]] = 0
if n.Property and #n.Property > 0 then
for i = 1,#n.Property do
if not allPro[n.Property[i][1]] then
allPro[n.Property[i][1]] = 0
end
allPro[n.Property[i][1]] = allPro[n.Property[i][1]] + n.Property[i][2]
end
allPro[n.Property[i][1]] = allPro[n.Property[i][1]] + n.Property[i][2]
end
break
end
@ -175,11 +192,13 @@ function this.GetProData(indexType,index,lv)
else
for _,n in ipairs(list) do
if n.Property and #n.Property > 0 and lv <= n.lv then
for i = 1,#n.Property do
if not allPro[n.Property[i][1]] then
allPro[n.Property[i][1]] = 0
if n.Property and #n.Property > 0 then
for i = 1,#n.Property do
if not allPro[n.Property[i][1]] then
allPro[n.Property[i][1]] = 0
end
allPro[n.Property[i][1]] = allPro[n.Property[i][1]] + n.Property[i][2]
end
allPro[n.Property[i][1]] = allPro[n.Property[i][1]] + n.Property[i][2]
end
end
end
@ -198,11 +217,13 @@ function this.GetPrivilageProData(indexType,index,lv)
if index >= 0 then
for _,n in ipairs(list) do
if indexType == n.Type and index == n.lv then
for i = 1,#n.priPro do
if not allPro[n.priPro[i][1]] then
allPro[n.priPro[i][1]] = 0
end
allPro[n.priPro[i][1]] = allPro[n.priPro[i][1]] + n.priPro[i][2]
if n.priPro and #n.priPro > 0 then
for i = 1,#n.priPro do
if not allPro[n.priPro[i][1]] then
allPro[n.priPro[i][1]] = 0
end
allPro[n.priPro[i][1]] = allPro[n.priPro[i][1]] + n.priPro[i][2]
end
end
break
end
@ -210,11 +231,13 @@ function this.GetPrivilageProData(indexType,index,lv)
else
for _,n in ipairs(list) do
if n.priPro and #n.priPro > 0 and lv <= n.lv then
for i = 1,#n.priPro do
if not allPro[n.priPro[i][1]] then
allPro[n.priPro[i][1]] = 0
if n.priPro and #n.priPro > 0 then
for i = 1,#n.priPro do
if not allPro[n.priPro[i][1]] then
allPro[n.priPro[i][1]] = 0
end
allPro[n.priPro[i][1]] = allPro[n.priPro[i][1]] + n.priPro[i][2]
end
allPro[n.priPro[i][1]] = allPro[n.priPro[i][1]] + n.priPro[i][2]
end
end
end
@ -306,26 +329,30 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2,
else
list = this.HeroLvList
end
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1)
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(indexType)
if all then
for i = 1,#list do
local color = ""
if lv <= list[i].lv then
if lv >= list[i].lv then
color = "5dc446"
else
color = "fdf5e5"
end
if title2 and title2 ~= "" then
table.insert(data.prolist,string.format(title2,color,lv,num,totalNum))
table.insert(data.prolist,string.format(title2,color,list[i].lv,num,list[i].value))
end
this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color)
local str1,str2 = this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,color)
table.insert(data.prolist,str1)
table.insert(data.prolist,str2)
end
else
local color = "5dc446"
if title2 and title2 ~= "" then
table.insert(data.prolist,string.format(title2,color,lv,num,totalNum))
end
this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,data.prolist,color)
local str1,str2 = this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,color)
table.insert(data.prolist,str1)
table.insert(data.prolist,str2)
end
return data
end
@ -338,14 +365,21 @@ end
--subtitle1普通属性内容
--subtitle2特权属性内容
--nextLv: 下一等级
function this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,list,color)
function this.GetViewProDatas(indexType,add,lv,subtitle1,subtitle2,nextLv,color)
local num = 0
if indexType > 1 then
indexType = 2
end
local str1,str2 = "",""
local pro1 = LikabilityManager.GetProData(indexType,add,lv)
local str = this.SetProvalue(pro1,1,subtitle1,nextLv,indexType,color)
table.insert(list,str)
if LengthOfTable(pro1) > 0 then
str1 = this.SetProvalue(pro1,1,subtitle1,nextLv,indexType,color)
end
local pro2 = LikabilityManager.GetPrivilageProData(indexType,add,lv)
str = this.SetProvalue(pro2,2,subtitle2,nextLv,indexType,color)
table.insert(list,str)
if LengthOfTable(pro2) > 0 then
str2 = this.SetProvalue(pro2,2,subtitle2,nextLv,indexType,color)
end
return str1,str2
end
--属性列表 ,1属性 2特权, 标签,
@ -371,11 +405,12 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,color)
else
local config = ConfigManager.GetConfigDataByKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",k)
str1 = string.format(config.PrivilegeType,GetPropertyFormatStrOne(config.IfFloat, v))
str1 = string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, v))
end
table.insert(newProList,str1)
end
str = string.format(tag,color,(newProList[1] or ""),(newProList[2] or ""))
return str
end
return this

View File

@ -120,11 +120,10 @@ function LikeAbilityPanel:UpDataProSingleList(data,index)
if not self.proList[index] then
self.proList[index] = {}
self.proList[index].go = newObjToParent(self.pro,self.proGrid)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
end
self.proList[index].go.gameObject:SetActive(true)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
LogGreen("data.content:"..data.content)
self.proList[index].title.text = data.content
self.proList[index].go.gameObject:SetActive(true)
self.proList[index].title.text = data.content
for i = 1,math.max(#self.proList[index],#data.prolist) do
if not data.prolist[i] then
self.proList[index][i].go.gameObject:SetActive(false)
@ -133,11 +132,16 @@ function LikeAbilityPanel:UpDataProSingleList(data,index)
self.proList[index][i] = {}
self.proList[index][i].go = newObjToParent(self.proContent,self.proList[index].go)
self.proList[index][i].goText = self.proList[index][i].go:GetComponent("Text")
end
if data.prolist[i] == "" then
self.proList[index][i].go.gameObject:SetActive(false)
else
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
end
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
end
end
end
function LikeAbilityPanel:UpdataHeroDataPanel()

View File

@ -15,9 +15,9 @@ function LikeabilityPopup:InitComponent()
--self.likeabilitymask.fillAmount
self.lv = Util.GetGameObject(self.likeabilityBtn, "lv"):GetComponent("Text")
self.progress = Util.GetGameObject(self.likeabilityBtn, "progress"):GetComponent("Text")
self.pro = Util.GetGameObject(self.transform, "di/pro")
self.pro = Util.GetGameObject(self.transform, "pro")
self.proContent = Util.GetGameObject(self.pro, "content")
self.proGrid = Util.GetGameObject(self.transform, "di/proScroll")
self.proGrid = Util.GetGameObject(self.transform, "scroll/proScroll/proScrollgrid")
self.proList = {}
end
@ -61,10 +61,11 @@ function LikeabilityPopup:UpdateTopLayoutPanel()
self.likeabilitymask.fillAmount = num/totalNum
end
self:UpDataProList(lv)
end
function LikeabilityPopup:UpDataProList(lv)
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>总好感度属性:</color>","","<color=#%s>全体%s\n全体%s</color>","",nil)
local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"<color=#fed97f>当前等级加成:</color>","<color=#%s>%s级</color>","<color=#%s>属性加成:%s %s</color>","<color=#%s>特权加成:%s</color>",nil)
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>总好感度属性:</color>","","<color=#%s>全体%s\n全体%s</color>","",lv + 1)
local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"<color=#fed97f>当前等级加成:</color>","<color=#%s>%s级</color>","<color=#%s>属性加成:%s %s</color>","<color=#%s>特权加成:%s</color>",nil,true)
for i = 1,#self.proList do
self.proList[i].go.gameObject:SetActive(false)
end
@ -76,12 +77,18 @@ function LikeabilityPopup:UpDataProSingleList(data,index)
if not self.proList[index] then
self.proList[index] = {}
self.proList[index].go = newObjToParent(self.pro,self.proGrid)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
self.proList[index].fenge = Util.GetGameObject(self.proList[index].go, "Image")
if index == 1 then
self.proList[index].fenge.gameObject:SetActive(false)
else
self.proList[index].fenge.gameObject:SetActive(true)
end
end
self.proList[index].go.gameObject:SetActive(true)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
self.proList[index].title.text = data.content
for i = 1,math.max(#self.proList[index],#data.prolist) do
if not data.prolist[index][i] then
if not data.prolist[i] then
self.proList[index][i].go.gameObject:SetActive(false)
else
if not self.proList[index][i] then
@ -89,8 +96,12 @@ function LikeabilityPopup:UpDataProSingleList(data,index)
self.proList[index][i].go = newObjToParent(self.proContent,self.proList[index].go)
self.proList[index][i].goText = self.proList[index][i].go:GetComponent("Text")
end
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
if data.prolist[i] == "" then
self.proList[index][i].go.gameObject:SetActive(false)
else
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
end
end
end
end

View File

@ -12,9 +12,10 @@ function RoleLikeabilityPopup:InitComponent()
self.lvText = Util.GetGameObject(self.icon.transform, "lv"):GetComponent("Text")
self.progress = Util.GetGameObject(self.transform, "scroll/likeability/di/progress"):GetComponent("Image")
self.progressText = Util.GetGameObject(self.transform, "scroll/likeability/progressText"):GetComponent("Text")
self.pro = Util.GetGameObject(self.transform, "di/pro")
self.pro = Util.GetGameObject(self.transform, "pro")
self.proContent = Util.GetGameObject(self.pro, "content")
self.proGrid = Util.GetGameObject(self.transform, "di/proScroll")
self.proGrid = Util.GetGameObject(self.transform, "scroll/proScroll/proScrollGrid")
self.pos = Util.GetGameObject(self.transform, "scroll/pos")
self.proList = {}
end
@ -53,22 +54,20 @@ function RoleLikeabilityPopup:OnShow()
end
function RoleLikeabilityPopup:UpdateTopLayoutPanel()
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1)
local config = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LikeAbility,"Type",1,"Level",lv)
self.likeabilityDi.sprite = self.spLoader:LoadSprite(config.Bg)
self.lv.text = lv
if not self.totalNum or self.totalNum <= 0 then
self.progress.text = "好感度最佳"
self.likeabilitymask.fillAmount = 1
local num,lv,totalNum = LikabilityManager.GetTotalHeroLikeLv(self.curheroData.Id)
self.lvText.text = lv
if LikabilityManager.CheckIsMaxLv(self.curheroData.Id) then
self.progressText.text = "好感度最佳"
self.progress.fillAmount = 1
else
self.progress.text = string.format("%s/%s",num,totalNum)
self.likeabilitymask.fillAmount = num/totalNum
self.progressText.text = string.format("%s/%s",num,totalNum)
self.progress.fillAmount = num/totalNum
end
self:UpDataProList(lv)
end
function RoleLikeabilityPopup:UpDataProList(lv)
local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"","<color=#%s>好感度%s级(%s/%s)</color>","<color=#%s>"..self.curheroData.ReadingName.." %s %s</color>","<color=#%s>特权加成:%s</color>",nil)
local pro2 = LikabilityManager.GetViewProData(self.curheroData.Id,lv,lv,"","<color=#%s>好感度%s级(%s/%s)</color>","<color=#%s>"..self.curheroData.ReadingName.." %s %s</color>","<color=#%s>特权加成:%s</color>",nil,true)
for i = 1,#self.proList do
self.proList[i].go.gameObject:SetActive(false)
end
@ -82,9 +81,15 @@ function RoleLikeabilityPopup:UpDataProSingleList(data,index)
end
self.proList[index].go.gameObject:SetActive(true)
self.proList[index].title = Util.GetGameObject(self.proList[index].go, "title"):GetComponent("Text")
self.proList[index].title.text = data.content
if data.content == "" then
self.proList[index].title.gameObject:SetActive(false)
else
self.proList[index].title.gameObject:SetActive(true)
self.proList[index].title.text = data.content
end
for i = 1,math.max(#self.proList[index],#data.prolist) do
if not data.prolist[index][i] then
if not data.prolist[i] then
self.proList[index][i].go.gameObject:SetActive(false)
else
if not self.proList[index][i] then
@ -92,8 +97,12 @@ function RoleLikeabilityPopup:UpDataProSingleList(data,index)
self.proList[index][i].go = newObjToParent(self.proContent,self.proList[index].go)
self.proList[index][i].goText = self.proList[index][i].go:GetComponent("Text")
end
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
if data.prolist[i] == "" then
self.proList[index][i].go.gameObject:SetActive(false)
else
self.proList[index][i].go.gameObject:SetActive(true)
self.proList[index][i].goText.text = data.prolist[i]
end
end
end
end