Commit Graph

42 Commits (030431e3fca075d7435c9fcf8dfbfca3d3e2888c)

Author SHA1 Message Date
xiejun 56be2d2498 文字 2023-12-29 18:07:20 +08:00
xiejun 4f8f3955ce 关卡动态页面和巅峰赛竞技场 2023-12-22 15:36:03 +08:00
wangzhenxing 080023c58c 主城小人修改 2023-12-05 19:26:08 +08:00
jiaoyangna f45ec94ea5 血条位置修改提交 2022-01-07 16:46:25 +08:00
jiaoyangna 2b588340aa 【ID1019476】
【探索】称号遮挡复活中
2022-01-06 09:49:17 +08:00
jiaoyangna d4d1653bc2 探索优化 2021-12-30 14:01:30 +08:00
jiaoyangna 80263f61f0 探索优化提交 2021-12-30 13:50:39 +08:00
jiaoyangna 2a14bc799f 探索中优化 2021-12-30 11:41:13 +08:00
jiaoyangna 88130ac4dd 探索提交 2021-12-24 14:09:48 +08:00
jiaoyangna 7f0e684bc0 一键探索修改提交 2021-12-24 11:18:03 +08:00
jiaoyangna 83b5a04ac6 探索提交 2021-12-23 13:45:33 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
jiaoyangna b9336dbe7f 去掉对话背景 2021-06-03 17:43:07 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
ZhangBiao 7679f85af3 【修行】图标调整 2021-06-02 11:08:24 +08:00
ZhangBiao 6ea9015bed 【修行】印记提交4 2021-05-29 20:48:07 +08:00
ZhangBiao 19bce27f34 【修行】提交3 2021-05-29 19:58:52 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna bb2cd6a263 无尽副本修改提交 2021-05-26 14:57:28 +08:00
gaoxin 653d9bbd06 【meta】 2021-05-26 13:43:11 +08:00
gaoxin 07b41217fa 【挂机】攻击特效穿透 2021-04-29 11:45:39 +08:00
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
jiaoyangna 15ef116032 剧情提交 2021-04-26 09:41:41 +08:00
ZhangBiao c2e97f144d 【森罗无尽】小人消失i修改 2021-04-23 16:04:28 +08:00
jiaoyangna 42b91c0a4e 剧情提交 2021-04-22 18:13:28 +08:00
jiaoyangna a8393f2fb1 Merge branch 'china/dev-c' into 剧情
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-04-22 15:09:00 +08:00
jiaoyangna a0ecd56968 剧情提交 2021-04-22 15:06:47 +08:00
jiaoyangna 2d160ca755 资源提交 2021-04-21 10:57:21 +08:00
jiaoyangna 0fdb6b608d 名字提交 2021-04-20 15:07:10 +08:00
jiaoyangna 1e04dcc200 名字提交 2021-04-20 14:52:02 +08:00
jiaoyangna f3fa2c9a99 挂机界面提交 2021-04-19 18:20:57 +08:00
jiaoyangna d101c5ce7b 名字修改提交 2021-04-19 13:02:37 +08:00
jiaoyangna 3738137554 【挂机演示优化】挂机界面增加其他玩家 2021-04-15 15:51:24 +08:00
zhangqiang e4da98bff6 【bug修改】 2021-04-01 20:26:43 +08:00
gaoxin e0788a63ce 【本地化】资源同步 2021-01-27 13:49:15 +08:00
gaoxin 12356f5ed7 【本地化】预设提交 2021-01-26 17:48:24 +08:00
jiaoyangna 9fd56a684d 去除宝箱黑色框 2020-08-31 10:40:23 +08:00
gaoxin d4530f6ccf 修复新人物资源导致的报错 2020-08-24 17:43:28 +08:00
jiaoyangna 0210dc3109 conflict commit 2020-08-17 15:17:58 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00