Browse Source

该位置

master
jiannan.guo@yingxiong.com 1 month ago
parent
commit
3833c8e377
  1. 4
      client/client/Assets/RawResources/Model/Joystick.prefab
  2. 32
      client/client/Assets/Scenes/BattleEditor.unity
  3. 4
      client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs

4
client/client/Assets/RawResources/Model/Joystick.prefab

@ -37,8 +37,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 77.5, y: 0} m_AnchoredPosition: {x: 0, y: 110}
m_SizeDelta: {x: -155, y: 0} m_SizeDelta: {x: 0, y: -220}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8891952679383612412 --- !u!222 &8891952679383612412
CanvasRenderer: CanvasRenderer:

32
client/client/Assets/Scenes/BattleEditor.unity

@ -804,10 +804,10 @@ RectTransform:
- {fileID: 868441115} - {fileID: 868441115}
m_Father: {fileID: 1291515644} m_Father: {fileID: 1291515644}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 66, y: 44} m_AnchoredPosition: {x: 0, y: 100}
m_SizeDelta: {x: 40, y: 321.17} m_SizeDelta: {x: -120, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &536237624 --- !u!114 &536237624
MonoBehaviour: MonoBehaviour:
@ -852,7 +852,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1229089819} m_TargetGraphic: {fileID: 1229089819}
m_FillRect: {fileID: 585093706} m_FillRect: {fileID: 585093706}
m_HandleRect: {fileID: 1229089818} m_HandleRect: {fileID: 1229089818}
m_Direction: 3 m_Direction: 0
m_MinValue: 0 m_MinValue: 0
m_MaxValue: 1 m_MaxValue: 1
m_WholeNumbers: 0 m_WholeNumbers: 0
@ -908,7 +908,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 10} m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &585093707 --- !u!114 &585093707
MonoBehaviour: MonoBehaviour:
@ -1318,7 +1318,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -20} m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &914161519 --- !u!1 &914161519
GameObject: GameObject:
@ -1352,8 +1352,8 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 536237623} m_Father: {fileID: 536237623}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.25, y: 0} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 0.75, y: 1} m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -2092,7 +2092,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 40} m_SizeDelta: {x: 100, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1229089819 --- !u!114 &1229089819
MonoBehaviour: MonoBehaviour:
@ -2168,7 +2168,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -520} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1291515645 --- !u!114 &1291515645
MonoBehaviour: MonoBehaviour:
@ -2184,7 +2184,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
canvasScaler: {fileID: 1433238609} canvasScaler: {fileID: 1433238609}
VerticalBoundary: {fileID: 1653631439} VerticalBoundary: {fileID: 1653631439}
MaxDesignSize: {x: 1080, y: 1400} MaxDesignSize: {x: 1080, y: 2400}
defaultPortraitIndent: {x: 0, y: 0} defaultPortraitIndent: {x: 0, y: 0}
maxPortraitIndent: {x: 200, y: 200} maxPortraitIndent: {x: 200, y: 200}
indentRatioX: 0 indentRatioX: 0
@ -3023,10 +3023,10 @@ RectTransform:
- {fileID: 585093706} - {fileID: 585093706}
m_Father: {fileID: 536237623} m_Father: {fileID: 536237623}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.25, y: 0} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 0.75, y: 1} m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 5} m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: 0, y: -20} m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1921453497 --- !u!1 &1921453497
GameObject: GameObject:

4
client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs

@ -31,7 +31,7 @@ namespace CoreGame.Shared.Bridge
public static BattleModel GetSimulateData() public static BattleModel GetSimulateData()
{ {
var csBattleMode = new CSBattleModeSync(); var csBattleMode = new CSBattleModeSync();
for (int i = 0; i < 2; i++) for (int i = 0; i < 1; i++)
{ {
var hero = new HeroModel(); var hero = new HeroModel();
hero.Uid = i + 1; hero.Uid = i + 1;
@ -42,7 +42,7 @@ namespace CoreGame.Shared.Bridge
csBattleMode.Heroes.Add(hero); csBattleMode.Heroes.Add(hero);
} }
for (int i = 0; i < 2; i++) for (int i = 0; i < 1; i++)
{ {
var team = new TeamModel(); var team = new TeamModel();
team.TeamNum = i + 1; team.TeamNum = i + 1;

Loading…
Cancel
Save