zhangqiang
|
694320d99c
|
Merge branch '0功能/1月6_版本优化' into master_develop
# Conflicts:
# Assets/Effect_ls_08_jinwu_attack_02.controller.meta
# Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.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/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
# FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
|
2020-12-31 14:53:17 +08:00 |
zhangqiang
|
a6d16c13e5
|
【寻宝】加锁
|
2020-12-30 18:08:44 +08:00 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
zhangqiang
|
1227e93456
|
【寻宝】 优化 加锁 1
|
2020-12-29 16:56:18 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
zhangqiang
|
bd6fdce461
|
遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人
|
2020-09-27 16:12:21 +08:00 |
zhangqiang
|
51e88c5f34
|
寻宝自动选择逻辑修改
|
2020-09-01 16:45:11 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |
zhangqiang
|
acba506782
|
寻宝添加6星显示
|
2020-07-31 18:40:22 +08:00 |
jiaoyangna
|
46f091f09c
|
头像框修改提交
|
2020-07-25 20:28:41 +08:00 |
zhangqiang
|
98670958a0
|
首冲拍脸 寻宝红点条件
|
2020-07-17 13:56:30 +08:00 |
zhangqiang
|
8f96d9f067
|
探宝红点
|
2020-07-16 18:01:03 +08:00 |
zhangqiang
|
ed5a942875
|
探宝红点未完成
|
2020-07-15 13:34:13 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
2db43096de
|
补充提交
|
2020-06-12 18:04:22 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |