增加登录FGUI界面

FGUIProject/assets/Login/Login.xml

@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1920,1080">
+<component size="900,1600">
   <displayList>
-    <image id="n0_pdjl" name="n0" src="pdjl4" fileName="Login.png" xy="0,0" size="1920,1080">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <component id="n12_8ibs" name="Btn_Login" src="pdjlb" fileName="Btn_StartGame.xml" xy="1429,420" size="274,64" group="n16_8ibs">
+    <image id="n31_j5ra" name="n31" src="j5rasi" fileName="loginbg.png" xy="0,0"/>
+    <component id="n12_8ibs" name="Btn_Login" src="pdjlb" fileName="Btn_StartGame.xml" xy="270,984" size="297,64" group="n16_8ibs">
       <Button titleColor="#ffffff" titleFontSize="40"/>
     </component>
-    <component id="n22_brol" name="n22" src="brolsg" fileName="Btn_ContinueGame.xml" xy="1430,541" size="274,64" group="n16_8ibs">
-      <Button titleFontSize="30"/>
-    </component>
-    <group id="n16_8ibs" name="Gro_LoginInfo" xy="1429,420" size="275,185" advanced="true">
-      <relation target="" sidePair="right-right,middle-middle"/>
-    </group>
-    <text id="n23_rwz6" name="Text_test" xy="922,475" size="367,81" fontSize="20" autoSize="none" text="FGUI-更新测试"/>
+    <image id="n28_j5ra" name="n28" src="pdjl8" fileName="UI_LoginInput.PNG" xy="220,838" size="368,47" group="n16_8ibs"/>
+    <text id="n25_j5ra" name="input_name" xy="270,838" size="293,46" group="n16_8ibs" fontSize="30" color="#ffffff" vAlign="middle" autoSize="none" text="" input="true" prompt="[i][color=#999999]输入用户名&#xA;[/color][/i]" maxLength="16" keyboardType="1"/>
+    <image id="n29_j5ra" name="n29" src="pdjl8" fileName="UI_LoginInput.PNG" xy="220,906" size="368,47" group="n16_8ibs"/>
+    <text id="n30_j5ra" name="input_password" xy="270,906" size="293,46" group="n16_8ibs" font="ui://btak13q2brolh" fontSize="30" color="#ffffff" vAlign="middle" autoSize="none" text="" input="true" prompt="[i][color=#999999]输入密码[/color][/i]" maxLength="16" keyboardType="1" password="true"/>
+    <group id="n16_8ibs" name="Gro_LoginInfo" xy="220,838" size="368,210"/>
+    <text id="n23_rwz6" name="Text_Version" xy="0,1213" size="865,343" fontSize="20" color="#ffffff" align="right" vAlign="bottom" autoSize="none" text="Version:1"/>
   </displayList>
-  <transition name="Tween_LoginPanelFlyIn" autoPlay="true">
-    <item time="0" type="XY" target="n16_8ibs" tween="true" startValue="2112,401" endValue="1411,394" duration="24" ease="Back.Out"/>
-  </transition>
+  <transition name="Tween_LoginPanelFlyIn" autoPlay="true"/>
 </component>

FGUIProject/assets/Login/package.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="2jxt4hn8">
   <resources>
-    <image id="pdjl4" name="Login.png" path="/"/>
     <image id="pdjl6" name="UI_LoginBtn.PNG" path="/"/>
     <image id="pdjl7" name="UI_LoginBtn_ONpressed.png" path="/"/>
     <image id="pdjl8" name="UI_LoginInput.PNG" path="/"/>
     <component id="pdjl9" name="Login.xml" path="/" exported="true"/>
     <component id="pdjlb" name="Btn_StartGame.xml" path="/"/>
     <image id="pdjlc" name="banzi_da.png" path="/"/>
-    <image id="r0zzse" name="VersionInfo_Icon.png" path="/"/>
     <component id="brolsg" name="Btn_ContinueGame.xml" path="/"/>
+    <image id="j5rasi" name="loginbg.png" path="/"/>
   </resources>
-  <publish name="" genCode="true"/>
+  <publish name=""/>
 </packageDescription>

FGUIProject/assets/Shared/package.xml

@@ -6,6 +6,8 @@
     <image id="8nuw3" name="BarBackGround.PNG" path="/Res/" scale="9grid" scale9grid="40,10,50,20"/>
     <image id="8nuw4" name="Bar.PNG" path="/Res/"/>
     <component id="8nuw5" name="Com_ProWithTip.xml" path="/" exported="true"/>
+    <sound id="j5rai" name="click.wav" path="/Res/sound/"/>
+    <sound id="j5raj" name="tabswitch.wav" path="/Res/sound/"/>
   </resources>
   <publish name=""/>
 </packageDescription>

FGUIProject/settings/Publish.json

@@ -1,5 +1,5 @@
 {
-  "path": "../../Unity/Assets/Res/FGUI/",
+  "path": "../Unity/Assets/Res/FGUI/",
   "branchPath": "",
   "fileExtension": "bytes",
   "packageCount": 2,
@@ -9,10 +9,10 @@
   "compressPNG": false,
   "codeGeneration": {
     "allowGenCode": true,
-    "codePath": "",
+    "codePath": "../Unity\\Assets\\Scripts\\Codes\\Model\\Client\\FGUIGenerate",
     "classNamePrefix": "",
     "memberNamePrefix": "",
-    "packageName": null,
+    "packageName": "FUI",
     "ignoreNoname": false,
     "getMemberByName": false,
     "codeType": ""

Unity/Assets/Res/Config/HotUpdateAssemblyManifest.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f9ce34f47e4ed4827c54fe59e948d5, type: 3}
-  m_Name: HotUpdateAssemblyManifest
+  m_Name: Assets/Res/Config/HotUpdateAssemblyManifest.asset
   m_EditorClassIdentifier: 
   AOTMetadataDlls:
   - System.dll

Unity/Assets/Res/FGUI/Login_atlas0.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 08e72e80e0c22054fa9d7fb698b1d64f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Res/FGUI/Login_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d3fa9ef7f0f45504594b06ebcb571e73
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Resources/FGUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 668cd214c1e894749a067ada6894a65b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/HotfixView/Client/Global/GlobalComponentSystem.cs

@@ -10,8 +10,8 @@ namespace ET.Client
             GlobalComponent.Instance = self;
             
             self.Global = GameObject.Find("/Global").transform;
-            self.Unit = GameObject.Find("/Global/Unit").transform;
-            self.UI = GameObject.Find("/Global/UI").transform;
+            //self.Unit = GameObject.Find("/Global/Unit").transform;
+            //self.UI = GameObject.Find("/Global/UI").transform;
         }
     }
 }

Unity/Assets/Scripts/Codes/HotfixView/Unity.HotfixView.Codes.asmdef

@@ -9,7 +9,10 @@
         "Unity.ModelView.Codes",
         "Unity.Mathematics",
         "Unity.Loader",
-        "FairyGUI.Runtime"
+        "FairyGUI.Runtime",
+        "YooAsset",
+        "UniTask.YooAsset",
+        "UniTask"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Codes/ModelView/Client/FGUIGenerate.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0e3074a14b1feb34b8998a5b46030e74
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/ModelView/Unity.ModelView.Codes.asmdef

@@ -7,7 +7,10 @@
         "Unity.Model.Codes",
         "Unity.Mathematics",
         "Unity.Loader",
-        "FairyGUI.Runtime"
+        "FairyGUI.Runtime",
+        "YooAsset",
+        "UniTask.YooAsset",
+        "UniTask"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Empty/HotfixView/Unity.HotfixView.asmdef

@@ -9,7 +9,10 @@
         "Unity.Core",
         "Unity.Mathematics",
         "Unity.Loader",
-        "FairyGUI.Runtime"
+        "FairyGUI.Runtime",
+        "YooAsset",
+        "UniTask.YooAsset",
+        "UniTask"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Empty/Model/Unity.Model.asmdef

@@ -4,9 +4,7 @@
     "references": [
         "Unity.ThirdParty",
         "Unity.Core",
-        "Unity.Mathematics",
-        "FairyGUI.Runtime",
-        "UniTask"
+        "Unity.Mathematics"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Empty/ModelView/Unity.ModelView.asmdef

@@ -9,7 +9,8 @@
         "Unity.Loader",
         "UniTask",
         "UniTask.YooAsset",
-        "YooAsset"
+        "YooAsset",
+        "FairyGUI.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Loader/MonoBehaviour/Init.cs

@@ -11,15 +11,19 @@ namespace ET
 	{
 		private void Awake()
 		{
-			DontDestroyOnLoad(gameObject);
+#if UNITY_STANDALONE_WIN
+			Screen.SetResolution(540, 960, false);
+#endif
 #if UNITY_EDITOR
 			//Editor模式下去掉debug浮窗插件
 			var debugObj = GameObject.Find("IngameDebugConsole");
-			if(debugObj != null)
-			{
-				GameObject.Destroy(debugObj);
-			}
+            if (debugObj != null)
+            {
+                GameObject.Destroy(debugObj);
+            }
 #endif
+            DontDestroyOnLoad(gameObject);
+
 			//登陆过程限定帧率为30fps
 			Application.targetFrameRate = (int)FPS.Login;