 MushrooMagician
|
b41f6e9453
|
Merge remote-tracking branch 'origin/feature/xk/language' into dajun
# Conflicts:
# tgx-games-client/assets/Prefebs.meta
# tgx-games-client/assets/Prefebs/role/Character001.prefab
# tgx-games-client/assets/Prefebs/role/Character002.prefab
# tgx-games-client/assets/Prefebs/role/Character003.prefab
# tgx-games-client/assets/level1/Script/AreanPlayer.ts.meta
# tgx-games-client/assets/level1/Script/BattleView.ts.meta
# tgx-games-client/assets/level1/Script/PlayerController.ts
# tgx-games-client/assets/level1/Script/WoodenManGame.ts.meta
# tgx-games-client/assets/level1/Script/gameManager.ts
# tgx-games-client/assets/level1/Script/player.ts
# tgx-games-client/assets/level1/UI/图层 0.png.meta
# tgx-games-client/assets/level1/scene/level1Scene.scene
# tgx-games-client/assets/level3/scene/BallScene.scene
# tgx-games-client/assets/level3/script/GameManager.ts
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_bluegray.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_red.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_yellow.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_sqeure_01.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Label/label_tag_01_Demo.png.meta
# tgx-games-client/assets/module_arean/common/role/doll.prefab
# tgx-games-client/assets/module_arean/common/role/red_c.prefab
# tgx-games-client/assets/module_arean/lobby_arean.scene
# tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
# tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
# tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts
# tgx-games-client/assets/module_arean/ui_searching_rival/ui_searching_rival.prefab
# tgx-games-client/assets/module_basic/scripts/FrontConfig.ts
# tgx-games-client/tsconfig.json
# tgx-games-server/src/SrvGame/RoomArean.ts
# tgx-games-server/src/db/mongodb/MongoDBHero.ts
# tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
# tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
|
2025-02-21 14:15:16 +08:00 |
xukuan
|
e11e4a25b9
|
解决合并冲突
|
2025-02-21 11:22:13 +08:00 |
|
xukuan
|
a8176d9e6c
|
提交内容：
|
2025-02-21 11:19:10 +08:00 |
|
xukuan
|
81e0e6fddd
|
暂存
|
2025-02-21 11:06:39 +08:00 |
|
xukuan
|
e60c0c203d
|
Merge branch 'dajun' into dev
|
2025-02-21 11:06:26 +08:00 |
|
xukuan
|
fa81645638
|
暂存
|
2025-02-21 10:51:34 +08:00 |
|
MushrooMagician
|
88595b8b7a
|
上传
|
2025-02-21 10:45:46 +08:00 |
|
xukuan
|
31cbb3f511
|
Merge branch 'main' into feature/xk/game
|
2025-02-21 09:24:15 +08:00 |
|
xukuan
|
4e97d84926
|
提交内容：
|
2025-02-21 09:23:45 +08:00 |
|
xukuan
|
fff6e28ac1
|
多语言，登录完善
|
2025-02-18 09:45:06 +08:00 |
|
xukuan
|
933a83d2f6
|
多语言，创建账号流程
|
2025-02-17 21:36:37 +08:00 |
|
MushrooMagician
|
d128078e84
|
Merge branch 'main' of http://chengchennet.cn:3000/mushroom/squidGame
# Conflicts:
# tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
# tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
|
2025-02-12 11:22:14 +08:00 |
|
MushrooMagician
|
d204e3a061
|
表更新
|
2025-02-12 11:21:25 +08:00 |
|
LAPTOP-FUTFQGMC\mushroomagician
|
09b66ba3b7
|
服务器数据清理
|
2025-02-11 10:18:46 +08:00 |
|
LAPTOP-FUTFQGMC\mushroomagician
|
245a5887b0
|
前段资源清理
|
2025-02-10 17:40:26 +08:00 |
|
LAPTOP-FUTFQGMC\mushroomagician
|
14b5ac0032
|
服务器修改
|
2025-02-10 17:02:03 +08:00 |
|
MushrooMagician
|
4150bdfda6
|
Merge branch 'main' of http://chengchennet.cn:3000/mushroom/squidGame
|
2025-02-10 11:08:33 +08:00 |
|
MushrooMagician
|
8093955dd1
|
更新
|
2025-02-10 11:08:10 +08:00 |
 阿子_穆琪\zimuj
|
dddbd297b0
|
语言表更新
|
2025-02-08 17:39:04 +08:00 |
|
阿子_穆琪\zimuj
|
8e8208c1d1
|
表更新
|
2025-02-07 15:04:57 +08:00 |
|
LAPTOP-FUTFQGMC\mushroomagician
|
4d9f4f419d
|
首次提交
|
2025-02-07 10:49:34 +08:00 |