Merge branch 'AnHui_BaoShi' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into AnHui_BaoShi

Assets/Art/Models/AnHui/SM_GuangXianDeng/SM_Xiantou.FBX.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 9f5787b108ca9ae449ffc274a7e1ac15
+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/Scripts/UI/UIFengGuangJingBSKPanel.cs

@@ -14,6 +14,9 @@ namespace QFramework.Example
 		protected override void OnInit(IUIData uiData = null)
 		{
 			mData = uiData as UIFengGuangJingBSKPanelData ?? new UIFengGuangJingBSKPanelData();
+			
+			TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitEvent);
+			
 			// please add init code here
 			BS.GetComponent<Toggle>().onValueChanged.AddListener((isOn) =>
 			{
@@ -37,6 +40,10 @@ namespace QFramework.Example
 			});
 		}
 
+		private void OnModuleQuitEvent(OnModuleQuit quit)
+		{
+			Hide();
+		}
 		private void SelectBaoShi(string baoShiName)
 		{
 			FenGuangJingSceneCtrl fenGuangJingSceneCtrl = GameObject.FindObjectOfType<FenGuangJingSceneCtrl>();
@@ -45,7 +52,6 @@ namespace QFramework.Example
 				fenGuangJingSceneCtrl.SelectBaoShi(baoShiName);
 			}
 			StringEventSystem.Global.Send("InputUIʹÓýáÊø");
-			Destroy(gameObject);
 		}
 		protected override void OnOpen(IUIData uiData = null)
 		{
@@ -53,6 +59,11 @@ namespace QFramework.Example
 		
 		protected override void OnShow()
 		{
+			BS.GetComponent<Toggle>().isOn = false;
+			ZML.GetComponent<Toggle>().isOn = false;
+			HBS.GetComponent<Toggle>().isOn = false;
+			HSJJS.GetComponent<Toggle>().isOn = false;
+			LBS.GetComponent<Toggle>().isOn = false;
 		}
 		
 		protected override void OnHide()
@@ -61,6 +72,7 @@ namespace QFramework.Example
 		
 		protected override void OnClose()
 		{
+			TypeEventSystem.Global.UnRegister<OnModuleQuit>(OnModuleQuitEvent);
 		}
 	}
 }