4112
This commit is contained in:
commit
ed4fc75cad
|
@ -32,8 +32,8 @@ Material:
|
||||||
- _dispStrength: 1
|
- _dispStrength: 1
|
||||||
- _overBright: 1
|
- _overBright: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
|
- _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
|
- _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
|
||||||
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
- _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
||||||
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
|
- _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
- _TintColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|
|
@ -10022,6 +10022,8 @@ MonoBehaviour:
|
||||||
minCamera: {fileID: 1822639428928488196}
|
minCamera: {fileID: 1822639428928488196}
|
||||||
imageprs: {fileID: 8234605787508067104}
|
imageprs: {fileID: 8234605787508067104}
|
||||||
rawImage: {fileID: 2648302242586125239}
|
rawImage: {fileID: 2648302242586125239}
|
||||||
|
colliders: []
|
||||||
|
attackColliders1: []
|
||||||
--- !u!54 &916690897
|
--- !u!54 &916690897
|
||||||
Rigidbody:
|
Rigidbody:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -16139,10 +16141,10 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_UiScaleMode: 0
|
m_UiScaleMode: 1
|
||||||
m_ReferencePixelsPerUnit: 100
|
m_ReferencePixelsPerUnit: 100
|
||||||
m_ScaleFactor: 1
|
m_ScaleFactor: 1
|
||||||
m_ReferenceResolution: {x: 800, y: 600}
|
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||||
m_ScreenMatchMode: 0
|
m_ScreenMatchMode: 0
|
||||||
m_MatchWidthOrHeight: 0
|
m_MatchWidthOrHeight: 0
|
||||||
m_PhysicalUnit: 3
|
m_PhysicalUnit: 3
|
||||||
|
|
|
@ -731,7 +731,7 @@ Camera:
|
||||||
width: 1
|
width: 1
|
||||||
height: 1
|
height: 1
|
||||||
near clip plane: 0.3
|
near clip plane: 0.3
|
||||||
far clip plane: 150
|
far clip plane: 600
|
||||||
field of view: 60
|
field of view: 60
|
||||||
orthographic: 0
|
orthographic: 0
|
||||||
orthographic size: 5
|
orthographic size: 5
|
||||||
|
@ -836,10 +836,10 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_UiScaleMode: 0
|
m_UiScaleMode: 1
|
||||||
m_ReferencePixelsPerUnit: 100
|
m_ReferencePixelsPerUnit: 100
|
||||||
m_ScaleFactor: 1
|
m_ScaleFactor: 1
|
||||||
m_ReferenceResolution: {x: 800, y: 600}
|
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||||
m_ScreenMatchMode: 0
|
m_ScreenMatchMode: 0
|
||||||
m_MatchWidthOrHeight: 0
|
m_MatchWidthOrHeight: 0
|
||||||
m_PhysicalUnit: 3
|
m_PhysicalUnit: 3
|
||||||
|
|
|
@ -9571,10 +9571,10 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_UiScaleMode: 0
|
m_UiScaleMode: 1
|
||||||
m_ReferencePixelsPerUnit: 100
|
m_ReferencePixelsPerUnit: 100
|
||||||
m_ScaleFactor: 1
|
m_ScaleFactor: 1
|
||||||
m_ReferenceResolution: {x: 800, y: 600}
|
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||||
m_ScreenMatchMode: 0
|
m_ScreenMatchMode: 0
|
||||||
m_MatchWidthOrHeight: 0
|
m_MatchWidthOrHeight: 0
|
||||||
m_PhysicalUnit: 3
|
m_PhysicalUnit: 3
|
||||||
|
|
|
@ -405,10 +405,10 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_UiScaleMode: 0
|
m_UiScaleMode: 1
|
||||||
m_ReferencePixelsPerUnit: 100
|
m_ReferencePixelsPerUnit: 100
|
||||||
m_ScaleFactor: 1
|
m_ScaleFactor: 1
|
||||||
m_ReferenceResolution: {x: 800, y: 600}
|
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||||
m_ScreenMatchMode: 0
|
m_ScreenMatchMode: 0
|
||||||
m_MatchWidthOrHeight: 0
|
m_MatchWidthOrHeight: 0
|
||||||
m_PhysicalUnit: 3
|
m_PhysicalUnit: 3
|
||||||
|
@ -737,6 +737,8 @@ MonoBehaviour:
|
||||||
Frequency:
|
Frequency:
|
||||||
camera: {fileID: 480111845}
|
camera: {fileID: 480111845}
|
||||||
rawImage: {fileID: 1115657768}
|
rawImage: {fileID: 1115657768}
|
||||||
|
colliders: []
|
||||||
|
attackColliders1: []
|
||||||
--- !u!65 &1537869982341012852
|
--- !u!65 &1537869982341012852
|
||||||
BoxCollider:
|
BoxCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -44,7 +44,8 @@ namespace XFrame.Core.UI
|
||||||
instance.root = go.transform;
|
instance.root = go.transform;
|
||||||
CanvasScaler cs = go.AddComponent<CanvasScaler>();
|
CanvasScaler cs = go.AddComponent<CanvasScaler>();
|
||||||
cs.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
|
cs.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
|
||||||
cs.referenceResolution = new Vector2(Screen.width, Screen.height);
|
//cs.referenceResolution = new Vector2(Screen.width, Screen.height);
|
||||||
|
cs.referenceResolution = new Vector2(1920, 1080);
|
||||||
cs.screenMatchMode = CanvasScaler.ScreenMatchMode.Expand;
|
cs.screenMatchMode = CanvasScaler.ScreenMatchMode.Expand;
|
||||||
GameObject subRoot;
|
GameObject subRoot;
|
||||||
subRoot = CreateSubCanvasForRoot(go.transform, 0);
|
subRoot = CreateSubCanvasForRoot(go.transform, 0);
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
127.0.0.1:48888
|
172.20.10.5:48888
|
|
@ -1 +1 @@
|
||||||
127.0.0.1
|
172.20.10.5
|
File diff suppressed because it is too large
Load Diff
|
@ -68602,7 +68602,6 @@ MonoBehaviour:
|
||||||
prefabItem: {fileID: 7985558213978141209, guid: c4c52f318e5c8074780b18c3419b7fb5,
|
prefabItem: {fileID: 7985558213978141209, guid: c4c52f318e5c8074780b18c3419b7fb5,
|
||||||
type: 3}
|
type: 3}
|
||||||
model: {fileID: 0}
|
model: {fileID: 0}
|
||||||
huoPaoCtrls: []
|
|
||||||
modelname_text: {fileID: 0}
|
modelname_text: {fileID: 0}
|
||||||
isDragWRJ: 1
|
isDragWRJ: 1
|
||||||
deviceID:
|
deviceID:
|
||||||
|
@ -264633,9 +264632,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 951036334}
|
m_Father: {fileID: 951036334}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: -920, y: 0}
|
m_AnchoredPosition: {x: 45, y: -39}
|
||||||
m_SizeDelta: {x: 24, y: 30}
|
m_SizeDelta: {x: 24, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &504733559
|
--- !u!114 &504733559
|
||||||
|
@ -491742,10 +491741,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 936705244}
|
m_Father: {fileID: 936705244}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 1920, y: 80}
|
m_SizeDelta: {x: 0, y: 80}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &951036335
|
--- !u!114 &951036335
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -709311,9 +709310,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 951036334}
|
m_Father: {fileID: 951036334}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 11
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: -820, y: 0}
|
m_AnchoredPosition: {x: 148, y: -37}
|
||||||
m_SizeDelta: {x: 119, y: 29}
|
m_SizeDelta: {x: 119, y: 29}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1387180249
|
--- !u!114 &1387180249
|
||||||
|
@ -927387,7 +927386,7 @@ MonoBehaviour:
|
||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
randSeed: 100811953
|
randSeed: 454892781
|
||||||
isDoingTransition: 0
|
isDoingTransition: 0
|
||||||
minimumHeight: 0
|
minimumHeight: 0
|
||||||
--- !u!114 &1820978574
|
--- !u!114 &1820978574
|
||||||
|
@ -949240,10 +949239,10 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_UiScaleMode: 0
|
m_UiScaleMode: 1
|
||||||
m_ReferencePixelsPerUnit: 100
|
m_ReferencePixelsPerUnit: 100
|
||||||
m_ScaleFactor: 1
|
m_ScaleFactor: 1
|
||||||
m_ReferenceResolution: {x: 800, y: 600}
|
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||||
m_ScreenMatchMode: 0
|
m_ScreenMatchMode: 0
|
||||||
m_MatchWidthOrHeight: 0
|
m_MatchWidthOrHeight: 0
|
||||||
m_PhysicalUnit: 3
|
m_PhysicalUnit: 3
|
||||||
|
|
Loading…
Reference in New Issue