新增相关国旗内容

Assets/ResRaw/Fgui/CommonFlag_atlas0.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 52df48b1276d7eb4aaa1bb1934d99c5a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResRaw/Fgui/CommonFlag_atlas0_1.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: f7ba35b3a0b6bfd4b8c7a1b8e7ad4956
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResRaw/Fgui/CommonFlag_atlas0_2.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 333d4a060fd4de44c87e3a03f82af066
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResRaw/Fgui/CommonFlag_fui.bytes.meta

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

Assets/ResRaw/Maps/Map99/Map99.unity

@@ -258,7 +258,7 @@ Transform:
   m_GameObject: {fileID: 7149315942453194809}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 386, y: 0, z: 343}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Scripts/Fishing2/Data/Helper.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e4cf32f6efb45fba177341b57a34003
+timeCreated: 1756450772

Assets/Scripts/Fishing2/Helper.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4c1174e9753b43ac9dd5fa664e92021b
+timeCreated: 1756450590

Assets/Scripts/Fishing2/Helper/UnitHelper.cs

@@ -0,0 +1,7 @@
+namespace NBF.Fishing2
+{
+    public class UnitHelper
+    {
+        
+    }
+}

Assets/Scripts/Fishing2/Helper/UnitHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 82c91df89554417c87a3658709ef406d
+timeCreated: 1756450600

Assets/Scripts/Fishing2/View/Helper.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3148c2caaafd4a099b9bc156fce7a3f7
+timeCreated: 1756450740

Assets/Scripts/Fishing2/View/Helper/PrefabsHelper.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+
+namespace NBF.Fishing2
+{
+    public static class PrefabsHelper
+    {
+        /// <summary>
+        /// 创建角色预制体
+        /// </summary>
+        /// <param name="parent"></param>
+        /// <returns></returns>
+        public static GameObject CreatePlayer(Transform parent)
+        {
+            var model = Resources.Load<GameObject>("Prefabs/Player/male");
+            return Object.Instantiate(model, parent);
+        }
+    }
+}

Assets/Scripts/Fishing2/View/Helper/PrefabsHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 18ffcf16981040b2a88990281adcb4ac
+timeCreated: 1756451102

Assets/Scripts/Fishing2/View/Map.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9a177be5539c4a5183d9838dcf22605d
+timeCreated: 1756450754

Assets/Scripts/Fishing2/View/System/UnitUnityComponentSystem.cs

@@ -11,6 +11,7 @@ namespace NBF.Fishing2
             protected override void Awake(UnitUnityComponent self)
             {
                 Log.Info("UnitUnityComponentAwakeSystem");
+                self.InitGameObject();
             }
         }
 
@@ -23,13 +24,16 @@ namespace NBF.Fishing2
                 self.Transform = null;
             }
         }
+        
 
-        public static void SetGameObject(this UnitUnityComponent self, GameObject obj)
+        public static void InitGameObject(this UnitUnityComponent self)
         {
-            Log.Info("UnitUnityComponent SetGameObject");
-            self.GameObject = obj;
-            self.Transform = obj.transform;
-            self.Animator = obj.GetComponent<Animator>();
+            var unit = self.Parent as Unit;
+            var prefab = PrefabsHelper.CreatePlayer(SceneSettings.Instance.Node);
+
+            self.GameObject = prefab;
+            self.Transform = prefab.transform;
+            self.Animator = prefab.GetComponent<Animator>();
         }
     }
 }

Assets/Scripts/Fishing2/View/Unit/UnitUnityComponent.cs

@@ -1,6 +1,4 @@
-using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using NBC.Entitas;
 using UnityEngine;
 
 namespace NBF.Fishing2
@@ -16,5 +14,4 @@ namespace NBF.Fishing2
 
         public Animator Animator { get; set; }
     }
-    
 }

FGUIProject/assets/Common/package.xml

@@ -21,11 +21,11 @@
     <component id="dheven" name="ReelHand.xml" path="/Com/"/>
     <image id="dhevep" name="Logo.png" path="/Images/old/"/>
     <image id="o0hzeq" name="Circle - 256.png" path="/Images/Shapes/Circle/" exported="true"/>
-    <image id="o0hzer" name="Semi Rounded.png" path="/Images/Shapes/Semi Rounded/"/>
-    <image id="o0hzes" name="Semi Rounded - Stroke 8px.png" path="/Images/Shapes/Semi Rounded/"/>
-    <image id="o0hzet" name="Semi Rounded - Stroke 6px.png" path="/Images/Shapes/Semi Rounded/"/>
-    <image id="o0hzeu" name="Semi Rounded - Stroke 4px.png" path="/Images/Shapes/Semi Rounded/"/>
-    <image id="o0hzev" name="Semi Rounded - Stroke 2px.png" path="/Images/Shapes/Semi Rounded/"/>
+    <image id="o0hzer" name="Semi Rounded.png" path="/Images/Shapes/Semi Rounded/" exported="true"/>
+    <image id="o0hzes" name="Semi Rounded - Stroke 8px.png" path="/Images/Shapes/Semi Rounded/" exported="true" scale="9grid" scale9grid="64,64,128,128"/>
+    <image id="o0hzet" name="Semi Rounded - Stroke 6px.png" path="/Images/Shapes/Semi Rounded/" exported="true" scale="9grid" scale9grid="44,44,181,167"/>
+    <image id="o0hzeu" name="Semi Rounded - Stroke 4px.png" path="/Images/Shapes/Semi Rounded/" exported="true" scale="9grid" scale9grid="64,64,128,128"/>
+    <image id="o0hzev" name="Semi Rounded - Stroke 2px.png" path="/Images/Shapes/Semi Rounded/" exported="true" scale="9grid" scale9grid="64,64,128,128"/>
     <image id="o0hzew" name="Rounded.png" path="/Images/Shapes/Rounded/" exported="true"/>
     <image id="o0hzex" name="Rounded - Stroke 8px.png" path="/Images/Shapes/Rounded/" exported="true"/>
     <image id="o0hzey" name="Rounded - Stroke 6px.png" path="/Images/Shapes/Rounded/" exported="true"/>
@@ -41,8 +41,8 @@
     <image id="o0hzf9" name="Rounded - Stroke 2px.png" path="/Images/Shapes/Rounded/" exported="true"/>
     <image id="o0hzfa" name="Square.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="4,4,248,248" duplicatePadding="true"/>
     <image id="o0hzfb" name="Square - Stroke 1px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="4,4,248,248" duplicatePadding="true"/>
-    <image id="o0hzfc" name="Square - Stroke 4px.png" path="/Images/Shapes/Square/" exported="true"/>
-    <image id="o0hzfd" name="Square - Stroke 8px.png" path="/Images/Shapes/Square/" exported="true"/>
+    <image id="o0hzfc" name="Square - Stroke 4px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="10,11,236,233"/>
+    <image id="o0hzfd" name="Square - Stroke 8px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="16,14,227,229"/>
     <image id="cvcwfe" name="Square_1.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="1,1,2,2"/>
     <image id="jgrjff" name="Loading_2.png" path="/Images/" exported="true"/>
     <image id="jgrjfg" name="Loading_1.png" path="/Images/" exported="true"/>
@@ -138,7 +138,7 @@
     <image id="r03uiu" name="Gradient.png" path="/Images/Panels/" exported="true" scale="9grid" scale9grid="307,1,30,6"/>
     <image id="r03uiv" name="Square - Stroke 2px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="6,8,116,114"/>
     <image id="r03uiw" name="Square - Stroke 3px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="9,10,114,109"/>
-    <image id="r03uix" name="Square - Stroke 5px.png" path="/Images/Shapes/Square/" exported="true"/>
+    <image id="r03uix" name="Square - Stroke 5px.png" path="/Images/Shapes/Square/" exported="true" scale="9grid" scale9grid="16,16,100,99"/>
     <image id="r03uiy" name="Item01.png" path="/Icon/item/" exported="true"/>
     <image id="r03uiz" name="Item02.png" path="/Icon/item/" exported="true"/>
     <component id="r03uj0" name="BtnTitleInputControl.xml" path="/Com/Buttons/" exported="true"/>