PC-202302260912\Administrator
|
e911b8ec9d
|
Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into ShaoNv
# Conflicts:
# Assets/ManagedResources/BG/UI/1All/Qualifying_d03.png.meta
# Assets/ManagedResources/Prefabs/UI/Compound/SelectGiftListPopup.prefab
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayListPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab
# Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
|
2024-12-29 15:32:45 +08:00 |
PC-202302260912\Administrator
|
77455eb9c5
|
1刪除无用
|
2024-12-24 18:11:59 +08:00 |
DESKTOP-RH64908\Administrator
|
0960d7fc5a
|
1
|
2024-12-24 14:43:26 +08:00 |
PC-202302260912\Administrator
|
5e4c736ac8
|
图片更换
|
2024-12-09 18:24:03 +08:00 |
PC-202302260912\Administrator
|
41ef052071
|
删除无用图片
|
2024-12-03 14:31:07 +08:00 |
PC-202302260912\Administrator
|
1c36c4ab09
|
删除无用图标
|
2024-12-03 14:29:26 +08:00 |
PC-202302260912\Administrator
|
e086086730
|
删除无用图片
|
2024-12-02 19:46:07 +08:00 |
PC-202302260912\Administrator
|
4947aca4f4
|
删除图片
|
2024-12-02 19:42:26 +08:00 |
PC-202302260912\Administrator
|
ad71d5b7ef
|
删除无用图片
|
2024-12-02 19:37:31 +08:00 |
PC-202302260912\Administrator
|
3ab3ae12a6
|
删除无用图片
|
2024-11-23 11:28:13 +08:00 |
PC-202302260912\Administrator
|
8c0d93a049
|
删除无用图片
|
2024-11-22 20:41:59 +08:00 |
DESKTOP-RH64908\Administrator
|
838a42cfad
|
Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
# Assets/StreamingAssets/Android.meta
|
2024-11-22 20:14:14 +08:00 |
DESKTOP-RH64908\Administrator
|
351f192b82
|
1
|
2024-11-22 20:12:01 +08:00 |
PC-202302260912\Administrator
|
f58c94a302
|
删除无用图片
|
2024-11-22 19:41:30 +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
|
c318a3f870
|
修改战斗场景,替换挂机表现
|
2024-10-10 16:52:39 +08:00 |
zhangjiannan
|
4df7b99e38
|
meta上传
|
2024-09-23 14:48:00 +08:00 |
PC-202302260912\Administrator
|
4c0f81b40d
|
修改图标
|
2024-09-14 14:58:14 +08:00 |
PC-202302260912\Administrator
|
e3e3482c9c
|
修改图片和预设
|
2024-09-11 19:59:15 +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 |
DESKTOP-MMO982B\User
|
bcc987319b
|
胜败
|
2024-02-14 16:10:30 +08:00 |
DESKTOP-MMO982B\User
|
f1d3685b43
|
Revert "pvp和pve战斗结算胜败图片替换"
This reverts commit 2c12d2cbad.
|
2024-02-14 15:37:43 +08:00 |
DESKTOP-MMO982B\User
|
2c12d2cbad
|
pvp和pve战斗结算胜败图片替换
|
2024-02-14 15:24:56 +08:00 |
wangzhenxing
|
8d5f7f4b57
|
删除无用资源
|
2024-03-01 16:50:44 +08:00 |
wangzhenxing
|
da37451adc
|
完字替换
|
2024-02-23 18:25:20 +08:00 |
PC-202302260912\Administrator
|
6af82d132c
|
宝箱替换
|
2024-02-18 18:58:24 +08:00 |
PC-202302260912\Administrator
|
1678e59100
|
图片修改
|
2024-01-31 19:11:21 +08:00 |
wangzhenxing
|
b7c7632729
|
删除无用资源
|
2024-01-24 19:00:58 +08:00 |
wangzhenxing
|
9306240ab5
|
删除过时图片
|
2024-01-24 14:49:00 +08:00 |
PC-202302260912\Administrator
|
d2c5bf63f5
|
修改圣器
|
2024-01-18 21:27:01 +08:00 |
PC-202302260912\Administrator
|
61b2167ee4
|
修改两张图片
|
2024-01-18 11:44:16 +08:00 |
PC-202302260912\Administrator
|
bbd96b11cc
|
圣器图标上传
|
2024-01-17 22:40:38 +08:00 |
PC-202302260912\Administrator
|
e191d19fac
|
圣器上传
|
2024-01-17 19:27:18 +08:00 |
wangzhenxing
|
ed6d904661
|
删除无用图片
|
2024-01-12 14:34:44 +08:00 |
xiejun
|
cee660230b
|
修改bug
|
2024-01-04 17:07:44 +08:00 |
wangzhenxing
|
47024e7b57
|
删除技能名称图片
|
2023-12-04 14:28:28 +08:00 |
wangzhenxing
|
815155b2bf
|
删除无用spine
|
2023-11-16 16:20:33 +08:00 |
wangzhenxing
|
bb9243ea25
|
请求界面修改
|
2023-11-16 15:33:54 +08:00 |
wangzhenxing
|
88e7d006c5
|
删除无用图片
|
2023-11-14 17:13:20 +08:00 |
wangzhenxing
|
31718ea87d
|
主界面修改升级界面修改
|
2023-11-09 15:35:38 +08:00 |
wangzhenxing
|
b00f874236
|
点石成金修改提交
|
2023-11-09 10:52:24 +08:00 |
wangzhenxing
|
8223d041f9
|
聊天界面修改
|
2023-11-08 15:52:49 +08:00 |
wangzhenxing
|
0d2638355a
|
主界面修改
|
2023-11-03 15:46:07 +08:00 |
wangzhenxing
|
90134677d2
|
急速探索界面修改提交
|
2023-11-03 11:42:57 +08:00 |
wangzhenxing
|
9d6308c909
|
法宝聚灵界面修改提交
|
2023-10-31 14:38:02 +08:00 |
xiejun
|
44e3f87d2c
|
背包资源
|
2023-10-27 18:50:54 +08:00 |
xiejun
|
c47462c5d8
|
Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-09-20 18:57:44 +08:00 |
PC-202302260912\Administrator
|
83eea07584
|
牛气冲天图片修正
|
2023-09-04 19:03:24 +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 |