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
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
lihaiyang
|
63fc1c6ee2
|
【天蓬】图标
|
2023-05-16 11:49:23 +08:00 |
lihaiyang
|
ca935de5b9
|
悟空 技能字
|
2023-04-21 13:25:09 +08:00 |
lihaiyang
|
330fe63d9f
|
女娲相关
|
2023-02-28 18:14:52 +08:00 |
wangzhenxing
|
689ebec257
|
关卡奖励图标适配
|
2022-11-17 10:50:37 +08:00 |
lihaiyang
|
98f68504bc
|
【挑战副本】======修正描述
|
2022-11-15 14:03:56 +08:00 |
lihaiyang
|
a6929bab54
|
【防御挑战】======防御挑战图标上传
|
2022-11-14 17:46:04 +08:00 |
wangzhenxing
|
119c186c34
|
[主城]=======按钮修改提交
|
2022-11-08 14:51:51 +08:00 |
lihaiyang
|
85e9632df7
|
【刷冲特权】============布局修改
|
2022-11-02 19:06:25 +08:00 |
wangzhenxing
|
cfb70c9a9e
|
【成长基金】======图片修改提交
|
2022-07-12 17:15:18 +08:00 |
wangzhenxing
|
504da04293
|
[英雄信息界面]=======底图修改
|
2022-06-06 10:52:55 +08:00 |
wangzhenxing
|
dd7a256469
|
[周卡]======红点修改提交
|
2022-06-01 14:50:08 +08:00 |
luyao
|
6d745faedf
|
神将界面衬底图2
|
2022-06-01 10:57:23 +08:00 |
wangzhenxing
|
aab17e8323
|
图片修改提交
|
2022-05-09 18:41:55 +08:00 |
yuanshuai
|
5f40aab195
|
图片修改
|
2022-04-24 20:33:30 +08:00 |
luyao
|
4cee830a53
|
新图标、UI资源、meta文件上传
|
2022-04-22 16:29:09 +08:00 |
luyao
|
6a7b4263a7
|
聊天底图(变浅色)
|
2022-04-22 12:45:03 +08:00 |
luyao
|
9e97f77090
|
聊天衬底图更新
|
2022-04-22 12:43:29 +08:00 |
yuanshuai
|
c5b0d30f9c
|
资源提交
|
2022-04-19 13:39:48 +08:00 |
gaoxin
|
67c855ad56
|
【资源】特惠商城资源替换
|
2022-02-23 18:36:30 +08:00 |
ZhangBiao
|
60df01190d
|
【家园】资源替换
|
2022-01-18 15:19:19 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
ZhangBiao
|
617a557071
|
【家园】修改按钮
|
2022-01-11 18:20:12 +08:00 |
gaoxin
|
978d4acb4e
|
【限时升星】资源上传
|
2022-01-14 10:48:24 +08:00 |
ZhangBiao
|
bd2d5ccd50
|
【家园】提交
|
2021-12-30 20:24:59 +08:00 |
ZhangBiao
|
0d11371d87
|
【资源冲突】资源名修改提交
|
2021-12-06 16:15:24 +08:00 |
luyao
|
a9ecbeaddd
|
方寸商店meta文件。及 牛魔王【气冲斗牛】技能字
|
2021-12-06 13:40:25 +08:00 |
wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
ZhangBiao
|
bb7c738cd1
|
【每日礼包】banner修改
|
2021-11-26 17:26:30 +08:00 |
wangzhenxing
|
8590face13
|
【战斗】========主角技能名称图片资源提交
|
2021-10-22 14:44:11 +08:00 |
gaoxin
|
a712ddee3b
|
【挚礼月卡】功能完善
|
2021-10-20 16:36:36 +08:00 |
gaoxin
|
761f8d660c
|
【挚礼月卡】资源上传
|
2021-10-18 15:16:24 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
yuanshuai
|
0d31e6b0f8
|
,meta
|
2021-09-18 15:44:09 +08:00 |
yuanshuai
|
bee3fa5099
|
图片资源修改提交
|
2021-09-13 14:37:04 +08:00 |
yuanshuai
|
4c66f50e66
|
Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-09-10 09:38:55 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
liujiaqi
|
947a4fa368
|
【资源】织女技能字
|
2021-09-08 14:02:27 +08:00 |
jiaoyangna
|
792b533fa0
|
太初秘卷修改提交
|
2021-08-12 11:02:21 +08:00 |
wangzhenxing
|
55693a7b25
|
【bug】=====聊天界面背景图提交
|
2021-08-02 16:13:57 +08:00 |
ZhangBiao
|
92f3ee123c
|
【升星有礼】界面调整
|
2021-07-30 17:51:25 +08:00 |
gaoxin
|
5594474379
|
【累充】白片恢复
|
2021-07-29 18:05:44 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
jiaoyangna
|
b75d869c8a
|
【资源优化】整理废弃的冗余资源,减少包体大小
|
2021-07-27 17:13:18 +08:00 |
jiaoyangna
|
9a4c92baa1
|
Revert "【ID1009762】"
This reverts commit c99394b54e.
|
2021-07-27 17:04:12 +08:00 |