DESKTOP-RH64908\Administrator
|
8d4c3a2213
|
1
|
2025-02-10 20:20:21 +08:00 |
DESKTOP-RH64908\Administrator
|
0960d7fc5a
|
1
|
2024-12-24 14:43:26 +08:00 |
DESKTOP-RH64908\Administrator
|
351f192b82
|
1
|
2024-11-22 20:12:01 +08:00 |
zhangjiannan
|
699c903e8d
|
删除多余资源
|
2024-11-13 10:29:52 +08:00 |
DESKTOP-RH64908\Administrator
|
a384bda644
|
差异meta上传
|
2024-11-08 11:13:44 +08:00 |
zhangjiannan
|
c3f6ca697b
|
1
|
2024-10-24 15:32:47 +08:00 |
zhangjiannan
|
19484d6b62
|
Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/Icon/Haizeiskill.meta
# Assets/ManagedResources/Icons/luofu_huobi_1.png
# Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_2.png
# Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_3.png
# Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_4.png
# Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
# Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
# Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
|
2024-10-11 16:36:50 +08:00 |
zhangjiannan
|
c318a3f870
|
修改战斗场景,替换挂机表现
|
2024-10-10 16:52:39 +08:00 |
DESKTOP-MMO982B\User
|
fac68e88ae
|
Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/Icon/Haizeiskill/gedoujiaqiqi_skill1.png.meta
|
2024-09-11 17:12:37 +08:00 |
PC-202302260912\Administrator
|
77f090d66f
|
修改
|
2024-09-06 20:39:43 +08:00 |
wangzhenxing
|
bb28910a44
|
删除无用图片
|
2024-01-26 11:22:38 +08:00 |
xiejun
|
879a49823f
|
mapconfig
|
2023-12-29 18:40:13 +08:00 |
wangzhenxing
|
483eed2cda
|
资源提交
|
2023-12-29 18:28:11 +08:00 |
xiejun
|
d988829154
|
战斗场景根据配置加载
|
2023-11-09 18:22:16 +08:00 |
xiejun
|
1e53fbc529
|
锻器阁
|
2023-10-31 15:30:06 +08:00 |
xiejun
|
44e3f87d2c
|
背包资源
|
2023-10-27 18:50:54 +08:00 |
xiejun
|
8ef7efa6c1
|
达人活动UI和神印BUG
|
2023-10-27 16:41:28 +08:00 |
xiejun
|
077b82bd84
|
好友,公会副本等UI修改
|
2023-10-18 20:41:04 +08:00 |
xiejun
|
ff21cd74d2
|
竞技场部分预制体修改
|
2023-10-10 18:53:44 +08:00 |
xiejun
|
d53329f6fb
|
灵兽部分UI
|
2023-09-21 18:36:44 +08:00 |
xiejun
|
af6b341a0c
|
修改子弹逻辑
|
2023-09-18 15:41:32 +08:00 |
xiejun
|
363b5a3818
|
图鉴UI
|
2023-09-04 18:27:40 +08:00 |
xiejun
|
3ab79a59b7
|
副本UI
|
2023-09-02 18:53:21 +08:00 |
xiejun
|
5b8ef487f7
|
御灵
|
2023-09-02 17:16:34 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +08:00 |
xiejun
|
f1b9b526c1
|
代码修改
|
2023-08-30 20:33:29 +08:00 |
xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
xiejun
|
636a7bc3eb
|
配置
|
2023-08-15 21:16:42 +08:00 |
xiejun
|
32d5e9bb97
|
修改BUG
|
2023-08-15 20:52:29 +08:00 |
xiejun
|
5d7fcc5aec
|
修改bug
|
2023-08-15 20:25:06 +08:00 |
xiejun
|
58f205f22b
|
新图标
|
2023-08-15 17:03:19 +08:00 |
xiejun
|
b089acd68c
|
修改
|
2023-08-15 15:08:56 +08:00 |
xiejun
|
bbde945918
|
新角色立绘
|
2023-08-15 12:36:04 +08:00 |
xiejun
|
19231ba20a
|
公会UI
|
2023-08-14 16:36:26 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
xiejun
|
43d80275b9
|
神将部分UI替换
|
2023-08-04 18:58:14 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
xiejun
|
ed0681d015
|
路飞,萨博
|
2023-07-17 18:47:07 +08:00 |
xiejun
|
937ec44bf5
|
立绘和代码修改
|
2023-07-13 14:38:34 +08:00 |
xiejun
|
ab2e8eb833
|
增加技能特效spine
|
2023-07-06 14:08:10 +08:00 |
xiejun
|
214151b5ca
|
修改
|
2023-07-04 10:28:57 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
xiejun
|
f52a94841e
|
修改战斗的代码,已经调整live2D
|
2023-06-28 15:58:29 +08:00 |
xiejun
|
b47c16dcb7
|
test
|
2023-06-20 18:01:51 +08:00 |
wangzhenxing
|
ca2b699259
|
神印提交
|
2022-04-22 18:23:01 +08:00 |
luyao
|
6238708fee
|
探索商店,挑战商店 文字上传
|
2022-04-22 17:37:45 +08:00 |
luyao
|
f620d95f5e
|
【tips背板】修改提交
|
2022-04-22 15:49:52 +08:00 |
jiaoyangna
|
17f855be9f
|
【ID1011382】
进阶好礼
|
2022-04-02 15:43:29 +08:00 |