Merge remote-tracking branch 'origin/L_uo'

Assets/DC/地形/辽宁鞍山.fbx.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 0c2560a94cc81c9439db46f6951c9f54
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DC/辽宁鞍山.prefab

@@ -0,0 +1,59 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &6349171719633431500
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}
+      propertyPath: m_Name
+      value: "\u8FBD\u5B81\u978D\u5C71"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0c2560a94cc81c9439db46f6951c9f54, type: 3}

Assets/DC/辽宁鞍山.prefab.meta

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

Assets/_FishingMaster/Scenes/Liaoning_AnShan_Lishan_Dayuecheng.unity.meta

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

Assets/_FishingMaster/Scripts/Manager/GameManager.cs

@@ -21,7 +21,7 @@ public enum GamePlace
     // Test = -1,
     Company1Floor = 0,  
     Company1FloorShiwai=-999,
-    LiaoningAnShan = 1,
+    LiaoningAnShan = 1,//否
     Liaoning_AnShan_Lishan_Dayuecheng =-1,
     HangZhouLongHuTianJie = 2,
     Nanjing_Yuhua_Wanxiang = 3,
@@ -105,6 +105,17 @@ public enum GamePlace
     Hunan_Xiangxi_Yongshun_XintiandiShangchang=67,
     Shanxi_Yuncheng_Yanhu_WandaGuangchang = 68,
     Bejing_Miyun_RuijiaShangchang = 69,
+    Henan_Kaifeng_Longting_XihuJingqu = 70,
+    Henan_Kaifeng_Longting_XihuJingqu_Shiwai = 71,
+    Jiangxi_Nanchang_Xihu_NanchangDongwuyuan = 72,//否
+    Liaoning_Panjin_Xinglongtai_Shuiyoucheng = 73,
+    Shanxi_Yulin_Shenmu_Liuta_Yuyuecheng = 74,
+    Sichuan_Liangshan_Mianning_GaoyangJiedao = 75,
+    Jiangxi_Nanchang_Xihu_NanchangDongwuyuan_Shinei = 76,//否
+    Ningxia_Yinchuan_Xingqing_XinhuaBaihuo = 77,
+    Liaoning_Huludao_Jianchang_XinglongDajiating = 78,
+    Ningxia_Yinchuan_Xingqing_XinhuaBaihuo_Shiwai = 79,
+    Ningxia_Wuzhong_Litong_YiwuShangmaocheng = 80,
 }
 
 public enum GameKey

Assets/_FishingMaster/Scripts/UI/LoginPanel.cs

@@ -156,8 +156,8 @@ public class LoginPanel : MonoBehaviour
             WorldUIManager.Ins.Back();
         CoroutineTaskManager.Instance.WaitSecondTodo(() =>
         {
-            GameManager.Ins.CreateGameStartPoint();
-            //GameManager.Ins.CreateAICharacter();
+            //GameManager.Ins.CreateGameStartPoint();
+            GameManager.Ins.CreateAICharacter();
         }, 1);