修复：武器部件的一些问题

snipershooting/Data/exports/TableData.cs

@@ -16,6 +16,11 @@ namespace SSTRGame
 		public tabtoy.Logger TableLogger = new tabtoy.Logger();
 	
 		
+		/// <summary> 
+		/// FieldShapeData
+		/// </summary>
+		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
+		
 		/// <summary> 
 		/// ChallengeData
 		/// </summary>
@@ -26,11 +31,6 @@ namespace SSTRGame
 		/// </summary>
 		public List<FieldDataDefine> FieldData = new List<FieldDataDefine>(); 
 		
-		/// <summary> 
-		/// FieldShapeData
-		/// </summary>
-		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
-		
 		/// <summary> 
 		/// GameConfig
 		/// </summary>
@@ -88,7 +88,23 @@ namespace SSTRGame
 	
 	
 		#region Index code
-	 	Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
+	 	Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
+        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
+        {
+            FieldShapeDataDefine ret;
+            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
+            {
+                return ret;
+            }
+			
+			if ( def == default(FieldShapeDataDefine) )
+			{
+				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
+			}
+
+            return def;
+        }
+		Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
         public ChallengeDataDefine GetChallengeDataByID(int ID, ChallengeDataDefine def = default(ChallengeDataDefine))
         {
             ChallengeDataDefine ret;
@@ -118,22 +134,6 @@ namespace SSTRGame
 				TableLogger.ErrorLine("GetFieldDataByID failed, ID: {0}", ID);
 			}
 
-            return def;
-        }
-		Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
-        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
-        {
-            FieldShapeDataDefine ret;
-            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
-            {
-                return ret;
-            }
-			
-			if ( def == default(FieldShapeDataDefine) )
-			{
-				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
-			}
-
             return def;
         }
 		Dictionary<int, GameConfigDefine> _GameConfigByid = new Dictionary<int, GameConfigDefine>();
@@ -343,17 +343,17 @@ namespace SSTRGame
                 { 
                 	case 0xa0000:
                 	{
-						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
+						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0001:
                 	{
-						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
+						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0002:
                 	{
-						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
+						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0003:
@@ -415,6 +415,15 @@ namespace SSTRGame
              } 
 
 			
+			// Build FieldShapeData Index
+			for( int i = 0;i< ins.FieldShapeData.Count;i++)
+			{
+				var element = ins.FieldShapeData[i];
+				
+				ins._FieldShapeDataByID.Add(element.ID, element);
+				
+			}
+			
 			// Build ChallengeData Index
 			for( int i = 0;i< ins.ChallengeData.Count;i++)
 			{
@@ -433,15 +442,6 @@ namespace SSTRGame
 				
 			}
 			
-			// Build FieldShapeData Index
-			for( int i = 0;i< ins.FieldShapeData.Count;i++)
-			{
-				var element = ins.FieldShapeData[i];
-				
-				ins._FieldShapeDataByID.Add(element.ID, element);
-				
-			}
-			
 			// Build GameConfig Index
 			for( int i = 0;i< ins.GameConfig.Count;i++)
 			{
@@ -542,20 +542,20 @@ namespace SSTRGame
 			}
 			
 		}
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_ChallengeDataDefineDeserializeHandler == null )
+				if (_FieldShapeDataDefineDeserializeHandler == null )
 				{
-					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
+					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
 				}
 
-				return _ChallengeDataDefineDeserializeHandler;
+				return _FieldShapeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -568,34 +568,29 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x10001:
+                	case 0x60001:
                 	{
-						ins.FieldID = reader.ReadInt32();
+						ins.ResourceName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10002:
+                	case 0x60002:
                 	{
-						ins.DecStaminaCnt = reader.ReadInt32();
+						ins.EnvSoundName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10003:
+                	case 0x60003:
                 	{
-						ins.ConstraintType = reader.ReadInt32();
+						ins.EnvParticleName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10004:
+                	case 0x60004:
                 	{
-						ins.ConstraintValue = reader.ReadInt32();
+						ins.AttendAnim.Add( reader.ReadString() );
                 	}
                 	break; 
                 	case 0x10005:
                 	{
-						ins.Condition.Add( reader.ReadInt32() );
-                	}
-                	break; 
-                	case 0x10006:
-                	{
-						ins.Reward_ID_1 = reader.ReadInt32();
+						ins.LoadMethod = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -603,20 +598,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldDataDefineDeserializeHandler == null )
+				if (_ChallengeDataDefineDeserializeHandler == null )
 				{
-					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
+					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
 				}
 
-				return _FieldDataDefineDeserializeHandler;
+				return _ChallengeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -631,22 +626,32 @@ namespace SSTRGame
                 	break; 
                 	case 0x10001:
                 	{
-						ins.RoundFactorGroupID = reader.ReadInt32();
+						ins.FieldID = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10002:
                 	{
-						ins.FieldShapeID = reader.ReadInt32();
+						ins.DecStaminaCnt = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10003:
                 	{
-						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
+						ins.ConstraintType = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60004:
+                	case 0x10004:
                 	{
-						ins.Mark = reader.ReadString();
+						ins.ConstraintValue = reader.ReadInt32();
+                	}
+                	break; 
+                	case 0x10005:
+                	{
+						ins.Condition.Add( reader.ReadInt32() );
+                	}
+                	break; 
+                	case 0x10006:
+                	{
+						ins.Reward_ID_1 = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -654,20 +659,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldShapeDataDefineDeserializeHandler == null )
+				if (_FieldDataDefineDeserializeHandler == null )
 				{
-					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
+					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
 				}
 
-				return _FieldShapeDataDefineDeserializeHandler;
+				return _FieldDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -680,29 +685,24 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60001:
+                	case 0x10001:
                 	{
-						ins.ResourceName = reader.ReadString();
+						ins.RoundFactorGroupID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60002:
+                	case 0x10002:
                 	{
-						ins.EnvSoundName = reader.ReadString();
+						ins.FieldShapeID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60003:
+                	case 0x10003:
                 	{
-						ins.EnvParticleName = reader.ReadString();
+						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
                 	}
                 	break; 
                 	case 0x60004:
                 	{
-						ins.AttendAnim.Add( reader.ReadString() );
-                	}
-                	break; 
-                	case 0x10005:
-                	{
-						ins.LoadMethod = reader.ReadInt32();
+						ins.Mark = reader.ReadString();
                 	}
                 	break; 
                 }
@@ -1885,9 +1885,9 @@ namespace SSTRGame
 		#region Clear Code
 		public void Clear( )
 		{			
+				FieldShapeData.Clear(); 		
 				ChallengeData.Clear(); 		
 				FieldData.Clear(); 		
-				FieldShapeData.Clear(); 		
 				GameConfig.Clear(); 		
 				Language.Clear(); 		
 				Level.Clear(); 		
@@ -1900,9 +1900,9 @@ namespace SSTRGame
 				WeaponPart.Clear(); 		
 				WeaponProperty.Clear(); 
 			
+				_FieldShapeDataByID.Clear(); 
 				_ChallengeDataByID.Clear(); 
 				_FieldDataByID.Clear(); 
-				_FieldShapeDataByID.Clear(); 
 				_GameConfigByid.Clear(); 
 				_LanguageByid.Clear(); 
 				_LevelByID.Clear(); 
@@ -1920,9 +1920,9 @@ namespace SSTRGame
 
 	} 
 
-	// Defined in table: ChallengeData
+	// Defined in table: FieldShapeData
 	
-	public partial class ChallengeDataDefine
+	public partial class FieldShapeDataDefine
 	{
 	
 		
@@ -1932,30 +1932,29 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int FieldID = 0; 
-		
-		
-		public int DecStaminaCnt = 0; 
-		
+		public string ResourceName = ""; 
 		
-		public int ConstraintType = 0; 
 		
+		public string EnvSoundName = ""; 
 		
-		public int ConstraintValue = 0; 
 		
+		public string EnvParticleName = ""; 
 		
-		public List<int> Condition = new List<int>(); 
+		/// <summary> 
+		/// 开场动画，多选一
+		/// </summary>
+		public List<string> AttendAnim = new List<string>(); 
 		
 		
-		public int Reward_ID_1 = 0; 
+		public int LoadMethod = 0; 
 	
 	
 
 	} 
 
-	// Defined in table: FieldData
+	// Defined in table: ChallengeData
 	
-	public partial class FieldDataDefine
+	public partial class ChallengeDataDefine
 	{
 	
 		
@@ -1965,24 +1964,30 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int RoundFactorGroupID = 0; 
+		public int FieldID = 0; 
 		
 		
-		public int FieldShapeID = 0; 
+		public int DecStaminaCnt = 0; 
 		
 		
-		public List<int> DefaultPlayerPos = new List<int>(); 
+		public int ConstraintType = 0; 
 		
 		
-		public string Mark = ""; 
+		public int ConstraintValue = 0; 
+		
+		
+		public List<int> Condition = new List<int>(); 
+		
+		
+		public int Reward_ID_1 = 0; 
 	
 	
 
 	} 
 
-	// Defined in table: FieldShapeData
+	// Defined in table: FieldData
 	
-	public partial class FieldShapeDataDefine
+	public partial class FieldDataDefine
 	{
 	
 		
@@ -1992,21 +1997,16 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public string ResourceName = ""; 
-		
+		public int RoundFactorGroupID = 0; 
 		
-		public string EnvSoundName = ""; 
 		
+		public int FieldShapeID = 0; 
 		
-		public string EnvParticleName = ""; 
 		
-		/// <summary> 
-		/// 开场动画，多选一
-		/// </summary>
-		public List<string> AttendAnim = new List<string>(); 
+		public List<int> DefaultPlayerPos = new List<int>(); 
 		
 		
-		public int LoadMethod = 0; 
+		public string Mark = ""; 
 	
 	
 

snipershooting/Data/exports/TableData.json

@@ -1,6 +1,13 @@
 {
 	"Tool": "github.com/davyxu/tabtoy",
 	"Version": "2.9.1",
+	"FieldShapeData":[
+		{ "ID": 1, "ResourceName": "Bake_FactoryWarehouse", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 },
+		{ "ID": 2, "ResourceName": "Bake_chengbao1", "AttendAnim":[ "attend_5", "attend_6" ], "LoadMethod": 1 },
+		{ "ID": 3, "ResourceName": "Bake_ShootingRange", "AttendAnim":[ "attend_3", "attend_4" ], "LoadMethod": 1 },
+		{ "ID": 4, "ResourceName": "Bake_Stadium@2000", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 },
+		{ "ID": 5, "ResourceName": "Bake_Industry zone", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 }
+	], 
 	"ChallengeData":[
 		{ "ID": 1, "FieldID": 1, "DecStaminaCnt": 1, "ConstraintType": 2, "ConstraintValue": 5, "Condition":[ 6, 9, 12, 20 ], "Reward_ID_1": 0 },
 		{ "ID": 2, "FieldID": 2, "DecStaminaCnt": 1, "ConstraintType": 2, "ConstraintValue": 5, "Condition":[ 6, 12, 18, 38 ], "Reward_ID_1": 0 },
@@ -951,13 +958,6 @@
 		{ "ID": 472, "RoundFactorGroupID": 472, "FieldShapeID": 5, "DefaultPlayerPos":[ 0, 0, 0 ], "Mark": "30@8" },
 		{ "ID": 473, "RoundFactorGroupID": 473, "FieldShapeID": 5, "DefaultPlayerPos":[ 0, 0, 0 ], "Mark": "110" }
 	], 
-	"FieldShapeData":[
-		{ "ID": 1, "ResourceName": "Bake_FactoryWarehouse", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 },
-		{ "ID": 2, "ResourceName": "Bake_chengbao1", "AttendAnim":[ "attend_5", "attend_6" ], "LoadMethod": 1 },
-		{ "ID": 3, "ResourceName": "Bake_ShootingRange", "AttendAnim":[ "attend_3", "attend_4" ], "LoadMethod": 1 },
-		{ "ID": 4, "ResourceName": "Bake_Stadium@2000", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 },
-		{ "ID": 5, "ResourceName": "Bake_Industry zone", "AttendAnim":[ "attend_1", "attend_2" ], "LoadMethod": 1 }
-	], 
 	"GameConfig":[
 		{ "id": 1, "CrosshairPosition":[ 0, -0.15, 0 ], "CrosshairRotation":[ 0, 180, 0 ], "CrosshairScale":[ 0.5, 0.5, 0.5 ], "CameraHorizontalFreeRange":[ 0, 0 ], "CameraVerticalFreeRange":[ 0, 0 ], "HumanHorizontalFreeArea":[ -15, 15 ], "HumanVerticalFreeArea":[ -22, 10 ], "EyeCamReadyFOV": 34, "EyeCamReadyPosZ": 0.85, "HumanRotRatio":[ 0.004, 0.004 ], "BulletFlyRatio": 300, "ShootingPreparationSpeed": 1.5, "ShootingFocusDelay": 0.1, "ShootingFocusDuration": 0.4, "ShotgunShrapnels": 0, "ShotgunRange": 0.02, "ShotgunSensitivity": 1.2, "CsGunSensitivity": 1 }
 	], 
@@ -12733,7 +12733,7 @@
 	], 
 	"WeaponPart":[
 		{ "id": 1, "weaponID": 1, "partType": 5, "muzzlePos":[  ], "equipLevel": 1, "gameObjectName": "bayonet" },
-		{ "id": 2, "weaponID": 1, "partType": 2, "muzzlePos":[  ], "equipLevel": 2, "gameObjectName": "cheeksupport" },
+		{ "id": 2, "weaponID": 1, "partType": 4, "muzzlePos":[  ], "equipLevel": 2, "gameObjectName": "cheeksupport" },
 		{ "id": 3, "weaponID": 11, "partType": 1, "muzzlePos":[  ], "equipLevel": 1, "gameObjectName": "scope" },
 		{ "id": 4, "weaponID": 11, "partType": 3, "muzzlePos":[ 0, 0, 0.0006 ], "equipLevel": 2, "gameObjectName": "muzzle" },
 		{ "id": 5, "weaponID": 11, "partType": 4, "muzzlePos":[  ], "equipLevel": 3, "gameObjectName": "cheeksupport" },

snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/1.prefab

@@ -561,7 +561,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
       propertyPath: m_Layer
-      value: 10
+      value: 21
       objectReference: {fileID: 0}
     - target: {fileID: 100000, guid: 77035568ca8ba3f47845deaa9d3c5e9c, type: 3}
       propertyPath: m_IsActive

snipershooting/ShootSniper/Assets/Resources_moved/Weapon/WeaponInventory/16.prefab

@@ -159,8 +159,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parts:
-  - partType: 1
-    weaponPart: {fileID: 8289116718511153689}
   - partType: 3
     weaponPart: {fileID: 8799660252963293558}
   hologramMat: {fileID: 2100000, guid: 955061dc565ec364a8beaedb2661505e, type: 2}
@@ -762,6 +760,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: ccbb5773aff9c784e9368a70ffa15010, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ccbb5773aff9c784e9368a70ffa15010, type: 3}
       propertyPath: m_RootOrder
       value: 0

snipershooting/ShootSniper/Assets/Scripts/UIScript/Controller/WeaponStrengthenSubUICtrl.cs

@@ -414,7 +414,7 @@ namespace SSTRGame {
         /// </summary>
         private void OnClickRifleBtn(bool value) {
 
-            SSTRCore.Core.Sound.Play(SSTR.Sound.SoundEnum.UI_AnNiu.ToString(), SSTR.Sound.MuteType.SoundEff, false);//��Ч--��ť��Ч
+            // SSTRCore.Core.Sound.Play(SSTR.Sound.SoundEnum.UI_AnNiu.ToString(), SSTR.Sound.MuteType.SoundEff, false);//��Ч--��ť��Ч
             // m_toggle_shotGun.SetIsSelect(false);
             FastSwitching(0, WeaponUpgradeSource.Instance.m_equippedIndexInType0);
         }

snipershooting/ShootSniper/Assets/ShootGame/Scripts/GameData/TableData.cs

@@ -16,6 +16,11 @@ namespace SSTRGame
 		public tabtoy.Logger TableLogger = new tabtoy.Logger();
 	
 		
+		/// <summary> 
+		/// FieldShapeData
+		/// </summary>
+		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
+		
 		/// <summary> 
 		/// ChallengeData
 		/// </summary>
@@ -26,11 +31,6 @@ namespace SSTRGame
 		/// </summary>
 		public List<FieldDataDefine> FieldData = new List<FieldDataDefine>(); 
 		
-		/// <summary> 
-		/// FieldShapeData
-		/// </summary>
-		public List<FieldShapeDataDefine> FieldShapeData = new List<FieldShapeDataDefine>(); 
-		
 		/// <summary> 
 		/// GameConfig
 		/// </summary>
@@ -88,7 +88,23 @@ namespace SSTRGame
 	
 	
 		#region Index code
-	 	Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
+	 	Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
+        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
+        {
+            FieldShapeDataDefine ret;
+            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
+            {
+                return ret;
+            }
+			
+			if ( def == default(FieldShapeDataDefine) )
+			{
+				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
+			}
+
+            return def;
+        }
+		Dictionary<int, ChallengeDataDefine> _ChallengeDataByID = new Dictionary<int, ChallengeDataDefine>();
         public ChallengeDataDefine GetChallengeDataByID(int ID, ChallengeDataDefine def = default(ChallengeDataDefine))
         {
             ChallengeDataDefine ret;
@@ -118,22 +134,6 @@ namespace SSTRGame
 				TableLogger.ErrorLine("GetFieldDataByID failed, ID: {0}", ID);
 			}
 
-            return def;
-        }
-		Dictionary<int, FieldShapeDataDefine> _FieldShapeDataByID = new Dictionary<int, FieldShapeDataDefine>();
-        public FieldShapeDataDefine GetFieldShapeDataByID(int ID, FieldShapeDataDefine def = default(FieldShapeDataDefine))
-        {
-            FieldShapeDataDefine ret;
-            if ( _FieldShapeDataByID.TryGetValue( ID, out ret ) )
-            {
-                return ret;
-            }
-			
-			if ( def == default(FieldShapeDataDefine) )
-			{
-				TableLogger.ErrorLine("GetFieldShapeDataByID failed, ID: {0}", ID);
-			}
-
             return def;
         }
 		Dictionary<int, GameConfigDefine> _GameConfigByid = new Dictionary<int, GameConfigDefine>();
@@ -343,17 +343,17 @@ namespace SSTRGame
                 { 
                 	case 0xa0000:
                 	{
-						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
+						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0001:
                 	{
-						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
+						ins.ChallengeData.Add( reader.ReadStruct<ChallengeDataDefine>(ChallengeDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0002:
                 	{
-						ins.FieldShapeData.Add( reader.ReadStruct<FieldShapeDataDefine>(FieldShapeDataDefineDeserializeHandler) );
+						ins.FieldData.Add( reader.ReadStruct<FieldDataDefine>(FieldDataDefineDeserializeHandler) );
                 	}
                 	break; 
                 	case 0xa0003:
@@ -415,6 +415,15 @@ namespace SSTRGame
              } 
 
 			
+			// Build FieldShapeData Index
+			for( int i = 0;i< ins.FieldShapeData.Count;i++)
+			{
+				var element = ins.FieldShapeData[i];
+				
+				ins._FieldShapeDataByID.Add(element.ID, element);
+				
+			}
+			
 			// Build ChallengeData Index
 			for( int i = 0;i< ins.ChallengeData.Count;i++)
 			{
@@ -433,15 +442,6 @@ namespace SSTRGame
 				
 			}
 			
-			// Build FieldShapeData Index
-			for( int i = 0;i< ins.FieldShapeData.Count;i++)
-			{
-				var element = ins.FieldShapeData[i];
-				
-				ins._FieldShapeDataByID.Add(element.ID, element);
-				
-			}
-			
 			// Build GameConfig Index
 			for( int i = 0;i< ins.GameConfig.Count;i++)
 			{
@@ -542,20 +542,20 @@ namespace SSTRGame
 			}
 			
 		}
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_ChallengeDataDefineDeserializeHandler == null )
+				if (_FieldShapeDataDefineDeserializeHandler == null )
 				{
-					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
+					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
 				}
 
-				return _ChallengeDataDefineDeserializeHandler;
+				return _FieldShapeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -568,34 +568,29 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x10001:
+                	case 0x60001:
                 	{
-						ins.FieldID = reader.ReadInt32();
+						ins.ResourceName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10002:
+                	case 0x60002:
                 	{
-						ins.DecStaminaCnt = reader.ReadInt32();
+						ins.EnvSoundName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10003:
+                	case 0x60003:
                 	{
-						ins.ConstraintType = reader.ReadInt32();
+						ins.EnvParticleName = reader.ReadString();
                 	}
                 	break; 
-                	case 0x10004:
+                	case 0x60004:
                 	{
-						ins.ConstraintValue = reader.ReadInt32();
+						ins.AttendAnim.Add( reader.ReadString() );
                 	}
                 	break; 
                 	case 0x10005:
                 	{
-						ins.Condition.Add( reader.ReadInt32() );
-                	}
-                	break; 
-                	case 0x10006:
-                	{
-						ins.Reward_ID_1 = reader.ReadInt32();
+						ins.LoadMethod = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -603,20 +598,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> _ChallengeDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<ChallengeDataDefine> ChallengeDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldDataDefineDeserializeHandler == null )
+				if (_ChallengeDataDefineDeserializeHandler == null )
 				{
-					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
+					_ChallengeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<ChallengeDataDefine>(Deserialize);
 				}
 
-				return _FieldDataDefineDeserializeHandler;
+				return _ChallengeDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( ChallengeDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -631,22 +626,32 @@ namespace SSTRGame
                 	break; 
                 	case 0x10001:
                 	{
-						ins.RoundFactorGroupID = reader.ReadInt32();
+						ins.FieldID = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10002:
                 	{
-						ins.FieldShapeID = reader.ReadInt32();
+						ins.DecStaminaCnt = reader.ReadInt32();
                 	}
                 	break; 
                 	case 0x10003:
                 	{
-						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
+						ins.ConstraintType = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60004:
+                	case 0x10004:
                 	{
-						ins.Mark = reader.ReadString();
+						ins.ConstraintValue = reader.ReadInt32();
+                	}
+                	break; 
+                	case 0x10005:
+                	{
+						ins.Condition.Add( reader.ReadInt32() );
+                	}
+                	break; 
+                	case 0x10006:
+                	{
+						ins.Reward_ID_1 = reader.ReadInt32();
                 	}
                 	break; 
                 }
@@ -654,20 +659,20 @@ namespace SSTRGame
 
 			
 		}
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> _FieldShapeDataDefineDeserializeHandler;
-		static tabtoy.DeserializeHandler<FieldShapeDataDefine> FieldShapeDataDefineDeserializeHandler
+		static tabtoy.DeserializeHandler<FieldDataDefine> _FieldDataDefineDeserializeHandler;
+		static tabtoy.DeserializeHandler<FieldDataDefine> FieldDataDefineDeserializeHandler
 		{
 			get
 			{
-				if (_FieldShapeDataDefineDeserializeHandler == null )
+				if (_FieldDataDefineDeserializeHandler == null )
 				{
-					_FieldShapeDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldShapeDataDefine>(Deserialize);
+					_FieldDataDefineDeserializeHandler = new tabtoy.DeserializeHandler<FieldDataDefine>(Deserialize);
 				}
 
-				return _FieldShapeDataDefineDeserializeHandler;
+				return _FieldDataDefineDeserializeHandler;
 			}
 		}
-		public static void Deserialize( FieldShapeDataDefine ins, tabtoy.DataReader reader )
+		public static void Deserialize( FieldDataDefine ins, tabtoy.DataReader reader )
 		{
 			
  			int tag = -1;
@@ -680,29 +685,24 @@ namespace SSTRGame
 						ins.ID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60001:
+                	case 0x10001:
                 	{
-						ins.ResourceName = reader.ReadString();
+						ins.RoundFactorGroupID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60002:
+                	case 0x10002:
                 	{
-						ins.EnvSoundName = reader.ReadString();
+						ins.FieldShapeID = reader.ReadInt32();
                 	}
                 	break; 
-                	case 0x60003:
+                	case 0x10003:
                 	{
-						ins.EnvParticleName = reader.ReadString();
+						ins.DefaultPlayerPos.Add( reader.ReadInt32() );
                 	}
                 	break; 
                 	case 0x60004:
                 	{
-						ins.AttendAnim.Add( reader.ReadString() );
-                	}
-                	break; 
-                	case 0x10005:
-                	{
-						ins.LoadMethod = reader.ReadInt32();
+						ins.Mark = reader.ReadString();
                 	}
                 	break; 
                 }
@@ -1885,9 +1885,9 @@ namespace SSTRGame
 		#region Clear Code
 		public void Clear( )
 		{			
+				FieldShapeData.Clear(); 		
 				ChallengeData.Clear(); 		
 				FieldData.Clear(); 		
-				FieldShapeData.Clear(); 		
 				GameConfig.Clear(); 		
 				Language.Clear(); 		
 				Level.Clear(); 		
@@ -1900,9 +1900,9 @@ namespace SSTRGame
 				WeaponPart.Clear(); 		
 				WeaponProperty.Clear(); 
 			
+				_FieldShapeDataByID.Clear(); 
 				_ChallengeDataByID.Clear(); 
 				_FieldDataByID.Clear(); 
-				_FieldShapeDataByID.Clear(); 
 				_GameConfigByid.Clear(); 
 				_LanguageByid.Clear(); 
 				_LevelByID.Clear(); 
@@ -1920,9 +1920,9 @@ namespace SSTRGame
 
 	} 
 
-	// Defined in table: ChallengeData
+	// Defined in table: FieldShapeData
 	
-	public partial class ChallengeDataDefine
+	public partial class FieldShapeDataDefine
 	{
 	
 		
@@ -1932,30 +1932,29 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int FieldID = 0; 
-		
-		
-		public int DecStaminaCnt = 0; 
-		
+		public string ResourceName = ""; 
 		
-		public int ConstraintType = 0; 
 		
+		public string EnvSoundName = ""; 
 		
-		public int ConstraintValue = 0; 
 		
+		public string EnvParticleName = ""; 
 		
-		public List<int> Condition = new List<int>(); 
+		/// <summary> 
+		/// 开场动画，多选一
+		/// </summary>
+		public List<string> AttendAnim = new List<string>(); 
 		
 		
-		public int Reward_ID_1 = 0; 
+		public int LoadMethod = 0; 
 	
 	
 
 	} 
 
-	// Defined in table: FieldData
+	// Defined in table: ChallengeData
 	
-	public partial class FieldDataDefine
+	public partial class ChallengeDataDefine
 	{
 	
 		
@@ -1965,24 +1964,30 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public int RoundFactorGroupID = 0; 
+		public int FieldID = 0; 
 		
 		
-		public int FieldShapeID = 0; 
+		public int DecStaminaCnt = 0; 
 		
 		
-		public List<int> DefaultPlayerPos = new List<int>(); 
+		public int ConstraintType = 0; 
 		
 		
-		public string Mark = ""; 
+		public int ConstraintValue = 0; 
+		
+		
+		public List<int> Condition = new List<int>(); 
+		
+		
+		public int Reward_ID_1 = 0; 
 	
 	
 
 	} 
 
-	// Defined in table: FieldShapeData
+	// Defined in table: FieldData
 	
-	public partial class FieldShapeDataDefine
+	public partial class FieldDataDefine
 	{
 	
 		
@@ -1992,21 +1997,16 @@ namespace SSTRGame
 		public int ID = 0; 
 		
 		
-		public string ResourceName = ""; 
-		
+		public int RoundFactorGroupID = 0; 
 		
-		public string EnvSoundName = ""; 
 		
+		public int FieldShapeID = 0; 
 		
-		public string EnvParticleName = ""; 
 		
-		/// <summary> 
-		/// 开场动画，多选一
-		/// </summary>
-		public List<string> AttendAnim = new List<string>(); 
+		public List<int> DefaultPlayerPos = new List<int>(); 
 		
 		
-		public int LoadMethod = 0; 
+		public string Mark = "";