Commit Graph

30 Commits (e0359bb37a5d011b93c0b4e6924c2e0549545325)

Author SHA1 Message Date
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
ZhangBiao 0cd5ffca9d 魂印特效关闭 2020-08-03 16:11:04 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00
ZhangBiao 4f14ee8599 商店金币位数调整 2020-07-28 23:25:43 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
jiaoyangna 25d535fa4c 关闭特效 2020-07-28 16:57:12 +08:00
jiaoyangna d5b15a17ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2020-07-28 15:08:24 +08:00
zhangqiang 565d0392fc 背景颜色根据星级变化 2020-07-31 15:40:43 +08:00
jiaoyangna 99f9e7169e 添加特效 2020-07-28 15:06:47 +08:00
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
jiaoyangna 0ec835f540 获取头像框通用方法修改 2020-07-25 20:04:02 +08:00
jiaoyangna 48ff5b8b28 头像框通用方法修改 2020-07-25 20:02:24 +08:00
jiaoyangna d8fa2b9459 头像背景修改 2020-07-25 19:59:43 +08:00
gaoxin 65756cbe59 Merge branch 'master_local_test' into master_develop
# Conflicts:
#	Assets/Effect.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MapChoose.meta
2020-07-25 16:24:48 +08:00
JieLing 543a4ca080 修复提交数据报错,内网测试0.16.2 2020-07-25 16:23:04 +08:00
jiaoyangna 6742056a93 冲突解决提交 2020-07-25 15:18:07 +08:00
jiaoyangna a688050060 修改星星提交 2020-07-25 14:21:33 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
gaoxin 5c962f330a Merge branch '接入SDK' into master_test
# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset
2020-07-18 19:55:02 +08:00
gaoxin 7605156317 sdk结构修改 2020-07-15 13:44:37 +08:00
ZhangBiao eddaa95312 宝囊 2020-07-14 11:05:47 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00