PC-202302260912\Administrator
|
7bb9276a39
|
优化抽卡页面
|
2023-11-03 19:19:38 +08:00 |
xiejun
|
9b27835185
|
抽卡
|
2023-11-03 16:45:33 +08:00 |
wangzhenxing
|
0d2638355a
|
主界面修改
|
2023-11-03 15:46:07 +08:00 |
wangzhenxing
|
90134677d2
|
急速探索界面修改提交
|
2023-11-03 11:42:57 +08:00 |
PC-202302260912\Administrator
|
3f6e823337
|
通用图标上传
|
2023-11-03 10:52:32 +08:00 |
PC-202302260912\Administrator
|
e3e24353ef
|
神将
|
2023-11-02 19:22:51 +08:00 |
xiejun
|
a45b0fbb23
|
点将台UI
|
2023-11-02 17:24:35 +08:00 |
PC-202302260912\Administrator
|
192e92416e
|
在线奖励相关
|
2023-11-02 16:58:30 +08:00 |
wangzhenxing
|
c67eb7f7ad
|
神兵系统界面修改提交
|
2023-11-02 16:03:11 +08:00 |
PC-202302260912\Administrator
|
7c0cf86935
|
首充相关
|
2023-11-01 19:08:54 +08:00 |
wangzhenxing
|
9a86ec8026
|
神兵主界面修改提交
|
2023-11-01 19:02:00 +08:00 |
PC-202302260912\Administrator
|
a87bca727c
|
限时折扣
|
2023-11-01 17:29:04 +08:00 |
PC-202302260912\Administrator
|
fc66533d1a
|
阵营推荐
|
2023-11-01 16:27:05 +08:00 |
wangzhenxing
|
730966a6df
|
Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
|
2023-11-01 15:47:46 +08:00 |
wangzhenxing
|
dbac53d14d
|
属性信息界面,技能信息界面修改
|
2023-11-01 15:47:17 +08:00 |
xiejun
|
f939ff8ac8
|
神将置换UI
|
2023-11-01 15:46:54 +08:00 |
PC-202302260912\Administrator
|
121a97c801
|
添加按钮
|
2023-11-01 15:24:32 +08:00 |
wangzhenxing
|
08fea279e1
|
化身卡修改提交
|
2023-11-01 15:11:41 +08:00 |
PC-202302260912\Administrator
|
d4779c6a3d
|
超级特权相关
|
2023-11-01 14:39:15 +08:00 |
PC-202302260912\Administrator
|
aa81773fb0
|
主界面图标
|
2023-11-01 10:47:24 +08:00 |
PC-202302260912\Administrator
|
442e99da6d
|
限时兑换
|
2023-10-31 18:55:40 +08:00 |
PC-202302260912\Administrator
|
90eab3e98d
|
7日登陆
|
2023-10-31 17:00:08 +08:00 |
wangzhenxing
|
ad48afbfe9
|
礼物界面修改提交
|
2023-10-31 16:23:50 +08:00 |
xiejun
|
1e53fbc529
|
锻器阁
|
2023-10-31 15:30:06 +08:00 |
wangzhenxing
|
9d6308c909
|
法宝聚灵界面修改提交
|
2023-10-31 14:38:02 +08:00 |
PC-202302260912\Administrator
|
b15c4f942e
|
礼物相关
|
2023-10-31 11:43:32 +08:00 |
PC-202302260912\Administrator
|
c11ad012de
|
四象心法优化
|
2023-10-30 20:28:39 +08:00 |
wangzhenxing
|
d1a9cff2c5
|
法宝聚灵修改提交
|
2023-10-30 19:16:17 +08:00 |
PC-202302260912\Administrator
|
7088098c1a
|
四象心法修改
|
2023-10-30 16:29:58 +08:00 |
PC-202302260912\Administrator
|
21d8e1ee5b
|
添加日常任务缺少的图片
|
2023-10-28 16:08:31 +08:00 |
PC-202302260912\Administrator
|
aeb72a1f7b
|
天宫寻宝
|
2023-10-28 15:41:04 +08:00 |
xiejun
|
44e3f87d2c
|
背包资源
|
2023-10-27 18:50:54 +08:00 |
xiejun
|
1c56d6629d
|
修改公会,和恭喜获得的UI
|
2023-10-27 17:39:09 +08:00 |
xiejun
|
8ef7efa6c1
|
达人活动UI和神印BUG
|
2023-10-27 16:41:28 +08:00 |
wangzhenxing
|
ed4865cc3c
|
法宝星级显示修改
|
2023-10-26 20:44:18 +08:00 |
xiejun
|
fafab89f48
|
升星冲榜UI
|
2023-10-26 18:44:37 +08:00 |
xiejun
|
d9d842c5be
|
恭喜获得
|
2023-10-26 14:54:18 +08:00 |
xiejun
|
965fc5d494
|
十绝症UI
|
2023-10-25 18:51:09 +08:00 |
PC-202302260912\Administrator
|
fe702e50c4
|
天宫寻宝
|
2023-10-25 16:06:27 +08:00 |
xiejun
|
663fbca133
|
神兵热榜
|
2023-10-24 20:02:38 +08:00 |
xiejun
|
e1d0445714
|
修改bug,删除部分老预设
|
2023-10-23 17:44:09 +08:00 |
xiejun
|
443dbba568
|
充值UI修改
|
2023-10-20 18:51:12 +08:00 |
PC-202302260912\Administrator
|
98168f92a1
|
成就相关
|
2023-10-20 17:18:23 +08:00 |
PC-202302260912\Administrator
|
b487194cd8
|
上传信息图片
|
2023-10-20 15:18:31 +08:00 |
PC-202302260912\Administrator
|
99d70ca52d
|
月卡换底
|
2023-10-20 13:24:17 +08:00 |
xiejun
|
d7762a4a00
|
登录界面替换UI
|
2023-10-19 22:51:00 +08:00 |
PC-202302260912\Administrator
|
34ba7a787d
|
月卡相关
|
2023-10-19 22:43:48 +08:00 |
xiejun
|
2212a7443d
|
邮件和邮件内容UI
|
2023-10-19 21:05:35 +08:00 |
xiejun
|
bfbce921a3
|
屏蔽修行按钮,更换日常任务的UI,修改了好友的按钮选择显示逻辑
|
2023-10-19 17:42:21 +08:00 |
xiejun
|
077b82bd84
|
好友,公会副本等UI修改
|
2023-10-18 20:41:04 +08:00 |
wangzhenxing
|
a66437ec72
|
潜能提交
|
2023-10-16 15:12:47 +08:00 |
xiejun
|
eb926fc087
|
灵兽
|
2023-09-28 17:05:40 +08:00 |
xiejun
|
88740201b3
|
排行榜UI
|
2023-09-20 18:00:40 +08:00 |
xiejun
|
af6b341a0c
|
修改子弹逻辑
|
2023-09-18 15:41:32 +08:00 |
xiejun
|
3ab79a59b7
|
副本UI
|
2023-09-02 18:53:21 +08:00 |
xiejun
|
1a34fec66e
|
修复bug
|
2023-09-01 20:18:46 +08:00 |
xiejun
|
83a8e9ab56
|
修改
|
2023-09-01 18:27:39 +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
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
xiejun
|
58f205f22b
|
新图标
|
2023-08-15 17:03:19 +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
|
214151b5ca
|
修改
|
2023-07-04 10:28:57 +08:00 |
xiejun
|
ab6a726b3a
|
增加凯多角色
|
2023-07-02 21:52:32 +08:00 |
lihaiyang
|
f595ebee5b
|
修改称号等美术图标
|
2023-06-02 13:18:06 +08:00 |
wangzhenxing
|
5ae17748ce
|
月卡图片修改
|
2022-11-16 16:10:23 +08:00 |
lihaiyang
|
8779ae8ef0
|
【周卡】==修正图片
|
2022-11-02 14:53:10 +08:00 |
lihaiyang
|
48a0538cac
|
【月卡】==替换月卡图标
|
2022-11-02 13:43:20 +08:00 |
lihaiyang
|
e8d38b2bdb
|
修改两个月卡图标
|
2022-10-12 15:56:53 +08:00 |
yuanshuai
|
b74a00e7df
|
界面调整
|
2022-06-10 16:37:56 +08:00 |
luyao
|
e6ba8c5d05
|
周卡【再领一次】图片资源
|
2022-06-10 14:12:18 +08:00 |
yuanshuai
|
783298b7b2
|
周卡再领一次资源提交
|
2022-06-10 13:15:27 +08:00 |
yuanshuai
|
2d18090df7
|
周卡月卡脚本预设提交
|
2022-06-09 14:19:07 +08:00 |
yuanshuai
|
c5b0d30f9c
|
资源提交
|
2022-04-19 13:39:48 +08:00 |
gaoxin
|
2342bd8af8
|
【拍脸】寻仙招募拍脸添加
|
2022-02-23 18:08:50 +08:00 |
gaoxin
|
0fcf94a9c8
|
【周卡】协议,界面,逻辑搭建完成
|
2021-10-29 09:42:33 +08:00 |
gaoxin
|
a712ddee3b
|
【挚礼月卡】功能完善
|
2021-10-20 16:36:36 +08:00 |
gaoxin
|
761f8d660c
|
【挚礼月卡】资源上传
|
2021-10-18 15:16:24 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
gaoxin
|
5f77a01928
|
【meta】
|
2021-05-21 13:56:58 +08:00 |
zhangqiang
|
97ba718ac2
|
Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-05-20 17:32:06 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
wangzhenxing
|
278282f73e
|
[图片]==============替换立绘图片资源
|
2021-04-23 17:45:39 +08:00 |
JLIOSM1
|
cab9724de6
|
【ios】资源位置修改
|
2021-04-20 13:57:33 +08:00 |
zhangqiang
|
5d0882d9ff
|
【主场景修改】——01
|
2021-04-06 17:48:35 +08:00 |
gaoxin
|
871196a742
|
【本地化】资源提交
|
2021-01-26 17:56:55 +08:00 |
JieLing
|
04ba352791
|
【资源】 修改资源路径
|
2020-11-02 19:54:12 +08:00 |
gaoxin
|
c6704e6ed4
|
【逍遥游】修复白片问题
|
2020-10-20 00:38:49 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
gaoxin
|
7b7def3f8f
|
勇冠三军,叱咤风云活动添加
|
2020-09-27 16:09:55 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
gaoxin
|
e415076e53
|
主界面适配资源替换
|
2020-09-02 17:04:44 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
ZhangBiao
|
ec6cf58003
|
天尊降世入口资源替换
|
2020-08-24 17:04:45 +08:00 |
ZhangBiao
|
4b59561b3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
|
2020-08-24 16:08:01 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |