Merge branch 'onepiece_demo' into onepiece_demo_dev
commit
1d584c8d68
|
@ -67,7 +67,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 210, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3096286307795013761
|
||||
|
@ -338,7 +338,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: 0, y: 176.10004}
|
||||
m_AnchoredPosition: {x: 0, y: 170}
|
||||
m_SizeDelta: {x: 0, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4688125351347416022
|
||||
|
@ -583,7 +583,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 630, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3764668692912066610
|
||||
|
|
|
@ -4704,7 +4704,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.7924528, g: 0.52134585, b: 0.22801706, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -7946,6 +7946,7 @@ GameObject:
|
|||
- component: {fileID: 3388728286398406587}
|
||||
- component: {fileID: 4478053191229546414}
|
||||
- component: {fileID: 4785284737895290220}
|
||||
- component: {fileID: 1315461092}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -8015,6 +8016,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u597D\u53CB"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &1315461092
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 915536988969406652}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &946541004628445371
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -20899,6 +20915,7 @@ GameObject:
|
|||
- component: {fileID: 2957181921431038410}
|
||||
- component: {fileID: 4936616071039786353}
|
||||
- component: {fileID: 3717406172223654518}
|
||||
- component: {fileID: 1315461091}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -20968,6 +20985,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u90AE\u4EF6"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &1315461091
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2089231769674204396}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &2102301823679114759
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -24229,6 +24261,7 @@ GameObject:
|
|||
- component: {fileID: 8409874717947469271}
|
||||
- component: {fileID: 6279442171926522679}
|
||||
- component: {fileID: 8512947860336449871}
|
||||
- component: {fileID: 1062583897}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -24297,6 +24330,21 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6D77\u8D3C\u70ED\u699C"
|
||||
--- !u!114 &1062583897
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3088265054489047177}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &3139533495069807838
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -24537,7 +24585,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1407379797450811008
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -57994,7 +58042,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 170, y: -183}
|
||||
m_SizeDelta: {x: 147, y: 662}
|
||||
m_SizeDelta: {x: 147, y: 609.4}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6257897751989525113
|
||||
CanvasRenderer:
|
||||
|
@ -70100,6 +70148,7 @@ GameObject:
|
|||
- component: {fileID: 215456282333569649}
|
||||
- component: {fileID: 1932830892828610337}
|
||||
- component: {fileID: 3478397338255253088}
|
||||
- component: {fileID: 1108535273358491877}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -70168,6 +70217,21 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6C38\u4E45\u7279\u6743"
|
||||
--- !u!114 &1108535273358491877
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5730274860849767930}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &5735984104073139643
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -71182,7 +71246,7 @@ MonoBehaviour:
|
|||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 1
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
|
@ -71205,8 +71269,8 @@ MonoBehaviour:
|
|||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0.1254902, g: 0.02745098, b: 0.03529412, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &6018299568118914253
|
||||
GameObject:
|
||||
|
@ -94217,6 +94281,7 @@ GameObject:
|
|||
- component: {fileID: 1273297915651818124}
|
||||
- component: {fileID: 7737280027248304887}
|
||||
- component: {fileID: 1402553218796164664}
|
||||
- component: {fileID: 1315461090}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -94286,6 +94351,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u6392\u884C\u699C"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &1315461090
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8479075165530667083}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &8506423964865835045
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -95557,7 +95637,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 7, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2575244980898405363
|
||||
|
@ -95862,6 +95942,7 @@ GameObject:
|
|||
- component: {fileID: 1297017712337815052}
|
||||
- component: {fileID: 301413920127577166}
|
||||
- component: {fileID: 7596279605469739594}
|
||||
- component: {fileID: 1315461093}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
|
@ -95931,6 +96012,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u65E5\u5E38"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &1315461093
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9108013311423084702}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 2, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &9128937596084050107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -6854,7 +6854,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9960785, g: 0.7686275, b: 0.24705884, a: 1}
|
||||
m_Color: {r: 0.21568628, g: 0.16078432, b: 0.16078432, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -11703,7 +11703,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9960785, g: 0.7686275, b: 0.24705884, a: 1}
|
||||
m_Color: {r: 0.21568628, g: 0.16078432, b: 0.16078432, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -58987,7 +58987,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9960785, g: 0.7686275, b: 0.24705884, a: 1}
|
||||
m_Color: {r: 0.21698111, g: 0.16273583, b: 0.16273583, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -58998,7 +58998,7 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
|
@ -174296,7 +174296,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: 5.07, y: 345.29}
|
||||
m_AnchoredPosition: {x: 5.07, y: 1364}
|
||||
m_SizeDelta: {x: 796.31, y: 151.52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7952533447423413802
|
||||
|
@ -174548,7 +174548,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3766131170455723064
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -208138,7 +208138,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9960785, g: 0.7686275, b: 0.24705884, a: 1}
|
||||
m_Color: {r: 0.21568628, g: 0.16078432, b: 0.16078432, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -6491,7 +6491,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.7960785, g: 0.7411765, b: 0.69803923, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -6650,7 +6650,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.85490197, g: 0.7019608, b: 0.5372549, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -7536,7 +7536,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.7960785, g: 0.7411765, b: 0.69803923, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -7826,7 +7826,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2393b2cf84abe574e92fc8575543d7e4, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 0fc6aa8c4c8686a45827426cce6cc103, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -7978,7 +7978,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.85490197, g: 0.7019608, b: 0.5372549, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -8058,7 +8058,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.7960785, g: 0.7411765, b: 0.69803923, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -9592,7 +9592,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.85490197, g: 0.7019608, b: 0.5372549, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -10025,7 +10025,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 8cd93e362030e5749a079206fac3ea30, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 14de214bc71a54a4f912bd00874f57e5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -10350,7 +10350,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: ad27af5548aa5d04987888ccd8b6126c, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: ec571af34fa33624091b6ca3b065010a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -35,8 +35,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -0.000030517578, y: -12.799999}
|
||||
m_SizeDelta: {x: 672, y: 2}
|
||||
m_AnchoredPosition: {x: -35.5, y: -12.799999}
|
||||
m_SizeDelta: {x: 743, y: 2}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &1766069402006949971
|
||||
CanvasRenderer:
|
||||
|
@ -66,7 +66,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b966aac416f404f4f90ad0c1a4b0572d, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9de42f8f578587d419a05e3442ef5937, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -135,7 +135,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 750, y: 0}
|
||||
m_SizeDelta: {x: 814.25, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &757349028289488434
|
||||
MonoBehaviour:
|
||||
|
@ -383,8 +383,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 362.5, y: 0}
|
||||
m_SizeDelta: {x: 25, y: 0}
|
||||
m_AnchoredPosition: {x: 402.11, y: 0}
|
||||
m_SizeDelta: {x: 65, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4320833339301387177
|
||||
CanvasRenderer:
|
||||
|
@ -421,7 +421,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 25
|
||||
m_Left: 65
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
|
@ -469,7 +469,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -3762.0005, y: -491.5051}
|
||||
m_SizeDelta: {x: 700, y: 83}
|
||||
m_SizeDelta: {x: 814, y: 83}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1489507525450056629
|
||||
CanvasRenderer:
|
||||
|
@ -624,7 +624,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 58, y: 0}
|
||||
m_AnchoredPosition: {x: 98, y: 0}
|
||||
m_SizeDelta: {x: 66, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1952495588327230643
|
||||
|
@ -852,8 +852,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 362.5, y: 0}
|
||||
m_SizeDelta: {x: 91, y: 0}
|
||||
m_AnchoredPosition: {x: 402.11, y: 0}
|
||||
m_SizeDelta: {x: 131, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7422676475438108378
|
||||
CanvasRenderer:
|
||||
|
@ -890,7 +890,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 25
|
||||
m_Left: 65
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
|
@ -936,7 +936,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 25, y: 0}
|
||||
m_AnchoredPosition: {x: 65, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3520923418400653691
|
||||
|
@ -1050,8 +1050,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 380, y: 0}
|
||||
m_SizeDelta: {x: 760, y: 0}
|
||||
m_AnchoredPosition: {x: 407.11, y: 0}
|
||||
m_SizeDelta: {x: 814.22, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4185124015842772771
|
||||
CanvasRenderer:
|
||||
|
@ -1074,7 +1074,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: -25
|
||||
m_Left: 0
|
||||
m_Right: 10
|
||||
m_Top: 10
|
||||
m_Bottom: 0
|
||||
|
@ -1208,8 +1208,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -3641, y: -148}
|
||||
m_SizeDelta: {x: 700, y: 127}
|
||||
m_AnchoredPosition: {x: 205, y: 192}
|
||||
m_SizeDelta: {x: 814, y: 127}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5840828537624518994
|
||||
CanvasRenderer:
|
||||
|
@ -1265,6 +1265,7 @@ GameObject:
|
|||
- component: {fileID: 5427744254789621849}
|
||||
- component: {fileID: 5614760479803157645}
|
||||
- component: {fileID: 4519562031126316474}
|
||||
- component: {fileID: 5467495169284136021}
|
||||
m_Layer: 5
|
||||
m_Name: text
|
||||
m_TagString: Untagged
|
||||
|
@ -1321,8 +1322,8 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_FontSize: 42
|
||||
m_FontStyle: 2
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 70
|
||||
|
@ -1334,6 +1335,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u795E\u5C06\u5929\u8D4B"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &5467495169284136021
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7397356887735718145}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &7450073361584476940
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1419,7 +1435,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7723528773779627565
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1691,7 +1707,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 9000966320659701915}
|
||||
- component: {fileID: 3500391808153137436}
|
||||
- component: {fileID: 2954092092249721635}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
|
@ -1726,35 +1741,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8836947073186172051}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2954092092249721635
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8836947073186172051}
|
||||
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: 288461e87c49b6d4eb6b055d683d345c, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &9186487489877675353
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1790,8 +1776,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -12.800003}
|
||||
m_SizeDelta: {x: 672, y: 2}
|
||||
m_AnchoredPosition: {x: -35.505005, y: -12.800003}
|
||||
m_SizeDelta: {x: 742.99, y: 2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3664755432954548449
|
||||
CanvasRenderer:
|
||||
|
@ -1821,7 +1807,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b966aac416f404f4f90ad0c1a4b0572d, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9de42f8f578587d419a05e3442ef5937, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -32,9 +32,9 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
|
|||
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil,sortingOrder,NPCPosType.maincity)
|
||||
|
||||
if PlayerManager.GetPlayerRide() > 0 then
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,230,0)
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,240,0)
|
||||
else
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,170,0)
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,210,0)
|
||||
end
|
||||
--如果修行开启设置修行标识
|
||||
if ActTimeCtrlManager.SingleFuncState(108) then
|
||||
|
@ -55,14 +55,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
|
|||
designation = _NpvData.userTitle
|
||||
}
|
||||
if _NpvData.userMount > 0 then
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,230,0)
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,240,0)
|
||||
else
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,170,0)
|
||||
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,210,0)
|
||||
end
|
||||
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder,NPCPosType.maincity)
|
||||
end
|
||||
-- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil)
|
||||
--instance.NpcGO:SetNameHeight(10)
|
||||
--instance.NpcGO:SetNameHeight(200)
|
||||
instance.NpcGO:OnOpen()
|
||||
instance.NpcGO:OnSortingOrderChange(sortingOrder)
|
||||
if isSelf then
|
||||
|
|
|
@ -32,8 +32,9 @@ function OnlineRewardPanel:showReward()
|
|||
itemPreList[i] = SubUIManager.Open(SubUIConfig.ItemView,this.root.transform)
|
||||
end
|
||||
itemPreList[i]:OnOpen(false, {ActivityGiftManager.onlineData[i].Reward[1][1], ActivityGiftManager.onlineData[i].Reward[1][2]}, 0.9,true, false, false, self.sortingOrder)
|
||||
--itemPreList[i]:ResetNameColor(Vector4.New(1,1,1,1))
|
||||
itemPreList[i]:ResetNameSize(Vector3.New(0,-95,0),Vector3.New(1.3,1.3,1))
|
||||
itemPreList[i]:ResetNameColor(Color.New(178/255,85/255,55/255,1))
|
||||
|
||||
end
|
||||
OnlineRewardPanel:OnShowActivityData()
|
||||
end
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
require("Base/BasePanel")
|
||||
HelpPopup = Inherit(BasePanel)
|
||||
local this=HelpPopup
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ function QuickCommonPurchasePart:ctor(mainPanel, transform)
|
|||
|
||||
|
||||
Util.AddClick(this.helpBtn.gameObject,function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.DailyCarbon,this.helpPosition.x,this.helpPosition.y)
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.BuyCoin,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
|
@ -191,7 +191,7 @@ function PlayerLiveView:OnShowLive(isMap)
|
|||
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=curPlayerRole.Height
|
||||
local y=curPlayerRole.Height+2
|
||||
if curArtResourcesConfig.Position[2] then
|
||||
y=y+curArtResourcesConfig.Position[2]
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue