zhaoyang 3 жил өмнө
parent
commit
63e8848c28
25 өөрчлөгдсөн 503 нэмэгдсэн , 3 устгасан
  1. 18 0
      FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml
  2. 8 0
      FGUIProject/assets/RoleLvUp/components/Component1.xml
  3. 8 0
      FGUIProject/assets/RoleLvUp/components/Component2.xml
  4. BIN
      FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_1.png
  5. BIN
      FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_2.png
  6. BIN
      FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_3.png
  7. 12 0
      FGUIProject/assets/RoleLvUp/package.xml
  8. 12 3
      GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs
  9. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp.meta
  10. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component1.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component1.cs.meta
  12. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component2.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component2.cs.meta
  14. 85 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_RoleLvUpUI.cs
  15. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_RoleLvUpUI.cs.meta
  16. 8 0
      GameClient/Assets/Game/HotUpdate/Views/RoleLvUp.meta
  17. 40 0
      GameClient/Assets/Game/HotUpdate/Views/RoleLvUp/RoleLvUpView.cs
  18. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RoleLvUp/RoleLvUpView.cs.meta
  19. 8 0
      GameClient/Assets/ResIn/UI/RoleLvUp.meta
  20. BIN
      GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png
  21. 96 0
      GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png.meta
  22. BIN
      GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_fui.bytes
  23. 7 0
      GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_fui.bytes.meta
  24. BIN
      GameClient/Assets/ResIn/UI/RoleLvUp_fui.bytes
  25. 7 0
      GameClient/Assets/ResIn/UI/RoleLvUp_fui.bytes.meta

+ 18 - 0
FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="700,900">
+  <displayList>
+    <image id="n0_mueb" name="n0" src="mueb2" fileName="images/sjsd_kuangdi_1.png" xy="12,0"/>
+    <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,192" fontSize="150" color="#cda45f" text="35"/>
+    <text id="n4_mueb" name="n4" xy="185,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
+    <text id="n3_mueb" name="txtLastLv" xy="240,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34"/>
+    <text id="n5_mueb" name="n5" xy="326,624" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
+    <text id="n6_mueb" name="n6" xy="366,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
+    <text id="n2_mueb" name="txtCurLv" xy="421,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35"/>
+    <group id="n7_mueb" name="n7" xy="185,599" size="329,94" advanced="true" layout="hz" colGap="-7" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <component id="n8_mueb" name="com0" src="mueb4" fileName="components/Component1.xml" xy="92,723" group="n11_mueb"/>
+    <component id="n10_mueb" name="com1" src="mueb5" fileName="components/Component2.xml" xy="92,819" group="n11_mueb"/>
+    <group id="n11_mueb" name="n11" xy="92,723" size="516,158" advanced="true" layout="vt" lineGap="34" excludeInvisibles="true"/>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/RoleLvUp/components/Component1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="516,62">
+  <displayList>
+    <image id="n8_mueb" name="n8" src="mueb3" fileName="images/sjsd_kuangdi_2.png" xy="0,0"/>
+    <text id="n9_mueb" name="n9" xy="42,4" size="164,54" fontSize="40" color="#82673e" text="体力上限"/>
+    <text id="n10_mueb" name="txtCount" xy="412,4" pivot="1,0.5" size="53,54" fontSize="40" color="#82673e" text="+3"/>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/RoleLvUp/components/Component2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="516,62">
+  <displayList>
+    <image id="n8_mueb" name="n8" src="mueb1" fileName="images/sjsd_kuangdi_3.png" xy="0,0"/>
+    <text id="n9_mueb" name="n9" xy="42,4" size="164,54" fontSize="40" color="#906633" text="赠送体力"/>
+    <text id="n10_mueb" name="txtCount" xy="412,4" pivot="1,0.5" size="53,54" fontSize="40" color="#906633" text="+3"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_1.png


BIN
FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_2.png


BIN
FGUIProject/assets/RoleLvUp/images/sjsd_kuangdi_3.png


+ 12 - 0
FGUIProject/assets/RoleLvUp/package.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="ns2d6qb2">
+  <resources>
+    <component id="mueb0" name="RoleLvUpUI.xml" path="/" exported="true"/>
+    <image id="mueb1" name="sjsd_kuangdi_3.png" path="/images/"/>
+    <image id="mueb2" name="sjsd_kuangdi_1.png" path="/images/"/>
+    <image id="mueb3" name="sjsd_kuangdi_2.png" path="/images/"/>
+    <component id="mueb4" name="Component1.xml" path="/components/"/>
+    <component id="mueb5" name="Component2.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true"/>
+</packageDescription>

+ 12 - 3
GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         public static string roleName;
         public static int rechargeTotal;
         public static int rechargeTotalMon;
-
+        public static int roleLastLv;//上次的角色等级,用于升级界面展示用
 
         public static int power
         {
@@ -54,7 +54,7 @@ namespace GFGGame
                 return GameGlobal.myNumericComponent.GetAsInt(NumericType.DiamondP);
             }
         }
-        
+
         public static int diaR
         {
             get
@@ -94,8 +94,17 @@ namespace GFGGame
             //_lvl = roleInfo.lvl;
             //_diaP = roleInfo.diaP;
             //_diaR = roleInfo.diaR;
-            
+
+        }
+
+        public static void ShowRoleLvUpView()
+        {
+            Timers.inst.Remove(CheckUpLv);
+            Timers.inst.Add(1, 0, CheckUpLv);
         }
+        private static void CheckUpLv(object param)
+        {
 
+        }
     }
 }

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleLvUp
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public GTextField m_txtCount;
+        public const string URL = "ui://ns2d6qb2mueb4";
+        public const string PACKAGE_NAME = "RoleLvUp";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a815addf891727f4294ca207d2130b80
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleLvUp
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GTextField m_txtCount;
+        public const string URL = "ui://ns2d6qb2mueb5";
+        public const string PACKAGE_NAME = "RoleLvUp";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_Component2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a0b58074b8392f949b0e1f0117396e6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 85 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_RoleLvUpUI.cs

@@ -0,0 +1,85 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleLvUp
+{
+    public partial class UI_RoleLvUpUI
+    {
+        public GComponent target;
+        public GTextField m_txtLv;
+        public GTextField m_txtLastLv;
+        public GTextField m_txtCurLv;
+        public UI_Component1 m_com0;
+        public UI_Component2 m_com1;
+        public const string URL = "ui://ns2d6qb2mueb0";
+        public const string PACKAGE_NAME = "RoleLvUp";
+        public const string RES_NAME = "RoleLvUpUI";
+        private static UI_RoleLvUpUI _proxy;
+
+        public static UI_RoleLvUpUI Create(GObject gObject = null)
+        {
+            var ui = new UI_RoleLvUpUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_RoleLvUpUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RoleLvUpUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_txtLastLv = (GTextField)comp.GetChild("txtLastLv");
+            m_txtCurLv = (GTextField)comp.GetChild("txtCurLv");
+            m_com0 = (UI_Component1)UI_Component1.Create(comp.GetChild("com0"));
+            m_com1 = (UI_Component2)UI_Component2.Create(comp.GetChild("com1"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLv = null;
+            m_txtLastLv = null;
+            m_txtCurLv = null;
+            m_com0.Dispose();
+            m_com0 = null;
+            m_com1.Dispose();
+            m_com1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_RoleLvUpUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee4bb3ba7cbae0d45987134dae54216a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleLvUp.meta

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

+ 40 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleLvUp/RoleLvUpView.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UI.RoleLvUp;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class RoleLvUpView : BaseWindow
+    {
+
+        private UI_RoleLvUpUI _ui;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_RoleLvUpUI.PACKAGE_NAME;
+            _ui = UI_RoleLvUpUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleLvUp/RoleLvUpView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c302db00f2f8c544b6c86111563a170
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
GameClient/Assets/ResIn/UI/RoleLvUp.meta

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

BIN
GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 895c62395b144644884758b93142a018
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_fui.bytes.meta

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

BIN
GameClient/Assets/ResIn/UI/RoleLvUp_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/RoleLvUp_fui.bytes.meta

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