Browse Source

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 3 weeks ago
parent
commit
ebff32479f
38 changed files with 820 additions and 328 deletions
  1. 8 0
      Assets/Res/Config/LanguageChineseConfig.json
  2. 11 11
      Assets/Res/Config/LanguageChineseConfig_skill.json
  3. 12 3
      Assets/Res/Config/SkiptoConfig.json
  4. 8 0
      Assets/Res/Config/UnlockConfig.json
  5. 330 5
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  6. 3 3
      Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab
  7. 2 2
      Assets/Res/UI/MainPanel/MainPanel.prefab
  8. 1 1
      Assets/Res/UI/ShopPanel/ShopPanel.prefab
  9. 1 2
      Assets/Scripts/Core/Utility/Helper/TimeHelper.cs
  10. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs
  11. 3 0
      Assets/Scripts/GameLogic/Combat/CombatEvent/TriggerSkillSlotsEventData.cs
  12. 16 1
      Assets/Scripts/GameLogic/Combat/Skill/S2011.cs
  13. 14 7
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  14. 8 0
      Assets/Scripts/GameLogic/Player/PlayerManager.cs
  15. 3 3
      Assets/Scripts/GameLogic/Shop/ShopManger.cs
  16. 6 2
      Assets/Scripts/GameLogic/UnLock/ULockManager.cs
  17. 7 0
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  18. 5 0
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  19. 11 0
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanelData.cs
  20. 7 1
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs
  21. 6 2
      Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouGuaJiPanel.cs
  22. 6 1
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs
  23. 5 0
      Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs
  24. 34 25
      Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs
  25. 5 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs
  26. 3 0
      Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs
  27. 8 8
      Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs
  28. 1 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs
  29. 23 2
      Assets/Scripts/GameUI/Utility/SkiptoHelper.cs
  30. BIN
      Excel2Json/Excel/Language.xlsx
  31. BIN
      Excel2Json/Excel/Language_skill.xlsx
  32. BIN
      Excel2Json/Excel/Skipto.xlsx
  33. BIN
      Excel2Json/Excel/Unlock.xlsx
  34. BIN
      Excel2Json/Excel/skill.xlsx
  35. BIN
      HaiWai.keystore
  36. 8 8
      ProjectSettings/ProjectSettings.asset
  37. 263 240
      UserSettings/Layouts/default-2022.dwlt
  38. 1 0
      XiuXianGame.sln.DotSettings.user

+ 8 - 0
Assets/Res/Config/LanguageChineseConfig.json

@@ -40235,6 +40235,14 @@
     {
       "ID": 10799,
       "txt": "重置会完全返还升级消耗的经验和灵石(不影响星级),确认么?"
+    },
+    {
+      "ID": 10800,
+      "txt": "可获得双倍奖励,但需要再看一次广告,确认吗?"
+    },
+    {
+      "ID": 10801,
+      "txt": "达到{0}解锁!"
     }
   ]
 }

+ 11 - 11
Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2826,27 +2826,27 @@
     },
     {
       "ID": 1120110,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120111,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120112,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120113,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120114,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120115,
-      "txt": "所有流血状态造成的伤害会转换成充能值,轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120120,
@@ -5134,23 +5134,23 @@
     },
     {
       "ID": 1235021,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235022,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235023,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235024,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1235025,
-      "txt": "0"
+      "txt": ""
     }
   ]
 }

+ 12 - 3
Assets/Res/Config/SkiptoConfig.json

@@ -32,7 +32,10 @@
         6
       ],
       "SkipTxt": 10357,
-      "UnlockType": 0,
+      "UnlockType": 1,
+      "UnlockPara1": [
+        2
+      ],
       "UnlockPara2": 0
     },
     {
@@ -62,7 +65,10 @@
         6
       ],
       "SkipTxt": 10356,
-      "UnlockType": 0,
+      "UnlockType": 1,
+      "UnlockPara1": [
+        2
+      ],
       "UnlockPara2": 0
     },
     {
@@ -81,7 +87,10 @@
         4
       ],
       "SkipTxt": 10359,
-      "UnlockType": 0,
+      "UnlockType": 1,
+      "UnlockPara1": [
+        2
+      ],
       "UnlockPara2": 0
     },
     {

+ 8 - 0
Assets/Res/Config/UnlockConfig.json

@@ -7,6 +7,14 @@
       "ulockValue": 21,
       "lockType": 1,
       "UnlockTipsID": 0
+    },
+    {
+      "ID": 2,
+      "ulockFunction": 2,
+      "ulockCondition": 1,
+      "ulockValue": 10,
+      "lockType": 2,
+      "UnlockTipsID": 10801
     }
   ]
 }

+ 330 - 5
Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -398,6 +398,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &598771742048949026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 475219414390122298}
+  - component: {fileID: 5996369394632895734}
+  - component: {fileID: 8740975459501369530}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &475219414390122298
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 598771742048949026}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1376396851648066729}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 124, y: 48.2731}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &5996369394632895734
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 598771742048949026}
+  m_CullTransparentMesh: 1
+--- !u!114 &8740975459501369530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 598771742048949026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8196079, g: 0.9568628, b: 0.9176471, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u793C\u5305\u7801"
 --- !u!1 &701047435480110982
 GameObject:
   m_ObjectHideFlags: 0
@@ -492,6 +572,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10167
+--- !u!1 &951008146003287058
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5311892624620694022}
+  - component: {fileID: 6333362284424375891}
+  - component: {fileID: 6388989168176358981}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5311892624620694022
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 951008146003287058}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1376396851648066729}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 11.3}
+  m_SizeDelta: {x: 65, y: 66}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6333362284424375891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 951008146003287058}
+  m_CullTransparentMesh: 1
+--- !u!114 &6388989168176358981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 951008146003287058}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xuanxiang_beibao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1058212698097100470
 GameObject:
   m_ObjectHideFlags: 0
@@ -581,6 +750,142 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &1108212200417759946
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1376396851648066729}
+  - component: {fileID: 7087839982332542890}
+  - component: {fileID: 8067561739867245123}
+  - component: {fileID: 1621677913027749549}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Cdk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1376396851648066729
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108212200417759946}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 475219414390122298}
+  - {fileID: 5311892624620694022}
+  m_Father: {fileID: 2303318506788104112}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 288.34, y: 0}
+  m_SizeDelta: {x: 125, y: 158}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7087839982332542890
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108212200417759946}
+  m_CullTransparentMesh: 1
+--- !u!114 &8067561739867245123
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108212200417759946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xuanxiang_db
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
+  imageH: 79
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1621677913027749549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108212200417759946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8067561739867245123}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1139307306350664606
 GameObject:
   m_ObjectHideFlags: 0
@@ -2668,6 +2973,7 @@ GameObject:
   - component: {fileID: 7753631802842447130}
   - component: {fileID: 553848956453578161}
   - component: {fileID: 5335756367815044491}
+  - component: {fileID: 8385758576203364448}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Shop
@@ -2879,6 +3185,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &8385758576203364448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4816422879295191460}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7334e4a874a3af244b6ba80884842db4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uLockFunction: 2
 --- !u!1 &4883639511437899985
 GameObject:
   m_ObjectHideFlags: 0
@@ -3021,6 +3340,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Cdk
+    gameObject: {fileID: 1621677913027749549}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5245840134221701572
 GameObject:
@@ -3946,12 +4270,13 @@ RectTransform:
   m_Children:
   - {fileID: 7683181027623438140}
   - {fileID: 125996766480416986}
+  - {fileID: 1376396851648066729}
   m_Father: {fileID: 5083944578448688889}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -430.97397, y: 158}
+  m_SizeDelta: {x: -142.63397, y: 158}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &8458182348485034973
 MonoBehaviour:
@@ -3975,8 +4300,8 @@ MonoBehaviour:
   m_StartAxis: 0
   m_CellSize: {x: 125, y: 158}
   m_Spacing: {x: 19.17, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_Constraint: 1
+  m_ConstraintCount: 4
 --- !u!114 &1138849642642618802
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4253,7 +4578,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 11.3}
-  m_SizeDelta: {x: 65, y: 66}
+  m_SizeDelta: {x: 82, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5778517210920101383
 CanvasRenderer:
@@ -4293,7 +4618,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xuanxiang_beibao
+  _icon_name: dec_xuanxiang_mingyunfeng
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

+ 3 - 3
Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab

@@ -231,11 +231,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5438064346362230487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 140, y: 172}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2811671220144649283
 CanvasRenderer:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1915,7 +1915,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 27.6952}
+  m_SizeDelta: {x: 99, y: 27.6952}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8449163745382179136
 CanvasRenderer:
@@ -2958,7 +2958,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -76.77969, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7635584099307227047
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/ShopPanel/ShopPanel.prefab

@@ -441,7 +441,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2518, y: -1942}
-  m_SizeDelta: {x: 1200, y: 1241}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6128091390146622782
 MonoBehaviour:

+ 1 - 2
Assets/Scripts/Core/Utility/Helper/TimeHelper.cs

@@ -63,8 +63,7 @@ namespace Fort23.Core
             var networkTime = await NetworkTime.GetNetworkTimeAsync();
             if (networkTime.HasValue)
             {
-                long networkMs = (long)(networkTime.Value - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc))
-                    .TotalMilliseconds;
+                long networkMs = networkTime.Value.Ticks / 10000;
 
                 if (!IsNetworkTimeReady)
                 {

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -15,7 +15,7 @@ namespace Excel2Json
 	public struct SkillConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		/// <summary>
-		///技能ID IDGroup+技能等级
+		///所有流血状态造成的伤害会转换成充能值,经过2次金经脉后对全体敌人造成{0}%充能值的伤害
 		/// </summary>
 #if !COMBAT_SERVER
 		public int ID;

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatEvent/TriggerSkillSlotsEventData.cs

@@ -9,6 +9,9 @@ namespace Common.Utility.CombatEvent
     {
         public SkillBasic SkillBasic;
         public SkillSlots SkillSlots;
+        /// <summary>
+        /// 金、水、木、火、土 0-4
+        /// </summary>
         public int triggerType;
         public bool isNotUseSkill;
         protected override void ProDispose()

+ 16 - 1
Assets/Scripts/GameLogic/Combat/Skill/S2011.cs

@@ -13,6 +13,7 @@ namespace GameLogic.Combat.Skill
     public class S2011 : SkillBasic
     {
         private long addHarm;
+        private int count;
 
         protected override void ProUseSkill()
         {
@@ -22,6 +23,8 @@ namespace GameLogic.Combat.Skill
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
             CombatEventManager.Instance.AddEventListener(CombatEventType.TriggerSkillSlots, TriggerSkillSlots);
+            count = 0;
+            addHarm = 0;
         }
 
         protected override void ProDispose()
@@ -33,8 +36,20 @@ namespace GameLogic.Combat.Skill
         private void TriggerSkillSlots(IEventData ieventData)
         {
             TriggerSkillSlotsEventData triggerSkillSlotsEventData = ieventData as TriggerSkillSlotsEventData;
-            if (triggerSkillSlotsEventData.SkillBasic == this && addHarm > 0)
+           
+            if (triggerSkillSlotsEventData.SkillBasic == this)
             {
+                if (triggerSkillSlotsEventData.triggerType != 0)
+                {
+                    return;
+                }
+
+                count++;
+                if (count < 2)
+                {
+                    return;
+                }
+
                 long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(addHarm, effectValue[0]);
                 if (v > 0)
                 {

+ 14 - 7
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -59,7 +59,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 洞府经验丹使用数量
         /// </summary>
         public int todayUseExpElixrPanelCount = 0;
-        
+
         public string playerName = "";
 
         /// <summary>
@@ -128,7 +128,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         //招募数据
         public List<SummonData> SummonDatas = new List<SummonData>();
-        
+
         public List<RedDot> RedDotDatas = new List<RedDot>();
 
 
@@ -141,7 +141,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 领取挂机每日掉落时间
         /// </summary>
         public long QiankundaiLingQuDailyDropTime;
-        
+
         /// <summary>
         /// 乾坤袋领取时间
         /// </summary>
@@ -158,7 +158,14 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public List<int> phaseKey = new List<int>();
         public List<int> phaseValue = new List<int>();
         public bool isAutoCombat;
+        public string playerId;
+
+        /// <summary>
+        /// 今天看广告的次数
+        /// </summary>
+        public int todayPlayAdsCount;
     }
+
     [System.Serializable]
     public class RedDot
     {
@@ -438,7 +445,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int curStep;
 
         public bool isCompleted;
-        
+
         public bool isCompleted1;
     }
 
@@ -473,10 +480,10 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int score;
 
         public List<SummonSocreData> summonSocreData = new List<SummonSocreData>();
-        
+
         public bool isSummonSocre;
     }
-    
+
     [System.Serializable]
     public class IntList
     {
@@ -707,7 +714,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             {
                 skillData.useIndex = 9;
             }
-          
+
             playerData.AllSkillDatas.Add(skillData);
         }
 

+ 8 - 0
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -40,6 +40,8 @@ public class PlayerManager : Singleton<PlayerManager>
     public HeroInfo yindaoHeroData;
 
     private string playerName;
+    
+    
 
     public string PlayerName
     {
@@ -80,6 +82,12 @@ public class PlayerManager : Singleton<PlayerManager>
         SetConfigs();
 
         InitGameData();
+        
+        
+        if (string.IsNullOrEmpty(AccountFileInfo.Instance.playerData.playerId))
+        {
+            AccountFileInfo.Instance.playerData.playerId = Guid.NewGuid().ToString();
+        }
 
         // int m = Random.Range(0, 4 * 60 * 1000);
         RandownDaoYou(gameConstantConfig.Daoyoushowuptime + 1000);

+ 3 - 3
Assets/Scripts/GameLogic/Shop/ShopManger.cs

@@ -101,9 +101,9 @@ public class ShopManger : Singleton<ShopManger>
         {
             if (!productDic.ContainsKey(adsIdentifier))
             {
-                string price = IAPManager.Instance.GetPrice(adsIdentifier);
-                if (price != "")
-                    productDic.Add(adsIdentifier, price);
+                // string price = IAPManager.Instance.GetPrice(adsIdentifier);
+                // if (price != "")
+                //     productDic.Add(adsIdentifier, price);
             }
         }
 #endif

+ 6 - 2
Assets/Scripts/GameLogic/UnLock/ULockManager.cs

@@ -127,8 +127,12 @@ public class ULockManager : Singleton<ULockManager>
         switch (unLockCondition)
         {
             case 1: //玩家境界
-                // LevelBattleConfig levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(unLockValue);
-                // tips = LanguageManager.Instance.Text(_config.UnlockTipsID, levelBattleConfig.levelName);
+                HeroPowerUpConfig levelBattleConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(unLockValue);
+                string jingjie =
+                    LanguageManager.Instance.Text(levelBattleConfig.jingjieLanIDs[0]) +
+                    LanguageManager.Instance.Text(levelBattleConfig.jingjieLanIDs[1]) +
+                    LanguageManager.Instance.Text(levelBattleConfig.jingjieLanIDs[2]);
+                tips = LanguageManager.Instance.Text(_config.UnlockTipsID, jingjie);
                 break;
 
         }

+ 7 - 0
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -43,6 +43,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
         divineSenseConfigs = ConfigComponent.Instance.GetAll<DivineSenseConfig>().ToList();
 
+        if (AccountFileInfo.Instance.playerData.divineSensePoint < 0)
+        {
+            AccountFileInfo.Instance.playerData.divineSensePoint = 0;
+            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
+            EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
+        }
+
         foreach (var eventConfig in eventConfigs)
         {
             if (eventConfig.XiantuID != 0)

+ 5 - 0
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -113,6 +113,11 @@ namespace Fort23.Mono
 
         public async void Btn_Shop_Click(int shopId = 0)
         {
+            if (!ULockManager.Instance.IsULock(2))
+            {
+                return;
+            }
+
             CloseMenu();
             if (currentOpenUIPanel is ShopPanel)
             {

+ 11 - 0
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanelData.cs

@@ -184,6 +184,17 @@ namespace Fort23.Mono
 	      return _Icon_Di;
 	     }
 	   }
+	  private Button _Btn_Cdk;
+	  public Button Btn_Cdk
+	   {
+	   get{
+	      if (_Btn_Cdk == null)
+	       {
+	         _Btn_Cdk  = GetUIUnit<Button>("Btn_Cdk"); 
+	       }
+	      return _Btn_Cdk;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 7 - 1
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -66,9 +66,15 @@ namespace Fort23.Mono
         {
             tenButton.onClick.AddListener(async () =>
             {
-#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+#if UNITY_ANDROID && !UNITY_EDITOR&& Ads
                 if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
+                    bool relust = await TipsPanle.OpenPnael(10800);
+                    if (!relust)
+                    {
+                        return;
+                    }
+
                     if (TakuSDKManager.Instance.IsReady())
                     {
                         bool isOK = await TakuSDKManager.Instance.ShowAutoAd();

+ 6 - 2
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouGuaJiPanel.cs

@@ -35,15 +35,19 @@ namespace Fort23.Mono
             {
                 UIManager.Instance.DormancyGComponent(daoYouGuaJiWidget);
             }
-
+            
             widgets.Clear();
 
             foreach (var keyValuePair in AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas)
             {
-                DaoYouGuaJiWidget daoYouGuaJiWidget = await UIManager.Instance.CreateGComponent<DaoYouGuaJiWidget>(null, Content);
+                DaoYouGuaJiWidget daoYouGuaJiWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouGuaJiWidget>(null, Content);
                 daoYouGuaJiWidget.CustomInit(keyValuePair);
                 widgets.Add(daoYouGuaJiWidget);
             }
+            
+            AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas.RemoveAll(p => p.isLeave && p.items.Count <= 0);
+            AccountFileInfo.Instance.SavePlayerData();
 
             base.Show();
         }

+ 6 - 1
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -262,7 +262,12 @@ namespace Fort23.Mono
 
         private void DivineSenceHuoQuWidgetOnClick(ItemWidgetBasic obj)
         {
-            SkiptoHelper.Skipto(5);
+            if(SkiptoHelper.IsSkipto(5))
+                SkiptoHelper.Skipto(5);
+            else
+            {
+                TipMessagePanel.OpenTipMessagePanel(SkiptoHelper.SkiptoTips(5));
+            }
         }
 
         private void GoOnClick(ItemWidgetBasic obj)

+ 5 - 0
Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs

@@ -91,6 +91,11 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             SkipToWidget skipToWidget = obj as SkipToWidget;
+            if (!SkiptoHelper.IsSkipto(skipToWidget.SkiptoConfig.ID))
+            {
+                TipMessagePanel.OpenTipMessagePanel(SkiptoHelper.SkiptoTips(skipToWidget.SkiptoConfig.ID));
+                return;
+            }
             isSkipto = true;
             await UIManager.Instance.HideUIUIPanel(this);
             SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);

+ 34 - 25
Assets/Scripts/GameUI/UI/DivineSence/SkipToWidget.cs

@@ -1,36 +1,45 @@
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
+using Mono.Utility;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "SkipToWidget"  )]
-	public partial class SkipToWidget : ItemWidgetBasic
-	{
-		public SkiptoConfig SkiptoConfig;
-		private void Init()
-		{
+    [UIBinding(prefab = "SkipToWidget")]
+    public partial class SkipToWidget : ItemWidgetBasic
+    {
+        public SkiptoConfig SkiptoConfig;
 
-		}
-		public override void AddEvent()
-		{
+        private void Init()
+        {
+        }
 
-		}
-		public override void DelEvent()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
+        public override void DelEvent()
+        {
+        }
 
-		}
-		
-		public void CustonInit(int skiptoId)
-		{
-			SkiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
-			Text_Name.text = LanguageManager.Instance.Text(SkiptoConfig.SkipTxt);
-		}
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
 
-	}
-}
+        public void CustonInit(int skiptoId)
+        {
+            if (!SkiptoHelper.IsSkipto(skiptoId))
+            {
+                transform.Gray();
+            }
+            else
+            {
+                transform.RecoverColor();
+            }
+
+            SkiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+            Text_Name.text = LanguageManager.Instance.Text(SkiptoConfig.SkipTxt);
+        }
+    }
+}

+ 5 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -71,6 +71,11 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             SkipToWidget skipToWidget = obj as SkipToWidget;
+            if (!SkiptoHelper.IsSkipto(skipToWidget.SkiptoConfig.ID))
+            {
+                TipMessagePanel.OpenTipMessagePanel(SkiptoHelper.SkiptoTips(skipToWidget.SkiptoConfig.ID));
+                return;
+            }
             isSkipto = true;
             await UIManager.Instance.HideUIUIPanel(this);
             

+ 3 - 0
Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs

@@ -35,6 +35,9 @@ namespace Fort23.Mono
             {
                 faBaoWidget = await UIManager.Instance.CreateGComponent<FaBaoWidget>(null, FaBaoRoot);
                 faBaoWidget.CustomInit(faBaoInfo, false);
+                faBaoWidget.transform.anchorMin = new Vector2(0.5f, 0.5f);
+                faBaoWidget.transform.anchorMax = new Vector2(0.5f, 0.5f);
+                faBaoWidget.transform.pivot = new Vector2(0.5f, 0.5f);
                 faBaoWidget.transform.anchoredPosition = Vector2.zero;
             }
             else

+ 8 - 8
Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -58,9 +58,15 @@ namespace Fort23.Mono
         {
             Btn_ShuangBei.onClick.AddListener(async () =>
             {
-#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+#if UNITY_ANDROID && !UNITY_EDITOR&& Ads
                 if (!PlayerManager.Instance.BagController.IsEnough(23001, 1))
                 {
+                    bool relust = await TipsPanle.OpenPnael(10800);
+                    if (!relust)
+                    {
+                        return;
+                    }
+
                     if (TakuSDKManager.Instance.IsReady())
                     {
                         bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
@@ -75,7 +81,6 @@ namespace Fort23.Mono
                     }
                 }
 
-        
 
 #endif
                 float beLv =
@@ -95,12 +100,7 @@ namespace Fort23.Mono
                 // UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
             });
 
-            Btn_LingQu.onClick.AddListener(async () =>
-            {
-                 UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
-
-                
-            });
+            Btn_LingQu.onClick.AddListener(async () => { UIManager.Instance.HideUIUIPanel<ShopGachaPanel>(); });
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)

+ 1 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -320,6 +320,7 @@ namespace Fort23.Mono
 
         public static async CTask<ShopPanel> OpenPanel(int shopId)
         {
+           
             ShopPanel shopPanel =
                 await UIManager.Instance.LoadAndOpenPanel<ShopPanel>(null, uiData: new object[] { shopId },
                     isFullUI: true);

+ 23 - 2
Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -13,6 +13,13 @@ namespace Mono.Utility
         {
             SkiptoConfig skiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
 
+            if (skiptoConfig.UnlockPara1 != null)
+            {
+                if (!ULockManager.Instance.IsULock(skiptoConfig.UnlockPara1[0]))
+                {
+                    return;
+                }
+            }
 
             switch (skiptoConfig.SkipID)
             {
@@ -86,9 +93,16 @@ namespace Mono.Utility
         }
 
 
-        public async static CTask<bool> IsSkipto(int skiptoId)
+        public  static bool IsSkipto(int skiptoId)
         {
             SkiptoConfig skiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+            if (skiptoConfig.UnlockType == 1 && skiptoConfig.UnlockPara1 != null)
+            {
+                if (!ULockManager.Instance.IsULock(skiptoConfig.UnlockPara1[0]))
+                {
+                    return false;
+                }
+            }
 
             switch (skiptoConfig.SkipID)
             {
@@ -101,8 +115,15 @@ namespace Mono.Utility
         }
 
 
-        public async static CTask SkiptoTips(int skiptoId)
+        public  static string SkiptoTips(int skiptoId)
         {
+             SkiptoConfig skiptoConfig = ConfigComponent.Instance.Get<SkiptoConfig>(skiptoId);
+             if (skiptoConfig.UnlockType == 1 && skiptoConfig.UnlockPara1 != null)
+             {
+                return ULockManager.Instance.ShowUnlockTips(skiptoConfig.UnlockPara1[0]);
+             }
+
+             return "";
         }
     }
 }

BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Language_skill.xlsx


BIN
Excel2Json/Excel/Skipto.xlsx


BIN
Excel2Json/Excel/Unlock.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
HaiWai.keystore


+ 8 - 8
ProjectSettings/ProjectSettings.asset

@@ -13,8 +13,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: XiuXian
-  productName: XiuXian
+  companyName: Spirit Way
+  productName: Spirit Way
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
@@ -186,7 +186,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.taptap.xy.yousanjie
+    Android: com.xy.hw.ysj002
     Standalone: com.DefaultCompany.XY002
   buildNumber:
     Standalone: 0
@@ -294,8 +294,8 @@ PlayerSettings:
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: '{inproject}: taptap.keystore'
-  AndroidKeyaliasName: com.taptap.xy.yousanjie
+  AndroidKeystoreName: '{inproject}: HaiWai.keystore'
+  AndroidKeyaliasName: com.xy.hw.ysj002
   AndroidEnableArmv9SecurityFeatures: 0
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0
@@ -303,7 +303,7 @@ PlayerSettings:
   AndroidEnableTango: 0
   androidEnableBanner: 1
   androidUseLowAccuracyLocation: 0
-  androidUseCustomKeystore: 0
+  androidUseCustomKeystore: 1
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -318,7 +318,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 84d8d83ce9b889c4caec6e3cd485591d, type: 3}
+      m_Icon: {fileID: 2800000, guid: 39648e0b29b3040439f1dd8b9cfbf068, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0
@@ -805,7 +805,7 @@ PlayerSettings:
   webGLMemoryGeometricGrowthCap: 96
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: KAMGAM_SKY_CLOUDS_URP;AMPLIFY_SHADER_EDITOR
+    Android: KAMGAM_SKY_CLOUDS_URP;AMPLIFY_SHADER_EDITOR;Google;Ads
     ArmLinux: KAMGAM_SKY_CLOUDS_URP
     ArmLinuxServer: KAMGAM_SKY_CLOUDS_URP
     EmbeddedLinux: KAMGAM_SKY_CLOUDS_URP

+ 263 - 240
UserSettings/Layouts/default-2022.dwlt

@@ -15,42 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u5C42\u7EA7"
-  m_RootView: {fileID: 3}
-  m_MinSize: {x: 875, y: 300}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 2}
+  m_MinSize: {x: 875, y: 492}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 593.00006
-    height: 962.00006
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
-  m_Panes:
-  - {fileID: 15}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,22 +37,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 3}
   - {fileID: 4}
   - {fileID: 5}
-  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &4
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -95,12 +69,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 2 by 3
---- !u!114 &5
+  m_LastLoadedLayoutName: 
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,8 +87,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 10}
+  - {fileID: 6}
   - {fileID: 7}
   - {fileID: 8}
   - {fileID: 9}
@@ -122,14 +95,14 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 181
+  controlID: 160
   draggingID: 0
---- !u!114 &6
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -145,11 +118,37 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 10}
+  - {fileID: 11}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1210
+    height: 1299
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 20
+  draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -165,15 +164,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 991.50006
+    x: 1210
     y: 0
-    width: 272.00006
-    height: 962.00006
+    width: 411
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &8
@@ -191,15 +190,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1263.5001
+    x: 1621
     y: 0
-    width: 287
-    height: 962.00006
+    width: 367
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &9
@@ -217,15 +216,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1550.5001
+    x: 1988
     y: 0
-    width: 369.5
-    height: 962.00006
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+    width: 572
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &10
@@ -243,18 +242,44 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 593.00006
+    x: 0
     y: 0
-    width: 398.5
-    height: 962.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 1210
+    height: 462
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 462
+    width: 1210
+    height: 837
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -269,15 +294,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 991.5001
-    y: 62.000008
-    width: 270.00006
-    height: 941.00006
+    x: 1210
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -291,9 +316,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: d2f5faff
-      m_LastClickedID: -330286
-      m_ExpandedIDs: d2f5fafff4f5faff02f6faff04f6faff0af6faff0cf6faff5ef6faff8ef6faff90f6faffa6f6faffa8f6faff0ef7faff10f7fafff8f8faff0ef9faff9410fbffa010fbffa83afbffac3afbffced4fbff6c2afcffa06cfcffae6cfcffbe6ffcfff283fcff7cfcfeff96fcfeffa0fcfeff86fdfeffa0fdfeffbcfdfeffcefdfeffe8fdfefffafdfeff04fefeff28fefeff4afefeff50fefeff70fefeff74fefeffa0fefeffb8fefeffecfefeff0afffeffac4dffffb84dffff2a59ffff2e59ffff50f5ffff06e200000a350500
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: b8faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -316,8 +341,8 @@ MonoBehaviour:
     m_LockTracker:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 5f4efb439b131e2438dc600aa42d6799
---- !u!114 &12
+  m_WindowGUID: 04280301a53bc2049aa83a6b220683ba
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -332,15 +357,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1550.5002
-    y: 62.000008
-    width: 368.5
-    height: 941.00006
+    x: 1988
+    y: 73
+    width: 571
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -364,7 +389,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -379,15 +404,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1263.5001
-    y: 62.000008
-    width: 285
-    height: 941.00006
+    x: 1621
+    y: 73
+    width: 365
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -399,7 +424,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: cs3
+    m_NameFilter: GAMER
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -409,24 +434,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI
+    - Assets/Scripts/GameStart
     m_Globs: []
-    m_OriginalText: cs3
+    m_OriginalText: GAMER
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI
+  - Assets/Scripts/GameStart
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 758.99994}
-    m_SelectedIDs: 2ceb0100
-    m_LastClickedID: 125740
-    m_ExpandedIDs: 00000000a06b00002ceb01002eeb010030eb010032eb010034eb010036eb010038eb01003aeb01003ceb01003eeb010040eb010042eb010044eb010046eb010048eb01004aeb01004ceb01004eeb010050eb010052eb010054eb010056eb010058eb01005aeb01005ceb01005eeb010060eb010062eb010064eb010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 68cb0000
+    m_LastClickedID: 52072
+    m_ExpandedIDs: 000000005ca8000066ca000068ca00006aca00006cca00006eca000070ca000072ca000074ca000076ca000078ca00007aca00007cca00007eca000080ca000082ca000084ca000086ca000088ca00008aca00008cca00008eca000090ca000092ca000094ca000096ca000098ca00009aca00009cca00009eca0000a0ca0000a2ca0000a4ca0000a6ca0000a8ca0000aaca0000acca0000e8ca000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -454,7 +479,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a06b00002ceb01002eeb010030eb010032eb010034eb010036eb010038eb01003aeb01003ceb01003eeb010040eb010042eb010044eb010046eb010048eb01004aeb01004ceb01004eeb010050eb010052eb010054eb010056eb010058eb01005aeb01005ceb01005eeb010060eb010062eb010064eb0100
+    m_ExpandedIDs: 000000005ca8000066ca000068ca00006aca00006cca00006eca000070ca000072ca000074ca000076ca000078ca00007aca00007cca00007eca000080ca000082ca000084ca000086ca000088ca00008aca00008cca00008eca000090ca000092ca000094ca000096ca000098ca00009aca00009cca00009eca0000a0ca0000a2ca0000a4ca0000a6ca0000a8ca0000aaca0000acca0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -485,20 +510,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: DaoYouWidgetItem
-      m_OriginalName: DaoYouWidgetItem
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 126580
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 0}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -509,8 +534,106 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 168.5
---- !u!114 &14
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 535
+    width: 1209
+    height: 816
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 00000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1209
+      height: 795
+    m_Scale: {x: 0.48953202, y: 0.48953202}
+    m_Translation: {x: 604.5, y: 397.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -1234.8528
+      y: -812
+      width: 2469.7056
+      height: 1624
+    m_MinimalGUI: 1
+  m_defaultScale: 0.48953202
+  m_LastWindowPixelSize: {x: 1209, y: 816}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -525,15 +648,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 593.00006
-    y: 62.000008
-    width: 396.5
-    height: 941.00006
+    x: 0
+    y: 73
+    width: 1209
+    height: 441
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -548,8 +671,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -150.50003, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: -164, y: -26}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -600,7 +723,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25.000002}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -626,7 +749,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
+      snapOffset: {x: 67.5, y: 1}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Orientation
@@ -860,7 +983,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 48}
+      snapOffset: {x: 48, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Hot Reload
@@ -882,19 +1005,19 @@ MonoBehaviour:
       size: {x: 0, y: 0}
       sizeOverriden: 0
     m_OverlaysVisible: 1
-  m_WindowGUID: 065d1b59bcb1e324a88b0dde833c9816
+  m_WindowGUID: 53cfeeb9763ebff40abf5319ed88148a
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.09878802, y: -0.10564497, z: 0.006092904}
+    m_Target: {x: 0, y: 0, z: 0}
     speed: 2
-    m_Value: {x: -0.09878802, y: -0.10564497, z: 0.006092904}
+    m_Value: {x: 0, y: 0, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -922,9 +1045,9 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -935,22 +1058,22 @@ MonoBehaviour:
         m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
-      m_Size: {x: 1, y: 1}
-    m_ShowGrid: 0
+      m_Size: {x: 0, y: 0}
+    m_ShowGrid: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_Size:
-    m_Target: 2.4765315
+    m_Target: 10
     speed: 2
-    m_Value: 2.4765315
+    m_Value: 10
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -966,110 +1089,10 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.045909274, y: 0.9190152, z: -0.11250179, w: -0.37502807}
+  m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &15
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 62.000008
-    width: 592.00006
-    height: 941.00006
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames:
-  - UnityEditor.DeviceSimulation.SimulatorWindow
-  m_SerializedViewValues:
-  - H:\XY002\XiuXianGame\Library\PlayModeViewStates\b4652468d0ce042489af29ed85be1384
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 2160, y: 3840}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -540.00006
-    m_HBaseRangeMax: 540.00006
-    m_VBaseRangeMin: -960.0001
-    m_VBaseRangeMax: 960.0001
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 592.00006
-      height: 920.00006
-    m_Scale: {x: 0.47916663, y: 0.47916663}
-    m_Translation: {x: 296.00003, y: 460.00003}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -617.73926
-      y: -960.0001
-      width: 1235.4785
-      height: 1920.0002
-    m_MinimalGUI: 1
-  m_defaultScale: 0.47916663
-  m_LastWindowPixelSize: {x: 1184, y: 1882}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 00000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}

+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -20,6 +20,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F13_003F4d8b1ee1_003FColor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F1c_003Fee10685f_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F61_003Fdc27fc5d_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACultureInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F69_003F81b4a42b_003FCultureInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACustomRenderTexture_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F8f_003F8149d2e1_003FCustomRenderTexture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>