提交
This commit is contained in:
parent
90ebe8dc7f
commit
eacccb8d33
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -39962,7 +39962,7 @@ RectTransform:
|
|||||||
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.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 23.503296, y: -165.4}
|
m_AnchoredPosition: {x: 71, y: -172.01}
|
||||||
m_SizeDelta: {x: 60.1949, y: 27.978}
|
m_SizeDelta: {x: 60.1949, y: 27.978}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2705807114461495543
|
--- !u!222 &2705807114461495543
|
||||||
@ -39995,8 +39995,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u521D\u7EA7\u52A0\u901F"
|
m_text: "\u521D\u7EA7\u52A0\u901F"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
|
@ -189,8 +189,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D"
|
m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 9a1582a77b98b2347bc3864faa332c64, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: -4149713549750991327, guid: 9a1582a77b98b2347bc3864faa332c64, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
@ -214,8 +214,8 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 36
|
m_fontSize: 25.4
|
||||||
m_fontSizeBase: 36
|
m_fontSizeBase: 25.4
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
@ -15163,7 +15163,7 @@ RectTransform:
|
|||||||
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.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -74.306915, y: -45.899475}
|
m_AnchoredPosition: {x: -53, y: -60}
|
||||||
m_SizeDelta: {x: 200, y: 50}
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1382021493980304174
|
--- !u!222 &1382021493980304174
|
||||||
@ -15196,8 +15196,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u6301\u7EED\u70B9\u8D5E"
|
m_text: "\u6301\u7EED\u70B9\u8D5E"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 9a1582a77b98b2347bc3864faa332c64, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: -4149713549750991327, guid: 9a1582a77b98b2347bc3864faa332c64, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
|
@ -6578,8 +6578,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u6587\u660E\u699C"
|
m_text: "\u6587\u660E\u699C"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
@ -6603,8 +6603,8 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 40
|
m_fontSize: 35.1
|
||||||
m_fontSizeBase: 40
|
m_fontSizeBase: 35.1
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
@ -7888,8 +7888,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u79EF\u5206\u5468\u699C"
|
m_text: "\u79EF\u5206\u5468\u699C"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
@ -7913,8 +7913,8 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 40
|
m_fontSize: 31.1
|
||||||
m_fontSizeBase: 40
|
m_fontSizeBase: 31.1
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
@ -10393,8 +10393,8 @@ MonoBehaviour:
|
|||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\u79EF\u5206\u6708\u699C"
|
m_text: "\u79EF\u5206\u6708\u699C"
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2}
|
m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2}
|
||||||
m_fontSharedMaterials: []
|
m_fontSharedMaterials: []
|
||||||
m_fontMaterial: {fileID: 0}
|
m_fontMaterial: {fileID: 0}
|
||||||
m_fontMaterials: []
|
m_fontMaterials: []
|
||||||
@ -10418,8 +10418,8 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 40
|
m_fontSize: 31.8
|
||||||
m_fontSizeBase: 40
|
m_fontSizeBase: 31.8
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
|
@ -63,8 +63,8 @@ namespace GameLogic
|
|||||||
// 设置游戏时长
|
// 设置游戏时长
|
||||||
m_GameTimerLen = EventConts.gameLenTiemr;
|
m_GameTimerLen = EventConts.gameLenTiemr;
|
||||||
|
|
||||||
// 临时设置
|
//// 临时设置
|
||||||
m_GameTimerLen = 2 * 60;
|
//m_GameTimerLen = 2 * 60;
|
||||||
|
|
||||||
|
|
||||||
//if (GameModule.Setting.GetInt("gameLenTiemrId") != 0)
|
//if (GameModule.Setting.GetInt("gameLenTiemrId") != 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user