From 5efbc1a28f8cdce1228bb87845f0921b35b22f56 Mon Sep 17 00:00:00 2001 From: yangqiwen <494909017@qq.com> Date: Fri, 21 Feb 2025 20:32:56 +0800 Subject: [PATCH] 1 --- assets/FrameWork/Main.ts | 2 +- .../GameRoomRes/Room18/prefab/Room18.prefab | 182 +++++++----------- assets/Scripts/GameRoomRes/Room18/Room18.ts | 3 +- assets/Scripts/GameStoryRes/GameStory22.ts | 3 +- assets/Scripts/MainScene/MainScene.ts | 11 +- .../kaikuangshanScript.meta} | 0 .../kaikuangshanScript}/KaiKuangFirstView.ts | 15 +- .../KaiKuangFirstView.ts.meta | 0 .../kaikuangshanScript}/KaiKuangMainView.ts | 23 ++- .../KaiKuangMainView.ts.meta | 0 .../gameComScript/ANodeReplaceCheckScript.ts | 1 + .../gameComScript/XianSuoMoveTouchScript.ts | 3 +- 12 files changed, 104 insertions(+), 139 deletions(-) rename assets/{GameRes/kaiKuang/script.meta => Scripts/kaikuangshanScript.meta} (100%) rename assets/{GameRes/kaiKuang/script => Scripts/kaikuangshanScript}/KaiKuangFirstView.ts (92%) rename assets/{GameRes/kaiKuang/script => Scripts/kaikuangshanScript}/KaiKuangFirstView.ts.meta (100%) rename assets/{GameRes/kaiKuang/script => Scripts/kaikuangshanScript}/KaiKuangMainView.ts (91%) rename assets/{GameRes/kaiKuang/script => Scripts/kaikuangshanScript}/KaiKuangMainView.ts.meta (100%) diff --git a/assets/FrameWork/Main.ts b/assets/FrameWork/Main.ts index 18aa7925..731db43a 100644 --- a/assets/FrameWork/Main.ts +++ b/assets/FrameWork/Main.ts @@ -46,7 +46,7 @@ export default class Main extends cc.Component { async onLoad() { this.wdyjrjsdkInit(); - this.checkDoubleTexture(); + //this.checkDoubleTexture(); if (AppPlatform.is_TT_GAME_custom()) { console.log = ()=>{} diff --git a/assets/GameRoomRes/Room18/prefab/Room18.prefab b/assets/GameRoomRes/Room18/prefab/Room18.prefab index 2b0a8c0d..0ee4d8ec 100644 --- a/assets/GameRoomRes/Room18/prefab/Room18.prefab +++ b/assets/GameRoomRes/Room18/prefab/Room18.prefab @@ -45,26 +45,23 @@ "__id__": 134 }, { - "__id__": 140 + "__id__": 139 }, { - "__id__": 160 + "__id__": 159 }, { - "__id__": 178 + "__id__": 177 } ], "_active": true, "_components": [ { - "__id__": 181 - }, - { - "__id__": 182 + "__id__": 180 } ], "_prefab": { - "__id__": 183 + "__id__": 181 }, "_opacity": 255, "_color": { @@ -2494,9 +2491,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "b4ab1d2e-616c-4801-87cb-c37000f80a97" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -5088,13 +5083,9 @@ } ], "_active": false, - "_components": [ - { - "__id__": 138 - } - ], + "_components": [], "_prefab": { - "__id__": 139 + "__id__": 138 }, "_opacity": 255, "_color": { @@ -5250,19 +5241,6 @@ "fileId": "31b0coxtRN/Z1hqgQ/xcHZ", "sync": false }, - { - "__type__": "44cda7O7kRKYJ0YDLrmrd6D", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 134 - }, - "_enabled": true, - "animationType": 0, - "stopTime": 5, - "touchNode": null, - "_id": "" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -5283,19 +5261,19 @@ }, "_children": [ { - "__id__": 141 + "__id__": 140 }, { - "__id__": 147 + "__id__": 146 }, { - "__id__": 153 + "__id__": 152 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 159 + "__id__": 158 }, "_opacity": 255, "_color": { @@ -5349,21 +5327,21 @@ "_name": "qiPao_0", "_objFlags": 0, "_parent": { - "__id__": 140 + "__id__": 139 }, "_children": [ { - "__id__": 142 + "__id__": 141 } ], "_active": false, "_components": [ { - "__id__": 145 + "__id__": 144 } ], "_prefab": { - "__id__": 146 + "__id__": 145 }, "_opacity": 255, "_color": { @@ -5417,17 +5395,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 141 + "__id__": 140 }, "_children": [], "_active": true, "_components": [ { - "__id__": 143 + "__id__": 142 } ], "_prefab": { - "__id__": 144 + "__id__": 143 }, "_opacity": 255, "_color": { @@ -5481,7 +5459,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 142 + "__id__": 141 }, "_enabled": true, "_materials": [ @@ -5525,7 +5503,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 141 + "__id__": 140 }, "_enabled": true, "_materials": [ @@ -5568,21 +5546,21 @@ "_name": "qiPao_1", "_objFlags": 0, "_parent": { - "__id__": 140 + "__id__": 139 }, "_children": [ { - "__id__": 148 + "__id__": 147 } ], "_active": false, "_components": [ { - "__id__": 151 + "__id__": 150 } ], "_prefab": { - "__id__": 152 + "__id__": 151 }, "_opacity": 255, "_color": { @@ -5636,17 +5614,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 147 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ { - "__id__": 149 + "__id__": 148 } ], "_prefab": { - "__id__": 150 + "__id__": 149 }, "_opacity": 255, "_color": { @@ -5700,7 +5678,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 148 + "__id__": 147 }, "_enabled": true, "_materials": [ @@ -5744,7 +5722,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 147 + "__id__": 146 }, "_enabled": true, "_materials": [ @@ -5787,21 +5765,21 @@ "_name": "qiPao_2", "_objFlags": 0, "_parent": { - "__id__": 140 + "__id__": 139 }, "_children": [ { - "__id__": 154 + "__id__": 153 } ], "_active": false, "_components": [ { - "__id__": 157 + "__id__": 156 } ], "_prefab": { - "__id__": 158 + "__id__": 157 }, "_opacity": 255, "_color": { @@ -5855,17 +5833,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 153 + "__id__": 152 }, "_children": [], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 154 } ], "_prefab": { - "__id__": 156 + "__id__": 155 }, "_opacity": 255, "_color": { @@ -5919,7 +5897,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 154 + "__id__": 153 }, "_enabled": true, "_materials": [ @@ -5963,7 +5941,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 153 + "__id__": 152 }, "_enabled": true, "_materials": [ @@ -6021,20 +5999,20 @@ }, "_children": [ { - "__id__": 161 + "__id__": 160 }, { - "__id__": 170 + "__id__": 169 } ], "_active": true, "_components": [ { - "__id__": 176 + "__id__": 175 } ], "_prefab": { - "__id__": 177 + "__id__": 176 }, "_opacity": 255, "_color": { @@ -6088,24 +6066,24 @@ "_name": "diTu", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 159 }, "_children": [ { - "__id__": 162 + "__id__": 161 } ], "_active": false, "_components": [ { - "__id__": 166 + "__id__": 165 }, { - "__id__": 168 + "__id__": 167 } ], "_prefab": { - "__id__": 169 + "__id__": 168 }, "_opacity": 255, "_color": { @@ -6159,20 +6137,20 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 161 + "__id__": 160 }, "_children": [], "_active": true, "_components": [ { - "__id__": 163 + "__id__": 162 }, { - "__id__": 164 + "__id__": 163 } ], "_prefab": { - "__id__": 165 + "__id__": 164 }, "_opacity": 255, "_color": { @@ -6226,7 +6204,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 162 + "__id__": 161 }, "_enabled": true, "_materials": [ @@ -6259,7 +6237,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 162 + "__id__": 161 }, "_enabled": true, "_color": { @@ -6288,7 +6266,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 161 + "__id__": 160 }, "_enabled": true, "_normalMaterial": null, @@ -6297,7 +6275,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 167 + "__id__": 166 } ], "_N$interactable": true, @@ -6358,7 +6336,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 160 + "__id__": 159 }, "component": "", "_componentId": "80d7bgwi4BEwLB3smYXVoys", @@ -6370,7 +6348,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 161 + "__id__": 160 }, "_enabled": true, "_materials": [ @@ -6423,21 +6401,21 @@ "_name": "textNode", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 159 }, "_children": [ { - "__id__": 171 + "__id__": 170 } ], "_active": false, "_components": [ { - "__id__": 174 + "__id__": 173 } ], "_prefab": { - "__id__": 175 + "__id__": 174 }, "_opacity": 255, "_color": { @@ -6491,17 +6469,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 170 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 171 } ], "_prefab": { - "__id__": 173 + "__id__": 172 }, "_opacity": 255, "_color": { @@ -6555,7 +6533,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 171 + "__id__": 170 }, "_enabled": true, "_materials": [ @@ -6599,7 +6577,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 169 }, "_enabled": true, "_materials": [ @@ -6642,14 +6620,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 160 + "__id__": 159 }, "_enabled": true, "diTu": { - "__id__": 161 + "__id__": 160 }, "textNode": { - "__id__": 170 + "__id__": 169 }, "_id": "" }, @@ -6675,11 +6653,11 @@ "_active": false, "_components": [ { - "__id__": 179 + "__id__": 178 } ], "_prefab": { - "__id__": 180 + "__id__": 179 }, "_opacity": 255, "_color": { @@ -6733,7 +6711,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 178 + "__id__": 177 }, "_enabled": true, "_materials": [ @@ -6743,9 +6721,7 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "30a58c90-6bab-4bad-9e96-5a9caeaa9983" - }, + "_spriteFrame": null, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -6798,16 +6774,6 @@ "_originalHeight": 0, "_id": "" }, - { - "__type__": "286a9+/9ypD9pxVAV3fHoae", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": true, - "_id": "" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Scripts/GameRoomRes/Room18/Room18.ts b/assets/Scripts/GameRoomRes/Room18/Room18.ts index 315d1ab5..aeae1ad6 100644 --- a/assets/Scripts/GameRoomRes/Room18/Room18.ts +++ b/assets/Scripts/GameRoomRes/Room18/Room18.ts @@ -1,12 +1,13 @@ import { ryw_Event } from "../../../FrameWork/Event/EventEnum"; import EventMgr from "../../../FrameWork/Event/EventMgr"; import Common5 from "../../../Platform/th/Common5"; + import TaskManager, { MainTaskIdEnum } from "../../JuQingChat/TaskManager"; import JuQingQiPao from "../../JuQingGuanQia/JuQingQiPao"; import BagManager from "../../Manager/BagManager"; import UserManager from "../../Manager/UserManager"; import PrefabManage from "../../PrefabManager/PrefabManage"; -import CccGame from "../../WenZiRes/WenZiCommon/CccGame"; + import GameBaseScript from "../GameBaseScript"; let gameConfig = { diff --git a/assets/Scripts/GameStoryRes/GameStory22.ts b/assets/Scripts/GameStoryRes/GameStory22.ts index 5070da62..5579cace 100644 --- a/assets/Scripts/GameStoryRes/GameStory22.ts +++ b/assets/Scripts/GameStoryRes/GameStory22.ts @@ -1,11 +1,12 @@ import { ryw_Event } from "../../FrameWork/Event/EventEnum"; import EventMgr from "../../FrameWork/Event/EventMgr"; import Common5 from "../../Platform/th/Common5"; +import CccGame from "../../WenZiRes/WordGame/gameComScript/CccGame/CccGame"; import GameBaseScript from "../GameRoomRes/GameBaseScript"; import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager"; import NewGuideScript from "../NewGuide/NewGuideScript"; import PrefabManage, { GameType } from "../PrefabManager/PrefabManage"; -import CccGame from "../WenZiRes/WenZiCommon/CccGame"; + import ChaDianListScript2 from "../WenZiRes/WenZiCommon/ChaDianListScript2"; import logPrefabScript from "../WenZiRes/WenZiCommon/logPrefabScript2"; const { ccclass, property } = cc._decorator; diff --git a/assets/Scripts/MainScene/MainScene.ts b/assets/Scripts/MainScene/MainScene.ts index 9cd14ac5..93670f71 100644 --- a/assets/Scripts/MainScene/MainScene.ts +++ b/assets/Scripts/MainScene/MainScene.ts @@ -10,20 +10,17 @@ import User from "../../FrameWork/User/User"; import AppPlatform from "../../FrameWork/Util/AppPlatform"; import Common5 from "../../Platform/th/Common5"; import CommonDefine from "../../Platform/th/CommonDefine"; -import TTAPI from "../../Platform/tt/TTAPI"; + import { GameStoryConfigData } from "../FirstSelectScene/GameStoryConfig"; -import ChaoCai from "../GameMethodRes/ChaoCai/ChaoCai"; -import YiMaJiang from "../GameMethodRes/YiMaJiang/YiMaJiang"; -import JuQingManager from "../JuQingChat/JuQingManager"; + import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager"; -import BagManager from "../Manager/BagManager"; -import DiaoLuoManager1 from "../Manager/DiaoLuoManager1"; + import FangChanManager from "../Manager/FangChanManager"; import InterfaceManager from "../Manager/InterfaceManager"; import LevelUpManager from "../Manager/LevelUpManager"; import MiShuManager from "../Manager/MiShuManager"; import ShipuManager from "../Manager/ShipuManager"; -import TanWeiManager from "../Manager/TanWeiManager"; + import UserManager from "../Manager/UserManager"; import ZaoCanManager from "../Manager/ZaoCanManager"; import ZiChanManager from "../Manager/ZiChanManager"; diff --git a/assets/GameRes/kaiKuang/script.meta b/assets/Scripts/kaikuangshanScript.meta similarity index 100% rename from assets/GameRes/kaiKuang/script.meta rename to assets/Scripts/kaikuangshanScript.meta diff --git a/assets/GameRes/kaiKuang/script/KaiKuangFirstView.ts b/assets/Scripts/kaikuangshanScript/KaiKuangFirstView.ts similarity index 92% rename from assets/GameRes/kaiKuang/script/KaiKuangFirstView.ts rename to assets/Scripts/kaikuangshanScript/KaiKuangFirstView.ts index bca32188..5a684381 100644 --- a/assets/GameRes/kaiKuang/script/KaiKuangFirstView.ts +++ b/assets/Scripts/kaikuangshanScript/KaiKuangFirstView.ts @@ -1,10 +1,11 @@ -import { ryw_Event } from "../../../FrameWork/Event/EventEnum"; -import EventMgr from "../../../FrameWork/Event/EventMgr"; -import User from "../../../FrameWork/User/User"; -import AppPlatform from "../../../FrameWork/Util/AppPlatform"; -import Common5 from "../../../Platform/th/Common5"; -import KaiKuangDataManage from "../../../Scripts/Manager/KaiKuangDataManage"; -import PrefabManage, { GameType } from "../../../Scripts/PrefabManager/PrefabManage"; +import { ryw_Event } from "../../FrameWork/Event/EventEnum"; +import EventMgr from "../../FrameWork/Event/EventMgr"; +import User from "../../FrameWork/User/User"; +import AppPlatform from "../../FrameWork/Util/AppPlatform"; +import Common5 from "../../Platform/th/Common5"; +import KaiKuangDataManage from "../Manager/KaiKuangDataManage"; +import PrefabManage, { GameType } from "../PrefabManager/PrefabManage"; + const {ccclass, property} = cc._decorator; diff --git a/assets/GameRes/kaiKuang/script/KaiKuangFirstView.ts.meta b/assets/Scripts/kaikuangshanScript/KaiKuangFirstView.ts.meta similarity index 100% rename from assets/GameRes/kaiKuang/script/KaiKuangFirstView.ts.meta rename to assets/Scripts/kaikuangshanScript/KaiKuangFirstView.ts.meta diff --git a/assets/GameRes/kaiKuang/script/KaiKuangMainView.ts b/assets/Scripts/kaikuangshanScript/KaiKuangMainView.ts similarity index 91% rename from assets/GameRes/kaiKuang/script/KaiKuangMainView.ts rename to assets/Scripts/kaikuangshanScript/KaiKuangMainView.ts index 060d4ef1..213b7706 100644 --- a/assets/GameRes/kaiKuang/script/KaiKuangMainView.ts +++ b/assets/Scripts/kaikuangshanScript/KaiKuangMainView.ts @@ -1,15 +1,14 @@ -import { ryw_Event } from "../../../FrameWork/Event/EventEnum"; -import EventMgr from "../../../FrameWork/Event/EventMgr"; -import User from "../../../FrameWork/User/User"; -import AppPlatform from "../../../FrameWork/Util/AppPlatform"; -import Common5 from "../../../Platform/th/Common5"; -import TaskManager, { MainTaskIdEnum } from "../../../Scripts/JuQingChat/TaskManager"; -import BagManager from "../../../Scripts/Manager/BagManager"; -import InterfaceManager from "../../../Scripts/Manager/InterfaceManager"; -import KaiKuangDataManage from "../../../Scripts/Manager/KaiKuangDataManage"; -import UserManager from "../../../Scripts/Manager/UserManager"; -import PrefabManage, { GameType } from "../../../Scripts/PrefabManager/PrefabManage"; -import GetAward from "../../../Scripts/SCommon/GetAward"; +import { ryw_Event } from "../../FrameWork/Event/EventEnum"; +import EventMgr from "../../FrameWork/Event/EventMgr"; +import User from "../../FrameWork/User/User"; +import AppPlatform from "../../FrameWork/Util/AppPlatform"; +import Common5 from "../../Platform/th/Common5"; +import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager"; +import BagManager from "../Manager/BagManager"; +import KaiKuangDataManage from "../Manager/KaiKuangDataManage"; +import UserManager from "../Manager/UserManager"; +import PrefabManage, { GameType } from "../PrefabManager/PrefabManage"; +import GetAward from "../SCommon/GetAward"; const {ccclass, property} = cc._decorator; diff --git a/assets/GameRes/kaiKuang/script/KaiKuangMainView.ts.meta b/assets/Scripts/kaikuangshanScript/KaiKuangMainView.ts.meta similarity index 100% rename from assets/GameRes/kaiKuang/script/KaiKuangMainView.ts.meta rename to assets/Scripts/kaikuangshanScript/KaiKuangMainView.ts.meta diff --git a/assets/WenZiRes/WordGame/gameComScript/ANodeReplaceCheckScript.ts b/assets/WenZiRes/WordGame/gameComScript/ANodeReplaceCheckScript.ts index 657922ba..4ccb0ade 100644 --- a/assets/WenZiRes/WordGame/gameComScript/ANodeReplaceCheckScript.ts +++ b/assets/WenZiRes/WordGame/gameComScript/ANodeReplaceCheckScript.ts @@ -1,3 +1,4 @@ + import { ryw_Event } from "../../../FrameWork/Event/EventEnum"; import EventMgr from "../../../FrameWork/Event/EventMgr"; import GameReport from "../../../FrameWork/Report/ZyZyReport"; diff --git a/assets/WenZiRes/WordGame/gameComScript/XianSuoMoveTouchScript.ts b/assets/WenZiRes/WordGame/gameComScript/XianSuoMoveTouchScript.ts index 05184450..9727c844 100644 --- a/assets/WenZiRes/WordGame/gameComScript/XianSuoMoveTouchScript.ts +++ b/assets/WenZiRes/WordGame/gameComScript/XianSuoMoveTouchScript.ts @@ -1,5 +1,4 @@ -import { ryw_Event } from "../../../FrameWork/Event/EventEnum"; -import EventMgr from "../../../FrameWork/Event/EventMgr"; + import Common5 from "../../../Platform/th/Common5"; const { ccclass, property } = cc._decorator;